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

Merge remote-tracking branch 'origin/rails3'

Browse source 
Conflicts:
	Gemfile
	Gemfile.lock
This commit is contained in:
Manuel Wiedenmann 2013-06-10 01:53:31 +02:00
commit 7a63394dac
6 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/deliveries_helper.rb
View file

@ -11,7 +11,7 @@ module DeliveriesHelper
end
def stock_articles_for_select(supplier)
supplier.stock_articles.undeleted.map {|a| ["#{a.name} (#{number_to_currency a.price}/#{a.unit})", a.id] }
supplier.stock_articles.undeleted.reorder('articles.name ASC').map {|a| ["#{a.name} (#{number_to_currency a.price}/#{a.unit})", a.id] }
end
end