Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views/stock_takings
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
..
_stock_article_form.html.haml Fixed stockit. 2012-10-29 18:28:17 +01:00
_stock_change.html.haml Prevent article names from being truncated in StockTaking form 2013-03-14 22:30:22 +01:00
_stock_takings.html.haml finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00
edit.html.haml finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00
index.html.haml finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00
index.js.haml Fixed stockit. 2012-10-29 18:28:17 +01:00
new.html.haml finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00
show.html.haml finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00