Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
2,406 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

10 Commits

Author SHA1 Message Date
wvengen 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
Benjamin Meichsner c05b3e0e19 Balancing: Do not update oder summary automaticly when changing group orders. 2013-03-17 15:47:50 +01:00
Manuel Wiedenmann 8be93c33f8 i18n finance + controller 2013-02-10 15:05:31 +07:00
benni 0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +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 1912a3fd80 First part of stock-integratino. Orders with supplier_id == 0 become stockorders. 2009-02-05 16:40:02 +01:00
Benjamin Meichsner 6fd5d825f9 Order-refactoring part II. 2009-02-03 21:14:48 +01:00
Benjamin Meichsner 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
Benjamin Meichsner 9eb2125f15 Complete refactoring of orders-workflow. 
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
 2009-01-29 01:57:51 +01:00
Benjamin Meichsner 47398c6a70 Moved balancing logic into new namespace 'finance'. 2009-01-10 22:22:16 +01:00
Renamed from app/views/finance/_summary.haml (Browse further)