From 52c58df547725656c7d44dd2a75d2de266a4755b Mon Sep 17 00:00:00 2001 From: laurentbarontini Date: Mon, 9 Mar 2026 20:01:20 +0100 Subject: [PATCH] 09.03.26 --- modules/purchase_trade/sale.py | 4 +- modules/sale/sale_ict.fodt | 361 ++++++++++++++++++--------------- 2 files changed, 202 insertions(+), 163 deletions(-) diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index c187ceb..81ef4ad 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -280,7 +280,7 @@ class Sale(metaclass=PoolMeta): @property def report_nb_bale(self): - text_bale = 'Nb Bales: ' + text_bale = 'NB BALES: ' nb_bale = 0 if self.lines: for line in self.lines: @@ -561,7 +561,7 @@ class SaleLine(metaclass=PoolMeta): @property def get_pricing_text(self): - pricing_text = '' + pricing_text = ' ON ' if self.price_components: for pc in self.price_components: if pc.price_index: diff --git a/modules/sale/sale_ict.fodt b/modules/sale/sale_ict.fodt index 151d3bb..45db553 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-09T18:12:30.8700000002025-12-17T14:25:00Z34PT4H45M23S + LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Invoice nowillen2026-02-26T13:52:00Z2026-03-09T20:00:07.4150000002025-12-17T14:25:00Z37PT4H57M49S - 41453 + 43789 0 24236 11721 @@ -13,12 +13,12 @@ view2 - 12876 - 43533 + 10724 + 45861 0 - 41453 + 43789 24234 - 53172 + 55508 0 0 false @@ -91,7 +91,7 @@ false false false - 2803949 + 2969915 1846560 false false @@ -512,15 +512,18 @@ - - - - - - - + + + + + + + + + + @@ -529,11 +532,11 @@ - + - + @@ -542,10 +545,10 @@ - + - + @@ -561,11 +564,11 @@ - + - + @@ -573,7 +576,7 @@ - + @@ -585,20 +588,11 @@ - - - - - - - - - - + @@ -610,7 +604,7 @@ - + @@ -619,7 +613,7 @@ - + @@ -628,7 +622,7 @@ - + @@ -637,10 +631,16 @@ - + - + + + + + + + @@ -649,18 +649,42 @@ - + - + + + + + + + - + - + + + + + + + + + + + + + + + + + + + @@ -669,7 +693,7 @@ - + @@ -678,34 +702,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -714,30 +738,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -745,16 +745,22 @@ - + + + + + + - - + + + - - + + @@ -763,14 +769,38 @@ - + - + + + + + + + + + + + + + + + + + + + - + + + + + + + @@ -846,6 +876,9 @@ + + + @@ -875,7 +908,7 @@ - + iVBORw0KGgoAAAANSUhEUgAABZ4AAAC9CAIAAAC8iP/2AAAAAXNSR0IArs4c6QAAAAlwSFlz AAAOxAAADsMB2mqY3AAA/7VJREFUeF7svQeAHMd1Jlyduydu3kUmQRLMIimJVBaVbStYWc6y JdvncLZOtuxzOMmSreAsZ9/9tmVZsiVZWbKtnLMVSDGDAAkSGZsndw7/96p6ZmcXu8AsuAAW @@ -3262,7 +3295,7 @@ - + iVBORw0KGgoAAAANSUhEUgAAAqoAAAAnCAIAAABIVv0SAAAAAXNSR0IArs4c6QAAAAlwSFlz AAAOwwAADsMBx2+oZAAAge9JREFUeF7tvQeYHNW1LXwqdHXO05NHM8oSkkgOGDDGGGxMMjnn nCyCAZFBRuScETlnEMlgMjbYmCwQymly7Byrq7q66l/7VM9o4OL3vff+j3e5WO320Jqprjpx @@ -3896,8 +3929,8 @@ - <for each="sale in records"> - + <for each="sale in records"> + @@ -3909,7 +3942,7 @@ - + @@ -3919,93 +3952,97 @@ - + - Buyers + Buyers <sale.party.rec_name> ADDRESS:<sale.report_address> - + - Sellers + Sellers - ICT TRADING S.A. - VIA MAGAZZINI GENERALI, 3 + ICT TRADING S.A. + VIA MAGAZZINI GENERALI, 3 6828 BALERNA, SWITZERLAND - Agents + Agents <for each="line in sale.report_agent.splitlines()"> <line> </for> + - - + + - - Growth - + + Growth + - - <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> - 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>) <sale.report_nb_bale> + 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>) + <sale.report_nb_bale> + - + - Price + Price - <format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''>(<sale.report_price>) <sale.lines[0].get_pricing_text> + <format_currency(sale.lines[0].linked_price, sale.party.lang, sale.lines[0].linked_currency) if sale.lines[0].linked_price else format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency)>(<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> + - - + + @@ -4014,17 +4051,18 @@ <if test="sale.lines[0].pricing_rule"> - + - Fixation + Fixation - <for each="line in sale.lines[0].pricing_rule.splitlines()"> - <line> - </for> + <for each="line in sale.lines[0].pricing_rule.splitlines()"> + <line> + </for> + @@ -4032,45 +4070,45 @@ </if> - + - 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 ''> + - - - + + + - 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"> @@ -4078,40 +4116,41 @@ <line> </for> </if> + - + - - THE SELLERS + + THE SELLERS - - THE BUYERS + + THE BUYERS - ICT TRADING SA - - - - - + 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 ''> - - </for> + <sale.trader.initial if sale.trader else ''>/<sale.operator.initial if sale.operator else ''> + + </for> \ No newline at end of file