Merge latest changes in master

2013-06-17 15:47:08 +02:00 · 2013-06-17 15:47:08 +02:00 · 9502ca28dd
commit 9502ca28dd
parent a9938df443 f47237ebe0
11 changed files with 220 additions and 202 deletions
--- a/app/views/deliveries/_stock_article_form.html.haml
+++ b/app/views/deliveries/_stock_article_form.html.haml
@ -12,7 +12,9 @@
    = f.input :note
    - if stock_article.new_record?
      = f.input :price
-      = f.input :tax
+      = f.input :tax, :wrapper => :append do
+        = f.input_field :tax
+        %span.add-on %
      = f.input :deposit
    - else
      = f.input :price, :input_html => {:disabled => 'disabled'}, :hint => t('stockit.form.price_hint')