diff --git a/modules/sale/sale_final.fodt b/modules/sale/sale_final.fodt
index 24272d4..e6e9b18 100644
--- a/modules/sale/sale_final.fodt
+++ b/modules/sale/sale_final.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/><dc:description/><dc:subject/><meta:initial-creator>Aksel Kamhi</meta:initial-creator><meta:creation-date>2026-03-11T17:00:00Z</meta:creation-date><dc:date>2026-03-12T14:55:45.221000000</dc:date><meta:print-date>2025-12-11T15:32:00Z</meta:print-date><meta:editing-cycles>16</meta:editing-cycles><meta:editing-duration>PT58M54S</meta:editing-duration><meta:document-statistic meta:table-count="3" meta:image-count="2" meta:object-count="0" meta:page-count="3" meta:paragraph-count="51" meta:word-count="180" meta:character-count="1957" meta:non-whitespace-character-count="1760"/><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:creation-date>2026-03-11T17:00:00Z</meta:creation-date><dc:date>2026-03-12T15:13:33.798000000</dc:date><meta:print-date>2025-12-11T15:32:00Z</meta:print-date><meta:editing-cycles>17</meta:editing-cycles><meta:editing-duration>PT1H1M46S</meta:editing-duration><meta:document-statistic meta:table-count="3" meta:image-count="2" meta:object-count="0" meta:page-count="3" meta:paragraph-count="51" meta:word-count="168" meta:character-count="1931" meta:non-whitespace-character-count="1744"/><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">49553</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">41102</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">4461</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">53765</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">13767</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">48006</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">49553</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">41102</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">61272</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">52821</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">2303505</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">2351756</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>
@@ -159,7 +159,7 @@
  <office:styles>
   <style:default-style style:family="graphic">
    <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.035cm" svg:stroke-color="#042433" draw:stroke-linejoin="miter" svg:stroke-linecap="butt" draw:fill-color="#156082" 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="107%" 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="107%" 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="Aptos" fo:font-size="11pt" fo:letter-spacing="normal" fo:language="en" fo:country="GB" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" style:font-name-asian="Aptos" style:font-size-asian="11pt" style:language-asian="en" style:country-asian="US" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Times New Roman" 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"/>
@@ -418,13 +418,13 @@
    <style:table-cell-properties fo:padding-left="0.123cm" fo:padding-right="0.123cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="1pt solid #000000" style:writing-mode="lr-tb"/>
   </style:style>
   <style:style style:name="Tableau3" style:family="table">
-   <style:table-properties style:width="8.283cm" fo:margin-left="0cm" table:align="left"/>
+   <style:table-properties style:width="9.8cm" table:align="left"/>
   </style:style>
   <style:style style:name="Tableau3.A" style:family="table-column">
    <style:table-column-properties style:column-width="6.481cm"/>
   </style:style>
   <style:style style:name="Tableau3.B" style:family="table-column">
-   <style:table-column-properties style:column-width="1.803cm"/>
+   <style:table-column-properties style:column-width="3.32cm"/>
   </style:style>
   <style:style style:name="Tableau3.A1" 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="1pt solid #000000" style:writing-mode="lr-tb"/>
@@ -456,84 +456,92 @@
    <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="P6" 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%" fo:text-align="center" style:justify-single-word="false"/>
+   <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="P7" style:family="paragraph" style:parent-style-name="Normal">
    <style:paragraph-properties fo:margin-left="0.878cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%">
     <style:tab-stops/>
    </style:paragraph-properties>
   </style:style>
-  <style:style style:name="P7" 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="P8" 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%" fo:text-align="end" style:justify-single-word="false"/>
+   <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="P9" 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%" fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P10" 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%" fo:text-align="end" style:justify-single-word="false"/>
    <style:text-properties officeooo:paragraph-rsid="001fbf24"/>
   </style:style>
-  <style:style style:name="P10" 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 officeooo:paragraph-rsid="0021d479"/>
-  </style:style>
-  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Normal">
+  <style:style style:name="P11" 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 officeooo:paragraph-rsid="0021d479"/>
   </style:style>
   <style:style style:name="P12" 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="001fbf24"/>
+   <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 officeooo:paragraph-rsid="0021d479"/>
   </style:style>
   <style:style style:name="P13" 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 fo:color="#000000" loext:opacity="100%" style:font-name="Arial" fo:font-size="8pt" fo:font-weight="bold" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+   <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 officeooo:paragraph-rsid="00232611"/>
   </style:style>
   <style:style style:name="P14" 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 fo:color="#000000" loext:opacity="100%" style:font-name="Arial" fo:font-size="9pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="9pt" style:font-name-complex="Arial" style:font-size-complex="9pt"/>
