51f9826ea6
Merge branch 'master' of git://github.com/sandoz/foodsoft
2009-03-23 10:40:03 +01:00
48b6515c08
Genderchanged string 'Lieferant'
...
* Since s.b. started this already. I changed every string 'Lieferant' to
'Lieferantin' to give note on female existance in this world :-)
2009-03-22 15:04:29 +01:00
7c6a01b0fc
Genderneutralization in stockit/index.html.haml
...
* Genderneutralized string 'Lieferant'
2009-03-22 15:04:29 +01:00
1c62bf8786
Genderneutralized/Fixed strings in suppliers/index.haml
...
* Genderneutralized 'Lieferanten'
* Fixed string 'ArtikelDatenbank'
* Fixed string 'KundenNr'
2009-03-22 15:04:28 +01:00
a4900bf8e0
Translation/Genderneutralization in admin/index.html.haml
...
* Translated 'Nick' to 'Benutzername'
* Genderneutralized 'Neueste Benutzer'
* Genderneutralized '...Gruppen und Benutzer...'
* Changed 'Name' to 'Gruppenname' in section 'Neueste Gruppen'
2009-03-22 15:04:28 +01:00
de105bea70
SASS: Changed padding of input, textacrea, select
...
* At membership list, the layout was slightly broken by the top-padding
* of an input-element after a div with a float:left.
2009-03-22 15:03:50 +01:00
8cdcb10c69
Translation in foodcoop/members.html.haml
...
* Renamed "Sort by Ordergroups :"
* Removed whitespace before ':'
* Improved German Grammar. Hope you agree :-)
2009-03-22 14:16:53 +01:00
8171d3d173
Translation in foodcoop/_users.html.haml
...
* Transalated 'Nick' to 'Benutzername'
2009-03-22 14:16:53 +01:00
fea8c0993b
Translation in profile.html.erb
...
* Translated "cancal membership" and warning.
2009-03-22 14:16:53 +01:00
8d4acac081
Removed string "Benutzername: in home/profile.html.erb
...
* I think it doubles it self to have the same string again on the next
line. Hope you find it more beautiful too :-)
2009-03-22 14:16:52 +01:00
584431d00a
Translations in shared/_user_form.rhtml
...
* Added German text in order not to user default text.
2009-03-22 14:16:52 +01:00
ceec784e62
Translation in profile.html.erb
...
* Renamed "Nickname" to "Benutzername"
* Removed also '#' in end of line.
2009-03-22 14:16:52 +01:00
92e2bdd187
Renamed 'Help' to 'Hilfe' in top loginInfo bar
2009-03-22 14:16:52 +01:00
54715e50fc
Changed caption of group orders sum price
...
* Changed caption of order_article.group_orders_sum[:price] to be "Summe
(FC-Preis)" in _group_order_articles.html
* Trying to improve clarification of diffrent prices.
2009-03-22 14:16:52 +01:00
cde1fb3525
Show total price of ordered units per article in finance/balancing
...
* Implement functions total_price and total_gross_price on model
order_article
* Show total_price and total_gross_price in view finance/balancing
_order_article (Closed #108 )
2009-03-22 14:16:52 +01:00
2e490d1a52
Capitalized first letter of 'netto' and 'brutto' in Captions.
2009-03-22 14:16:52 +01:00
b189bc31d0
Small hack to make button "+" and "-" to be same size.
...
* It would be better to put a specific class for de/increase buttons.
* Right now just adding min-width to input globally in SASS.
2009-03-22 14:16:04 +01:00
891fc74d91
Merge branch 'master' of git://github.com/bennibu/foodsoft
2009-03-22 10:56:58 +01:00
3654ba7cf1
Added buttons to in/decrease group order article results.
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-03-21 05:39:02 +08:00
f7f13ee7a6
Correct 'brutto'-price to be price.gross not fc_price.
...
* We want to be more consistent in the use of diffrent price types:
* netto, brutto, fc_price
Signed-off-by: bennibu <benni@dresdener27.de>
2009-03-21 05:38:58 +08:00
39fdda4019
Fixed buggy link in finance/balancing/new.html.haml
...
* Link to "Rechnung anlegen" did not send supplier id.
Signed-off-by: bennibu <benni@dresdener27.de>
2009-03-21 05:38:57 +08:00
f655272448
Removed auto-created fixtures in stock_takings.yml
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-03-21 05:38:55 +08:00
6da9190b03
Added buttons to in/decrease group order article results.
2009-03-20 20:37:13 +01:00
a5349191b7
Small hack to make button "+" and "-" to be same size.
...
* It would be better to put a specific class for de/increase buttons.
* Right now just adding min-width to input globally in CSS.
2009-03-20 20:37:13 +01:00
8fbce954e3
Correct 'brutto'-price to be price.gross not fc_price.
...
* We want to be more consistent in the use of diffrent price types:
* netto, brutto, fc_price
2009-03-20 20:28:44 +01:00
2c52944956
Fixed buggy link in finance/balancing/new.html.haml
...
* Link to "Rechnung anlegen" did not send supplier id.
2009-03-20 16:32:47 +01:00
192fbd4662
Removed auto-created fixtures in stock_takings.yml
2009-03-20 16:00:42 +01:00
da08365816
Fixed bug order.profit calculation.
...
Order.profit will also be saved, when order is closed.
2009-03-17 19:43:41 +01:00
843e4a7233
Added ability to send private messages.
2009-03-17 18:28:09 +01:00
e4c394d881
New foodcoop configuration option. Use own mailinglist instead of messaging system.
2009-03-17 18:13:00 +01:00
312e51e8dc
Fixed bug in group_order.price updates, when finishing an order.
2009-03-17 10:47:00 +01:00
1791243b25
Fixed bug when distuingish between finished and closed orders.
2009-03-13 00:06:20 +01:00
20d4177990
Added net|gross sum for deliveries-show-page. ( Fixed #193 )
2009-03-11 18:03:28 +01:00
35251576fa
Fixed failures in show-view of StockOrders. ( #195 )
2009-03-11 17:08:12 +01:00
714197eea1
Made order-finish-confirm-message consistently. Fixed #196
2009-03-11 17:00:51 +01:00
ce2156d75f
Send order-finish-notifications in background.
2009-03-11 16:58:31 +01:00
37c9e2aeaf
Fixed wrong price value of GroupOrder when finishing an order.
2009-03-11 16:34:36 +01:00
dd940fb414
Send messages directly instead of using controller filter. Litte improvements to the messages lists.
2009-03-09 13:02:43 +01:00
de4f1d573b
Fixed bug in order_result-message.
2009-03-09 00:10:43 +01:00
d680885660
Fixed bugs in message system.
2009-03-06 20:08:11 +01:00
a30444a602
Fixed bug in messaging system. Moved navigation 'messages' to 'foodcoop' tab.
2009-03-06 19:38:06 +01:00
a29053b4e9
Some language fixes. Finished migration path.
2009-03-01 18:45:34 +01:00
857475af1b
Revert "First parts of new 'web-app-theme'." This is fun stuff and should be managed in another branch.
...
This reverts commit c04819e8c4
2009-02-18 12:01:51 +01:00
c04819e8c4
First parts of new 'web-app-theme'.
2009-02-18 11:41:03 +01:00
3ea8d5a2ef
Refactoring of message system.
2009-02-18 01:06:35 +01:00
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38:41 +01:00
951d19db6a
Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views!
2009-02-12 18:32:20 +01:00
2bb4cdb9d6
Fixed bug in ordering page.
2009-02-12 14:35:29 +01:00
8cb8701c60
Fixed bug in commenting orders.
2009-02-12 14:30:25 +01:00
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
2009-02-11 18:09:04 +01:00
Benjamin Meichsner
sandoz
sandoz