Merge branch 'master' into stock_article_quantity_history

2013-07-11 19:23:52 +02:00 · 2013-07-11 19:23:52 +02:00 · 620686fa46
commit 620686fa46
parent 54afbb7af5 2ef7e58b0b
4 changed files with 12 additions and 2 deletions
--- a/app/views/group_orders/_form.html.haml
+++ b/app/views/group_orders/_form.html.haml
@ -4,6 +4,7 @@
      #{data_to_js(@ordering_data)}
      setGroupBalance(#{@ordering_data[:available_funds]});
      setCurrencyFormat("#{t('number.currency.format.separator')}", #{t('number.currency.format.precision')}, "#{t('number.currency.format.unit')}");
+      setMinimumBalance(#{FoodsoftConfig[:minimum_balance] or 0});
      setToleranceBehaviour(#{FoodsoftConfig[:tolerance_is_costly]});
      setStockit(#{@order.stockit?});
    });