From f0c1b8909eb165a5ca3511b377e027250a355580 Mon Sep 17 00:00:00 2001 From: laurentbarontini Date: Thu, 12 Mar 2026 14:56:09 +0100 Subject: [PATCH] 12.03.26 --- modules/sale/sale_final.fodt | 157 +++++++++++++++++++---------------- 1 file changed, 87 insertions(+), 70 deletions(-) diff --git a/modules/sale/sale_final.fodt b/modules/sale/sale_final.fodt index 80fa6af..24272d4 100644 --- a/modules/sale/sale_final.fodt +++ b/modules/sale/sale_final.fodt @@ -1,10 +1,10 @@ - LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Aksel Kamhi2026-03-11T17:00:00Z2026-03-12T14:43:31.6190000002025-12-11T15:32:00Z13PT53M10S0x010100C9130B1D3286474FB2D468C22F52A7B0 + LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Aksel Kamhi2026-03-11T17:00:00Z2026-03-12T14:55:45.2210000002025-12-11T15:32:00Z16PT58M54S0x010100C9130B1D3286474FB2D468C22F52A7B0 - 62883 + 49553 0 24236 11721 @@ -13,12 +13,12 @@ view2 - 10516 - 68199 + 4461 + 53765 0 - 62883 + 49553 24234 - 74602 + 61272 0 0 false @@ -91,7 +91,7 @@ false false false - 2217081 + 2303505 1803951 false false @@ -159,7 +159,7 @@ - + @@ -470,41 +470,39 @@ - - - + + + - - + + - + + + + + + + + + - + - - - - - - - + - - - - @@ -513,11 +511,33 @@ - + + + + + + + + + - + + + + + + + + + + + + + + + @@ -550,33 +570,30 @@ - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + - + - + @@ -2404,11 +2421,11 @@ COMMERCIAL INVOICE Invoice Nr: Date: - + <sale.report_deal><format_date(sale.sale_date, sale.party.lang) if sale.sale_date else ''> Order reference: - <sale.reference or ''> + <sale.reference or ''> @@ -2436,12 +2453,12 @@ Payment terms: <sale.payment_term.description if sale.payment_term else ''>  - Bank: UBS SWITZERLAND AG + Bank: UBS SWITZERLAND AG Case Postale CH-1211 Genève 2 - IBAN : CH36 0021 5215 2487 7461 D - SwifT Code: UBSWCHZH80A + IBAN : CH36 0021 5215 2487 7461 D + SwifT Code: UBSWCHZH80A @@ -2471,7 +2488,7 @@ To: - <sale.to_location.name if sale.to_location else ''> + <sale.to_location.name if sale.to_location else ''> Origin: @@ -2487,31 +2504,31 @@ - Quantity + Quantity - Goods Description + Goods Description - Unit Price / mt + Unit Price / mt - US Dollar Amount + US Dollar Amount - <sale.lines[0].quantity><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> + <format_number_symbol(sale.lines[0].quantity, sale.party.lang, sale.lines[0].unit, digits=2)> - <sale.lines[0].product.name if sale.lines[0].product else ''> - + <sale.lines[0].product.name if sale.lines[0].product else ''> + - <format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''> + <format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''> - <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)> + <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)> @@ -2522,7 +2539,7 @@ - <if test="sale.lines[0].price_composition"> + <if test="sale.lines[0].price_composition"> @@ -2530,7 +2547,7 @@ - <for each="pc in sale.lines[0].price_composition"> + <for each="pc in sale.lines[0].price_composition"> @@ -2538,10 +2555,10 @@ - <pc.component>Value in <sale.currency> + <pc.component>Value in <sale.currency.name> - <pc.price> + <format_currency(pc.price, sale.party.lang, sale.currency)> @@ -2562,7 +2579,7 @@ - Total <sale.incoterm.code if sale.incoterm else ''>Value in <sale.currency> + Total <sale.incoterm.code if sale.incoterm else ''>Value in <sale.currency.name> <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)> @@ -2578,8 +2595,8 @@ - Net weight: <sale.report_net or ''> - Gross weight: <sale.report_gross or ''> + Net weight: <sale.report_net or ''><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> + Gross weight: <sale.report_gross or ''><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> Packaging: <sale.report_packing or ''>