Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views/finance/balancing
History
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
..
_edit_note.html.haml i18n finance + controller 2013-02-10 15:05:31 +07:00
_edit_results_by_articles.html.haml i18n finance + controller 2013-02-10 15:05:31 +07:00
_group_order_articles.html.haml Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
_invoice.html.haml i18n finance + controller 2013-02-10 15:05:31 +07:00
_order_article.html.haml i18n finance + controller 2013-02-10 15:05:31 +07:00
_order_article_result.html.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
_orders.html.haml i18n finance + controller 2013-02-10 15:05:31 +07:00
_summary.haml Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
confirm.html.haml i18n finance + controller 2013-02-10 15:05:31 +07:00
edit_note.js.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
index.html.haml i18n finance + controller 2013-02-10 15:05:31 +07:00
index.js.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
new.html.haml Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
new.js.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
update_note.js.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
update_summary.js.haml Balancing: Do not update oder summary automaticly when changing group orders. 2013-03-17 15:47:50 +01:00