[update] sale template

i18n/fr.po

 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # 	* ap_report
+# 	* sale
 # 	* stock
 #
 msgid ""
@@ -397,6 +398,16 @@ msgstr ""
 msgid "séquences entières"
 msgstr ""
 
+#. module: sale
+#: model_terms:ir.ui.view,arch_db:sale.report_saleorder_document
+msgid "<strong>Expiration:</strong>"
+msgstr "<strong>Durée de validité :</strong>"
+
+#. module: sale
+#: model_terms:ir.ui.view,arch_db:sale.report_saleorder_document
+msgid "<strong>Salesperson:</strong>"
+msgstr "<strong>Référent :</strong>"
+
 #. module: stock
 #: model:ir.actions.report,name:stock.action_report_picking
 msgid "Picking Operations"

templates/report_sale.xml

@@ -5,39 +5,8 @@
         id="ap_report_saleorder_document"
         inherit_id="sale.report_saleorder_document"
     >
-        <xpath expr="//h2[hasclass('mt16')]" position="replace" />
-
-        <t
-            t-if="doc.partner_shipping_id == doc.partner_invoice_id
-                             and doc.partner_invoice_id != doc.partner_id
-                             or doc.partner_shipping_id != doc.partner_invoice_id"
-            position="replace"
-        >
-            <t
-                t-if="doc.partner_invoice_id != doc.partner_id
-                    or doc.partner_shipping_id != doc.partner_id"
-            >
-                <t t-set="information_block">
-                    <t t-if="doc.partner_invoice_id != doc.partner_id">
-                        <strong>Adresse de facturation:</strong>
-                        <div
-                            t-field="doc.partner_invoice_id"
-                            t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
-                        />
-                    </t>
-                    <t t-if="doc.partner_shipping_id != doc.partner_id">
-                        <strong>Adresse de livraison:</strong>
-                        <div
-                            t-field="doc.partner_shipping_id"
-                            t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
-                        />
-                    </t>
-                </t>
-            </t>
-        </t>
-
-        <xpath expr="//div[@t-field='doc.partner_id']" position="before">
-            <h2>
+        <xpath expr="//t[@t-set='address']" position="before">
+            <h3>
                 <t t-if="not (env.context.get('proforma', False) or is_pro_forma)">
                     <span t-if="doc.state not in ['draft','sent']">Commande n° </span>
                     <span t-if="doc.state in ['draft','sent']">Devis N° </span>
@@ -46,31 +15,24 @@
                     <span>Facture pro-forma n° </span>
                 </t>
                 <span t-field="doc.name" />
-            </h2>
+            </h3>
         </xpath>
-
-        <div t-if="doc.user_id.name" position="replace">
-            <div t-if="doc.user_id.name" class="col-auto col-3 mw-100 mb-2">
-                <strong>Référent:</strong>
-                <p class="m-0"><span t-field="doc.user_id" /><t
-                        t-if="doc.user_id.phone"
-                    >, <t t-esc="doc.user_id.phone" /></t></p>
-            </div>
-        </div>
-        <xpath expr="//div[hasclass('page')]" position="inside">
-            <p>Mention « bon pour accord » et signature du client</p>
+        <!-- Masque titre initial -->
+        <xpath expr="//h2[hasclass('mt16')]"  position="attributes">
+            <attribute name="style">display: none;</attribute>
         </xpath>
         
-        <xpath expr="//div[@name='signature']" position="before">
-            <p
-                t-if="doc.company_id.text_report"
-                name="text_tva"
-                class="mt-2 text-right"
-            >
-                <t t-esc="doc.company_id.text_report" />
-            </p>
+        <!-- Masque Shipping & Invoice address -->
+        <xpath expr="//t[@t-set='information_block']" position="replace" />
+
+        <!-- Ajout du tel sur le référent -->
+        <xpath expr="//p[@t-field='doc.user_id']" position="after">
+            <t t-if="doc.user_id.phone">
+                <t t-esc="doc.user_id.phone" />
+            </t>
         </xpath>
 
+        <!-- Remplacement des tableaux de prix et totaux -->
         <table class="table table-sm o_main_table" position="replace">
             <table class="table table-sm o_main_table">
                 <!-- In case we want to repeat the header, remove "display: table-row-group" -->
@@ -279,6 +241,21 @@
             </div>
         </div>
 
+        <!-- Mention de bas de page -->
+        <xpath expr="//div[hasclass('page')]" position="inside">
+            <p>Mention « bon pour accord » et signature du client</p>
+        </xpath>
+
+        <xpath expr="//div[@name='signature']" position="before">
+            <p
+                t-if="doc.company_id.text_report"
+                name="text_tva"
+                class="mt-2 text-right"
+            >
+                <t t-esc="doc.company_id.text_report" />
+            </p>
+        </xpath>
+
     </template>
 
 </odoo>