diff --git a/modules/sale/sale_itsa.fodt b/modules/sale/sale_itsa.fodt
index a4ef623..a6f22b6 100644
--- a/modules/sale/sale_itsa.fodt
+++ b/modules/sale/sale_itsa.fodt
@@ -543,76 +543,82 @@
    <style:drawing-page-properties draw:background-size="full"/>
   </style:style>
 
-  <style:style style:name="ItsaTitle" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-left="10.2cm" fo:margin-bottom="0.1cm"/>
-   <style:text-properties style:font-name="Arial" fo:font-size="18pt" fo:font-weight="normal" fo:language="en" fo:country="GB"/>
-  </style:style>
-  <style:style style:name="ItsaHeader" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-left="10.2cm" fo:margin-bottom="0.05cm">
-    <style:tab-stops><style:tab-stop style:position="5.7cm"/></style:tab-stops>
-   </style:paragraph-properties>
-   <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="GB"/>
-  </style:style>
-  <style:style style:name="ItsaHeaderValues" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-left="10.2cm" fo:margin-bottom="0.45cm">
-    <style:tab-stops><style:tab-stop style:position="5.7cm"/></style:tab-stops>
-   </style:paragraph-properties>
-   <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:font-weight="bold" fo:language="en" fo:country="GB"/>
+  <style:style style:name="ItsaTopSpacer" style:family="paragraph" style:parent-style-name="Normal" style:master-page-name="MP0">
+   <style:paragraph-properties fo:line-height="95%" fo:margin-top="0cm" fo:margin-bottom="2.05cm" style:page-number="auto"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="5pt" style:font-size-asian="5pt" style:font-name-complex="Arial"/>
   </style:style>
   <style:style style:name="ItsaBuyer" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-left="10.5cm" fo:margin-bottom="0cm"/>
-   <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="GB"/>
+   <style:paragraph-properties fo:margin-left="10.55cm" fo:margin-bottom="0cm" fo:line-height="106%"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="10.5pt" style:font-size-asian="10.5pt" style:font-name-complex="Arial"/>
   </style:style>
-  <style:style style:name="ItsaBuyerBold" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-left="10.5cm" fo:margin-bottom="0cm"/>
-   <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:font-weight="bold" fo:language="en" fo:country="GB"/>
+  <style:style style:name="ItsaSmallGap" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:margin-bottom="0.08cm" fo:line-height="80%"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="4pt" style:font-size-asian="4pt" style:font-name-complex="Arial"/>
   </style:style>
-  <style:style style:name="ItsaSpacerSmall" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-bottom="0.2cm"/>
-   <style:text-properties fo:font-size="6pt"/>
-  </style:style>
-  <style:style style:name="ItsaLabel" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-left="1.2cm" fo:margin-bottom="0.2cm">
-    <style:tab-stops><style:tab-stop style:position="4cm"/></style:tab-stops>
+  <style:style style:name="ItsaDocLine" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:margin-left="1.35cm" fo:margin-bottom="0cm" fo:line-height="110%">
+    <style:tab-stops><style:tab-stop style:position="4.95cm"/><style:tab-stop style:position="5.65cm"/></style:tab-stops>
    </style:paragraph-properties>
-   <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="GB"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="9.5pt" style:font-size-asian="9.5pt" style:font-name-complex="Arial"/>
   </style:style>
-  <style:style style:name="ItsaSign" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-left="1.2cm" fo:margin-bottom="0cm">
-    <style:tab-stops><style:tab-stop style:position="11cm"/></style:tab-stops>
+  <style:style style:name="ItsaInvoiceTitle" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:margin-left="1.35cm" fo:margin-right="0.6cm" fo:margin-top="0.42cm" fo:margin-bottom="0.22cm">
+    <style:tab-stops><style:tab-stop style:position="14.2cm"/></style:tab-stops>
    </style:paragraph-properties>
-   <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="GB"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="13pt" fo:font-weight="bold" style:font-size-asian="13pt" style:font-weight-asian="bold" style:font-name-complex="Arial"/>
   </style:style>
