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

order articles by number then name in fax+receive

Browse source 
This makes it easier to enter the receive screen from an order pdf print
with received amounts.

Conflicts:
	app/documents/order_fax.rb
This commit is contained in:
wvengen 2014-08-18 10:56:03 +02:00
parent fd8b9ac19d
commit e61c3c9267
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/documents/order_fax.rb
View file

@ -58,7 +58,7 @@ class OrderFax < OrderPdf
# Articles
total = 0
data = [I18n.t('documents.order_fax.rows')]
data += @order.order_articles.ordered.includes(:article).collect do |a|
data += @order.order_articles.ordered.includes(:article).order('articles.order_number, articles.name').collect do |a|
subtotal = a.units_to_order * a.price.unit_quantity * a.price.price
total += subtotal
[a.article.order_number,