Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'bennibu/rails3' into rails3

Browse source 
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
This commit is contained in:
wvengen 2013-03-21 22:08:09 +01:00
commit 7af796c09c
47 changed files with 325 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/suppliers/index.haml
View file

@ -18,8 +18,8 @@
%td= link_to h(supplier.name) , supplier
%td= supplier.phone
%td= supplier.customer_number
%td= link_to t('.articles', count: supplier.articles.count), supplier_articles_path(supplier)
%td= link_to t('.stock', count: supplier.stock_articles.count), stock_articles_path
%td= link_to t('.articles', count: supplier.articles.undeleted.count), supplier_articles_path(supplier)
%td= link_to t('.stock', count: supplier.stock_articles.undeleted.count), stock_articles_path
%td= link_to t('.deliveries', count: supplier.deliveries.count), supplier_deliveries_path(supplier)
%td
= link_to t('ui.edit'), edit_supplier_path(supplier), class: 'btn btn-mini'