-  <style:style style:name="ItsaTotal" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-left="12.2cm" fo:margin-bottom="0.25cm"/>
-   <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="GB"/>
+  <style:style style:name="ItsaCenterFooter" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" fo:margin-top="0.2cm"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="12pt" style:font-size-asian="12pt" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="ItsaTiny" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:margin-bottom="0cm" fo:line-height="95%"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="8.5pt" style:font-size-asian="8.5pt" style:font-name-complex="Arial"/>
   </style:style>
   <style:style style:name="ItsaBold" style:family="text">
    <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
-  <style:style style:name="ItsaCell" style:family="table-cell">
-   <style:table-cell-properties fo:border="0.5pt solid #000000" fo:padding="0.08cm"/>
-  </style:style>
-  <style:style style:name="ItsaCellHeader" style:family="table-cell">
-   <style:table-cell-properties fo:border="0.5pt solid #000000" fo:padding="0.04cm"/>
-  </style:style>
-  <style:style style:name="ItsaCellP" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="GB"/>
-  </style:style>
-  <style:style style:name="ItsaCellPBold" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-   <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:font-weight="bold" fo:language="en" fo:country="GB"/>
+  <style:style style:name="ItsaUnderline" style:family="text">
+   <style:text-properties style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/>
   </style:style>
   <style:style style:name="ItsaTable" style:family="table">
-   <style:table-properties table:align="margins" style:width="18.4cm" fo:margin-left="1.2cm"/>
+   <style:table-properties table:align="center" style:width="19.4cm"/>
+  </style:style>
+  <style:style style:name="ItsaInfoTable" style:family="table">
+   <style:table-properties table:align="left" style:width="19.4cm" fo:margin-left="0.35cm"/>
+  </style:style>
+  <style:style style:name="ItsaQtyCol" style:family="table-column"><style:table-column-properties style:column-width="2.2cm"/></style:style>
+  <style:style style:name="ItsaDescCol" style:family="table-column"><style:table-column-properties style:column-width="11.15cm"/></style:style>
+  <style:style style:name="ItsaUnitCol" style:family="table-column"><style:table-column-properties style:column-width="2.3cm"/></style:style>
+  <style:style style:name="ItsaAmtCol" style:family="table-column"><style:table-column-properties style:column-width="3.75cm"/></style:style>
+  <style:style style:name="ItsaInfoLabelCol" style:family="table-column"><style:table-column-properties style:column-width="3.9cm"/></style:style>
+  <style:style style:name="ItsaInfoSepCol" style:family="table-column"><style:table-column-properties style:column-width="0.65cm"/></style:style>
+  <style:style style:name="ItsaInfoValueCol" style:family="table-column"><style:table-column-properties style:column-width="14.85cm"/></style:style>
+  <style:style style:name="ItsaHeadCell" style:family="table-cell">
+   <style:table-cell-properties fo:border="0.06cm solid #000000" fo:padding="0.06cm"/>
+  </style:style>
+  <style:style style:name="ItsaBodyCell" style:family="table-cell">
+   <style:table-cell-properties fo:border-left="0.04cm solid #000000" fo:border-right="0.04cm solid #000000" fo:border-top="0.02cm solid #d9d9d9" fo:border-bottom="0.02cm solid #d9d9d9" fo:padding="0.10cm"/>
+  </style:style>
+  <style:style style:name="ItsaBottomCell" style:family="table-cell">
+   <style:table-cell-properties fo:border-left="0.04cm solid #000000" fo:border-right="0.04cm solid #000000" fo:border-bottom="0.06cm solid #000000" fo:border-top="0.02cm solid #d9d9d9" fo:padding="0.10cm"/>
+  </style:style>
+  <style:style style:name="ItsaCellCenter" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" fo:margin-bottom="0cm"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="ItsaCellLeft" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:text-align="start" fo:margin-bottom="0cm"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="9pt" style:font-size-asian="9pt" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="ItsaCellRight" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false" fo:margin-bottom="0cm"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="9.5pt" style:font-size-asian="9.5pt" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="ItsaCellBold" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:text-align="start" fo:margin-top="0.18cm" fo:margin-bottom="0cm"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="9.5pt" fo:font-weight="bold" style:font-size-asian="9.5pt" style:font-weight-asian="bold" style:font-name-complex="Arial"/>
   </style:style>
