From 93f0e6b0afbfbffb4d2acf558e24a525aafaefae Mon Sep 17 00:00:00 2001
From: laurentbarontini <l.barontini@open-squared.ch>
Date: Sun, 15 Mar 2026 11:45:42 +0100
Subject: [PATCH] 15.03.26

---
 modules/purchase/purchase.py               |   2 +
 modules/purchase_trade/party.py            |   1 +
 modules/purchase_trade/view/party_form.xml |   3 +
 modules/sale/sale.py                       |   2 +
 modules/sale/sale_melya.fodt               | 515 +++++++++++----------
 5 files changed, 285 insertions(+), 238 deletions(-)

diff --git a/modules/purchase/purchase.py b/modules/purchase/purchase.py
index 57ab2fd..7378967 100755
--- a/modules/purchase/purchase.py
+++ b/modules/purchase/purchase.py
@@ -462,6 +462,8 @@ class Purchase(
                 self.tol_min = self.party.tol_min
             if self.party.tol_max:
                 self.tol_max = self.party.tol_max
+            if self.party.origin:
+                self.product_origin = self.party.origin
             if self.party.wb:
                 self.wb = self.party.wb
             if self.party.association:
diff --git a/modules/purchase_trade/party.py b/modules/purchase_trade/party.py
index b7bfc42..6024a54 100755
--- a/modules/purchase_trade/party.py
+++ b/modules/purchase_trade/party.py
@@ -80,6 +80,7 @@ class Party(metaclass=PoolMeta):
     tol_max = fields.Numeric("Tol + in %")
     wb = fields.Many2One('purchase.weight.basis',"Weight basis")
     association = fields.Many2One('purchase.association',"Association")
+    origin =fields.Char("Origin")
     execution = fields.One2Many('party.execution','party',"")
     sla = fields.One2Many('party.execution.sla','party', "Sla")
     initial = fields.Char("Initials")
diff --git a/modules/purchase_trade/view/party_form.xml b/modules/purchase_trade/view/party_form.xml
index 7df457d..fe7f3a5 100755
--- a/modules/purchase_trade/view/party_form.xml
+++ b/modules/purchase_trade/view/party_form.xml
@@ -12,6 +12,9 @@
             <label name="association"/>
             <field name="association"/>
             <newline/>
+            <label name="origin"/>
+            <field name="origin"/>
+            <newline/>
             <label name="initial"/>
             <field name="initial"/>
         </page>
diff --git a/modules/sale/sale.py b/modules/sale/sale.py
index 5d64968..440ac1e 100755
--- a/modules/sale/sale.py
+++ b/modules/sale/sale.py
@@ -508,6 +508,8 @@ class Sale(
                 self.tol_max = self.party.tol_max
             if self.party.wb:
                 self.wb = self.party.wb
+            if self.party.origin:
+                self.product_origin = self.party.origin
             if self.party.association:
                 self.association = self.party.association
             if self.party.sale_invoice_method:
diff --git a/modules/sale/sale_melya.fodt b/modules/sale/sale_melya.fodt
index c37b474..379da6f 100644
--- a/modules/sale/sale_melya.fodt
+++ b/modules/sale/sale_melya.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:date>2026-03-15T11:27:54.274000000</dc:date><meta:editing-duration>PT1H28M29S</meta:editing-duration><meta:editing-cycles>17</meta:editing-cycles><meta:document-statistic meta:table-count="1" meta:image-count="1" meta:object-count="0" meta:page-count="1" meta:paragraph-count="30" meta:word-count="116" meta:character-count="1282" meta:non-whitespace-character-count="1076"/></office:meta>
+ <office:meta><meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator><dc:date>2026-03-15T11:45:11.486000000</dc:date><meta:editing-duration>PT1H33M41S</meta:editing-duration><meta:editing-cycles>20</meta:editing-cycles><meta:document-statistic meta:table-count="1" meta:image-count="1" meta:object-count="0" meta:page-count="1" meta:paragraph-count="32" meta:word-count="131" meta:character-count="1497" meta:non-whitespace-character-count="1278"/></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" config:type="long">2477</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">6592</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">36352</config:config-item>
    <config:config-item config:name="ViewAreaHeight" config:type="long">18332</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">9675</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">16999</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">16238</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">15161</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">2477</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">6592</config:config-item>
      <config:config-item config:name="VisibleRight" config:type="long">36350</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">20807</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">24922</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">2596590</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">2838212</config:config-item>
    <config:config-item config:name="RsidRoot" config:type="int">1822556</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>
@@ -324,7 +324,7 @@
    <style:table-cell-properties style:vertical-align="" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="0.5pt solid #000000" fo:border-top="0.5pt solid #000000" fo:border-bottom="0.5pt solid #000000" style:writing-mode="lr-tb"/>
   </style:style>
   <style:style style:name="Tableau1.2" style:family="table-row">
-   <style:table-row-properties style:min-row-height="4.364cm" fo:keep-together="auto"/>
+   <style:table-row-properties style:min-row-height="3.013cm" fo:keep-together="auto"/>
   </style:style>
   <style:style style:name="Tableau1.A2" style:family="table-cell">
    <style:table-cell-properties style:vertical-align="" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border-left="0.5pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.5pt solid #000000" style:writing-mode="lr-tb"/>
@@ -365,47 +365,44 @@
   <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
    <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" officeooo:paragraph-rsid="0020f809" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
   </style:style>
-  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" officeooo:paragraph-rsid="00279eee" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="100%" 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" fo:font-size="9pt" officeooo:paragraph-rsid="00279eee" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0.272cm" style:line-height-at-least="0.776cm" 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" fo:font-size="9pt" officeooo:paragraph-rsid="001ca0a2" style:font-size-asian="9pt"/>
   </style:style>
-  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" 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" fo:font-size="9pt" style:font-size-asian="9pt"/>
   </style:style>
-  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
    <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" fo:font-weight="bold" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+  <style:style style:name="P14" 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" fo:font-size="9pt" fo:letter-spacing="-0.004cm" style:font-size-asian="9pt"/>
   </style:style>
-  <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="1.965cm" fo:margin-right="0cm" 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"/>
-  </style:style>
-  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="1.965cm" fo:margin-right="0cm" 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="00246a1a"/>
-  </style:style>
   <style:style style:name="P15" 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:paragraph-properties fo:margin-left="1.965cm" fo:margin-right="0cm" 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"/>
   </style:style>
   <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="1.965cm" 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:paragraph-properties fo:margin-left="1.965cm" fo:margin-right="0cm" 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="00246a1a"/>
@@ -414,180 +411,177 @@
    <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="00246a1a"/>
+   <style:text-properties style:font-name="Arial mt"/>
   </style:style>
   <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="1.965cm" 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="00246a1a"/>
+  </style:style>
+  <style:style style:name="P19" 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="00246a1a"/>
+  </style:style>
+  <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="0.342cm" 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 officeooo:paragraph-rsid="001ca0a2"/>
   </style:style>
-  <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
-   <style:text-properties fo:font-size="8.5pt" style:font-size-asian="8.5pt"/>
-  </style:style>
-  <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.011cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
-   <style:text-properties fo:font-size="8.5pt" style:font-size-asian="8.5pt"/>
-  </style:style>
   <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
     <style:tab-stops/>
    </style:paragraph-properties>
-  </style:style>
-  <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-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
-   <style:text-properties officeooo:paragraph-rsid="00201a57"/>
-  </style:style>
-  <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
-   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
-  </style:style>
-  <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.319cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
-   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
-  </style:style>
-  <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.025cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
-   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
-  </style:style>
-  <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.351cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
-   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
-  </style:style>
-  <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0.289cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
-   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
-  </style:style>
-  <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="2.466cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
-   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
-  </style:style>
-  <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="justify" 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 fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-  </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 fo:font-size="9pt" style:font-size-asian="9pt"/>
-  </style:style>
-  <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.351cm" fo:margin-bottom="0cm" style:contextual-spacing="false" 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 fo:font-size="9pt" style:font-size-asian="9pt"/>
-  </style:style>
-  <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0.272cm" style:line-height-at-least="0.776cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
-   <style:text-properties officeooo:paragraph-rsid="001ca0a2"/>
-  </style:style>
-  <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0.272cm" style:line-height-at-least="0.776cm" 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 officeooo:paragraph-rsid="001ca0a2"/>
-  </style:style>
-  <style:style style:name="P34" 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: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:line-height="0.342cm" 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" fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-  </style:style>
-  <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
-  </style:style>
-  <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.023cm" fo:margin-bottom="0.247cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
-  </style:style>
-  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
-  </style:style>
-  <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Text_20_body">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.023cm" fo:margin-bottom="0.247cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
-  </style:style>
-  <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" officeooo:paragraph-rsid="00279eee" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-  </style:style>
-  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="0.342cm" 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" fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-  </style:style>
-  <style:style style:name="P42" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="100%" 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" fo:font-size="9pt" officeooo:paragraph-rsid="00279eee" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-  </style:style>
-  <style:style style:name="P43" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
-    <style:tab-stops/>
-   </style:paragraph-properties>
    <style:text-properties fo:font-size="8.5pt" style:font-size-asian="8.5pt"/>
   </style:style>
-  <style:style style:name="P44" 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:margin-top="0.011cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties fo:font-size="8.5pt" style:font-size-asian="8.5pt"/>
   </style:style>
-  <style:style style:name="P45" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="2.466cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+  <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="0.342cm" 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 fo:font-size="8.5pt" style:font-size-asian="8.5pt"/>
+  </style:style>
+  <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+  </style:style>
+  <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties officeooo:paragraph-rsid="00201a57"/>
+  </style:style>
+  <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
   </style:style>
-  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+  <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.319cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
+  </style:style>
+  <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:margin-top="0.025cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
   </style:style>
-  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+  <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.351cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
+  </style:style>
+  <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0.289cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
+  </style:style>
+  <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="2.466cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
+  </style:style>
+  <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="justify" 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 fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="P33" 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 fo:font-size="9pt" style:font-size-asian="9pt"/>
+  </style:style>
+  <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.351cm" fo:margin-bottom="0cm" style:contextual-spacing="false" 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 fo:font-size="9pt" style:font-size-asian="9pt"/>
+  </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="0.272cm" style:line-height-at-least="0.776cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties officeooo:paragraph-rsid="001ca0a2"/>
+  </style:style>
+  <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0.272cm" style:line-height-at-least="0.776cm" 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 officeooo:paragraph-rsid="001ca0a2"/>
+  </style:style>
+  <style:style style:name="P37" 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:style>
+  <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="0.342cm" 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" fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+   <style:text-properties style:font-name="Arial Mt" fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
   </style:style>
-  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+  <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="100%" 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" fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+   <style:text-properties style:font-name="Arial Mt" fo:font-size="9pt" officeooo:paragraph-rsid="00279eee" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb"/>
+   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
+  </style:style>
+  <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.023cm" fo:margin-bottom="0.247cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb"/>
+   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
+  </style:style>
+  <style:style style:name="P42" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="100%" 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 officeooo:paragraph-rsid="00279eee"/>
+  </style:style>
+  <style:style style:name="P43" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties officeooo:rsid="0029805b" officeooo:paragraph-rsid="0029805b"/>
+  </style:style>
+  <style:style style:name="P44" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="0029805b" officeooo:paragraph-rsid="0029805b" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="P45" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb"/>
+   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
+  </style:style>
+  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.023cm" fo:margin-bottom="0.247cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb"/>
+   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
+  </style:style>
+  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="100%" 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" fo:font-size="9pt" officeooo:paragraph-rsid="00279eee" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="100%" 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 officeooo:paragraph-rsid="00279eee"/>
   </style:style>
   <style:style style:name="P49" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="100%" fo:text-align="center" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
@@ -596,34 +590,58 @@
    <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" officeooo:paragraph-rsid="00279eee" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
   </style:style>
   <style:style style:name="P50" 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:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="0.342cm" 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"/>
+   <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
   </style:style>
   <style:style style:name="P51" 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"/>
   </style:style>
   <style:style style:name="P52" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="0.342cm" 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 fo:font-size="8.5pt" style:font-size-asian="8.5pt"/>
+  </style:style>
+  <style:style style:name="P53" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.011cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="8.5pt" style:font-size-asian="8.5pt"/>
+  </style:style>
+  <style:style style:name="P54" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="2.466cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
+  </style:style>
+  <style:style style:name="P55" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.025cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
+  </style:style>
+  <style:style style:name="P56" 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:style>
+  <style:style style:name="P57" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="lr-tb">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties officeooo:paragraph-rsid="00201a57"/>
   </style:style>
-  <style:style style:name="P53" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
+  <style:style style:name="P58" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="0.342cm" 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 officeooo:paragraph-rsid="001ca0a2"/>
   </style:style>
-  <style:style style:name="P54" style:family="paragraph" style:parent-style-name="Table_20_Paragraph">
-   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:line-height="100%" 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 officeooo:paragraph-rsid="00279eee"/>
-  </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties style:font-name="Arial Mt" fo:font-size="16pt" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
   </style:style>
@@ -661,98 +679,122 @@
    <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" fo:letter-spacing="-0.004cm" style:font-size-asian="9pt"/>
   </style:style>
   <style:style style:name="T13" style:family="text">
-   <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" fo:letter-spacing="-0.009cm" fo:language="en" fo:country="GB" style:font-size-asian="9pt" style:font-name-complex="Arial2" style:font-size-complex="9pt"/>
+   <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" fo:letter-spacing="-0.004cm" fo:font-weight="normal" style:font-size-asian="9pt" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
   </style:style>
   <style:style style:name="T14" style:family="text">
-   <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" fo:letter-spacing="-0.009cm" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+   <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" fo:letter-spacing="-0.009cm" fo:language="en" fo:country="GB" style:font-size-asian="9pt" style:font-name-complex="Arial2" style:font-size-complex="9pt"/>
   </style:style>
   <style:style style:name="T15" style:family="text">
-   <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" fo:letter-spacing="-0.005cm" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+   <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" fo:letter-spacing="-0.009cm" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
   </style:style>
   <style:style style:name="T16" style:family="text">
-   <style:text-properties style:font-name="Arial mt" style:font-size-complex="9pt"/>
+   <style:text-properties style:font-name="Arial mt" fo:font-size="9pt" fo:letter-spacing="-0.005cm" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
   </style:style>
   <style:style style:name="T17" style:family="text">
-   <style:text-properties style:font-name="Arial mt" fo:letter-spacing="-0.005cm" style:font-size-complex="9pt"/>
+   <style:text-properties style:font-name="Arial mt" style:font-size-complex="9pt"/>
   </style:style>
   <style:style style:name="T18" style:family="text">
-   <style:text-properties style:font-name="Arial mt" fo:letter-spacing="-0.009cm" style:font-size-complex="9pt"/>
+   <style:text-properties style:font-name="Arial mt" fo:letter-spacing="-0.005cm" style:font-size-complex="9pt"/>
   </style:style>
   <style:style style:name="T19" style:family="text">
-   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
+   <style:text-properties style:font-name="Arial mt" fo:letter-spacing="-0.009cm" style:font-size-complex="9pt"/>
   </style:style>
   <style:style style:name="T20" style:family="text">
-   <style:text-properties fo:font-size="9pt" fo:letter-spacing="-0.005cm" style:font-size-asian="9pt"/>
+   <style:text-properties style:font-name="Arial mt" fo:font-size="10pt" fo:letter-spacing="-0.004cm" fo:font-weight="normal" style:font-size-asian="10pt" style:font-weight-asian="normal" style:font-size-complex="10pt" style:font-weight-complex="normal"/>
   </style:style>
   <style:style style:name="T21" style:family="text">
-   <style:text-properties fo:font-size="9pt" fo:letter-spacing="-0.009cm" style:font-size-asian="9pt"/>
+   <style:text-properties style:font-name="Arial mt" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="T22" style:family="text">
-   <style:text-properties fo:font-size="9pt" fo:letter-spacing="-0.023cm" style:font-size-asian="9pt"/>
+   <style:text-properties style:font-name="Arial mt" fo:font-size="10pt" fo:letter-spacing="-0.009cm" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="T23" style:family="text">
-   <style:text-properties fo:font-size="9pt" fo:letter-spacing="-0.011cm" style:font-size-asian="9pt"/>
+   <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt"/>
   </style:style>
   <style:style style:name="T24" style:family="text">
-   <style:text-properties fo:font-size="9pt" fo:letter-spacing="-0.004cm" style:font-size-asian="9pt"/>
+   <style:text-properties fo:font-size="9pt" fo:letter-spacing="-0.005cm" style:font-size-asian="9pt"/>
   </style:style>
   <style:style style:name="T25" style:family="text">
-   <style:text-properties style:font-name="Arial1"/>
+   <style:text-properties fo:font-size="9pt" fo:letter-spacing="-0.009cm" style:font-size-asian="9pt"/>
   </style:style>
   <style:style style:name="T26" style:family="text">
-   <style:text-properties style:font-name="Arial1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="9pt" fo:letter-spacing="-0.023cm" style:font-size-asian="9pt"/>
   </style:style>
   <style:style style:name="T27" style:family="text">
-   <style:text-properties style:font-name="Arial1" fo:font-size="10pt" fo:letter-spacing="-0.005cm" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="9pt" fo:letter-spacing="-0.011cm" style:font-size-asian="9pt"/>
   </style:style>
   <style:style style:name="T28" style:family="text">
-   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
+   <style:text-properties fo:font-size="9pt" fo:letter-spacing="-0.004cm" style:font-size-asian="9pt"/>
   </style:style>
   <style:style style:name="T29" style:family="text">
-   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+   <style:text-properties style:font-name="Arial1"/>
   </style:style>
   <style:style style:name="T30" style:family="text">
-   <style:text-properties fo:font-size="8.5pt" fo:letter-spacing="-0.004cm" style:font-size-asian="8.5pt"/>
+   <style:text-properties style:font-name="Arial1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="T31" style:family="text">
-   <style:text-properties fo:font-size="8.5pt" style:font-size-asian="8.5pt"/>
+   <style:text-properties style:font-name="Arial1" fo:font-size="10pt" fo:letter-spacing="-0.005cm" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="T32" style:family="text">
-   <style:text-properties fo:font-size="8.5pt" fo:letter-spacing="-0.007cm" style:font-size-asian="8.5pt"/>
+   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
   </style:style>
   <style:style style:name="T33" style:family="text">
-   <style:text-properties fo:font-size="8.5pt" fo:letter-spacing="0.002cm" style:font-size-asian="8.5pt"/>
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="T34" style:family="text">
-   <style:text-properties style:font-name="Arial" fo:font-size="9pt" fo:language="en" fo:country="GB" style:font-size-asian="9pt" style:font-name-complex="Arial2" style:font-size-complex="9pt"/>
+   <style:text-properties fo:font-size="8.5pt" fo:letter-spacing="-0.004cm" style:font-size-asian="8.5pt"/>
   </style:style>
   <style:style style:name="T35" style:family="text">
-   <style:text-properties style:font-name="Arial" fo:font-size="8pt" style:font-size-asian="8pt" style:font-name-complex="Arial2" style:font-size-complex="8pt"/>
+   <style:text-properties fo:font-size="8.5pt" style:font-size-asian="8.5pt"/>
   </style:style>
   <style:style style:name="T36" style:family="text">
-   <style:text-properties style:font-name="Arial" fo:font-size="8pt" fo:language="en" fo:country="GB" style:font-size-asian="8pt" style:language-asian="en" style:country-asian="GB" style:font-name-complex="Arial2" style:font-size-complex="8pt"/>
+   <style:text-properties fo:font-size="8.5pt" fo:letter-spacing="-0.007cm" style:font-size-asian="8.5pt"/>
   </style:style>
   <style:style style:name="T37" style:family="text">
-   <style:text-properties style:font-name="Arial" style:font-name-complex="Arial2"/>
+   <style:text-properties fo:font-size="8.5pt" fo:letter-spacing="0.002cm" style:font-size-asian="8.5pt"/>
   </style:style>
   <style:style style:name="T38" style:family="text">
-   <style:text-properties style:font-name="Arial" fo:language="en" fo:country="GB" style:language-asian="en" style:country-asian="GB" style:font-name-complex="Arial2"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="9pt" fo:language="en" fo:country="GB" style:font-size-asian="9pt" style:font-name-complex="Arial2" style:font-size-complex="9pt"/>
   </style:style>
   <style:style style:name="T39" style:family="text">
-   <style:text-properties fo:letter-spacing="-0.004cm"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="8pt" style:font-size-asian="8pt" style:font-name-complex="Arial2" style:font-size-complex="8pt"/>
   </style:style>
   <style:style style:name="T40" style:family="text">
-   <style:text-properties fo:letter-spacing="-0.007cm"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="8pt" fo:language="en" fo:country="GB" style:font-size-asian="8pt" style:language-asian="en" style:country-asian="GB" style:font-name-complex="Arial2" style:font-size-complex="8pt"/>
   </style:style>
   <style:style style:name="T41" style:family="text">
-   <style:text-properties fo:letter-spacing="-0.005cm"/>
+   <style:text-properties style:font-name="Arial" style:font-name-complex="Arial2"/>
   </style:style>
   <style:style style:name="T42" style:family="text">
-   <style:text-properties fo:letter-spacing="-0.009cm"/>
+   <style:text-properties style:font-name="Arial" fo:language="en" fo:country="GB" style:language-asian="en" style:country-asian="GB" style:font-name-complex="Arial2"/>
   </style:style>
   <style:style style:name="T43" style:family="text">
+   <style:text-properties fo:letter-spacing="-0.004cm"/>
+  </style:style>
+  <style:style style:name="T44" style:family="text">
+   <style:text-properties fo:letter-spacing="-0.007cm"/>
+  </style:style>
+  <style:style style:name="T45" style:family="text">
+   <style:text-properties fo:letter-spacing="-0.005cm"/>
+  </style:style>
+  <style:style style:name="T46" style:family="text">
+   <style:text-properties fo:letter-spacing="-0.009cm"/>
+  </style:style>
+  <style:style style:name="T47" style:family="text">
    <style:text-properties officeooo:rsid="00279eee"/>
   </style:style>
+  <style:style style:name="T48" style:family="text">
+   <style:text-properties style:font-name="Arial mt"/>
+  </style:style>
+  <style:style style:name="T49" style:family="text">
+   <style:text-properties style:font-name="Arial mt" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T50" style:family="text">
+   <style:text-properties style:font-name="Arial mt" fo:font-size="10pt" fo:font-weight="bold" 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="T51" style:family="text">
+   <style:text-properties style:font-name="Arial mt" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
   <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
    <style:graphic-properties style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>
   </style:style>
@@ -1661,18 +1703,18 @@
      </draw:image>
     </draw:frame><text:tab/><text:tab/><text:span text:style-name="T1">PROFORMA INVOICE</text:span></text:p>
    <text:p text:style-name="Standard"><text:tab/><text:tab/><text:span text:style-name="T9">Proforma Nr:<text:tab/><text:tab/><text:tab/>Date:</text:span></text:p>
-   <text:p text:style-name="Standard"><text:tab/><text:tab/><text:span text:style-name="T29"><text:placeholder text:placeholder-type="text">&lt;sale.report_deal&gt;</text:placeholder></text:span><text:tab/><text:tab/><text:tab/><text:span text:style-name="T29"><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:p>
+   <text:p text:style-name="Standard"><text:tab/><text:tab/><text:span text:style-name="T33"><text:placeholder text:placeholder-type="text">&lt;sale.report_deal&gt;</text:placeholder></text:span><text:tab/><text:tab/><text:tab/><text:span text:style-name="T33"><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:p>
    <text:p text:style-name="Standard"/>
    <text:p text:style-name="Standard"/>
    <text:p text:style-name="Standard"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:span text:style-name="T9">Buyer:</text:span></text:p>
-   <text:p text:style-name="Standard"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:span text:style-name="T26"><text:placeholder text:placeholder-type="text">&lt;sale.party.rec_name&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:span text:style-name="T30"><text:placeholder text:placeholder-type="text">&lt;sale.party.rec_name&gt;</text:placeholder></text:span></text:p>
    <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.report_address.splitlines()&quot;&gt;</text:placeholder></text:p>
    <text:p text:style-name="P1"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p>
    <text:p text:style-name="P1"><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"/>
-   <text:p text:style-name="P36" loext:marker-style-name="T28"/>
-   <text:p text:style-name="P37" loext:marker-style-name="T28"/>
+   <text:p text:style-name="P40" loext:marker-style-name="T32"/>
+   <text:p text:style-name="P41" loext:marker-style-name="T32"/>
    <table:table table:name="Tableau1" table:style-name="Tableau1">
     <table:table-column table:style-name="Tableau1.A"/>
     <table:table-column table:style-name="Tableau1.B"/>
@@ -1680,56 +1722,53 @@
     <table:table-column table:style-name="Tableau1.D"/>
     <table:table-row table:style-name="Tableau1.1">
      <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
-      <text:p text:style-name="P42" loext:marker-style-name="T31"><text:span text:style-name="T39">Quantity</text:span></text:p>
+      <text:p text:style-name="P39" loext:marker-style-name="T35"><text:span text:style-name="T43">Quantity</text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.B1" office:value-type="string">
-      <text:p text:style-name="P42" loext:marker-style-name="T31">Goods<text:span text:style-name="T40"> </text:span><text:span text:style-name="T39">Description</text:span></text:p>
+      <text:p text:style-name="P39" loext:marker-style-name="T35">Goods<text:span text:style-name="T44"> </text:span><text:span text:style-name="T43">Description</text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.B1" office:value-type="string">
-      <text:p text:style-name="P54" loext:marker-style-name="T31"><text:span text:style-name="T5">Unit</text:span><text:span text:style-name="T6"> </text:span><text:span text:style-name="T7">Price</text:span></text:p>
+      <text:p text:style-name="P42" loext:marker-style-name="T35"><text:span text:style-name="T5">Unit</text:span><text:span text:style-name="T6"> </text:span><text:span text:style-name="T7">Price</text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.D1" office:value-type="string">
-      <text:p text:style-name="P49" loext:marker-style-name="T31"><text:span text:style-name="T39">Amount</text:span></text:p>
+      <text:p text:style-name="P10" loext:marker-style-name="T35"><text:span text:style-name="T43">Amount</text:span></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row table:style-name="Tableau1.2">
      <table:table-cell table:style-name="Tableau1.A2" office:value-type="string">
-      <text:p text:style-name="P35" loext:marker-style-name="T31"><text:span text:style-name="T39"/></text:p>
-      <text:p text:style-name="P19" loext:marker-style-name="T31"/>
-      <text:p text:style-name="P28" loext:marker-style-name="T19"><text:span text:style-name="T16"/></text:p>
-      <text:p text:style-name="P34" loext:marker-style-name="T19"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].quantity&gt;</text:placeholder></text:span><text:span text:style-name="T15"><text:s/></text:span><text:span text:style-name="T14"><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:p>
+      <text:p text:style-name="P23" loext:marker-style-name="T35"/>
+      <text:p text:style-name="P31" loext:marker-style-name="T23"><text:span text:style-name="T17"/></text:p>
+      <text:p text:style-name="P37" loext:marker-style-name="T23"><text:span text:style-name="T9"><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].quantity&gt;</text:placeholder></text:span><text:span text:style-name="T16"><text:s/></text:span><text:span text:style-name="T15"><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:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.B2" office:value-type="string">
-      <text:p text:style-name="P35" loext:marker-style-name="T31"><text:span text:style-name="T39"/></text:p>
-      <text:p text:style-name="P19" loext:marker-style-name="T31"/>
-      <text:p text:style-name="P20" loext:marker-style-name="T31"/>
-      <text:p text:style-name="P34" loext:marker-style-name="T19"><text:span text:style-name="T19"><text:s text:c="2"/></text:span><text:span text:style-name="T34"><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].product.name if sale.lines and sale.lines[0].product else &apos;&apos;&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P25" loext:marker-style-name="T19"/>
-      <text:p text:style-name="P22" loext:marker-style-name="T34"><text:span text:style-name="T34"><text:s/></text:span></text:p>
-      <text:p text:style-name="P21"/>
+      <text:p text:style-name="P23" loext:marker-style-name="T35"/>
+      <text:p text:style-name="P22" loext:marker-style-name="T35"/>
+      <text:p text:style-name="P37" loext:marker-style-name="T23"><text:span text:style-name="T23"><text:s text:c="2"/></text:span><text:span text:style-name="T38"><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].product.name if sale.lines and sale.lines[0].product else &apos;&apos;&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P28" loext:marker-style-name="T23"/>
+      <text:p text:style-name="P25" loext:marker-style-name="T38"><text:span text:style-name="T38"><text:s/></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.B2" office:value-type="string">
-      <text:p text:style-name="P18" loext:marker-style-name="T31"><text:span text:style-name="T7"/></text:p>
-      <text:p text:style-name="P18" loext:marker-style-name="T31"><text:span text:style-name="T7"/></text:p>
-      <text:p text:style-name="P18" loext:marker-style-name="T31"><text:span text:style-name="T19"><text:tab/><text:tab/></text:span></text:p>
-      <text:p text:style-name="P15" loext:marker-style-name="T19"><text:span text:style-name="T19"><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:p>
+      <text:p text:style-name="P20" loext:marker-style-name="T35"><text:span text:style-name="T7"/></text:p>
+      <text:p text:style-name="P20" loext:marker-style-name="T35"><text:span text:style-name="T23"><text:tab/><text:tab/></text:span></text:p>
+      <text:p text:style-name="P17" loext:marker-style-name="T23"><text:span text:style-name="T23"><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:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.D2" office:value-type="string">
-      <text:p text:style-name="P4" loext:marker-style-name="T31"><text:span text:style-name="T39"/></text:p>
-      <text:p text:style-name="P5" loext:marker-style-name="T31"/>
-      <text:p text:style-name="P20" loext:marker-style-name="T31"/>
-      <text:p text:style-name="P15" loext:marker-style-name="T19"><text:span text:style-name="T24"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:span></text:p>
+      <text:p text:style-name="P4" loext:marker-style-name="T35"/>
+      <text:p text:style-name="P22" loext:marker-style-name="T35"/>
+      <text:p text:style-name="P17" loext:marker-style-name="T23"><text:span text:style-name="T28"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:span></text:p>
      </table:table-cell>
     </table:table-row>
    </table:table>
    <text:p text:style-name="Standard"/>
