finish finance invoice i18n and en translation
This commit is contained in:
parent
d3d4bf1e2b
commit
2b03a15a9a
10 changed files with 86 additions and 34 deletions
|
@ -3,9 +3,9 @@
|
||||||
= f.hidden_field :order_id
|
= f.hidden_field :order_id
|
||||||
|
|
||||||
- if @invoice.delivery
|
- if @invoice.delivery
|
||||||
%p Diese Rechnung ist mit einer #{link_to("Lieferung", [@invoice.supplier,@invoice.delivery])} verknüpft.
|
%p= t '.linked', what_link: link_to(t('.delivery'), [@invoice.supplier,@invoice.delivery])
|
||||||
- if @invoice.order
|
- if @invoice.order
|
||||||
%p Diese Rechnung ist mit einer #{link_to("Bestellung", @invoice.order)} verknüpft.
|
%p= t '.linked', what_link: link_to(t('.order'), @invoice.order)
|
||||||
|
|
||||||
= f.association :supplier, hint: false
|
= f.association :supplier, hint: false
|
||||||
= f.input :number
|
= f.input :number
|
||||||
|
@ -17,4 +17,4 @@
|
||||||
= f.input :note
|
= f.input :note
|
||||||
.form-actions
|
.form-actions
|
||||||
= f.submit class: 'btn'
|
= f.submit class: 'btn'
|
||||||
= link_to "oder abbrechen", :back
|
= link_to t('.or_cancel'), :back
|
||||||
|
|
|
@ -5,14 +5,14 @@
|
||||||
%table.table.table-striped
|
%table.table.table-striped
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th Nummer
|
%th= t 'simple_form.labels.invoice.number'
|
||||||
%th Lieferantin
|
%th= t 'simple_form.labels.invoice.supplier'
|
||||||
%th Datum
|
%th= t 'simple_form.labels.invoice.date'
|
||||||
%th Bezahlt am
|
%th= t 'simple_form.labels.invoice.paid_on'
|
||||||
%th Betrag
|
%th= t 'simple_form.labels.invoice.amount'
|
||||||
%th Lieferung
|
%th= t 'simple_form.labels.invoice.delivery'
|
||||||
%th Bestellung
|
%th= t 'simple_form.labels.invoice.order'
|
||||||
%th Note
|
%th= t 'simple_form.labels.invoice.note'
|
||||||
%th
|
%th
|
||||||
%th
|
%th
|
||||||
%tbody
|
%tbody
|
||||||
|
@ -23,9 +23,9 @@
|
||||||
%td= format_date invoice.date
|
%td= format_date invoice.date
|
||||||
%td= format_date invoice.paid_on
|
%td= format_date invoice.paid_on
|
||||||
%td= number_to_currency invoice.amount
|
%td= number_to_currency invoice.amount
|
||||||
%td= link_to "Lieferung", [invoice.supplier,invoice.delivery] if invoice.delivery
|
%td= link_to t('.delivery'), [invoice.supplier,invoice.delivery] if invoice.delivery
|
||||||
%td= link_to format_date(invoice.order.ends), new_finance_order_path(order_id: invoice.order_id) if invoice.order
|
%td= link_to format_date(invoice.order.ends), new_finance_order_path(order_id: invoice.order_id) if invoice.order
|
||||||
%td= truncate(invoice.note)
|
%td= truncate(invoice.note)
|
||||||
%td= link_to "Bearbeiten", edit_finance_invoice_path(invoice), class: 'btn btn-mini'
|
%td= link_to t('ui.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'
|
||||||
%td= link_to "Löschen", finance_invoice_path(invoice), :confirm => 'Are you sure?', :method => :delete,
|
%td= link_to t('ui.delete'), finance_invoice_path(invoice), :confirm => t('.confirm_delete'), :method => :delete,
|
||||||
class: 'btn btn-danger btn-mini'
|
class: 'btn btn-danger btn-mini'
|
|
@ -1,2 +1,2 @@
|
||||||
- title "Rechnung bearbeiten"
|
- title t('.title')
|
||||||
= render :partial => 'form'
|
= render :partial => 'form'
|
|
@ -1,6 +1,6 @@
|
||||||
- title "Rechnungen"
|
- title t('.title')
|
||||||
|
|
||||||
- content_for :actionbar do
|
- content_for :actionbar do
|
||||||
= link_to 'Neue Rechnung anlegen', new_finance_invoice_path, class: 'btn btn-primary'
|
= link_to t('.action_new'), new_finance_invoice_path, class: 'btn btn-primary'
|
||||||
|
|
||||||
#invoicesTable= render 'invoices'
|
#invoicesTable= render 'invoices'
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
- title "Neue Rechnung anlegen"
|
- title t('.title')
|
||||||
= render :partial => 'form'
|
= render :partial => 'form'
|
||||||
= link_to 'Zurück', finance_invoices_path
|
= link_to t('.back'), finance_invoices_path
|
||||||
|
|
|
@ -1,34 +1,34 @@
|
||||||
- title "Rechnung #{@invoice.number}"
|
- title t('.title', number: @invoice.number)
|
||||||
|
|
||||||
%p
|
%p
|
||||||
%b Lieferantin:
|
%b= t 'simple_form.labels.invoice.supplier'
|
||||||
= @invoice.supplier.name
|
= @invoice.supplier.name
|
||||||
- if @invoice.delivery
|
- if @invoice.delivery
|
||||||
%p
|
%p
|
||||||
%b Lieferung:
|
%b= t('simple_form.labels.invoice.delivery') + ':'
|
||||||
Diese Rechnung ist mit einer #{link_to "Lieferung", [@invoice.supplier,@invoice.delivery]} verknüpft.
|
= t '.linked', what_link: link_to(t('.delivery'), [@invoice.supplier,@invoice.delivery])
|
||||||
%p
|
%p
|
||||||
%b Rechnungsnummer:
|
%b= t('simple_form.labels.invoice.number') + ':'
|
||||||
= @invoice.number
|
= @invoice.number
|
||||||
%p
|
%p
|
||||||
%b Datum:
|
%b= t('simple_form.labels.invoice.date') + ':'
|
||||||
= @invoice.date
|
= @invoice.date
|
||||||
%p
|
%p
|
||||||
%b Bezahlt am:
|
%b= t('simple_form.labels.invoice.paid_on') + ':'
|
||||||
= @invoice.paid_on
|
= @invoice.paid_on
|
||||||
%p
|
%p
|
||||||
%b Rechnungsbetrag:
|
%b= t('simple_form.labels.invoice.amount') + ':'
|
||||||
= number_to_currency @invoice.amount
|
= number_to_currency @invoice.amount
|
||||||
%p
|
%p
|
||||||
%b Pfand berechnet:
|
%b= t('simple_form.labels.invoice.deposit') + ':'
|
||||||
= number_to_currency @invoice.deposit
|
= number_to_currency @invoice.deposit
|
||||||
%p
|
%p
|
||||||
%b Pfand gutgeschrieben:
|
%b= t('simple_form.labels.invoice.deposit_credit') + ':'
|
||||||
= number_to_currency @invoice.deposit_credit
|
= number_to_currency @invoice.deposit_credit
|
||||||
%p
|
%p
|
||||||
%b Notiz:
|
%b= t('simple_form.labels.invoice.note') + ':'
|
||||||
=h @invoice.note
|
=h @invoice.note
|
||||||
|
|
||||||
= link_to "Bearbeiten", edit_finance_invoice_path(@invoice)
|
= link_to t('ui.edit'), edit_finance_invoice_path(@invoice)
|
||||||
|
|
|
|
||||||
= link_to "Zurück", finance_invoices_path
|
= link_to t('.back'), finance_invoices_path
|
||||||
|
|
|
@ -144,6 +144,28 @@ de:
|
||||||
title: "Konten verwalten"
|
title: "Konten verwalten"
|
||||||
new_transaction: "Neue Überweisungen eingeben"
|
new_transaction: "Neue Überweisungen eingeben"
|
||||||
search_placeholder: 'Suchen ...'
|
search_placeholder: 'Suchen ...'
|
||||||
|
invoices:
|
||||||
|
edit:
|
||||||
|
title: "Rechnung bearbeiten"
|
||||||
|
form:
|
||||||
|
linked: "Diese Rechnung ist mit einer %{what_link} verknüpft."
|
||||||
|
delivery: "Lieferung"
|
||||||
|
order: "Bestellung"
|
||||||
|
or_cancel: "oder abbrechen"
|
||||||
|
index:
|
||||||
|
title: "Rechnungen"
|
||||||
|
action_new: "Neue Rechnung anlegen"
|
||||||
|
invoices:
|
||||||
|
delivery: "Lieferung"
|
||||||
|
confirm_delete: "Bist Du sicher?"
|
||||||
|
new:
|
||||||
|
title: "Neue Rechnung anlegen"
|
||||||
|
back: "Züruck"
|
||||||
|
show:
|
||||||
|
title: "Rechnung %{number}"
|
||||||
|
linked: "Diese Rechnung ist mit einer %{what_link} verknüpft."
|
||||||
|
delivery: "Lieferung"
|
||||||
|
back: "Züruck"
|
||||||
|
|
||||||
# used by controller
|
# used by controller
|
||||||
create:
|
create:
|
||||||
|
|
|
@ -118,6 +118,10 @@ de:
|
||||||
paid_on: Bezahlt am
|
paid_on: Bezahlt am
|
||||||
deposit: Pfand berechnet
|
deposit: Pfand berechnet
|
||||||
deposit_credit: Pfand gutgeschrieben
|
deposit_credit: Pfand gutgeschrieben
|
||||||
|
amount: Betrag
|
||||||
|
delivery: Lieferung
|
||||||
|
order: Bestellung
|
||||||
|
note: Notiz
|
||||||
order_article:
|
order_article:
|
||||||
units_to_order: Menge
|
units_to_order: Menge
|
||||||
update_current_price: Globalen Preis aktualisieren
|
update_current_price: Globalen Preis aktualisieren
|
||||||
|
|
|
@ -144,6 +144,28 @@ en:
|
||||||
title: "Manage accounts"
|
title: "Manage accounts"
|
||||||
new_transaction: "Add new transactions"
|
new_transaction: "Add new transactions"
|
||||||
search_placeholder: 'Search ..'
|
search_placeholder: 'Search ..'
|
||||||
|
invoices:
|
||||||
|
edit:
|
||||||
|
title: "Edit invoice"
|
||||||
|
form:
|
||||||
|
linked: "This invoice is linked to a %{what_link}."
|
||||||
|
delivery: "delivery"
|
||||||
|
order: "order"
|
||||||
|
or_cancel: "or cancel"
|
||||||
|
index:
|
||||||
|
title: "Invoices"
|
||||||
|
action_new: "Create new invoice"
|
||||||
|
invoices:
|
||||||
|
delivery: "Delivery"
|
||||||
|
confirm_delete: "Are you sure?"
|
||||||
|
new:
|
||||||
|
title: "Create new invoice"
|
||||||
|
back: "Back"
|
||||||
|
show:
|
||||||
|
title: "Invoice %{number}"
|
||||||
|
linked: "This invoice is linked to a %{what_link}."
|
||||||
|
delivery: "delivery"
|
||||||
|
back: "Back"
|
||||||
|
|
||||||
# used by controller
|
# used by controller
|
||||||
create:
|
create:
|
||||||
|
|
|
@ -118,6 +118,10 @@ en:
|
||||||
paid_on: Paid on
|
paid_on: Paid on
|
||||||
deposit: Charge deposit
|
deposit: Charge deposit
|
||||||
deposit_credit: Credit deposit
|
deposit_credit: Credit deposit
|
||||||
|
amount: Amount
|
||||||
|
delivery: Delivery
|
||||||
|
order: Order
|
||||||
|
note: Note
|
||||||
order_article:
|
order_article:
|
||||||
units_to_order: Amount of units
|
units_to_order: Amount of units
|
||||||
update_current_price: Globally update current price
|
update_current_price: Globally update current price
|
||||||
|
|
Loading…
Reference in a new issue