Notes

Reviewed-on: #8

.gitignore

@@ -0,0 +1 @@
+*.pyc

AGENTS.md

@@ -38,15 +38,34 @@ Guide rapide pour les agents qui codent dans ce repository.
   - Lire `wsgi.py`, `rpc.py`, `protocols/*`, `tests/test_rpc.py`, `tests/test_wsgi.py`.
 - Si bug metier:
   - Modifier uniquement `modules/<module>/` + ses tests.
+- Conventions de champs dates:
+  - Dans ce projet, ne pas introduire de `fields.DateTime`.
+  - Utiliser `fields.Date` pour les dates metier et les champs de suivi UI, sauf demande explicite deja existante dans le module cible.
 - Si bug template Relatorio (`.fodt`):
   - Lire d'abord le template standard voisin du meme domaine (`invoice.fodt`, `sale.fodt`, etc.).
   - Preferer des proprietes Python simples exposees par le modele plutot que des expressions Genshi complexes dans le template.
   - Dans les placeholders XML, utiliser `&quot;` et `&apos;` plutot que des antislashs type `\'`.
   - Si un document facture depend fortement d'une vente/achat, ajouter au besoin un petit pont Python pour exposer des `report_*` stables au template.
+  - Pour les templates `stock.shipment.in`, preferer aussi des proprietes `report_*` sur le shipment plutot que des contextes ad hoc (`si_*`) quand le document devient metier ou client-specifique.
   - Si plusieurs actions de report pointent vers `report_name = 'account.invoice'`, verifier aussi le cache `invoice_report_cache` dans `modules/account_invoice/invoice.py`: un mauvais cache peut faire croire que plusieurs actions utilisent le meme `.fodt`.
   - Avant de conclure qu'un template ou une action est faux, verifier si le report alternatif doit bypasser le cache standard.
+  - Pour les templates shipment, ne pas supposer qu'une variable locale comme `shipment` sera definie partout dans Genshi, surtout dans les headers/footers; preferer `records[0]....` ou des placeholders alignes sur le scope reel du report.
   - Dans `purchase_trade`, pour remonter d'une facture vers shipment, pro forma, freight ou autres donnees logistiques, privilegier le lot physique comme pont entre `purchase.line`, `sale.line` et shipment.
   - Pour `FREIGHT VALUE`, ne pas lire un champ direct sur la facture: retrouver le fee de shipment (`shipment_in`) dont le produit est `Maritime freight`, puis utiliser `fee.get_amount()`.
+  - Rappels session templates (2026-04-08):
+    - `insurance.fodt`: le texte "insured for account of" doit afficher la compagnie courante (shipment.company.party), pas le client.
+    - `insurance.fodt`: exposer des proprietes Python `report_*` sur `stock.shipment.in` pour les montants (incoming moves) et les zones client-specifiques.
+    - `insurance.fodt`: "Amount insured" suit la regle metier 110% du montant incoming (base calculee via lot -> purchase.line.unit_price * quantite courante convertie).
+    - `insurance.fodt`: zone "Contact the following surveyor" alimentee par une propriete dediee, avec champ `surveyor` (party.party) cote shipment.
+    - `packing_list.fodt`: date en haut a droite = date du jour; unites Net/Gross = unite de `purchase.line`.
+    - `bill.fodt` (sale): la 2eme date doit etre une vraie maturity date (depuis `invoice.lines_to_pay.maturity_date`), pas `payment_term.rec_name`.
+    - `bill.fodt` (sale): le montant en lettres doit provenir du montant du bill (facture/total), pas du `unit_price` de ligne.
+    - Quand un template affiche les placeholders en brut, verifier que les champs sont bien des placeholders Relatorio dans le XML (pas du texte litteral).
+    - Eviter les apostrophes echappees style `\'` dans placeholders; preferer `&quot;` et `&apos;`.
+
+## 4.bis) Memo templates de session
+
+- Voir aussi `notes/template_business_rules.md` pour le recap detaille (business rules + decisions templates de la session).
 
 ## 5) Workflow de modification (obligatoire)
 
@@ -105,3 +124,18 @@ Toujours fournir:
 3. Proposer le patch minimal.
 4. Implementer + tester cible.
 5. Rendre avec le contrat de sortie (section 8).
+- Rappels session 2026-04-09:
+  - `invoice_ict.fodt` / `invoice_ict_final.fodt`: poids et unites depuis `lot.qt.hist` / `lot_unit_line`, priorite lots `physic`, sinon lot `virtual` unique.
+  - `invoice_ict.fodt` / `invoice_ict_final.fodt`: infos shipment depuis les lots reels des lignes facture; ne rien afficher si plusieurs shipments differents.
+  - `invoice_ict.fodt` / `invoice_ict_final.fodt`: `S/I` = `shipment.reference`; `NB BALES: 0` => `Unchanged` sur le final.
+  - `invoice_ict.fodt` / `invoice_ict_final.fodt`: quantites uniformisees a `2` decimales; conversion `LBS` via UoM, jamais via un facteur fixe aveugle.
+  - `invoice_ict.fodt` / `invoice_ict_final.fodt`: si plusieurs lignes reutilisent le meme lot, les lignes detaillees suivent la quantite facturee convertie, mais le `GROSS` global doit rester le vrai delta historique du lot.
+  - `sale_ict.fodt`: meme priorite lots; les mots suivent l'unite reelle; le total convertit vers une unite commune, qui est celle du lot virtuel seulement s'il y a un seul lot virtuel sur tout le report.
+  - `lot.report.r_del_period`: utiliser `sale.line.del_period` pour `lot_s` sans `lot_p`, sinon `purchase.line.del_period`.
+  - `lot.do_weighing`: `lot_qt` editable et ecrasement direct de `lot.lot_qt`.
+  - `account.invoice`: `Validate` cree aussi le `account.move` pour les factures client, attribue aussi le `number` a ce stade pour les factures client comme fournisseur; `Post` ne doit plus forcer une fresh session sur ce flux.
+  - `pricing.pricing`: saisie manuelle autorisee meme sans composant; en manuel, l'utilisateur saisit seulement `Qt` et `Settl. price`; `fixed_qt`, `fixed_qt_price`, `unfixed_qt`, `unfixed_qt_price` et `eod_price` sont derives automatiquement.
+  - `pricing.pricing`: en manuel, `fixed_qt` = cumul des `quantity`, `fixed_qt_price` = moyenne ponderee cumulee des `settl_price`, `unfixed_qt` = reste a fixer, `unfixed_qt_price` = `settl_price` de la ligne.
+  - `pricing.pricing`: `eod_price` reste non editable et calcule en prix moyen pondere; `last=True` gere par groupe `line + component`, choisi sur la `pricing_date` la plus grande.
+  - `purchase_trade`: `trader` filtre sur `TRADER`, `operator` sur `OPERATOR`; fallback sur `quantity` si `quantity_theorical` est vide dans les quotas/pricings.
+  - `sale.line` / `purchase.line`: en mode `basis`, sans `price_component`, le `Price` et le `Fix. progress` de la ligne doivent remonter depuis la ligne `Summary` sans component.

debug.log

@@ -0,0 +1 @@
+[0407/143111.471:ERROR:third_party\crashpad\crashpad\util\win\registration_protocol_win.cc:108] CreateFile: Accès refusé. (0x5)

deployment/README.md

@@ -0,0 +1,5 @@
+# Deployment Notes
+
+- Runbook onboarding SSH: `deployment/runbooks/vps-onboarding.md`
+- VPS 46.202.173.47 credentials: `deployment/vps/46.202.173.47-credentials.md`
+- VPS 46.202.173.47 quickstart: `deployment/vps/46.202.173.47-quickstart.md`

deployment/runbooks/vps-onboarding.md

@@ -0,0 +1,57 @@
+# Procedure - Ajouter un nouveau VPS (SSH)
+
+Date de reference: 2026-04-07
+
+## 1) Preparation locale (Windows)
+
+1. Creer le dossier SSH local si absent:
+`New-Item -ItemType Directory -Force $env:USERPROFILE\.ssh`
+
+2. Generer une cle dediee VPS:
+`ssh-keygen -t ed25519 -C "vps-deploy" -f $env:USERPROFILE\.ssh\vps_deploy_key`
+
+3. Lire la cle publique:
+`Get-Content $env:USERPROFILE\.ssh\vps_deploy_key.pub`
+
+## 2) Installer la cle sur le VPS
+
+1. Se connecter au VPS avec mot de passe (premiere fois):
+`ssh <user>@<ip_vps>`
+
+2. Sur le VPS, preparer le dossier SSH:
+`mkdir -p ~/.ssh`
+`chmod 700 ~/.ssh`
+
+3. Ajouter la cle publique (une ligne complete):
+`echo "ssh-ed25519 ... vps-deploy" >> ~/.ssh/authorized_keys`
+`chmod 600 ~/.ssh/authorized_keys`
+
+## 3) Tester la connexion par cle
+
+Depuis Windows:
+`ssh -i $env:USERPROFILE\.ssh\vps_deploy_key <user>@<ip_vps>`
+
+## 4) Test operationnel minimal
+
+Creer un dossier distant:
+`ssh -i $env:USERPROFILE\.ssh\vps_deploy_key <user>@<ip_vps> "mkdir -p ~/test_codex_deploy && ls -ld ~/test_codex_deploy"`
+
+## 5) Durcissement recommande
+
+- Desactiver l'authentification par mot de passe apres validation de la cle.
+- Utiliser une cle dediee par environnement (dev/staging/prod).
+- Documenter user + IP + chemin de cle dans une fiche VPS separee.
+
+## 6) Note importante - Contrainte sandbox Codex
+
+- Si une commande SSH/SCP echoue avec un message proche de:
+  - `Identity file ... not accessible: Permission denied`
+- Cause probable:
+  - la session est en sandbox et ne peut pas lire la cle locale dans
+    `C:\Users\<user>\.ssh\...`.
+- Action:
+  - relancer la commande en mode `require_escalated` (hors sandbox) pour
+    autoriser l'acces a la cle locale.
+- Exemple observe le 2026-04-07:
+  - creation du dossier `/root/test` sur `46.202.173.47` reussie uniquement
+    apres escalation.

deployment/vps/46.202.173.47-credentials.md

@@ -0,0 +1,36 @@
+# Fiche VPS - 46.202.173.47
+
+Date de reference: 2026-04-07
+
+## Identite serveur
+
+- IP: `46.202.173.47`
+- Hostname alias conseille: `vps3`
+
+## Acces
+
+- Cle publique Laurent Barontini (vps-deploy):
+`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEm8JMCYsk6I1IoYhIHXNrdyERHdh+eeDCJagOHaRAEK vps-deploy`
+
+- Cle publique Sylvain Duvernay (s.duvernay@singa-associates.com):
+`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG6Xsp/v6q6JO04ETv1880qoSPptUMxlWQvgcBz67o63 s.duvernay@singa-associates.com`
+  - Fichier local: `$env:USERPROFILE\.ssh\id_ed25519`
+
+- Mot de passe fourni:
+`!!OpenSquared!!`
+
+- Utilisateur SSH:
+'root'
+- Port SSH:
+'22'
+
+## Commande de connexion type
+
+- Laurent Barontini (cle vps-deploy):
+`ssh -i $env:USERPROFILE\.ssh\vps_deploy_key <user>@46.202.173.47`
+
+- Sylvain Duvernay (cle id_ed25519):
+`ssh -i $env:USERPROFILE\.ssh\id_ed25519 <user>@46.202.173.47`
+
+- Avec port custom:
+`ssh -i $env:USERPROFILE\.ssh\id_ed25519 -p <port> <user>@46.202.173.47`

deployment/vps/46.202.173.47-quickstart.md

@@ -0,0 +1,39 @@
+# Commandes Rapides - VPS 46.202.173.47
+
+Date de reference: 2026-04-07
+
+## Cles SSH par utilisateur
+
+| Utilisateur | Fichier cle locale |
+|---|---|
+| Laurent Barontini | `$env:USERPROFILE\.ssh\vps_deploy_key` |
+| Sylvain Duvernay | `$env:USERPROFILE\.ssh\id_ed25519` |
+
+> Les commandes ci-dessous utilisent `id_ed25519` (Sylvain Duvernay).
+
+## 1) Test SSH
+
+`ssh -i $env:USERPROFILE\.ssh\id_ed25519 <user>@46.202.173.47 "echo ok"`
+
+## 2) Creer un dossier test distant
+
+`ssh -i $env:USERPROFILE\.ssh\id_ed25519 <user>@46.202.173.47 "mkdir -p ~/test_codex_deploy && ls -ld ~/test_codex_deploy"`
+
+## 3) Lister home distant
+
+`ssh -i $env:USERPROFILE\.ssh\id_ed25519 <user>@46.202.173.47 "ls -la ~"`
+
+## 4) Copier un fichier local vers le VPS
+
+`scp -i $env:USERPROFILE\.ssh\id_ed25519 .\local.txt <user>@46.202.173.47:~/local.txt`
+
+## 5) Recuperer un fichier du VPS
+
+`scp -i $env:USERPROFILE\.ssh\id_ed25519 <user>@46.202.173.47:~/remote.txt .\remote.txt`
+
+## 6) Depannage sandbox (Codex)
+
+- Symptome:
+  - `Identity file ... not accessible: Permission denied`
+- Correctif:
+  - relancer la commande SSH/SCP en mode escalade (`require_escalated`).

modules/account_invoice/invoice.py

@@ -485,7 +485,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin, InvoiceReportMixin):
                 })
         cls.__rpc__.update({
                 'post': RPC(
-                    readonly=False, instantiate=0, fresh_session=True),
+                    readonly=False, instantiate=0, fresh_session=False),
                 })
 
     @classmethod
@@ -1890,17 +1890,15 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin, InvoiceReportMixin):
         cls._check_taxes(invoices)
         # cls._check_similar(invoices)
 
-        invoices_in = cls.browse([i for i in invoices if i.type == 'in'])
+        cls.set_number(invoices)
-        cls.set_number(invoices_in)
         cls._store_cache(invoices)
         
         moves = []
         for invoice in invoices:
-            if invoice.type == 'in':
+            move = invoice.get_move()
-                move = invoice.get_move()
+            if move != invoice.move:
-                if move != invoice.move:
+                invoice.move = move
-                    invoice.move = move
+                moves.append(move)
-                    moves.append(move)
             invoice.do_lot_invoicing()
         if moves:
             Move.save(moves)

modules/account_invoice/invoice.xml

@@ -288,7 +288,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
 
         <record model="ir.action.report" id="report_invoice">
-            <field name="name">Provisional Invoice</field>
+            <field name="name">Invoice</field>
             <field name="model">account.invoice</field>
             <field name="report_name">account.invoice</field>
             <field name="report">account_invoice/invoice.fodt</field>
@@ -314,7 +314,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
 
         <record model="ir.action.report" id="report_invoice_ict_final">
-            <field name="name">Final Invoice</field>
+            <field name="name">CN/DN</field>
             <field name="model">account.invoice</field>
             <field name="report_name">account.invoice</field>
             <field name="report">account_invoice/invoice_ict_final.fodt</field>

modules/account_invoice/invoice_ict.fodt

@@ -2,19 +2,19 @@
 
 <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>
-    <dc:title>Provisional Invoice</dc:title>
+   <dc:title>Invoice</dc:title>
     <meta:initial-creator>willen</meta:initial-creator>
     
     
     
     <meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator>
-    <meta:editing-duration>PT3H16M29S</meta:editing-duration>
+    <meta:editing-duration>PT3H20M59S</meta:editing-duration>
-    <meta:editing-cycles>9</meta:editing-cycles>
+    <meta:editing-cycles>12</meta:editing-cycles>
     
-  <dc:date>2026-03-27T07:35:45.157000000</dc:date><meta:document-statistic meta:table-count="10" meta:image-count="2" meta:object-count="0" meta:page-count="2" meta:paragraph-count="61" meta:word-count="210" meta:character-count="2997" meta:non-whitespace-character-count="2429"/></office:meta>
+  <dc:date>2026-04-10T10:30:16.567000000</dc:date><meta:document-statistic meta:table-count="10" meta:image-count="2" meta:object-count="0" meta:page-count="2" meta:paragraph-count="66" meta:word-count="168" meta:character-count="2416" meta:non-whitespace-character-count="1896"/></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" config:type="long">28575</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">6879</config:config-item>
    <config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
    <config:config-item config:name="ViewAreaWidth" config:type="long">27264</config:config-item>
    <config:config-item config:name="ViewAreaHeight" config:type="long">13187</config:config-item>
@@ -23,12 +23,12 @@
    <config:config-item-map-indexed config:name="Views">
     <config:config-item-map-entry>
      <config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" config:type="long">7583</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">13275</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">33203</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">15563</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">28575</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">6879</config:config-item>
      <config:config-item config:name="VisibleRight" config:type="long">27263</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">41760</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">20064</config:config-item>
      <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutColumns" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -101,7 +101,7 @@
    <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item>
    <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" config:type="boolean">false</config:config-item>
    <config:config-item config:name="UseOldPrinterMetrics" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="Rsid" config:type="int">297701</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">523469</config:config-item>
    <config:config-item config:name="RsidRoot" config:type="int">84510</config:config-item>
    <config:config-item config:name="ProtectForm" config:type="boolean">false</config:config-item>
    <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item>
@@ -168,19 +168,20 @@
   <style:font-face style:name="Lucida Sans1" svg:font-family="&apos;Lucida Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
   <style:font-face style:name="Microsoft YaHei" svg:font-family="&apos;Microsoft YaHei&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
   <style:font-face style:name="Tahoma" svg:font-family="Tahoma, arial" style:font-family-generic="swiss" style:font-pitch="variable"/>
-  <style:font-face style:name="Times New Roman" svg:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Times New Roman" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Times New Roman1" svg:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable"/>
  </office:font-face-decls>
  <office:styles>
   <style:default-style style:family="graphic">
    <style:graphic-properties svg:stroke-color="#808080" draw:fill-color="#cfe7f5" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:writing-mode="lr-tb" style:flow-with-text="true"/>
-   <style:paragraph-properties style:text-autospace="none" style:line-break="strict" loext:tab-stop-distance="0cm" style:font-independent-line-spacing="false">
+   <style:paragraph-properties style:text-autospace="none" style:line-break="strict" loext:tab-stop-distance="0cm" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
     <style:tab-stops/>
    </style:paragraph-properties>
-   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman" fo:font-size="12pt" fo:language="fr" fo:country="CH" style:letter-kerning="true" style:font-name-asian="Times New Roman" style:font-size-asian="12pt" style:language-asian="fr" style:country-asian="CH" style:font-name-complex="Times New Roman" style:font-size-complex="12pt" style:language-complex="fr" style:country-complex="CH"/>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman1" fo:font-size="12pt" fo:language="fr" fo:country="CH" style:letter-kerning="true" style:font-name-asian="Times New Roman1" style:font-size-asian="12pt" style:language-asian="fr" style:country-asian="CH" style:font-name-complex="Times New Roman1" style:font-size-complex="12pt" style:language-complex="fr" style:country-complex="CH"/>
   </style:default-style>
   <style:default-style style:family="paragraph">
    <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="none" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.249cm" style:writing-mode="lr-tb"/>
-   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman" fo:font-size="12pt" fo:language="fr" fo:country="CH" style:letter-kerning="true" style:font-name-asian="Times New Roman" style:font-size-asian="12pt" style:language-asian="fr" style:country-asian="CH" style:font-name-complex="Times New Roman" style:font-size-complex="12pt" style:language-complex="fr" style:country-complex="CH" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="no-limit" loext:hyphenation-zone="no-limit"/>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman1" fo:font-size="12pt" fo:language="fr" fo:country="CH" style:letter-kerning="true" style:font-name-asian="Times New Roman1" style:font-size-asian="12pt" style:language-asian="fr" style:country-asian="CH" style:font-name-complex="Times New Roman1" style:font-size-complex="12pt" style:language-complex="fr" style:country-complex="CH" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="no-limit" loext:hyphenation-zone="no-limit"/>
   </style:default-style>
   <style:default-style style:family="table">
    <style:table-properties table:border-model="collapsing"/>
@@ -245,7 +246,7 @@
   </style:style>
   <style:style style:name="No_20_Spacing" style:display-name="No Spacing" style:family="paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false" style:text-autospace="ideograph-alpha" style:vertical-align="auto"/>
-   <style:text-properties style:font-name="Calibri1" fo:font-family="Calibri, &apos;Century Gothic&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="11pt" fo:language="it" fo:country="IT" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-size-asian="11pt" style:language-asian="en" style:country-asian="US" style:font-name-complex="Calibri1" style:font-family-complex="Calibri, &apos;Century Gothic&apos;" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable" style:font-size-complex="11pt" style:language-complex="ar" style:country-complex="SA"/>
+   <style:text-properties style:font-name="Calibri1" fo:font-family="Calibri, &apos;Century Gothic&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="11pt" fo:language="it" fo:country="IT" style:font-name-asian="Times New Roman1" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-size-asian="11pt" style:language-asian="en" style:country-asian="US" style:font-name-complex="Calibri1" style:font-family-complex="Calibri, &apos;Century Gothic&apos;" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable" style:font-size-complex="11pt" style:language-complex="ar" style:country-complex="SA"/>
   </style:style>
   <style:style style:name="Header_20_and_20_Footer" style:display-name="Header and Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
    <style:paragraph-properties text:number-lines="false" text:line-number="0">
@@ -295,30 +296,35 @@
    </style:paragraph-properties>
    <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
   </style:style>
+  <style:style style:name="Normal" style:family="paragraph">
+   <style:paragraph-properties fo:hyphenation-ladder-count="no-limit"/>
+   <style:text-properties fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="no-limit" loext:hyphenation-zone="no-limit"/>
+  </style:style>
   <style:style style:name="Default_20_Paragraph_20_Font" style:display-name="Default Paragraph Font" style:family="text"/>
   <style:style style:name="Titolo_20_1_20_Carattere" style:display-name="Titolo 1 Carattere" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
    <style:text-properties style:font-name="Arial1" fo:font-family="Arial, Arial" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="12pt" fo:language="en" fo:country="US" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" style:font-name-asian="Arial1" style:font-family-asian="Arial, Arial" style:font-family-generic-asian="swiss" style:font-pitch-asian="variable" style:font-size-asian="12pt" style:language-asian="en" style:country-asian="US" style:font-weight-asian="bold" style:font-name-complex="Arial1" style:font-family-complex="Arial, Arial" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable" style:font-size-complex="12pt" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="Intestazione_20_Carattere" style:display-name="Intestazione Carattere" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
-   <style:text-properties style:font-name="Times New Roman" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="10pt" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable" style:font-size-complex="10pt"/>
+   <style:text-properties style:font-name="Times New Roman1" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="10pt" style:font-name-asian="Times New Roman1" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="Placeholder_20_Text" style:display-name="Placeholder Text" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
-   <style:text-properties fo:color="#808080" loext:opacity="100%" style:font-name="Times New Roman" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-name-complex="Times New Roman" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable"/>
+   <style:text-properties fo:color="#808080" loext:opacity="100%" style:font-name="Times New Roman1" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" style:font-name-asian="Times New Roman1" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-name-complex="Times New Roman1" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable"/>
   </style:style>
   <style:style style:name="Testo_20_fumetto_20_Carattere" style:display-name="Testo fumetto Carattere" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
    <style:text-properties style:font-name="Tahoma" fo:font-family="Tahoma, arial" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="8pt" style:font-name-asian="Tahoma" style:font-family-asian="Tahoma, arial" style:font-family-generic-asian="swiss" style:font-pitch-asian="variable" style:font-size-asian="8pt" style:font-name-complex="Tahoma" style:font-family-complex="Tahoma, arial" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable" style:font-size-complex="8pt"/>
   </style:style>
   <style:style style:name="PiÃ_a8__20_di_20_pagina_20_Carattere" style:display-name="Piè di pagina Carattere" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
-   <style:text-properties style:font-name="Times New Roman" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-name-complex="Times New Roman" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable"/>
+   <style:text-properties style:font-name="Times New Roman1" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" style:font-name-asian="Times New Roman1" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-name-complex="Times New Roman1" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable"/>
   </style:style>
   <style:style style:name="Nessuna_20_spaziatura_20_Carattere" style:display-name="Nessuna spaziatura Carattere" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
-   <style:text-properties style:font-name="Calibri1" fo:font-family="Calibri, &apos;Century Gothic&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:language="it" fo:country="IT" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:language-asian="en" style:country-asian="US" style:font-name-complex="Calibri1" style:font-family-complex="Calibri, &apos;Century Gothic&apos;" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable"/>
+   <style:text-properties style:font-name="Calibri1" fo:font-family="Calibri, &apos;Century Gothic&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:language="it" fo:country="IT" style:font-name-asian="Times New Roman1" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:language-asian="en" style:country-asian="US" style:font-name-complex="Calibri1" style:font-family-complex="Calibri, &apos;Century Gothic&apos;" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable"/>
   </style:style>
   <style:style style:name="Placeholder" style:family="text">
    <style:text-properties fo:font-variant="small-caps" fo:color="#008080" loext:opacity="100%" style:text-underline-style="dotted" style:text-underline-width="auto" style:text-underline-color="font-color"/>
   </style:style>
   <style:style style:name="Police_20_par_20_dÃ_a9_faut" style:display-name="Police par défaut" style:family="text"/>
   <style:style style:name="Default_20_Paragraph_20_Font_20__28_WW_29_" style:display-name="Default Paragraph Font (WW)" style:family="text"/>
+  <style:style style:name="Police_20_par_20_défaut" style:display-name="Police par défaut" style:family="text"/>
   <style:style style:name="Frame" style:family="graphic">
    <style:graphic-properties text:anchor-type="paragraph" svg:x="0cm" svg:y="0cm" style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" fo:background-color="transparent" draw:fill="none" draw:fill-color="#cfe7f5"/>
   </style:style>
@@ -664,7 +670,7 @@
   </style:style>
   <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="GB" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="GB" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
@@ -684,7 +690,7 @@
   </style:style>
   <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="US" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="US" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
@@ -696,7 +702,7 @@
   </style:style>
   <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
@@ -708,7 +714,7 @@
   </style:style>
   <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" fo:language="fr" fo:country="CH" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="10pt" fo:language="fr" fo:country="CH" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="end" style:justify-single-word="false" style:writing-mode="lr-tb"/>
@@ -724,7 +730,7 @@
   </style:style>
   <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="1pt" fo:language="en" fo:country="US" style:font-size-asian="1pt" style:font-name-complex="Times New Roman" style:font-size-complex="1pt" text:display="none"/>
+   <style:text-properties fo:font-size="1pt" fo:language="en" fo:country="US" style:font-size-asian="1pt" style:font-name-complex="Times New Roman1" style:font-size-complex="1pt" text:display="none"/>
   </style:style>
   <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
@@ -759,14 +765,34 @@
    </style:paragraph-properties>
    <style:text-properties officeooo:paragraph-rsid="00022035"/>
   </style:style>
-  <style:style style:name="P44" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P44" style:family="paragraph" style:parent-style-name="Normal">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
-   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="GB" officeooo:paragraph-rsid="000391f3" style:font-size-asian="10pt" style:font-name-complex="Arial1" style:font-size-complex="10pt"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Arial" fo:font-size="10pt" officeooo:paragraph-rsid="00056da2" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="10pt" style:font-name-complex="Arial" style:font-size-complex="10pt"/>
   </style:style>
-  <style:style style:name="P45" style:family="paragraph" style:parent-style-name="footer">
+  <style:style style:name="P45" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Calibri" fo:font-size="10pt" officeooo:paragraph-rsid="00056da2" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="10pt" style:font-name-complex="Arial" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
+   <style:text-properties officeooo:paragraph-rsid="00056da2"/>
+  </style:style>
+  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Normal">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
+   <style:text-properties style:font-name="Calibri" fo:font-size="10pt" officeooo:paragraph-rsid="00056da2" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Calibri" fo:font-size="10pt" fo:language="fr" fo:country="CH" style:font-size-asian="10pt" style:font-name-complex="Arial1" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P49" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
+   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P50" style:family="paragraph" style:parent-style-name="footer">
    <style:paragraph-properties style:writing-mode="lr-tb"/>
   </style:style>
-  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="header">
+  <style:style style:name="P51" style:family="paragraph" style:parent-style-name="header">
    <style:paragraph-properties style:writing-mode="lr-tb"/>
   </style:style>
   <style:style style:name="T1" style:family="text">
@@ -790,6 +816,24 @@
   <style:style style:name="T7" style:family="text">
    <style:text-properties fo:language="fr" fo:country="CH"/>
   </style:style>
+  <style:style style:name="T8" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Arial" fo:font-size="9pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="9pt" style:font-name-complex="Arial" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="T9" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Arial" fo:font-size="9pt" officeooo:rsid="00056da2" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="9pt" style:font-name-complex="Arial" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="T10" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" fo:font-size="9pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="9pt" style:font-name-complex="Arial" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="T11" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" fo:font-size="9pt" officeooo:rsid="00056da2" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="9pt" style:font-name-complex="Arial" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="T12" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T13" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" officeooo:rsid="00056da2" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-name-complex="Arial"/>
+  </style:style>
   <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
    <style:graphic-properties style:run-through="background" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="top" style:vertical-rel="baseline" 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>
@@ -3866,7 +3910,7 @@
     <table:table-row table:style-name="Tableau3.1">
      <table:table-cell table:style-name="Tableau3.A1" office:value-type="string">
       <text:p text:style-name="P22"/>
-      <text:p text:style-name="P22">Provisional Invoice</text:p>
+      <text:p text:style-name="P22">Invoice</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau3.A1" office:value-type="string">
       <text:p text:style-name="P22"/>
@@ -3930,15 +3974,19 @@
       <text:p text:style-name="P25">Goods description</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau5.A1" office:value-type="string">
-      <text:p text:style-name="P26">QUANTITY: <text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_lbs, invoice.party.lang) if invoice.report_lbs != &apos;&apos; else &apos;&apos;&gt;</text:placeholder><text:s/>LBS (<text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_net, invoice.party.lang) if invoice.report_net != &apos;&apos; else &apos;&apos;&gt;</text:placeholder> MTS)</text:p>
+      <text:p text:style-name="P26">QUANTITY: <text:placeholder text:placeholder-type="text">&lt;invoice.report_lbs_display&gt;</text:placeholder><text:s/>LBS (<text:placeholder text:placeholder-type="text">&lt;invoice.report_net_display&gt;</text:placeholder> <text:placeholder text:placeholder-type="text">&lt;invoice.report_weight_unit_upper&gt;</text:placeholder>)</text:p>
-      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;invoice.report_description_upper or invoice.report_product_description&gt;</text:placeholder><text:s/>CROP <text:placeholder text:placeholder-type="text">&lt;invoice.report_crop_name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P26"/>
+      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;invoice.report_description_upper or invoice.report_product_description&gt;</text:placeholder><text:placeholder text:placeholder-type="text">&lt;&apos; CROP &apos; + invoice.report_crop_name if invoice.report_crop_name else &apos;&apos;&gt;</text:placeholder></text:p>
       <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;invoice.report_attributes_name&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P18">At <text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_currency_upper&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_value&gt;</text:placeholder><text:s/>PER <text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_unit_upper&gt;</text:placeholder><text:s/>(<text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_price_words&gt;</text:placeholder>) <text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_pricing_text&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;block in invoice.report_trade_blocks&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;block[0]&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P18">At <text:placeholder text:placeholder-type="text">&lt;block[1]&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P18"/>
+      <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
       <text:p text:style-name="P18"/>
       <text:p text:style-name="P18"/>
-      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;invoice.report_incoterm&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P29"><text:span text:style-name="T7"><text:placeholder text:placeholder-type="text">&lt;invoice.report_incoterm&gt;</text:placeholder></text:span><text:span text:style-name="T3"><text:s/></text:span></text:p>
-      <text:p text:style-name="P29"><text:span text:style-name="T1">ALL DETAILS AND SPECIFICATIONS AS PER</text:span> <text:span text:style-name="T3">BENEFICIARY </text:span></text:p>
+      <text:p text:style-name="P26"/>
-      <text:p text:style-name="P26">PROFORMA INVOICE NO. <text:placeholder text:placeholder-type="text">&lt;invoice.report_proforma_invoice_number&gt;</text:placeholder><text:s/>DATED <text:placeholder text:placeholder-type="text">&lt;format_date(invoice.report_proforma_invoice_date, invoice.party.lang) if invoice.report_proforma_invoice_date else &apos;&apos;&gt;</text:placeholder>.</text:p>
       <text:p text:style-name="P26"/>
       <text:p text:style-name="P12"/>
      </table:table-cell>
@@ -3952,10 +4000,10 @@
       <text:p text:style-name="P15"><text:s text:c="19"/>BALES</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A1" office:value-type="string">
-      <text:p text:style-name="P41"><text:s text:c="13"/>Gross KGS</text:p>
+      <text:p text:style-name="P41"><text:s text:c="13"/>Gross <text:placeholder text:placeholder-type="text">&lt;invoice.report_weight_unit_upper&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A1" office:value-type="string">
-      <text:p text:style-name="P15"><text:s text:c="13"/>NET KGS</text:p>
+      <text:p text:style-name="P15"><text:s text:c="13"/>NET <text:placeholder text:placeholder-type="text">&lt;invoice.report_weight_unit_upper&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A1" office:value-type="string">
       <text:p text:style-name="P41"><text:s text:c="10"/></text:p>
@@ -3969,10 +4017,10 @@
       <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_nb_bale&gt;</text:placeholder><text:s/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A2" office:value-type="string">
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_gross, invoice.party.lang) if invoice.report_gross != &apos;&apos; else &apos;&apos;&gt;</text:placeholder><text:s/></text:p>
+      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_gross_display&gt;</text:placeholder><text:s/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A2" office:value-type="string">
-      <text:p text:style-name="P30"><text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_net, invoice.party.lang) if invoice.report_net != &apos;&apos; else &apos;&apos;&gt;</text:placeholder><text:s/></text:p>
+      <text:p text:style-name="P30"><text:placeholder text:placeholder-type="text">&lt;invoice.report_net_display&gt;</text:placeholder><text:s/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A2" office:value-type="string">
       <text:p text:style-name="P16"/>
@@ -3996,7 +4044,7 @@
       <text:p text:style-name="P16">Equivalent to LBS</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau7.A1" office:value-type="string">
-      <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_lbs, invoice.party.lang) if invoice.report_lbs != &apos;&apos; else &apos;&apos;&gt;</text:placeholder><text:s/></text:p>
+      <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text">&lt;invoice.report_lbs_display&gt;</text:placeholder><text:s/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau7.A1" office:value-type="string">
       <text:p text:style-name="P20"/>
@@ -4009,13 +4057,18 @@
     <table:table-column table:style-name="Tableau8.B"/>
     <table:table-row table:style-name="Tableau8.1">
      <table:table-cell table:style-name="Tableau8.A1" office:value-type="string">
-      <text:p text:style-name="P14">At <text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_currency_upper&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_value&gt;</text:placeholder><text:s/>PER <text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_unit_upper&gt;</text:placeholder><text:s/>(<text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_price_words&gt;</text:placeholder>) <text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_pricing_text&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in invoice.report_rate_lines.splitlines()&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P14">At <text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
       <text:p text:style-name="P14"/>
       <text:p text:style-name="P14">FREIGHT VALUE: <text:placeholder text:placeholder-type="text">&lt;invoice.report_freight_currency_symbol&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_freight_amount, invoice.party.lang) if invoice.report_freight_amount != &apos;&apos; else &apos;&apos;&gt;</text:placeholder></text:p>
       <text:p text:style-name="P14"/>
       <text:p text:style-name="P17">WE CERTIFY THAT THE MERCHANDISE IS OF <text:span text:style-name="T7"><text:placeholder text:placeholder-type="text">&lt;invoice.report_origin or &apos;&apos;&gt;</text:placeholder></text:span><text:s/>ORIGIN</text:p>
-      <text:p text:style-name="P31"><text:soft-page-break/>L/C NUMBER </text:p>
+      <text:p text:style-name="P17"/>
-      <text:p text:style-name="P31"/>
+      <text:p text:style-name="P47"><text:span text:style-name="T12">B</text:span><text:span text:style-name="T13">ANK</text:span><text:span text:style-name="T12">: EFG BANK SA</text:span></text:p>
+      <text:p text:style-name="P45">IBAN : CH8808667007168111027</text:p>
+      <text:p text:style-name="P45">SwifT Code: EFGBCHZZ</text:p>
+      <text:p text:style-name="P48"/>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau8.A1" office:value-type="string">
       <text:p text:style-name="P34"><text:s text:c="3"/><text:placeholder text:placeholder-type="text">&lt;format_currency(invoice.total_amount, invoice.party.lang, invoice.currency)&gt;</text:placeholder><text:s/></text:p>
@@ -4027,6 +4080,7 @@
    <text:p text:style-name="P11"/>
    <table:table table:name="Tableau9" table:style-name="Tableau9">
     <table:table-column table:style-name="Tableau9.A"/>
+    <text:soft-page-break/>
     <table:table-row table:style-name="Tableau9.1">
      <table:table-cell table:style-name="Tableau9.A1" office:value-type="string">
       <text:p text:style-name="P21">NET LANDED WEIGHTS, ACTUAL TARE, NO FRANCHISE</text:p>
@@ -4052,7 +4106,7 @@
       <text:p text:style-name="P13">Controller Name</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau10.A1" office:value-type="string">
-      <text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;invoice.report_si_number&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;invoice.report_si_reference&gt;</text:placeholder></text:p>
       <text:p text:style-name="P25"/>
       <text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;invoice.report_controller_name&gt;</text:placeholder></text:p>
      </table:table-cell>
@@ -4100,4 +4154,4 @@
    <text:p text:style-name="P38"/>
   </office:text>
  </office:body>
-</office:document>
+</office:document>

modules/account_invoice/invoice_ict_final.fodt

@@ -2,33 +2,33 @@
 
 <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>
-    <dc:title>Final Invoice</dc:title>
+   <dc:title>Credit / Debit Note</dc:title>
     <meta:initial-creator>willen</meta:initial-creator>
-    <meta:creation-date>2018-12-09T16:20:00</meta:creation-date>
-    <dc:date>2026-03-27T08:01:16.333000000</dc:date>
-    <meta:print-date>2007-08-28T18:19:00</meta:print-date>
-    <meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator>
-    <meta:editing-duration>PT3H13M14S</meta:editing-duration>
-    <meta:editing-cycles>13</meta:editing-cycles>
     
-  <meta:document-statistic meta:table-count="10" meta:image-count="2" meta:object-count="0" meta:page-count="2" meta:paragraph-count="68" meta:word-count="226" meta:character-count="3098" meta:non-whitespace-character-count="2521"/></office:meta>
+    
+    
+    <meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator>
+    <meta:editing-duration>PT3H14M14S</meta:editing-duration>
+    <meta:editing-cycles>15</meta:editing-cycles>
+    
+  <dc:date>2026-04-10T09:14:51.284000000</dc:date><meta:document-statistic meta:table-count="10" meta:image-count="2" meta:object-count="0" meta:page-count="2" meta:paragraph-count="67" meta:word-count="175" meta:character-count="2499" meta:non-whitespace-character-count="1973"/></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" config:type="long">9437</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">17727</config:config-item>
    <config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
    <config:config-item config:name="ViewAreaWidth" config:type="long">27264</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="long">13242</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">13187</config:config-item>
    <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
    <config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item>
    <config:config-item-map-indexed config:name="Views">
     <config:config-item-map-entry>
      <config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" config:type="long">10084</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">5639</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">16424</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">26935</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">9437</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">17727</config:config-item>
      <config:config-item config:name="VisibleRight" config:type="long">27263</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">22677</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">30912</config:config-item>
      <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutColumns" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -101,11 +101,11 @@
    <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">665618</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">890727</config:config-item>
    <config:config-item config:name="RsidRoot" config:type="int">84510</config:config-item>
    <config:config-item config:name="ProtectForm" config:type="boolean">false</config:config-item>
    <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="MsWordCompMinLineHeightByFly" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="MsWordCompMinLineHeightByFly" config:type="boolean">true</config:config-item>
    <config:config-item config:name="MathBaselineAlignment" config:type="boolean">true</config:config-item>
    <config:config-item config:name="SmallCapsPercentage66" config:type="boolean">true</config:config-item>
    <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item>
@@ -114,7 +114,7 @@
    <config:config-item config:name="EmbedOnlyUsedFonts" config:type="boolean">false</config:config-item>
    <config:config-item config:name="EmbedLatinScriptFonts" config:type="boolean">true</config:config-item>
    <config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="TabOverMargin" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabOverMargin" config:type="boolean">true</config:config-item>
    <config:config-item config:name="ApplyParagraphMarkFormatToNumbering" config:type="boolean">false</config:config-item>
    <config:config-item config:name="TabOverSpacing" config:type="boolean">false</config:config-item>
    <config:config-item config:name="TreatSingleColumnBreakAsPageBreak" config:type="boolean">false</config:config-item>
@@ -131,6 +131,7 @@
    <config:config-item config:name="ImagePreferredDPI" config:type="int">0</config:config-item>
    <config:config-item config:name="AutoFirstLineIndentDisregardLineSpace" config:type="boolean">false</config:config-item>
    <config:config-item config:name="HyphenateURLs" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="DoNotBreakWrappedTables" config:type="boolean">true</config:config-item>
    <config:config-item config:name="NoNumberingShowFollowBy" config:type="boolean">false</config:config-item>
    <config:config-item config:name="DropCapPunctuation" config:type="boolean">false</config:config-item>
    <config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item>
@@ -158,16 +159,20 @@
   </office:script>
  </office:scripts>
  <office:font-face-decls>
+  <style:font-face style:name="0" svg:font-family="0" style:font-family-generic="roman" style:font-pitch="variable"/>
   <style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/>
   <style:font-face style:name="Arial1" svg:font-family="Arial, Arial" style:font-family-generic="swiss" style:font-pitch="variable"/>
   <style:font-face style:name="Calibri" svg:font-family="Calibri" style:font-family-generic="swiss" style:font-pitch="variable"/>
   <style:font-face style:name="Calibri1" svg:font-family="Calibri, &apos;Century Gothic&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
   <style:font-face style:name="FuturaBookATT" svg:font-family="FuturaBookATT, &apos;Century Gothic&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
-  <style:font-face style:name="Lucida Sans" svg:font-family="&apos;Lucida Sans&apos;" style:font-family-generic="swiss"/>
+  <style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
-  <style:font-face style:name="Lucida Sans1" svg:font-family="&apos;Lucida Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="Lucida Sans" svg:font-family="&apos;Lucida Sans&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Lucida Sans1" svg:font-family="&apos;Lucida Sans&apos;" style:font-family-generic="swiss"/>
+  <style:font-face style:name="Lucida Sans2" svg:font-family="&apos;Lucida Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
   <style:font-face style:name="Microsoft YaHei" svg:font-family="&apos;Microsoft YaHei&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
   <style:font-face style:name="Tahoma" svg:font-family="Tahoma, arial" style:font-family-generic="swiss" style:font-pitch="variable"/>
-  <style:font-face style:name="Times New Roman" svg:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Times New Roman" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
+  <style:font-face style:name="Times New Roman1" svg:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable"/>
  </office:font-face-decls>
  <office:styles>
   <style:default-style style:family="graphic">
@@ -175,11 +180,11 @@
    <style:paragraph-properties style:text-autospace="none" style:line-break="strict" loext:tab-stop-distance="0cm" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
     <style:tab-stops/>
    </style:paragraph-properties>
-   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman" fo:font-size="12pt" fo:language="fr" fo:country="CH" style:letter-kerning="true" style:font-name-asian="Times New Roman" style:font-size-asian="12pt" style:language-asian="fr" style:country-asian="CH" style:font-name-complex="Times New Roman" style:font-size-complex="12pt" style:language-complex="fr" style:country-complex="CH"/>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman1" fo:font-size="12pt" fo:language="fr" fo:country="CH" style:letter-kerning="true" style:font-name-asian="Times New Roman1" style:font-size-asian="12pt" style:language-asian="fr" style:country-asian="CH" style:font-name-complex="Times New Roman1" style:font-size-complex="12pt" style:language-complex="fr" style:country-complex="CH"/>
   </style:default-style>
   <style:default-style style:family="paragraph">
-   <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="none" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.249cm" style:writing-mode="page"/>
+   <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="none" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.249cm" style:writing-mode="lr-tb"/>
-   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman" fo:font-size="12pt" fo:language="fr" fo:country="CH" style:letter-kerning="true" style:font-name-asian="Times New Roman" style:font-size-asian="12pt" style:language-asian="fr" style:country-asian="CH" style:font-name-complex="Times New Roman" style:font-size-complex="12pt" style:language-complex="fr" style:country-complex="CH" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="no-limit" loext:hyphenation-zone="no-limit"/>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman1" fo:font-size="12pt" fo:language="fr" fo:country="CH" style:letter-kerning="true" style:font-name-asian="Times New Roman1" style:font-size-asian="12pt" style:language-asian="fr" style:country-asian="CH" style:font-name-complex="Times New Roman1" style:font-size-complex="12pt" style:language-complex="fr" style:country-complex="CH" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="no-limit" loext:hyphenation-zone="no-limit"/>
   </style:default-style>
   <style:default-style style:family="table">
    <style:table-properties table:border-model="collapsing"/>
@@ -193,21 +198,21 @@
   </style:style>
   <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">
    <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" fo:keep-with-next="always"/>
-   <style:text-properties style:font-name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" style:font-name-asian="Microsoft YaHei" style:font-family-asian="&apos;Microsoft YaHei&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-name-complex="Lucida Sans1" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt"/>
+   <style:text-properties style:font-name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" style:font-name-asian="Microsoft YaHei" style:font-family-asian="&apos;Microsoft YaHei&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-name-complex="Lucida Sans2" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt"/>
   </style:style>
   <style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false"/>
   </style:style>
   <style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list">
-   <style:text-properties style:font-name-complex="Lucida Sans" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="swiss"/>
+   <style:text-properties style:font-name-complex="Lucida Sans1" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="swiss"/>
   </style:style>
   <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
    <style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" text:number-lines="false" text:line-number="0"/>
-   <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Lucida Sans" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="swiss" style:font-size-complex="12pt" style:font-style-complex="italic"/>
+   <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Lucida Sans1" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="swiss" style:font-size-complex="12pt" style:font-style-complex="italic"/>
   </style:style>
   <style:style style:name="Index" style:family="paragraph" style:parent-style-name="Standard" style:class="index">
    <style:paragraph-properties text:number-lines="false" text:line-number="0"/>
-   <style:text-properties style:font-name-complex="Lucida Sans" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="swiss"/>
+   <style:text-properties style:font-name-complex="Lucida Sans1" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="swiss"/>
   </style:style>
   <style:style style:name="heading_20_1" style:display-name="heading 1" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Standard" style:default-outline-level="1" style:list-style-name="">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="center" style:justify-single-word="false" fo:keep-with-next="always"/>
@@ -244,7 +249,7 @@
   </style:style>
   <style:style style:name="No_20_Spacing" style:display-name="No Spacing" style:family="paragraph">
    <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false" style:text-autospace="ideograph-alpha" style:vertical-align="auto"/>
-   <style:text-properties style:font-name="Calibri1" fo:font-family="Calibri, &apos;Century Gothic&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="11pt" fo:language="it" fo:country="IT" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-size-asian="11pt" style:language-asian="en" style:country-asian="US" style:font-name-complex="Calibri1" style:font-family-complex="Calibri, &apos;Century Gothic&apos;" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable" style:font-size-complex="11pt" style:language-complex="ar" style:country-complex="SA"/>
+   <style:text-properties style:font-name="Calibri1" fo:font-family="Calibri, &apos;Century Gothic&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="11pt" fo:language="it" fo:country="IT" style:font-name-asian="Times New Roman1" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-size-asian="11pt" style:language-asian="en" style:country-asian="US" style:font-name-complex="Calibri1" style:font-family-complex="Calibri, &apos;Century Gothic&apos;" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable" style:font-size-complex="11pt" style:language-complex="ar" style:country-complex="SA"/>
   </style:style>
   <style:style style:name="Header_20_and_20_Footer" style:display-name="Header and Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
    <style:paragraph-properties text:number-lines="false" text:line-number="0">
@@ -277,29 +282,70 @@
    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" text:number-lines="false" text:line-number="0"/>
    <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
   </style:style>
+  <style:style style:name="Normal1" style:family="paragraph">
+   <style:paragraph-properties fo:orphans="2" fo:widows="2" fo:hyphenation-ladder-count="no-limit" style:writing-mode="lr-tb"/>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Liberation Serif" fo:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="12pt" fo:language="en" fo:country="GB" style:letter-kerning="true" style:font-name-asian="0" style:font-family-asian="0" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lucida Sans" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="roman" style:font-pitch-complex="variable" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="no-limit" loext:hyphenation-zone="no-limit"/>
+  </style:style>
+  <style:style style:name="header1" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="0.423cm">
+    <style:tab-stops>
+     <style:tab-stop style:position="8.001cm" style:type="center"/>
+     <style:tab-stop style:position="16.002cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="footer1" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="0.423cm">
+    <style:tab-stops>
+     <style:tab-stop style:position="8.001cm" style:type="center"/>
+     <style:tab-stop style:position="16.002cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+  </style:style>
+  <style:style style:name="footer2" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="0.423cm">
+    <style:tab-stops>
+     <style:tab-stop style:position="8.001cm" style:type="center"/>
+     <style:tab-stop style:position="16.002cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+  </style:style>
+  <style:style style:name="header2" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="0.423cm">
+    <style:tab-stops>
+     <style:tab-stop style:position="8.001cm" style:type="center"/>
+     <style:tab-stop style:position="16.002cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
   <style:style style:name="Default_20_Paragraph_20_Font" style:display-name="Default Paragraph Font" style:family="text"/>
   <style:style style:name="Titolo_20_1_20_Carattere" style:display-name="Titolo 1 Carattere" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
    <style:text-properties style:font-name="Arial1" fo:font-family="Arial, Arial" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="12pt" fo:language="en" fo:country="US" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" style:font-name-asian="Arial1" style:font-family-asian="Arial, Arial" style:font-family-generic-asian="swiss" style:font-pitch-asian="variable" style:font-size-asian="12pt" style:language-asian="en" style:country-asian="US" style:font-weight-asian="bold" style:font-name-complex="Arial1" style:font-family-complex="Arial, Arial" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable" style:font-size-complex="12pt" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="Intestazione_20_Carattere" style:display-name="Intestazione Carattere" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
-   <style:text-properties style:font-name="Times New Roman" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="10pt" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable" style:font-size-complex="10pt"/>
+   <style:text-properties style:font-name="Times New Roman1" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="10pt" style:font-name-asian="Times New Roman1" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="Placeholder_20_Text" style:display-name="Placeholder Text" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
-   <style:text-properties fo:color="#808080" loext:opacity="100%" style:font-name="Times New Roman" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-name-complex="Times New Roman" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable"/>
+   <style:text-properties fo:color="#808080" loext:opacity="100%" style:font-name="Times New Roman1" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" style:font-name-asian="Times New Roman1" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-name-complex="Times New Roman1" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable"/>
   </style:style>
   <style:style style:name="Testo_20_fumetto_20_Carattere" style:display-name="Testo fumetto Carattere" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
    <style:text-properties style:font-name="Tahoma" fo:font-family="Tahoma, arial" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="8pt" style:font-name-asian="Tahoma" style:font-family-asian="Tahoma, arial" style:font-family-generic-asian="swiss" style:font-pitch-asian="variable" style:font-size-asian="8pt" style:font-name-complex="Tahoma" style:font-family-complex="Tahoma, arial" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable" style:font-size-complex="8pt"/>
   </style:style>
   <style:style style:name="PiÃ_a8__20_di_20_pagina_20_Carattere" style:display-name="Piè di pagina Carattere" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
-   <style:text-properties style:font-name="Times New Roman" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-name-complex="Times New Roman" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable"/>
+   <style:text-properties style:font-name="Times New Roman1" fo:font-family="&apos;Times New Roman&apos;, Times" style:font-family-generic="roman" style:font-pitch="variable" style:font-name-asian="Times New Roman1" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:font-name-complex="Times New Roman1" style:font-family-complex="&apos;Times New Roman&apos;, Times" style:font-family-generic-complex="roman" style:font-pitch-complex="variable"/>
   </style:style>
   <style:style style:name="Nessuna_20_spaziatura_20_Carattere" style:display-name="Nessuna spaziatura Carattere" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font">
-   <style:text-properties style:font-name="Calibri1" fo:font-family="Calibri, &apos;Century Gothic&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:language="it" fo:country="IT" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:language-asian="en" style:country-asian="US" style:font-name-complex="Calibri1" style:font-family-complex="Calibri, &apos;Century Gothic&apos;" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable"/>
+   <style:text-properties style:font-name="Calibri1" fo:font-family="Calibri, &apos;Century Gothic&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:language="it" fo:country="IT" style:font-name-asian="Times New Roman1" style:font-family-asian="&apos;Times New Roman&apos;, Times" style:font-family-generic-asian="roman" style:font-pitch-asian="variable" style:language-asian="en" style:country-asian="US" style:font-name-complex="Calibri1" style:font-family-complex="Calibri, &apos;Century Gothic&apos;" style:font-family-generic-complex="swiss" style:font-pitch-complex="variable"/>
   </style:style>
   <style:style style:name="Placeholder" style:family="text">
    <style:text-properties fo:font-variant="small-caps" fo:color="#008080" loext:opacity="100%" style:text-underline-style="dotted" style:text-underline-width="auto" style:text-underline-color="font-color"/>
   </style:style>
   <style:style style:name="Police_20_par_20_dÃ_a9_faut" style:display-name="Police par défaut" style:family="text"/>
+  <style:style style:name="Police_20_par_20_défaut" style:display-name="Police par défaut" style:family="text"/>
+  <style:style style:name="Default_20_Paragraph_20_Font_20__28_WW_29_" style:display-name="Default Paragraph Font (WW)" style:family="text"/>
+  <style:style style:name="Default_20_Paragraph_20_Font1" style:display-name="Default Paragraph Font1" style:family="text"/>
   <style:style style:name="Frame" style:family="graphic">
    <style:graphic-properties text:anchor-type="paragraph" svg:x="0cm" svg:y="0cm" style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" fo:background-color="transparent" draw:fill="none" draw:fill-color="#cfe7f5"/>
   </style:style>
@@ -396,6 +442,9 @@
   <text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
   <text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/>
   <text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>
+  <style:default-page-layout>
+   <style:page-layout-properties style:writing-mode="lr-tb" style:layout-grid-standard-mode="true"/>
+  </style:default-page-layout>
   <loext:theme loext:name="Office Theme">
    <loext:theme-colors loext:name="LibreOffice">
     <loext:color loext:name="dark1" loext:color="#000000"/>
@@ -642,11 +691,11 @@
   </style:style>
   <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="GB" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="GB" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="GB" officeooo:paragraph-rsid="000681ce" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="GB" officeooo:paragraph-rsid="000681ce" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
@@ -666,11 +715,11 @@
   </style:style>
   <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="US" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="US" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="US" officeooo:paragraph-rsid="000681ce" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="US" officeooo:paragraph-rsid="000681ce" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
@@ -682,7 +731,7 @@
   </style:style>
   <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="center" style:justify-single-word="false" style:writing-mode="lr-tb"/>
@@ -694,7 +743,7 @@
   </style:style>
   <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="10pt" fo:language="fr" fo:country="CH" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
+   <style:text-properties fo:font-size="10pt" fo:language="fr" fo:country="CH" style:font-size-asian="10pt" style:font-name-complex="Times New Roman1" style:font-size-complex="10pt"/>
   </style:style>
   <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="end" style:justify-single-word="false" style:writing-mode="lr-tb"/>
@@ -710,7 +759,7 @@
   </style:style>
   <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
-   <style:text-properties fo:font-size="1pt" fo:language="en" fo:country="US" style:font-size-asian="1pt" style:font-name-complex="Times New Roman" style:font-size-complex="1pt" text:display="none"/>
+   <style:text-properties fo:font-size="1pt" fo:language="en" fo:country="US" style:font-size-asian="1pt" style:font-name-complex="Times New Roman1" style:font-size-complex="1pt" text:display="none"/>
   </style:style>
   <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Standard">
    <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
@@ -745,14 +794,25 @@
    </style:paragraph-properties>
    <style:text-properties officeooo:paragraph-rsid="00022035"/>
   </style:style>
-  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Normal1">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
-   <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="GB" style:font-size-asian="10pt" style:font-name-complex="Times New Roman" style:font-size-complex="10pt"/>
   </style:style>
-  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="footer">
+  <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Normal1">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%"/>
+   <style:text-properties style:font-name="Calibri" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Calibri" fo:font-size="10pt" fo:language="fr" fo:country="CH" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="10pt" style:font-name-complex="Arial" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P49" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:line-height="100%" style:writing-mode="lr-tb"/>
+   <style:text-properties style:font-name="Calibri" fo:font-size="10pt" fo:language="fr" fo:country="CH" style:font-size-asian="10pt" style:font-name-complex="Arial1" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="P50" style:family="paragraph" style:parent-style-name="footer">
    <style:paragraph-properties style:writing-mode="lr-tb"/>
   </style:style>
-  <style:style style:name="P48" style:family="paragraph" style:parent-style-name="header">
+  <style:style style:name="P51" style:family="paragraph" style:parent-style-name="header">
    <style:paragraph-properties style:writing-mode="lr-tb"/>
   </style:style>
   <style:style style:name="T1" style:family="text">
@@ -776,11 +836,32 @@
   <style:style style:name="T7" style:family="text">
    <style:text-properties fo:language="fr" fo:country="CH"/>
   </style:style>
+  <style:style style:name="T8" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="T9" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Arial" fo:font-size="9pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="9pt" style:font-name-complex="Arial" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="T10" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Arial" fo:font-size="10pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="10pt" style:font-name-complex="Arial" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="T11" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Arial" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-name-complex="Arial"/>
+  </style:style>
+  <style:style style:name="T12" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" fo:font-size="9pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="9pt" style:font-name-complex="Arial" style:font-size-complex="9pt"/>
+  </style:style>
+  <style:style style:name="T13" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" fo:font-size="10pt" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-size-asian="10pt" style:font-name-complex="Arial" style:font-size-complex="10pt"/>
+  </style:style>
+  <style:style style:name="T14" style:family="text">
+   <style:text-properties fo:color="#000000" loext:opacity="100%" style:letter-kerning="false" style:font-name-asian="Times New Roman" style:font-name-complex="Arial"/>
+  </style:style>
   <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
    <style:graphic-properties style:run-through="background" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="top" style:vertical-rel="baseline" 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>
   <style:page-layout style:name="pm1">
-   <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.75cm" fo:margin-bottom="1.499cm" fo:margin-left="2cm" fo:margin-right="2cm" fo:border="none" fo:padding="0cm" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+   <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.75cm" fo:margin-bottom="1.499cm" fo:margin-left="2cm" fo:margin-right="2cm" fo:border="none" fo:padding="0cm" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="44" style:layout-grid-base-height="0.55cm" style:layout-grid-ruby-height="0cm" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="true" style:layout-grid-display="true" style:layout-grid-base-width="0.37cm" style:layout-grid-snap-to="true" style:footnote-max-height="0cm" loext:margin-gutter="0cm">
     <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
    </style:page-layout-properties>
    <style:header-style>
@@ -3852,7 +3933,7 @@
     <table:table-row table:style-name="Tableau3.1">
      <table:table-cell table:style-name="Tableau3.A1" office:value-type="string">
       <text:p text:style-name="P23"/>
-      <text:p text:style-name="P23">Final Invoice</text:p>
+      <text:p text:style-name="P23"><text:placeholder text:placeholder-type="text">&lt;invoice.report_note_title&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau3.A1" office:value-type="string">
       <text:p text:style-name="P23"/>
@@ -3916,23 +3997,19 @@
       <text:p text:style-name="P26">Goods description</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau5.A1" office:value-type="string">
-      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in invoice.lines&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P27">QUANTITY: <text:placeholder text:placeholder-type="text">&lt;invoice.report_lbs_display&gt;</text:placeholder><text:s/>LBS (<text:placeholder text:placeholder-type="text">&lt;invoice.report_net_display&gt;</text:placeholder> <text:placeholder text:placeholder-type="text">&lt;invoice.report_weight_unit_upper&gt;</text:placeholder>)</text:p>
-      <text:p text:style-name="P28"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.type == &apos;line&apos;&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P27"/>
-      <text:p text:style-name="P22"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;line.report_description_upper&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;invoice.report_description_upper or invoice.report_product_description&gt;</text:placeholder><text:placeholder text:placeholder-type="text">&lt;&apos; CROP &apos; + invoice.report_crop_name if invoice.report_crop_name else &apos;&apos;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P22"><text:placeholder text:placeholder-type="text">&lt;line.report_description_upper&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;invoice.report_attributes_name&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P22"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;block in invoice.report_trade_blocks&quot;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P27">QUANTITY <text:placeholder text:placeholder-type="text">&lt;format_number(line.report_lbs, invoice.party.lang) if line.report_lbs != &apos;&apos; else &apos;&apos;&gt;</text:placeholder><text:s/>LBS (<text:placeholder text:placeholder-type="text">&lt;format_number(line.report_net, invoice.party.lang) if line.report_net != &apos;&apos; else &apos;&apos;&gt;</text:placeholder> MTS)</text:p>
+      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;block[0]&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;line.report_product_description or line.product_name or &apos;&apos;&gt;</text:placeholder><text:s/>CROP <text:placeholder text:placeholder-type="text">&lt;line.report_crop_name&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P18">At <text:placeholder text:placeholder-type="text">&lt;block[1]&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;line.report_attributes_name&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P18">At <text:placeholder text:placeholder-type="text">&lt;line.report_rate_currency_upper&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;line.report_rate_value&gt;</text:placeholder><text:s/>PER <text:placeholder text:placeholder-type="text">&lt;line.report_rate_unit_upper&gt;</text:placeholder><text:s/>(<text:placeholder text:placeholder-type="text">&lt;line.report_rate_price_words&gt;</text:placeholder>) <text:placeholder text:placeholder-type="text">&lt;line.report_rate_pricing_text&gt;</text:placeholder></text:p>
       <text:p text:style-name="P18"/>
-      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-      <text:p text:style-name="P18"/>
-      <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
       <text:p text:style-name="P21"/>
       <text:p text:style-name="P34"><text:placeholder text:placeholder-type="text">&lt;invoice.report_incoterm&gt;</text:placeholder></text:p>
       <text:p text:style-name="P31"><text:span text:style-name="T1">ALL DETAILS AND SPECIFICATIONS AS PER</text:span> <text:span text:style-name="T3">BENEFICIARY </text:span></text:p>
-      <text:p text:style-name="P27">PROFORMA INVOICE NO. <text:placeholder text:placeholder-type="text">&lt;invoice.report_proforma_invoice_number&gt;</text:placeholder><text:s/>DATED <text:placeholder text:placeholder-type="text">&lt;format_date(invoice.report_proforma_invoice_date, invoice.party.lang) if invoice.report_proforma_invoice_date else &apos;&apos;&gt;</text:placeholder>.</text:p>
+      <text:p text:style-name="P27"/>
       <text:p text:style-name="P27"/>
       <text:p text:style-name="P12"/>
      </table:table-cell>
@@ -3946,10 +4023,10 @@
       <text:p text:style-name="P15"><text:s text:c="19"/>BALES</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A1" office:value-type="string">
-      <text:p text:style-name="P43"><text:s text:c="13"/>Gross KGS</text:p>
+      <text:p text:style-name="P43"><text:s text:c="13"/>Gross <text:placeholder text:placeholder-type="text">&lt;invoice.report_weight_unit_upper&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A1" office:value-type="string">
-      <text:p text:style-name="P15"><text:s text:c="13"/>NET KGS</text:p>
+      <text:p text:style-name="P15"><text:s text:c="13"/>NET <text:placeholder text:placeholder-type="text">&lt;invoice.report_weight_unit_upper&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A1" office:value-type="string">
       <text:p text:style-name="P43"><text:s text:c="10"/></text:p>
@@ -3960,13 +4037,13 @@
     </table:table-row>
     <table:table-row table:style-name="Tableau6.1">
      <table:table-cell table:style-name="Tableau6.A2" office:value-type="string">
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_nb_bale&gt;</text:placeholder><text:s/></text:p>
+      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_cndn_nb_bale&gt;</text:placeholder><text:s/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A2" office:value-type="string">
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_gross, invoice.party.lang) if invoice.report_gross != &apos;&apos; else &apos;&apos;&gt;</text:placeholder><text:s/></text:p>
+      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_gross_display&gt;</text:placeholder><text:s/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A2" office:value-type="string">
-      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_net, invoice.party.lang) if invoice.report_net != &apos;&apos; else &apos;&apos;&gt;</text:placeholder><text:s/></text:p>
+      <text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;invoice.report_net_display&gt;</text:placeholder><text:s/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A2" office:value-type="string">
       <text:p text:style-name="P16"/>
@@ -3990,7 +4067,7 @@
       <text:p text:style-name="P16">Equivalent to LBS</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau7.A1" office:value-type="string">
-      <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_lbs, invoice.party.lang) if invoice.report_lbs != &apos;&apos; else &apos;&apos;&gt;</text:placeholder><text:s/></text:p>
+      <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text">&lt;invoice.report_lbs_display&gt;</text:placeholder><text:s/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau7.A1" office:value-type="string">
       <text:p text:style-name="P20"/>
@@ -4003,17 +4080,22 @@
     <table:table-column table:style-name="Tableau8.B"/>
     <table:table-row table:style-name="Tableau8.1">
      <table:table-cell table:style-name="Tableau8.A1" office:value-type="string">
-      <text:p text:style-name="P14">At <text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_currency_upper&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_value&gt;</text:placeholder><text:s/>PER <text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_unit_upper&gt;</text:placeholder><text:s/>(<text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_price_words&gt;</text:placeholder>) <text:placeholder text:placeholder-type="text">&lt;invoice.report_rate_pricing_text&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in invoice.report_positive_rate_lines.splitlines()&quot;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P14">At <text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
       <text:p text:style-name="P14"/>
-      <text:p text:style-name="P14"><text:soft-page-break/>FREIGHT VALUE: <text:placeholder text:placeholder-type="text">&lt;invoice.report_freight_currency_symbol&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_freight_amount, invoice.party.lang) if invoice.report_freight_amount != &apos;&apos; else &apos;&apos;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P14">FREIGHT VALUE: <text:placeholder text:placeholder-type="text">&lt;invoice.report_freight_currency_symbol&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_freight_amount, invoice.party.lang) if invoice.report_freight_amount != &apos;&apos; else &apos;&apos;&gt;</text:placeholder></text:p>
       <text:p text:style-name="P14"/>
       <text:p text:style-name="P17">WE CERTIFY THAT THE MERCHANDISE IS OF <text:span text:style-name="T7"><text:placeholder text:placeholder-type="text">&lt;invoice.report_origin or &apos;&apos;&gt;</text:placeholder></text:span><text:s/>ORIGIN</text:p>
-      <text:p text:style-name="P33">L/C NUMBER </text:p>
+      <text:p text:style-name="P17"/>
-      <text:p text:style-name="P33"/>
+      <text:p text:style-name="P47" loext:marker-style-name="T8"><text:span text:style-name="T14">BANK: EFG BANK SA</text:span></text:p>
+      <text:p text:style-name="P47" loext:marker-style-name="T8"><text:span text:style-name="T14">IBAN : CH8808667007168111027</text:span><text:span text:style-name="T14"/></text:p>
+      <text:p text:style-name="P48">SwifT Code: EFGBCHZZ</text:p>
+      <text:p text:style-name="P49"/>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau8.A1" office:value-type="string">
       <text:p text:style-name="P36"><text:s text:c="3"/><text:placeholder text:placeholder-type="text">&lt;format_currency(invoice.total_amount, invoice.party.lang, invoice.currency)&gt;</text:placeholder><text:s/></text:p>
-      <text:p text:style-name="P24"><text:soft-page-break/></text:p>
+      <text:p text:style-name="P24"/>
       <text:p text:style-name="P35"/>
      </table:table-cell>
     </table:table-row>
@@ -4021,6 +4103,7 @@
    <text:p text:style-name="P11"/>
    <table:table table:name="Tableau9" table:style-name="Tableau9">
     <table:table-column table:style-name="Tableau9.A"/>
+    <text:soft-page-break/>
     <table:table-row table:style-name="Tableau9.1">
      <table:table-cell table:style-name="Tableau9.A1" office:value-type="string">
       <text:p text:style-name="P21">NET LANDED WEIGHTS, ACTUAL TARE, NO FRANCHISE</text:p>
@@ -4046,7 +4129,7 @@
       <text:p text:style-name="P13">Controller Name</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau10.A1" office:value-type="string">
-      <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;invoice.report_si_number&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;invoice.report_si_reference&gt;</text:placeholder></text:p>
       <text:p text:style-name="P26"/>
       <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;invoice.report_controller_name&gt;</text:placeholder></text:p>
      </table:table-cell>
@@ -4094,4 +4177,4 @@
    <text:p text:style-name="P40"/>
   </office:text>
  </office:body>
-</office:document>
+</office:document>

modules/account_invoice/tests/test_module.py

@@ -3,6 +3,7 @@
 
 import datetime
 from decimal import Decimal
+from unittest.mock import Mock, patch
 
 from trytond.modules.account_invoice.exceptions import (
     PaymentTermValidationError)
@@ -251,5 +252,70 @@ class AccountInvoiceTestCase(
                 (datetime.date(2012, 1, 14), Decimal('-1.0')),
                 ])
 
+    def test_post_rpc_does_not_require_fresh_session(self):
+        'posting invoices does not force a fresh session'
+        Invoice = Pool().get('account.invoice')
+
+        self.assertFalse(Invoice.__rpc__['post'].fresh_session)
+
+    @with_transaction()
+    def test_validate_invoice_creates_move_for_customer_invoice(self):
+        'validating customer invoices now creates the account move'
+        Invoice = Pool().get('account.invoice')
+
+        move = Mock()
+        invoice = Invoice()
+        invoice.type = 'out'
+        invoice.move = None
+        invoice.get_move = Mock(return_value=move)
+        invoice.do_lot_invoicing = Mock()
+
+        move_model = Mock()
+
+        with patch.object(Invoice, '_check_taxes'), patch.object(
+                Invoice, '_store_cache'), patch.object(
+                Invoice, 'browse', return_value=[]), patch.object(
+                Invoice, 'cleanMoves') as clean_moves, patch.object(
+                Invoice, 'save') as save_invoices, patch(
+                'trytond.modules.account_invoice.invoice.Pool'
+                ) as PoolMock:
+            PoolMock.return_value.get.return_value = move_model
+
+            Invoice.validate_invoice([invoice])
+
+        self.assertIs(invoice.move, move)
+        invoice.get_move.assert_called_once_with()
+        invoice.do_lot_invoicing.assert_called_once_with()
+        move_model.save.assert_called_once_with([move])
+        clean_moves.assert_called_once_with([move])
+        save_invoices.assert_called()
+
+    @with_transaction()
+    def test_validate_invoice_sets_number_for_customer_invoice(self):
+        'validating customer invoices now assigns the invoice number'
+        Invoice = Pool().get('account.invoice')
+
+        move = Mock()
+        invoice = Invoice()
+        invoice.type = 'out'
+        invoice.move = None
+        invoice.get_move = Mock(return_value=move)
+        invoice.do_lot_invoicing = Mock()
+
+        move_model = Mock()
+
+        with patch.object(Invoice, '_check_taxes'), patch.object(
+                Invoice, '_store_cache'), patch.object(
+                Invoice, 'set_number') as set_number, patch.object(
+                Invoice, 'cleanMoves'), patch.object(
+                Invoice, 'save'), patch(
+                'trytond.modules.account_invoice.invoice.Pool'
+                ) as PoolMock:
+            PoolMock.return_value.get.return_value = move_model
+
+            Invoice.validate_invoice([invoice])
+
+        set_number.assert_called_once_with([invoice])
+
 
 del ModuleTestCase

modules/automation/automation.py

@@ -248,29 +248,10 @@ class AutomationDocument(ModelSQL, ModelView, Workflow):
                     ShipmentWR.save([swr])
                     doc.notes = (doc.notes or "") + f"Shipment found: {sh[0].number}\n"
                     logger.info("BL_NUMBER:%s",sh[0].bl_number)
-                    if sh[0].incoming_moves:
+                    doc.notes = (
-                        factor_net = wr.net_landed_kg / wr.bales if wr.bales else 1
+                        (doc.notes or "")
-                        factor_gross = wr.gross_landed_kg / wr.bales if wr.bales else 1
+                        + "Global WR linked to shipment. "
-                        for move in sh[0].incoming_moves:
+                        + "Create remote lot WRs from the weight report form.\n")
-                            lot = move.lot
-                            if lot.lot_type == 'physic':
-                                wr_payload = {
-                                    "chunk_key": lot.lot_chunk_key,
-                                    "gross_weight": float(round(Decimal(lot.lot_qt) * factor_gross,5)),
-                                    "net_weight": float(round(Decimal(lot.lot_qt) * factor_net,5)),
-                                    "tare_total": float(round(wr.tare_kg * (Decimal(lot.lot_qt) / wr.bales),5)) ,
-                                    "bags": int(lot.lot_qt),
-                                    "surveyor_code": sh[0].controller.get_alf(),
-                                    "place_key": sh[0].to_location.get_places(),
-                                    "report_date": int(wr.report_date.strftime("%Y%m%d")),#wr.report_date.isoformat() if wr.report_date else None,
-                                    "weight_date": int(wr.weight_date.strftime("%Y%m%d")),#wr.weight_date.isoformat() if wr.weight_date else None,
-                                    "agent": sh[0].agent.get_alf(),
-                                    "forwarder_ref": sh[0].returned_id
-                                }
-                                logger.info("PAYLOAD:%s",wr_payload)
-                                data = doc.create_weight_report(wr_payload)
-                                doc.notes = (doc.notes or "") + f"WR created in Fintrade: {data.get('success')}\n"
-                                doc.notes = (doc.notes or "") + f"WR key: {data.get('weight_report_key')}\n"
 
                 # if cls.rule_set.ocr_required:[]
                 #     cls.run_ocr([doc])
@@ -293,4 +274,4 @@ class AutomationDocument(ModelSQL, ModelView, Workflow):
             # except Exception as e:
             #     doc.state = "error"
             #     doc.notes = (doc.notes or "") + f"Pipeline error: {e}\n"
-            doc.save()
+            doc.save()

modules/purchase_trade/AGENTS.md

@@ -0,0 +1,183 @@
+# AGENTS.md - Module `purchase_trade`
+
+Ce guide complete le `AGENTS.md` racine.
+Pour ce module, les regles locales ci-dessous priment.
+
+## 1) Perimetre metier
+
+Le module `purchase_trade` etend les flux achat/vente Tryton avec une logique
+de negoce physique:
+
+- contrats d'achat (`purchase.purchase`, `purchase.line`)
+- contrats de vente (`sale.sale`, `sale.line`)
+- lots physiques et virtuels
+- matching achat/vente
+- shipments et execution logistique
+- frais (`fee.fee`)
+- templates de documents metier et facture
+
+## 2) Fichiers pivots
+
+- Contrats achat:
+  - `modules/purchase_trade/purchase.py`
+- Contrats vente:
+  - `modules/purchase_trade/sale.py`
+- Lots / matching / invoicing:
+  - `modules/purchase_trade/lot.py`
+- Shipments / lien facture-lot:
+  - `modules/purchase_trade/stock.py`
+- Fees:
+  - `modules/purchase_trade/fee.py`
+- Bridge facture / templates:
+  - `modules/purchase_trade/invoice.py`
+- Vues:
+  - `modules/purchase_trade/view/*.xml`
+- Actions module:
+  - `modules/purchase_trade/*.xml`
+- Manifest:
+  - `modules/purchase_trade/tryton.cfg`
+
+## 3) Documentation locale a lire en priorite
+
+- Regles metier:
+  - `modules/purchase_trade/docs/business-rules.md`
+- Regles templates:
+  - `modules/purchase_trade/docs/template-rules.md`
+- Catalogue des proprietes templates:
+  - `modules/purchase_trade/docs/template-properties.md`
+
+## 4) Invariants metier a preserver
+
+- Un lot `virtual` est la reference d'ouverture de quantite pour une `purchase.line`.
+- Une `sale.line` doit aussi avoir au minimum un lot `virtual`; une valuation
+  cote sale ne doit donc pas disparaitre juste parce que le lot est `open`.
+- Le lot physique est le pont principal entre:
+  - `purchase.line`
+  - `sale.line`
+  - shipment
+  - facture
+- Pour remonter d'une facture vers shipment / BL / controller / fret:
+  - privilegier le lot physique
+  - ne pas multiplier des chemins d'acces concurrents
+- Pour les champs de colis (`NB BALES`) dans les templates facture:
+  - la source de verite est `line.lot.lot_qt`
+  - sur une facture, sommer les `lot_qt` des lignes de facture
+  - tenir compte du signe de la ligne de facture pour les notes finales
+  - ne pas proratiser depuis le poids (`net` / `gross`)
+- Le `FREIGHT VALUE` d'un template facture vient du `fee.fee` du shipment
+  dont le produit est `Maritime freight`.
+- Pour `stock/insurance.fodt`, le `Amount insured` doit venir en priorite de
+  `110%` du total des `incoming_moves` (fallback fee `Insurance` si aucun
+  montant incoming calculable).
+- Pour le surveyor du certificat d'assurance shipment, la priorite est:
+  `shipment.surveyor` -> `shipment.controller` -> fournisseur du fee
+  `Insurance`.
+- Pour `payment_order.fodt`, utiliser des proprietes
+  `invoice.report_payment_order_*` plutot que des tokens legacy `<...>`.
+- Ajouter un champ de template dans `Document Templates` ne rend pas le report
+  visible dans la fiche: il faut aussi l'action `ir.action.report` +
+  `ir.action.keyword` (`form_print`) cote `account.invoice`.
+- Le wizard `Create contracts` en mode `matched` peut maintenant partir de
+  plusieurs `lot.qt`, mais doit conserver un matching par lot source et laisser
+  `created_by_code = True` sur les lignes creees pour ne pas declencher les
+  creations automatiques de lots dans les validations.
+- En valuation / PnL:
+  - la valeur stockee dans `type` est la cle technique (`pur. priced`,
+    `sale priced`, `pur. fee`, etc.), pas le label affiche dans l'UI
+  - les references doivent rester coherentes avec le type de lot:
+    `Purchase/Open`, `Purchase/Physic`, `Sale/Open`, `Sale/Physic`
+  - pour une sale matchee, les lignes de valuation purchase generees sur un lot
+    physique doivent aussi renseigner `sale` et `sale_line` afin de remonter
+    dans l'onglet PnL de la sale
+  - une sale non matchee doit etre valorisable "sale-first" et alimenter
+    `valuation.valuation` / `valuation.valuation.line`
+  - si une `sale.line` `basis` n'a ni `price_summary` ni `lot_price_sale`,
+    creer quand meme une ligne `sale priced` avec `price = 0` et `amount = 0`
+    plutot que de ne rien generer
+  - le MTM ne doit etre renseigne que pour `pur. priced`, `sale priced` et
+    `derivative`; jamais pour les fees
+  - `mtm_price` doit afficher le prix brut de valorisation (sans ratio), alors
+    que `mtm` reste le montant calcule selon la logique de strategie
+- En pricing:
+  - le `unit_price` doit rester un prix de base, hors `premium`
+  - le `premium` doit impacter le prix total economique et donc le `amount`,
+    aussi bien en `priced` qu'en `basis`
+  - dans `pricing.pricing` en saisie manuelle, l'utilisateur renseigne
+    seulement `quantity` et `settl_price`
+  - `fixed_qt`, `fixed_qt_price`, `unfixed_qt`, `unfixed_qt_price` et
+    `eod_price` sont des valeurs derivees et ne doivent pas etre saisies a la
+    main
+  - en manuel, `fixed_qt` = cumul des `quantity` du groupe trie par
+    `pricing_date`
+  - en manuel, `fixed_qt_price` = moyenne ponderee cumulee des `settl_price`
+  - en manuel, `unfixed_qt_price` = `settl_price` de la ligne
+  - pour les documents commerciaux / facture, une ligne `basis` affiche le
+    `premium` comme prix visible, pas le prix economique total
+  - si `linked currency` est active, le `premium` est saisi dans la devise /
+    unite liee (ex: `USC/LB`) puis converti vers le repere de la ligne pour le
+    calcul du `amount`
+  - en `basis + linked currency`, le `linked_price` doit representer le prix
+    basis brut (hors premium) dans la devise liee; le `unit_price` reste ce
+    prix brut converti, et le `premium` converti est ajoute seulement dans
+    l'`amount`
+  - si `linked currency` est cochee, `linked_price`, `linked_currency` et
+    `linked_unit` sont requis
+  - dans les forms, presenter le bloc prix dans l'ordre:
+    `price_type` -> linked fields -> `premium` -> `unit_price` -> `amount`
+  - en valuation `basis`, le premium s'applique a chaque composant, pas
+    uniquement a une ligne de resume
+  - pour une ligne `basis` sans `price_summary`, la valuation fallback doit
+    utiliser `unit_price + premium` (et pas `unit_price` seul)
+  - a la validation d'une `sale.line`, si un lot virtuel est cree et qu'aucun
+    matching purchase n'existe, il faut lancer `generate_from_sale_line()` pour
+    alimenter le PnL sale-first
+
+## 5) Conventions de modification
+
+1. Modifier la logique metier dans le fichier pivot le plus proche.
+2. Si un template `.fodt` devient complexe, deplacer la logique dans une
+   propriete Python `report_*`.
+3. Pour une facture trade, preferer enrichir `modules/purchase_trade/invoice.py`
+   plutot que surcharger lourdement le `.fodt`.
+4. Si une regle metier durable change, mettre a jour
+   `docs/business-rules.md`.
+5. Si une convention de template change, mettre a jour
+   `docs/template-rules.md`.
+6. Pour les vues XML Tryton de ce module, utiliser `editable="1"` sur les
+   `<tree>` editables; ne pas utiliser `editable="bottom"`.
+7. Si une regle de texte par defaut durable est demandee sur achat/vente,
+   preferer un singleton de configuration expose dans un menu fonctionnel
+   existant plutot qu'un menu technique `purchase_trade`.
+
+## 6) Pieges connus
+
+- Plusieurs actions de report `account.invoice` peuvent sembler rendre le meme
+  document a cause du cache `invoice_report_cache`.
+- Les reports alternatifs (`Final Invoice`, `Prepayment`, etc.) ne doivent pas
+  reutiliser le cache du report standard sans verification.
+- Pour les donnees achat/vente partagees, ne pas supposer qu'une facture de
+  vente doit lire directement sur la `sale.line`: souvent, la verite metier
+  passe par le lot physique et/ou la `account.invoice.line`.
+- Les templates `invoice_ict*` peuvent partager les memes proprietes Python;
+  si une regle doit valoir pour provisional et final, la mettre dans
+  `modules/purchase_trade/invoice.py` plutot que dupliquer dans les `.fodt`.
+- Dans les ecrans PnL, le label `Sale price` correspond au type stocke
+  `sale priced`; idem pour `Pur. price` / `pur. priced`.
+- Une ligne `basis` sans resume de pricing peut sinon disparaitre de la
+  valuation si aucun fallback explicite a `0` n'est prevu.
+- Le calcul du prix peut diverger entre `unit_price`, `linked_price`,
+  `lot_price` et valuation si le premium n'est pas traite explicitement dans
+  chaque maillon.
+- Sur `account.invoice`, le workflow `Validate` doit maintenant aligner
+  fournisseur et client pour:
+  - creation du `account.move`
+  - attribution du `number`
+  - `Post` ne doit pas reintroduire une difference de session/fresh login cote
+    client
+
+## 7) Definition of done (module `purchase_trade`)
+
+- Le flux achat/vente/lot cible reste coherent.
+- Les impacts templates/facture ont ete verifies conceptuellement.
+- Les docs locales ont ete mises a jour si une nouvelle regle durable a emerge.
+- Le patch reste minimal et local au domaine demande.

modules/purchase_trade/__init__.py

@@ -3,9 +3,10 @@
 
 from trytond.pool import Pool
 
-from . import (
+from . import (
-    account,
+    account,
-    purchase,
+    configuration,
+    purchase,
     sale,
     global_reporting,
     stock,
@@ -54,9 +55,10 @@ def register():
         incoming.ImportSwift,
         lc.LCMT700,
         lc.LCMessage,
-        lc.CreateLCStart,
+        lc.CreateLCStart,
-        global_reporting.GRConfiguration,
+        global_reporting.GRConfiguration,
-        module='purchase_trade', type_='model')
+        configuration.Configuration,
+        module='purchase_trade', type_='model')
     Pool.register(
         incoming.ImportSwift,
         incoming.PrepareDocuments,
@@ -105,10 +107,13 @@ def register():
         purchase.FeeLots,
         valuation.Valuation,
         valuation.ValuationLine, 
-        valuation.ValuationDyn,
+        valuation.ValuationDyn,
-        valuation.ValuationReport,
+        valuation.ValuationReport,
-        valuation.ValuationReportContext,
+        valuation.ValuationReportContext,
-        derivative.Derivative,
+        valuation.ValuationProcessDimension,
+        valuation.ValuationProcessStart,
+        valuation.ValuationProcessResult,
+        derivative.Derivative,
         derivative.DerivativeMatch,
         derivative.MatchWizardStart,
         derivative.DerivativeReport,
@@ -258,14 +263,23 @@ def register():
         purchase.InvoicePayment,
         stock.ImportSoFWizard,
         dashboard.BotWizard,
-        dashboard.DashboardLoader,
+        dashboard.DashboardLoader,
-        forex.ForexReport,
+        forex.ForexReport,
-        purchase.PnlReport,
+        purchase.PnlReport,
-        purchase.PositionReport,
+        purchase.PositionReport,
-        derivative.DerivativeMatchWizard,
+        valuation.ValuationProcess,
-        module='purchase', type_='wizard')
+        derivative.DerivativeMatchWizard,
-    Pool.register(
+        module='purchase', type_='wizard')
-        sale.SaleCreatePurchase,
+    Pool.register(
-        sale.SaleAllocationsWizard,
+        sale.SaleCreatePurchase,
-        module='sale', type_='wizard')
+        sale.SaleAllocationsWizard,
+        module='sale', type_='wizard')
+    Pool.register(
+        invoice.InvoiceReport,
+        invoice.SaleReport,
+        invoice.PurchaseReport,
+        stock.ShipmentShippingReport,
+        stock.ShipmentInsuranceReport,
+        stock.ShipmentPackingListReport,
+        module='purchase_trade', type_='report')
     

modules/purchase_trade/configuration.py

@@ -0,0 +1,19 @@
+from trytond.model import ModelSingleton, ModelSQL, ModelView, fields
+
+
+class Configuration(ModelSingleton, ModelSQL, ModelView):
+    "Purchase Trade Configuration"
+    __name__ = 'purchase_trade.configuration'
+
+    pricing_rule = fields.Text("Pricing Rule")
+    sale_report_template = fields.Char("Sale Template")
+    sale_bill_report_template = fields.Char("Sale Bill Template")
+    sale_final_report_template = fields.Char("Sale Final Template")
+    invoice_report_template = fields.Char("Invoice Template")
+    invoice_cndn_report_template = fields.Char("CN/DN Template")
+    invoice_prepayment_report_template = fields.Char("Prepayment Template")
+    invoice_payment_order_report_template = fields.Char("Payment Order Template")
+    purchase_report_template = fields.Char("Purchase Template")
+    shipment_shipping_report_template = fields.Char("Shipping Template")
+    shipment_insurance_report_template = fields.Char("Insurance Template")
+    shipment_packing_list_report_template = fields.Char("Packing List Template")

modules/purchase_trade/configuration.xml

@@ -0,0 +1,48 @@
+<tryton>
+    <data>
+        <record model="ir.ui.view" id="purchase_trade_configuration_view_form">
+            <field name="model">purchase_trade.configuration</field>
+            <field name="type">form</field>
+            <field name="name">configuration_form</field>
+        </record>
+        <record model="ir.ui.view" id="purchase_trade_template_configuration_view_form">
+            <field name="model">purchase_trade.configuration</field>
+            <field name="type">form</field>
+            <field name="name">template_configuration_form</field>
+        </record>
+
+        <record model="ir.action.act_window" id="act_purchase_trade_configuration_form">
+            <field name="name">Pricing Configuration</field>
+            <field name="res_model">purchase_trade.configuration</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_purchase_trade_configuration_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="purchase_trade_configuration_view_form"/>
+            <field name="act_window" ref="act_purchase_trade_configuration_form"/>
+        </record>
+        <record model="ir.action.act_window" id="act_purchase_trade_template_configuration_form">
+            <field name="name">Document Templates</field>
+            <field name="res_model">purchase_trade.configuration</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_purchase_trade_template_configuration_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="purchase_trade_template_configuration_view_form"/>
+            <field name="act_window" ref="act_purchase_trade_template_configuration_form"/>
+        </record>
+
+        <menuitem
+            name="Configuration"
+            parent="price.menu_price"
+            action="act_purchase_trade_configuration_form"
+            sequence="10"
+            id="menu_purchase_trade_configuration"
+            icon="tryton-settings"/>
+        <menuitem
+            name="Document Templates"
+            parent="document_incoming.menu_configuration"
+            action="act_purchase_trade_template_configuration_form"
+            sequence="20"
+            id="menu_purchase_trade_template_configuration"
+            icon="tryton-settings"/>
+    </data>
+</tryton>

modules/purchase_trade/docs/business-rules.md

@@ -1,8 +1,8 @@
 # Business Rules - Purchase Trade
 
 Statut: `draft`
-Version: `v0.2`
+Version: `v0.5`
-Derniere mise a jour: `2026-03-27`
+Derniere mise a jour: `2026-04-10`
 Owner metier: `a completer`
 Owner technique: `a completer`
 
@@ -100,6 +100,334 @@ Owner technique: `a completer`
 - Priorite:
   - `importante`
 
+### BR-PT-004 - La valuation doit couvrir les flux purchase et sale, y compris les sales non matchees
+
+- Intent: obtenir un PnL coherent cote achat et cote vente, meme lorsqu'une
+  sale n'est pas encore matchee a une purchase.
+- Description:
+  - Le flux historique de valuation part de `purchase.line` puis remonte vers
+    les ventes via les lots/lots matchants.
+  - Le systeme doit egalement savoir valoriser directement une `sale.line`
+    non matchee ("sale-first").
+  - Une sale non matchee doit creer des lignes dans
+    `valuation.valuation` et `valuation.valuation.line` afin d'apparaitre dans
+    l'onglet PnL de la sale.
+- Resultat attendu:
+  - pour une `sale.line` non matchee, generer au minimum les types:
+    - `sale priced`
+    - `sale fee`
+    - `derivative` si la ligne porte des derives
+  - si la sale est matchee via un lot physique, les lignes purchase portees par
+    ce lot physique doivent aussi renseigner `sale` et `sale_line`
+  - une sale matchee doit donc voir:
+    - ses lignes `sale *`
+    - les lignes purchase portees par le lot physique partage
+- Priorite:
+  - `structurante`
+
+### BR-PT-005 - Les references de valuation doivent decrire la nature du lot de la ligne
+
+- Intent: eviter les ambiguïtes dans les ecrans PnL entre lots `open` et lots
+  `physic`.
+- Description:
+  - La reference affichee dans la valuation doit decrire la ligne elle-meme,
+    pas son vis-a-vis.
+  - Les references autorisees pour les lignes de prix sont:
+    - `Purchase/Open`
+    - `Purchase/Physic`
+    - `Sale/Open`
+    - `Sale/Physic`
+- Resultat attendu:
+  - un lot `virtual` cote purchase ne doit jamais sortir avec la reference
+    `Purchase/Physic`
+  - un lot `virtual` cote sale ne doit jamais sortir avec la reference
+    `Sale/Physic`
+  - un lot physique matche peut produire:
+    - une ligne purchase en `Purchase/Physic`
+    - une ligne sale en `Sale/Physic`
+  - un open sale matche a un open purchase peut produire des quantites egales
+    tout en gardant des references differentes (`Purchase/Open` vs `Sale/Open`)
+- Priorite:
+  - `importante`
+
+### BR-PT-006 - Une sale basis sans prix detaille doit quand meme apparaitre en valuation
+
+- Intent: ne pas perdre les lignes de PnL lorsque le detail de pricing n'est
+  pas encore renseigne.
+- Description:
+  - Une `sale.line` de type `basis` peut exister avec un lot `virtual`, sans
+    `price_summary` et sans `lot_price_sale`.
+  - Dans ce cas, la valuation doit quand meme creer une ligne `sale priced`.
+- Resultat attendu:
+  - si `price_summary` est vide:
+    - creer une ligne `sale priced`
+    - avec `price = 0`
+    - avec `amount = 0`
+    - avec un `state` de type `unfixed`
+  - si `lot_price_sale` est vide sur un lot sale, utiliser `sale_line.unit_price`
+    comme fallback quand il existe
+- Priorite:
+  - `importante`
+
+### BR-PT-007 - Le MTM de valuation ne s'applique pas aux fees
+
+- Intent: distinguer les lignes de prix marquables au marche des lignes de
+  frais qui ne doivent pas etre mark-to-market.
+- Description:
+  - Le systeme peut renseigner `mtm_price`, `mtm` et `strategy` uniquement pour:
+    - `pur. priced`
+    - `sale priced`
+    - `derivative`
+  - Les fees (`pur. fee`, `sale fee`, `shipment fee`, `line fee`) ne doivent
+    jamais porter de valorisation MTM.
+- Resultat attendu:
+  - les lignes de fee doivent conserver:
+    - `mtm_price = NULL`
+    - `mtm = NULL`
+    - `strategy = NULL`
+  - `mtm_price` doit representer le prix brut de valorisation sans appliquer le
+    ratio de composant
+  - `mtm` reste le montant calcule selon la logique de strategie
+- Priorite:
+  - `structurante`
+
+### BR-PT-008 - Le premium fait partie du prix contractuel en `priced` et en `basis`
+
+- Intent: garantir que le montant total valorise et facture reflete toujours le
+  premium/discount saisi sur la ligne.
+- Description:
+  - Le `premium` d'une `purchase.line` ou `sale.line` doit impacter le prix
+    total quelle que soit la `price_type`.
+  - Cette regle vaut pour:
+    - les calculs de `amount`
+    - la valuation / PnL
+- Resultat attendu:
+  - le `unit_price` reste le prix de base, hors premium
+  - en `priced`, le montant economique = `unit_price + premium`
+  - en `basis`, le premium s'ajoute aussi au prix total economique
+  - en valuation `basis`, le premium s'applique a chaque composant valorise
+    (ex: meme premium repete sur chaque bloc ICE)
+- Exemple metier:
+  - `8.30 USC/LB 500 TONS ON ICE MCH'26`
+  - `8.30 USC/LB 500 TONS ON ICE MAY 26`
+  - le premium `8.30 USC/LB` s'applique a chaque composant
+- Priorite:
+  - `structurante`
+
+### BR-PT-009 - En linked currency, le premium est exprime dans la devise/unite liee
+
+- Intent: respecter la facon dont les traders saisissent les prix sur certains
+  produits (ex: coton en `USC/LB`).
+- Description:
+  - Quand `enable_linked_currency` est coche, le `premium` est saisi dans la
+    devise / unite liee, pas dans la devise / unite native de la ligne.
+  - Le systeme doit convertir ce premium vers le repere de la ligne pour les
+    calculs internes de montant et de valuation.
+- Resultat attendu:
+  - `premium` est interprete dans le repere `linked_currency` / `linked_unit`
+  - le `unit_price` ne doit pas absorber ce premium
+  - les `amount` et valuations doivent refleter ce premium converti
+  - si `linked currency` est cochee, `linked_price`, `linked_currency` et
+    `linked_unit` sont obligatoires
+- Priorite:
+  - `structurante`
+
+### BR-PT-010 - En `basis + linked currency`, le linked price suit le basis brut
+
+- Intent: rendre lisible la decomposition entre prix basis de marche et premium.
+- Description:
+  - Quand une ligne est en `basis` et `linked currency`, le bloc
+    `linked_price` doit etre recalcule automatiquement.
+  - Ce `linked_price` doit representer le prix basis brut, hors premium.
+  - Le `unit_price` de la ligne doit rester ce prix brut converti.
+  - Le premium converti n'est ajoute qu'au niveau du `amount`.
+- Resultat attendu:
+  - modification du basis -> mise a jour automatique du `linked_price`
+  - `linked_price` = base market / basis
+  - `unit_price` = `linked_price` converti
+  - `amount` = quantite * (`unit_price` + premium converti)
+- Priorite:
+  - `importante`
+
+### BR-PT-011 - Une sale line non matchee avec lot virtuel doit generer une valuation sale-first des la validation
+
+- Intent: ne pas attendre un matching purchase pour afficher le PnL d'une sale
+  ouverte.
+- Description:
+  - Lors de la validation d'une `sale.line`, le systeme peut creer un lot
+    `virtual`.
+  - Si aucun `lot.qt` ne relie ce lot a une `purchase.line`, il faut tout de
+    meme generer la valuation cote sale.
+
+### BR-PT-012 - Le wizard Create contracts peut creer un seul achat matche a plusieurs open sales
+
+- Intent: permettre la creation d'un contrat achat unique a partir de plusieurs
+  `lot.qt` de vente selectionnes.
+- Description:
+  - En mode `matched`, le wizard `Create contracts` peut recevoir plusieurs
+    `lot.qt` selectionnes.
+  - Il doit creer un seul contrat, avec une ligne par lot source selectionne.
+  - Chaque ligne doit conserver son lot d'origine pour le matching.
+- Resultat attendu:
+  - le wizard agrege les quantites de la selection
+  - il refuse une quantite saisie differente du total selectionne
+  - il conserve `created_by_code = True` sur les lignes creees pour ne pas
+    declencher les creations automatiques parasites lors des validations
+- Priorite:
+  - `importante`
+
+### BR-PT-013 - Le texte par defaut de pricing_rule est configure globalement
+
+- Intent: centraliser un texte metier recurrent reutilise a la creation des
+  lignes achat et vente.
+- Description:
+  - Le module expose un singleton `purchase_trade.configuration` avec un champ
+    texte `pricing_rule`.
+  - Toute nouvelle `purchase.line` et `sale.line` doit prendre ce texte comme
+    valeur par defaut de `pricing_rule`.
+- Resultat attendu:
+  - la configuration est accessible depuis le menu `Prices`
+  - la valeur sert de defaut a la creation des lignes
+  - les lignes existantes ne sont pas modifiees retroactivement
+- Priorite:
+  - `importante`
+
+### BR-PT-014 - L'affectation d'un controller doit suivre l'ecart a l'objectif regional
+
+- Intent: repartir les controllers selon les cibles definies dans l'onglet
+  `Execution` des `party.party`.
+- Description:
+  - chaque ligne `party.execution` fixe une cible `% targeted` pour un
+    controller sur une `country.region`
+  - le `% achieved` est calcule a partir des `stock.shipment.in` deja affectes
+    a un controller dans cette zone
+  - la zone d'un shipment est determinee par `shipment.to_location.country`
+  - une region parente couvre aussi ses sous-regions
+- Resultat attendu:
+  - pour une ligne `party.execution`, `achieved_percent` =
+    `shipments de la zone avec ce controller / shipments controles de la zone`
+  - le denominateur ne compte que les `stock.shipment.in` qui ont deja un
+    `controller`; les shipments encore non affectes ne biaisent donc pas la
+    statistique affichee
+  - lors d'un choix automatique de controller, la priorite va a la regle dont
+    l'ecart `targeted - achieved` est le plus eleve
+  - un controller a `80%` cible et `40%` reel doit donc passer avant un
+    controller a `50%` cible et `45%` reel sur la meme zone
+  - l'appartenance a la zone se lit depuis `shipment.to_location.country`, et
+    une region parente couvre aussi ses sous-regions
+- Priorite:
+  - `importante`
+
+### BR-PT-015 - Les weight reports distants par lot partent du weight report global attache au shipment
+
+- Intent: separer la creation du `weight.report` global et l'export detaille
+  par lot vers le systeme distant.
+- Description:
+  - l'automation cree le `weight.report` global et l'attache au
+    `stock.shipment.in`
+  - l'export FastAPI par lot ne part plus directement de l'automation
+  - l'utilisateur ouvre le `weight.report` voulu depuis le shipment et lance
+    l'action d'export depuis ce rapport
+- Resultat attendu:
+  - le rapport choisi sert de base unique pour calculer les payloads par lot
+  - seuls les lots physiques des `incoming_moves` du shipment sont exportes
+  - l'action exige au minimum un `controller` et un `returned_id` sur le
+    shipment
+- les cles renvoyees par le systeme distant et la date d'envoi sont
+  conservees sur le `weight.report` local
+- Priorite:
+  - `importante`
+
+### BR-PT-016 - En pricing manuel, seules la quantite fixee du jour et le prix de marche sont saisis
+
+- Intent: simplifier la saisie utilisateur et garantir une coherence unique
+  entre les colonnes de `pricing.pricing`.
+- Description:
+  - Pour une ligne de `pricing.pricing` en mode manuel, l'utilisateur ne doit
+    saisir que:
+    - `quantity`
+    - `settl_price`
+  - Les autres colonnes de suivi sont derivees automatiquement sur tout le
+    groupe metier (`line + component` ou `sale_line + component`) trie par
+    `pricing_date`.
+- Resultat attendu:
+  - `fixed_qt` = cumul des `quantity`
+  - `fixed_qt_price` = moyenne ponderee cumulee des `settl_price`
+  - `unfixed_qt` = quantite de base de la ligne - `fixed_qt`
+  - `unfixed_qt_price` = `settl_price` de la ligne
+  - `eod_price` = moyenne ponderee entre jambe fixee et non fixee
+  - `last=True` reste unique par groupe et suit la plus grande `pricing_date`
+- Hors scope:
+  - la generation automatique des lignes quand `pricing.component.auto = True`
+    ne doit pas changer de comportement
+- Priorite:
+  - `structurante`
+
+### BR-PT-017 - Le workflow Validate des factures client doit aussi attribuer le numero
+
+- Intent: aligner le comportement des factures client et fournisseur au moment
+  de `Validate`.
+- Description:
+  - Lors du workflow `Validate` sur `account.invoice`, une facture client
+    (`type = out`) doit maintenant:
+    - creer son `account.move`
+    - recevoir son `number`
+  - La numerotation ne doit plus etre repoussee au `Post` cote client.
+- Resultat attendu:
+  - a l'issue de `Validate`, une facture fournisseur ou client possede deja:
+    - son `account.move`
+    - son `number`
+  - `Post` conserve son role de posting comptable sans reintroduire de
+    difference de session/fresh login cote client
+- Priorite:
+  - `importante`
+- Resultat attendu:
+  - apres creation du lot virtuel, si aucun matching purchase n'existe:
+    - appeler `Valuation.generate_from_sale_line(line)`
+    - creer au moins la ligne `sale priced` fallback si la ligne porte un prix
+      economique via le premium
+- Priorite:
+  - `importante`
+
+### BR-PT-012 - Fallback valuation basis sans summary: utiliser le prix economique de la ligne
+
+- Intent: eviter qu'une valuation `basis` ouverte sorte a zero alors que la
+  ligne a bien une valeur economique via le premium.
+- Description:
+  - Une ligne `basis` peut ne pas avoir encore de `price_summary`.
+  - Dans ce cas, la valuation fallback ne doit pas prendre `unit_price` seul si
+    celui-ci est brut et hors premium.
+- Resultat attendu:
+  - le fallback valuation `basis` doit utiliser:
+    - `unit_price + premium converti`
+  - cette regle vaut au minimum pour:
+    - `sale.line` non matchee
+    - `purchase.line` sans summary
+- Priorite:
+  - `importante`
+
+### BR-PT-013 - Create Contracts multi-lots doit conserver un matching par lot source
+
+- Intent: permettre la creation d'un seul contrat mirror a partir de plusieurs
+  open quantities sans perdre le lien lot-a-lot.
+- Description:
+  - Le wizard `Create contracts` peut etre lance avec plusieurs `lot.qt`
+    selectionnes.
+  - En creation `matched`, le systeme doit creer un seul contrat avec une ligne
+    par lot source selectionne, et chaque ligne doit etre matchee avec son lot
+    d'origine.
+- Resultat attendu:
+  - la quantite totale du wizard = somme des open quantities selectionnees
+  - le contrat cree porte plusieurs lignes si plusieurs lots source sont
+    selectionnes
+  - chaque ligne creee reutilise le `shipment_origin` et le lot source qui lui
+    correspondent
+  - `created_by_code` doit rester positionne sur les lignes creees par wizard
+    pour eviter la recreation automatique de lots virtuels dans les `validate`
+    de `purchase.line`, `sale.line` et `lot.lot`
+- Priorite:
+  - `importante`
+
 ## 4) Exemples concrets
 
 ### Exemple E1 - Augmentation simple
@@ -146,6 +474,8 @@ Owner technique: `a completer`
 - Fichiers Python concernes:
   - `modules/purchase_trade/purchase.py`
   - `modules/purchase_trade/lot.py`
+  - `modules/purchase_trade/valuation.py`
+  - `modules/purchase_trade/sale.py`
 
 ## 6) Strategie de tests
 
@@ -155,3 +485,11 @@ Pour cette regle, couvrir au minimum:
 - augmentation sans `lot.qt` ouvert
 - diminution possible
 - diminution impossible avec erreur
+- valuation purchase/sale sur lot physique matche
+- valuation sale-first sur sale non matchee avec lot virtual
+- valuation sale `basis` sans `price_summary`
+- absence de MTM sur les fees
+- premium en `priced`
+- premium en `basis`
+- premium en `linked currency`
+- synchro `basis` -> `linked_price` -> `unit_price`

modules/purchase_trade/docs/template-properties.md

@@ -0,0 +1,417 @@
+# Template Properties - Purchase Trade
+
+Statut: `draft`
+Version: `v0.2`
+Derniere mise a jour: `2026-04-07`
+
+## 1) Objectif
+
+- Lister les proprietes Python exposees pour alimenter les templates Relatorio.
+- Donner un point d'entree rapide aux createurs de templates.
+- Eviter de reparser tout `modules/purchase_trade/invoice.py`, `sale.py` ou `purchase.py`.
+
+## 2) Fichiers sources
+
+- Bridge facture:
+  - `modules/purchase_trade/invoice.py`
+- Proprietes de vente reutilisables:
+  - `modules/purchase_trade/sale.py`
+- Proprietes d'achat reutilisables:
+  - `modules/purchase_trade/purchase.py`
+
+## 3) Principes de lecture
+
+- Pour une facture:
+  - preferer les proprietes `report_*` exposees sur `account.invoice`
+  - pour une facture finale detaillee, utiliser aussi les proprietes `report_*`
+    exposees sur `account.invoice.line`
+- Pour une vente:
+  - reutiliser si possible les proprietes `report_*` deja presentes sur `sale.sale`
+- Pour un achat:
+  - reutiliser si possible les proprietes `report_*` deja presentes sur `purchase.purchase`
+- Pour un shipment entrant:
+  - reutiliser si possible les proprietes `report_*` exposees sur `stock.shipment.in`
+
+## 4) Propriete disponibles sur `account.invoice`
+
+Source code: `modules/purchase_trade/invoice.py`
+
+### Identite du document / parties
+
+- `report_address`
+  - Usage: adresse d'affichage de la facture
+  - Source de verite: `sale.report_address` ou `purchase.report_address`, fallback `invoice.invoice_address.full_address`
+
+- `report_contract_number`
+  - Usage: numero de contrat
+  - Source de verite: `sale.full_number` ou `purchase.full_number`
+
+- `report_trader_initial`
+  - Usage: initiales trader dans les templates
+  - Source de verite: contrat lie
+
+- `report_operator_initial`
+  - Usage: initiales operator dans les templates
+  - Source de verite: contrat lie
+
+### Produit / contrat / quantites
+
+- `report_origin`
+  - Usage: origine produit
+  - Source de verite: `sale.product_origin` ou `purchase.product_origin`
+
+- `report_product_description`
+  - Usage: description produit principale
+  - Source de verite: premiere ligne metier liee a la facture
+
+- `report_product_name`
+  - Usage: nom produit principal
+  - Source de verite: premiere ligne metier liee a la facture
+
+- `report_description_upper`
+  - Usage: description de ligne en majuscules
+  - Source de verite: premiere `account.invoice.line`
+
+- `report_crop_name`
+  - Usage: campagne / crop
+  - Source de verite: contrat lie
+
+- `report_attributes_name`
+  - Usage: attributs produit
+  - Source de verite: premiere ligne metier liee a la facture
+
+- `report_price`
+  - Usage: prix en toutes lettres
+  - Source de verite: `sale.report_price` ou `purchase.report_price`
+
+- `report_nb_bale`
+  - Usage: nombre de balles
+  - Source de verite: `sale.report_nb_bale` ou recalcul sur les lots physiques
+
+- `report_gross`
+  - Usage: poids brut
+  - Source de verite: `sale.report_gross` ou recalcul sur les lots physiques
+
+- `report_net`
+  - Usage: poids net
+  - Source de verite: `sale.report_net` ou `purchase.report_net` ou recalcul sur les lots physiques
+
+- `report_lbs`
+  - Usage: poids net converti en LBS
+  - Source de verite: conversion de `report_net`
+
+- `report_quantity_lines`
+  - Usage: detail quantite multi-lignes pour les templates facture
+  - Source de verite: `sale.report_quantity_lines` si vente source, sinon aggregation des `account.invoice.line`
+
+### Bloc prix type `sale_ict`
+
+- `report_rate_currency_upper`
+  - Usage: devise du bloc `At ... PER ...`
+  - Source de verite: premiere `account.invoice.line` de type `line`
+
+- `report_rate_value`
+  - Usage: prix numerique du bloc `At ... PER ...`
+  - Source de verite: premiere `account.invoice.line` de type `line`
+
+- `report_rate_unit_upper`
+  - Usage: unite du bloc `At ... PER ...`
+  - Source de verite: premiere `account.invoice.line` de type `line`
+
+- `report_rate_price_words`
+  - Usage: prix en toutes lettres dans le bloc `At ... PER ...`
+  - Source de verite: premiere `account.invoice.line` de type `line`, fallback `report_price`
+
+- `report_rate_pricing_text`
+  - Usage: texte de pricing additionnel
+  - Source de verite: premiere `account.invoice.line` de type `line`
+
+- `report_rate_lines`
+  - Usage: detail multi-lignes du bloc `At ... PER ...`
+  - Source de verite: `sale.report_price_lines` si vente source, sinon aggregation des `account.invoice.line`
+
+### Logistique / shipment
+
+- `report_shipment`
+  - Usage: resume vessel / BL / shipment
+  - Source de verite: contrat lie
+
+- `report_bl_date`
+  - Usage: date de BL
+  - Source de verite: shipment du lot physique
+
+- `report_bl_nb`
+  - Usage: numero de BL
+  - Source de verite: shipment du lot physique
+
+- `report_vessel`
+  - Usage: nom du vessel
+  - Source de verite: shipment du lot physique
+
+- `report_loading_port`
+  - Usage: port of loading
+  - Source de verite: shipment du lot physique
+
+- `report_discharge_port`
+  - Usage: port of discharge
+  - Source de verite: shipment du lot physique
+
+- `report_controller_name`
+  - Usage: nom du controller
+  - Source de verite: shipment du lot physique
+
+- `report_si_number`
+  - Usage: S/I number
+  - Source de verite: shipment du lot physique
+
+### Conditions commerciales
+
+- `report_incoterm`
+  - Usage: incoterm + location
+  - Source de verite: contrat lie
+
+- `report_payment_date`
+  - Usage: date de paiement
+  - Source de verite: contrat lie
+
+- `report_payment_description`
+  - Usage: description des conditions de paiement
+  - Source de verite: payment term du contrat ou de la facture
+
+### Pro forma / freight
+
+- `report_proforma_invoice_number`
+  - Usage: numero de facture provisoire
+  - Source de verite: lot physique via `invoice_line_prov` ou `sale_invoice_line_prov`
+
+- `report_proforma_invoice_date`
+  - Usage: date de facture provisoire
+  - Source de verite: lot physique via `invoice_line_prov` ou `sale_invoice_line_prov`
+
+- `report_freight_amount`
+  - Usage: `FREIGHT VALUE`
+  - Source de verite:
+    - lot physique
+    - shipment du lot
+    - `fee.fee` avec `product.name = 'Maritime freight'`
+    - montant = `fee.get_amount()`
+
+- `report_freight_currency_symbol`
+  - Usage: devise du `FREIGHT VALUE`
+  - Source de verite: devise du fee `Maritime freight`, fallback devise facture
+
+### Payment order
+
+- `report_payment_order_short_name`
+  - Usage: nom court emetteur du payment order
+  - Source de verite: `invoice.company.party.rec_name`
+
+- `report_payment_order_document_reference`
+  - Usage: reference du document payment order
+  - Source de verite: `invoice.number`, fallback `invoice.reference`
+
+- `report_payment_order_from_account_nb`
+  - Usage: compte bancaire emetteur
+  - Source de verite: premier `bank.account` de la societe
+
+- `report_payment_order_to_bank_name`
+  - Usage: banque destinataire
+  - Source de verite: banque du premier compte bancaire du partenaire facture
+
+- `report_payment_order_to_bank_city`
+  - Usage: ville banque destinataire
+  - Source de verite: adresse de la banque destinataire
+
+- `report_payment_order_amount`
+  - Usage: montant payment order
+  - Source de verite: `invoice.total_amount`
+
+- `report_payment_order_currency_code`
+  - Usage: devise payment order
+  - Source de verite: `invoice.currency` (`code`, fallback `rec_name/symbol`)
+
+- `report_payment_order_amount_text`
+  - Usage: montant en lettres
+  - Source de verite: conversion `amount_to_currency_words(invoice.total_amount)`
+
+- `report_payment_order_value_date`
+  - Usage: date valeur
+  - Source de verite: `invoice.payment_term_date`, fallback `invoice.invoice_date`
+
+- `report_payment_order_company_address`
+  - Usage: bloc beneficiaire
+  - Source de verite: `invoice.invoice_address.full_address`, fallback
+    `invoice.report_address`
+
+- `report_payment_order_beneficiary_account_nb`
+  - Usage: compte beneficiaire
+  - Source de verite: premier compte bancaire du `invoice.party`
+
+- `report_payment_order_beneficiary_bank_name`
+  - Usage: banque beneficiaire
+  - Source de verite: banque du compte beneficiaire
+
+- `report_payment_order_beneficiary_bank_city`
+  - Usage: ville banque beneficiaire
+  - Source de verite: adresse banque beneficiaire
+
+- `report_payment_order_swift_code`
+  - Usage: swift/bic beneficiaire
+  - Source de verite: `bank.bic`
+
+- `report_payment_order_other_instructions`
+  - Usage: instructions complementaires
+  - Source de verite: `invoice.description`
+
+- `report_payment_order_reference`
+  - Usage: reference business de paiement
+  - Source de verite: `invoice.reference`, fallback `invoice.number`
+
+- `report_payment_order_current_user`
+  - Usage: signataire payment order
+  - Source de verite: utilisateur courant (`res.user`)
+
+- `report_payment_order_current_user_email`
+  - Usage: email retour swift
+  - Source de verite: contact email du `party` utilisateur, fallback `user.email`
+
+## 5) Proprietes disponibles sur `account.invoice.line`
+
+Source code: `modules/purchase_trade/invoice.py`
+
+- `report_product_description`
+  - Usage: description produit de la ligne
+  - Source de verite: `invoice_line.product` ou `origin.product`
+
+- `report_description_upper`
+  - Usage: description de ligne en uppercase
+  - Source de verite: `invoice_line.description`
+
+- `report_crop_name`
+  - Usage: crop de la ligne
+  - Source de verite: contrat relie via `origin`
+
+- `report_attributes_name`
+  - Usage: attributs de la ligne
+  - Source de verite: `origin.attributes_name`
+
+- `report_net`
+  - Usage: quantite nette de la ligne
+  - Source de verite: `invoice_line.quantity`
+
+- `report_lbs`
+  - Usage: quantite convertie en LBS
+  - Source de verite: conversion de `report_net`
+
+- `report_rate_currency_upper`
+  - Usage: devise de prix de la ligne
+  - Source de verite: `origin.linked_currency` ou `invoice_line.currency`
+
+- `report_rate_value`
+  - Usage: prix numerique de la ligne
+  - Source de verite: `invoice_line.unit_price`
+
+- `report_rate_unit_upper`
+  - Usage: unite de prix de la ligne
+  - Source de verite: `origin.linked_unit` ou `invoice_line.unit`
+
+- `report_rate_price_words`
+  - Usage: prix en toutes lettres de la ligne
+  - Source de verite: contrat relie via `trade.report_price`
+
+- `report_rate_pricing_text`
+  - Usage: texte de pricing de la ligne
+  - Source de verite: `origin.get_pricing_text`
+
+## 6) Proprietes utiles deja presentes sur `sale.sale`
+
+Source code: `modules/purchase_trade/sale.py`
+
+- `report_terms`
+- `report_crop_name`
+- `report_gross`
+- `report_net`
+- `report_qt`
+- `report_total_quantity`
+- `report_quantity_unit_upper`
+- `report_quantity_lines`
+- `report_nb_bale`
+- `report_deal`
+- `report_packing`
+- `report_price`
+- `report_price_lines`
+- `report_delivery`
+- `report_payment_date`
+- `report_shipment`
+- `report_shipment_periods`
+- `report_product_name`
+- `report_product_description`
+
+Usage typique:
+- base de travail pour les templates de type `sale_ict.fodt`
+- source de verite de plusieurs proprietes du bridge facture
+
+## 7) Proprietes utiles deja presentes sur `purchase.purchase`
+
+Source code: `modules/purchase_trade/purchase.py`
+
+- `report_terms`
+- `report_qt`
+- `report_price`
+- `report_delivery`
+- `report_payment_date`
+- `report_shipment`
+
+Usage typique:
+- templates et bridges pour facturation fournisseur
+- fallback achat quand une facture n'est pas liee a une vente
+
+## 8) Templates connus qui utilisent ces proprietes
+
+- `modules/account_invoice/invoice_ict.fodt`
+- `modules/account_invoice/invoice_ict_final.fodt`
+- `modules/sale/sale_ict.fodt`
+- `modules/stock/insurance.fodt`
+
+## 9) Proprietes utiles deja presentes sur `stock.shipment.in`
+
+Source code: `modules/purchase_trade/stock.py`
+
+- `report_product_name`
+- `report_product_description`
+- `report_insurance_footer_ref`
+- `report_insurance_certificate_number`
+- `report_insurance_account_of`
+- `report_insurance_goods_description`
+- `report_insurance_loading_port`
+- `report_insurance_discharge_port`
+- `report_insurance_transport`
+- `report_insurance_amount`
+- `report_insurance_incoming_amount`
+- `report_insurance_amount_insured`
+- `report_insurance_surveyor`
+- `report_insurance_contact_surveyor`
+- `report_insurance_issue_place_and_date`
+
+Usage typique:
+- templates shipment relies a l'assurance
+- `report_insurance_amount`: montant affiche dans `Amount insured` (priorite a
+  `110%` du total incoming, fallback fee `Insurance`)
+- `report_insurance_incoming_amount`: somme `incoming_moves` de
+  `quantity * unit_price`, avec fallback lot
+  (`lot.line.unit_price * lot.get_current_quantity_converted()`)
+- `report_insurance_amount_insured`: `110%` de
+  `report_insurance_incoming_amount`
+- `report_insurance_contact_surveyor`: surveyor affiche sous
+  `Contact the following surveyor` (priorite au champ shipment `surveyor`,
+  puis fallback controller / fee `Insurance`)
+- base de travail pour un certificat d'assurance lie a un shipment
+
+## 10) Recommandations
+
+- Avant d'ajouter une nouvelle expression dans un `.fodt`, verifier si une
+  propriete `report_*` existe deja ici.
+- Si une nouvelle propriete est ajoutee pour un template, la documenter dans ce
+  fichier.
+- Pour les donnees logistiques facture, privilegier toujours:
+  - facture -> ligne metier -> lot physique -> shipment / fee

modules/purchase_trade/docs/template-rules.md

@@ -1,8 +1,8 @@
 # Template Rules - Purchase Trade
 
 Statut: `draft`
-Version: `v0.2`
+Version: `v0.4`
-Derniere mise a jour: `2026-03-27`
+Derniere mise a jour: `2026-04-07`
 
 ## 1) Scope
 
@@ -16,6 +16,12 @@ Derniere mise a jour: `2026-03-27`
 
 - Eviter les erreurs de parsing Relatorio/Genshi lors de la generation des documents.
 - Standardiser la maniere d'alimenter les templates metier a partir du code Python.
+- Centraliser les proprietes `report_*` dans une documentation reutilisable.
+
+## 2.1) Index de reference
+
+- Catalogue des proprietes templates:
+  - `modules/purchase_trade/docs/template-properties.md`
 
 ## 3) Regles pratiques
 
@@ -92,6 +98,135 @@ Derniere mise a jour: `2026-03-27`
   - verifier si le probleme vient du cache avant de modifier le `.fodt`
   - pour un report alternatif, ne pas reutiliser le cache du report standard `account_invoice/invoice.fodt`
   - si besoin, bypasser la lecture/ecriture du cache pour les templates alternatifs
+  - pour les clients multi-templates, preferer une configuration metier qui
+    stocke le nom du template par action (`Invoice`, `CN/DN`, `Prepayment`)
+    plutot qu'une modification manuelle de `ir_action_report.report`
+
+### TR-012 - Centraliser les templates client dans `Document Templates`
+
+- Pour les templates client-specifiques, ne pas modifier `ir_action_report.report`
+  en base a la main selon l'environnement ou le client.
+- Preferer la configuration singleton `purchase_trade.configuration`,
+  exposee dans `Documents > Configuration > Document Templates`.
+- Sections actuellement attendues:
+  - `Sale`
+  - `Invoice`
+  - `Payment`
+  - `Purchase`
+  - `Shipment`
+- Dans la section `Shipment`, les templates metier attendus sont:
+  - `Shipping`
+  - `Insurance`
+  - `Packing List`
+- Regle:
+  - si le champ de template correspondant est vide, le report doit echouer
+    explicitement avec `No template found`
+  - ne pas masquer dynamiquement l'action d'impression si ce n'est pas
+    necessaire
+
+### TR-013 - `sale_melya.fodt` et `invoice_melya.fodt` doivent afficher nom + description produit
+
+- Dans les templates client Melya, le bloc produit doit prevoir:
+  - une ligne pour le nom produit
+  - une ligne pour la description produit
+- Ne pas dereferencer directement `line.product.name` / `line.product.description`
+  dans les `.fodt`.
+- Preferer:
+  - `sale.report_product_name`
+  - `sale.report_product_description`
+  - `invoice.report_product_name`
+  - `invoice.report_product_description`
+
+### TR-014 - `invoice_melya.fodt` doit afficher `Invoice` et `Reference` sur les bons champs
+
+- Pour `modules/account_invoice/invoice_melya.fodt`:
+  - `Invoice` doit afficher `invoice.number`
+  - `Reference` doit afficher `invoice.report_contract_number`
+- Ne pas reutiliser `invoice.reference` pour ce label dans ce template client
+  sans demande explicite
+
+### TR-015 - Le template `stock/insurance.fodt` doit lire sur `stock.shipment.in`
+
+- Le template `modules/stock/insurance.fodt` est pilote par le report
+  `stock.shipment.in.insurance`.
+- Toutes les croix rouges / placeholders metier doivent etre remplacees par
+  des proprietes `report_*` exposees sur `stock.shipment.in`.
+- Pour ce template, ne pas compter sur une variable Genshi locale `shipment`
+  dans tout le document; preferer `records[0]....` dans le `.fodt`.
+- Source de verite du montant assure:
+  - sommer les montants des `incoming_moves` du shipment
+  - montant d'un move = `move.quantity * move.unit_price`
+  - si `move.unit_price` est vide, fallback via lot:
+    `lot.line.unit_price * lot.get_current_quantity_converted()`
+  - exposer au moins:
+    - le montant total des incoming moves
+    - le montant assure a `110%` de ce total
+  - pour le placeholder `Amount insured`, `report_insurance_amount` doit
+    afficher ce `110%`, avec fallback fee `Insurance` si aucun montant
+    incoming n'est calculable
+
+### TR-016 - Hypotheses actuelles pour le certificat d'assurance shipment
+
+- Tant qu'une source metier plus precise n'est pas fournie:
+  - numero du certificat: `shipment.bl_number`, sinon `shipment.number`
+  - `insured for account of`: client de la premiere ligne metier retrouvee via
+    lot physique, sinon `shipment.supplier`
+  - `surveyor`: `shipment.surveyor`, sinon `shipment.controller`, sinon
+    fournisseur du fee `Insurance`
+  - lieu/date d'emission: ville de la societe + date du jour
+- Si une source differente est decidee plus tard, corriger la propriete Python
+  plutot que complexifier `insurance.fodt`
+
+### TR-017 - `payment_order.fodt` doit utiliser des proprietes `report_payment_order_*`
+
+- Pour `modules/account_invoice/payment_order.fodt`, ne pas utiliser des
+  placeholders externes legacy (tokens metier entre `<...>` du systeme source).
+- Tous les placeholders du template doivent pointer vers des proprietes Python
+  stables exposees sur `account.invoice`:
+  - `report_payment_order_document_reference`
+  - `report_payment_order_from_account_nb`
+  - `report_payment_order_to_bank_name`
+  - `report_payment_order_to_bank_city`
+  - `report_payment_order_amount`
+  - `report_payment_order_currency_code`
+  - `report_payment_order_amount_text`
+  - `report_payment_order_value_date`
+  - `report_payment_order_company_address`
+  - `report_payment_order_beneficiary_account_nb`
+  - `report_payment_order_beneficiary_bank_name`
+  - `report_payment_order_beneficiary_bank_city`
+  - `report_payment_order_swift_code`
+  - `report_payment_order_other_instructions`
+  - `report_payment_order_reference`
+  - `report_payment_order_current_user`
+  - `report_payment_order_current_user_email`
+- Eviter les marqueurs conditionnels heredites de l'ancien moteur (`++...`):
+  privilegier des placeholders simples avec fallback `or ''`.
+
+### TR-018 - Un template configure n'apparait dans le form que si une action report existe
+
+- Ajouter un champ dans `Document Templates` ne suffit pas a rendre un
+  template imprimable depuis la fiche.
+- Pour afficher l'entree dans `account.invoice`, il faut aussi:
+  - un `ir.action.report` sur `model = account.invoice`
+  - un `ir.action.keyword` `form_print` lie a cette action
+- Appliquer cette regle pour `Payment Order` comme pour `Invoice`,
+  `Prepayment` et `CN/DN`.
+
+### TR-019 - Un placeholder Relatorio doit etre dans une balise `text:placeholder`
+
+- Dans un `.fodt`, une expression du type `&lt;records[0].report_* ...&gt;`
+  ecrite en texte brut peut s'afficher telle quelle a l'impression.
+- Regle stricte:
+  - encapsuler les expressions dans
+    `<text:placeholder text:placeholder-type="text">...</text:placeholder>`
+  - ne pas laisser de token `&lt;...&gt;` directement dans un `text:span`,
+    `text:p`, `text:h`, etc.
+- Exemple:
+  - incorrect:
+    `PAYMENT ORDER &lt;records[0].report_payment_order_document_reference or &apos;&apos;&gt;`
+  - correct:
+    `PAYMENT ORDER <text:placeholder text:placeholder-type="text">&lt;records[0].report_payment_order_document_reference or &apos;&apos;&gt;</text:placeholder>`
 
 ### TR-007 - Pour une facture trade, privilegier le lot physique comme chemin de navigation
 
@@ -120,6 +255,44 @@ Derniere mise a jour: `2026-03-27`
   - utiliser `fee.get_amount()`
 - Si le fee a sa propre devise, preferer aussi exposer le symbole de devise depuis le fee plutot que depuis la facture.
 
+### TR-009 - Ne pas dereferencer directement `del_period.description` dans les templates
+
+- Eviter les expressions du type:
+  - `sale.lines[0].del_period.description`
+  - `purchase.lines[0].del_period.description`
+- Meme avec un `if ... else`, ces acces sont fragiles dans un `.fodt` et
+  rendent le debug plus difficile.
+- Preferer une propriete Python stable:
+  - `sale.report_delivery_period_description`
+  - `purchase.report_delivery_period_description`
+  - `invoice.report_delivery_period_description`
+
+### TR-010 - En template, un contrat `basis` affiche le premium comme prix
+
+- Pour les templates commerciaux/facture (`sale_ict`, `invoice_ict`, etc.),
+  le prix affiche d'une ligne `basis` ne doit pas etre le prix economique total
+  (`unit_price`, `linked_price` ou prix basis brut).
+- La valeur a afficher est uniquement le `premium`:
+  - en devise/unite liee si `linked currency` est active
+  - sinon dans la devise/unite native de la ligne
+- Le texte de curve / pricing (`ON ICE ...`) reste affiche a cote, mais la
+  valeur numerique et sa version en lettres doivent representer le premium.
+
+### TR-011 - Pour `NB BALES` sur une facture, sommer les `lot_qt` des lignes facture
+
+- Pour `invoice_ict.fodt` et `invoice_ict_final.fodt`, la source de verite du
+  nombre de bales n'est pas le poids (`report_net`, `report_gross`) mais
+  `line.lot.lot_qt`.
+- La regle attendue est:
+  - lire les lignes de facture
+  - recuperer leur `lot`
+  - sommer `lot.lot_qt`
+  - sur une note finale, tenir compte du signe de la ligne de facture pour que
+    les lignes positives et negatives se compensent
+- Ne pas recalculer le nombre de bales a partir du poids:
+  - les poids peuvent varier (humidite, poids net/gross)
+  - le nombre de bales peut rester stable
+
 ## 4) Workflow recommande pour corriger un template en erreur
 
 1. Identifier le placeholder exact qui provoque l'erreur Relatorio.

modules/purchase_trade/invoice.py

@@ -1,17 +1,294 @@
-from decimal import Decimal
+from decimal import Decimal, ROUND_HALF_UP
+from datetime import date as dt_date
 
 from trytond.pool import Pool, PoolMeta
+from trytond.modules.purchase_trade.numbers_to_words import amount_to_currency_words
+from trytond.exceptions import UserError
+from trytond.transaction import Transaction
+from trytond.modules.account_invoice.invoice import (
+    InvoiceReport as BaseInvoiceReport)
+from trytond.modules.sale.sale import SaleReport as BaseSaleReport
+from trytond.modules.purchase.purchase import (
+    PurchaseReport as BasePurchaseReport)
 
 
 class Invoice(metaclass=PoolMeta):
     __name__ = 'account.invoice'
 
+    @staticmethod
+    def _format_report_number(value, digits='0.0000', keep_trailing_decimal=False,
+            strip_trailing_zeros=True):
+        value = Decimal(str(value or 0)).quantize(Decimal(digits))
+        text = format(value, 'f')
+        if strip_trailing_zeros:
+            text = text.rstrip('0').rstrip('.')
+        if keep_trailing_decimal and '.' not in text:
+            text += '.0'
+        return text or '0'
+
+    @classmethod
+    def _format_report_quantity_display(cls, value):
+        return cls._format_report_number(
+            value, digits='0.01', strip_trailing_zeros=False)
+
     def _get_report_invoice_line(self):
         for line in self.lines or []:
             if getattr(line, 'type', None) == 'line':
                 return line
         return self.lines[0] if self.lines else None
 
+    def _get_report_invoice_lines(self):
+        lines = [
+            line for line in (self.lines or [])
+            if getattr(line, 'type', None) == 'line'
+        ]
+        return lines or list(self.lines or [])
+
+    @staticmethod
+    def _get_report_related_lots(line):
+        lots = []
+        seen = set()
+
+        def add_lot(lot):
+            if not lot:
+                return
+            lot_id = getattr(lot, 'id', None)
+            key = ('id', lot_id) if lot_id is not None else ('obj', id(lot))
+            if key in seen:
+                return
+            seen.add(key)
+            lots.append(lot)
+
+        add_lot(getattr(line, 'lot', None))
+        origin = getattr(line, 'origin', None)
+        for lot in getattr(origin, 'lots', []) or []:
+            add_lot(lot)
+        return lots
+
+    @classmethod
+    def _get_report_preferred_lots(cls, line):
+        lots = cls._get_report_related_lots(line)
+        physicals = [
+            lot for lot in lots
+            if getattr(lot, 'lot_type', None) == 'physic'
+        ]
+        if physicals:
+            return physicals
+        virtuals = [
+            lot for lot in lots
+            if getattr(lot, 'lot_type', None) == 'virtual'
+        ]
+        if len(virtuals) == 1:
+            return virtuals
+        return []
+
+    @staticmethod
+    def _get_report_line_sign(line):
+        quantity = Decimal(str(getattr(line, 'quantity', 0) or 0))
+        return Decimal(-1) if quantity < 0 else Decimal(1)
+
+    @staticmethod
+    def _get_report_lot_hist_weights(lot):
+        if not lot:
+            return None, None
+        if hasattr(lot, 'get_hist_quantity'):
+            net, gross = lot.get_hist_quantity()
+            return (
+                Decimal(str(net or 0)),
+                Decimal(str(gross if gross not in (None, '') else net or 0)),
+            )
+        hist = list(getattr(lot, 'lot_hist', []) or [])
+        state = getattr(lot, 'lot_state', None)
+        state_id = getattr(state, 'id', None)
+        if state_id is not None:
+            for entry in hist:
+                quantity_type = getattr(entry, 'quantity_type', None)
+                if getattr(quantity_type, 'id', None) == state_id:
+                    net = Decimal(str(getattr(entry, 'quantity', 0) or 0))
+                    gross = Decimal(str(
+                        getattr(entry, 'gross_quantity', None)
+                        if getattr(entry, 'gross_quantity', None) not in (None, '')
+                        else net))
+                    return net, gross
+        return None, None
+
+    def _get_report_invoice_line_weights(self, line):
+        lots = self._get_report_preferred_lots(line)
+        if lots and self._report_invoice_line_reuses_lot(line):
+            quantity = self._get_report_invoice_line_quantity_from_line(line)
+            return quantity, quantity
+        if lots:
+            sign = self._get_report_line_sign(line)
+            net_total = Decimal(0)
+            gross_total = Decimal(0)
+            for lot in lots:
+                net, gross = self._get_report_lot_hist_weights(lot)
+                if net is None:
+                    continue
+                net_total += net
+                gross_total += gross
+            if net_total or gross_total:
+                return net_total * sign, gross_total * sign
+        quantity = Decimal(str(getattr(line, 'quantity', 0) or 0))
+        return quantity, quantity
+
+    @staticmethod
+    def _get_report_line_lot_keys(line):
+        keys = []
+        for lot in Invoice._get_report_preferred_lots(line):
+            lot_id = getattr(lot, 'id', None)
+            keys.append(lot_id if lot_id is not None else id(lot))
+        return tuple(sorted(keys))
+
+    def _report_invoice_line_reuses_lot(self, line):
+        line_keys = self._get_report_line_lot_keys(line)
+        if not line_keys:
+            return False
+        for other in self._get_report_invoice_lines():
+            if other is line:
+                continue
+            if self._get_report_line_lot_keys(other) == line_keys:
+                return True
+        return False
+
+    def _get_report_reused_lot_lines(self):
+        groups = {}
+        for line in self._get_report_invoice_lines():
+            lots = self._get_report_preferred_lots(line)
+            if not lots:
+                continue
+            for lot in lots:
+                lot_id = getattr(lot, 'id', None)
+                key = lot_id if lot_id is not None else id(lot)
+                groups.setdefault(key, {'lot': lot, 'lines': []})
+                groups[key]['lines'].append(line)
+        return {
+            key: value for key, value in groups.items()
+            if len(value['lines']) > 1
+        }
+
+    @staticmethod
+    def _convert_report_quantity(quantity, from_unit, to_unit):
+        value = Decimal(str(quantity or 0))
+        if not from_unit or not to_unit:
+            return value
+        if getattr(from_unit, 'id', None) == getattr(to_unit, 'id', None):
+            return value
+        from_name = getattr(from_unit, 'rec_name', None)
+        to_name = getattr(to_unit, 'rec_name', None)
+        if from_name and to_name and from_name == to_name:
+            return value
+        converted = Pool().get('product.uom').compute_qty(
+            from_unit, float(value), to_unit) or 0
+        return Decimal(str(converted))
+
+    @classmethod
+    def _get_report_invoice_line_quantity_from_line(cls, line):
+        quantity = Decimal(str(getattr(line, 'quantity', 0) or 0))
+        return cls._convert_report_quantity(
+            quantity,
+            getattr(line, 'unit', None),
+            cls._get_report_invoice_line_unit(line),
+        )
+
+    @classmethod
+    def _find_report_hist_entry_for_quantity(cls, lot, quantity, exclude_state_id=None):
+        target = Decimal(str(quantity or 0)).copy_abs()
+        for entry in list(getattr(lot, 'lot_hist', []) or []):
+            quantity_type = getattr(entry, 'quantity_type', None)
+            if getattr(quantity_type, 'id', None) == exclude_state_id:
+                continue
+            entry_quantity = Decimal(str(getattr(entry, 'quantity', 0) or 0))
+            if entry_quantity == target:
+                return entry
+        return None
+
+    def _get_report_reused_lot_gross_total(self):
+        reused_lots = self._get_report_reused_lot_lines()
+        if not reused_lots:
+            return None
+        total = Decimal(0)
+        for data in reused_lots.values():
+            lot = data['lot']
+            _, current_gross = self._get_report_lot_hist_weights(lot)
+            if current_gross is None:
+                continue
+            current_state = getattr(getattr(lot, 'lot_state', None), 'id', None)
+            negative_lines = [
+                line for line in data['lines']
+                if Decimal(str(getattr(line, 'quantity', 0) or 0)) < 0
+            ]
+            previous_gross = Decimal(0)
+            matched = False
+            for line in negative_lines:
+                previous_entry = self._find_report_hist_entry_for_quantity(
+                    lot,
+                    self._get_report_invoice_line_quantity_from_line(line),
+                    exclude_state_id=current_state,
+                )
+                if not previous_entry:
+                    continue
+                previous_gross += Decimal(str(
+                    getattr(previous_entry, 'gross_quantity', 0) or 0))
+                matched = True
+            if matched:
+                total += current_gross - previous_gross
+        return total
+
+    @staticmethod
+    def _get_report_invoice_line_unit(line):
+        lots = Invoice._get_report_preferred_lots(line)
+        if lots and getattr(lots[0], 'lot_unit_line', None):
+            return lots[0].lot_unit_line
+        return getattr(line, 'unit', None)
+
+    @staticmethod
+    def _get_report_lbs_unit():
+        Uom = Pool().get('product.uom')
+        for domain in (
+                [('symbol', '=', 'LBS')],
+                [('rec_name', '=', 'LBS')],
+                [('name', '=', 'LBS')],
+                [('symbol', '=', 'LB')],
+                [('rec_name', '=', 'LB')],
+                [('name', '=', 'LB')]):
+            units = Uom.search(domain, limit=1)
+            if units:
+                return units[0]
+        return None
+
+    @classmethod
+    def _convert_report_quantity_to_lbs(cls, quantity, unit):
+        value = Decimal(str(quantity or 0))
+        if value == 0:
+            return Decimal('0.00')
+        if not unit:
+            return (value * Decimal('2204.62')).quantize(Decimal('0.01'))
+        label = (
+            getattr(unit, 'symbol', None)
+            or getattr(unit, 'rec_name', None)
+            or getattr(unit, 'name', None)
+            or ''
+        ).strip().upper()
+        if label in {'LBS', 'LB', 'POUND', 'POUNDS'}:
+            return value.quantize(Decimal('0.01'))
+        lbs_unit = cls._get_report_lbs_unit()
+        if lbs_unit:
+            converted = Pool().get('product.uom').compute_qty(
+                unit, float(value), lbs_unit) or 0
+            return Decimal(str(converted)).quantize(Decimal('0.01'))
+        if label in {'KG', 'KGS', 'KILOGRAM', 'KILOGRAMS'}:
+            return (value * Decimal('2.20462')).quantize(Decimal('0.01'))
+        return (value * Decimal('2204.62')).quantize(Decimal('0.01'))
+
+    @staticmethod
+    def _clean_report_description(value):
+        text = (value or '').strip()
+        normalized = text.replace(' ', '').upper()
+        if normalized == 'PROFORMA':
+            return ''
+        return text.upper() if text else ''
+
     def _get_report_purchase(self):
         purchases = list(self.purchases or [])
         return purchases[0] if purchases else None
@@ -46,6 +323,81 @@ class Invoice(metaclass=PoolMeta):
                     return lot
             return line.lots[0]
 
+    @staticmethod
+    def _get_report_lot_shipment(lot):
+        if not lot:
+            return None
+        return (
+            getattr(lot, 'lot_shipment_in', None)
+            or getattr(lot, 'lot_shipment_out', None)
+            or getattr(lot, 'lot_shipment_internal', None)
+        )
+
+    def _get_report_invoice_shipments(self):
+        shipments = []
+        seen = set()
+        for line in self._get_report_invoice_lines():
+            for lot in self._get_report_preferred_lots(line):
+                shipment = self._get_report_lot_shipment(lot)
+                if not shipment:
+                    continue
+                shipment_id = getattr(shipment, 'id', None)
+                key = (
+                    getattr(shipment, '__name__', None),
+                    shipment_id if shipment_id is not None else id(shipment),
+                )
+                if key in seen:
+                    continue
+                seen.add(key)
+                shipments.append(shipment)
+        return shipments
+
+    def _get_report_invoice_lots(self):
+        invoice_lines = self._get_report_invoice_lines()
+        if not invoice_lines:
+            return []
+
+        def _same_invoice_line(left, right):
+            if not left or not right:
+                return False
+            left_id = getattr(left, 'id', None)
+            right_id = getattr(right, 'id', None)
+            if left_id is not None and right_id is not None:
+                return left_id == right_id
+            return left is right
+
+        trade = self._get_report_trade()
+        trade_lines = getattr(trade, 'lines', []) if trade else []
+        lots = []
+        for line in trade_lines or []:
+            for lot in getattr(line, 'lots', []) or []:
+                if getattr(lot, 'lot_type', None) != 'physic':
+                    continue
+                refs = [
+                    getattr(lot, 'sale_invoice_line', None),
+                    getattr(lot, 'sale_invoice_line_prov', None),
+                    getattr(lot, 'invoice_line', None),
+                    getattr(lot, 'invoice_line_prov', None),
+                ]
+                if any(
+                        _same_invoice_line(ref, invoice_line)
+                        for ref in refs for invoice_line in invoice_lines):
+                    lots.append(lot)
+        return lots
+
+    @staticmethod
+    def _format_report_package_label(unit):
+        label = (
+            getattr(unit, 'symbol', None)
+            or getattr(unit, 'rec_name', None)
+            or getattr(unit, 'name', None)
+            or 'BALE'
+        )
+        label = label.upper()
+        if not label.endswith('S'):
+            label += 'S'
+        return label
+
     def _get_report_freight_fee(self):
         pool = Pool()
         Fee = pool.get('fee.fee')
@@ -59,14 +411,165 @@ class Invoice(metaclass=PoolMeta):
         return fees[0] if fees else None
 
     def _get_report_shipment(self):
-        lot = self._get_report_lot()
+        shipments = self._get_report_invoice_shipments()
-        if not lot:
+        if len(shipments) == 1:
+            return shipments[0]
+        if len(shipments) > 1:
             return None
-        return (
+        lot = self._get_report_lot()
-            getattr(lot, 'lot_shipment_in', None)
+        return self._get_report_lot_shipment(lot)
-            or getattr(lot, 'lot_shipment_out', None)
+
-            or getattr(lot, 'lot_shipment_internal', None)
+    @staticmethod
-        )
+    def _get_report_bank_account(party):
+        accounts = list(getattr(party, 'bank_accounts', []) or [])
+        return accounts[0] if accounts else None
+
+    @staticmethod
+    def _get_report_bank_account_number(account):
+        if not account:
+            return ''
+        numbers = list(getattr(account, 'numbers', []) or [])
+        for number in numbers:
+            if getattr(number, 'type', None) == 'iban' and getattr(number, 'number', None):
+                return number.number or ''
+        for number in numbers:
+            if getattr(number, 'number', None):
+                return number.number or ''
+        return ''
+
+    @staticmethod
+    def _get_report_bank_name(account):
+        bank = getattr(account, 'bank', None) if account else None
+        party = getattr(bank, 'party', None) if bank else None
+        return getattr(party, 'rec_name', None) or getattr(bank, 'rec_name', None) or ''
+
+    @staticmethod
+    def _get_report_bank_city(account):
+        bank = getattr(account, 'bank', None) if account else None
+        party = getattr(bank, 'party', None) if bank else None
+        address = party.address_get() if party and hasattr(party, 'address_get') else None
+        return getattr(address, 'city', None) or ''
+
+    @staticmethod
+    def _get_report_bank_swift(account):
+        bank = getattr(account, 'bank', None) if account else None
+        return getattr(bank, 'bic', None) or ''
+
+    @staticmethod
+    def _format_report_payment_amount(value):
+        amount = Decimal(str(value or 0)).quantize(Decimal('0.01'))
+        return format(amount, 'f')
+
+    @property
+    def _report_payment_order_company_account(self):
+        return self._get_report_bank_account(getattr(self.company, 'party', None))
+
+    @property
+    def _report_payment_order_beneficiary_account(self):
+        return self._get_report_bank_account(self.party)
+
+    @property
+    def report_payment_order_short_name(self):
+        company_party = getattr(self.company, 'party', None)
+        return getattr(company_party, 'rec_name', '') or ''
+
+    @property
+    def report_payment_order_document_reference(self):
+        return self.number or self.reference or ''
+
+    @property
+    def report_payment_order_from_account_nb(self):
+        return self._get_report_bank_account_number(
+            self._report_payment_order_company_account)
+
+    @property
+    def report_payment_order_to_bank_name(self):
+        return self._get_report_bank_name(self._report_payment_order_beneficiary_account)
+
+    @property
+    def report_payment_order_to_bank_city(self):
+        return self._get_report_bank_city(self._report_payment_order_beneficiary_account)
+
+    @property
+    def report_payment_order_amount(self):
+        return self._format_report_payment_amount(self.total_amount)
+
+    @property
+    def report_payment_order_currency_code(self):
+        currency = self.currency
+        code = getattr(currency, 'code', None) or ''
+        rec_name = getattr(currency, 'rec_name', None) or ''
+        symbol = getattr(currency, 'symbol', None) or ''
+        if code and any(ch.isalpha() for ch in code):
+            return code
+        if rec_name and any(ch.isalpha() for ch in rec_name):
+            return rec_name
+        if symbol and any(ch.isalpha() for ch in symbol):
+            return symbol
+        return code or rec_name or symbol or ''
+
+    @property
+    def report_payment_order_amount_text(self):
+        return amount_to_currency_words(self.total_amount)
+
+    @property
+    def report_payment_order_value_date(self):
+        value_date = self.payment_term_date or self.invoice_date
+        if isinstance(value_date, dt_date):
+            return value_date.strftime('%d-%m-%Y')
+        return ''
+
+    @property
+    def report_payment_order_company_address(self):
+        if self.invoice_address and getattr(self.invoice_address, 'full_address', None):
+            return self.invoice_address.full_address
+        return self.report_address
+
+    @property
+    def report_payment_order_beneficiary_account_nb(self):
+        return self._get_report_bank_account_number(
+            self._report_payment_order_beneficiary_account)
+
+    @property
+    def report_payment_order_beneficiary_bank_name(self):
+        return self._get_report_bank_name(self._report_payment_order_beneficiary_account)
+
+    @property
+    def report_payment_order_beneficiary_bank_city(self):
+        return self._get_report_bank_city(self._report_payment_order_beneficiary_account)
+
+    @property
+    def report_payment_order_swift_code(self):
+        return self._get_report_bank_swift(self._report_payment_order_beneficiary_account)
+
+    @property
+    def report_payment_order_other_instructions(self):
+        return self.description or ''
+
+    @property
+    def report_payment_order_reference(self):
+        return self.reference or self.number or ''
+
+    @staticmethod
+    def _get_report_current_user():
+        user_id = Transaction().user
+        if not user_id:
+            return None
+        User = Pool().get('res.user')
+        return User(user_id)
+
+    @property
+    def report_payment_order_current_user(self):
+        user = self._get_report_current_user()
+        return getattr(user, 'rec_name', None) or ''
+
+    @property
+    def report_payment_order_current_user_email(self):
+        user = self._get_report_current_user()
+        party = getattr(user, 'party', None) if user else None
+        if party and hasattr(party, 'contact_mechanism_get'):
+            return party.contact_mechanism_get('email') or ''
+        return getattr(user, 'email', None) or ''
 
     @property
     def report_address(self):
@@ -119,10 +622,17 @@ class Invoice(metaclass=PoolMeta):
             return line.product.description or ''
         return ''
 
+    @property
+    def report_product_name(self):
+        line = self._get_report_trade_line()
+        if line and line.product:
+            return line.product.name or ''
+        return ''
+
     @property
     def report_description_upper(self):
         if self.lines:
-            return (self.lines[0].description or '').upper()
+            return self._clean_report_description(self.lines[0].description)
         return ''
 
     @property
@@ -146,6 +656,36 @@ class Invoice(metaclass=PoolMeta):
             return trade.report_price
         return ''
 
+    @property
+    def report_quantity_lines(self):
+        details = []
+        for line in self._get_report_invoice_lines():
+            quantity, _ = self._get_report_invoice_line_weights(line)
+            if quantity == '':
+                continue
+            quantity_text = self._format_report_quantity_display(quantity)
+            unit = self._get_report_invoice_line_unit(line)
+            unit_name = unit.rec_name.upper() if unit and unit.rec_name else ''
+            lbs = self._convert_report_quantity_to_lbs(quantity, unit)
+            parts = [quantity_text, unit_name]
+            if lbs != '':
+                parts.append(
+                    f"({self._format_report_quantity_display(lbs)} LBS)")
+            detail = ' '.join(part for part in parts if part)
+            if detail:
+                details.append(detail)
+        return '\n'.join(details)
+
+    @property
+    def report_trade_blocks(self):
+        blocks = []
+        quantity_lines = self.report_quantity_lines.splitlines()
+        rate_lines = self.report_rate_lines.splitlines()
+        for index, quantity_line in enumerate(quantity_lines):
+            price_line = rate_lines[index] if index < len(rate_lines) else ''
+            blocks.append((quantity_line, price_line))
+        return blocks
+
     @property
     def report_rate_currency_upper(self):
         line = self._get_report_invoice_line()
@@ -181,6 +721,66 @@ class Invoice(metaclass=PoolMeta):
             return line.report_rate_pricing_text
         return ''
 
+    @property
+    def report_rate_lines(self):
+        details = []
+        for line in self._get_report_invoice_lines():
+            currency = getattr(line, 'report_rate_currency_upper', '') or ''
+            value = getattr(line, 'report_rate_value', '')
+            value_text = ''
+            if value != '':
+                value_text = self._format_report_number(
+                    value, strip_trailing_zeros=False)
+            unit = getattr(line, 'report_rate_unit_upper', '') or ''
+            words = getattr(line, 'report_rate_price_words', '') or ''
+            pricing_text = getattr(line, 'report_rate_pricing_text', '') or ''
+            detail = ' '.join(
+                part for part in [
+                    currency,
+                    value_text,
+                    'PER' if unit else '',
+                    unit,
+                    f"({words})" if words else '',
+                    pricing_text,
+                ] if part)
+            if detail:
+                details.append(detail)
+        return '\n'.join(details)
+
+    @property
+    def report_positive_rate_lines(self):
+        sale = self._get_report_sale()
+        if sale and getattr(sale, 'report_price_lines', None):
+            return sale.report_price_lines
+        details = []
+        for line in self._get_report_invoice_lines():
+            quantity = getattr(line, 'report_net', '')
+            if quantity == '':
+                quantity = getattr(line, 'quantity', '')
+            if Decimal(str(quantity or 0)) <= 0:
+                continue
+            currency = getattr(line, 'report_rate_currency_upper', '') or ''
+            value = getattr(line, 'report_rate_value', '')
+            value_text = ''
+            if value != '':
+                value_text = self._format_report_number(
+                    value, strip_trailing_zeros=False)
+            unit = getattr(line, 'report_rate_unit_upper', '') or ''
+            words = getattr(line, 'report_rate_price_words', '') or ''
+            pricing_text = getattr(line, 'report_rate_pricing_text', '') or ''
+            detail = ' '.join(
+                part for part in [
+                    currency,
+                    value_text,
+                    'PER' if unit else '',
+                    unit,
+                    f"({words})" if words else '',
+                    pricing_text,
+                ] if part)
+            if detail:
+                details.append(detail)
+        return '\n'.join(details)
+
     @property
     def report_payment_date(self):
         trade = self._get_report_trade()
@@ -188,6 +788,16 @@ class Invoice(metaclass=PoolMeta):
             return trade.report_payment_date
         return ''
 
+    @property
+    def report_delivery_period_description(self):
+        trade = self._get_report_trade()
+        if trade and getattr(trade, 'report_delivery_period_description', None):
+            return trade.report_delivery_period_description
+        line = self._get_report_trade_line()
+        if line and getattr(line, 'del_period', None):
+            return line.del_period.description or ''
+        return ''
+
     @property
     def report_payment_description(self):
         trade = self._get_report_trade()
@@ -199,6 +809,39 @@ class Invoice(metaclass=PoolMeta):
 
     @property
     def report_nb_bale(self):
+        total_packages = Decimal(0)
+        package_unit = None
+        has_invoice_line_packages = False
+        for line in self._get_report_invoice_lines():
+            lot = getattr(line, 'lot', None)
+            if not lot or getattr(lot, 'lot_qt', None) in (None, ''):
+                continue
+            has_invoice_line_packages = True
+            if not package_unit and getattr(lot, 'lot_unit', None):
+                package_unit = lot.lot_unit
+            sign = Decimal(1)
+            if Decimal(str(getattr(line, 'quantity', 0) or 0)) < 0:
+                sign = Decimal(-1)
+            total_packages += (
+                Decimal(str(lot.lot_qt or 0)).quantize(
+                    Decimal('1'), rounding=ROUND_HALF_UP) * sign)
+        if has_invoice_line_packages:
+            label = self._format_report_package_label(package_unit)
+            return f"NB {label}: {int(total_packages)}"
+
+        lots = self._get_report_invoice_lots()
+        if lots:
+            total_packages = Decimal(0)
+            package_unit = None
+            for lot in lots:
+                if getattr(lot, 'lot_qt', None):
+                    total_packages += Decimal(str(lot.lot_qt or 0))
+                if not package_unit and getattr(lot, 'lot_unit', None):
+                    package_unit = lot.lot_unit
+            package_qty = total_packages.quantize(
+                Decimal('1'), rounding=ROUND_HALF_UP)
+            label = self._format_report_package_label(package_unit)
+            return f"NB {label}: {int(package_qty)}"
         sale = self._get_report_sale()
         if sale and sale.report_nb_bale:
             return sale.report_nb_bale
@@ -210,11 +853,47 @@ class Invoice(metaclass=PoolMeta):
             return 'NB BALES: ' + str(int(nb_bale))
         return ''
 
+    @property
+    def report_cndn_nb_bale(self):
+        nb_bale = self.report_nb_bale
+        if nb_bale == 'NB BALES: 0':
+            return 'Unchanged'
+        return nb_bale
+
+    @property
+    def report_net_display(self):
+        net = self.report_net
+        if net == '':
+            return ''
+        return self._format_report_quantity_display(net)
+
+    @property
+    def report_gross_display(self):
+        gross = self.report_gross
+        if gross == '':
+            return ''
+        return self._format_report_quantity_display(gross)
+
+    @property
+    def report_lbs_display(self):
+        lbs = self.report_lbs
+        if lbs == '':
+            return ''
+        return self._format_report_quantity_display(lbs)
+
     @property
     def report_gross(self):
-        sale = self._get_report_sale()
+        if self.lines:
-        if sale and sale.report_gross != '':
+            reused_gross = self._get_report_reused_lot_gross_total()
-            return sale.report_gross
+            if reused_gross is not None:
+                non_reused_total = sum(
+                    self._get_report_invoice_line_weights(line)[1]
+                    for line in self._get_report_invoice_lines()
+                    if not self._report_invoice_line_reuses_lot(line))
+                return non_reused_total + reused_gross
+            return sum(
+                self._get_report_invoice_line_weights(line)[1]
+                for line in self._get_report_invoice_lines())
         line = self._get_report_trade_line()
         if line and line.lots:
             return sum(
@@ -225,9 +904,10 @@ class Invoice(metaclass=PoolMeta):
 
     @property
     def report_net(self):
-        trade = self._get_report_trade()
+        if self.lines:
-        if trade and getattr(trade, 'report_net', '') != '':
+            return sum(
-            return trade.report_net
+                self._get_report_invoice_line_weights(line)[0]
+                for line in self._get_report_invoice_lines())
         line = self._get_report_trade_line()
         if line and line.lots:
             return sum(
@@ -243,7 +923,41 @@ class Invoice(metaclass=PoolMeta):
         net = self.report_net
         if net == '':
             return ''
-        return round(Decimal(net) * Decimal('2204.62'),2)
+        invoice_line = self._get_report_invoice_line()
+        unit = self._get_report_invoice_line_unit(invoice_line) if invoice_line else None
+        return self._convert_report_quantity_to_lbs(net, unit)
+
+    @property
+    def report_weight_unit_upper(self):
+        invoice_line = self._get_report_invoice_line()
+        unit = self._get_report_invoice_line_unit(invoice_line) if invoice_line else None
+        if not unit:
+            line = self._get_report_trade_line()
+            lot = self._get_report_lot()
+            unit = (
+                getattr(lot, 'lot_unit_line', None)
+                or getattr(line, 'unit', None) if line else None
+            )
+        if unit and unit.rec_name:
+            return unit.rec_name.upper()
+        return 'KGS'
+
+    @property
+    def report_note_title(self):
+        total = Decimal(str(self.total_amount or 0))
+        invoice_type = getattr(self, 'type', None)
+        if not invoice_type:
+            if self.sales:
+                invoice_type = 'out'
+            elif self.purchases:
+                invoice_type = 'in'
+        if invoice_type == 'out':
+            if total < 0:
+                return 'Credit Note'
+            return 'Debit Note'
+        if total < 0:
+            return 'Debit Note'
+        return 'Credit Note'
 
     @property
     def report_bl_date(self):
@@ -328,6 +1042,13 @@ class Invoice(metaclass=PoolMeta):
             return shipment.number or ''
         return ''
 
+    @property
+    def report_si_reference(self):
+        shipment = self._get_report_shipment()
+        if shipment:
+            return getattr(shipment, 'reference', None) or ''
+        return ''
+
     @property
     def report_freight_amount(self):
         fee = self._get_report_freight_fee()
@@ -366,9 +1087,18 @@ class InvoiceLine(metaclass=PoolMeta):
             return origin.product.description or ''
         return ''
 
+    @property
+    def report_product_name(self):
+        if self.product:
+            return self.product.name or ''
+        origin = getattr(self, 'origin', None)
+        if origin and getattr(origin, 'product', None):
+            return origin.product.name or ''
+        return ''
+
     @property
     def report_description_upper(self):
-        return (self.description or '').upper()
+        return Invoice._clean_report_description(self.description)
 
     @property
     def report_rate_currency_upper(self):
@@ -380,6 +1110,11 @@ class InvoiceLine(metaclass=PoolMeta):
 
     @property
     def report_rate_value(self):
+        origin = self._get_report_trade_line()
+        if origin and getattr(origin, 'price_type', None) == 'basis':
+            if getattr(origin, 'enable_linked_currency', False) and getattr(origin, 'linked_currency', None):
+                return Decimal(str(origin.premium or 0))
+            return Decimal(str(origin._get_premium_price() or 0))
         return self.unit_price if self.unit_price is not None else ''
 
     @property
@@ -392,6 +1127,12 @@ class InvoiceLine(metaclass=PoolMeta):
 
     @property
     def report_rate_price_words(self):
+        origin = self._get_report_trade_line()
+        if origin and getattr(origin, 'price_type', None) == 'basis':
+            value = self.report_rate_value
+            if self.report_rate_currency_upper == 'USC':
+                return amount_to_currency_words(value, 'USC', 'USC')
+            return amount_to_currency_words(value)
         trade = self._get_report_trade()
         if trade and getattr(trade, 'report_price', None):
             return trade.report_price
@@ -419,6 +1160,16 @@ class InvoiceLine(metaclass=PoolMeta):
     @property
     def report_net(self):
         if self.type == 'line':
+            invoice = getattr(self, 'invoice', None)
+            if invoice and invoice._report_invoice_line_reuses_lot(self):
+                return Invoice._get_report_invoice_line_quantity_from_line(self)
+            lot = getattr(self, 'lot', None)
+            if lot:
+                net, _ = Invoice._get_report_lot_hist_weights(lot)
+                if net is None:
+                    net = 0
+                sign = Invoice._get_report_line_sign(self)
+                return Decimal(str(net or 0)) * sign
             return self.quantity
         return ''
 
@@ -427,4 +1178,98 @@ class InvoiceLine(metaclass=PoolMeta):
         net = self.report_net
         if net == '':
             return ''
-        return round(Decimal(net) * Decimal('2204.62'),2)
+        unit = Invoice._get_report_invoice_line_unit(self)
+        return Invoice._convert_report_quantity_to_lbs(net, unit)
+
+
+class ReportTemplateMixin:
+    @classmethod
+    def _get_purchase_trade_configuration(cls):
+        Configuration = Pool().get('purchase_trade.configuration')
+        configurations = Configuration.search([], limit=1)
+        return configurations[0] if configurations else None
+
+    @classmethod
+    def _get_action_name(cls, action):
+        if isinstance(action, dict):
+            return action.get('name') or ''
+        return getattr(action, 'name', '') or ''
+
+    @classmethod
+    def _get_action_report_path(cls, action):
+        if isinstance(action, dict):
+            return action.get('report') or ''
+        return getattr(action, 'report', '') or ''
+
+    @classmethod
+    def _resolve_template_path(cls, action, field_name, default_prefix):
+        config = cls._get_purchase_trade_configuration()
+        template = getattr(config, field_name, '') if config else ''
+        template = (template or '').strip()
+        if not template:
+            raise UserError('No template found')
+        if '/' not in template:
+            return f'{default_prefix}/{template}'
+        return template
+
+    @classmethod
+    def _get_resolved_action(cls, action):
+        report_path = cls._resolve_configured_report_path(action)
+        if isinstance(action, dict):
+            resolved = dict(action)
+            resolved['report'] = report_path
+            return resolved
+        setattr(action, 'report', report_path)
+        return action
+
+    @classmethod
+    def _execute(cls, records, header, data, action):
+        resolved_action = cls._get_resolved_action(action)
+        return super()._execute(records, header, data, resolved_action)
+
+
+class InvoiceReport(ReportTemplateMixin, BaseInvoiceReport):
+    __name__ = 'account.invoice'
+
+    @classmethod
+    def _resolve_configured_report_path(cls, action):
+        report_path = cls._get_action_report_path(action) or ''
+        action_name = cls._get_action_name(action)
+
+        if (report_path.endswith('/prepayment.fodt')
+                or action_name == 'Prepayment'):
+            field_name = 'invoice_prepayment_report_template'
+        elif (report_path.endswith('/payment_order.fodt')
+                or action_name == 'Payment Order'):
+            field_name = 'invoice_payment_order_report_template'
+        elif (report_path.endswith('/invoice_ict_final.fodt')
+                or action_name == 'CN/DN'):
+            field_name = 'invoice_cndn_report_template'
+        else:
+            field_name = 'invoice_report_template'
+        return cls._resolve_template_path(action, field_name, 'account_invoice')
+
+
+class SaleReport(ReportTemplateMixin, BaseSaleReport):
+    __name__ = 'sale.sale'
+
+    @classmethod
+    def _resolve_configured_report_path(cls, action):
+        report_path = cls._get_action_report_path(action)
+        action_name = cls._get_action_name(action)
+        if report_path.endswith('/bill.fodt') or action_name == 'Bill':
+            field_name = 'sale_bill_report_template'
+        elif report_path.endswith('/sale_final.fodt') or action_name == 'Sale (final)':
+            field_name = 'sale_final_report_template'
+        else:
+            field_name = 'sale_report_template'
+        return cls._resolve_template_path(action, field_name, 'sale')
+
+
+class PurchaseReport(ReportTemplateMixin, BasePurchaseReport):
+    __name__ = 'purchase.purchase'
+
+    @classmethod
+    def _resolve_configured_report_path(cls, action):
+        return cls._resolve_template_path(
+            action, 'purchase_report_template', 'purchase')

modules/purchase_trade/invoice.xml

@@ -0,0 +1,16 @@
+<tryton>
+    <data>
+        <record model="ir.action.report" id="report_payment_order">
+            <field name="name">Payment Order</field>
+            <field name="model">account.invoice</field>
+            <field name="report_name">account.invoice</field>
+            <field name="report">account_invoice/payment_order.fodt</field>
+            <field name="single" eval="True"/>
+        </record>
+        <record model="ir.action.keyword" id="report_payment_order_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">account.invoice,-1</field>
+            <field name="action" ref="report_payment_order"/>
+        </record>
+    </data>
+</tryton>

modules/purchase_trade/lot.py

@@ -1334,11 +1334,16 @@ class LotQt(
                 Case((lp.id>0, lp.lot_premium_sale),else_=ls.lot_premium_sale).as_('r_lot_premium_sale'),
                 Case((lp.id>0, lp.lot_parent),else_=ls.lot_parent).as_('r_lot_parent'),
                 Case((lp.id>0, lp.lot_himself),else_=ls.lot_himself).as_('r_lot_himself'),
-                Case((lp.id>0, lp.lot_container),else_=ls.lot_container).as_('r_lot_container'),
+                Case((lp.id>0, lp.lot_container),else_=ls.lot_container).as_('r_lot_container'),
-                Case((lp.id>0, lp.line),else_=None).as_('r_line'),
+                Case((lp.id>0, lp.line),else_=None).as_('r_line'),
-                Case((pu.id>0, pu.id),else_=None).as_('r_purchase'),
+                Case(
-                Case((sa.id>0, sa.id),else_=None).as_('r_sale'),
+                    (((lqt.lot_s != None) & (lqt.lot_p == None) & (sl.id > 0)),
-                Case((ls.id>0, ls.sale_line),else_=None).as_('r_sale_line'),
+                        sl.del_period),
+                    else_=Case((pl.id>0, pl.del_period),else_=None)
+                ).as_('r_del_period'),
+                Case((pu.id>0, pu.id),else_=None).as_('r_purchase'),
+                Case((sa.id>0, sa.id),else_=None).as_('r_sale'),
+                Case((ls.id>0, ls.sale_line),else_=None).as_('r_sale_line'),
                 (MaQt + AvQt).as_('r_tot'),
                 pu.party.as_('r_supplier'),
                 sa.party.as_('r_client'),
@@ -1439,13 +1444,14 @@ class LotQt(
                 lp.lot_av.as_("r_lot_av"),
                 lp.lot_premium.as_("r_lot_premium"),
                 lp.lot_premium_sale.as_("r_lot_premium_sale"),
-                lp.lot_parent.as_("r_lot_parent"),
+                lp.lot_parent.as_("r_lot_parent"),
-                lp.lot_himself.as_("r_lot_himself"),
+                lp.lot_himself.as_("r_lot_himself"),
-                lp.lot_container.as_("r_lot_container"),
+                lp.lot_container.as_("r_lot_container"),
-                lp.line.as_("r_line"),
+                lp.line.as_("r_line"),
-                Case((pu.id > 0, pu.id), else_=None).as_("r_purchase"),
+                pl.del_period.as_("r_del_period"),
-                Case((sa.id > 0, sa.id), else_=None).as_("r_sale"),
+                Case((pu.id > 0, pu.id), else_=None).as_("r_purchase"),
-                lp.sale_line.as_("r_sale_line"),
+                Case((sa.id > 0, sa.id), else_=None).as_("r_sale"),
+                lp.sale_line.as_("r_sale_line"),
                 (MaQt2 + Abs(AvQt2)).as_("r_tot"),
                 pu.party.as_("r_supplier"),
                 sa.party.as_("r_client"),
@@ -1504,13 +1510,14 @@ class LotQt(
                 Max(lp.lot_av).as_("r_lot_av"),
                 Avg(lp.lot_premium).as_("r_lot_premium"),
                 Literal(None).as_("r_lot_premium_sale"),
-                Literal(None).as_("r_lot_parent"),
+                Literal(None).as_("r_lot_parent"),
-                Literal(None).as_("r_lot_himself"),
+                Literal(None).as_("r_lot_himself"),
-                Max(lp.lot_container).as_("r_lot_container"),
+                Max(lp.lot_container).as_("r_lot_container"),
-                lp.line.as_("r_line"),
+                lp.line.as_("r_line"),
-                Max(Case((pu.id > 0, pu.id), else_=None)).as_("r_purchase"),
+                Max(pl.del_period).as_("r_del_period"),
-                Max(Case((sa.id > 0, sa.id), else_=None)).as_("r_sale"),
+                Max(Case((pu.id > 0, pu.id), else_=None)).as_("r_purchase"),
-                lp.sale_line.as_("r_sale_line"),
+                Max(Case((sa.id > 0, sa.id), else_=None)).as_("r_sale"),
+                lp.sale_line.as_("r_sale_line"),
                 Sum(MaQt2 + Abs(AvQt2)).as_("r_tot"),
                 Max(pu.party).as_("r_supplier"),
                 Max(sa.party).as_("r_client"),
@@ -1557,13 +1564,14 @@ class LotQt(
             union.r_lot_av.as_("r_lot_av"),
             union.r_lot_premium.as_("r_lot_premium"),
             union.r_lot_premium_sale.as_("r_lot_premium_sale"),
-            union.r_lot_parent.as_("r_lot_parent"),
+            union.r_lot_parent.as_("r_lot_parent"),
-            union.r_lot_himself.as_("r_lot_himself"),
+            union.r_lot_himself.as_("r_lot_himself"),
-            union.r_lot_container.as_("r_lot_container"),
+            union.r_lot_container.as_("r_lot_container"),
-            union.r_line.as_("r_line"),
+            union.r_line.as_("r_line"),
-            union.r_purchase.as_("r_purchase"),
+            union.r_del_period.as_("r_del_period"),
-            union.r_sale.as_("r_sale"),
+            union.r_purchase.as_("r_purchase"),
-            union.r_sale_line.as_("r_sale_line"),
+            union.r_sale.as_("r_sale"),
+            union.r_sale_line.as_("r_sale_line"),
             union.r_tot.as_("r_tot"),
             union.r_supplier.as_("r_supplier"),
             union.r_client.as_("r_client"),
@@ -1630,14 +1638,15 @@ class LotReport(
     r_lot_shipment_out = fields.Many2One('stock.shipment.out', "Shipment Out")
     r_lot_shipment_internal = fields.Many2One('stock.shipment.internal', "Shipment Internal")
     r_lot_move = fields.Many2One('stock.move', "Move")
-    r_lot_parent = fields.Many2One('lot.lot',"Parent")
+    r_lot_parent = fields.Many2One('lot.lot',"Parent")
-    r_lot_himself = fields.Many2One('lot.lot',"Lot")
+    r_lot_himself = fields.Many2One('lot.lot',"Lot")
-    r_lot_container = fields.Char("Container")
+    r_lot_container = fields.Char("Container")
-    r_lot_unit_line = fields.Function(fields.Many2One('product.uom', "Unit"),'get_unit')
+    r_lot_unit_line = fields.Function(fields.Many2One('product.uom', "Unit"),'get_unit')
-    r_lot_price = fields.Function(fields.Numeric("Price", digits='r_lot_unit_line'),'get_lot_price')
+    r_lot_price = fields.Function(fields.Numeric("Price", digits='r_lot_unit_line'),'get_lot_price')
-    r_lot_price_sale = fields.Function(fields.Numeric("Price", digits='r_lot_unit_line'),'get_lot_sale_price')
+    r_lot_price_sale = fields.Function(fields.Numeric("Price", digits='r_lot_unit_line'),'get_lot_sale_price')
-    r_sale_line = fields.Many2One('sale.line',"S. line")
+    r_del_period = fields.Many2One('product.month', "Delivery Period")
-    r_sale = fields.Many2One('sale.sale',"Sale")
+    r_sale_line = fields.Many2One('sale.line',"S. line")
+    r_sale = fields.Many2One('sale.sale',"Sale")
     r_tot = fields.Numeric("Qt tot", digits='r_lot_unit_line')
     r_supplier = fields.Many2One('party.party',"Supplier")
     r_client = fields.Many2One('party.party',"Client")
@@ -2774,40 +2783,54 @@ class LotInvoice(Wizard):
             'action': act
             }
 
-    def transition_invoicing(self):
+    def transition_invoicing(self):
-        Lot = Pool().get('lot.lot')
+        Lot = Pool().get('lot.lot')
-        Purchase = Pool().get('purchase.purchase')
+        Purchase = Pool().get('purchase.purchase')
-        Sale = Pool().get('sale.sale')
+        Sale = Pool().get('sale.sale')
-        lots = []
+        lots = []
-        action = self.inv.action
+        purchases = []
-        for r in self.records:
+        sales = []
-            purchase = r.r_line.purchase
+        action = self.inv.action
-            sale = None
+        for r in self.records:
-            if r.r_sale_line:
+            purchase = r.r_line.purchase if r.r_line else None
-                sale = r.r_sale_line.sale
+            sale = r.r_sale_line.sale if r.r_sale_line else None
-            lot = Lot(r.r_lot_p)
+            if purchase and purchase not in purchases:
-            # if lot.move == None:
+                purchases.append(purchase)
-            #     Warning = Pool().get('res.user.warning')   
+            if sale and sale not in sales:
-            #     warning_name = Warning.format("Lot not confirmed", [])
+                sales.append(sale)
-            #     if Warning.check(warning_name):
+            lot = Lot(r.r_lot_p)
+            # if lot.move == None:
+            #     Warning = Pool().get('res.user.warning')   
+            #     warning_name = Warning.format("Lot not confirmed", [])
+            #     if Warning.check(warning_name):
             #         raise QtWarning(warning_name,
             #                     "Lot not confirmed, click yes to confirm and invoice")
             #         continue
-            if lot.invoice_line:
+            if lot.invoice_line:
-                continue
+                continue
-            lots.append(lot)
+            lots.append(lot)
-
+
-        invoice_line = None
+        invoice_line = None
-        if self.inv.type == 'purchase':
+        if self.inv.type == 'purchase':
-            Purchase._process_invoice([purchase],lots,action,self.inv.pp_pur)
+            Purchase._process_invoice(purchases, lots, action, self.inv.pp_pur)
-            invoice_line = r.r_lot_p.invoice_line if r.r_lot_p.invoice_line else r.r_lot_p.invoice_line_prov
+            for lot in lots:
-        else:
+                lot = Lot(lot.id)
-            if sale:
+                invoice_line = lot.invoice_line or lot.invoice_line_prov
-                Sale._process_invoice([sale],lots,action,self.inv.pp_sale)
+                if invoice_line:
-                invoice_line = r.r_lot_p.invoice_line if r.r_lot_p.sale_invoice_line else r.r_lot_p.sale_invoice_line_prov
+                    break
-        self.message.invoice = invoice_line.invoice
+        else:
-
+            if sales:
-        return 'message'
+                Sale._process_invoice(sales, lots, action, self.inv.pp_sale)
+                for lot in lots:
+                    lot = Lot(lot.id)
+                    invoice_line = lot.sale_invoice_line or lot.sale_invoice_line_prov
+                    if invoice_line:
+                        break
+        if not invoice_line:
+            raise UserError("No invoice line was generated from the selected lots.")
+        self.message.invoice = invoice_line.invoice
+
+        return 'message'
 
     def default_message(self, fields):
         return {
@@ -3027,25 +3050,26 @@ class LotWeighing(Wizard):
         Lot = Pool().get('lot.lot')
         context = Transaction().context
         ids = context.get('active_ids')
-        for i in ids:
+        for i in ids:
-            if i > 10000000:
+            if i > 10000000:
-                raise UserError("Trying to do weighing on open quantity!")
+                raise UserError("Trying to do weighing on open quantity!")
-            val = {}
+            val = {}
-            lot = Lot(i)
+            lot = Lot(i)
-            val['lot'] = lot.id
+            val['lot'] = lot.id
-            val['lot_name'] = lot.lot_name
+            val['lot_name'] = lot.lot_name
             if lot.lot_shipment_in:
                 val['lot_shipment_in'] = lot.lot_shipment_in.id
             if lot.lot_shipment_internal:
                 val['lot_shipment_internal'] = lot.lot_shipment_internal.id
-            if lot.lot_shipment_out:
+            if lot.lot_shipment_out:
-                val['lot_shipment_out'] = lot.lot_shipment_out.id
+                val['lot_shipment_out'] = lot.lot_shipment_out.id
-            val['lot_product'] = lot.lot_product.id
+            val['lot_product'] = lot.lot_product.id
-            val['lot_quantity'] = lot.lot_quantity
+            val['lot_qt'] = lot.lot_qt
-            val['lot_gross_quantity'] = lot.lot_gross_quantity
+            val['lot_quantity'] = lot.lot_quantity
-            val['lot_unit'] = lot.lot_unit.id
+            val['lot_gross_quantity'] = lot.lot_gross_quantity
-            val['lot_unit_line'] = lot.lot_unit_line.id
+            val['lot_unit'] = lot.lot_unit.id
-            lot_p.append(val)
+            val['lot_unit_line'] = lot.lot_unit_line.id
+            lot_p.append(val)
         return {
             'lot_p': lot_p,
             }
@@ -3060,17 +3084,18 @@ class LotWeighing(Wizard):
             lhs = LotHist.search([('lot',"=",l.lot.id),('quantity_type','=',self.w.lot_state.id)])
             if lhs:
                 lh = lhs[0]
-            else: 
+            else: 
-                lh = LotHist()
+                lh = LotHist()
-            lh.lot = l.lot
+            lh.lot = l.lot
-            lh.quantity_type = self.w.lot_state
+            lh.quantity_type = self.w.lot_state
-            lh.quantity = round(l.lot_quantity_new,5)
+            lh.quantity = round(l.lot_quantity_new,5)
-            lh.gross_quantity = round(l.lot_gross_quantity_new,5)
+            lh.gross_quantity = round(l.lot_gross_quantity_new,5)
-            LotHist.save([lh])
+            LotHist.save([lh])
-            
+            l.lot.lot_qt = l.lot_qt
-            if self.w.lot_update_state :
+            
-                l.lot.lot_state = self.w.lot_state
+            if self.w.lot_update_state :
-            Lot.save([l.lot])
+                l.lot.lot_state = self.w.lot_state
+            Lot.save([l.lot])
             diff = round(Decimal(l.lot.get_current_quantity_converted() - quantity),5)
             if diff != 0 :
                 #need to update virtual part
@@ -3105,12 +3130,13 @@ class LotWeighingLot(ModelView):
     lot_name = fields.Char("Name",readonly=True)
     lot_shipment_in = fields.Many2One('stock.shipment.in',"Shipment In")
     lot_shipment_internal = fields.Many2One('stock.shipment.internal',"Shipment Internal")
-    lot_shipment_out = fields.Many2One('stock.shipment.out',"Shipment Out")
+    lot_shipment_out = fields.Many2One('stock.shipment.out',"Shipment Out")
-    lot_product = fields.Many2One('product.product',"Product",readonly=True)
+    lot_product = fields.Many2One('product.product',"Product",readonly=True)
-    lot_quantity = fields.Numeric("Net weight",digits=(1,5),readonly=True)
+    lot_qt = fields.Integer("Qt")
-    lot_gross_quantity = fields.Numeric("Gross weight",digits=(1,5),readonly=True)
+    lot_quantity = fields.Numeric("Net weight",digits=(1,5),readonly=True)
-    lot_unit = fields.Many2One('product.uom',"Unit",readonly=True)
+    lot_gross_quantity = fields.Numeric("Gross weight",digits=(1,5),readonly=True)
-    lot_unit_line = fields.Many2One('product.uom',"Unit",readonly=True)
+    lot_unit = fields.Many2One('product.uom',"Unit",readonly=True)
+    lot_unit_line = fields.Many2One('product.uom',"Unit",readonly=True)
     lot_quantity_new = fields.Numeric("New net weight",digits=(1,5))
     lot_gross_quantity_new = fields.Numeric("New gross weight",digits=(1,5))
     lot_shipment_origin = fields.Function(
@@ -3154,37 +3180,55 @@ class CreateContracts(Wizard):
     def transition_start(self):
         return 'ct'
         
-    def default_ct(self, fields):
+    def default_ct(self, fields):
-        LotQt = Pool().get('lot.qt')
+        LotQt = Pool().get('lot.qt')
-        Lot = Pool().get('lot.lot')
+        Lot = Pool().get('lot.lot')
-        context = Transaction().context
+        context = Transaction().context
-        ids = context.get('active_ids')
+        ids = context.get('active_ids')
         unit = None
         product = None
         sh_in = None
         sh_int = None
-        sh_out = None
+        sh_out = None
-        lot = None
+        lot = None
-        qt = None
+        qt = Decimal(0)
-        type = None
+        type = None
-        for i in ids:
+        shipment_in_values = set()
-            val = {}
+        shipment_internal_values = set()
-            if i < 10000000:
+        shipment_out_values = set()
-                raise UserError("You must create contract from an open quantity !")
+        for i in ids:
-            l = LotQt(i - 10000000)
+            if i < 10000000:
-            ll = Lot(l.lot_p if l.lot_p else l.lot_s)
+                raise UserError("You must create contract from an open quantity !")
-            type = "Sale" if l.lot_p else "Purchase"
+            l = LotQt(i - 10000000)
-            unit = l.lot_unit.id
+            ll = Lot(l.lot_p if l.lot_p else l.lot_s)
-            qt = l.lot_quantity
+            current_type = "Sale" if l.lot_p else "Purchase"
-            product = ll.lot_product.id
+            if type and current_type != type:
-            sh_in = l.lot_shipment_in.id if l.lot_shipment_in else None
+                raise UserError("You must select open quantities from the same side.")
-            sh_int = l.lot_shipment_internal.id if l.lot_shipment_internal else None
+            type = current_type
-            sh_out = l.lot_shipment_out.id if l.lot_shipment_out else None
+            if product and ll.lot_product.id != product:
-            lot = ll.id
+                raise UserError("You must select open quantities with the same product.")
-            
+            if unit and l.lot_unit.id != unit:
-        return {
+                raise UserError("You must select open quantities with the same unit.")
-            'quantity': qt,
+            unit = l.lot_unit.id
-            'unit': unit,
+            qt += abs(Decimal(str(l.lot_quantity or 0)))
+            product = ll.lot_product.id
+            shipment_in_values.add(l.lot_shipment_in.id if l.lot_shipment_in else None)
+            shipment_internal_values.add(
+                l.lot_shipment_internal.id if l.lot_shipment_internal else None)
+            shipment_out_values.add(l.lot_shipment_out.id if l.lot_shipment_out else None)
+            if lot is None:
+                lot = ll.id
+
+        if len(shipment_in_values) == 1:
+            sh_in = next(iter(shipment_in_values))
+        if len(shipment_internal_values) == 1:
+            sh_int = next(iter(shipment_internal_values))
+        if len(shipment_out_values) == 1:
+            sh_out = next(iter(shipment_out_values))
+            
+        return {
+            'quantity': qt,
+            'unit': unit,
             'product': product,
             'shipment_in': sh_in,
             'shipment_internal': sh_int,
@@ -3359,4 +3403,4 @@ class ContractDetail(ModelView):
         if self.del_period:
             self.from_del = self.del_period.beg_date
             self.to_del = self.del_period.end_date
-    
+    

modules/purchase_trade/party.py

@@ -7,17 +7,74 @@ from decimal import getcontext, Decimal, ROUND_HALF_UP
 from sql import Table
 from trytond.pyson import Bool, Eval, Id, If
 
-class PartyExecution(ModelSQL,ModelView):
+class PartyExecution(ModelSQL,ModelView):
-    "Party Execution"
+    "Party Execution"
-    __name__ = 'party.execution'
+    __name__ = 'party.execution'
 
     party = fields.Many2One('party.party',"Party")
-    area = fields.Many2One('country.region',"Area")
+    area = fields.Many2One('country.region',"Area")
-    percent = fields.Numeric("% targeted")
+    percent = fields.Numeric("% targeted")
-    achieved_percent = fields.Function(fields.Numeric("% achieved"),'get_percent')
+    achieved_percent = fields.Function(fields.Numeric("% achieved"),'get_percent')
-
+
-    def get_percent(self,name):
+    @staticmethod
-        return 2
+    def _to_decimal(value):
+        if value is None:
+            return Decimal('0')
+        if isinstance(value, Decimal):
+            return value
+        return Decimal(str(value))
+
+    @classmethod
+    def _round_percent(cls, value):
+        return cls._to_decimal(value).quantize(
+            Decimal('0.01'), rounding=ROUND_HALF_UP)
+
+    def matches_country(self, country):
+        if not self.area or not country or not getattr(country, 'region', None):
+            return False
+        region = country.region
+        while region:
+            if region.id == self.area.id:
+                return True
+            region = getattr(region, 'parent', None)
+        return False
+
+    def matches_shipment(self, shipment):
+        location = getattr(shipment, 'to_location', None)
+        country = getattr(location, 'country', None)
+        return self.matches_country(country)
+
+    @classmethod
+    def compute_achieved_percent_for(cls, party, area):
+        if not party or not area:
+            return Decimal('0')
+        Shipment = Pool().get('stock.shipment.in')
+        shipments = Shipment.search([
+                ('controller', '!=', None),
+                ])
+        execution = cls()
+        execution.area = area
+        shipments = [
+            shipment for shipment in shipments
+            if execution.matches_shipment(shipment)]
+        total = len(shipments)
+        if not total:
+            return Decimal('0')
+        achieved = sum(
+            1 for shipment in shipments
+            if shipment.controller and shipment.controller.id == party.id)
+        return cls._round_percent(
+            (Decimal(achieved) * Decimal('100')) / Decimal(total))
+
+    def compute_achieved_percent(self):
+        return self.__class__.compute_achieved_percent_for(
+            self.party, self.area)
+
+    def get_target_gap(self):
+        return self._to_decimal(self.percent) - self.compute_achieved_percent()
+
+    def get_percent(self,name):
+        return self.compute_achieved_percent()
 
 class PartyExecutionSla(ModelSQL,ModelView):
     "Party Execution Sla"
@@ -55,8 +112,8 @@ class PartyExecutionPlace(ModelSQL,ModelView):
             'readonly': Eval('mode') != 'ppack',
             })
     
-class Party(metaclass=PoolMeta):
+class Party(metaclass=PoolMeta):
-    __name__ = 'party.party'
+    __name__ = 'party.party'
 
     tol_min = fields.Numeric("Tol - in %")
     tol_max = fields.Numeric("Tol + in %")
@@ -65,13 +122,25 @@ class Party(metaclass=PoolMeta):
     origin =fields.Char("Origin")
     execution = fields.One2Many('party.execution','party',"")
     sla = fields.One2Many('party.execution.sla','party', "Sla")
-    initial = fields.Char("Initials")
+    initial = fields.Char("Initials")
-
+
-    def IsAvailableForControl(self,sh):
+    def IsAvailableForControl(self,sh):
-        return True
+        return True
-    
+
-    def get_sla_cost(self,location):
+    def get_controller_execution_priority(self, shipment):
-        if self.sla:
+        best_rule = None
+        best_gap = None
+        for execution in self.execution or []:
+            if not execution.matches_shipment(shipment):
+                continue
+            gap = execution.get_target_gap()
+            if best_gap is None or gap > best_gap:
+                best_gap = gap
+                best_rule = execution
+        return best_gap, best_rule
+    
+    def get_sla_cost(self,location):
+        if self.sla:
             for sla in self.sla:
                 SlaPlace = Pool().get('party.execution.place')
                 sp = SlaPlace.search([('pes','=', sla.id),('location','=',location)])
@@ -111,4 +180,4 @@ class Party(metaclass=PoolMeta):
                     pc.category = cat[0].id
                     PartyCategory.save([pc])
             return p
-    
+    

modules/purchase_trade/pricing.py

@@ -325,20 +325,20 @@ class Component(ModelSQL, ModelView):
 
         super(Component, cls).delete(components)
 
-class Pricing(ModelSQL,ModelView):
+class Pricing(ModelSQL,ModelView):
-    "Pricing"
+    "Pricing"
-    __name__ = 'pricing.pricing'
+    __name__ = 'pricing.pricing'
-
+
-    pricing_date = fields.Date("Date")
+    pricing_date = fields.Date("Date")
-    price_component = fields.Many2One('pricing.component', "Component")#, domain=[('id', 'in', Eval('line.price_components'))], ondelete='CASCADE')
+    price_component = fields.Many2One('pricing.component', "Component")#, domain=[('id', 'in', Eval('line.price_components'))], ondelete='CASCADE')
-    quantity = fields.Numeric("Qt",digits='unit')
+    quantity = fields.Numeric("Qt",digits='unit')
-    settl_price = fields.Numeric("Settl. price",digits='unit')
+    settl_price = fields.Numeric("Settl. price",digits='unit')
-    fixed_qt = fields.Numeric("Fixed qt",digits='unit',readonly=True)
+    fixed_qt = fields.Numeric("Fixed qt",digits='unit', readonly=True)
-    fixed_qt_price = fields.Numeric("Fixed qt price",digits='unit',readonly=True)
+    fixed_qt_price = fields.Numeric("Fixed qt price",digits='unit', readonly=True)
-    unfixed_qt = fields.Numeric("Unfixed qt",digits='unit',readonly=True)
+    unfixed_qt = fields.Numeric("Unfixed qt",digits='unit', readonly=True)
-    unfixed_qt_price = fields.Numeric("Unfixed qt price",digits='unit',readonly=True)
+    unfixed_qt_price = fields.Numeric("Unfixed qt price",digits='unit', readonly=True)
-    eod_price = fields.Numeric("EOD price",digits='unit',readonly=True)
+    eod_price = fields.Numeric("EOD price",digits='unit',readonly=True)
-    last = fields.Boolean("Last")
+    last = fields.Boolean("Last")
     
     @classmethod
     def default_fixed_qt(cls):
@@ -364,24 +364,244 @@ class Pricing(ModelSQL,ModelView):
     def default_settl_price(cls):
         return Decimal(0)
 
-    @classmethod
+    @classmethod
-    def default_eod_price(cls):
+    def default_eod_price(cls):
-        return Decimal(0)
+        return Decimal(0)
-
+
-    def get_fixed_price(self):
+    @staticmethod
-        price = Decimal(0)
+    def _weighted_average_price(fixed_qt, fixed_price, unfixed_qt, unfixed_price):
-        Pricing = Pool().get('pricing.pricing')
+        fixed_qt = Decimal(str(fixed_qt or 0))
-        pricings = Pricing.search(['price_component','=',self.price_component.id],order=[('pricing_date', 'ASC')])
+        fixed_price = Decimal(str(fixed_price or 0))
-        if pricings:
+        unfixed_qt = Decimal(str(unfixed_qt or 0))
-            cumul_qt = Decimal(0)
+        unfixed_price = Decimal(str(unfixed_price or 0))
-            cumul_qt_price = Decimal(0)
+        total_qty = fixed_qt + unfixed_qt
-            for pr in pricings:
+        if total_qty == 0:
-                cumul_qt += pr.quantity
+            return Decimal(0)
-                cumul_qt_price += pr.quantity * pr.settl_price
+        return round(
-                if pr.id == self.id:
+            ((fixed_qt * fixed_price) + (unfixed_qt * unfixed_price)) / total_qty,
-                    break
+            4,
-            if cumul_qt > 0:
+        )
-                price = cumul_qt_price / cumul_qt
+
+    def compute_eod_price(self):
+        if getattr(self, 'sale_line', None) and hasattr(self, 'get_eod_price_sale'):
+            return self.get_eod_price_sale()
+        if getattr(self, 'line', None) and hasattr(self, 'get_eod_price_purchase'):
+            return self.get_eod_price_purchase()
+        return self._weighted_average_price(
+            self.fixed_qt,
+            self.fixed_qt_price,
+            self.unfixed_qt,
+            self.unfixed_qt_price,
+        )
+
+    @fields.depends('fixed_qt', 'fixed_qt_price', 'unfixed_qt', 'unfixed_qt_price')
+    def on_change_fixed_qt(self):
+        self.eod_price = self.compute_eod_price()
+
+    @fields.depends('fixed_qt', 'fixed_qt_price', 'unfixed_qt', 'unfixed_qt_price')
+    def on_change_fixed_qt_price(self):
+        self.eod_price = self.compute_eod_price()
+
+    @fields.depends('fixed_qt', 'fixed_qt_price', 'unfixed_qt', 'unfixed_qt_price')
+    def on_change_unfixed_qt(self):
+        self.eod_price = self.compute_eod_price()
+
+    @fields.depends('fixed_qt', 'fixed_qt_price', 'unfixed_qt', 'unfixed_qt_price')
+    def on_change_unfixed_qt_price(self):
+        self.eod_price = self.compute_eod_price()
+
+    @classmethod
+    def create(cls, vlist):
+        records = super(Pricing, cls).create(vlist)
+        cls._sync_manual_values(records)
+        cls._sync_manual_last(records)
+        cls._sync_eod_price(records)
+        return records
+
+    @classmethod
+    def write(cls, *args):
+        super(Pricing, cls).write(*args)
+        if (Transaction().context.get('skip_pricing_eod_sync')
+                or Transaction().context.get('skip_pricing_last_sync')):
+            return
+        records = []
+        actions = iter(args)
+        for record_set, values in zip(actions, actions):
+            if values:
+                records.extend(record_set)
+        cls._sync_manual_values(records)
+        cls._sync_manual_last(records)
+        cls._sync_eod_price(records)
+
+    @classmethod
+    def _sync_eod_price(cls, records):
+        if not records:
+            return
+        with Transaction().set_context(skip_pricing_eod_sync=True):
+            for record in records:
+                eod_price = record.compute_eod_price()
+                if Decimal(str(record.eod_price or 0)) == Decimal(str(eod_price or 0)):
+                    continue
+                super(Pricing, cls).write([record], {
+                    'eod_price': eod_price,
+                })
+
+    @classmethod
+    def _is_manual_pricing_record(cls, record):
+        component = getattr(record, 'price_component', None)
+        if component is None:
+            return True
+        return not bool(getattr(component, 'auto', False))
+
+    @classmethod
+    def _get_pricing_group_domain(cls, record):
+        component = getattr(record, 'price_component', None)
+        if getattr(record, 'sale_line', None):
+            return [
+                ('sale_line', '=', record.sale_line.id),
+                ('price_component', '=',
+                    component.id if getattr(component, 'id', None) else None),
+            ]
+        if getattr(record, 'line', None):
+            return [
+                ('line', '=', record.line.id),
+                ('price_component', '=',
+                    component.id if getattr(component, 'id', None) else None),
+            ]
+        return None
+
+    @classmethod
+    def _get_base_quantity(cls, record):
+        owner = getattr(record, 'sale_line', None) or getattr(record, 'line', None)
+        if not owner:
+            return Decimal(0)
+        if hasattr(owner, '_get_pricing_base_quantity'):
+            return Decimal(str(owner._get_pricing_base_quantity() or 0))
+        quantity = getattr(owner, 'quantity_theorical', None)
+        if quantity is None:
+            quantity = getattr(owner, 'quantity', None)
+        return Decimal(str(quantity or 0))
+
+    @classmethod
+    def _sync_manual_values(cls, records):
+        if (not records
+                or Transaction().context.get('skip_pricing_manual_sync')):
+            return
+        domains = []
+        seen = set()
+        for record in records:
+            if not cls._is_manual_pricing_record(record):
+                continue
+            domain = cls._get_pricing_group_domain(record)
+            if not domain:
+                continue
+            key = tuple(domain)
+            if key in seen:
+                continue
+            seen.add(key)
+            domains.append(domain)
+        if not domains:
+            return
+        with Transaction().set_context(
+                skip_pricing_manual_sync=True,
+                skip_pricing_last_sync=True,
+                skip_pricing_eod_sync=True):
+            for domain in domains:
+                pricings = cls.search(
+                    domain,
+                    order=[('pricing_date', 'ASC'), ('id', 'ASC')])
+                if not pricings:
+                    continue
+                base_quantity = cls._get_base_quantity(pricings[0])
+                cumul_qt = Decimal(0)
+                cumul_qt_price = Decimal(0)
+                total = len(pricings)
+                for index, pricing in enumerate(pricings):
+                    quantity = Decimal(str(pricing.quantity or 0))
+                    settl_price = Decimal(str(pricing.settl_price or 0))
+                    cumul_qt += quantity
+                    cumul_qt_price += quantity * settl_price
+                    fixed_qt = cumul_qt
+                    if fixed_qt > 0:
+                        fixed_qt_price = round(cumul_qt_price / fixed_qt, 4)
+                    else:
+                        fixed_qt_price = Decimal(0)
+                    unfixed_qt = base_quantity - fixed_qt
+                    if unfixed_qt < Decimal('0.001'):
+                        unfixed_qt = Decimal(0)
+                        fixed_qt = base_quantity
+                    values = {
+                        'fixed_qt': fixed_qt,
+                        'fixed_qt_price': fixed_qt_price,
+                        'unfixed_qt': unfixed_qt,
+                        'unfixed_qt_price': settl_price,
+                        'last': index == (total - 1),
+                    }
+                    eod_price = cls._weighted_average_price(
+                        values['fixed_qt'],
+                        values['fixed_qt_price'],
+                        values['unfixed_qt'],
+                        values['unfixed_qt_price'],
+                    )
+                    values['eod_price'] = eod_price
+                    super(Pricing, cls).write([pricing], values)
+
+    @classmethod
+    def _get_manual_last_group_domain(cls, record):
+        return cls._get_pricing_group_domain(record)
+
+    @classmethod
+    def _sync_manual_last(cls, records):
+        if not records:
+            return
+        domains = []
+        seen = set()
+        for record in records:
+            domain = cls._get_manual_last_group_domain(record)
+            if not domain:
+                continue
+            key = tuple(domain)
+            if key in seen:
+                continue
+            seen.add(key)
+            domains.append(domain)
+        if not domains:
+            return
+        with Transaction().set_context(
+                skip_pricing_last_sync=True,
+                skip_pricing_eod_sync=True):
+            for domain in domains:
+                pricings = cls.search(
+                    domain,
+                    order=[('pricing_date', 'ASC'), ('id', 'ASC')])
+                if not pricings:
+                    continue
+                last_pricing = pricings[-1]
+                for pricing in pricings[:-1]:
+                    if pricing.last:
+                        super(Pricing, cls).write([pricing], {'last': False})
+                if not last_pricing.last:
+                    super(Pricing, cls).write([last_pricing], {'last': True})
+
+    def get_fixed_price(self):
+        price = Decimal(0)
+        Pricing = Pool().get('pricing.pricing')
+        domain = self._get_pricing_group_domain(self)
+        if not domain:
+            return price
+        pricings = Pricing.search(domain, order=[('pricing_date', 'ASC'), ('id', 'ASC')])
+        if pricings:
+            cumul_qt = Decimal(0)
+            cumul_qt_price = Decimal(0)
+            for pr in pricings:
+                quantity = Decimal(str(pr.quantity or 0))
+                settl_price = Decimal(str(pr.settl_price or 0))
+                cumul_qt += quantity
+                cumul_qt_price += quantity * settl_price
+                if pr.id == self.id:
+                    break
+            if cumul_qt > 0:
+                price = cumul_qt_price / cumul_qt
         return round(price,4)
 
     

modules/purchase_trade/purchase.py

@@ -139,10 +139,14 @@ class Component(metaclass=PoolMeta):
         if self.line:
             return self.line.unit
 
-    def get_quota_purchase(self, name):
+    def get_quota_purchase(self, name):
-        if self.line:
+        if self.line:
-            if self.line.quantity:
+            quantity = getattr(self.line, 'quantity_theorical', None)
-                return round(self.line.quantity_theorical / (self.nbdays if self.nbdays > 0 else 1),5)
+            if quantity is None:
+                quantity = getattr(self.line, 'quantity', None)
+            if quantity is not None:
+                nbdays = self.nbdays if self.nbdays and self.nbdays > 0 else 1
+                return round(Decimal(quantity) / nbdays, 5)
        
 class Pricing(metaclass=PoolMeta):
     "Pricing"
@@ -151,14 +155,17 @@ class Pricing(metaclass=PoolMeta):
     line = fields.Many2One('purchase.line',"Lines")
     unit = fields.Function(fields.Many2One('product.uom',"Unit"),'get_unit_purchase')
 
-    def get_unit_purchase(self,name):
+    def get_unit_purchase(self,name):
-        if self.line:
+        if self.line:
-            return self.line.unit
+            return self.line.unit
-
+
-    def get_eod_price_purchase(self):
+    def get_eod_price_purchase(self):
-        if self.line:
+        return self._weighted_average_price(
-            return round((self.fixed_qt * self.fixed_qt_price + self.unfixed_qt * self.unfixed_qt_price)/Decimal(self.line.quantity_theorical),4)
+            self.fixed_qt,
-        return Decimal(0)
+            self.fixed_qt_price,
+            self.unfixed_qt,
+            self.unfixed_qt_price,
+        )
 
 class Summary(ModelSQL,ModelView):
     "Pricing summary"
@@ -289,8 +296,12 @@ class Purchase(metaclass=PoolMeta):
         'purchase',
         'Analytic Dimensions'
     )
-    trader = fields.Many2One('party.party',"Trader")
+    trader = fields.Many2One(
-    operator = fields.Many2One('party.party',"Operator")
+        'party.party', "Trader",
+        domain=[('categories.name', '=', 'TRADER')])
+    operator = fields.Many2One(
+        'party.party', "Operator",
+        domain=[('categories.name', '=', 'OPERATOR')])
     our_reference = fields.Char("Our Reference")
     company_visible = fields.Function(
         fields.Boolean("Visible"), 'on_change_with_company_visible')
@@ -384,16 +395,22 @@ class Purchase(metaclass=PoolMeta):
             return ''
     
     @property
-    def report_delivery(self):
+    def report_delivery(self):
-        del_date = 'PROMPT'
+        del_date = 'PROMPT'
-        if self.lines:
+        if self.lines:
-            if self.lines[0].estimated_date:
+            if self.lines[0].estimated_date:
-                delivery_date = [dd.estimated_date for dd in self.lines[0].estimated_date if dd.trigger=='deldate']
+                delivery_date = [dd.estimated_date for dd in self.lines[0].estimated_date if dd.trigger=='deldate']
-                if delivery_date:
+                if delivery_date:
-                    del_date = delivery_date[0]
+                    del_date = delivery_date[0]
-                    if del_date:
+                    if del_date:
-                        del_date = format_date_en(del_date)
+                        del_date = format_date_en(del_date)
-        return del_date
+        return del_date
+
+    @property
+    def report_delivery_period_description(self):
+        if self.lines and self.lines[0].del_period:
+            return self.lines[0].del_period.description or ''
+        return ''
     
     @property
     def report_payment_date(self):
@@ -543,14 +560,16 @@ class Purchase(metaclass=PoolMeta):
                     OpenPosition = Pool().get('open.position')
                     # OpenPosition.create_from_purchase_line(line)
                     
-                #line unit_price calculation
+                #line unit_price calculation
-                if line.price_type == 'basis' and line.lots: #line.price_pricing and line.price_components and 
+                if line.price_type == 'basis' and line.lots: #line.price_pricing and line.price_components and 
-                    unit_price = line.get_basis_price()
+                    previous_linked_price = line.linked_price
-                    logger.info("VALIDATEPURCHASE:%s",unit_price)
+                    line.sync_linked_price_from_basis()
-                    if unit_price != line.unit_price:
+                    unit_price = line.get_basis_price()
-                        line.unit_price = unit_price
+                    logger.info("VALIDATEPURCHASE:%s",unit_price)
-                        logger.info("VALIDATEPURCHASE2:%s",line.unit_price)
+                    if unit_price != line.unit_price or line.linked_price != previous_linked_price:
-                        Line.save([line])
+                        line.unit_price = unit_price
+                        logger.info("VALIDATEPURCHASE2:%s",line.unit_price)
+                        Line.save([line])
                 if line.price_type == 'efp':
                     if line.derivatives:
                         for d in line.derivatives:
@@ -1018,10 +1037,21 @@ class QualityAnalysis(ModelSQL,ModelView):
                 ))
         return " | ".join(filter(None, values))
 
-class Line(metaclass=PoolMeta):
+class Line(metaclass=PoolMeta):
-    __name__ = 'purchase.line'
+    __name__ = 'purchase.line'
-
+
-    quantity_theorical = fields.Numeric("Contractual Qt", digits='unit', readonly=False)
+    @classmethod
+    def default_pricing_rule(cls):
+        try:
+            Configuration = Pool().get('purchase_trade.configuration')
+        except KeyError:
+            return ''
+        configurations = Configuration.search([], limit=1)
+        if configurations:
+            return configurations[0].pricing_rule or ''
+        return ''
+
+    quantity_theorical = fields.Numeric("Contractual Qt", digits='unit', readonly=False)
     price_type = fields.Selection([
         ('cash', 'Cash Price'),
         ('priced', 'Priced'),
@@ -1076,18 +1106,23 @@ class Line(metaclass=PoolMeta):
     # ],"Certification",states={'readonly': (Eval('inherit_cer')),})
     certif = fields.Many2One('purchase.certification',"Certification",states={'readonly': (Eval('inherit_cer')),})
     inherit_cer = fields.Boolean("Inherit certification")
-    enable_linked_currency = fields.Boolean("Linked currencies")
+    enable_linked_currency = fields.Boolean("Linked currencies")
-    linked_price = fields.Numeric("Price", digits='unit',states={
+    linked_price = fields.Numeric("Price", digits='unit',states={
-            'invisible': (~Eval('enable_linked_currency')),
+            'invisible': (~Eval('enable_linked_currency')),
-            })
+            'required': Eval('enable_linked_currency'),
-    linked_currency = fields.Many2One('currency.linked',"Currency",states={
+            'readonly': Eval('price_type') == 'basis',
-            'invisible': (~Eval('enable_linked_currency')),
+            }, depends=['enable_linked_currency', 'price_type'])
-            })
+    linked_currency = fields.Many2One('currency.linked',"Currency",states={
-    linked_unit = fields.Many2One('product.uom', 'Unit',states={
+            'invisible': (~Eval('enable_linked_currency')),
-            'invisible': (~Eval('enable_linked_currency')),
+            'required': Eval('enable_linked_currency'),
-            })
+            }, depends=['enable_linked_currency'])
+    linked_unit = fields.Many2One('product.uom', 'Unit',states={
+            'invisible': (~Eval('enable_linked_currency')),
+            'required': Eval('enable_linked_currency'),
+            }, depends=['enable_linked_currency'])
     premium = fields.Numeric("Premium/Discount",digits='unit')
-    fee_ = fields.Many2One('fee.fee',"Fee")
+    fee_ = fields.Many2One('fee.fee',"Fee")
+    pricing_rule = fields.Text("Pricing description")
 
     attributes = fields.Dict(
         'product.attribute', 'Attributes',
@@ -1125,9 +1160,16 @@ class Line(metaclass=PoolMeta):
         ('umpire', 'Umpire'),
     ], "Type")
 
-    @classmethod
+    @classmethod
-    def default_finished(cls):
+    def default_finished(cls):
-        return False
+        return False
+
+    @property
+    def report_fixing_rule(self):
+        pricing_rule = ''
+        if self.pricing_rule:
+            pricing_rule = self.pricing_rule
+        return pricing_rule
 
     
     @fields.depends('product')
@@ -1198,55 +1240,166 @@ class Line(metaclass=PoolMeta):
             if self.tol_max and self.quantity_theorical:
                 return round((1+(self.tol_max/100))*Decimal(self.quantity_theorical),3)
 
-    def get_progress(self,name):
+    def get_progress(self,name):
-        PS = Pool().get('purchase.pricing.summary')
+        PS = Pool().get('purchase.pricing.summary')
-        ps = PS.search(['line','=',self.id])
+        ps = PS.search(['line','=',self.id])
-        if ps:
+        if ps:
-            return sum((e.progress if e.progress else 0) * (e.ratio if e.ratio else 0) / 100 for e in ps)
+            if not self.price_components:
+                manual = [e for e in ps if not e.price_component]
+                if manual:
+                    return manual[0].progress or 0
+            return sum((e.progress if e.progress else 0) * (e.ratio if e.ratio else 0) / 100 for e in ps)
 
-    def getVirtualLot(self):
+    def getVirtualLot(self):
-        if self.lots:
+        if self.lots:
-            return [l for l in self.lots if l.lot_type=='virtual'][0]                
+            return [l for l in self.lots if l.lot_type=='virtual'][0]                
-            
+
-    def get_basis_price(self):
+    def _get_linked_unit_factor(self):
-        price = Decimal(0)
+        if not (self.enable_linked_currency and self.linked_currency):
-        if self.terms:
+            return None
-            for t in self.terms:
+        factor = Decimal(self.linked_currency.factor or 0)
-                price += (t.manual_price if t.manual_price else Decimal(0))
+        if not factor:
-        else:
+            return None
-            for pc in self.price_components:
+        unit_factor = Decimal(1)
-                PP = Pool().get('purchase.pricing.summary')
+        if self.linked_unit:
-                pp = PP.search([('price_component','=',pc.id),('line','=',self.id)])
+            source_unit = getattr(self, 'unit', None)
-                if pp:
+            if not source_unit and self.product:
-                    price += pp[0].price * (pc.ratio / 100)
+                source_unit = self.product.purchase_uom or self.product.default_uom
-        return round(price,4)
+            if not source_unit:
+                return factor
+            Uom = Pool().get('product.uom')
+            unit_factor = Decimal(str(
+                Uom.compute_qty(source_unit, float(1), self.linked_unit) or 0))
+        return factor * unit_factor
+
+    def _linked_to_line_price(self, price):
+        factor = self._get_linked_unit_factor()
+        price = Decimal(price or 0)
+        if not factor:
+            return price
+        return round(price * factor, 4)
+
+    def _line_to_linked_price(self, price):
+        factor = self._get_linked_unit_factor()
+        price = Decimal(price or 0)
+        if not factor:
+            return price
+        return round(price / factor, 4)
+
+    def _get_premium_price(self):
+        premium = Decimal(self.premium or 0)
+        if not premium:
+            return Decimal(0)
+        if self.enable_linked_currency and self.linked_currency:
+            return self._linked_to_line_price(premium)
+        return premium
+
+    def _get_basis_component_price(self):
+        price = Decimal(0)
+        if self.terms:
+            for t in self.terms:
+                price += (t.manual_price if t.manual_price else Decimal(0))
+        else:
+            if not self.price_components:
+                PP = Pool().get('purchase.pricing.summary')
+                pp = PP.search([
+                    ('line', '=', self.id),
+                    ('price_component', '=', None),
+                ], limit=1)
+                if pp:
+                    return round(Decimal(pp[0].price or 0), 4)
+            for pc in self.price_components:
+                PP = Pool().get('purchase.pricing.summary')
+                pp = PP.search([('price_component','=',pc.id),('line','=',self.id)])
+                if pp:
+                    price += pp[0].price * (pc.ratio / 100)
+        return round(price,4)
+
+    def get_basis_price(self):
+        return round(self._get_basis_component_price(), 4)
+
+    def sync_linked_price_from_basis(self):
+        if self.enable_linked_currency and self.linked_currency:
+            self.linked_price = self._line_to_linked_price(
+                self._get_basis_component_price())
+
+    def get_price(self,lot_premium=0):
+        return round(
+            Decimal(self.unit_price or 0)
+            + Decimal(lot_premium or 0),
+            4)
+
+    def get_price_linked_currency(self,lot_premium=0):
+        return round(
+            self._linked_to_line_price(
+                Decimal(self.linked_price or 0)
+                + Decimal(lot_premium or 0)),
+            4)
 
-    def get_price(self,lot_premium=0):
+    @fields.depends('id','unit','quantity','unit_price','price_pricing','price_type','price_components','estimated_date','lots','fees','enable_linked_currency','linked_price','linked_currency','linked_unit')
-        return (self.unit_price + Decimal(lot_premium)) if self.unit_price else Decimal(0) + (self.premium if self.premium else Decimal(0))
+    def on_change_with_unit_price(self, name=None):
-
+        Date = Pool().get('ir.date')
-    def get_price_linked_currency(self,lot_premium=0):
+        logger.info("ONCHANGEUNITPRICE:%s",self.unit_price)
-        if self.linked_unit:
+        if self.price_type == 'basis':
-            Uom = Pool().get('product.uom')
+            self.sync_linked_price_from_basis()
-            qt = Uom.compute_qty(self.unit, float(1), self.linked_unit)
+            price = self.get_basis_price()
-            return round(((self.linked_price + Decimal(lot_premium) + (self.premium if self.premium else Decimal(0))) * self.linked_currency.factor) * Decimal(qt), 4)
+            logger.info("ONCHANGEUNITPRICE_IN:%s",price)
-        else:
+            return price
-            return round((self.linked_price + Decimal(lot_premium) + (self.premium if self.premium else Decimal(0))) * self.linked_currency.factor, 4)
+        if self.enable_linked_currency and self.linked_price and self.linked_currency and self.price_type == 'priced':
-
+            return self.get_price_linked_currency()
-    @fields.depends('id','unit','quantity','unit_price','price_pricing','price_type','price_components','premium','estimated_date','lots','fees','enable_linked_currency','linked_price','linked_currency','linked_unit')
+        if self.price_type == 'efp':
-    def on_change_with_unit_price(self, name=None):
+            if hasattr(self, 'derivatives') and self.derivatives:
-        Date = Pool().get('ir.date')
+                for d in self.derivatives:
-        logger.info("ONCHANGEUNITPRICE:%s",self.unit_price)
+                    return round(d.price_index.get_price(Date.today(),self.unit,self.purchase.currency,True),4)
-        if self.price_type == 'basis' and self.lots: #self.price_pricing and self.price_components and
+        return self.get_price()
-            price = self.get_basis_price()
+
-            logger.info("ONCHANGEUNITPRICE_IN:%s",price)
+    @fields.depends(
-            return price
+        'type', 'quantity', 'unit_price', 'unit', 'product',
-        if self.enable_linked_currency and self.linked_price and self.linked_currency and self.price_type == 'priced':
+        'purchase', '_parent_purchase.currency',
-            return self.get_price_linked_currency()
+        'premium', 'enable_linked_currency', 'linked_currency', 'linked_unit')
-        if self.price_type == 'efp':
+    def on_change_with_amount(self):
-            if hasattr(self, 'derivatives') and self.derivatives:
+        if (self.type == 'line'
-                for d in self.derivatives:
+                and self.quantity is not None
-                    return round(d.price_index.get_price(Date.today(),self.unit,self.purchase.currency,True),4)
+                and self.unit_price is not None):
-        return self.unit_price
+            currency = self.purchase.currency if self.purchase else None
+            amount = Decimal(str(self.quantity)) * (
+                Decimal(self.unit_price or 0) + self._get_premium_price())
+            if currency:
+                return currency.round(amount)
+            return amount
+        return Decimal(0)
+
+    @fields.depends(
+        'unit', 'product', 'price_type', 'enable_linked_currency',
+        'linked_currency', 'linked_unit', 'linked_price', 'premium',
+        methods=['on_change_with_unit_price', 'on_change_with_amount'])
+    def _recompute_trade_price_fields(self):
+        self.unit_price = self.on_change_with_unit_price()
+        self.amount = self.on_change_with_amount()
+
+    @fields.depends(methods=['_recompute_trade_price_fields'])
+    def on_change_premium(self):
+        self._recompute_trade_price_fields()
+
+    @fields.depends(methods=['_recompute_trade_price_fields'])
+    def on_change_price_type(self):
+        self._recompute_trade_price_fields()
+
+    @fields.depends(methods=['_recompute_trade_price_fields'])
+    def on_change_enable_linked_currency(self):
+        self._recompute_trade_price_fields()
+
+    @fields.depends(methods=['_recompute_trade_price_fields'])
+    def on_change_linked_price(self):
+        self._recompute_trade_price_fields()
+
+    @fields.depends(methods=['_recompute_trade_price_fields'])
+    def on_change_linked_currency(self):
+        self._recompute_trade_price_fields()
+
+    @fields.depends(methods=['_recompute_trade_price_fields'])
+    def on_change_linked_unit(self):
+        self._recompute_trade_price_fields()
 
     @classmethod
     def write(cls, *args):
@@ -1493,23 +1646,13 @@ class Line(metaclass=PoolMeta):
 
         if self.price_components:
             for pc in self.price_components:
-                if not pc.auto:
+                if not pc.auto:
-                    Pricing = Pool().get('pricing.pricing')
+                    Pricing = Pool().get('pricing.pricing')
-                    pricings = Pricing.search(['price_component','=',pc.id],order=[('pricing_date', 'ASC')])
+                    pricings = Pricing.search(['price_component','=',pc.id],order=[('pricing_date', 'ASC')])
-                    if pricings:
+                    if pricings:
-                        cumul_qt = Decimal(0)
+                        Pricing._sync_manual_values(pricings)
-                        index = 0
+                        Pricing._sync_manual_last(pricings)
-                        for pr in pricings:
+                        Pricing._sync_eod_price(pricings)
-                            cumul_qt += pr.quantity
-                            pr.fixed_qt = cumul_qt
-                            pr.fixed_qt_price = pr.get_fixed_price()
-                            pr.unfixed_qt = Decimal(pr.line.quantity_theorical) - pr.fixed_qt
-                            pr.unfixed_qt_price = pr.fixed_qt_price
-                            pr.eod_price = pr.get_eod_price_purchase()
-                            if index == len(pricings) - 1:
-                                pr.last = True
-                            index += 1
-                            Pricing.save([pr])
                             
                 if pc.triggers and pc.auto:
                     prDate = []
@@ -1540,9 +1683,9 @@ class Line(metaclass=PoolMeta):
                 i += 1
             return lprice
 
-    def getnearprice(self,pl,d,t,max_date=None):
+    def getnearprice(self,pl,d,t,max_date=None):
-        if pl:
+        if pl:
-            pl_sorted = sorted(pl, key=lambda x: x['date'])
+            pl_sorted = sorted(pl, key=lambda x: x['date'])
             pminus = pl_sorted[0]
             if not max_date:
                 max_date = d.date()
@@ -1557,17 +1700,24 @@ class Line(metaclass=PoolMeta):
                         return pminus[t]
                     else:
                         return Decimal(0)
-                pminus = p
+                pminus = p
-            return pl_sorted[len(pl)-1][t]
+            return pl_sorted[len(pl)-1][t]
-        return Decimal(0)
+        return Decimal(0)
-
+
-    def generate_pricing(self,pc,dl,pl):
+    def _get_pricing_base_quantity(self):
-        Pricing = Pool().get('pricing.pricing')
+        quantity = self.quantity_theorical
-        pricing = Pricing.search(['price_component','=',pc.id])
+        if quantity is None:
-        if pricing:
+            quantity = self.quantity
-            Pricing.delete(pricing)
+        return Decimal(str(quantity or 0))
-        cumul_qt = 0
+
-        index = 0
+    def generate_pricing(self,pc,dl,pl):
+        Pricing = Pool().get('pricing.pricing')
+        pricing = Pricing.search(['price_component','=',pc.id])
+        if pricing:
+            Pricing.delete(pricing)
+        base_quantity = self._get_pricing_base_quantity()
+        cumul_qt = 0
+        index = 0
         dl_sorted = sorted(dl)
         for d in dl_sorted:
             if pc.pricing_date and d.date() > pc.pricing_date:
@@ -1582,16 +1732,16 @@ class Line(metaclass=PoolMeta):
             if price > 0:
                 cumul_qt += pc.quota
             p.fixed_qt = round(Decimal(cumul_qt),5)
-            p.fixed_qt_price = round(Decimal(self.getnearprice(pl,d,'avg')),4)
+            p.fixed_qt_price = round(Decimal(self.getnearprice(pl,d,'avg')),4)
-            #p.fixed_qt_price = p.get_fixed_price()
+            #p.fixed_qt_price = p.get_fixed_price()
-            if p.fixed_qt_price == 0:
+            if p.fixed_qt_price == 0:
-                p.fixed_qt_price = round(Decimal(self.getnearprice(pl,d,'avg_minus_1')),4)
+                p.fixed_qt_price = round(Decimal(self.getnearprice(pl,d,'avg_minus_1')),4)
-            p.unfixed_qt = round(Decimal(self.quantity_theorical) - Decimal(cumul_qt),5)
+            p.unfixed_qt = round(base_quantity - Decimal(cumul_qt),5)
-            if p.unfixed_qt < 0.001:
+            if p.unfixed_qt < 0.001:
-                p.unfixed_qt = Decimal(0)
+                p.unfixed_qt = Decimal(0)
-                p.fixed_qt = Decimal(self.quantity_theorical)
+                p.fixed_qt = base_quantity
-            if price > 0:
+            if price > 0:
-                p.unfixed_qt_price = price
+                p.unfixed_qt_price = price
             else:
                 pr = Decimal(pc.price_index.get_price(p.pricing_date,self.unit,self.purchase.currency,True))
                 pr = round(pr,4)

modules/purchase_trade/service.py

@@ -4,6 +4,7 @@ import logging
 
 from trytond.pool import Pool
 from trytond.transaction import Transaction
+from trytond.exceptions import UserError
 
 logger = logging.getLogger(__name__)
 
@@ -35,16 +36,11 @@ class ContractFactory:
         Date = pool.get('ir.date')
 
         created = []
-
+        sources = cls._get_sources(ct, type_)
-        base_contract = (
+        base_contract = cls._get_base_contract(sources, ct, type_)
-            ct.lot.sale_line.sale
-            if type_ == 'Purchase'
-            else ct.lot.line.purchase
-        )
 
         for c in contracts:
             contract = Purchase() if type_ == 'Purchase' else Sale()
-            line = PurchaseLine() if type_ == 'Purchase' else SaleLine()
 
             # ---------- CONTRACT ----------
             parts = c.currency_unit.split("_")
@@ -79,33 +75,34 @@ class ContractFactory:
 
             contract.save()
 
-            # ---------- LINE ----------
+            line_sources = cls._get_line_sources(c, sources, ct)
-            line.quantity = c.quantity
+            for source in line_sources:
-            line.quantity_theorical = c.quantity
+                line = PurchaseLine() if type_ == 'Purchase' else SaleLine()
-            line.product = ct.product
-            line.unit = ct.unit
-            line.price_type = c.price_type
-            line.created_by_code = ct.matched
-            line.premium = Decimal(0)
 
-            if type_ == 'Purchase':
+                # ---------- LINE ----------
-                line.purchase = contract.id
+                line.quantity = source['quantity']
-            else:
+                line.quantity_theorical = source['quantity']
-                line.sale = contract.id
+                line.product = ct.product
+                line.unit = ct.unit
+                line.price_type = c.price_type
+                line.created_by_code = ct.matched
+                line.premium = Decimal(0)
 
-            cls._apply_price(line, c, parts)
+                if type_ == 'Purchase':
+                    line.purchase = contract.id
+                else:
+                    line.sale = contract.id
 
-            line.del_period = c.del_period
+                cls._apply_price(line, c, parts)
-            line.from_del = c.from_del
+                cls._apply_delivery(line, c, source)
-            line.to_del = c.to_del
 
-            line.save()
+                line.save()
 
-            logger.info("CREATE_ID:%s", contract.id)
+                logger.info("CREATE_ID:%s", contract.id)
-            logger.info("CREATE_LINE_ID:%s", line.id)
+                logger.info("CREATE_LINE_ID:%s", line.id)
 
-            if ct.matched:
+                if ct.matched:
-                cls._create_lot(line, c, ct, type_)
+                    cls._create_lot(line, c, source, type_)
 
             created.append(contract)
 
@@ -155,12 +152,124 @@ class ContractFactory:
         else:
             line.unit_price = c.price if c.price else Decimal(0)
 
+    @staticmethod
+    def _apply_delivery(line, c, source):
+        source_line = source.get('trade_line')
+        if source.get('use_source_delivery') and source_line:
+            line.del_period = getattr(source_line, 'del_period', None)
+            line.from_del = getattr(source_line, 'from_del', None)
+            line.to_del = getattr(source_line, 'to_del', None)
+            return
+        line.del_period = c.del_period
+        line.from_del = c.from_del
+        line.to_del = c.to_del
+
+    @staticmethod
+    def _normalize_quantity(quantity):
+        return abs(Decimal(str(quantity or 0))).quantize(Decimal('0.00001'))
+
+    @classmethod
+    def _get_base_contract(cls, sources, ct, type_):
+        if sources:
+            source_lot = sources[0]['lot']
+            return (
+                source_lot.sale_line.sale
+                if type_ == 'Purchase'
+                else source_lot.line.purchase
+            )
+        return (
+            ct.lot.sale_line.sale
+            if type_ == 'Purchase'
+            else ct.lot.line.purchase
+        )
+
+    @classmethod
+    def _get_sources(cls, ct, type_):
+        pool = Pool()
+        LotQt = pool.get('lot.qt')
+        context = Transaction().context or {}
+        active_ids = context.get('active_ids') or []
+        sources = []
+        if active_ids:
+            for record_id in active_ids:
+                if record_id < 10000000:
+                    continue
+                lqt = LotQt(record_id - 10000000)
+                lot = lqt.lot_p or lqt.lot_s
+                if not lot:
+                    continue
+                trade_line = (
+                    lot.sale_line if type_ == 'Purchase' else lot.line
+                )
+                sources.append({
+                    'lqt': lqt,
+                    'lot': lot,
+                    'trade_line': trade_line,
+                    'quantity': cls._normalize_quantity(lqt.lot_quantity),
+                    'shipment_origin': lqt.lot_shipment_origin,
+                })
+        elif getattr(ct, 'lot', None):
+            lot = ct.lot
+            trade_line = (
+                lot.sale_line if type_ == 'Purchase' else lot.line
+            )
+            sources.append({
+                'lqt': None,
+                'lot': lot,
+                'trade_line': trade_line,
+                'quantity': cls._normalize_quantity(getattr(ct, 'quantity', 0)),
+                'shipment_origin': cls._get_shipment_origin(ct),
+            })
+
+        cls._validate_sources(sources, type_)
+        return sources
+
+    @classmethod
+    def _validate_sources(cls, sources, type_):
+        if not sources:
+            return
+        first_line = sources[0]['trade_line']
+        for source in sources[1:]:
+            line = source['trade_line']
+            if bool(getattr(line, 'sale', None)) != bool(getattr(first_line, 'sale', None)):
+                raise UserError('Selected lots must all come from the same side.')
+            if getattr(line.product, 'id', None) != getattr(first_line.product, 'id', None):
+                raise UserError('Selected lots must share the same product.')
+            if getattr(line.unit, 'id', None) != getattr(first_line.unit, 'id', None):
+                raise UserError('Selected lots must share the same unit.')
+
+    @classmethod
+    def _get_line_sources(cls, contract_detail, sources, ct):
+        if not ct.matched or len(sources) <= 1:
+            quantity = cls._normalize_quantity(contract_detail.quantity)
+            source = sources[0] if sources else {
+                'lot': getattr(ct, 'lot', None),
+                'trade_line': None,
+                'shipment_origin': cls._get_shipment_origin(ct),
+            }
+            return [{
+                **source,
+                'quantity': quantity,
+                'use_source_delivery': False,
+            }]
+
+        selected_total = sum(source['quantity'] for source in sources)
+        requested = cls._normalize_quantity(contract_detail.quantity)
+        if requested != selected_total:
+            raise UserError(
+                'For multi-lot matched creation, quantity must equal the total selected open quantity.'
+            )
+        return [{
+            **source,
+            'use_source_delivery': True,
+        } for source in sources]
+
     # -------------------------------------------------------------------------
     # LOT / MATCHING (repris tel quel du wizard)
     # -------------------------------------------------------------------------
 
     @classmethod
-    def _create_lot(cls, line, c, ct, type_):
+    def _create_lot(cls, line, c, source, type_):
         pool = Pool()
         Lot = pool.get('lot.lot')
         LotQtHist = pool.get('lot.qt.hist')
@@ -192,10 +301,9 @@ class ContractFactory:
 
         lot.save()
 
-        vlot = ct.lot
+        vlot = source['lot']
-        shipment_origin = cls._get_shipment_origin(ct)
+        shipment_origin = source.get('shipment_origin')
-
+        qt = source['quantity']
-        qt = c.quantity
 
         if type_ == 'Purchase':
             if not lot.updateVirtualPart(qt, shipment_origin, vlot):

modules/purchase_trade/stock.py

@@ -6,7 +6,7 @@ from trytond.pyson import Bool, Eval, Id
 from trytond.model import (ModelSQL, ModelView)
 from trytond.tools import is_full_text, lstrip_wildcard
 from trytond.transaction import Transaction, inactive_records
-from decimal import getcontext, Decimal, ROUND_HALF_UP
+from decimal import getcontext, Decimal, ROUND_HALF_UP
 from sql.aggregate import Count, Max, Min, Sum, Avg, BoolOr
 from sql.conditionals import Case
 from sql import Column, Literal
@@ -23,8 +23,10 @@ import io
 import base64
 import logging
 import json
-import re
+import re
-import html
+import html
+from trytond.exceptions import UserError
+from trytond.modules.stock.shipment import SupplierShipping as BaseSupplierShipping
 
 
 logger = logging.getLogger(__name__)
@@ -387,8 +389,8 @@ class ShipmentWR(ModelSQL,ModelView):
     shipment_in = fields.Many2One('stock.shipment.in',"Shipment In")
     wr = fields.Many2One('weight.report',"WR")
 
-class ShipmentIn(metaclass=PoolMeta):
+class ShipmentIn(metaclass=PoolMeta):
-    __name__ = 'stock.shipment.in'
+    __name__ = 'stock.shipment.in'
 
     from_location = fields.Many2One('stock.location', 'From location')
     to_location = fields.Many2One('stock.location', 'To location')
@@ -439,9 +441,10 @@ class ShipmentIn(metaclass=PoolMeta):
         'shipment',
         'Container'
     )
-    shipment_wr = fields.One2Many('shipment.wr','shipment_in',"WR")
+    shipment_wr = fields.One2Many('shipment.wr','shipment_in',"WR")
-    controller = fields.Many2One('party.party',"Controller")
+    controller = fields.Many2One('party.party',"Controller")
-    controller_target = fields.Char("Targeted controller")
+    surveyor = fields.Many2One('party.party', "Surveyor")
+    controller_target = fields.Char("Targeted controller")
     send_instruction = fields.Boolean("Send instruction")
     instructions = fields.Text("Instructions")
     add_bl = fields.Boolean("Add BL")
@@ -459,9 +462,336 @@ class ShipmentIn(metaclass=PoolMeta):
             'send': {},
         })
 
-    def get_vessel_type(self,name=None):
+    def get_vessel_type(self,name=None):
-        if self.vessel:
+        if self.vessel:
-            return self.vessel.vessel_type
+            return self.vessel.vessel_type
+
+    def _get_report_primary_move(self):
+        moves = list(self.incoming_moves or self.moves or [])
+        return moves[0] if moves else None
+
+    def _get_report_primary_lot(self):
+        move = self._get_report_primary_move()
+        return getattr(move, 'lot', None) if move else None
+
+    def _get_report_trade_line(self):
+        lot = self._get_report_primary_lot()
+        if not lot:
+            return None
+        return getattr(lot, 'sale_line', None) or getattr(lot, 'line', None)
+
+    def _get_report_insurance_fee(self):
+        for fee in self.fees or []:
+            product = getattr(fee, 'product', None)
+            name = ((getattr(product, 'name', '') or '')).strip().lower()
+            if 'insurance' in name:
+                return fee
+        return None
+
+    def _get_report_incoming_amount_data(self):
+        total = Decimal('0.0')
+        currency = None
+        for move in (self.incoming_moves or []):
+            move_amount, move_currency = self._get_report_incoming_move_amount(
+                move)
+            total += move_amount
+            if not currency and move_currency:
+                currency = move_currency
+        return total, currency
+
+    def _get_report_incoming_move_amount(self, move):
+        quantity = Decimal(str(getattr(move, 'quantity', 0) or 0))
+        unit_price = getattr(move, 'unit_price', None)
+        if unit_price not in (None, ''):
+            move_currency = getattr(move, 'currency', None)
+            return quantity * Decimal(str(unit_price or 0)), move_currency
+
+        lot = getattr(move, 'lot', None)
+        line = getattr(lot, 'line', None) if lot else None
+        if not lot or not line:
+            return Decimal('0.0'), None
+
+        lot_quantity = Decimal(str(
+            lot.get_current_quantity_converted() or 0))
+        line_unit_price = Decimal(str(getattr(line, 'unit_price', 0) or 0))
+        trade = getattr(line, 'purchase', None)
+        line_currency = getattr(trade, 'currency', None) if trade else None
+        return lot_quantity * line_unit_price, line_currency
+
+    @staticmethod
+    def _get_report_currency_text(currency):
+        return (
+            getattr(currency, 'rec_name', None)
+            or getattr(currency, 'code', None)
+            or getattr(currency, 'symbol', None)
+            or '')
+
+    @staticmethod
+    def _format_report_amount(value):
+        if value in (None, ''):
+            return ''
+        value = Decimal(str(value or 0)).quantize(Decimal('0.01'))
+        return format(value, 'f')
+
+    @staticmethod
+    def _format_report_quantity(value, digits='0.001'):
+        if value in (None, ''):
+            return ''
+        quantity = Decimal(str(value or 0)).quantize(Decimal(digits))
+        text = format(quantity, 'f')
+        return text.rstrip('0').rstrip('.') or '0'
+
+    def _get_report_trade(self):
+        line = self._get_report_trade_line()
+        if not line:
+            return None
+        return getattr(line, 'sale', None) or getattr(line, 'purchase', None)
+
+    def _get_report_weight_totals(self):
+        net = Decimal('0')
+        gross = Decimal('0')
+        for move in (self.incoming_moves or self.moves or []):
+            lot = getattr(move, 'lot', None)
+            if lot:
+                lot_net = (
+                    lot.get_current_quantity()
+                    if hasattr(lot, 'get_current_quantity')
+                    else lot.get_current_quantity_converted()
+                    if hasattr(lot, 'get_current_quantity_converted')
+                    else getattr(move, 'quantity', 0)
+                )
+                lot_gross = (
+                    lot.get_current_gross_quantity()
+                    if hasattr(lot, 'get_current_gross_quantity')
+                    else lot_net
+                )
+                net += Decimal(str(lot_net or 0))
+                gross += Decimal(str(lot_gross or 0))
+            else:
+                quantity = Decimal(str(getattr(move, 'quantity', 0) or 0))
+                net += quantity
+                gross += quantity
+        return net, gross
+
+    @property
+    def report_product_name(self):
+        line = self._get_report_trade_line()
+        product = getattr(line, 'product', None) if line else None
+        if product:
+            return product.name or ''
+        move = self._get_report_primary_move()
+        product = getattr(move, 'product', None) if move else None
+        return getattr(product, 'name', '') or ''
+
+    @property
+    def report_product_description(self):
+        line = self._get_report_trade_line()
+        product = getattr(line, 'product', None) if line else None
+        if product:
+            return product.description or ''
+        move = self._get_report_primary_move()
+        product = getattr(move, 'product', None) if move else None
+        return getattr(product, 'description', '') or ''
+
+    @property
+    def report_insurance_footer_ref(self):
+        return self.bl_number or self.number or ''
+
+    @property
+    def report_insurance_certificate_number(self):
+        return self.bl_number or self.number or ''
+
+    @property
+    def report_insurance_account_of(self):
+        line = self._get_report_trade_line()
+        trade = getattr(line, 'sale', None) or getattr(line, 'purchase', None)
+        party = getattr(trade, 'party', None) if trade else None
+        if party:
+            return party.rec_name or ''
+        return getattr(self.supplier, 'rec_name', '') or ''
+
+    @property
+    def report_insurance_goods_description(self):
+        name = self.report_product_name
+        description = self.report_product_description
+        if description and description != name:
+            return ' - '.join(part for part in [name, description] if part)
+        return name or description
+
+    @property
+    def report_insurance_loading_port(self):
+        return getattr(self.from_location, 'name', '') or ''
+
+    @property
+    def report_insurance_discharge_port(self):
+        return getattr(self.to_location, 'name', '') or ''
+
+    @property
+    def report_insurance_transport(self):
+        if self.vessel and self.vessel.vessel_name:
+            return self.vessel.vessel_name
+        return self.transport_type or ''
+
+    @property
+    def report_insurance_amount(self):
+        insured_amount, insured_currency = self._get_report_incoming_amount_data()
+        if insured_amount:
+            insured_amount *= Decimal('1.10')
+            currency_text = self._get_report_currency_text(insured_currency)
+            amount_text = self._format_report_amount(insured_amount)
+            return ' '.join(part for part in [currency_text, amount_text] if part)
+
+        fee = self._get_report_insurance_fee()
+        if not fee:
+            return ''
+        currency = getattr(fee, 'currency', None)
+        currency_text = self._get_report_currency_text(currency)
+        amount = self._format_report_amount(fee.get_amount())
+        return ' '.join(part for part in [currency_text, amount] if part)
+
+    @property
+    def report_insurance_incoming_amount(self):
+        amount, currency = self._get_report_incoming_amount_data()
+        currency_text = self._get_report_currency_text(currency)
+        amount_text = self._format_report_amount(amount)
+        return ' '.join(part for part in [currency_text, amount_text] if part)
+
+    @property
+    def report_insurance_amount_insured(self):
+        amount, currency = self._get_report_incoming_amount_data()
+        insured_amount = amount * Decimal('1.10')
+        currency_text = self._get_report_currency_text(currency)
+        amount_text = self._format_report_amount(insured_amount)
+        return ' '.join(part for part in [currency_text, amount_text] if part)
+
+    @property
+    def report_insurance_surveyor(self):
+        if self.surveyor:
+            return self.surveyor.rec_name or ''
+        if self.controller:
+            return self.controller.rec_name or ''
+        fee = self._get_report_insurance_fee()
+        supplier = getattr(fee, 'supplier', None) if fee else None
+        return getattr(supplier, 'rec_name', '') or ''
+
+    @property
+    def report_insurance_contact_surveyor(self):
+        return self.report_insurance_surveyor
+
+    @property
+    def report_insurance_issue_place_and_date(self):
+        Date = Pool().get('ir.date')
+        address = None
+        if self.company and getattr(self.company, 'party', None):
+            address = self.company.party.address_get()
+        place = (
+            getattr(address, 'city', None)
+            or getattr(self.company.party, 'rec_name', None)
+            if self.company and getattr(self.company, 'party', None) else ''
+        ) or ''
+        today = Date.today()
+        date_text = today.strftime('%d-%m-%Y') if today else ''
+        return ', '.join(part for part in [place, date_text] if part)
+
+    @property
+    def report_packing_product_class(self):
+        return self.report_product_name
+
+    @property
+    def report_packing_contract_number(self):
+        trade = self._get_report_trade()
+        return (
+            getattr(trade, 'reference', None)
+            or getattr(trade, 'number', None)
+            or self.reference
+            or self.number
+            or '')
+
+    @property
+    def report_packing_invoice_qty(self):
+        quantity = self.quantity if self.quantity not in (None, '') else 0
+        return self._format_report_quantity(quantity)
+
+    @property
+    def report_packing_invoice_qty_unit(self):
+        unit = self.unit
+        return (
+            getattr(unit, 'symbol', None)
+            or getattr(unit, 'rec_name', None)
+            or '')
+
+    @property
+    def report_packing_origin(self):
+        trade = self._get_report_trade()
+        return (
+            getattr(trade, 'product_origin', None)
+            or getattr(self.from_location, 'name', None)
+            or '')
+
+    @property
+    def report_packing_product(self):
+        return self.report_product_name
+
+    @property
+    def report_packing_counterparty_name(self):
+        trade = self._get_report_trade()
+        party = getattr(trade, 'party', None) if trade else None
+        if party:
+            return party.rec_name or ''
+        return getattr(self.supplier, 'rec_name', '') or ''
+
+    @property
+    def report_packing_ship_name(self):
+        if self.vessel and self.vessel.vessel_name:
+            return self.vessel.vessel_name
+        return self.transport_type or ''
+
+    @property
+    def report_packing_loading_port(self):
+        return getattr(self.from_location, 'name', '') or ''
+
+    @property
+    def report_packing_destination_port(self):
+        return getattr(self.to_location, 'name', '') or ''
+
+    @property
+    def report_packing_chunk_number(self):
+        return self.bl_number or self.number or ''
+
+    @property
+    def report_packing_chunk_date(self):
+        if self.bl_date:
+            return self.bl_date.strftime('%d-%m-%Y')
+        return ''
+
+    @property
+    def report_packing_today_date(self):
+        Date = Pool().get('ir.date')
+        today = Date.today()
+        if not today:
+            return ''
+        return f"{today.strftime('%B')} {today.day}, {today.year}"
+
+    @property
+    def report_packing_weight_unit(self):
+        line = self._get_report_trade_line()
+        unit = getattr(line, 'unit', None) if line else None
+        if unit:
+            return (
+                getattr(unit, 'symbol', None)
+                or getattr(unit, 'rec_name', None)
+                or '')
+        return self.report_packing_invoice_qty_unit or 'KGS'
+
+    @property
+    def report_packing_gross_weight(self):
+        _, gross = self._get_report_weight_totals()
+        return self._format_report_quantity(gross)
+
+    @property
+    def report_packing_net_weight(self):
+        net, _ = self._get_report_weight_totals()
+        return self._format_report_quantity(net)
 
     def get_rec_name(self, name=None):
         if self.number:
@@ -487,16 +817,26 @@ class ShipmentIn(metaclass=PoolMeta):
             fee.price = price
             Fee.save([fee])
 
-    def get_controller(self):
+    def get_controller(self):
-        ControllerCategory = Pool().get('party.category')
+        ControllerCategory = Pool().get('party.category')
-        PartyCategory = Pool().get('party.party-party.category')
+        PartyCategory = Pool().get('party.party-party.category')
-        cc = ControllerCategory.search(['name','=','CONTROLLER'])
+        cc = ControllerCategory.search(['name','=','CONTROLLER'])
-        if cc:
+        if cc:
-            cc = cc[0]
+            cc = cc[0]
-            controllers = PartyCategory.search(['category','=',cc.id])
+            controllers = PartyCategory.search(['category','=',cc.id])
-            for c in controllers:
+            prioritized = []
-                if c.party.IsAvailableForControl(self):
+            for c in controllers:
-                    return c.party
+                if not c.party.IsAvailableForControl(self):
+                    continue
+                gap, rule = c.party.get_controller_execution_priority(self)
+                prioritized.append((
+                        1 if rule else 0,
+                        gap if gap is not None else Decimal('-999999'),
+                        c.party,
+                        ))
+            if prioritized:
+                prioritized.sort(key=lambda item: (item[0], item[1]), reverse=True)
+                return prioritized[0][2]
     
     def get_instructions_html(self,inv_date,inv_nb):
         vessel = self.vessel.vessel_name if self.vessel else ""
@@ -1878,7 +2218,7 @@ class Revaluate(Wizard):
 
         return 'end'
 
-class RevaluateStart(ModelView):
+class RevaluateStart(ModelView):
     "Revaluate"
     __name__ = 'account.revaluate.start'
     revaluation_date = fields.Date(
@@ -1892,5 +2232,73 @@ class RevaluateStart(ModelView):
         return Date.today()
 
     @classmethod
-    def default_delete_after(cls):
+    def default_delete_after(cls):
-        return False
+        return False
+
+
+class ShipmentTemplateReportMixin:
+
+    @classmethod
+    def _get_purchase_trade_configuration(cls):
+        Configuration = Pool().get('purchase_trade.configuration')
+        configurations = Configuration.search([], limit=1)
+        return configurations[0] if configurations else None
+
+    @classmethod
+    def _get_action_report_path(cls, action):
+        if isinstance(action, dict):
+            return action.get('report') or ''
+        return getattr(action, 'report', '') or ''
+
+    @classmethod
+    def _resolve_template_path(cls, field_name, default_prefix):
+        config = cls._get_purchase_trade_configuration()
+        template = getattr(config, field_name, '') if config else ''
+        template = (template or '').strip()
+        if not template:
+            raise UserError('No template found')
+        if '/' not in template:
+            return f'{default_prefix}/{template}'
+        return template
+
+    @classmethod
+    def _get_resolved_action(cls, action):
+        report_path = cls._resolve_configured_report_path(action)
+        if isinstance(action, dict):
+            resolved = dict(action)
+            resolved['report'] = report_path
+            return resolved
+        setattr(action, 'report', report_path)
+        return action
+
+    @classmethod
+    def _execute(cls, records, header, data, action):
+        resolved_action = cls._get_resolved_action(action)
+        return super()._execute(records, header, data, resolved_action)
+
+
+class ShipmentShippingReport(ShipmentTemplateReportMixin, BaseSupplierShipping):
+    __name__ = 'stock.shipment.in.shipping'
+
+    @classmethod
+    def _resolve_configured_report_path(cls, action):
+        return cls._resolve_template_path(
+            'shipment_shipping_report_template', 'stock')
+
+
+class ShipmentInsuranceReport(ShipmentTemplateReportMixin, BaseSupplierShipping):
+    __name__ = 'stock.shipment.in.insurance'
+
+    @classmethod
+    def _resolve_configured_report_path(cls, action):
+        return cls._resolve_template_path(
+            'shipment_insurance_report_template', 'stock')
+
+
+class ShipmentPackingListReport(ShipmentTemplateReportMixin, BaseSupplierShipping):
+    __name__ = 'stock.shipment.in.packing_list'
+
+    @classmethod
+    def _resolve_configured_report_path(cls, action):
+        return cls._resolve_template_path(
+            'shipment_packing_list_report_template', 'stock')

modules/purchase_trade/stock.xml

@@ -56,10 +56,34 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">stock.shipment.in,-1</field>
             <field name="action" ref="act_vf"/>
         </record>
-        <record model="ir.action.url" id="url_vessel_finder">
+        <record model="ir.action.url" id="url_vessel_finder">
-            <field name="name">Find Vessel</field>
+            <field name="name">Find Vessel</field>
-            <field name="url">https://www.vesselfinder.com</field>
+            <field name="url">https://www.vesselfinder.com</field>
-        </record>
+        </record>
+
+        <record model="ir.action.report" id="report_shipment_in_insurance">
+            <field name="name">Insurance</field>
+            <field name="model">stock.shipment.in</field>
+            <field name="report_name">stock.shipment.in.insurance</field>
+            <field name="report">stock/insurance.fodt</field>
+        </record>
+        <record model="ir.action.keyword" id="report_shipment_in_insurance_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">stock.shipment.in,-1</field>
+            <field name="action" ref="report_shipment_in_insurance"/>
+        </record>
+
+        <record model="ir.action.report" id="report_shipment_in_packing_list">
+            <field name="name">Packing List</field>
+            <field name="model">stock.shipment.in</field>
+            <field name="report_name">stock.shipment.in.packing_list</field>
+            <field name="report">stock/packing_list.fodt</field>
+        </record>
+        <record model="ir.action.keyword" id="report_shipment_in_packing_list_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">stock.shipment.in,-1</field>
+            <field name="action" ref="report_shipment_in_packing_list"/>
+        </record>
 
         <record model="ir.action.wizard" id="act_update_sof">
             <field name="name">Update with SoF PDF</field>
@@ -126,4 +150,4 @@ this repository contains the full copyright notices and license terms. -->
             id="menu_revaluate"/>
 
     </data>
-</tryton>
+</tryton>

modules/purchase_trade/tryton.cfg

@@ -1,8 +1,9 @@
 [tryton]
 version=7.2.7
-depends:
+depends:
-    ir
+    ir
-    purchase
+    price
+    purchase
     sale
     account_invoice
     stock
@@ -10,12 +11,13 @@ depends:
     lot
     document_incoming
     incoterm
-xml:
+xml:
-    purchase.xml
+    purchase.xml
-    sale.xml
+    sale.xml
-    lot.xml
+    lot.xml
-    pricing.xml
+    pricing.xml
-    stock.xml
+    configuration.xml
+    stock.xml
     workflow.xml
     lc.xml
     optional.xml
@@ -31,7 +33,8 @@ xml:
     global_reporting.xml
     derivative.xml
     valuation.xml
-    weight_report.xml
+    weight_report.xml
-    dimension.xml
+    dimension.xml
-    backtoback.xml
+    backtoback.xml
-    account.xml
+    invoice.xml
+    account.xml

modules/purchase_trade/valuation.xml

@@ -1,5 +1,25 @@
 <tryton>
     <data>
+        <record model="ir.ui.view" id="valuation_process_dimension_view_tree">
+            <field name="model">valuation.process.dimension</field>
+            <field name="type">tree</field>
+            <field name="name">valuation_process_dimension_tree</field>
+        </record>
+        <record model="ir.ui.view" id="valuation_process_dimension_view_form">
+            <field name="model">valuation.process.dimension</field>
+            <field name="type">form</field>
+            <field name="name">valuation_process_dimension_form</field>
+        </record>
+        <record model="ir.ui.view" id="valuation_process_start_view_form">
+            <field name="model">valuation.process.start</field>
+            <field name="type">form</field>
+            <field name="name">valuation_process_start_form</field>
+        </record>
+        <record model="ir.ui.view" id="valuation_process_result_view_form">
+            <field name="model">valuation.process.result</field>
+            <field name="type">form</field>
+            <field name="name">valuation_process_result_form</field>
+        </record>
         <record model="ir.ui.view" id="valuation_view_tree_sequence3">
             <field name="model">valuation.valuation</field>
             <field name="type">tree</field>
@@ -36,6 +56,10 @@
             <field name="res_model">valuation.report</field>
             <field name="context_model">valuation.report.context</field>
         </record>
+        <record model="ir.action.wizard" id="act_valuation_process">
+            <field name="name">Process valuation</field>
+            <field name="wiz_name">valuation.process</field>
+        </record>
         <record model="ir.action.act_window.view" id="act_valuation_form_view">
             <field name="sequence" eval="70"/>
             <field name="view" ref="valuation_view_list"/>
@@ -43,9 +67,18 @@
         </record>
 
         <menuitem
-            parent="purchase_trade.menu_global_reporting"
+            name="Valuation"
-            sequence="120"
+            sequence="98"
+            id="menu_valuation"/>
+        <menuitem
+            parent="menu_valuation"
+            sequence="10"
+            action="act_valuation_process"
+            id="menu_valuation_process"/>
+        <menuitem
+            parent="menu_valuation"
+            sequence="20"
             action="act_valuation_form"
             id="menu_valuation_form"/>
     </data>
-</tryton>
+</tryton>

modules/purchase_trade/view/configuration_form.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<form col="4">
+    <label name="pricing_rule"/>
+    <field name="pricing_rule" colspan="3"/>
+</form>

modules/purchase_trade/view/contract_detail_tree.xml

@@ -9,13 +9,13 @@
    <field name="tol_min"/>
    <field name="tol_max"/>
    <field name="price_type"/>
+   <field name="from_location"/>
+   <field name="to_location"/>
    <field name="payment_term"/>
    <field name="incoterm"/>
    <field name="crop"/>
    <field name="del_period"/>
    <field name="from_del"/>
    <field name="to_del"/>
-   <field name="from_location"/>
-   <field name="to_location"/>
    <field name="category" tree_invisible="1"/>
 </tree>

modules/purchase_trade/view/lot_report_list.xml

@@ -1,8 +1,9 @@
-<tree editable="1">
+<tree>
     <field name="r_lot_type" width="80">
         <prefix name="qt_icon"/>
     </field>
     <field name="r_lot_p" width="60"/>
+    <field name="r_del_period" width="110"/>
     <field name="r_supplier" width="90"/>
     <field name="r_purchase" width="120"/>
     <field name="r_lot_pur_inv" width="120"/>

modules/purchase_trade/view/lot_weighing_lot_tree.xml

@@ -4,6 +4,7 @@
    <field name="lot_shipment_origin"/>
    <field name="lot_product"/>
    <field name="lot_unit_line"/>
+   <field name="lot_qt"/>
    <field name="lot_quantity"/>
    <field name="lot_gross_quantity"/>
    <field name="lot_quantity_new"/>

modules/purchase_trade/view/purchase_line_form.xml

@@ -2,37 +2,37 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="/form/notebook/page[@id='general']/field[@name='unit']" position="after">
+    <xpath expr="/form/notebook/page[@id='general']/field[@name='unit']" position="after">
-        <newline/>
+        <newline/>
-        <label name="quantity_theorical"/>
+        <label name="quantity_theorical"/>
-        <field name="quantity_theorical"/>
+        <field name="quantity_theorical"/>
-        <label name="finished"/>
+        <label name="finished"/>
-        <field name="finished"/>
+        <field name="finished"/>
-        <newline/>
+        <newline/>
-        <label name="enable_linked_currency"/>
+        <label name="price_type"/>
-        <field name="enable_linked_currency"/>
+        <field name="price_type"/>
-        <newline/>
+        <label name="enable_linked_currency"/>
-        <label name="linked_price"/>
+        <field name="enable_linked_currency"/>
-        <field name="linked_price"/>
+        <newline/>
-        <label name="linked_currency"/>
+        <label name="linked_currency"/>
-        <field name="linked_currency"/>
+        <field name="linked_currency"/>
-        <label name="linked_unit"/>
+        <label name="linked_unit"/>
-        <field name="linked_unit"/>
+        <field name="linked_unit"/>
-        <newline/>
+        <newline/>
-    </xpath>
+        <label name="linked_price"/>
-    <xpath expr="/form/notebook/page[@id='general']/field[@name='amount']" position="after">
+        <field name="linked_price"/>
-        <newline/>
+        <label name="premium"/>
-        <label name="price_type"/>
+        <field name="premium"/>
-        <field name="price_type"/>
+        <newline/>
-        <label name="progress"/>
+    </xpath>
-        <field name="progress" widget="progressbar"/>
+    <xpath expr="/form/notebook/page[@id='general']/field[@name='amount']" position="after">
-        <newline/>
+        <newline/>
-        <label name="premium"/>
+        <label name="progress"/>
-        <field name="premium"/>
+        <field name="progress" widget="progressbar"/>
-        <newline/>
+        <newline/>
-        <label name="inherit_tol"/>
+        <label name="inherit_tol"/>
-        <field name="inherit_tol"/>
+        <field name="inherit_tol"/>
-        <newline/>
+        <newline/>
         <label name="tol_min"/>
         <field name="tol_min"/>
         <label name="tol_min_v"/>
@@ -93,11 +93,15 @@ this repository contains the full copyright notices and license terms. -->
                 <page string="Pricing dates" col="4" id="pricing_date">
                     <field name="price_pricing" />
                 </page>
-                <page string="Summary" col="4" id="summary">
+                <page string="Summary" col="4" id="summary">
-                    <field name="price_summary" />
+                    <field name="price_summary" />
-                </page>
+                </page>
-            </notebook>
+                <page string="Report" col="4" id="report">
-        </page>
+                    <label name="pricing_rule" />
+                    <field name="pricing_rule" />
+                </page>
+            </notebook>
+        </page>
         <page string="Estimated dates" col="4" id="estimated">
             <field name="estimated_date" />
         </page>
@@ -105,4 +109,4 @@ this repository contains the full copyright notices and license terms. -->
             <field name="optional" />
         </page>
     </xpath>
-</data>
+</data>

modules/purchase_trade/view/purchase_line_tree_sequence.xml

@@ -7,4 +7,7 @@ this repository contains the full copyright notices and license terms. -->
         <field name="from_del"/>
         <field name="to_del"/>
     </xpath>
-</data>
+    <xpath expr="//field[@name='unit_price']" position="after">
+        <field name="premium"/>
+    </xpath>
+</data>

modules/purchase_trade/view/sale_line_form.xml

@@ -2,37 +2,37 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="/form/notebook/page[@id='general']/field[@name='unit']" position="after">
+    <xpath expr="/form/notebook/page[@id='general']/field[@name='unit']" position="after">
-        <newline/>
+        <newline/>
-        <label name="quantity_theorical"/>
+        <label name="quantity_theorical"/>
-        <field name="quantity_theorical"/>
+        <field name="quantity_theorical"/>
-        <label name="finished"/>
+        <label name="finished"/>
-        <field name="finished"/>
+        <field name="finished"/>
-        <newline/>
+        <newline/>
-        <label name="enable_linked_currency"/>
+        <label name="price_type"/>
-        <field name="enable_linked_currency"/>
+        <field name="price_type"/>
-        <newline/>
+        <label name="enable_linked_currency"/>
-        <label name="linked_price"/>
+        <field name="enable_linked_currency"/>
-        <field name="linked_price"/>
+        <newline/>
-        <label name="linked_currency"/>
+        <label name="linked_currency"/>
-        <field name="linked_currency"/>
+        <field name="linked_currency"/>
-        <label name="linked_unit"/>
+        <label name="linked_unit"/>
-        <field name="linked_unit"/>
+        <field name="linked_unit"/>
-        <newline/>  
+        <newline/>
-    </xpath>
+        <label name="linked_price"/>
-    <xpath expr="/form/notebook/page[@id='general']/field[@name='amount']" position="after">
+        <field name="linked_price"/>
-        <newline/>
+        <label name="premium"/>
-        <label name="price_type"/>
+        <field name="premium"/>
-        <field name="price_type"/>
+        <newline/>
-        <label name="progress"/>
+    </xpath>
-        <field name="progress" widget="progressbar"/>
+    <xpath expr="/form/notebook/page[@id='general']/field[@name='amount']" position="after">
-        <newline/>
+        <newline/>
-        <label name="premium"/>
+        <label name="progress"/>
-        <field name="premium"/>
+        <field name="progress" widget="progressbar"/>
-        <newline/>
+        <newline/>
-        <label name="inherit_tol"/>
+        <label name="inherit_tol"/>
-        <field name="inherit_tol"/>
+        <field name="inherit_tol"/>
-        <newline/>
+        <newline/>
         <label name="tol_min"/>
         <field name="tol_min"/>
         <label name="tol_min_v"/>
@@ -91,4 +91,4 @@ this repository contains the full copyright notices and license terms. -->
             <field name="estimated_date" />
         </page>
     </xpath>
-</data>
+</data>

modules/purchase_trade/view/sale_line_tree_sequence.xml

@@ -7,4 +7,7 @@ this repository contains the full copyright notices and license terms. -->
         <field name="from_del"/>
         <field name="to_del"/>
     </xpath>
-</data>
+    <xpath expr="//field[@name='unit_price']" position="after">
+        <field name="premium"/>
+    </xpath>
+</data>

modules/purchase_trade/view/shipment_in_form.xml

@@ -137,5 +137,9 @@ this repository contains the full copyright notices and license terms. -->
             <newline/>
             <field name="shipment_wr" colspan="4"  mode="tree" view_ids="purchase_trade.shipment_wr_view_tree"/>
         </page>
+        <page string="Surveyor" col="4" id="surveyor">
+            <label name="surveyor"/>
+            <field name="surveyor"/>
+        </page>
     </xpath>
-</data>
+</data>

modules/purchase_trade/view/template_configuration_form.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<form col="4">
+    <separator id="sale_templates" string="Sale" colspan="4"/>
+    <label name="sale_report_template"/>
+    <field name="sale_report_template" colspan="3"/>
+    <label name="sale_bill_report_template"/>
+    <field name="sale_bill_report_template" colspan="3"/>
+    <label name="sale_final_report_template"/>
+    <field name="sale_final_report_template" colspan="3"/>
+
+    <separator id="invoice_templates" string="Invoice" colspan="4"/>
+    <label name="invoice_report_template"/>
+    <field name="invoice_report_template" colspan="3"/>
+    <label name="invoice_cndn_report_template"/>
+    <field name="invoice_cndn_report_template" colspan="3"/>
+    <label name="invoice_prepayment_report_template"/>
+    <field name="invoice_prepayment_report_template" colspan="3"/>
+
+    <separator id="payment_templates" string="Payment" colspan="4"/>
+    <label name="invoice_payment_order_report_template"/>
+    <field name="invoice_payment_order_report_template" colspan="3"/>
+
+    <separator id="purchase_templates" string="Purchase" colspan="4"/>
+    <label name="purchase_report_template"/>
+    <field name="purchase_report_template" colspan="3"/>
+
+    <separator id="shipment_templates" string="Shipment" colspan="4"/>
+    <label name="shipment_shipping_report_template"/>
+    <field name="shipment_shipping_report_template" colspan="3"/>
+    <label name="shipment_insurance_report_template"/>
+    <field name="shipment_insurance_report_template" colspan="3"/>
+    <label name="shipment_packing_list_report_template"/>
+    <field name="shipment_packing_list_report_template" colspan="3"/>
+</form>

modules/purchase_trade/view/valuation_list.xml

@@ -12,5 +12,6 @@
     <field name="base_amount" sum="1"/>
     <field name="rate"/>
     <field name="strategy"/>
+    <field name="mtm_price"/>
     <field name="mtm" optional="0" sum="1"/>
-</tree>
+</tree>

modules/purchase_trade/view/valuation_process_dimension_form.xml

@@ -0,0 +1,6 @@
+<form col="4">
+    <label name="dimension"/>
+    <field name="dimension"/>
+    <label name="value"/>
+    <field name="value"/>
+</form>

modules/purchase_trade/view/valuation_process_dimension_tree.xml

@@ -0,0 +1,4 @@
+<tree editable="1">
+    <field name="dimension"/>
+    <field name="value"/>
+</tree>

modules/purchase_trade/view/valuation_process_result_form.xml

@@ -0,0 +1,3 @@
+<form>
+    <field name="message"/>
+</form>

modules/purchase_trade/view/valuation_process_start_form.xml

@@ -0,0 +1,18 @@
+<form col="4">
+    <label name="valuation_type"/>
+    <field name="valuation_type"/>
+    <newline/>
+    <label name="purchase_from_date"/>
+    <field name="purchase_from_date"/>
+    <label name="purchase_to_date"/>
+    <field name="purchase_to_date"/>
+    <label name="purchase_numbers"/>
+    <field name="purchase_numbers" colspan="3"/>
+    <label name="sale_from_date"/>
+    <field name="sale_from_date"/>
+    <label name="sale_to_date"/>
+    <field name="sale_to_date"/>
+    <label name="sale_numbers"/>
+    <field name="sale_numbers" colspan="3"/>
+    <field name="analytic_dimensions" colspan="4"/>
+</form>

modules/purchase_trade/view/valuation_tree_sequence3.xml

@@ -11,5 +11,6 @@ this repository contains the full copyright notices and license terms. -->
     <field name="quantity" symbol="unit"/>
     <field name="amount" sum="1"/>
     <field name="strategy"/>
+    <field name="mtm_price"/>
     <field name="mtm" optional="0" sum="1"/>
-</tree>
+</tree>

modules/purchase_trade/view/valuation_tree_sequence4.xml

@@ -11,6 +11,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="r_quantity" symbol="r_unit"/>
     <field name="r_amount" sum="1"/>
     <field name="r_strategy"/>
+    <field name="r_mtm_price"/>
     <field name="r_mtm" optional="0" sum="1"/>
 </tree>
 

modules/purchase_trade/view/weight_report_form.xml

@@ -79,9 +79,16 @@
         <label name="weight_date"/>
         <field name="weight_date"/>
     </group>
+    <group id="remote_wr" colspan="8" col="4">
+        <button name="create_remote_weight_reports" string="Create Remote WRs" colspan="4"/>
+        <label name="remote_weight_report_sent_at"/>
+        <field name="remote_weight_report_sent_at"/>
+        <label name="remote_weight_report_keys"/>
+        <field name="remote_weight_report_keys" colspan="4"/>
+    </group>
     
     <!-- <group id="buttons" colspan="8">
         <button name="import_json" string="Import JSON"/>
         <button name="export_json" string="Export JSON"/>
     </group> -->
-</form>
+</form>

modules/purchase_trade/view/weight_report_list.xml

@@ -12,6 +12,7 @@
     <field name="invoice_net_kg"/>
     <field name="gain_loss_kg"/>
     <field name="gain_loss_percent"/>
+    <field name="remote_weight_report_sent_at"/>
     <!-- <button name="import_json" tree_invisible="1"/>
     <button name="export_json" tree_invisible="1"/> -->
-</tree>
+</tree>

modules/purchase_trade/weight_report.py

@@ -1,7 +1,10 @@
 from trytond.model import ModelSQL, ModelView, fields
 from trytond.pool import Pool
+from trytond.exceptions import UserError
 from decimal import Decimal, ROUND_HALF_UP
 from datetime import datetime as dt
+import datetime
+import requests
 import logging
 
 logger = logging.getLogger(__name__)
@@ -49,21 +52,127 @@ class WeightReport(ModelSQL, ModelView):
     invoice_net_kg = fields.Numeric('Invoice Net (kg)', digits=(16, 2))
     gain_loss_kg = fields.Numeric('Gain/Loss (kg)', digits=(16, 2))
     gain_loss_percent = fields.Numeric('Gain/Loss (%)', digits=(16, 2))
+    remote_weight_report_keys = fields.Text('Remote WR Keys', readonly=True)
+    remote_weight_report_sent_at = fields.Date(
+        'Remote WR Sent At', readonly=True)
     
     @classmethod
     def __setup__(cls):
         super().__setup__()
         cls._order = [('report_date', 'DESC')]
-        # cls._buttons.update({
+        cls._buttons.update({
-        #     'import_json': {},
+            'create_remote_weight_reports': {},
-        #     'export_json': {},
+        })
-        # })
     
     def get_rec_name(self, name):
         items = [self.lab]
         if self.reference:
             items.append('[%s]' % self.reference)
         return ' '.join(items)
+
+    def create_remote_weight_report(self, wr_payload):
+        response = requests.post(
+            "http://automation-service:8006/weight-report",
+            json=wr_payload,
+            timeout=10
+        )
+        response.raise_for_status()
+        return response.json()
+
+    def get_related_shipments(self):
+        ShipmentWR = Pool().get('shipment.wr')
+        links = ShipmentWR.search([('wr', '=', self.id)])
+        return [link.shipment_in for link in links if link.shipment_in]
+
+    def get_source_shipment(self):
+        shipments = self.get_related_shipments()
+        if not shipments:
+            raise UserError('No shipment is linked to this weight report.')
+        unique_shipments = {shipment.id: shipment for shipment in shipments}
+        if len(unique_shipments) > 1:
+            raise UserError(
+                'This weight report is linked to multiple shipments.')
+        return next(iter(unique_shipments.values()))
+
+    def get_remote_weight_report_lots(self, shipment):
+        lots = []
+        seen = set()
+        for move in shipment.incoming_moves or []:
+            lot = getattr(move, 'lot', None)
+            if (not lot or lot.lot_type != 'physic'
+                    or lot.id in seen):
+                continue
+            seen.add(lot.id)
+            lots.append(lot)
+        if not lots:
+            raise UserError(
+                'No physical lot was found on the incoming moves.')
+        return lots
+
+    def validate_remote_weight_report_context(self, shipment):
+        if not shipment.controller:
+            raise UserError(
+                'A controller is required before creating remote weight reports.')
+        if not shipment.returned_id:
+            raise UserError(
+                'A returned ID is required before creating remote weight reports.')
+        if not shipment.agent:
+            raise UserError(
+                'A booking agent is required before creating remote weight reports.')
+        if not shipment.to_location:
+            raise UserError(
+                'A destination location is required before creating remote weight reports.')
+        if not self.bales:
+            raise UserError(
+                'The global weight report must define the number of bales.')
+        if not self.report_date or not self.weight_date:
+            raise UserError(
+                'Report date and weight date are required.')
+
+    def build_remote_weight_report_payload(self, shipment, lot):
+        if not lot.lot_chunk_key:
+            raise UserError(
+                'Each physical lot must have a chunk key before export.')
+        factor_net = self.net_landed_kg / self.bales
+        factor_gross = self.gross_landed_kg / self.bales
+        lot_ratio = Decimal(lot.lot_qt) / self.bales
+        return {
+            "chunk_key": lot.lot_chunk_key,
+            "gross_weight": float(round(
+                Decimal(lot.lot_qt) * factor_gross, 5)),
+            "net_weight": float(round(
+                Decimal(lot.lot_qt) * factor_net, 5)),
+            "tare_total": float(round(self.tare_kg * lot_ratio, 5)),
+            "bags": int(lot.lot_qt),
+            "surveyor_code": shipment.controller.get_alf(),
+            "place_key": shipment.to_location.get_places(),
+            "report_date": int(self.report_date.strftime("%Y%m%d")),
+            "weight_date": int(self.weight_date.strftime("%Y%m%d")),
+            "agent": shipment.agent.get_alf(),
+            "forwarder_ref": shipment.returned_id,
+        }
+
+    @classmethod
+    @ModelView.button
+    def create_remote_weight_reports(cls, reports):
+        to_save = []
+        for report in reports:
+            shipment = report.get_source_shipment()
+            report.validate_remote_weight_report_context(shipment)
+            lots = report.get_remote_weight_report_lots(shipment)
+            created = []
+            for lot in lots:
+                payload = report.build_remote_weight_report_payload(
+                    shipment, lot)
+                logger.info("REMOTE_WR_PAYLOAD:%s", payload)
+                data = report.create_remote_weight_report(payload)
+                created.append(
+                    f"{lot.rec_name}: {data.get('weight_report_key')}")
+            report.remote_weight_report_keys = '\n'.join(created)
+            report.remote_weight_report_sent_at = datetime.date.today()
+            to_save.append(report)
+        if to_save:
+            cls.save(to_save)
     # @classmethod
     # @ModelView.button_action('weight_report.act_import_json')
     # def import_json(cls, reports):
@@ -200,4 +309,4 @@ class WeightReport(ModelSQL, ModelView):
         report['gain_loss_percent'] = gain_loss_percent.quantize(Decimal('0.01'), rounding=ROUND_HALF_UP)
 
         # 7. Création du rapport
-        return cls.create([report])[0]
+        return cls.create([report])[0]

modules/purchase_trade/weight_report.xml

@@ -103,18 +103,12 @@
         </record> -->
         
         <!-- Model Buttons -->
-        <!-- <record model="ir.model.button" id="weight_report_import_button">
+        <record model="ir.model.button" id="weight_report_create_remote_button">
             <field name="model">weight.report</field>
-            <field name="name">import_json</field>
+            <field name="name">create_remote_weight_reports</field>
-            <field name="string">Import JSON</field>
+            <field name="string">Create Remote WRs</field>
         </record>
         
-        <record model="ir.model.button" id="weight_report_export_button">
-            <field name="model">weight.report</field>
-            <field name="name">export_json</field>
-            <field name="string">Export JSON</field>
-        </record> -->
-        
         <!-- Menu Structure -->
         <menuitem
             name="Weight Reports"
@@ -136,4 +130,4 @@
             sequence="30"
             id="menu_gr_weight_reports"/> -->
     </data>
-</tryton>
+</tryton>

modules/sale/bill.fodt

@@ -1,30 +1,28 @@
 <?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>
+ <office:meta><meta:initial-creator>Giorgio Calligaro</meta:initial-creator><meta:creation-date>2026-03-12T13:26:00</meta:creation-date><dc:date>2026-03-12T17:30:00</dc:date><meta:print-date>2026-03-12T17:29:00</meta:print-date><meta:editing-cycles>3</meta:editing-cycles><meta:editing-duration>P0D</meta:editing-duration><meta:document-statistic meta:table-count="1" meta:image-count="0" meta:object-count="0" meta:page-count="1" meta:paragraph-count="11" meta:word-count="30" meta:character-count="221" meta:non-whitespace-character-count="186"/><meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator><meta:user-defined meta:name="Company">Fintel S.A.</meta:user-defined><meta:user-defined meta:name="Operator">HACER</meta:user-defined></office:meta>
-  <meta:generator>LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265</meta:generator>
- <dc:date>2026-03-15T13:01:38.668000000</dc:date><meta:editing-duration>PT10M4S</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:document-statistic meta:table-count="7" meta:image-count="0" meta:object-count="0" meta:page-count="1" meta:paragraph-count="22" meta:word-count="122" meta:character-count="932" meta:non-whitespace-character-count="828"/></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
    <config:config-item config:name="ViewAreaTop" config:type="long">0</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">31487</config:config-item>
+   <config:config-item config:name="ViewAreaWidth" config:type="long">43623</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="long">15713</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">21098</config:config-item>
    <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
    <config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item>
    <config:config-item-map-indexed config:name="Views">
     <config:config-item-map-entry>
      <config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" config:type="long">6627</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">17221</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">7108</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">7202</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">0</config:config-item>
-     <config:config-item config:name="VisibleRight" config:type="long">31485</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">43621</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">15711</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">21096</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>
-     <config:config-item config:name="ZoomFactor" config:type="short">140</config:config-item>
+     <config:config-item config:name="ZoomFactor" config:type="short">100</config:config-item>
      <config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item>
      <config:config-item config:name="KeepRatio" config:type="boolean">false</config:config-item>
      <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item>
@@ -37,9 +35,9 @@
   <config:config-item-set config:name="ooo:configuration-settings">
    <config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item>
    <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
-   <config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="AddParaTableSpacing" config:type="boolean">false</config:config-item>
    <config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="TabAtLeftIndentForParagraphsInList" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabAtLeftIndentForParagraphsInList" config:type="boolean">true</config:config-item>
    <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item>
    <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item>
    <config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item>
@@ -68,13 +66,13 @@
    <config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item>
    <config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item>
    <config:config-item config:name="ClippedPictures" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddFrameOffsets" config:type="boolean">true</config:config-item>
    <config:config-item config:name="AddVerticalFrameOffsets" config:type="boolean">false</config:config-item>
    <config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item>
    <config:config-item config:name="UnbreakableNumberings" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="HeaderSpacingBelowLastPara" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="HeaderSpacingBelowLastPara" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="TabsRelativeToIndent" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="TableRowKeep" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TableRowKeep" config:type="boolean">true</config:config-item>
    <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item>
    <config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item>
    <config:config-item config:name="TabOverflow" config:type="boolean">true</config:config-item>
@@ -93,11 +91,11 @@
    <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">1907347</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">1475016</config:config-item>
-   <config:config-item config:name="RsidRoot" config:type="int">1907347</config:config-item>
+   <config:config-item config:name="RsidRoot" config:type="int">1475016</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>
+   <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="MsWordCompMinLineHeightByFly" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="MsWordCompMinLineHeightByFly" config:type="boolean">true</config:config-item>
    <config:config-item config:name="MathBaselineAlignment" config:type="boolean">true</config:config-item>
    <config:config-item config:name="SmallCapsPercentage66" config:type="boolean">false</config:config-item>
    <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item>
@@ -106,24 +104,25 @@
    <config:config-item config:name="EmbedOnlyUsedFonts" config:type="boolean">false</config:config-item>
    <config:config-item config:name="EmbedLatinScriptFonts" config:type="boolean">true</config:config-item>
    <config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="TabOverMargin" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabOverMargin" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="ApplyParagraphMarkFormatToNumbering" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ApplyParagraphMarkFormatToNumbering" config:type="boolean">true</config:config-item>
    <config:config-item config:name="TabOverSpacing" config:type="boolean">false</config:config-item>
    <config:config-item config:name="TreatSingleColumnBreakAsPageBreak" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="SurroundTextWrapSmall" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SurroundTextWrapSmall" config:type="boolean">true</config:config-item>
    <config:config-item config:name="PropLineSpacingShrinksFirstLine" config:type="boolean">true</config:config-item>
    <config:config-item config:name="SubtractFlysAnchoredAtFlys" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="EmptyDbFieldHidesPara" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmptyDbFieldHidesPara" config:type="boolean">true</config:config-item>
    <config:config-item config:name="ContinuousEndnotes" config:type="boolean">false</config:config-item>
    <config:config-item config:name="ProtectBookmarks" config:type="boolean">false</config:config-item>
    <config:config-item config:name="ProtectFields" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="FrameAutowidthWithMorePara" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="FrameAutowidthWithMorePara" config:type="boolean">true</config:config-item>
    <config:config-item config:name="GutterAtTop" config:type="boolean">false</config:config-item>
    <config:config-item config:name="FootnoteInColumnToPageEnd" config:type="boolean">true</config:config-item>
    <config:config-item config:name="ImagePreferredDPI" config:type="int">0</config:config-item>
    <config:config-item config:name="AutoFirstLineIndentDisregardLineSpace" config:type="boolean">true</config:config-item>
    <config:config-item config:name="HyphenateURLs" config:type="boolean">false</config:config-item>
-   <config:config-item config:name="NoNumberingShowFollowBy" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="DoNotBreakWrappedTables" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="NoNumberingShowFollowBy" config:type="boolean">true</config:config-item>
    <config:config-item config:name="DropCapPunctuation" config:type="boolean">true</config:config-item>
    <config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item>
    <config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item>
@@ -151,11 +150,15 @@
  </office:scripts>
  <office:font-face-decls>
   <style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Arial1" svg:font-family="Arial" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="Calibri" svg:font-family="Calibri" style:font-family-generic="roman" style:font-pitch="variable"/>
   <style:font-face style:name="Liberation Sans" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
+  <style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
   <style:font-face style:name="Lucida Sans" svg:font-family="&apos;Lucida Sans&apos;" style:font-family-generic="swiss"/>
   <style:font-face style:name="Lucida Sans1" svg:font-family="&apos;Lucida Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
   <style:font-face style:name="Microsoft YaHei" svg:font-family="&apos;Microsoft YaHei&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
   <style:font-face style:name="NSimSun" svg:font-family="NSimSun" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="Times New Roman" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
  </office:font-face-decls>
  <office:styles>
   <style:default-style style:family="graphic">
@@ -163,11 +166,11 @@
    <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" loext:tab-stop-distance="0cm" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
     <style:tab-stops/>
    </style:paragraph-properties>
-   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Arial" fo:font-size="9pt" fo:language="en" fo:country="GB" style:letter-kerning="true" style:font-name-asian="NSimSun" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lucida Sans1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt" fo:language="en" fo:country="GB" style:letter-kerning="true" style:font-name-asian="NSimSun" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lucida Sans1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/>
   </style:default-style>
   <style:default-style style:family="paragraph">
-   <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/>
+   <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.249cm" style:writing-mode="page"/>
-   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Arial" fo:font-size="9pt" fo:language="en" fo:country="GB" style:letter-kerning="true" style:font-name-asian="NSimSun" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lucida Sans1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="5" loext:hyphenation-zone="no-limit"/>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt" fo:language="en" fo:country="GB" style:letter-kerning="true" style:font-name-asian="NSimSun" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lucida Sans1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="5" loext:hyphenation-zone="no-limit"/>
   </style:default-style>
   <style:default-style style:family="table">
    <style:table-properties table:border-model="collapsing"/>
@@ -175,7 +178,10 @@
   <style:default-style style:family="table-row">
    <style:table-row-properties fo:keep-together="auto"/>
   </style:default-style>
-  <style:style style:name="Standard" style:family="paragraph" style:class="text"/>
+  <style:style style:name="Standard" style:family="paragraph" style:class="text">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false" fo:orphans="2" fo:widows="2" style:vertical-align="auto"/>
+   <style:text-properties style:font-name="Arial" fo:font-family="Arial" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="11pt" fo:language="fr" fo:country="FR" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="11pt" style:language-asian="fr" style:country-asian="FR" style:font-name-complex="Arial1" style:font-family-complex="Arial" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="11pt" style:language-complex="ar" style:country-complex="SA"/>
+  </style:style>
   <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">
    <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" fo:keep-with-next="always"/>
    <style:text-properties style:font-name="Liberation Sans" fo:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" style:font-name-asian="Microsoft YaHei" style:font-family-asian="&apos;Microsoft YaHei&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-name-complex="Lucida Sans1" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt"/>
@@ -194,12 +200,12 @@
    <style:paragraph-properties text:number-lines="false" text:line-number="0"/>
    <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Lucida Sans" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="swiss"/>
   </style:style>
-  <style:style style:name="Table_20_Contents" style:display-name="Table Contents" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
+  <style:style style:name="Normal_20_Table_20__28_WW_29_" style:display-name="Normal Table (WW)" style:family="paragraph">
-   <style:paragraph-properties fo:orphans="0" fo:widows="0" text:number-lines="false" text:line-number="0"/>
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.353cm" style:contextual-spacing="false" fo:line-height="115%" fo:text-align="start" style:justify-single-word="false" fo:orphans="2" fo:widows="2" style:vertical-align="auto"/>
-  </style:style>
+   <style:text-properties style:font-name="Calibri" fo:font-family="Calibri" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="11pt" fo:language="en" fo:country="GB" style:font-name-asian="Times New Roman" style:font-family-asian="&apos;Times New Roman&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="11pt" style:language-asian="en" style:country-asian="GB" style:font-name-complex="Times New Roman" style:font-family-complex="&apos;Times New Roman&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="11pt" style:language-complex="ar" style:country-complex="SA"/>
-  <style:style style:name="Placeholder" style:family="text">
-   <style:text-properties fo:font-variant="small-caps" fo:color="#008080" loext:opacity="100%" style:text-underline-style="dotted" style:text-underline-width="auto" style:text-underline-color="font-color"/>
   </style:style>
+  <style:style style:name="Style1" style:family="paragraph" style:parent-style-name="Standard"/>
+  <style:style style:name="Default_20_Paragraph_20_Font_20__28_WW_29_" style:display-name="Default Paragraph Font (WW)" style:family="text"/>
   <text:outline-style style:name="Outline">
    <text:outline-level-style text:level="1" style:num-format="">
     <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
@@ -255,6 +261,9 @@
   <text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
   <text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/>
   <text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>
+  <style:default-page-layout>
+   <style:page-layout-properties style:layout-grid-standard-mode="true"/>
+  </style:default-page-layout>
   <loext:theme loext:name="Office Theme">
    <loext:theme-colors loext:name="LibreOffice">
     <loext:color loext:name="dark1" loext:color="#000000"/>
@@ -273,239 +282,154 @@
   </loext:theme>
  </office:styles>
  <office:automatic-styles>
-  <style:style style:name="BillOfExchange" style:family="table">
+  <style:style style:name="Tableau1" style:family="table">
-   <style:table-properties style:width="20.001cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+   <style:table-properties style:width="15.24cm" fo:margin-left="0.635cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
   </style:style>
-  <style:style style:name="BillOfExchange.A" style:family="table-column">
+  <style:style style:name="Tableau1.A" style:family="table-column">
-   <style:table-column-properties style:column-width="4.75cm"/>
+   <style:table-column-properties style:column-width="1.905cm"/>
   </style:style>
-  <style:style style:name="BillOfExchange.B" style:family="table-column">
+  <style:style style:name="Tableau1.B" style:family="table-column">
-   <style:table-column-properties style:column-width="15.251cm"/>
+   <style:table-column-properties style:column-width="2.54cm"/>
   </style:style>
-  <style:style style:name="BillOfExchange.A1" style:family="table-cell">
+  <style:style style:name="Tableau1.C" style:family="table-column">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+   <style:table-column-properties style:column-width="2.332cm"/>
   </style:style>
-  <style:style style:name="BillOfExchange.B1" style:family="table-cell">
+  <style:style style:name="Tableau1.D" style:family="table-column">
-   <style:table-cell-properties fo:padding="0.101cm" fo:border="0.5pt solid #000000"/>
+   <style:table-column-properties style:column-width="1.478cm"/>
   </style:style>
-  <style:style style:name="Inner1" style:family="table">
+  <style:style style:name="Tableau1.E" style:family="table-column">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+   <style:table-column-properties style:column-width="0.953cm"/>
   </style:style>
-  <style:style style:name="Inner1.A" style:family="table-column">
+  <style:style style:name="Tableau1.F" style:family="table-column">
-   <style:table-column-properties style:column-width="4.001cm"/>
+   <style:table-column-properties style:column-width="6.031cm"/>
   </style:style>
-  <style:style style:name="Inner1.B" style:family="table-column">
+  <style:style style:name="Tableau1.1" style:family="table-row">
-   <style:table-column-properties style:column-width="3.5cm"/>
+   <style:table-row-properties style:min-row-height="2.223cm" fo:keep-together="auto"/>
   </style:style>
-  <style:style style:name="Inner1.C" style:family="table-column">
+  <style:style style:name="Tableau1.A1" style:family="table-cell">
-   <style:table-column-properties style:column-width="10.899cm"/>
+   <style:table-cell-properties style:vertical-align="" fo:padding-left="0.123cm" fo:padding-right="0.123cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="none" style:writing-mode="lr-tb"/>
   </style:style>
-  <style:style style:name="Inner1.A1" style:family="table-cell">
+  <style:style style:name="Tableau1.2" style:family="table-row">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+   <style:table-row-properties fo:keep-together="always"/>
   </style:style>
-  <style:style style:name="Inner1.C1" style:family="table-cell">
+  <style:style style:name="Tableau1.3" style:family="table-row">
-   <style:table-cell-properties style:vertical-align="middle" fo:padding="0.101cm" fo:border="1.5pt solid #000000"/>
+   <style:table-row-properties fo:keep-together="always"/>
   </style:style>
-  <style:style style:name="Inner2" style:family="table">
+  <style:style style:name="Tableau1.4" style:family="table-row">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+   <style:table-row-properties fo:keep-together="always"/>
   </style:style>
-  <style:style style:name="Inner2.A" style:family="table-column">
+  <style:style style:name="Tableau1.5" style:family="table-row">
-   <style:table-column-properties style:column-width="4.5cm"/>
+   <style:table-row-properties fo:keep-together="auto"/>
-  </style:style>
-  <style:style style:name="Inner2.B" style:family="table-column">
-   <style:table-column-properties style:column-width="13.899cm"/>
-  </style:style>
-  <style:style style:name="Inner2.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-  </style:style>
-  <style:style style:name="Inner2.B1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
-  </style:style>
-  <style:style style:name="Inner3" style:family="table">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
-  </style:style>
-  <style:style style:name="Inner3.A" style:family="table-column">
-   <style:table-column-properties style:column-width="18.399cm"/>
-  </style:style>
-  <style:style style:name="Inner3.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-  </style:style>
-  <style:style style:name="Inner4" style:family="table">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
-  </style:style>
-  <style:style style:name="Inner4.A" style:family="table-column">
-   <style:table-column-properties style:column-width="2.499cm"/>
-  </style:style>
-  <style:style style:name="Inner4.B" style:family="table-column">
-   <style:table-column-properties style:column-width="15.9cm"/>
-  </style:style>
-  <style:style style:name="Inner4.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
-  </style:style>
-  <style:style style:name="Inner4.B1" style:family="table-cell">
-   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-  </style:style>
-  <style:style style:name="Inner5" style:family="table">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
-  </style:style>
-  <style:style style:name="Inner5.A" style:family="table-column">
-   <style:table-column-properties style:column-width="2.499cm"/>
-  </style:style>
-  <style:style style:name="Inner5.B" style:family="table-column">
-   <style:table-column-properties style:column-width="15.9cm"/>
-  </style:style>
-  <style:style style:name="Inner5.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
-  </style:style>
-  <style:style style:name="Inner5.B1" style:family="table-cell">
-   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-  </style:style>
-  <style:style style:name="Inner6" style:family="table">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
-  </style:style>
-  <style:style style:name="Inner6.A" style:family="table-column">
-   <style:table-column-properties style:column-width="2.499cm"/>
-  </style:style>
-  <style:style style:name="Inner6.B" style:family="table-column">
-   <style:table-column-properties style:column-width="3.5cm"/>
-  </style:style>
-  <style:style style:name="Inner6.F" style:family="table-column">
-   <style:table-column-properties style:column-width="3.902cm"/>
-  </style:style>
-  <style:style style:name="Inner6.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
-  </style:style>
-  <style:style style:name="Inner6.B1" style:family="table-cell">
-   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-  </style:style>
-  <style:style style:name="Inner1" style:family="table">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
-  </style:style>
-  <style:style style:name="Inner1.A" style:family="table-column">
-   <style:table-column-properties style:column-width="4.001cm"/>
-  </style:style>
-  <style:style style:name="Inner1.B" style:family="table-column">
-   <style:table-column-properties style:column-width="3.5cm"/>
-  </style:style>
-  <style:style style:name="Inner1.C" style:family="table-column">
-   <style:table-column-properties style:column-width="10.899cm"/>
-  </style:style>
-  <style:style style:name="Inner1.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
-  </style:style>
-  <style:style style:name="Inner1.C1" style:family="table-cell">
-   <style:table-cell-properties style:vertical-align="middle" fo:padding="0.101cm" fo:border="1.5pt solid #000000"/>
-  </style:style>
-  <style:style style:name="Inner2" style:family="table">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
-  </style:style>
-  <style:style style:name="Inner2.A" style:family="table-column">
-   <style:table-column-properties style:column-width="4.5cm"/>
-  </style:style>
-  <style:style style:name="Inner2.B" style:family="table-column">
-   <style:table-column-properties style:column-width="13.899cm"/>
-  </style:style>
-  <style:style style:name="Inner2.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-  </style:style>
-  <style:style style:name="Inner2.B1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
-  </style:style>
-  <style:style style:name="Inner3" style:family="table">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
-  </style:style>
-  <style:style style:name="Inner3.A" style:family="table-column">
-   <style:table-column-properties style:column-width="18.399cm"/>
-  </style:style>
-  <style:style style:name="Inner3.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-  </style:style>
-  <style:style style:name="Inner4" style:family="table">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
-  </style:style>
-  <style:style style:name="Inner4.A" style:family="table-column">
-   <style:table-column-properties style:column-width="2.499cm"/>
-  </style:style>
-  <style:style style:name="Inner4.B" style:family="table-column">
-   <style:table-column-properties style:column-width="15.9cm"/>
-  </style:style>
-  <style:style style:name="Inner4.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
-  </style:style>
-  <style:style style:name="Inner4.B1" style:family="table-cell">
-   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-  </style:style>
-  <style:style style:name="Inner5" style:family="table">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
-  </style:style>
-  <style:style style:name="Inner5.A" style:family="table-column">
-   <style:table-column-properties style:column-width="2.499cm"/>
-  </style:style>
-  <style:style style:name="Inner5.B" style:family="table-column">
-   <style:table-column-properties style:column-width="15.9cm"/>
-  </style:style>
-  <style:style style:name="Inner5.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
-  </style:style>
-  <style:style style:name="Inner5.B1" style:family="table-cell">
-   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-  </style:style>
-  <style:style style:name="Inner6" style:family="table">
-   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
-  </style:style>
-  <style:style style:name="Inner6.A" style:family="table-column">
-   <style:table-column-properties style:column-width="2.499cm"/>
-  </style:style>
-  <style:style style:name="Inner6.B" style:family="table-column">
-   <style:table-column-properties style:column-width="3.5cm"/>
-  </style:style>
-  <style:style style:name="Inner6.F" style:family="table-column">
-   <style:table-column-properties style:column-width="3.902cm"/>
-  </style:style>
-  <style:style style:name="Inner6.A1" style:family="table-cell">
-   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
-  </style:style>
-  <style:style style:name="Inner6.B1" style:family="table-cell">
-   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
   </style:style>
   <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+   <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 style:font-name="Arial" fo:font-size="8pt"/>
+    <style:tab-stops>
+     <style:tab-stop style:position="7.303cm"/>
+     <style:tab-stop style:position="10.795cm"/>
+     <style:tab-stop style:position="22.86cm" style:type="right"/>
+     <style:tab-stop style:position="26.988cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
   </style:style>
   <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+   <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 style:font-name="Arial" fo:font-size="8pt" fo:font-weight="bold"/>
+    <style:tab-stops>
+     <style:tab-stop style:position="7.303cm"/>
+     <style:tab-stop style:position="10.795cm"/>
+     <style:tab-stop style:position="22.86cm" style:type="right"/>
+     <style:tab-stop style:position="26.988cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="8pt" fo:language="en" fo:country="GB" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
   <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <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 style:font-name="Arial" fo:font-size="8pt"/>
+    <style:tab-stops>
+     <style:tab-stop style:position="7.303cm"/>
+     <style:tab-stop style:position="10.795cm"/>
+     <style:tab-stop style:position="22.86cm" style:type="right"/>
+     <style:tab-stop style:position="26.988cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="5pt" fo:language="en" fo:country="GB" fo:font-weight="bold" style:font-size-asian="5pt" style:font-weight-asian="bold" style:font-size-complex="5pt" style:font-weight-complex="bold"/>
   </style:style>
   <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="end" style:justify-single-word="false"/>
+   <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 style:font-name="Arial" fo:font-size="8pt"/>
+    <style:tab-stops>
+     <style:tab-stop style:position="7.303cm"/>
+     <style:tab-stop style:position="10.795cm"/>
+     <style:tab-stop style:position="22.86cm" style:type="right"/>
+     <style:tab-stop style:position="26.988cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="3pt" fo:language="en" fo:country="GB" style:font-size-asian="3pt" style:font-size-complex="3pt"/>
   </style:style>
-  <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Style1">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+   <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 style:font-name="Arial" fo:font-size="7pt"/>
+    <style:tab-stops>
+     <style:tab-stop style:position="7.303cm"/>
+     <style:tab-stop style:position="10.795cm"/>
+     <style:tab-stop style:position="22.86cm" style:type="right"/>
+     <style:tab-stop style:position="26.988cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="8pt" fo:language="en" fo:country="GB" style:font-size-asian="8pt" style:font-size-complex="8pt" text:display="none"/>
   </style:style>
-  <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Style1">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <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 style:font-name="Arial" fo:font-size="7pt"/>
+    <style:tab-stops>
+     <style:tab-stop style:position="7.303cm"/>
+     <style:tab-stop style:position="10.795cm"/>
+     <style:tab-stop style:position="22.86cm" style:type="right"/>
+     <style:tab-stop style:position="26.988cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="8pt" fo:language="en" fo:country="GB" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
   </style:style>
-  <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Style1">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <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 style:font-name="Arial" fo:font-size="9pt" fo:font-weight="bold"/>
+    <style:tab-stops>
+     <style:tab-stop style:position="7.303cm"/>
+     <style:tab-stop style:position="10.795cm"/>
+     <style:tab-stop style:position="22.86cm" style:type="right"/>
+     <style:tab-stop style:position="26.988cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
   </style:style>
-  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Style1">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <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 style:font-name="Arial" fo:font-size="7pt"/>
+    <style:tab-stops>
+     <style:tab-stop style:position="7.303cm"/>
+     <style:tab-stop style:position="10.795cm"/>
+     <style:tab-stop style:position="22.86cm" style:type="right"/>
+     <style:tab-stop style:position="26.988cm" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="12pt" fo:language="en" fo:country="GB" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
   </style:style>
-  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard">
+  <style:style style:name="T1" style:family="text">
-   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:font-size="8pt" fo:language="en" fo:country="GB" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-   <style:text-properties style:font-name="Arial" fo:font-size="7pt" officeooo:paragraph-rsid="001d1a93"/>
+  </style:style>
+  <style:style style:name="T2" style:family="text">
+   <style:text-properties fo:font-size="8pt" fo:language="en" fo:country="GB" style:font-size-asian="8pt" style:font-size-complex="8pt" text:display="none"/>
+  </style:style>
+  <style:style style:name="T3" style:family="text">
+   <style:text-properties fo:font-size="8pt" fo:language="en" fo:country="GB" fo:font-weight="bold" style:font-size-asian="8pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T4" style:family="text">
+   <style:text-properties fo:font-size="12pt" fo:language="en" fo:country="GB" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="T5" style:family="text">
+   <style:text-properties fo:language="en" fo:country="GB"/>
+  </style:style>
+  <style:style style:name="T6" style:family="text">
+   <style:text-properties fo:font-size="5pt" fo:language="en" fo:country="GB" fo:font-weight="bold" style:font-size-asian="5pt" style:font-weight-asian="bold" style:font-size-complex="5pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T7" style:family="text">
+   <style:text-properties fo:font-size="3pt" fo:language="en" fo:country="GB" style:font-size-asian="3pt" style:font-size-complex="3pt"/>
   </style:style>
   <style:page-layout style:name="pm1">
-   <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="9.999cm" style:num-format="1" style:print-orientation="landscape" fo:margin-top="0.4cm" fo:margin-bottom="0.4cm" fo:margin-left="0.499cm" fo:margin-right="0.499cm" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+   <style:page-layout-properties fo:page-width="29.7cm" fo:page-height="21.001cm" style:num-format="1" style:print-orientation="landscape" fo:margin-top="6.701cm" fo:margin-bottom="1.501cm" fo:margin-left="9.502cm" fo:margin-right="1.501cm" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="12798" style:layout-grid-base-height="0.176cm" style:layout-grid-ruby-height="0cm" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:layout-grid-base-width="0.388cm" style:layout-grid-snap-to="true" style:footnote-max-height="0cm" loext:margin-gutter="0cm">
     <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
    </style:page-layout-properties>
    <style:header-style/>
@@ -527,127 +451,103 @@
     <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="P1"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;sale in records&quot;&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P5" loext:marker-style-name="T2"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;sale in records&quot;&gt;</text:placeholder></text:p>
-   <table:table table:name="BillOfExchange" table:style-name="BillOfExchange">
+   <table:table table:name="Tableau1" table:style-name="Tableau1">
-    <table:table-column table:style-name="BillOfExchange.A"/>
+    <table:table-column table:style-name="Tableau1.A"/>
-    <table:table-column table:style-name="BillOfExchange.B"/>
+    <table:table-column table:style-name="Tableau1.B"/>
-    <table:table-row>
+    <table:table-column table:style-name="Tableau1.C"/>
-     <table:table-cell table:style-name="BillOfExchange.A1" table:number-rows-spanned="2" office:value-type="string">
+    <table:table-column table:style-name="Tableau1.D"/>
-      <text:p text:style-name="P6">Accepted by:</text:p>
+    <table:table-column table:style-name="Tableau1.E"/>
-      <text:p text:style-name="P6"/>
+    <table:table-column table:style-name="Tableau1.F"/>
-      <text:p text:style-name="P6"/>
+    <table:table-row table:style-name="Tableau1.1">
-      <text:p text:style-name="P6"/>
+     <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
-      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6" loext:marker-style-name="T1"/>
-      <text:p text:style-name="P6"/>
-      <text:p text:style-name="P6"/>
-      <text:p text:style-name="P6"/>
-      <text:p text:style-name="P6"/>
-      <text:p text:style-name="P6"/>
-      <text:p text:style-name="P6"/>
-      <text:p text:style-name="P6"/>
-      <text:p text:style-name="P9">Per aval:</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="BillOfExchange.B1" office:value-type="string">
+     <table:table-cell table:style-name="Tableau1.A1" table:number-columns-spanned="2" office:value-type="string">
-      <table:table table:name="Inner1" table:style-name="Inner1">
+      <text:p text:style-name="P7" loext:marker-style-name="T1"><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text">&lt;format_date(sale.sale_date, sale.party.lang)&gt;</text:placeholder></text:span><text:span text:style-name="T1"/></text:p>
-       <table:table-column table:style-name="Inner1.A"/>
+      <text:p text:style-name="P8" loext:marker-style-name="T4"/>
-       <table:table-column table:style-name="Inner1.B"/>
+      <text:p text:style-name="P7" loext:marker-style-name="T1"><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text">&lt;format_date(sale.report_bill_maturity_date, sale.party.lang) if sale.report_bill_maturity_date else &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T1"/></text:p>
-       <table:table-column table:style-name="Inner1.C"/>
+      <text:p text:style-name="P6" loext:marker-style-name="T1"/>
-       <table:table-row>
+      <text:p text:style-name="P6" loext:marker-style-name="T1"/>
-        <table:table-cell table:style-name="Inner1.A1" office:value-type="string">
+      <text:p text:style-name="P6" loext:marker-style-name="T1"/>
-         <text:p text:style-name="P1">Geneva, <text:placeholder text:placeholder-type="text">&lt;format_date(sale.sale_date, sale.party.lang)&gt;</text:placeholder></text:p>
+     </table:table-cell>
-        </table:table-cell>
+     <table:covered-table-cell/>
-        <table:table-cell table:style-name="Inner1.A1" office:value-type="string">
+     <table:table-cell table:style-name="Tableau1.A1" table:number-columns-spanned="2" office:value-type="string">
-         <text:p text:style-name="P1">For</text:p>
+      <text:p text:style-name="P6" loext:marker-style-name="T1"/>
-        </table:table-cell>
+     </table:table-cell>
-        <table:table-cell table:style-name="Inner1.C1" office:value-type="string">
+     <table:covered-table-cell/>
-         <text:p text:style-name="P7"><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:style-name="Tableau1.A1" office:value-type="string">
-        </table:table-cell>
+      <text:p text:style-name="P7" loext:marker-style-name="T5"><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text">&lt;format_currency(sale.report_bill_amount, sale.party.lang, sale.currency)&gt;</text:placeholder></text:span><text:span text:style-name="T3"/></text:p>
-       </table:table-row>
-      </table:table>
-      <table:table table:name="Inner2" table:style-name="Inner2">
-       <table:table-column table:style-name="Inner2.A"/>
-       <table:table-column table:style-name="Inner2.B"/>
-       <table:table-row>
-        <table:table-cell table:style-name="Inner2.A1" office:value-type="string">
-         <text:p text:style-name="P1">At / on <text:placeholder text:placeholder-type="text">&lt;sale.payment_term.rec_name if sale.payment_term else &apos;&apos;&gt;</text:placeholder></text:p>
-        </table:table-cell>
-        <table:table-cell table:style-name="Inner2.B1" office:value-type="string">
-         <text:p text:style-name="P1">for value received, please pay against this sole Bill of Exchange</text:p>
-        </table:table-cell>
-       </table:table-row>
-      </table:table>
-      <text:p text:style-name="P1">to our order of Melya S.A., Switzerland, the amount of</text:p>
-      <table:table table:name="Inner3" table:style-name="Inner3">
-       <table:table-column table:style-name="Inner3.A"/>
-       <table:table-row>
-        <table:table-cell table:style-name="Inner3.A1" office:value-type="string">
-         <text:p text:style-name="P1"> </text:p>
-        </table:table-cell>
-       </table:table-row>
-      </table:table>
-      <text:p text:style-name="P5">effective payment to be made in <text:placeholder text:placeholder-type="text">&lt;sale.currency.symbol if sale.currency else &apos;&apos;&gt;</text:placeholder> only, without deduction for and free of any taxes, impost, levies or duties present or future of any nature under the laws of <text:placeholder text:placeholder-type="text">&lt;sale.party.addresses[0].country.name if sale.party and sale.party.addresses else &apos;&apos;&gt;</text:placeholder> or any political subdivision thereof or therein.</text:p>
-      <table:table table:name="Inner4" table:style-name="Inner4">
-       <table:table-column table:style-name="Inner4.A"/>
-       <table:table-column table:style-name="Inner4.B"/>
-       <table:table-row>
-        <table:table-cell table:style-name="Inner4.A1" office:value-type="string">
-         <text:p text:style-name="P1">Payable at</text:p>
-        </table:table-cell>
-        <table:table-cell table:style-name="Inner4.B1" office:value-type="string">
-         <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;sale.party.addresses[0].city if sale.party and sale.party.addresses else &apos;&apos;&gt;</text:placeholder></text:p>
-        </table:table-cell>
-       </table:table-row>
-      </table:table>
-      <table:table table:name="Inner5" table:style-name="Inner5">
-       <table:table-column table:style-name="Inner5.A"/>
-       <table:table-column table:style-name="Inner5.B"/>
-       <table:table-row>
-        <table:table-cell table:style-name="Inner5.A1" office:value-type="string">
-         <text:p text:style-name="P1">Drawn on at</text:p>
-        </table:table-cell>
-        <table:table-cell table:style-name="Inner5.B1" office:value-type="string">
-         <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;sale.party.rec_name&gt;</text:placeholder></text:p>
-        </table:table-cell>
-       </table:table-row>
-      </table:table>
-      <table:table table:name="Inner6" table:style-name="Inner6">
-       <table:table-column table:style-name="Inner6.A"/>
-       <table:table-column table:style-name="Inner6.B"/>
-       <table:table-column table:style-name="Inner6.A"/>
-       <table:table-column table:style-name="Inner6.B"/>
-       <table:table-column table:style-name="Inner6.A"/>
-       <table:table-column table:style-name="Inner6.F"/>
-       <table:table-row>
-        <table:table-cell table:style-name="Inner6.A1" office:value-type="string">
-         <text:p text:style-name="P1">No</text:p>
-        </table:table-cell>
-        <table:table-cell table:style-name="Inner6.B1" office:value-type="string">
-         <text:p text:style-name="P1"> </text:p>
-        </table:table-cell>
-        <table:table-cell table:style-name="Inner6.A1" office:value-type="string">
-         <text:p text:style-name="P1">/ Invoice No</text:p>
-        </table:table-cell>
-        <table:table-cell table:style-name="Inner6.B1" office:value-type="string">
-         <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;sale.full_number&gt;</text:placeholder></text:p>
-        </table:table-cell>
-        <table:table-cell table:style-name="Inner6.A1" office:value-type="string">
-         <text:p text:style-name="P1">/ D:</text:p>
-        </table:table-cell>
-        <table:table-cell table:style-name="Inner6.B1" office:value-type="string">
-         <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;sale.reference if sale.reference else &apos;&apos;&gt;</text:placeholder></text:p>
-        </table:table-cell>
-       </table:table-row>
-      </table:table>
      </table:table-cell>
     </table:table-row>
-    <table:table-row>
+    <table:table-row table:style-name="Tableau1.2">
-     <table:covered-table-cell table:style-name="BillOfExchange.A1"/>
+     <table:table-cell table:style-name="Tableau1.A1" table:number-columns-spanned="6" office:value-type="string">
-     <table:table-cell table:style-name="BillOfExchange.A1" office:value-type="string">
+      <text:p text:style-name="P1" loext:marker-style-name="T1"><text:span text:style-name="T1">***<text:placeholder text:placeholder-type="text">&lt;sale.report_bill_amount_words&gt;</text:placeholder>***</text:span><text:span text:style-name="T1"/></text:p>
-      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
      </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <table:table-row table:style-name="Tableau1.3">
+     <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Tableau1.A1" table:number-columns-spanned="4" office:value-type="string">
+      <text:p text:style-name="P1" loext:marker-style-name="T1"><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text">&lt;sale.currency.symbol if sale.currency else &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T1"/></text:p>
+      <text:p text:style-name="P3" loext:marker-style-name="T6"/>
+      <text:p text:style-name="P1" loext:marker-style-name="T1"><text:span text:style-name="T1"><text:s text:c="13"/><text:placeholder text:placeholder-type="text">&lt;(sale.party.addresses[0].country.name.upper()) if sale.party and sale.party.addresses and sale.party.addresses[0].country else &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T1"/></text:p>
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <table:table-row table:style-name="Tableau1.4">
+     <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Tableau1.A1" table:number-columns-spanned="5" office:value-type="string">
+      <text:p text:style-name="P4" loext:marker-style-name="T7"/>
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+      <text:p text:style-name="P1" loext:marker-style-name="T1"><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text">&lt;sale.party.rec_name&gt;</text:placeholder></text:span><text:span text:style-name="T1"/></text:p>
+      <text:p text:style-name="P1" loext:marker-style-name="T1"><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text">&lt;sale.full_number&gt;</text:placeholder></text:span><text:span text:style-name="T1"/></text:p>
+      <text:p text:style-name="P1" loext:marker-style-name="T1"><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text">&lt;sale.party.addresses[0].city if sale.party and sale.party.addresses else &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T1"/></text:p>
+      <text:p text:style-name="P1" loext:marker-style-name="T1"><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text">&lt;sale.reference if sale.reference else &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T1"/></text:p>
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <table:table-row table:style-name="Tableau1.5">
+     <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
+      <text:p text:style-name="P1" loext:marker-style-name="T5"><text:span text:style-name="T1"><text:s/></text:span><text:span text:style-name="T1"/></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Tableau1.A1" office:value-type="string">
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Tableau1.A1" table:number-columns-spanned="2" office:value-type="string">
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:table-cell table:style-name="Tableau1.A1" table:number-columns-spanned="2" office:value-type="string">
+      <text:p text:style-name="P2" loext:marker-style-name="T1"/>
+     </table:table-cell>
+     <table:covered-table-cell/>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P2" loext:marker-style-name="T1"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
   </office:text>
  </office:body>
-</office:document>
+</office:document>

modules/sale/bill_old.fodt

@@ -0,0 +1,653 @@
+<?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-15T13:01:38.668000000</dc:date><meta:editing-duration>PT10M4S</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:document-statistic meta:table-count="7" meta:image-count="0" meta:object-count="0" meta:page-count="1" meta:paragraph-count="22" meta:word-count="122" meta:character-count="932" meta:non-whitespace-character-count="828"/></office:meta>
+ <office:settings>
+  <config:config-item-set config:name="ooo:view-settings">
+   <config:config-item config:name="ViewAreaTop" config:type="long">0</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">31487</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">15713</config:config-item>
+   <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item>
+   <config:config-item-map-indexed config:name="Views">
+    <config:config-item-map-entry>
+     <config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">6627</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">7108</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">0</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">31485</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">15711</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>
+     <config:config-item config:name="ZoomFactor" config:type="short">140</config:config-item>
+     <config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item>
+     <config:config-item config:name="KeepRatio" config:type="boolean">false</config:config-item>
+     <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item>
+     <config:config-item config:name="LegacySingleLineFontwork" config:type="boolean">false</config:config-item>
+     <config:config-item config:name="ConnectorUseSnapRect" config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IgnoreBreakAfterMultilineField" config:type="boolean">false</config:config-item>
+    </config:config-item-map-entry>
+   </config:config-item-map-indexed>
+  </config:config-item-set>
+  <config:config-item-set config:name="ooo:configuration-settings">
+   <config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
+   <config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabAtLeftIndentForParagraphsInList" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item>
+   <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="UnxForceZeroExtLeading" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="UseOldNumbering" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrinterName" config:type="string"/>
+   <config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/>
+   <config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrinterPaperFromSetup" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="BackgroundParaOverDrawings" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="CurrentDatabaseCommand" config:type="string"/>
+   <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item>
+   <config:config-item config:name="DisableOffPagePositioning" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="SaveThumbnail" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="StylesNoDefault" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="CurrentDatabaseDataSource" config:type="string"/>
+   <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item>
+   <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/>
+   <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item>
+   <config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ClippedPictures" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddVerticalFrameOffsets" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="UnbreakableNumberings" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="HeaderSpacingBelowLastPara" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="TableRowKeep" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="TabOverflow" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="DoNotCaptureDrawObjsOnPage" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddParaLineSpacingToTableCells" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="CollapseEmptyCellPara" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedSystemFonts" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="DoNotResetParaAttrsForNumFont" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="FloattableNomargins" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IgnoreTabsAndBlanksForLineCalculation" config:type="boolean">false</config:config-item>
+   <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">1907347</config:config-item>
+   <config:config-item config:name="RsidRoot" config:type="int">1907347</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>
+   <config:config-item config:name="MsWordCompMinLineHeightByFly" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="MathBaselineAlignment" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="SmallCapsPercentage66" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="EmbedComplexScriptFonts" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="EmbedOnlyUsedFonts" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedLatinScriptFonts" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="TabOverMargin" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ApplyParagraphMarkFormatToNumbering" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabOverSpacing" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TreatSingleColumnBreakAsPageBreak" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SurroundTextWrapSmall" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PropLineSpacingShrinksFirstLine" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="SubtractFlysAnchoredAtFlys" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmptyDbFieldHidesPara" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ContinuousEndnotes" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ProtectBookmarks" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ProtectFields" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="FrameAutowidthWithMorePara" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="GutterAtTop" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="FootnoteInColumnToPageEnd" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="ImagePreferredDPI" config:type="int">0</config:config-item>
+   <config:config-item config:name="AutoFirstLineIndentDisregardLineSpace" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="HyphenateURLs" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="NoNumberingShowFollowBy" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="DropCapPunctuation" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item>
+   <config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintControls" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintLeftPages" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintEmptyPages" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintHiddenText" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintTextPlaceholder" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintReversed" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintFaxName" config:type="string"/>
+   <config:config-item config:name="PrintPaperFromSetup" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item>
+  </config:config-item-set>
+ </office:settings>
+ <office:scripts>
+  <office:script script:language="ooo:Basic">
+   <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+  </office:script>
+ </office:scripts>
+ <office:font-face-decls>
+  <style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Liberation Sans" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
+  <style:font-face style:name="Lucida Sans" svg:font-family="&apos;Lucida Sans&apos;" style:font-family-generic="swiss"/>
+  <style:font-face style:name="Lucida Sans1" svg:font-family="&apos;Lucida Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="Microsoft YaHei" svg:font-family="&apos;Microsoft YaHei&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="NSimSun" svg:font-family="NSimSun" style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+  <style:default-style style:family="graphic">
+   <style:graphic-properties svg:stroke-color="#3465a4" draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/>
+   <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" loext:tab-stop-distance="0cm" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Arial" fo:font-size="9pt" fo:language="en" fo:country="GB" style:letter-kerning="true" style:font-name-asian="NSimSun" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lucida Sans1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/>
+  </style:default-style>
+  <style:default-style style:family="paragraph">
+   <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/>
+   <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Arial" fo:font-size="9pt" fo:language="en" fo:country="GB" style:letter-kerning="true" style:font-name-asian="NSimSun" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lucida Sans1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="5" loext:hyphenation-zone="no-limit"/>
+  </style:default-style>
+  <style:default-style style:family="table">
+   <style:table-properties table:border-model="collapsing"/>
+  </style:default-style>
+  <style:default-style style:family="table-row">
+   <style:table-row-properties fo:keep-together="auto"/>
+  </style:default-style>
+  <style:style style:name="Standard" style:family="paragraph" style:class="text"/>
+  <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">
+   <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" fo:keep-with-next="always"/>
+   <style:text-properties style:font-name="Liberation Sans" fo:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" style:font-name-asian="Microsoft YaHei" style:font-family-asian="&apos;Microsoft YaHei&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-name-complex="Lucida Sans1" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt"/>
+  </style:style>
+  <style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.247cm" style:contextual-spacing="false" fo:line-height="115%"/>
+  </style:style>
+  <style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list">
+   <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Lucida Sans" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="swiss"/>
+  </style:style>
+  <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
+   <style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" text:number-lines="false" text:line-number="0"/>
+   <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Lucida Sans" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="swiss" style:font-size-complex="12pt" style:font-style-complex="italic"/>
+  </style:style>
+  <style:style style:name="Index" style:family="paragraph" style:parent-style-name="Standard" style:class="index">
+   <style:paragraph-properties text:number-lines="false" text:line-number="0"/>
+   <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Lucida Sans" style:font-family-complex="&apos;Lucida Sans&apos;" style:font-family-generic-complex="swiss"/>
+  </style:style>
+  <style:style style:name="Table_20_Contents" style:display-name="Table Contents" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
+   <style:paragraph-properties fo:orphans="0" fo:widows="0" text:number-lines="false" text:line-number="0"/>
+  </style:style>
+  <style:style style:name="Placeholder" style:family="text">
+   <style:text-properties fo:font-variant="small-caps" fo:color="#008080" loext:opacity="100%" style:text-underline-style="dotted" style:text-underline-width="auto" style:text-underline-color="font-color"/>
+  </style:style>
+  <text:outline-style style:name="Outline">
+   <text:outline-level-style text:level="1" style:num-format="">
+    <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+     <style:list-level-label-alignment text:label-followed-by="listtab"/>
+    </style:list-level-properties>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="2" style:num-format="">
+    <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+     <style:list-level-label-alignment text:label-followed-by="listtab"/>
+    </style:list-level-properties>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="3" style:num-format="">
+    <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+     <style:list-level-label-alignment text:label-followed-by="listtab"/>
+    </style:list-level-properties>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="4" style:num-format="">
+    <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+     <style:list-level-label-alignment text:label-followed-by="listtab"/>
+    </style:list-level-properties>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="5" style:num-format="">
+    <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+     <style:list-level-label-alignment text:label-followed-by="listtab"/>
+    </style:list-level-properties>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="6" style:num-format="">
+    <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+     <style:list-level-label-alignment text:label-followed-by="listtab"/>
+    </style:list-level-properties>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="7" style:num-format="">
+    <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+     <style:list-level-label-alignment text:label-followed-by="listtab"/>
+    </style:list-level-properties>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="8" style:num-format="">
+    <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+     <style:list-level-label-alignment text:label-followed-by="listtab"/>
+    </style:list-level-properties>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="9" style:num-format="">
+    <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+     <style:list-level-label-alignment text:label-followed-by="listtab"/>
+    </style:list-level-properties>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="10" style:num-format="">
+    <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+     <style:list-level-label-alignment text:label-followed-by="listtab"/>
+    </style:list-level-properties>
+   </text:outline-level-style>
+  </text:outline-style>
+  <text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
+  <text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/>
+  <text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>
+  <loext:theme loext:name="Office Theme">
+   <loext:theme-colors loext:name="LibreOffice">
+    <loext:color loext:name="dark1" loext:color="#000000"/>
+    <loext:color loext:name="light1" loext:color="#ffffff"/>
+    <loext:color loext:name="dark2" loext:color="#000000"/>
+    <loext:color loext:name="light2" loext:color="#ffffff"/>
+    <loext:color loext:name="accent1" loext:color="#18a303"/>
+    <loext:color loext:name="accent2" loext:color="#0369a3"/>
+    <loext:color loext:name="accent3" loext:color="#a33e03"/>
+    <loext:color loext:name="accent4" loext:color="#8e03a3"/>
+    <loext:color loext:name="accent5" loext:color="#c99c00"/>
+    <loext:color loext:name="accent6" loext:color="#c9211e"/>
+    <loext:color loext:name="hyperlink" loext:color="#0000ee"/>
+    <loext:color loext:name="followed-hyperlink" loext:color="#551a8b"/>
+   </loext:theme-colors>
+  </loext:theme>
+ </office:styles>
+ <office:automatic-styles>
+  <style:style style:name="BillOfExchange" style:family="table">
+   <style:table-properties style:width="20.001cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="BillOfExchange.A" style:family="table-column">
+   <style:table-column-properties style:column-width="4.75cm"/>
+  </style:style>
+  <style:style style:name="BillOfExchange.B" style:family="table-column">
+   <style:table-column-properties style:column-width="15.251cm"/>
+  </style:style>
+  <style:style style:name="BillOfExchange.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="BillOfExchange.B1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.101cm" fo:border="0.5pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner1" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner1.A" style:family="table-column">
+   <style:table-column-properties style:column-width="4.001cm"/>
+  </style:style>
+  <style:style style:name="Inner1.B" style:family="table-column">
+   <style:table-column-properties style:column-width="3.5cm"/>
+  </style:style>
+  <style:style style:name="Inner1.C" style:family="table-column">
+   <style:table-column-properties style:column-width="10.899cm"/>
+  </style:style>
+  <style:style style:name="Inner1.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="Inner1.C1" style:family="table-cell">
+   <style:table-cell-properties style:vertical-align="middle" fo:padding="0.101cm" fo:border="1.5pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner2" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner2.A" style:family="table-column">
+   <style:table-column-properties style:column-width="4.5cm"/>
+  </style:style>
+  <style:style style:name="Inner2.B" style:family="table-column">
+   <style:table-column-properties style:column-width="13.899cm"/>
+  </style:style>
+  <style:style style:name="Inner2.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner2.B1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="Inner3" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner3.A" style:family="table-column">
+   <style:table-column-properties style:column-width="18.399cm"/>
+  </style:style>
+  <style:style style:name="Inner3.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner4" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner4.A" style:family="table-column">
+   <style:table-column-properties style:column-width="2.499cm"/>
+  </style:style>
+  <style:style style:name="Inner4.B" style:family="table-column">
+   <style:table-column-properties style:column-width="15.9cm"/>
+  </style:style>
+  <style:style style:name="Inner4.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="Inner4.B1" style:family="table-cell">
+   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner5" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner5.A" style:family="table-column">
+   <style:table-column-properties style:column-width="2.499cm"/>
+  </style:style>
+  <style:style style:name="Inner5.B" style:family="table-column">
+   <style:table-column-properties style:column-width="15.9cm"/>
+  </style:style>
+  <style:style style:name="Inner5.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="Inner5.B1" style:family="table-cell">
+   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner6" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner6.A" style:family="table-column">
+   <style:table-column-properties style:column-width="2.499cm"/>
+  </style:style>
+  <style:style style:name="Inner6.B" style:family="table-column">
+   <style:table-column-properties style:column-width="3.5cm"/>
+  </style:style>
+  <style:style style:name="Inner6.F" style:family="table-column">
+   <style:table-column-properties style:column-width="3.902cm"/>
+  </style:style>
+  <style:style style:name="Inner6.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="Inner6.B1" style:family="table-cell">
+   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner1" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner1.A" style:family="table-column">
+   <style:table-column-properties style:column-width="4.001cm"/>
+  </style:style>
+  <style:style style:name="Inner1.B" style:family="table-column">
+   <style:table-column-properties style:column-width="3.5cm"/>
+  </style:style>
+  <style:style style:name="Inner1.C" style:family="table-column">
+   <style:table-column-properties style:column-width="10.899cm"/>
+  </style:style>
+  <style:style style:name="Inner1.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="Inner1.C1" style:family="table-cell">
+   <style:table-cell-properties style:vertical-align="middle" fo:padding="0.101cm" fo:border="1.5pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner2" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner2.A" style:family="table-column">
+   <style:table-column-properties style:column-width="4.5cm"/>
+  </style:style>
+  <style:style style:name="Inner2.B" style:family="table-column">
+   <style:table-column-properties style:column-width="13.899cm"/>
+  </style:style>
+  <style:style style:name="Inner2.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner2.B1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="Inner3" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner3.A" style:family="table-column">
+   <style:table-column-properties style:column-width="18.399cm"/>
+  </style:style>
+  <style:style style:name="Inner3.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner4" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner4.A" style:family="table-column">
+   <style:table-column-properties style:column-width="2.499cm"/>
+  </style:style>
+  <style:style style:name="Inner4.B" style:family="table-column">
+   <style:table-column-properties style:column-width="15.9cm"/>
+  </style:style>
+  <style:style style:name="Inner4.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="Inner4.B1" style:family="table-cell">
+   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner5" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner5.A" style:family="table-column">
+   <style:table-column-properties style:column-width="2.499cm"/>
+  </style:style>
+  <style:style style:name="Inner5.B" style:family="table-column">
+   <style:table-column-properties style:column-width="15.9cm"/>
+  </style:style>
+  <style:style style:name="Inner5.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="Inner5.B1" style:family="table-cell">
+   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Inner6" style:family="table">
+   <style:table-properties style:width="18.399cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left"/>
+  </style:style>
+  <style:style style:name="Inner6.A" style:family="table-column">
+   <style:table-column-properties style:column-width="2.499cm"/>
+  </style:style>
+  <style:style style:name="Inner6.B" style:family="table-column">
+   <style:table-column-properties style:column-width="3.5cm"/>
+  </style:style>
+  <style:style style:name="Inner6.F" style:family="table-column">
+   <style:table-column-properties style:column-width="3.902cm"/>
+  </style:style>
+  <style:style style:name="Inner6.A1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+  </style:style>
+  <style:style style:name="Inner6.B1" style:family="table-cell">
+   <style:table-cell-properties fo:padding-left="0.101cm" fo:padding-right="0.049cm" fo:padding-top="0.049cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="8pt"/>
+  </style:style>
+  <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="8pt" fo:font-weight="bold"/>
+  </style:style>
+  <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="8pt"/>
+  </style:style>
+  <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="end" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="8pt"/>
+  </style:style>
+  <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="7pt"/>
+  </style:style>
+  <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="7pt"/>
+  </style:style>
+  <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="9pt" fo:font-weight="bold"/>
+  </style:style>
+  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="7pt"/>
+  </style:style>
+  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Arial" fo:font-size="7pt" officeooo:paragraph-rsid="001d1a93"/>
+  </style:style>
+  <style:page-layout style:name="pm1">
+   <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="9.999cm" style:num-format="1" style:print-orientation="landscape" fo:margin-top="0.4cm" fo:margin-bottom="0.4cm" fo:margin-left="0.499cm" fo:margin-right="0.499cm" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+    <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
+   </style:page-layout-properties>
+   <style:header-style/>
+   <style:footer-style/>
+  </style:page-layout>
+  <style:style style:name="dp1" style:family="drawing-page">
+   <style:drawing-page-properties draw:background-size="full"/>
+  </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+  <style:master-page style:name="Standard" style:page-layout-name="pm1" draw:style-name="dp1"/>
+ </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="P1"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;sale in records&quot;&gt;</text:placeholder></text:p>
+   <table:table table:name="BillOfExchange" table:style-name="BillOfExchange">
+    <table:table-column table:style-name="BillOfExchange.A"/>
+    <table:table-column table:style-name="BillOfExchange.B"/>
+    <table:table-row>
+     <table:table-cell table:style-name="BillOfExchange.A1" table:number-rows-spanned="2" office:value-type="string">
+      <text:p text:style-name="P6">Accepted by:</text:p>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P6"/>
+      <text:p text:style-name="P9">Per aval:</text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="BillOfExchange.B1" office:value-type="string">
+      <table:table table:name="Inner1" table:style-name="Inner1">
+       <table:table-column table:style-name="Inner1.A"/>
+       <table:table-column table:style-name="Inner1.B"/>
+       <table:table-column table:style-name="Inner1.C"/>
+       <table:table-row>
+        <table:table-cell table:style-name="Inner1.A1" office:value-type="string">
+         <text:p text:style-name="P1">Geneva, <text:placeholder text:placeholder-type="text">&lt;format_date(sale.sale_date, sale.party.lang)&gt;</text:placeholder></text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Inner1.A1" office:value-type="string">
+         <text:p text:style-name="P1">For</text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Inner1.C1" office:value-type="string">
+         <text:p text:style-name="P7"><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-row>
+      </table:table>
+      <table:table table:name="Inner2" table:style-name="Inner2">
+       <table:table-column table:style-name="Inner2.A"/>
+       <table:table-column table:style-name="Inner2.B"/>
+       <table:table-row>
+        <table:table-cell table:style-name="Inner2.A1" office:value-type="string">
+         <text:p text:style-name="P1">At / on <text:placeholder text:placeholder-type="text">&lt;sale.payment_term.rec_name if sale.payment_term else &apos;&apos;&gt;</text:placeholder></text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Inner2.B1" office:value-type="string">
+         <text:p text:style-name="P1">for value received, please pay against this sole Bill of Exchange</text:p>
+        </table:table-cell>
+       </table:table-row>
+      </table:table>
+      <text:p text:style-name="P1">to our order of Melya S.A., Switzerland, the amount of</text:p>
+      <table:table table:name="Inner3" table:style-name="Inner3">
+       <table:table-column table:style-name="Inner3.A"/>
+       <table:table-row>
+        <table:table-cell table:style-name="Inner3.A1" office:value-type="string">
+         <text:p text:style-name="P1"> </text:p>
+        </table:table-cell>
+       </table:table-row>
+      </table:table>
+      <text:p text:style-name="P5">effective payment to be made in <text:placeholder text:placeholder-type="text">&lt;sale.currency.symbol if sale.currency else &apos;&apos;&gt;</text:placeholder> only, without deduction for and free of any taxes, impost, levies or duties present or future of any nature under the laws of <text:placeholder text:placeholder-type="text">&lt;sale.party.addresses[0].country.name if sale.party and sale.party.addresses else &apos;&apos;&gt;</text:placeholder> or any political subdivision thereof or therein.</text:p>
+      <table:table table:name="Inner4" table:style-name="Inner4">
+       <table:table-column table:style-name="Inner4.A"/>
+       <table:table-column table:style-name="Inner4.B"/>
+       <table:table-row>
+        <table:table-cell table:style-name="Inner4.A1" office:value-type="string">
+         <text:p text:style-name="P1">Payable at</text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Inner4.B1" office:value-type="string">
+         <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;sale.party.addresses[0].city if sale.party and sale.party.addresses else &apos;&apos;&gt;</text:placeholder></text:p>
+        </table:table-cell>
+       </table:table-row>
+      </table:table>
+      <table:table table:name="Inner5" table:style-name="Inner5">
+       <table:table-column table:style-name="Inner5.A"/>
+       <table:table-column table:style-name="Inner5.B"/>
+       <table:table-row>
+        <table:table-cell table:style-name="Inner5.A1" office:value-type="string">
+         <text:p text:style-name="P1">Drawn on at</text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Inner5.B1" office:value-type="string">
+         <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;sale.party.rec_name&gt;</text:placeholder></text:p>
+        </table:table-cell>
+       </table:table-row>
+      </table:table>
+      <table:table table:name="Inner6" table:style-name="Inner6">
+       <table:table-column table:style-name="Inner6.A"/>
+       <table:table-column table:style-name="Inner6.B"/>
+       <table:table-column table:style-name="Inner6.A"/>
+       <table:table-column table:style-name="Inner6.B"/>
+       <table:table-column table:style-name="Inner6.A"/>
+       <table:table-column table:style-name="Inner6.F"/>
+       <table:table-row>
+        <table:table-cell table:style-name="Inner6.A1" office:value-type="string">
+         <text:p text:style-name="P1">No</text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Inner6.B1" office:value-type="string">
+         <text:p text:style-name="P1"> </text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Inner6.A1" office:value-type="string">
+         <text:p text:style-name="P1">/ Invoice No</text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Inner6.B1" office:value-type="string">
+         <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;sale.full_number&gt;</text:placeholder></text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Inner6.A1" office:value-type="string">
+         <text:p text:style-name="P1">/ D:</text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Inner6.B1" office:value-type="string">
+         <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;sale.reference if sale.reference else &apos;&apos;&gt;</text:placeholder></text:p>
+        </table:table-cell>
+       </table:table-row>
+      </table:table>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:covered-table-cell table:style-name="BillOfExchange.A1"/>
+     <table:table-cell table:style-name="BillOfExchange.A1" office:value-type="string">
+      <text:p text:style-name="P6"/>
+     </table:table-cell>
+    </table:table-row>
+   </table:table>
+   <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
+  </office:text>
+ </office:body>
+</office:document>

modules/sale/sale.xml

@@ -422,18 +422,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="action" ref="report_bill"/>
         </record>
 
-        <record model="ir.action.report" id="report_sale_final">
-            <field name="name">Sale (final)</field>
-            <field name="model">sale.sale</field>
-            <field name="report_name">sale.sale</field>
-            <field name="report">sale/sale_final.fodt</field>
-        </record>
-        <record model="ir.action.keyword" id="report_sale_final_keyword">
-            <field name="keyword">form_print</field>
-            <field name="model">sale.sale,-1</field>
-            <field name="action" ref="report_sale_final"/>
-        </record>
-
         <record model="ir.ui.view" id="sale_line_view_form">
             <field name="model">sale.line</field>
             <field name="type">form</field>

modules/sale/sale_ict.fodt

@@ -4069,7 +4069,7 @@
               <text:s />
               <text:span text:style-name="T21">CROP </text:span>
               <text:span text:style-name="T21">
-                <text:placeholder text:placeholder-type="text">&lt;sale.crop.name&gt;</text:placeholder>
+                <text:placeholder text:placeholder-type="text">&lt;sale.report_crop_name&gt;</text:placeholder>
               </text:span>
             </text:p>
           </table:table-cell>
@@ -4091,10 +4091,19 @@
             <text:p text:style-name="P42" />
           </table:table-cell>
           <table:table-cell table:style-name="Table4.A1" office:value-type="string">
-            <text:p text:style-name="P31">ABOUT <text:placeholder text:placeholder-type="text">&lt;sum(line.quantity for line in sale.lines)&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 ''&gt;</text:placeholder><text:s /><text:span text:style-name="T23">(</text:span><text:span text:style-name="T23"><text:placeholder text:placeholder-type="text">&lt;sale.report_qt&gt;</text:placeholder></text:span><text:span text:style-name="T23">) </text:span></text:p>
+            <text:p text:style-name="P31">ABOUT <text:placeholder text:placeholder-type="text">&lt;sale.report_total_quantity&gt;</text:placeholder><text:s /><text:placeholder text:placeholder-type="text">&lt;sale.report_quantity_unit_upper&gt;</text:placeholder><text:s /><text:span text:style-name="T23">(</text:span><text:span text:style-name="T23"><text:placeholder text:placeholder-type="text">&lt;sale.report_qt&gt;</text:placeholder></text:span><text:span text:style-name="T23">) </text:span></text:p>
             <text:p text:style-name="P39">
               <text:placeholder text:placeholder-type="text">&lt;sale.report_nb_bale&gt;</text:placeholder>
             </text:p>
+            <text:p text:style-name="P39">
+              <text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.report_quantity_lines.splitlines()&quot;&gt;</text:placeholder>
+            </text:p>
+            <text:p text:style-name="P39">
+              <text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder>
+            </text:p>
+            <text:p text:style-name="P39">
+              <text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder>
+            </text:p>
             <text:p text:style-name="P39" />
           </table:table-cell>
         </table:table-row>
@@ -4110,27 +4119,13 @@
           </table:table-cell>
           <table:table-cell table:style-name="Table5.A1" office:value-type="string">
             <text:p text:style-name="P56">
-              <text:placeholder text:placeholder-type="text">&lt;sale.lines[0].linked_currency.rec_name.upper() if sale.lines[0].linked_currency else sale.currency.rec_name.upper()&gt;</text:placeholder>
+              <text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.report_price_lines.splitlines()&quot;&gt;</text:placeholder>
-              <text:s />
+            </text:p>
-              <text:placeholder text:placeholder-type="text">&lt;sale.lines[0].linked_price if sale.lines[0].linked_price else sale.lines[0].unit_price&gt;</text:placeholder>
+            <text:p text:style-name="P56">
-              <text:span text:style-name="T23">
+              <text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder>
-                <text:s />
+            </text:p>
-              </text:span>
+            <text:p text:style-name="P56">
-              <text:span text:style-name="T26">PER </text:span>
+              <text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder>
-              <text:span text:style-name="T26">
-                <text:placeholder text:placeholder-type="text">&lt;sale.lines[0].linked_unit.rec_name.upper() if sale.lines[0].linked_unit else sale.lines[0].unit.rec_name.upper()&gt;</text:placeholder>
-              </text:span>
-              <text:span text:style-name="T26">
-                <text:s />
-              </text:span>
-              <text:span text:style-name="T23">(</text:span>
-              <text:span text:style-name="T26">
-                <text:placeholder text:placeholder-type="text">&lt;sale.report_price&gt;</text:placeholder>
-              </text:span>
-              <text:span text:style-name="T23">) </text:span>
-              <text:span text:style-name="T23">
-                <text:placeholder text:placeholder-type="text">&lt;sale.lines[0].get_pricing_text&gt;</text:placeholder>
-              </text:span>
             </text:p>
             <text:p text:style-name="P37" />
           </table:table-cell>
@@ -4199,12 +4194,18 @@
             </text:p>
           </table:table-cell>
           <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+            <text:p text:style-name="P36">
+              <text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in sale.report_shipment_periods.splitlines()&quot;&gt;</text:placeholder>
+            </text:p>
             <text:p text:style-name="P36">
               <text:s />
               <text:span text:style-name="T24">
-                <text:placeholder text:placeholder-type="text">&lt;sale.lines[0].del_period.description if sale.lines[0].del_period else ''&gt;</text:placeholder>
+                <text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder>
               </text:span>
             </text:p>
+            <text:p text:style-name="P36">
+              <text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder>
+            </text:p>
             <text:p text:style-name="P34" />
           </table:table-cell>
         </table:table-row>
@@ -4389,4 +4390,4 @@
       </text:p>
     </office:text>
   </office:body>
-</office:document>
+</office:document>

modules/sale/sale_melya.fodt

@@ -1763,8 +1763,8 @@
       <text:p text:style-name="P25" loext:marker-style-name="T39"/>
       <text:p text:style-name="P24" loext:marker-style-name="T39"/>
       <text:p text:style-name="P24" loext:marker-style-name="T39"/>
-      <text:p text:style-name="P39" loext:marker-style-name="T26"><text:span text:style-name="T26"><text:s text:c="2"/></text:span><text:span text:style-name="T42"><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="P39" loext:marker-style-name="T26"><text:span text:style-name="T26"><text:s text:c="2"/></text:span><text:span text:style-name="T42"><text:placeholder text:placeholder-type="text">&lt;sale.report_product_name or &apos;&apos;&gt;</text:placeholder></text:span></text:p>
-      <text:p text:style-name="P30" loext:marker-style-name="T26"/>
+      <text:p text:style-name="P30" loext:marker-style-name="T26"><text:span text:style-name="T42"><text:placeholder text:placeholder-type="text">&lt;sale.report_product_description or &apos;&apos;&gt;</text:placeholder></text:span></text:p>
       <text:p text:style-name="P27" loext:marker-style-name="T42"><text:span text:style-name="T42"><text:s/></text:span></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.B2" office:value-type="string">
@@ -1791,7 +1791,7 @@
    <text:p text:style-name="P9"/>
    <text:p text:style-name="P9"/>
    <text:p text:style-name="P9"/>
-   <text:p text:style-name="P9"><text:span text:style-name="T51">SHIPMENT SCHEDULE</text:span>:<text:tab/><text:span text:style-name="T45"><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:span text:style-name="T51">SHIPMENT SCHEDULE</text:span>:<text:tab/><text:span text:style-name="T45"><text:placeholder text:placeholder-type="text">&lt;sale.report_delivery_period_description or &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"/>
@@ -1803,6 +1803,13 @@
    <text:p text:style-name="P2"/>
    <text:p text:style-name="P7">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="P2"/>
+   <text:p text:style-name="P8">BANK: UBS SWITZERLAND AG</text:p>
+   <text:p text:style-name="P8">Case Postale</text:p>
+   <text:p text:style-name="P8">CH-1211 Geneve 2</text:p>
+   <text:p text:style-name="P2"/>
+   <text:p text:style-name="P8">IBAN : CH36 0021 5215 2487 7461 D</text:p>
+   <text:p text:style-name="P8">SwifT Code: UBSWCHZH80A</text:p>
+   <text:p text:style-name="P2"/>
    <text:p text:style-name="P2"/>
    <text:p text:style-name="P2">DELIVERY IS SUBJECT TO THE DELIVERY BY OUR SUPPLIER.</text:p>
    <text:p text:style-name="P2"/>
@@ -1814,4 +1821,4 @@
    <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
   </office:text>
  </office:body>
-</office:document>
+</office:document>

notes/template_business_rules.md

@@ -0,0 +1,96 @@
+# Template Business Rules - Session Memo
+
+Date: 2026-04-08
+Scope: templates Relatorio + ponts `report_*` Python.
+
+## 1) Regles metier confirmees
+
+- `insurance.fodt`:
+  - "This is to certify that we have insured for account of" doit afficher la compagnie courante (`shipment.company.party`), pas le client.
+  - "Amount insured" suit la regle 110% de la valeur incoming.
+  - Base incoming: montant des incoming moves lies au shipment, derive des lots et de la source achat (`purchase.line.unit_price * current_quantity_converted`).
+- `sale bill`:
+  - La 2eme date attendue est une maturity date (echeance), pas le libelle de condition de paiement.
+  - Le montant en toutes lettres doit correspondre au montant du bill (montant facture/total), pas au prix unitaire d'une ligne.
+
+## 2) Pratiques templates Relatorio
+
+- Preferer des proprietes Python `report_*` stables sur le modele plutot que des expressions Genshi complexes.
+- Pour `stock.shipment.in`, privilegier `records[0].report_*` dans le template.
+- Si un placeholder s'affiche en brut dans le PDF:
+  - verifier que c'est un vrai `text:placeholder` ODF et pas du texte simple.
+  - verifier le scope de variable (`records[0]` vs variable locale non definie).
+- Dans les placeholders XML:
+  - utiliser `"` et `'` dans les expressions XML.
+  - eviter les echappements de type `\'`.
+
+## 3) Decisions de conception appliquees
+
+- `insurance.fodt`:
+  - ajout d'un champ shipment `surveyor` (party.party) via onglet "Surveyor".
+  - ajout d'une propriete `report_insurance_contact_surveyor` pour la zone "Contact the following surveyor".
+- `payment_order.fodt`:
+  - migration des tags `<...>` legacy vers la syntaxe template habituelle du projet.
+  - ajout de la section de config template, et exposition depuis `account.invoice` comme pour CN/DN/Invoice/Prepayment.
+- `packing_list.fodt`:
+  - date en haut droite basee sur la date du jour.
+  - unites Net/Gross alignees sur l'unite de `purchase.line`.
+- `bill.fodt`:
+  - suppression du report `sale_final.fodt` du menu sale.
+  - ajout de ponts Python cote sale pour:
+    - montant bill numerique,
+    - montant bill en lettres,
+    - maturity date issue de `invoice.lines_to_pay.maturity_date` (avec fallback metier).
+
+## 4) Check-list rapide avant validation d'un template
+
+- Les placeholders sont-ils tous resolus (aucun `<records[...]...>` brut)?
+- Le scope est-il correct (`records[0]` / `sale` / `invoice`) partout, y compris header/footer?
+- La source metier est-elle correcte (compagnie vs client, total vs unit_price, maturity date vs payment term)?
+- Les formats sont-ils conformes (date, devise, montant en lettres)?
+- Le template est-il bien expose dans la config + menu d'impression de la forme cible?
+
+## 5) Session 2026-04-09 - Rappels metier purchase_trade / account_invoice
+
+- Factures trade:
+  - `NET` et `GROSS` viennent de `lot.qt.hist` du lot retenu, pas de `invoice.line.quantity`.
+  - priorite lots: `physic` d'abord, sinon lot `virtual` unique.
+  - l'unite affichee vient de `lot.lot_unit_line`.
+  - les infos shipment doivent dependre des lots reels des lignes facture.
+  - le label `S/I` doit afficher `shipment.reference`.
+  - `invoice_ict_final.fodt`: si `NB BALES = 0`, afficher `Unchanged`.
+  - les quantites de `invoice_ict` et `invoice_ict_final` sont uniformisees a `2` decimales.
+  - la conversion vers `LBS` doit passer par `product.uom.compute_qty`, pas un facteur fixe.
+  - si plusieurs lignes reutilisent le meme lot, les lignes detaillees utilisent la quantite facturee convertie, mais le `GROSS` global doit continuer a refleter le vrai delta historique du lot.
+- CN / DN:
+  - cote `sale` / `out`: montant negatif => `Credit Note`, montant positif => `Debit Note`.
+  - cote `purchase` / `in`: logique inverse conservee.
+- Report sale:
+  - meme priorite lots que facture.
+  - les quantites en lettres suivent l'unite reelle (`MT`, `KILOGRAM`, `LBS`).
+  - le total convertit les lignes vers une unite commune.
+  - l'unite commune est celle du lot virtuel seulement s'il y a un seul lot virtuel sur tout le report.
+- Lots:
+  - `lot.report.r_del_period` affiche `sale.line.del_period` pour `lot_s` sans `lot_p`, sinon `purchase.line.del_period`.
+  - dans `Do weighing`, `lot_qt` doit etre editable et ecraser directement `lot.lot_qt`.
+- Factures client / fournisseur:
+  - `Validate` cree aussi le `account.move` pour les factures client.
+  - `Validate` attribue aussi le `number` pour les factures client; la numerotation ne doit plus attendre `Post` cote `out`.
+  - `Post` ne doit plus forcer une fresh session / demande de mot de passe sur ce flux.
+- Pricing:
+  - `pricing.pricing` peut etre saisi manuellement meme sans composant.
+  - en manuel, l'utilisateur saisit seulement `quantity` et `settl_price`.
+  - `fixed_qt`, `fixed_qt_price`, `unfixed_qt`, `unfixed_qt_price` sont derives automatiquement et restent non editables.
+  - `fixed_qt` = cumul des `quantity` du groupe.
+  - `fixed_qt_price` = moyenne ponderee cumulee des `settl_price`.
+  - `unfixed_qt` = quantite de base restante a fixer.
+  - `unfixed_qt_price` = `settl_price` de la ligne.
+  - `eod_price` reste non editable et suit le prix moyen pondere.
+  - le mode auto suit la meme formule.
+  - `last` est gere par groupe metier (`line + component`), avec un seul `last=True` par groupe.
+  - la ligne `last=True` est celle de `pricing_date` la plus grande; `id` ne sert qu'en tie-break.
+- Divers:
+  - `trader` filtre sur `TRADER`.
+  - `operator` filtre sur `OPERATOR`.
+  - les quotas/pricings doivent fallback sur `quantity` si `quantity_theorical` est vide.
+- `sale.line` / `purchase.line`: en mode `basis`, si aucun `price_component` n'est defini, le prix et la progression doivent remonter depuis la ligne `Summary` / `pricing.summary` sans component.

test.py

@@ -0,0 +1 @@
+#Commentaire de Sylvain