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

Merge price columns in receive form into one

Browse source 
Conflicts:
	app/views/orders/_edit_amount.html.haml
This commit is contained in:
Julius 2014-01-02 21:59:08 +01:00 • committed by wvengen
parent 0af8a065a1
commit f230d39055
3 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/orders/_edit_amount.html.haml
View file

@ -7,7 +7,9 @@
%td= order_article.article.order_number
%td.name{title: order_title.join("\n")}= order_article.article.name
%td.unit= order_article.article.unit
%td.article_price= number_to_currency order_article.article.price
%td.article_price
= number_to_currency order_article.article.price
= article_price_change_hint(order_article)
%td #{order_article.quantity} + #{order_article.tolerance}
%td
= order_article.units_to_order
@ -16,7 +18,7 @@
- unless order_article.units_billed.nil?
= order_article.units_billed
= pkg_helper order_article.article
%td
%td.units_received_cell
= receive_input_field(form)
= pkg_helper order_article.article_price, false
- if order_article.result_manually_changed?