+   <style:text-properties officeooo:paragraph-rsid="001fbf24"/>
   </style:style>
   <style:style style:name="P15" 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%" fo:text-align="center" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P16" 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%" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties officeooo:paragraph-rsid="001fbf24"/>
+  </style:style>
+  <style:style style:name="P17" 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%" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties officeooo:paragraph-rsid="00232611"/>
+  </style:style>
+  <style:style style:name="P18" 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="00232611"/>
+  </style:style>
+  <style:style style:name="P19" 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 fo:color="#000000" loext:opacity="100%" style:font-name="Arial" fo:font-size="8pt" fo:font-weight="bold" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="P20" 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 fo:color="#000000" loext:opacity="100%" style:font-name="Arial" fo:font-size="9pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="9pt" style:font-name-complex="Arial" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="P21" 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 fo:color="#000000" loext:opacity="100%" 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="P16" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+  <style:style style:name="P22" 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="P17" style:family="paragraph" style:parent-style-name="Texte_20_par_20_défaut">
+  <style:style style:name="P23" 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="P18" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P24" 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="P19" 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="P20" 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%" fo:text-align="center" style:justify-single-word="false"/>
-  </style:style>
-  <style:style style:name="P21" 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%" fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties officeooo:paragraph-rsid="001fbf24"/>
-  </style:style>
-  <style:style style:name="P22" 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%" fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties officeooo:paragraph-rsid="00232611"/>
-  </style:style>
-  <style:style style:name="P23" 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%" fo:text-align="end" style:justify-single-word="false"/>
-   <style:text-properties officeooo:paragraph-rsid="00232611"/>
-  </style:style>
-  <style:style style:name="P24" 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="00232611"/>
-  </style:style>
   <style:style style:name="P25" 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%" fo:text-align="center" style:justify-single-word="false"/>
+   <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="P26" 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="0023e28c"/>
+  </style:style>
+  <style:style style:name="P27" 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="P26" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+  <style:style style:name="P28" 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>
@@ -638,7 +646,7 @@
     <table:table-row>
      <table:table-cell table:style-name="Tableau1.A1" table:number-columns-spanned="2" office:value-type="string">
       <text:p text:style-name="P1"/>
-      <text:p text:style-name="P6"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T1"><draw:frame draw:style-name="fr1" draw:name="Picture 1" text:anchor-type="as-char" svg:y="0cm" svg:width="5.969cm" style:rel-width="scale" svg:height="3.577cm" style:rel-height="scale" draw:z-index="0"><draw:image draw:mime-type="image/png">
+      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T1"><draw:frame draw:style-name="fr1" draw:name="Picture 1" text:anchor-type="as-char" svg:y="0cm" svg:width="5.969cm" style:rel-width="scale" svg:height="3.577cm" style:rel-height="scale" draw:z-index="0"><draw:image draw:mime-type="image/png">
            <office:binary-data>iVBORw0KGgoAAAANSUhEUgAAAgUAAAE2CAYAAADxmuGTAAAAAXNSR0IArs4c6QAAAARnQU1B
             AACxjwv8YQUAAAAJcEhZcwAAIdUAACHVAQSctJ0AAP+lSURBVHhevL132GVFsT08Oc+8E2Ey
             w2RABZEsQTKSJCjBRHRMXANwlSQqEocoIkrOYYhDBkWCJEVFgoJKUAQFRBCQJKP296yuXefU
@@ -2418,14 +2426,14 @@
      <table:covered-table-cell/>
      <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
       <text:p text:style-name="P3"/>
-      <text:h text:style-name="P19" text:outline-level="1"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T3">COMMERCIAL INVOICE</text:span></text:span></text:h>
+      <text:h text:style-name="P25" text:outline-level="1"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T3">COMMERCIAL INVOICE</text:span></text:span></text:h>
       <text:p text:style-name="P2"/>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T4">Invoice Nr: <text:tab/><text:tab/><text:tab/>Date:</text:span></text:span></text:p>
-      <text:p text:style-name="P13"/>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T4"><text:placeholder text:placeholder-type="text">&lt;sale.report_deal&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T5"><text:s text:c="48"/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T4"><text:placeholder text:placeholder-type="text">&lt;format_date(sale.sale_date, sale.party.lang) if sale.sale_date else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T4">Invoice Nr: <text:tab/><text:tab/><text:tab/>Date:</text:span></text:span></text:p>
+      <text:p text:style-name="P19"/>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T4"><text:placeholder text:placeholder-type="text">&lt;sale.report_deal&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T5"><text:s text:c="48"/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T4"><text:placeholder text:placeholder-type="text">&lt;format_date(sale.sale_date, sale.party.lang) if sale.sale_date else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
       <text:p text:style-name="P3"/>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T4">Order reference:</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="T4"><text:placeholder text:placeholder-type="text">&lt;sale.reference or &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T4">Order reference:</text:span></text:span></text:p>
