diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index 2a1756a..8b3e35a 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -303,6 +303,25 @@ class Sale(metaclass=PoolMeta): nb_bale += sum([l.lot_qt for l in line.lots if l.lot_type == 'physic']) return text_bale + str(int(nb_bale)) + @property + def report_deal(self): + if self.lines and self.lines[0].lots and len(self.lines[0].lots)>1: + return self.lines[0].lots[1].line.purchase.number + ' ' + self.number + else: + '' + + @property + def report_packing(self): + nb_packing = 0 + unit = '' + if self.lines: + for line in self.lines: + if line.lots: + nb_packing += sum([l.lot_qt for l in line.lots if l.lot_type == 'physic']) + if len(line.lots)>1: + unit = line.lots[1].lot_unit_line.name + return str(int(nb_packing)) + unit + @property def report_price(self): if self.lines: diff --git a/modules/sale/sale_final.fodt b/modules/sale/sale_final.fodt index e5352dd..1765c88 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-11T21:21:43.3080000002025-12-11T15:32:00Z5PT15M42S0x010100C9130B1D3286474FB2D468C22F52A7B0 + LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Aksel Kamhi2026-03-11T17:00:00Z2026-03-11T22:04:57.9610000002025-12-11T15:32:00Z10PT39M17S0x010100C9130B1D3286474FB2D468C22F52A7B0 - 68883 + 67929 0 24236 12222 @@ -13,12 +13,12 @@ view2 - 6073 - 75166 + 5724 + 73828 0 - 68883 + 67929 24234 - 81104 + 80149 0 0 false @@ -91,7 +91,7 @@ false false false - 1984380 + 2080548 1803951 false false @@ -151,6 +151,7 @@ + @@ -158,7 +159,7 @@ - + @@ -261,6 +262,7 @@ + @@ -469,9 +471,23 @@ - + + + + + + + + + + + + + + + @@ -497,8 +513,20 @@ + + + + + + + + + + + + @@ -2321,14 +2349,14 @@ - COMMERCIAL INVOICE + COMMERCIAL INVOICE Invoice Nr: Date: - <sale.full_number><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 ''> + <sale.reference or ''> @@ -2375,7 +2403,7 @@ Transportation: - <sale.incoterm_location.party_name if sale.incoterm_location else ''> + <sale.report_shipment> @@ -2387,11 +2415,11 @@ From: - <sale.incoterm_location.name if sale.incoterm_location else ''> + <sale.from_location.name if sale.from_location else ''> To: - <', '.join(filter(None, [sale.party.addresses[0].city, sale.party.addresses[0].country.name if sale.party.addresses[0].country else ''])) if sale.party.addresses else ''> + <sale.to_location.name if sale.to_location else ''> Origin: @@ -2425,20 +2453,20 @@ - <for each="line in sale.lines"><line.quantity><line.unit.rec_name.upper() if line.unit else ''> + <sale.lines[0].quantity><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit 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(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''> - <format_currency(line.amount, sale.party.lang, sale.currency)></for> + <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)> @@ -2491,7 +2519,7 @@ Net weight: <sale.report_net or ''> Gross weight: <sale.report_gross or ''> - Packaging: <sale.comment or ''> + Packaging: <sale.report_packing or ''>