+   <text:p text:style-name="P43"><text:span text:style-name="T50">Total quantity</text:span>: <text:span text:style-name="T21"><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].quantity&gt;</text:placeholder></text:span><text:span text:style-name="T9"><text:s/></text:span><text:span text:style-name="T22"><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:p>
    <text:p text:style-name="Standard"/>
+   <text:p text:style-name="P44"><text:span text:style-name="T21">Total amount:</text:span> <text:span text:style-name="T20"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:span></text:p>
    <text:p text:style-name="Standard"/>
-   <text:p text:style-name="P40"><text:span text:style-name="T43">SHIPMENT SCHEDULE</text:span>:<text:tab/><text:span text:style-name="T37"><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].del_period.month_name if sale.lines and sale.lines[0].del_period else &apos;&apos;&gt;</text:placeholder></text:span></text:p>
-   <text:p text:style-name="P40"/>
+   <text:p text:style-name="P9"><text:span text:style-name="T47">SHIPMENT SCHEDULE</text:span>:<text:tab/><text:span text:style-name="T41"><text:placeholder text:placeholder-type="text">&lt;sale.lines[0].del_period.month_name if sale.lines and sale.lines[0].del_period else &apos;&apos;&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P9"/>
    <text:p text:style-name="P6">TOLERANCE:<text:tab/><text:tab/>+/- <text:placeholder text:placeholder-type="text">&lt;sale.tol_min&gt;</text:placeholder><text:s/>%</text:p>
    <text:p text:style-name="P2"/>
