7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
6196bdae41
Added some eager loading for balancing new.
2013-03-12 12:38:08 +01:00
8be93c33f8
i18n finance + controller
2013-02-10 15:05:31 +07:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
6bd4bbec86
Deactivated broken links in balancing.
2012-05-12 11:18:46 +02:00
578002501b
Hide ordergroups with result = 0.
2009-04-03 18:01:19 +02: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
6da9190b03
Added buttons to in/decrease group order article results.
2009-03-20 20:37:13 +01:00
c17b63b192
Second part of stock-integration.
...
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
2009-02-06 16:26:35 +01:00
251ced4fa1
Introduced group_order_article.result to save the result for each group/article.
2009-02-04 16:41:01 +01:00
190a777278
Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing.
2009-01-29 21:28:22 +01:00
wvengen
Benjamin Meichsner
Manuel Wiedenmann
Benjamin Meichsner
sandoz