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/controllers/orders_controller.rb
View file

@ -114,7 +114,7 @@ class OrdersController < ApplicationController
def receive
@order = Order.find(params[:id])
unless request.post?
@order_articles = @order.order_articles.ordered.includes(:article)
@order_articles = @order.order_articles.ordered.includes(:article).order('articles.order_number, articles.name')
else
s = update_order_amounts
flash[:notice] = (s ? I18n.t('orders.receive.notice', :msg => s) : I18n.t('orders.receive.notice_none'))