From 979bbec013b1d7e79372d0b1d07dc5496cdf56d0 Mon Sep 17 00:00:00 2001
From: laurentbarontini <l.barontini@open-squared.ch>
Date: Tue, 28 Jul 2026 14:04:17 +0200
Subject: [PATCH] Melya report

---
 modules/account_invoice/invoice_melya.fodt | 110 +++++++++------------
 1 file changed, 44 insertions(+), 66 deletions(-)

diff --git a/modules/account_invoice/invoice_melya.fodt b/modules/account_invoice/invoice_melya.fodt
index 092e296..e29d48a 100644
--- a/modules/account_invoice/invoice_melya.fodt
+++ b/modules/account_invoice/invoice_melya.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/><dc:description/><dc:subject/><meta:initial-creator>Aksel Kamhi</meta:initial-creator><meta:editing-cycles>27</meta:editing-cycles><meta:editing-duration>PT1H24M14S</meta:editing-duration><dc:date>2026-07-28T12:02:32.466000000</dc:date><meta:document-statistic meta:table-count="3" meta:image-count="1" meta:object-count="0" meta:page-count="3" meta:paragraph-count="58" meta:word-count="215" meta:character-count="2690" meta:non-whitespace-character-count="2256"/><meta:user-defined meta:name="ContentTypeId">0x010100C9130B1D3286474FB2D468C22F52A7B0</meta:user-defined><meta:template xlink:type="simple" xlink:actuate="onRequest" xlink:title="" xlink:href="./INVOICE%20MASK.odt/Normal.dotm"/></office:meta>
+ <office:meta><meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator><dc:title/><dc:description/><dc:subject/><meta:initial-creator>Aksel Kamhi</meta:initial-creator><meta:editing-cycles>29</meta:editing-cycles><meta:editing-duration>PT1H27M3S</meta:editing-duration><dc:date>2026-07-28T14:03:57.347000000</dc:date><meta:document-statistic meta:table-count="3" meta:image-count="1" meta:object-count="0" meta:page-count="3" meta:paragraph-count="59" meta:word-count="215" meta:character-count="2695" meta:non-whitespace-character-count="2256"/><meta:user-defined meta:name="ContentTypeId">0x010100C9130B1D3286474FB2D468C22F52A7B0</meta:user-defined><meta:template xlink:type="simple" xlink:actuate="onRequest" xlink:title="" xlink:href="./INVOICE%20MASK.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">70660</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">39471</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">12222</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">5376</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">75925</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">14490</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">48154</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">70660</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">39471</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">82880</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">51190</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">2947209</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">3065690</config:config-item>
    <config:config-item config:name="RsidRoot" config:type="int">1803951</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>
@@ -473,9 +473,6 @@
   <style:style style:name="Tableau3.A4" style:family="table-cell">
    <style:table-cell-properties fo:padding-left="0.123cm" fo:padding-right="0.123cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border-left="1pt solid #000000" fo:border-right="1pt solid #000000" fo:border-top="none" fo:border-bottom="1pt solid #000000" style:writing-mode="lr-tb"/>
   </style:style>
-  <style:style style:name="Tableau3.B7" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0cm" fo:border="none"/>
-  </style:style>
   <style:style style:name="P1" style:family="paragraph" style:parent-style-name="MelyaFooterVat">
    <style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
@@ -583,56 +580,47 @@
   <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Standard">
    <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Arial mt1" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+  <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Arial mt1" fo:font-size="8pt" fo:font-weight="bold" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties style:font-name="Arial mt" officeooo:paragraph-rsid="001fbf24"/>
   </style:style>
-  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Texte_20_par_20_défaut">
+  <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Texte_20_par_20_défaut">
    <style:text-properties fo:font-size="9pt" fo:language="en" fo:country="US" officeooo:paragraph-rsid="0021d479" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
   </style:style>
-  <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="end" style:justify-single-word="false"/>
    <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:font-weight="bold" officeooo:paragraph-rsid="0021d479" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+  </style:style>
+  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+  </style:style>
+  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties style:font-name="Arial mt" officeooo:paragraph-rsid="001fbf24"/>
   </style:style>
-  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
-  </style:style>
-  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
-   <style:text-properties officeooo:paragraph-rsid="002836ef"/>
-  </style:style>
-  <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
-   <style:text-properties style:font-name="Times New Roman" fo:font-size="12pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="12pt" style:font-name-complex="Times New Roman" style:font-size-complex="12pt"/>
-  </style:style>
   <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.423cm" style:contextual-spacing="false" fo:line-height="100%"/>
