diff --git a/modules/account_invoice/invoice_melya.fodt b/modules/account_invoice/invoice_melya.fodt index db22084..57196b2 100644 --- a/modules/account_invoice/invoice_melya.fodt +++ b/modules/account_invoice/invoice_melya.fodt @@ -382,6 +382,19 @@ + + + + + + + + + + + + + @@ -626,8 +639,18 @@ - - + + + VAT NR. – NOT SUBJECT TO VAT IN SWITZERLAND + We certify this invoice authentic and definitivePage 1/1 + + + + + VAT NR. – NOT SUBJECT TO VAT IN SWITZERLAND + We certify this invoice authentic and definitivePage 1/1 + + @@ -1624,7 +1647,7 @@ - <format_number_symbol(invoice.report_net, invoice.party.lang, invoice.lines[0].unit, digits=2) if invoice.lines else ''> + <format_number_symbol(invoice.report_net, invoice.party.lang, invoice.lines[0].unit, digits=4) if invoice.lines else ''> <invoice.report_product_name or ''> @@ -1701,8 +1724,8 @@ - Net weight: <format_number_symbol(invoice.report_net, invoice.party.lang, invoice.lines[0].unit, digits=2) if invoice.lines else ''> - Gross weight: <format_number_symbol(invoice.report_gross, invoice.party.lang, invoice.lines[0].unit, digits=2) if invoice.lines else ''> + Net weight: <format_number_symbol(invoice.report_net, invoice.party.lang, invoice.lines[0].unit, digits=4) if invoice.lines else ''> + Gross weight: <format_number_symbol(invoice.report_gross, invoice.party.lang, invoice.lines[0].unit, digits=4) if invoice.lines else ''> Packaging: <invoice.report_packaging or ''> diff --git a/modules/sale/sale_melya.fodt b/modules/sale/sale_melya.fodt index 1814916..33fa0db 100644 --- a/modules/sale/sale_melya.fodt +++ b/modules/sale/sale_melya.fodt @@ -660,6 +660,25 @@ + + + + + + + + + + + + + + + + + + + @@ -828,7 +847,12 @@ - + + + VAT NR. – NOT SUBJECT TO VAT IN SWITZERLAND + We certify this invoice authentic and definitivePage 1/1 + + @@ -1724,9 +1748,9 @@ <sale.report_melya_proforma_number><format_date(sale.sale_date, sale.party.lang) if sale.sale_date else ''> - Buyer: + Buyer: <for each="line in sale.report_melya_buyer_address.splitlines()"> - <line> + <line> </for> @@ -1756,7 +1780,7 @@ - <sale.lines[0].quantity><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> + <format_number(sale.lines[0].quantity, sale.party.lang, digits=4) if sale.lines else ''><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> @@ -1782,7 +1806,7 @@ - Total quantity: <sale.lines[0].quantity><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> + Total quantity: <format_number(sale.lines[0].quantity, sale.party.lang, digits=4) if sale.lines else ''><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> Total amount: <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)>