From 0b1bb2ffa59a33a1563516f451885e6fbff5840c Mon Sep 17 00:00:00 2001 From: laurentbarontini Date: Wed, 11 Mar 2026 21:06:45 +0100 Subject: [PATCH] 11.03.26 --- modules/sale/sale_final.fodt | 132 +++++++++++++++++++---------------- 1 file changed, 73 insertions(+), 59 deletions(-) diff --git a/modules/sale/sale_final.fodt b/modules/sale/sale_final.fodt index 15c015e..7103ca3 100644 --- a/modules/sale/sale_final.fodt +++ b/modules/sale/sale_final.fodt @@ -1,24 +1,24 @@ - LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Aksel KamhiLaurent BARONTINI2026-03-11T17:00:00Z2026-03-11T17:00:00Z2025-12-11T15:32:00Z2PT0S0x010100C9130B1D3286474FB2D468C22F52A7B0 + LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Aksel Kamhi2026-03-11T17:00:00Z2026-03-11T21:06:24.3820000002025-12-11T15:32:00Z3PT10M19S0x010100C9130B1D3286474FB2D468C22F52A7B0 - 0 + 75593 0 24236 - 11770 + 12222 true false view2 - 4281 - 3076 + 5724 + 76018 0 - 0 + 75593 24234 - 11769 + 87813 0 0 false @@ -91,7 +91,7 @@ false false false - 1803951 + 1926905 1803951 false false @@ -152,21 +152,22 @@ + - - + + - + - + @@ -177,74 +178,85 @@ - + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -302,8 +314,11 @@ + + + - + @@ -333,7 +348,7 @@ - + @@ -488,7 +503,7 @@ - + @@ -506,7 +521,7 @@ - + @@ -2310,10 +2325,10 @@ Invoice Nr: Date: - <sale.full_number><format_date(sale.sale_date, sale.party.lang) if sale.sale_date else \'\' > + <sale.full_number><format_date(sale.sale_date, sale.party.lang) if sale.sale_date else ''> Order reference: - <sale.reference or \'\' > + <sale.reference or ''> @@ -2325,10 +2340,10 @@ Buyer: <sale.party.rec_name> - <'TAX ID: ' + sale.party.tax_identifier.code if sale.party.tax_identifier else \'\' > - <for each="line in sale.report_address.splitlines()"><line></for> - - + <'TAX ID: ' + sale.party.tax_identifier.code if sale.party.tax_identifier else ''> + <for each="line in sale.report_address.splitlines()"><line></for> + + @@ -2339,7 +2354,7 @@ Payment terms: - <sale.payment_term.description if sale.payment_term else \'\' >  + <sale.payment_term.description if sale.payment_term else ''>  Bank: UBS SWITZERLAND AG Case Postale @@ -2355,24 +2370,24 @@ Shipment date: - <format_date(sale.sale_date, sale.party.lang) if sale.sale_date else \'\' > + <format_date(sale.sale_date, sale.party.lang) if sale.sale_date else ''> Transportation: - <sale.incoterm_location.party_name if sale.incoterm_location else \'\' > + <sale.incoterm_location.party_name if sale.incoterm_location else ''> Terms of delivery: - <sale.incoterm.code if sale.incoterm else \'\' > + <sale.incoterm.code if sale.incoterm else ''> From: - <sale.incoterm_location.name if sale.incoterm_location else \'\' > + <sale.incoterm_location.name if sale.incoterm_location else ''> To: @@ -2380,7 +2395,7 @@ Origin: - <sale.lines[0].product.origin_country.name if sale.lines and sale.lines[0].product and sale.lines[0].product.origin_country else \'\' > + <sale.lines[0].product.origin_country.name if sale.lines and sale.lines[0].product and sale.lines[0].product.origin_country else ''> @@ -2410,20 +2425,20 @@ - <for each="line in sale.lines"><line.quantity> <line.unit.rec_name.upper() if line.unit else \'\' > + <for each="line in sale.lines"><line.quantity><line.unit.rec_name.upper() if line.unit else ''> - <line.product.name if line.product else \'\' > - + <line.product.name if line.product else ''> + - <format_currency(line.unit_price, sale.party.lang, sale.currency) if line.unit_price else \'\' > <sale.currency.name> + <format_currency(line.unit_price, sale.party.lang, sale.currency) if line.unit_price else ''><sale.currency.name> - <format_currency(line.amount, sale.party.lang, sale.currency)></for> + <format_currency(line.amount, sale.party.lang, sale.currency)></for> @@ -2436,7 +2451,7 @@ FOB Value in USD - <format_currency(sale.untaxed_amount, sale.party.lang, sale.currency)> + @@ -2444,7 +2459,7 @@ FREIGHT Value in USD - <format_currency(sale.freight_amount, sale.party.lang, sale.currency) if hasattr(sale, \'freight_amount\') else \'\' > + @@ -2452,15 +2467,15 @@ INSURANCE Value in USD - <format_currency(sale.insurance_amount, sale.party.lang, sale.currency) if hasattr(sale, \'insurance_amount\') else \'\' > + - Total CIF ISKENDERUN Value in USD + Total CIF Value in USD - <format_currency(sale.total_amount, sale.party.lang, sale.currency)> + <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)> @@ -2473,12 +2488,12 @@ - Net weight: <sale.total_net_weight or \'\' > - Gross weight: <sale.total_gross_weight or \'\' > + Net weight: <sale.total_net_weight or ''> + Gross weight: <sale.total_gross_weight or ''> - Packaging: <sale.comment or \'\' > + Packaging: <sale.comment or ''> + - iVBORw0KGgoAAAANSUhEUgAAARwAAAC1CAYAAACNkEByAAAAAXNSR0IArs4c6QAAAARnQU1B AACxjwv8YQUAAAAJcEhZcwAAIdUAACHVAQSctJ0AAHdDSURBVHhe5X13mBTF1jdpyTkusLvs @@ -3054,7 +3069,6 @@ Description automatically generated - </for>