-   <style:text-properties style:font-name="Times New Roman" fo:font-size="8pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="8pt" style:font-name-complex="Times New Roman" style:font-size-complex="8pt"/>
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
   </style:style>
   <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
+   <style:text-properties officeooo:paragraph-rsid="002ec75a"/>
   </style:style>
-  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Arial mt1" fo:font-size="8pt" fo:font-weight="bold" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="10pt" style:font-name-complex="Arial" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:line-height="40%"/>
-   <style:text-properties fo:font-size="8pt" officeooo:paragraph-rsid="002b465b" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
-  <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:line-height="40%"/>
-   <style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-  </style:style>
-  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Arial mt1" fo:font-size="8pt" fo:font-weight="bold" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties officeooo:rsid="0029edf7"/>
@@ -1673,7 +1661,7 @@
      <table:covered-table-cell/>
      <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
       <text:p text:style-name="P7"/>
-      <text:h text:style-name="P33" text:outline-level="1"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8">COMMERCIAL INVOICE</text:span></text:span></text:h>
+      <text:h text:style-name="P36" text:outline-level="1"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8">COMMERCIAL INVOICE</text:span></text:span></text:h>
       <text:p text:style-name="P6"/>
       <text:p text:style-name="P24"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9">Invoice: </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;invoice.number or &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
       <text:p text:style-name="P24"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9">Date: </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;format_date(invoice.invoice_date, invoice.party.lang) if invoice.invoice_date else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
@@ -1687,7 +1675,6 @@
      </table:table-cell>
      <table:covered-table-cell/>
      <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
-      <text:p text:style-name="P8"/>
       <text:p text:style-name="P12"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12">Buyer:</text:span></text:span></text:p>
       <text:p text:style-name="P12"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T13"><text:placeholder text:placeholder-type="text">&lt;&apos;TAX ID: &apos; + invoice.party_tax_identifier.code if invoice.party_tax_identifier else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
       <text:p text:style-name="P12"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T13"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in invoice.report_address.splitlines()&quot;&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T13"><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T13"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:span></text:span></text:p>
@@ -1709,8 +1696,7 @@
       <text:p text:style-name="P12"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:span></text:span></text:p>
       <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
       <text:p text:style-name="P8"/>
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;invoice.report_melya_bank_account_line&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P8"/>
+      <text:p text:style-name="P38"><text:span text:style-name="T5"><text:placeholder text:placeholder-type="text">&lt;invoice.report_melya_bank_account_line&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
@@ -1720,7 +1706,7 @@
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
       <text:p text:style-name="P12"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12">Transportation:</text:span></text:span></text:p>
-      <text:p text:style-name="P12"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_transportation or &apos;&apos;&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:line-break/><text:line-break/></text:span></text:span></text:p>
+      <text:p text:style-name="P12"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_transportation or &apos;&apos;&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:line-break/></text:span></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
       <text:p text:style-name="P12"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12">Terms of delivery:</text:span></text:span></text:p>
@@ -1764,7 +1750,7 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tableau2.A1" office:value-type="string">
-      <text:p text:style-name="P21"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T19"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(invoice.report_net, invoice.party.lang, invoice.lines[0].unit, digits=4) if invoice.lines else &apos;&apos;&gt;</text:placeholder></text:span></text:span><text:soft-page-break/></text:p>
+      <text:p text:style-name="P21"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T19"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(invoice.report_net, invoice.party.lang, invoice.lines[0].unit, digits=4) if invoice.lines else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau2.A1" office:value-type="string">
       <text:p text:style-name="P19"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_product_name or &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
@@ -1775,17 +1761,17 @@
       <text:p text:style-name="P20"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;format_currency(invoice.lines[0].unit_price, invoice.party.lang, invoice.currency) if invoice.lines else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau2.A1" office:value-type="string">
-      <text:p text:style-name="P29" loext:marker-style-name="T28"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T22"><text:placeholder text:placeholder-type="text">&lt;format_currency(invoice.untaxed_amount, invoice.party.lang, invoice.currency)&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P30" loext:marker-style-name="T28"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T22"><text:placeholder text:placeholder-type="text">&lt;format_currency(invoice.untaxed_amount, invoice.party.lang, invoice.currency)&gt;</text:placeholder></text:span></text:span></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P8"/>
+   <text:p text:style-name="P8"><text:soft-page-break/></text:p>
    <table:table table:name="Tableau3" table:style-name="Tableau3">
     <table:table-column table:style-name="Tableau3.A"/>
     <table:table-column table:style-name="Tableau3.B"/>
     <table:table-row>
      <table:table-cell table:style-name="Tableau3.A1" office:value-type="string">
