Resolve merge conflicts with i18n

2013-06-10 20:05:47 +02:00 · 2013-06-10 20:05:47 +02:00 · 9753e6db00
commit 9753e6db00
parent ad29a238f2 b7416b2210
6 changed files with 22 additions and 8 deletions
--- a/app/views/stock_takings/_stock_article_form.html.haml
+++ b/app/views/stock_takings/_stock_article_form.html.haml
@ -4,7 +4,10 @@
  = f.input :unit
  = f.input :note
  = f.input :price
-  = f.input :tax
+  = f.input :tax, :wrapper => :append do
+    = f.input_field :tax
+    %span.add-on %
+    -# untested, because this view is currently not included (?)
  = f.input :deposit
  = f.association :article_category
-  = f.submit
+  = f.submit