Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1394 commits 22 branches 1 tag 31 MiB
Commit graph

1394 commits

This branch
This branch
All branches
Author SHA1 Message Date
sandoz
8171d3d173 Translation in foodcoop/_users.html.haml 
* Transalated 'Nick' to 'Benutzername'
 2009-03-22 14:16:53 +01:00
sandoz
fea8c0993b Translation in profile.html.erb 
* Translated "cancal membership" and warning.
 2009-03-22 14:16:53 +01:00
sandoz
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
sandoz
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
sandoz
ceec784e62 Translation in profile.html.erb 
* Renamed "Nickname" to "Benutzername"
* Removed also '#' in end of line.
 2009-03-22 14:16:52 +01:00
sandoz
92e2bdd187 Renamed 'Help' to 'Hilfe' in top loginInfo bar 2009-03-22 14:16:52 +01:00
sandoz
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
sandoz
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
sandoz
2e490d1a52 Capitalized first letter of 'netto' and 'brutto' in Captions. 2009-03-22 14:16:52 +01:00
sandoz
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
sandoz
891fc74d91 Merge branch 'master' of git://github.com/bennibu/foodsoft 2009-03-22 10:56:58 +01:00
sandoz
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
sandoz
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
sandoz
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
sandoz
f655272448 Removed auto-created fixtures in stock_takings.yml 
Signed-off-by: bennibu <benni@dresdener27.de>
 2009-03-21 05:38:55 +08:00
sandoz
6da9190b03 Added buttons to in/decrease group order article results. 2009-03-20 20:37:13 +01:00
sandoz
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
sandoz
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
sandoz
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
sandoz
192fbd4662 Removed auto-created fixtures in stock_takings.yml 2009-03-20 16:00:42 +01:00
Benjamin Meichsner
da08365816 Fixed bug order.profit calculation. 
Order.profit will also be saved, when order is closed.
 2009-03-17 19:43:41 +01:00
Benjamin Meichsner
843e4a7233 Added ability to send private messages. 2009-03-17 18:28:09 +01:00
Benjamin Meichsner
e4c394d881 New foodcoop configuration option. Use own mailinglist instead of messaging system. 2009-03-17 18:13:00 +01:00
Benjamin Meichsner
312e51e8dc Fixed bug in group_order.price updates, when finishing an order. 2009-03-17 10:47:00 +01:00
Benjamin Meichsner
1791243b25 Fixed bug when distuingish between finished and closed orders. 2009-03-13 00:06:20 +01:00
Benjamin Meichsner
20d4177990 Added net|gross sum for deliveries-show-page. (Fixed #193) 2009-03-11 18:03:28 +01:00
Benjamin Meichsner
35251576fa Fixed failures in show-view of StockOrders. (#195) 2009-03-11 17:08:12 +01:00
Benjamin Meichsner
714197eea1 Made order-finish-confirm-message consistently. Fixed #196 2009-03-11 17:00:51 +01:00
Benjamin Meichsner
ce2156d75f Send order-finish-notifications in background. 2009-03-11 16:58:31 +01:00
Benjamin Meichsner
37c9e2aeaf Fixed wrong price value of GroupOrder when finishing an order. 2009-03-11 16:34:36 +01:00
Benjamin Meichsner
dd940fb414 Send messages directly instead of using controller filter. Litte improvements to the messages lists. 2009-03-09 13:02:43 +01:00
Benjamin Meichsner
de4f1d573b Fixed bug in order_result-message. 2009-03-09 00:10:43 +01:00
Benjamin Meichsner
d680885660 Fixed bugs in message system. 2009-03-06 20:08:11 +01:00
Benjamin Meichsner
a30444a602 Fixed bug in messaging system. Moved navigation 'messages' to 'foodcoop' tab. 2009-03-06 19:38:06 +01:00
Benjamin Meichsner
a29053b4e9 Some language fixes. Finished migration path. 2009-03-01 18:45:34 +01:00
Benjamin Meichsner
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
Benjamin Meichsner
c04819e8c4 First parts of new 'web-app-theme'. 2009-02-18 11:41:03 +01:00
Benjamin Meichsner
3ea8d5a2ef Refactoring of message system. 2009-02-18 01:06:35 +01:00
Benjamin Meichsner
a0e10141dc Translations and other little improvements. 2009-02-12 21:38:41 +01:00
Benjamin Meichsner
951d19db6a Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views! 2009-02-12 18:32:20 +01:00
Benjamin Meichsner
2bb4cdb9d6 Fixed bug in ordering page. 2009-02-12 14:35:29 +01:00
Benjamin Meichsner
8cb8701c60 Fixed bug in commenting orders. 2009-02-12 14:30:25 +01:00
Benjamin Meichsner
86b2b28dc9 Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices. 2009-02-11 18:09:04 +01:00
Benjamin Meichsner
325d47b22f Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'. 2009-02-11 15:23:59 +01:00
Benjamin Meichsner
cd9636a650 Improved the creation/updating of deliveries. 2009-02-10 20:06:08 +01:00
Benjamin Meichsner
67743cd014 Implement notification for upcoming tasks via a daily fired rake-task. 2009-02-10 15:07:47 +01:00
Benjamin Meichsner
053593f718 Translations for articles-pages. 2009-02-10 13:26:10 +01:00
Benjamin Meichsner
6202e05841 Last part of order refactoring. Now order_article create/update is possible. 2009-02-09 20:12:56 +01:00
Benjamin Meichsner
4d796b8e73 Since there are StockArticles for each supplier, the StockArticles has 
to be excluded in normal articles-view.
 2009-02-07 15:19:07 +01:00
Benjamin Meichsner
24b66ee8d4 Small bugfix in shared view. Translations on start-page. 2009-02-06 21:18:20 +01:00