From 6fdf5e199490d3080283fb6c65b064ec27cd1b33 Mon Sep 17 00:00:00 2001 From: laurentbarontini Date: Fri, 27 Feb 2026 06:17:55 +0100 Subject: [PATCH] 27.02.26 --- modules/purchase_trade/sale.py | 2 +- modules/sale/sale.fodt | 115 ++++++++++++++++++--------------- 2 files changed, 63 insertions(+), 54 deletions(-) diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index 1f6ad9a..b2b90db 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -281,7 +281,7 @@ class Sale(metaclass=PoolMeta): @property def report_delivery(self): - del_date = '' + del_date = 'PROMPT' if self.lines: if self.estimated_date: delivery_date = [dd.estimated_date for dd in self.estimated_date if dd.trigger=='deldate'] diff --git a/modules/sale/sale.fodt b/modules/sale/sale.fodt index 34944b3..86ab3db 100755 --- a/modules/sale/sale.fodt +++ b/modules/sale/sale.fodt @@ -1,10 +1,10 @@ - LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Invoice nowillen2026-02-26T13:52:00Z2026-02-27T06:05:06.4840000002025-12-17T14:25:00Z9PT29M56S + LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Invoice nowillen2026-02-26T13:52:00Z2026-02-27T06:16:42.3320000002025-12-17T14:25:00Z10PT30M43S - 37599 + 37685 0 24236 11721 @@ -13,12 +13,12 @@ view2 - 15041 + 7430 44309 0 - 37599 + 37685 24234 - 49318 + 49405 0 0 false @@ -91,7 +91,7 @@ false false false - 2091355 + 2162399 1846560 false false @@ -161,7 +161,7 @@ - + @@ -636,6 +636,9 @@ + + + @@ -644,17 +647,8 @@ - - - - - - - - - - + @@ -663,7 +657,7 @@ - + @@ -672,18 +666,33 @@ + - + + + + + + + + + - + - - + + + + + + + + - + @@ -769,7 +778,7 @@ - + iVBORw0KGgoAAAANSUhEUgAABZ4AAAC9CAIAAAC8iP/2AAAAAXNSR0IArs4c6QAAAAlwSFlz AAAOxAAADsMB2mqY3AAA/7VJREFUeF7svQeAHMd1Jlyduydu3kUmQRLMIimJVBaVbStYWc6y JdvncLZOtuxzOMmSreAsZ9/9tmVZsiVZWbKtnLMVSDGDAAkSGZsndw7/96p6ZmcXu8AsuAAW @@ -3156,7 +3165,7 @@ - + iVBORw0KGgoAAAANSUhEUgAAAqoAAAAnCAIAAABIVv0SAAAAAXNSR0IArs4c6QAAAAlwSFlz AAAOwwAADsMBx2+oZAAAge9JREFUeF7tvQeYHNW1LXwqdHXO05NHM8oSkkgOGDDGGGxMMjnn nCyCAZFBRuScETlnEMlgMjbYmCwQymly7Byrq7q66l/7VM9o4OL3vff+j3e5WO320Jqprjpx @@ -3791,7 +3800,7 @@ <for each="sale in records"> - + @@ -3854,9 +3863,9 @@ - - Growth - + + Growth + @@ -3865,17 +3874,17 @@ - Quality - + Quality + - <sale.report_shipment> + <sale.report_shipment> - 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>) @@ -3889,7 +3898,7 @@ - Price + Price <format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''>(<sale.report_price>) @@ -3903,12 +3912,12 @@ - + Delivery - <sale.report_delivery if sale.report_delivery else 'PROMPT'> + <sale.report_delivery> @@ -3920,8 +3929,8 @@ - - Terms + + Terms @@ -3930,15 +3939,15 @@ - + - + - + @@ -3946,15 +3955,15 @@ - Payment + Payment - <sale.payment_term.rec_name if sale.payment_term else '100% CASH AGAINST DOCUMENTS'> + <sale.payment_term.rec_name if sale.payment_term else '100% CASH AGAINST DOCUMENTS'> - + @@ -3962,7 +3971,7 @@ - Arbitration & Rules + Arbitration & Rules - ALL DISPUTES RELATING TO THIS CONTRACT WILL BE RESOLVED THROUGH ARBITRATION IN ACCORDANCE WITH THE BYLAWS OF THE INTERNATIONAL COTTON ASSOCIATION, LIMITED. THIS AGREEMENT INCORPORATES THE BYLAWS WHICH SET OUT THE ASSOCIATION’S ARBITRATION PROCEDURE. @@ -3970,24 +3979,24 @@ - + - - THE SELLERS + + THE SELLERS - - THE BUYERS + + THE BUYERS ICT TRADING SA - + iVBORw0KGgoAAAANSUhEUgAAAQ8AAAEJCAIAAAAFFDV0AAAAAXNSR0IArs4c6QAA/8pJREFU eF7sfQeAXGd19etletned7Wr3VXvsootW+69gk2HQIAkJIEUElJ+SAKBhBJqEhICxEAcsDHF vcmybFlW72V7r7PT5/X2n++NJBsjxZZtjAx+DPKW2Zk37333u/eee+65tOu6lH84jsMwDL61 @@ -5614,7 +5623,7 @@ - <sale.party.rec_name> + <sale.party.rec_name>