diff --git a/modules/sale/sale_final.fodt b/modules/sale/sale_final.fodt index f66147c..80fa6af 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-11T22:17:20.7990000002025-12-11T15:32:00Z11PT40M37S0x010100C9130B1D3286474FB2D468C22F52A7B0 + 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 - 68806 + 62883 0 24236 11721 @@ -13,12 +13,12 @@ view2 - 5904 - 53906 + 10516 + 68199 0 - 68806 + 62883 24234 - 80525 + 74602 0 0 false @@ -91,7 +91,7 @@ false false false - 2159149 + 2217081 1803951 false false @@ -159,7 +159,7 @@ - + @@ -263,6 +263,10 @@ + + + + @@ -396,22 +400,19 @@ - + - + - + - + - - - - + @@ -428,6 +429,12 @@ + + + + + + @@ -485,57 +492,93 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + @@ -2358,14 +2401,14 @@ - COMMERCIAL INVOICE + COMMERCIAL INVOICE - Invoice Nr: Date: + Invoice Nr: Date: - <sale.report_deal><format_date(sale.sale_date, sale.party.lang) if sale.sale_date else ''> + <sale.report_deal><format_date(sale.sale_date, sale.party.lang) if sale.sale_date else ''> - Order reference: - <sale.reference or ''> + Order reference: + <sale.reference or ''> @@ -2375,12 +2418,12 @@ - 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> - - + 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> + + @@ -2390,12 +2433,12 @@ - Payment terms: - <sale.payment_term.description if sale.payment_term else ''>  + Payment terms: + <sale.payment_term.description if sale.payment_term else ''>  Bank: UBS SWITZERLAND AG - Case Postale - CH-1211 Genève 2 + Case Postale + CH-1211 Genève 2 IBAN : CH36 0021 5215 2487 7461 D SwifT Code: UBSWCHZH80A @@ -2406,33 +2449,33 @@ - Shipment date: - <format_date(sale.sale_date, sale.party.lang) if sale.sale_date else ''> + Shipment date: + <format_date(sale.sale_date, sale.party.lang) if sale.sale_date else ''> - Transportation: - <sale.report_shipment> + Transportation: + <sale.report_shipment> - Terms of delivery: - <sale.incoterm.code if sale.incoterm else ''> + Terms of delivery: + <sale.incoterm.code if sale.incoterm else ''> - From: - <sale.from_location.name if sale.from_location else ''> + From: + <sale.from_location.name if sale.from_location else ''> - To: - <sale.to_location.name if sale.to_location else ''> + To: + <sale.to_location.name if sale.to_location else ''> - Origin: - <sale.origin> + Origin: + <sale.origin> @@ -2442,40 +2485,33 @@ - - 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 ''> + <sale.lines[0].quantity><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> + <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)> @@ -2483,17 +2519,10 @@ + - FOB Value in USD - - - - - - - - FREIGHT Value in USD + <if test="sale.lines[0].price_composition"> @@ -2501,34 +2530,58 @@ - INSURANCE Value in USD + <for each="pc in sale.lines[0].price_composition"> - + - Total CIF Value in USD + <pc.component>Value in <sale.currency> - <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)> + <pc.price> + + + + + </for> + + + + + + + + </if> + + + + + + + + Total <sale.incoterm.code if sale.incoterm else ''>Value in <sale.currency> + + + <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)> - + - Net weight: <sale.report_net or ''> - Gross weight: <sale.report_gross or ''> + Net weight: <sale.report_net or ''> + Gross weight: <sale.report_gross or ''> - Packaging: <sale.report_packing or ''> + Packaging: <sale.report_packing or ''>