-  <style:style style:name="ItsaTable.A" style:family="table-column"><style:table-column-properties style:column-width="4.7cm"/></style:style>
-  <style:style style:name="ItsaTable.B" style:family="table-column"><style:table-column-properties style:column-width="5.3cm"/></style:style>
-  <style:style style:name="ItsaTable.C" style:family="table-column"><style:table-column-properties style:column-width="4.5cm"/></style:style>
-  <style:style style:name="ItsaTable.D" style:family="table-column"><style:table-column-properties style:column-width="3.9cm"/></style:style>
-  <style:style style:name="ItsaRowHeader" style:family="table-row"><style:table-row-properties style:row-height="0.55cm" fo:keep-together="always"/></style:style>
-  <style:style style:name="ItsaRowBody" style:family="table-row"><style:table-row-properties style:row-height="3.4cm" fo:keep-together="always"/></style:style>
  </office:automatic-styles>
  <office:master-styles>
   <style:master-page style:name="Standard" style:page-layout-name="pm1"/>
@@ -5087,62 +5093,65 @@
   </style:master-page>
  </office:master-styles>
  <office:body>
-  <office:text>
-   <text:sequence-decls>
-    <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
-    <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
-    <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
-    <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
-    <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
-   </text:sequence-decls>
-   <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;sale in records&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="ItsaTitle">PROFORMA INVOICE</text:p>
-   <text:p text:style-name="ItsaHeader">Order reference:<text:tab/>Date:</text:p>
-   <text:p text:style-name="ItsaHeaderValues"><text:placeholder text:placeholder-type="text">&lt;sale.report_melya_proforma_number&gt;</text:placeholder><text:tab/><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:p>
-   <text:p text:style-name="ItsaBuyerBold">Buyer:</text:p>
+  <office:text text:use-soft-page-breaks="true">
+   <text:p text:style-name="ItsaTopSpacer"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;sale in records&quot;&gt;</text:placeholder></text:p>
    <text:p text:style-name="ItsaBuyer"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.report_melya_buyer_block.splitlines()&quot;&gt;</text:placeholder></text:p>
    <text:p text:style-name="ItsaBuyer"><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p>
    <text:p text:style-name="ItsaBuyer"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-   <text:p text:style-name="ItsaSpacerSmall"/>
