From 039b278757066d79a2c230316f93c93c6f2a8c7a Mon Sep 17 00:00:00 2001 From: laurentbarontini Date: Mon, 9 Mar 2026 20:27:08 +0100 Subject: [PATCH] 09.03.26 --- modules/purchase_trade/sale.py | 5 +- modules/sale/sale_ict.fodt | 127 +++++++++++++++++---------------- 2 files changed, 69 insertions(+), 63 deletions(-) diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index 73e0d35..67740e9 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -292,7 +292,10 @@ class Sale(metaclass=PoolMeta): def report_price(self): if self.lines: if self.lines[0].price_type == 'priced': - return amount_to_currency_words(self.lines[0].unit_price) + if self.lines[0].linked_price: + return amount_to_currency_words(self.lines[0].linked_price,'USC','USC') + else: + return amount_to_currency_words(self.lines[0].unit_price) elif self.lines[0].price_type == 'basis': return amount_to_currency_words(self.lines[0].unit_price) + ' ' + self.lines[0].get_pricing_text() else: diff --git a/modules/sale/sale_ict.fodt b/modules/sale/sale_ict.fodt index f9d7b32..01bd958 100644 --- a/modules/sale/sale_ict.fodt +++ b/modules/sale/sale_ict.fodt @@ -1,10 +1,10 @@ - LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Invoice nowillen2026-02-26T13:52:00Z2026-03-09T20:10:32.6950000002025-12-17T14:25:00Z38PT5H2M54S + LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Invoice nowillen2026-02-26T13:52:00Z2026-03-09T20:26:38.5930000002025-12-17T14:25:00Z39PT5H4M10S - 43427 + 36941 0 24236 11721 @@ -13,12 +13,12 @@ view2 - 11536 - 45473 + 14600 + 46249 0 - 43427 + 36941 24234 - 55146 + 48660 0 0 false @@ -91,7 +91,7 @@ false false false - 2973863 + 3002665 1846560 false false @@ -162,7 +162,7 @@ - + @@ -706,6 +706,9 @@ + + + @@ -714,10 +717,10 @@ - + - + @@ -726,21 +729,12 @@ - + - + - - - - - - - - - @@ -748,7 +742,7 @@ - + @@ -757,6 +751,7 @@ + @@ -765,16 +760,24 @@ + + + + + + + + - + - + - + @@ -783,16 +786,16 @@ - + - + - - + + - + @@ -3924,7 +3927,7 @@ <for each="sale in records"> - + @@ -3990,9 +3993,9 @@ - - Growth - + + Growth + @@ -4001,17 +4004,17 @@ - Quality - + Quality + - <sale.lines[0].attributes_name> + <sale.lines[0].attributes_name> - Quantity - + Quantity + ABOUT <sum(line.quantity for line in sale.lines)><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''>(<sale.report_qt>) @@ -4027,10 +4030,10 @@ - Price + Price - <sale.lines[0].linked_currency.rec_name.upper() if sale.lines[0].linked_currency else sale.currency.rec_name.upper()><sale.lines[0].linked_price if sale.lines[0].linked_price else sale.lines[0].unit_price>(<sale.report_price>) PER <sale.lines[0].linked_unit.rec_name.upper() if sale.lines[0].linked_unit else sale.lines[0].unit.rec_name.upper()><sale.lines[0].get_pricing_text> + <sale.lines[0].linked_currency.rec_name.upper() if sale.lines[0].linked_currency else sale.currency.rec_name.upper()><sale.lines[0].linked_price if sale.lines[0].linked_price else sale.lines[0].unit_price>PER <sale.lines[0].linked_unit.rec_name.upper() if sale.lines[0].linked_unit else sale.lines[0].unit.rec_name.upper()>(<sale.report_price>) <sale.lines[0].get_pricing_text> @@ -4050,7 +4053,7 @@ - Fixation + Fixation <for each="line in sale.lines[0].pricing_rule.splitlines()"> @@ -4069,7 +4072,7 @@ - Shipment + Shipment <sale.lines[0].del_period.description if sale.lines[0].del_period else ''> @@ -4085,24 +4088,24 @@ - Terms + Terms - <sale.incoterm.code if sale.incoterm else ''><sale.incoterm_location.party_name if sale.incoterm_location else ''>, <sale.wb.description if sale.wb else ''> + <sale.incoterm.code if sale.incoterm else ''><sale.incoterm_location.party_name if sale.incoterm_location else ''>, <sale.wb.description if sale.wb else ''> - Payment + Payment - <sale.payment_term.rec_name if sale.payment_term else '100% CASH AGAINST DOCUMENTS'> - BEFORE <sale.report_payment_date><sale.payment_term.description if sale.payment_term else ''> + <sale.payment_term.rec_name if sale.payment_term else '100% CASH AGAINST DOCUMENTS'> + BEFORE <sale.report_payment_date><sale.payment_term.description if sale.payment_term else ''> - Arbitration & Rules + Arbitration & Rules <if test="sale.association"> @@ -4114,36 +4117,36 @@ - + - - THE SELLERS + + THE SELLERS - - THE BUYERS + + THE BUYERS ICT TRADING SA - - - - - + + + + + - <sale.party.rec_name> + <sale.party.rec_name> - <sale.trader.initial if sale.trader else ''>/<sale.operator.initial if sale.operator else ''> - + <sale.trader.initial if sale.trader else ''>/<sale.operator.initial if sale.operator else ''> + </for>