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

Fixed failures in show-view of StockOrders. (#195)

Browse source
This commit is contained in:
Benjamin Meichsner 2009-03-11 17:08:12 +01:00
parent 714197eea1
commit 35251576fa
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/views/orders/_articles.html.haml
View file

@ -4,7 +4,8 @@
%th Gebinde %th Gebinde
%th Netto-/Bruttopreis %th Netto-/Bruttopreis
%th Bestellte Einheiten %th Bestellte Einheiten
%th Volle Gebinde - unless order.stockit?
%th Volle Gebinde
- total_net, total_gross, counter = 0, 0, 0 - total_net, total_gross, counter = 0, 0, 0
- order.articles_grouped_by_category.each do |category_name, order_articles| - order.articles_grouped_by_category.each do |category_name, order_articles|
%tr{:style => "background-color:#EFEFEF"} %tr{:style => "background-color:#EFEFEF"}
@ -21,8 +22,11 @@
%td=h order_article.article.name %td=h order_article.article.name
%td= "#{unit_quantity} x #{order_article.article.unit}" %td= "#{unit_quantity} x #{order_article.article.unit}"
%td= "#{number_to_currency(net_price)} / #{number_to_currency(gross_price)}" %td= "#{number_to_currency(net_price)} / #{number_to_currency(gross_price)}"
%td= "#{order_article.quantity} + #{order_article.tolerance}" if unit_quantity > 1 - if order.stockit?
%td= units %td= units
- else
%td= "#{order_article.quantity} + #{order_article.tolerance}" if unit_quantity > 1
%td= units
%p %p
Summe (Netto/Brutto-Preise): Summe (Netto/Brutto-Preise):
= "#{number_to_currency(total_net)} / #{number_to_currency(total_gross)}" = "#{number_to_currency(total_net)} / #{number_to_currency(total_gross)}"