-   <table:table table:name="ItsaTable" table:style-name="ItsaTable">
-    <table:table-column table:style-name="ItsaTable.A"/>
-    <table:table-column table:style-name="ItsaTable.B"/>
-    <table:table-column table:style-name="ItsaTable.C"/>
-    <table:table-column table:style-name="ItsaTable.D"/>
-    <table:table-row table:style-name="ItsaRowHeader">
-     <table:table-cell table:style-name="ItsaCellHeader" office:value-type="string"><text:p text:style-name="ItsaCellP">Quantity</text:p></table:table-cell>
-     <table:table-cell table:style-name="ItsaCellHeader" office:value-type="string"><text:p text:style-name="ItsaCellP">Goods Description</text:p></table:table-cell>
-     <table:table-cell table:style-name="ItsaCellHeader" office:value-type="string"><text:p text:style-name="ItsaCellP">Unit Price</text:p></table:table-cell>
-     <table:table-cell table:style-name="ItsaCellHeader" office:value-type="string"><text:p text:style-name="ItsaCellP">Amount</text:p></table:table-cell>
+   <text:p text:style-name="ItsaSmallGap"/>
+   <table:table table:name="ItsaInfo" table:style-name="ItsaInfoTable">
+    <table:table-column table:style-name="ItsaInfoLabelCol"/>
+    <table:table-column table:style-name="ItsaInfoSepCol"/>
+    <table:table-column table:style-name="ItsaInfoValueCol"/>
+    <table:table-row><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft">Vessel / Tanker</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft">:</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft"><text:placeholder text:placeholder-type="text">&lt;sale.report_shipment or &apos;&apos;&gt;</text:placeholder></text:p></table:table-cell></table:table-row>
+    <table:table-row><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft">Bs/L Date</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft">:</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft"><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:p></table:table-cell></table:table-row>
+    <table:table-row><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft">Port of Loading</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft">:</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft"><text:placeholder text:placeholder-type="text">&lt;sale.from_location.rec_name if sale.from_location else &apos;&apos;&gt;</text:placeholder></text:p></table:table-cell></table:table-row>
+    <table:table-row><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft">Port of Discharge</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft">:</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p text:style-name="ItsaCellLeft"><text:placeholder text:placeholder-type="text">&lt;sale.to_location.rec_name if sale.to_location else &apos;&apos;&gt;</text:placeholder></text:p></table:table-cell></table:table-row>
+   </table:table>
+   <text:p text:style-name="ItsaInvoiceTitle">COMMERCIAL INVOICE No.<text:s/> <text:placeholder text:placeholder-type="text">&lt;sale.report_melya_proforma_number&gt;</text:placeholder><text:tab/><text:span text:style-name="ItsaBold"><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>
+   <table:table table:name="CommercialInvoice" table:style-name="ItsaTable">
+    <table:table-column table:style-name="ItsaQtyCol"/>
+    <table:table-column table:style-name="ItsaDescCol"/>
+    <table:table-column table:style-name="ItsaUnitCol"/>
+    <table:table-column table:style-name="ItsaAmtCol"/>
+    <table:table-row>
+     <table:table-cell table:style-name="ItsaHeadCell" office:value-type="string"><text:p text:style-name="ItsaCellCenter"><text:span text:style-name="ItsaBold">Quantity</text:span></text:p></table:table-cell>
+     <table:table-cell table:style-name="ItsaHeadCell" office:value-type="string"><text:p text:style-name="ItsaCellCenter"><text:span text:style-name="ItsaBold">Description</text:span></text:p></table:table-cell>
+     <table:table-cell table:style-name="ItsaHeadCell" office:value-type="string"><text:p text:style-name="ItsaCellCenter"><text:span text:style-name="ItsaBold">Unit Price</text:span></text:p></table:table-cell>
+     <table:table-cell table:style-name="ItsaHeadCell" office:value-type="string"><text:p text:style-name="ItsaCellCenter"><text:span text:style-name="ItsaBold">Amount</text:span></text:p></table:table-cell>
     </table:table-row>
