26.02.26

2026-02-26 20:21:42 +01:00
parent 399d9da9e5
commit a724e0a086
2 changed files with 44 additions and 22 deletions
--- a/modules/commission/sale.py
+++ b/modules/commission/sale.py
@@ -27,6 +27,14 @@ class Sale(metaclass=PoolMeta):
            invoice.save()
        return invoice

+    @property
+    def report_agent(self):
+        if self.agent:
+            return self.agent.party.address_get(
+                type='invoice')
+        else:
+            return ''
+
    @classmethod
    @ModelView.button
    @Workflow.transition('quotation')
--- a/modules/sale/sale.fodt
+++ b/modules/sale/sale.fodt
@@ -1,10 +1,10 @@
 <?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-26T16:37:50.656000000</dc:date><meta:print-date>2025-12-17T14:25:00Z</meta:print-date><meta:editing-cycles>3</meta:editing-cycles><meta:editing-duration>PT4M15S</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="46" meta:word-count="236" meta:character-count="1893" meta:non-whitespace-character-count="1696"/><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-26T20:21:19.619000000</dc:date><meta:print-date>2025-12-17T14:25:00Z</meta:print-date><meta:editing-cycles>4</meta:editing-cycles><meta:editing-duration>PT15M18S</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="43" meta:word-count="208" meta:character-count="1744" meta:non-whitespace-character-count="1572"/><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">35761</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">43349</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">11721</config:config-item>
@@ -13,12 +13,12 @@
   <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">44697</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">11986</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">36936</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">35761</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">43349</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">47480</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">55069</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">1920244</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">1972244</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"/>
@@ -271,7 +271,7 @@
   <style:text-properties fo:font-variant="small-caps" fo:color="#008080" loext:opacity="100%" style:text-underline-style="dotted" style:text-underline-width="auto" style:text-underline-color="font-color"/>
  </style:style>
  <style:style style:name="Graphics" style:family="graphic">
-   <style:graphic-properties fo:background-color="transparent" draw:fill="none"/>
+   <style:graphic-properties fo:background-color="transparent" draw:fill="none" draw:fill-color="#4f81bd"/>
  </style:style>
  <text:outline-style style:name="Outline">
   <text:outline-level-style text:level="1" loext:num-list-format="%1%" style:num-format="">
@@ -357,19 +357,19 @@
   <style:table-cell-properties fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="none" style:writing-mode="lr-tb"/>
  </style:style>
  <style:style style:name="Table2" style:family="table">
-   <style:table-properties style:width="17cm" style:rel-width="100%" fo:margin-left="0cm" table:align="left"/>
+   <style:table-properties style:width="17.267cm" fo:margin-left="-0.266cm" table:align="left"/>
  </style:style>
  <style:style style:name="Table2.A" style:family="table-column">
-   <style:table-column-properties style:column-width="17cm" style:rel-column-width="9638*"/>
+   <style:table-column-properties style:column-width="17.267cm"/>
  </style:style>
  <style:style style:name="Table2.A1" style:family="table-cell">
   <style:table-cell-properties fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="none" style:writing-mode="lr-tb"/>
  </style:style>
  <style:style style:name="Table3" style:family="table">
-   <style:table-properties style:width="17.06cm" fo:margin-left="-0.06cm" table:align="left"/>
+   <style:table-properties style:width="17.256cm" fo:margin-left="-0.256cm" table:align="left"/>
  </style:style>
  <style:style style:name="Table3.A" style:family="table-column">
-   <style:table-column-properties style:column-width="3.674cm"/>
+   <style:table-column-properties style:column-width="3.87cm"/>
  </style:style>
  <style:style style:name="Table3.B" style:family="table-column">
   <style:table-column-properties style:column-width="13.386cm"/>
@@ -414,10 +414,10 @@
   <style:table-cell-properties fo:padding-left="0.123cm" fo:padding-right="0.123cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="none" style:writing-mode="lr-tb"/>
  </style:style>
  <style:style style:name="Table7" style:family="table">
-   <style:table-properties style:width="17.51cm" fo:margin-left="-0.127cm" table:align="left"/>
+   <style:table-properties style:width="17.658cm" fo:margin-left="-0.275cm" table:align="left"/>
  </style:style>
  <style:style style:name="Table7.A" style:family="table-column">
-   <style:table-column-properties style:column-width="3.81cm"/>
+   <style:table-column-properties style:column-width="3.958cm"/>
  </style:style>
  <style:style style:name="Table7.B" style:family="table-column">
   <style:table-column-properties style:column-width="13.7cm"/>
@@ -641,9 +641,26 @@
  <style:style style:name="P29" 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="P30" style:family="paragraph" style:parent-style-name="Normal" style:master-page-name="MP0">
+  <style:style style:name="P30" 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="P31" 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="P32" style:family="paragraph" style:parent-style-name="Texte_20_par_20_défaut">
+   <style:paragraph-properties>
+    <style:tab-stops>
+     <style:tab-stop style:position="3.461cm"/>
+     <style:tab-stop style:position="3.96cm"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="9pt" fo:language="en" fo:country="US" officeooo:paragraph-rsid="001e1814" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
  <style:style style:name="T1" style:family="text">
   <style:text-properties style:font-size-complex="8pt"/>
  </style:style>
@@ -3737,7 +3754,7 @@
    <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
   </text:sequence-decls>
   <text:p text:style-name="P9"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;sale in records&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P30"/>
+   <text:p text:style-name="P31"/>
   <table:table table:name="Table1" table:style-name="Table1">
    <table:table-column table:style-name="Table1.A"/>
    <table:table-row>
@@ -3789,9 +3806,7 @@
      <text:p text:style-name="P10">Agents</text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Table3.A1" office:value-type="string">
-      <text:p text:style-name="P7">ALLLUCK COTTON CO. LTD.</text:p>
-      <text:p text:style-name="P7">FALT/RM A 12/F ZJ 300,</text:p>
-      <text:p text:style-name="P7">300 LOCKHART ROAD, WAN CHAI, HONG KONG</text:p>
+      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;sale.report_agent&gt;</text:placeholder></text:p>
     </table:table-cell>
    </table:table-row>
   </table:table>
@@ -3900,8 +3915,7 @@
      <text:p text:style-name="P23">Payment</text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Table7.A1" office:value-type="string">
-      <text:p text:style-name="P22"><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:s/></text:p>
-      <text:p text:style-name="P27"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12">BEFORE 5</text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T13">TH</text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"> JANUARY 2026 BY CABLE TRANSFER AT BUYER’S EXPENSES IN SELLER’S FAVOUR.</text:span></text:span></text:p>
+      <text:p text:style-name="P27"><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>
     </table:table-cell>
    </table:table-row>
    <table:table-row>