-   <text:p text:style-name="P6">ORIGIN:<text:tab/><text:tab/><text:tab/><text:placeholder text:placeholder-type="text">&lt;sale.comment&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P6">ORIGIN:<text:tab/><text:tab/><text:tab/><text:placeholder text:placeholder-type="text">&lt;sale.product_origin&gt;</text:placeholder></text:p>
    <text:p text:style-name="P3"/>
    <text:p text:style-name="P3">TRANSPORTATION BY:<text:tab/>VESSEL</text:p>
    <text:p text:style-name="P3"/>
@@ -1743,8 +1782,8 @@
    <text:p text:style-name="P2"/>
    <text:p text:style-name="P2"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/>Signed by :</text:p>
    <text:p text:style-name="P2"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/>(The Seller)</text:p>
-   <text:p text:style-name="P2"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/> <text:s text:c="12"/><text:span text:style-name="T29">MELYA SA<text:line-break/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/>13 RUE ROBERT CEARD<text:line-break/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/> <text:s text:c="5"/>CH-1204 GENEVA<text:line-break/></text:span><text:span text:style-name="T29"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/> <text:s text:c="8"/>SWITZERLAND</text:span></text:p>
-   <text:p text:style-name="P11"/>
+   <text:p text:style-name="P2"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/> <text:s text:c="12"/><text:span text:style-name="T33">MELYA SA<text:line-break/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/>13 RUE ROBERT CEARD<text:line-break/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/> <text:s text:c="5"/>CH-1204 GENEVA<text:line-break/></text:span><text:span text:style-name="T33"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/> <text:s text:c="8"/>SWITZERLAND</text:span></text:p>
+   <text:p text:style-name="P13"/>
    <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
   </office:text>
  </office:body>