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

Merge remote-tracking branch 'foodcoops/master' into feature-receive

Browse source
This commit is contained in:
wvengen 2014-01-02 18:57:59 +01:00
commit 27a73be68f
16 changed files with 87 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/finance/invoices/_form.html.haml
View file

@ -5,7 +5,7 @@
- if @invoice.delivery
%p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_delivery'), [@invoice.supplier,@invoice.delivery])).html_safe
- if @invoice.order
%p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_order'), @invoice.order)).html_safe
%p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_order'), new_finance_order_path(order_id: @invoice.order.id))).html_safe
= f.association :supplier, hint: false
= f.input :number