fix invoice description

This commit is contained in:
Georg Kahest 2016-08-31 14:33:41 +03:00
parent 1357e17a47
commit 52cf53343c
3 changed files with 13 additions and 11 deletions

View file

@ -112,10 +112,6 @@ class Invoice < ActiveRecord::Base
kit.to_pdf kit.to_pdf
end end
def description
"Order nr. #{number}"
end
def pdf_name def pdf_name
"invoice-#{number}.pdf" "invoice-#{number}.pdf"
end end

View file

@ -25,9 +25,12 @@
%dt= t(:payment_term) %dt= t(:payment_term)
%dd= t(@invoice.payment_term) %dd= t(@invoice.payment_term)
%dt= t(:description) %dt= t(:"invoice no")
- @invoice.description.prepend(' - ') if @invoice.description.present? %dd= @invoice.number
%dd= "#{t('invoice_no', no: @invoice.number)}#{@invoice.description}"
- if @invoice.description.present?
%dt= t(:description)
%dd=@invoice.description
%dt= t(:reference_no) %dt= t(:reference_no)
%dd= @invoice.reference_no %dd= @invoice.reference_no

View file

@ -175,9 +175,12 @@
%dt= t(:payment_term) %dt= t(:payment_term)
%dd= t(@invoice.payment_term) %dd= t(@invoice.payment_term)
%dt= t(:description) %dt= t(:"invoice no")
- @invoice.description.prepend(' - ') if @invoice.description.present? %dd= @invoice.number
%dd= "#{t('invoice_no', no: @invoice.number)}#{@invoice.description}"
- if @invoice.description.present?
%dt= t(:description)
%dd=@invoice.description
%dt= t(:reference_no) %dt= t(:reference_no)
%dd= @invoice.reference_no %dd= @invoice.reference_no