From f0b0666773899c2a5eb0fb1e9d1fac968a79e23f Mon Sep 17 00:00:00 2001
From: laurentbarontini <l.barontini@open-squared.ch>
Date: Thu, 26 Mar 2026 19:50:27 +0100
Subject: [PATCH] 26.03.26

---
 modules/account_invoice/invoice.xml           | 13 ++++++++++
 .../invoice_ict_final.fodt                    | 26 +++++++++----------
 modules/purchase_trade/invoice.xml            | 16 ------------
 modules/purchase_trade/setup.py               | 10 +++----
 modules/purchase_trade/tryton.cfg             |  1 -
 5 files changed, 31 insertions(+), 35 deletions(-)
 rename modules/{purchase_trade => account_invoice}/invoice_ict_final.fodt (99%)
 delete mode 100644 modules/purchase_trade/invoice.xml

diff --git a/modules/account_invoice/invoice.xml b/modules/account_invoice/invoice.xml
index 1f500ef..aeb62c8 100755
--- a/modules/account_invoice/invoice.xml
+++ b/modules/account_invoice/invoice.xml
@@ -318,6 +318,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="action" ref="report_prepayment"/>
         </record>
 
+        <record model="ir.action.report" id="report_invoice_ict_final">
+            <field name="name">Final Invoice</field>
+            <field name="model">account.invoice</field>
+            <field name="report_name">account.invoice</field>
+            <field name="report">account_invoice/invoice_ict_final.fodt</field>
+            <field name="single" eval="True"/>
+        </record>
+        <record model="ir.action.keyword" id="report_invoice_ict_final_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">account.invoice,-1</field>
+            <field name="action" ref="report_invoice_ict_final"/>
+        </record>
+
         <record model="ir.sequence.type" id="sequence_type_account_invoice">
             <field name="name">Invoice</field>
         </record>
diff --git a/modules/purchase_trade/invoice_ict_final.fodt b/modules/account_invoice/invoice_ict_final.fodt
similarity index 99%
rename from modules/purchase_trade/invoice_ict_final.fodt
rename to modules/account_invoice/invoice_ict_final.fodt
index a09960a..7e80ec8 100644
--- a/modules/purchase_trade/invoice_ict_final.fodt
+++ b/modules/account_invoice/invoice_ict_final.fodt
@@ -5,16 +5,16 @@
     <dc:title>Final Invoice</dc:title>
     <meta:initial-creator>willen</meta:initial-creator>
     <meta:creation-date>2018-12-09T16:20:00</meta:creation-date>
-    <dc:date>2026-03-26T19:27:43.538000000</dc:date>
+    <dc:date>2026-03-26T19:40:52.573000000</dc:date>
     <meta:print-date>2007-08-28T18:19:00</meta:print-date>
     <meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator>
-    <meta:editing-duration>PT3H3M36S</meta:editing-duration>
-    <meta:editing-cycles>4</meta:editing-cycles>
+    <meta:editing-duration>PT3H5M31S</meta:editing-duration>
+    <meta:editing-cycles>6</meta:editing-cycles>
     
-  <meta:document-statistic meta:table-count="10" meta:image-count="2" meta:object-count="0" meta:page-count="2" meta:paragraph-count="71" meta:word-count="252" meta:character-count="3258" meta:non-whitespace-character-count="2658"/></office:meta>
+  <meta:document-statistic meta:table-count="10" meta:image-count="2" meta:object-count="0" meta:page-count="2" meta:paragraph-count="71" meta:word-count="247" meta:character-count="3198" meta:non-whitespace-character-count="2602"/></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" config:type="long">9878</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">7144</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">27264</config:config-item>
    <config:config-item config:name="ViewAreaHeight" config:type="long">13187</config:config-item>
@@ -23,12 +23,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">10084</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">15993</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">18336</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">26861</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">9878</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">7144</config:config-item>
      <config:config-item config:name="VisibleRight" config:type="long">27263</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">23063</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">20329</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>
@@ -101,7 +101,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">248552</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">336932</config:config-item>
    <config:config-item config:name="RsidRoot" config:type="int">84510</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>
@@ -172,7 +172,7 @@
  <office:styles>
   <style:default-style style:family="graphic">
    <style:graphic-properties svg:stroke-color="#808080" draw:fill-color="#cfe7f5" fo:wrap-option="no-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="true"/>
