diff --git a/modules/purchase_trade/purchase.py b/modules/purchase_trade/purchase.py index 1b880ab..14e670c 100755 --- a/modules/purchase_trade/purchase.py +++ b/modules/purchase_trade/purchase.py @@ -309,7 +309,7 @@ class Purchase(metaclass=PoolMeta): @property def report_price(self): if self.lines: - if self.lines[0].price_type == 'fixed': + if self.lines[0].price_type == 'priced': 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() @@ -319,8 +319,6 @@ class Purchase(metaclass=PoolMeta): @property def report_delivery(self): del_date = 'PROMPT' - if self.lc_date: - return format_date_en(self.lc_date) if self.lines: if self.lines[0].estimated_date: delivery_date = [dd.estimated_date for dd in self.lines[0].estimated_date if dd.trigger=='deldate'] @@ -333,6 +331,8 @@ class Purchase(metaclass=PoolMeta): @property def report_payment_date(self): if self.lines: + if self.lc_date: + return format_date_en(self.lc_date) Date = Pool().get('ir.date') payment_date = self.lines[0].sale.payment_term.lines[0].get_date(Date.today(),self.lines[0]) if payment_date: diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index 3ff6da3..b18ca45 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -281,7 +281,7 @@ class Sale(metaclass=PoolMeta): @property def report_price(self): if self.lines: - if self.lines[0].price_type == 'fixed': + if self.lines[0].price_type == 'priced': 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() @@ -291,8 +291,6 @@ class Sale(metaclass=PoolMeta): @property def report_delivery(self): del_date = 'PROMPT' - if self.lc_date: - return format_date_en(self.lc_date) if self.lines: if self.lines[0].estimated_date: delivery_date = [dd.estimated_date for dd in self.lines[0].estimated_date if dd.trigger=='deldate'] @@ -305,6 +303,8 @@ class Sale(metaclass=PoolMeta): @property def report_payment_date(self): if self.lines: + if self.lc_date: + return format_date_en(self.lc_date) Date = Pool().get('ir.date') payment_date = self.lines[0].sale.payment_term.lines[0].get_date(Date.today(),self.lines[0]) if payment_date: diff --git a/modules/sale/sale_ict.fodt b/modules/sale/sale_ict.fodt index f17b928..7194a9a 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-09T16:07:48.8700000002025-12-17T14:25:00Z25PT3H47M29S + LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Invoice nowillen2026-02-26T13:52:00Z2026-03-09T16:51:17.3460000002025-12-17T14:25:00Z27PT4H22M40S - 39742 + 42088 0 24236 11721 @@ -13,12 +13,12 @@ view2 - 11423 - 46249 + 7491 + 49431 0 - 39742 + 42088 24234 - 51461 + 53807 0 0 false @@ -91,7 +91,7 @@ false false false - 2494704 + 2574500 1846560 false false @@ -162,7 +162,7 @@ - + @@ -666,14 +666,8 @@ - - - - - - - - + + @@ -682,7 +676,7 @@ - + @@ -691,6 +685,7 @@ + @@ -699,16 +694,24 @@ + + + + + + + + - + - + - + @@ -717,14 +720,14 @@ - + - + - - + + @@ -751,46 +754,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + @@ -3843,7 +3852,7 @@ <for each="sale in records"> - + @@ -3914,7 +3923,7 @@ - <sale.lines[0].product.description if sale.lines and sale.lines[0].product else ''>CROP <sale.crop.name> + <sale.lines[0].product.description if sale.lines and sale.lines[0].product else ''>CROP <sale.crop.name> @@ -3923,7 +3932,7 @@ - <sale.lines[0].attributes_name> + <sale.lines[0].attributes_name> @@ -3932,7 +3941,7 @@ - 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>) + 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>) @@ -3946,7 +3955,7 @@ Price - <format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''>(<sale.report_price>) + <format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''>(<sale.report_price>) @@ -3958,11 +3967,11 @@ - Shipment + Shipment - <sale.lines[0].del_period.description if sale.lines[0].del_period else ''> + <sale.lines[0].del_period.description if sale.lines[0].del_period else ''> @@ -3979,7 +3988,7 @@ - <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 ''> @@ -3987,8 +3996,8 @@ 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 ''> @@ -3996,40 +4005,44 @@ Arbitration & Rules - <sale.association.rule if sale.association else ''> + <if test="sale.association"> + <for each="line in sale.association.rule.splitlines()"> + <line> + </for> + </if> - + - 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>