-      <text:p text:style-name="P30"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T14"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;invoice.report_melya_rate_rows&quot;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P31"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T14"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;invoice.report_melya_rate_rows&quot;&gt;</text:placeholder></text:span></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau3.A1" office:value-type="string">
       <text:p text:style-name="P13"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T14"/></text:span></text:p>
@@ -1809,7 +1795,7 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tableau3.A4" office:value-type="string">
-      <text:p text:style-name="P31"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau3.A4" office:value-type="string">
       <text:p text:style-name="P13"/>
@@ -1817,7 +1803,7 @@
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tableau3.A4" office:value-type="string">
-      <text:p text:style-name="P31"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau3.A4" office:value-type="string">
       <text:p text:style-name="P13"/>
@@ -1831,27 +1817,19 @@
       <text:p text:style-name="P13"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T14"><text:placeholder text:placeholder-type="text">&lt;format_currency(invoice.untaxed_amount, invoice.party.lang, invoice.currency)&gt;</text:placeholder></text:span></text:span></text:p>
      </table:table-cell>
     </table:table-row>
-    <table:table-row>
-     <table:table-cell table:style-name="Tableau3.A1" office:value-type="string">
-      <text:p text:style-name="P8"/>
-     </table:table-cell>
-     <table:table-cell table:style-name="Tableau3.B7" office:value-type="string">
-      <text:p text:style-name="P8"/>
-     </table:table-cell>
-    </table:table-row>
    </table:table>
-   <text:p text:style-name="P8"/>
    <text:p text:style-name="P23"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12">Net weight: </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(invoice.report_net, invoice.party.lang, invoice.lines[0].unit, digits=4) if invoice.lines else &apos;&apos;&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:s/></text:span></text:span></text:p>
    <text:p text:style-name="P23"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12">Gross weight: </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T19"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(invoice.report_gross, invoice.party.lang, invoice.lines[0].unit, digits=4) if invoice.lines else &apos;&apos;&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:s/></text:span></text:span></text:p>
-   <text:p text:style-name="P12"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12">Packaging: </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_packaging or &apos;&apos;&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:s text:c="14"/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T16">Signed by : <text:s text:c="41"/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T10">MELYA S.A</text:span></text:span></text:p>
-   <text:p text:style-name="P37"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/> <text:s text:c="11"/><text:span text:style-name="T29">(The Seller)</text:span><text:tab/> <text:s text:c="3"/><text:tab/> <text:s text:c="6"/><text:span text:style-name="T33">13 RUE ROBERT CEARD</text:span></text:p>
-   <text:p text:style-name="P37"><text:span text:style-name="T29"><text:s text:c="143"/></text:span><text:span text:style-name="T33">CH-1204 GENEVA</text:span></text:p>
-   <text:p text:style-name="P37"><text:span text:style-name="T29"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/> <text:s text:c="14"/><text:tab/><text:tab/> <text:s/></text:span><text:span text:style-name="T33">SWITZERLAND</text:span></text:p>
-   <text:p text:style-name="P41"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P37"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12">Packaging: </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_packaging or &apos;&apos;&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:s text:c="14"/></text:span></text:span></text:p>
+   <text:p text:style-name="P37"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T16"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/>Signed by : <text:s text:c="41"/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T10">MELYA S.A</text:span></text:span></text:p>
+   <text:p text:style-name="P33"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/> <text:s text:c="11"/><text:span text:style-name="T29">(The Seller)</text:span><text:tab/> <text:s text:c="3"/><text:tab/> <text:s text:c="6"/><text:span text:style-name="T33">13 RUE ROBERT CEARD</text:span></text:p>
+   <text:p text:style-name="P33"><text:span text:style-name="T29"><text:s text:c="143"/></text:span><text:span text:style-name="T33">CH-1204 GENEVA</text:span></text:p>
+   <text:p text:style-name="P33"><text:span text:style-name="T29"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/> <text:s text:c="14"/><text:tab/><text:tab/> <text:s/></text:span><text:span text:style-name="T33">SWITZERLAND</text:span></text:p>
+   <text:p text:style-name="P34"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
    <text:p text:style-name="Standard"/>
    <text:p text:style-name="Standard" loext:marker-style-name="T5"><text:span text:style-name="T24"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/></text:span></text:p>
    <text:p text:style-name="Standard" loext:marker-style-name="T5"><text:span text:style-name="T24"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/></text:span></text:p>
-   <text:p text:style-name="P38" loext:marker-style-name="T24"/>
+   <text:p text:style-name="P29" loext:marker-style-name="T24"/>
   </office:text>
  </office:body>
 </office:document>
\ No newline at end of file