From e768fe71a3ced47f43afe4934bc6e4eaa6d88c3e Mon Sep 17 00:00:00 2001
From: laurentbarontini <l.barontini@open-squared.ch>
Date: Fri, 27 Feb 2026 06:55:07 +0100
Subject: [PATCH] 27.02.26

---
 modules/purchase_trade/sale.py | 16 ++++++++-----
 modules/sale/sale.fodt         | 42 ++++++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py
index 95adcac..8d9a82d 100755
--- a/modules/purchase_trade/sale.py
+++ b/modules/purchase_trade/sale.py
@@ -279,25 +279,28 @@ class Sale(metaclass=PoolMeta):
         else:
             return ''
     
-    @property
-    def report_del(self):
-        return 'PROMPT'
-    
     @property
     def report_delivery(self):
         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']
+            if self.lines[0].estimated_date:
+                delivery_date = [dd.estimated_date for dd in self.lines[0].estimated_date if dd.trigger=='deldate']
                 if delivery_date:
                     del_date = delivery_date[0]
         return del_date
+    
+    @property
+    def report_payment_date(self):
+        if self.lines:
+            Date = Pool().get('ir.date')
+            return self.lines[0].sale.payment_term.lines[0].get_date(Date.today(),self.lines[0])
         
     @property
     def report_shipment(self):
         if self.lines:
             if len(self.lines[0].lots)>1:
                 shipment = self.lines[0].lots[1].lot_shipment_in
+                lot = self.lines[0].lots[1].lot_name
                 if shipment:
                     info = 'B/L ' + shipment.bl_number 
                     if shipment.container and shipment.container[0].container_no:
@@ -310,6 +313,7 @@ class Sale(metaclass=PoolMeta):
                             else:
                                 info += ' unnamed'
                             id += 1
+                    info += ' (LOT ' + lot + ')'
                     if shipment.note:
                         info += ' ' + shipment.note
                     return info
diff --git a/modules/sale/sale.fodt b/modules/sale/sale.fodt
index cc68312..edf631c 100755
--- a/modules/sale/sale.fodt
+++ b/modules/sale/sale.fodt
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:officeooo="http://openoffice.org/2009/office" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator><dc:title>Invoice no</dc:title><dc:description/><dc:subject/><meta:initial-creator>willen</meta:initial-creator><meta:creation-date>2026-02-26T13:52:00Z</meta:creation-date><dc:date>2026-02-27T06:32:21.562000000</dc:date><meta:print-date>2025-12-17T14:25:00Z</meta:print-date><meta:editing-cycles>13</meta:editing-cycles><meta:editing-duration>PT32M48S</meta:editing-duration><meta:document-statistic meta:table-count="8" meta:image-count="3" meta:object-count="0" meta:page-count="2" meta:paragraph-count="40" meta:word-count="178" meta:character-count="1540" meta:non-whitespace-character-count="1395"/><meta:template xlink:type="simple" xlink:actuate="onRequest" xlink:title="" xlink:href="ICT_sale_template.odt/Normal.dotm"/></office:meta>
+ <office:meta><meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator><dc:title>Invoice no</dc:title><dc:description/><dc:subject/><meta:initial-creator>willen</meta:initial-creator><meta:creation-date>2026-02-26T13:52:00Z</meta:creation-date><dc:date>2026-02-27T06:54:36.785000000</dc:date><meta:print-date>2025-12-17T14:25:00Z</meta:print-date><meta:editing-cycles>14</meta:editing-cycles><meta:editing-duration>PT45M44S</meta:editing-duration><meta:document-statistic meta:table-count="8" meta:image-count="3" meta:object-count="0" meta:page-count="2" meta:paragraph-count="41" meta:word-count="188" meta:character-count="1658" meta:non-whitespace-character-count="1504"/><meta:template xlink:type="simple" xlink:actuate="onRequest" xlink:title="" xlink:href="ICT_sale_template.odt/Normal.dotm"/></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" config:type="long">36842</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">44533</config:config-item>
    <config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
    <config:config-item config:name="ViewAreaWidth" config:type="long">24236</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="long">11770</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">11721</config:config-item>
    <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
    <config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item>
    <config:config-item-map-indexed config:name="Views">
     <config:config-item-map-entry>
      <config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" config:type="long">7430</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">44309</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">12264</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">46637</config:config-item>
      <config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item>
