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

Resolve merge conflicts with i18n

This commit is contained in:
Julius 2013-06-10 20:05:47 +02:00
parent ad29a238f2 b7416b2210
commit 9753e6db00
6 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/articles/_edit_all_table.html.haml
View File

@ -28,7 +28,9 @@
%td= form.text_field 'note', class: 'input-medium'
%td= form.collection_select 'article_category_id', ArticleCategory.all,
:id, :name, { :include_blank => true }, class: 'input-small'
%td= form.text_field 'tax', class: 'input-mini'
%td.input-append
= form.text_field 'tax', class: 'input-mini'
%span.add-on %
%td= form.text_field 'deposit', class: 'input-mini'
- unless article.errors.empty?
%tr.alert

4
app/views/articles/_form.html.haml
View File

@ -16,7 +16,9 @@
= f.input :price
= f.input :unit_quantity
= f.input :order_number
= f.input :tax
= f.input :tax, :wrapper => :append do
= f.input_field :tax
%span.add-on %
= f.input :deposit
.modal-footer
= link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}

4
app/views/articles/sync.html.haml
View File

@ -60,7 +60,9 @@
%td{:style => highlight_new(attrs, :unit)}= form.text_field 'unit', class: 'input-mini'
%td{:style => highlight_new(attrs, :unit_quantity)}= form.text_field 'unit_quantity', class: 'input-mini'
%td{:style => highlight_new(attrs, :price)}= form.text_field 'price', class: 'input-mini'
%td{:style => highlight_new(attrs, :tax)}= form.text_field 'tax', class: 'input-mini'
%td{:style => highlight_new(attrs, :tax), class: 'input-append'}
= form.text_field 'tax', class: 'input-mini'
%span.add-on %
%td{:style => highlight_new(attrs, :deposit)}= form.text_field 'deposit', class: 'input-mini'
%td= form.select :article_category_id, ArticleCategory.all.map {|a| [ a.name, a.id ] },
{include_blank: true}, class: 'input-small'

7
app/views/deliveries/_stock_article_form.html.haml
View File

@ -5,7 +5,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 class: 'btn'
= f.submit class: 'btn'

7
app/views/stock_takings/_stock_article_form.html.haml
View File

@ -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

4
app/views/stockit/_form.html.haml
View File

@ -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')