foodsoft/app/views/finance/order_articles
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.html.haml Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
_new.html.haml finish finance/order_articles i18n + en translation 2013-03-08 23:35:50 +01:00
create.js.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
destroy.js.haml Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
edit.js.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
new.js.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
update.js.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00