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

Merge remote-tracking branch 'bennibu/rails3' into rails3

Browse source 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
This commit is contained in:
wvengen 2013-03-21 22:08:09 +01:00
commit 7af796c09c
47 changed files with 325 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/home/_apple_bar.html.haml
View file

@ -5,4 +5,5 @@
%span.description
= t '.desc', amount: number_to_currency(apple_bar.mean_order_amount_per_job, :precision=>0)
- if FoodsoftConfig[:stop_ordering_under].present?
%strong= t '.warning', threshold: FoodsoftConfig[:stop_ordering_under]
%strong= t('.warning', threshold: FoodsoftConfig[:stop_ordering_under])
= link_to t('.more_info'), FoodsoftConfig[:applepear_url], target: '_blank'