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

17 Commits

Author SHA1 Message Date
wvengen 37e5b0c25c add balancing integration spec 2013-07-26 18:34:03 +02:00
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 6196bdae41 Added some eager loading for balancing new. 2013-03-12 12:38:08 +01:00
Manuel Wiedenmann 8be93c33f8 i18n finance + controller 2013-02-10 15:05:31 +07:00
benni f4f10b1e4c Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
benni 0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
benni af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
benni 6bd4bbec86 Deactivated broken links in balancing. 2012-05-12 11:18:46 +02:00
benni c49edb79a2 Fixed edit_not in balancing. 2012-05-12 10:55:20 +02:00
sandoz 305a4ac895 Don't show action "Create invoice" for stock order 2009-10-05 13:36:57 +02:00
sandoz f7e24d26b4 Better layout with equal distance from each sides. 
* Added css class middle_column
 2009-08-21 23:37:05 +02: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
Benjamin Meichsner 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
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 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/editOrder.haml (Browse further)