+      <text:p text:style-name="P14"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T4"><text:placeholder text:placeholder-type="text">&lt;sale.reference or &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
@@ -2435,13 +2443,12 @@
      <table:covered-table-cell/>
      <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
       <text:p text:style-name="P4"/>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Buyer:</text:span></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T7"><text:placeholder text:placeholder-type="text">&lt;sale.party.rec_name&gt;</text:placeholder></text:span></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T7"><text:placeholder text:placeholder-type="text">&lt;&apos;TAX ID: &apos; + sale.party.tax_identifier.code if sale.party.tax_identifier else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T7"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.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="T7"><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="T7"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:span></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T7"/></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T7"/></text:span></text:p>
-      <text:p text:style-name="P5"/>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Buyer:</text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T7"><text:placeholder text:placeholder-type="text">&lt;sale.party.rec_name&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T7"><text:placeholder text:placeholder-type="text">&lt;&apos;TAX ID: &apos; + sale.party.tax_identifier.code if sale.party.tax_identifier else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T7"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.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="T7"><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="T7"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T7"/></text:span></text:p>
+      <text:p text:style-name="P4"/>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
@@ -2450,49 +2457,47 @@
      </table:table-cell>
      <table:covered-table-cell/>
      <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Payment terms:</text:span></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.payment_term.description if sale.payment_term 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="T9"> </text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Payment terms:</text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.payment_term.description if sale.payment_term 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="T9"> </text:span></text:span></text:p>
       <text:p text:style-name="P4"/>
-      <text:p text:style-name="P14">Bank: UBS SWITZERLAND AG</text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9">Case Postale </text:span></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9">CH-1211 Genève 2</text:span></text:span></text:p>
-      <text:p text:style-name="P4"/>
-      <text:p text:style-name="P15">IBAN : CH36 0021 5215 2487 7461 D</text:p>
-      <text:p text:style-name="P15">SwifT Code: UBSWCHZH80A</text:p>
+      <text:p text:style-name="P20">Bank: UBS SWITZERLAND AG</text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9">Case Postale </text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9">CH-1211 Genève 2</text:span></text:span></text:p>
       <text:p text:style-name="P4"/>
+      <text:p text:style-name="P21">IBAN : CH36 0021 5215 2487 7461 D</text:p>
+      <text:p text:style-name="P21">SwifT Code: UBSWCHZH80A</text:p>
       <text:p text:style-name="P4"/>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
       <text:p text:style-name="P4"/>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Shipment date:</text:span></text:span></text:p>
-      <text:p text:style-name="P7"><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(sale.sale_date, sale.party.lang) if sale.sale_date else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Shipment date:</text:span></text:span></text:p>
+      <text:p text:style-name="P8"><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(sale.sale_date, sale.party.lang) if sale.sale_date else &apos;&apos;&gt;</text:placeholder></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="P4"/>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Transportation:</text:span></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.report_shipment&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:line-break/><text:line-break/></text:span></text:span></text:p>
-      <text:p text:style-name="P4"/>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Transportation:</text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.report_shipment&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:line-break/><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="P4"/>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Terms of delivery:</text:span></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.incoterm.code if sale.incoterm else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Terms of delivery:</text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.incoterm.code if sale.incoterm else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">From:</text:span></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.from_location.name if sale.from_location else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">From:</text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.from_location.name if sale.from_location else &apos;&apos;&gt;</text:placeholder></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="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">To:</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="T9"><text:placeholder text:placeholder-type="text">&lt;sale.to_location.name if sale.to_location else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">To:</text:span></text:span></text:p>
+      <text:p text:style-name="P14"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.to_location.name if sale.to_location else &apos;&apos;&gt;</text:placeholder></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="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Origin:</text:span></text:span></text:p>
-      <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.origin&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Origin:</text:span></text:span></text:p>
+      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.origin&gt;</text:placeholder></text:span></text:span></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
@@ -2504,31 +2509,31 @@
     <table:table-column table:style-name="Tableau2.D"/>
     <table:table-row>
      <table:table-cell table:style-name="Tableau2.A1" office:value-type="string">
