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/stockit/_form.html.haml
+++ b/app/views/stockit/_form.html.haml
@ -6,7 +6,9 @@

  - 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('.form.price_hint')