-     <config:config-item config:name="VisibleTop" config:type="long">36842</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">44533</config:config-item>
      <config:config-item config:name="VisibleRight" config:type="long">24234</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">48611</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">56252</config:config-item>
      <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutColumns" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -91,7 +91,7 @@
    <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item>
    <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" config:type="boolean">false</config:config-item>
    <config:config-item config:name="UseOldPrinterMetrics" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="Rsid" config:type="int">2353095</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">2361083</config:config-item>
    <config:config-item config:name="RsidRoot" config:type="int">1846560</config:config-item>
    <config:config-item config:name="ProtectForm" config:type="boolean">false</config:config-item>
    <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item>
@@ -161,7 +161,7 @@
  <office:styles>
   <style:default-style style:family="graphic">
    <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.071cm" svg:stroke-color="#1c334e" svg:stroke-linecap="butt" draw:fill-color="#4f81bd" fo:wrap-option="wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:writing-mode="lr-tb" style:flow-with-text="false"/>
-   <style:paragraph-properties fo:line-height="115%" fo:text-align="start" style:text-autospace="ideograph-alpha" style:line-break="strict" loext:tab-stop-distance="0cm" style:font-independent-line-spacing="false">
+   <style:paragraph-properties fo:line-height="115%" fo:text-align="start" style:text-autospace="ideograph-alpha" style:line-break="strict" loext:tab-stop-distance="0cm" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" loext:opacity="0%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-size="11pt" fo:letter-spacing="normal" fo:language="fr" fo:country="FR" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="11pt" style:language-asian="fr" style:country-asian="FR" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Calibri" style:font-size-complex="11pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none"/>
@@ -692,7 +692,24 @@
   <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Normal" style:master-page-name="">
    <style:paragraph-properties style:page-number="auto" fo:break-before="page"/>
   </style:style>
-  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Normal" style:master-page-name="MP0">
+  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
+   <style:paragraph-properties>
+    <style:tab-stops>
+     <style:tab-stop style:position="3.184cm"/>
+     <style:tab-stop style:position="16.766cm"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+  </style:style>
+  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Global_20_Dunavant">
+   <style:paragraph-properties>
+    <style:tab-stops>
+     <style:tab-stop style:position="3.184cm"/>
+     <style:tab-stop style:position="16.766cm"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties officeooo:rsid="002406fb" officeooo:paragraph-rsid="002406fb"/>
+  </style:style>
+  <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Normal" style:master-page-name="MP0">
    <style:paragraph-properties style:page-number="auto" fo:break-before="page"/>
   </style:style>
   <style:style style:name="T1" style:family="text">
@@ -3800,7 +3817,7 @@
     <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
    </text:sequence-decls>
    <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;sale in records&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P37"/>
+   <text:p text:style-name="P39"/>
    <table:table table:name="Table1" table:style-name="Table1">
     <table:table-column table:style-name="Table1.A"/>
     <table:table-row>
@@ -3917,7 +3934,7 @@
      </table:table-cell>
      <table:table-cell table:style-name="Table6.A1" office:value-type="string">
       <text:p text:style-name="P25"/>
-      <text:p text:style-name="P28"><text:s/><text:span text:style-name="T18"><text:placeholder text:placeholder-type="text">&lt;sale.report_del&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P28"><text:s/><text:span text:style-name="T18"><text:placeholder text:placeholder-type="text">&lt;sale.report_delivery&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
@@ -3959,6 +3976,7 @@
      </table:table-cell>
      <table:table-cell table:style-name="Table7.A1" office:value-type="string">
       <text:p text:style-name="P34"><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;sale.payment_term.rec_name if sale.payment_term else &apos;100% CASH AGAINST DOCUMENTS&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T12"><text:s/></text:span></text:p>
+      <text:p text:style-name="P38"><text:span text:style-name="T12">BEFORE </text:span><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;sale.report_payment_date&gt;</text:placeholder></text:span><text:span text:style-name="T12"><text:s/></text:span><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;sale.payment_term.description if sale.payment_term else &apos;&apos;&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>