-      <text:p text:style-name="P20"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Quantity</text:span></text:span></text:p>
+      <text:p text:style-name="P15"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Quantity</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="P20"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Goods Description</text:span></text:span></text:p>
+      <text:p text:style-name="P15"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Goods Description</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="P20"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Unit Price / mt</text:span></text:span></text:p>
+      <text:p text:style-name="P15"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Unit Price / mt</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="P20"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">US Dollar Amount</text:span></text:span></text:p>
+      <text:p text:style-name="P15"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">US Dollar Amount</text:span></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tableau2.A1" office:value-type="string">
-      <text:p text:style-name="P22"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(sale.lines[0].quantity, sale.party.lang, sale.lines[0].unit, digits=2)&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P17"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(sale.lines[0].quantity, sale.party.lang, sale.lines[0].unit, digits=2)&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="P20"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].product.name if sale.lines[0].product else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
-      <text:p text:style-name="P25"/>
+      <text:p text:style-name="P15"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].product.name if sale.lines[0].product else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P6"/>
      </table:table-cell>
      <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="T9"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P16"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:s/></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.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="P16" loext:marker-style-name="T18"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P22" loext:marker-style-name="T18"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T15"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:span></text:span></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
@@ -2536,53 +2541,52 @@
    <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"/>
-    <text:soft-page-break/>
     <table:table-row>
      <table:table-cell table:style-name="Tableau3.A1" office:value-type="string">
-      <text:p text:style-name="P17"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;sale.lines[0].price_composition&quot;&gt;</text:placeholder></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="T8"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;sale.lines[0].price_composition&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="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"/></text:span></text:p>
+      <text:p text:style-name="P9"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"/></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="P10"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;pc in sale.lines[0].price_composition&quot;&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P11"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;pc in sale.lines[0].price_composition&quot;&gt;</text:placeholder></text:span></text:span><text:soft-page-break/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau3.A1" office:value-type="string">
-      <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"/></text:span></text:p>
+      <text:p text:style-name="P9"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"/></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="P11"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;pc.component&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:s/>Value in </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;sale.currency.name&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="T8"><text:placeholder text:placeholder-type="text">&lt;pc.component&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:s/>Value in </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;sale.currency.name&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="P23"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;format_currency(pc.price, sale.party.lang, sale.currency)&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P13"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;format_currency(pc.price, sale.party.lang, sale.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.A4" office:value-type="string">
-      <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P24"><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="P8"/>
+      <text:p text:style-name="P9"/>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
      <table:table-cell table:style-name="Tableau3.A4" office:value-type="string">
-      <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P24"><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="P8"/>
+      <text:p text:style-name="P9"/>
      </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="P11"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8">Total </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;sale.incoterm.code if sale.incoterm 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="T8"><text:s/>Value in </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;sale.currency.name&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="T8">Total </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T10"><text:placeholder text:placeholder-type="text">&lt;sale.incoterm.code if sale.incoterm 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="T8"><text:s/>Value in </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;sale.currency.name&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="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:span></text:span></text:p>
+      <text:p text:style-name="P9"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T8"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:span></text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
@@ -2595,10 +2599,10 @@
     </table:table-row>
    </table:table>
    <text:p text:style-name="P4"/>
-   <text:p text:style-name="P24"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Net weight: </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;sale.report_net 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="T9"><text:s/></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;sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else &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="T6">Gross weight: </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;sale.report_gross 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="T9"><text:s/></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;sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+   <text:p text:style-name="P26"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Net weight: </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(sale.lines[0].report_net, sale.party.lang, sale.lines[0].unit, digits=2)&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:s/></text:span></text:span></text:p>
+   <text:p text:style-name="P26"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Gross weight: </text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T12"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(sale.lines[0].report_gross, sale.party.lang, sale.lines[0].unit, digits=2)&gt;</text:placeholder></text:span></text:span><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T9"><text:s/></text:span></text:span></text:p>
    <text:p text:style-name="P4"/>
-   <text:p text:style-name="P7"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Packaging: </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;sale.report_packing or &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
+   <text:p text:style-name="P8"><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T6">Packaging: </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;sale.report_packing or &apos;&apos;&gt;</text:placeholder></text:span></text:span></text:p>
    <text:p text:style-name="Normal"/>
    <text:p text:style-name="Normal"/>
    <text:p text:style-name="Normal"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:span text:style-name="Police_20_par_20_défaut"><text:span text:style-name="T1"><draw:frame draw:style-name="fr1" draw:name="Image1" text:anchor-type="as-char" svg:y="0cm" svg:width="3.281cm" style:rel-width="scale" svg:height="2.088cm" style:rel-height="scale" draw:z-index="1"><draw:image draw:mime-type="image/png">