-   <style:paragraph-properties style:text-autospace="none" style:line-break="strict" loext:tab-stop-distance="0cm" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
+   <style:paragraph-properties style:text-autospace="none" style:line-break="strict" loext:tab-stop-distance="0cm" style:font-independent-line-spacing="false">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman" fo:font-size="12pt" fo:language="fr" fo:country="CH" style:letter-kerning="true" style:font-name-asian="Times New Roman" style:font-size-asian="12pt" style:language-asian="fr" style:country-asian="CH" style:font-name-complex="Times New Roman" style:font-size-complex="12pt" style:language-complex="fr" style:country-complex="CH"/>
@@ -3991,11 +3991,11 @@
       <text:p text:style-name="P14">WE CERTIFY THAT THE MERCHANDISE IS OF BRAZIL ORIGIN</text:p>
       <text:p text:style-name="P29">L/C NUMBER <text:placeholder text:placeholder-type="text">&lt;invoice.reference or &apos;&apos;&gt;</text:placeholder></text:p>
       <text:p text:style-name="P29">IMPORTER H.S. CODE NOS. <text:placeholder text:placeholder-type="text">&lt;invoice.party_tax_identifier.type_string if invoice.party_tax_identifier else &apos;5201.0090&apos;&gt;</text:placeholder><text:s/></text:p>
-      <text:p text:style-name="P29">IMPORTER’S NTN <text:placeholder text:placeholder-type="text">&lt;invoice.party_tax_identifier.code if invoice.party_tax_identifier else &apos;&apos;&gt;</text:placeholder><text:s/></text:p>
+      <text:p text:style-name="P29">IMPORTER NTN <text:placeholder text:placeholder-type="text">&lt;invoice.party_tax_identifier.code if invoice.party_tax_identifier else &apos;&apos;&gt;</text:placeholder><text:s/></text:p>
       <text:p text:style-name="P29"/>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau8.A1" office:value-type="string">
-      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;invoice.currency.symbol if invoice.currency else &apos;USD&apos;&gt;</text:placeholder><text:soft-page-break/><text:s text:c="3"/><text:placeholder text:placeholder-type="text">&lt;format_currency(invoice.total_amount, invoice.party.lang, invoice.currency)&gt;</text:placeholder><text:s/></text:p>
+      <text:p text:style-name="P32"><text:s text:c="3"/><text:placeholder text:placeholder-type="text">&lt;format_currency(invoice.total_amount, invoice.party.lang, invoice.currency)&gt;</text:placeholder><text:soft-page-break/><text:s/></text:p>
       <text:p text:style-name="P21"/>
       <text:p text:style-name="P31"/>
      </table:table-cell>
diff --git a/modules/purchase_trade/invoice.xml b/modules/purchase_trade/invoice.xml
deleted file mode 100644
index c05edbd..0000000
--- a/modules/purchase_trade/invoice.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<tryton>
-    <data>
-        <record model="ir.action.report" id="report_invoice_ict_final">
-            <field name="name">Final Invoice</field>
-            <field name="model">account.invoice</field>
-            <field name="report_name">account.invoice</field>
-            <field name="report">purchase_trade/invoice_ict_final.fodt</field>
-        </record>
-        <record model="ir.action.keyword" id="report_invoice_ict_final_keyword">
-            <field name="keyword">form_print</field>
-            <field name="model">account.invoice,-1</field>
-            <field name="action" ref="report_invoice_ict_final"/>
-        </record>
-    </data>
-</tryton>
diff --git a/modules/purchase_trade/setup.py b/modules/purchase_trade/setup.py
index 60d91b6..58a5ffc 100755
--- a/modules/purchase_trade/setup.py
+++ b/modules/purchase_trade/setup.py
@@ -67,10 +67,10 @@ setup(name=name,
         + ['trytond.modules.purchase_trade.%s' % p
             for p in find_packages()]
         ),
-    package_data={
-        'trytond.modules.purchase_trade': (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
-        },
+    package_data={
+        'trytond.modules.purchase_trade': (info.get('xml', [])
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
+        },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
@@ -120,4 +120,4 @@ setup(name=name,
     [trytond.modules]
     purchase_trade = trytond.modules.purchase_trade
     """,
-    )
\ No newline at end of file
+    )
diff --git a/modules/purchase_trade/tryton.cfg b/modules/purchase_trade/tryton.cfg
index cb663bd..e125de5 100755
--- a/modules/purchase_trade/tryton.cfg
+++ b/modules/purchase_trade/tryton.cfg
@@ -34,4 +34,3 @@ xml:
     weight_report.xml
     dimension.xml
     backtoback.xml
-    invoice.xml