-    <table:table-row table:style-name="ItsaRowBody">
-     <table:table-cell table:style-name="ItsaCell" office:value-type="string"><text:p text:style-name="ItsaCellP"><text:placeholder text:placeholder-type="text">&lt;format_number(sale.lines[0].quantity, sale.party.lang, digits=4) if sale.lines else &apos;&apos;&gt;</text:placeholder><text:s/><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:p></table:table-cell>
-     <table:table-cell table:style-name="ItsaCell" office:value-type="string"><text:p text:style-name="ItsaCellP"><text:placeholder text:placeholder-type="text">&lt;sale.report_product_name or &apos;&apos;&gt;</text:placeholder></text:p><text:p text:style-name="ItsaCellP"><text:placeholder text:placeholder-type="text">&lt;sale.report_product_description or &apos;&apos;&gt;</text:placeholder></text:p></table:table-cell>
-     <table:table-cell table:style-name="ItsaCell" office:value-type="string"><text:p text:style-name="ItsaCellP"><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:p></table:table-cell>
-     <table:table-cell table:style-name="ItsaCell" office:value-type="string"><text:p text:style-name="ItsaCellP"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:p></table:table-cell>
+    <table:table-row>
+     <table:table-cell table:style-name="ItsaBodyCell" office:value-type="string"><text:p text:style-name="ItsaCellCenter"><text:placeholder text:placeholder-type="text">&lt;format_number(sale.lines[0].quantity, sale.party.lang, digits=3) if sale.lines else &apos;&apos;&gt;</text:placeholder></text:p></table:table-cell>
+     <table:table-cell table:style-name="ItsaBodyCell" office:value-type="string">
+      <text:p text:style-name="ItsaCellLeft">Metric Tons <text:placeholder text:placeholder-type="text">&lt;sale.report_product_name or &apos;&apos;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="ItsaCellLeft"/>
+      <text:p text:style-name="ItsaCellLeft">Marks &amp; Nos.<text:s text:c="7"/>:<text:s/>NO MARK</text:p>
+      <text:p text:style-name="ItsaCellLeft"/>
+      <text:p text:style-name="ItsaCellLeft">Manufacturer<text:s text:c="6"/>:<text:s/></text:p>
+      <text:p text:style-name="ItsaCellLeft"/>
+      <text:p text:style-name="ItsaCellLeft">Exporter<text:s text:c="11"/>:<text:s/><text:placeholder text:placeholder-type="text">&lt;sale.company.party.rec_name if sale.company and sale.company.party else &apos;&apos;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="ItsaCellLeft"/>
+      <text:p text:style-name="ItsaCellLeft">Country of origin<text:s text:c="2"/>:<text:s/><text:placeholder text:placeholder-type="text">&lt;sale.product_origin or &apos;&apos;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="ItsaCellBold"><text:span text:style-name="ItsaUnderline">PRICE</text:span></text:p>
+      <text:p text:style-name="ItsaCellLeft"><text:placeholder text:placeholder-type="text">&lt;sale.currency.code if sale.currency else &apos;&apos;&gt;</text:placeholder><text:s text:c="7"/><text:placeholder text:placeholder-type="text">&lt;format_number(sale.lines[0].unit_price, sale.party.lang, digits=sale.currency.digits) if sale.lines and sale.currency else &apos;&apos;&gt;</text:placeholder><text:s/>/ MT T.Q. <text:placeholder text:placeholder-type="text">&lt;sale.report_melya_incoterm&gt;</text:placeholder></text:p>
+      <text:p text:style-name="ItsaCellBold"><text:span text:style-name="ItsaUnderline">PAYMENT</text:span></text:p>
+      <text:p text:style-name="ItsaCellLeft"><text:placeholder text:placeholder-type="text">&lt;sale.payment_term.description if sale.payment_term else &apos;&apos;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="ItsaCellLeft"><text:placeholder text:placeholder-type="text">&lt;sale.report_melya_bank_name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="ItsaCellLeft"><text:placeholder text:placeholder-type="text">&lt;sale.report_melya_bank_iban_line&gt;</text:placeholder></text:p>
+      <text:p text:style-name="ItsaCellLeft"><text:placeholder text:placeholder-type="text">&lt;sale.report_melya_bank_swift_line&gt;</text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="ItsaBodyCell" office:value-type="string"><text:p text:style-name="ItsaCellRight"><text:placeholder text:placeholder-type="text">&lt;sale.currency.code if sale.currency else &apos;&apos;&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;format_number(sale.lines[0].unit_price, sale.party.lang, digits=sale.currency.digits) if sale.lines and sale.currency else &apos;&apos;&gt;</text:placeholder></text:p></table:table-cell>
+     <table:table-cell table:style-name="ItsaBodyCell" office:value-type="string"><text:p text:style-name="ItsaCellRight"><text:span text:style-name="ItsaBold"><text:placeholder text:placeholder-type="text">&lt;sale.currency.code if sale.currency else &apos;&apos;&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;format_number(sale.lines[0].amount, sale.party.lang, digits=sale.currency.digits) if sale.lines and sale.currency else &apos;&apos;&gt;</text:placeholder></text:span></text:p></table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="ItsaBottomCell" office:value-type="string"><text:p text:style-name="ItsaTiny"/></table:table-cell>
+     <table:table-cell table:style-name="ItsaBottomCell" office:value-type="string"><text:p text:style-name="ItsaTiny"/></table:table-cell>
+     <table:table-cell table:style-name="ItsaBottomCell" office:value-type="string"><text:p text:style-name="ItsaTiny"/></table:table-cell>
+     <table:table-cell table:style-name="ItsaBottomCell" office:value-type="string"><text:p text:style-name="ItsaCellLeft">VAT : zero rate</text:p></table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="ItsaSpacerSmall"/>
-   <text:p text:style-name="ItsaTotal"><text:span text:style-name="ItsaBold">Total quantity:</text:span><text:s/><text:placeholder text:placeholder-type="text">&lt;format_number(sale.lines[0].quantity, sale.party.lang, digits=4) if sale.lines else &apos;&apos;&gt;</text:placeholder><text:s/><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:p>
-   <text:p text:style-name="ItsaTotal"><text:span text:style-name="ItsaBold">Total amount:</text:span><text:s/><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:p>
-   <text:p text:style-name="ItsaSpacerSmall"/>
-   <text:p text:style-name="ItsaLabel">SHIPMENT SCHEDULE:<text:tab/><text:placeholder text:placeholder-type="text">&lt;sale.report_delivery_period_description or &apos;&apos;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="ItsaLabel">TOLERANCE:<text:tab/>+/- <text:placeholder text:placeholder-type="text">&lt;sale.tol_min&gt;</text:placeholder><text:s/>%</text:p>
-   <text:p text:style-name="ItsaLabel">ORIGIN:<text:tab/><text:placeholder text:placeholder-type="text">&lt;sale.product_origin&gt;</text:placeholder></text:p>
-   <text:p text:style-name="ItsaLabel">TRANSPORTATION BY:<text:tab/>VESSEL</text:p>
-   <text:p text:style-name="ItsaLabel">DELIVERY TERMS:<text:tab/><text:placeholder text:placeholder-type="text">&lt;sale.report_melya_incoterm&gt;</text:placeholder></text:p>
-   <text:p text:style-name="ItsaLabel">PAYMENT TERMS:<text:tab/><text:placeholder text:placeholder-type="text">&lt;sale.payment_term.description if sale.payment_term else &apos;&apos;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="ItsaLabel">BANK DETAILS:<text:tab/><text:placeholder text:placeholder-type="text">&lt;sale.report_melya_bank_name&gt;</text:placeholder></text:p>
-   <text:p text:style-name="ItsaLabel"><text:tab/><text:placeholder text:placeholder-type="text">&lt;sale.report_melya_bank_swift_line&gt;</text:placeholder></text:p>
-   <text:p text:style-name="ItsaLabel"><text:tab/><text:placeholder text:placeholder-type="text">&lt;sale.report_melya_bank_iban_line&gt;</text:placeholder></text:p>
-   <text:p text:style-name="ItsaSpacerSmall"/>
-   <text:p text:style-name="ItsaLabel">DELIVERY IS SUBJECT TO THE DELIVERY BY OUR SUPPLIER.</text:p>
-   <text:p text:style-name="ItsaSpacerSmall"/>
-   <text:p text:style-name="ItsaSign">Signed by :<text:tab/>Signed by :</text:p>
-   <text:p text:style-name="ItsaSign">(The Seller)<text:tab/>(The Buyer)</text:p>
-   <text:p text:style-name="ItsaLabel">INTERACID TRADING S.A.</text:p>
-   <text:p text:style-name="ItsaLabel">AV. DES BAUMETTES 5 - CH-1020 RENENS - SWITZERLAND</text:p>
-   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+   <text:p text:style-name="ItsaCenterFooter">INTERACID TRADING S.A.</text:p>
+   <text:p text:style-name="ItsaSmallGap"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
   </office:text>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>