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

Resolve merge conflicts

Browse source
This commit is contained in:
Julius Rapp 2013-12-07 11:50:37 +01:00
commit 11117738ce
9 changed files with 126 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/stockit/_stock_article.html.haml
View file

@ -1,7 +1,7 @@
%tr{:class => stock_article_classes(stock_article), :id => "stockArticle-#{stock_article.id}"}
%td= link_to stock_article.name, stock_article
%td= stock_article.quantity
%td= stock_article.quantity - stock_article.quantity_available
%td= stock_article.quantity_ordered
%th= stock_article.quantity_available
%td= stock_article.unit
%td= stock_article.price