Merge PR #3881 into 14.0

Signed-off-by aleuffre
OCA · Jan 23, 2024 · 0893a41 · 0893a41
2 parents 0ae0b7b + 2e400c2
commit 0893a41
Showing 1 changed file with 7 additions and 40 deletions.
diff --git a/l10n_it_delivery_note/report/report_delivery_note.xml b/l10n_it_delivery_note/report/report_delivery_note.xml
@@ -54,46 +54,13 @@
                     <h4>
                         <strong>Delivery address:</strong>
                     </h4>
-                    <t t-if="doc.partner_id.id == doc.partner_sender_id.id">
-                        <div
-                            t-field="doc.partner_shipping_id"
-                            t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
-                        />
-                        <p t-if="doc.partner_shipping_id.vat"><t
-                                t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"
-                            />: <span t-field="doc.partner_shipping_id.vat" /></p>
-                    </t>
-                    <t t-if="doc.partner_id.id != doc.partner_sender_id.id">
-                        <t
-                            t-if="doc.partner_sender_id.id != doc.partner_shipping_id.id"
-                        >
-                            <small>
-                                <div
-                                    t-field="doc.partner_sender_id"
-                                    t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
-                                />
-                                <p t-if="doc.partner_sender_id.vat"><t
-                                        t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"
-                                    />: <span t-field="doc.partner_sender_id.vat" /></p>
-                            </small>
-                            <div
-                                t-field="doc.partner_shipping_id"
-                                t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
-                            />
-                            <p t-if="doc.partner_shipping_id.vat"><t
-                                    t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"
-                                />: <span t-field="doc.partner_shipping_id.vat" /></p>
-                        </t>
-                        <t t-else="">
-                            <div
-                                t-field="doc.partner_sender_id"
-                                t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
-                            />
-                            <p t-if="doc.partner_sender_id.vat"><t
-                                    t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"
-                                />: <span t-field="doc.partner_sender_id.vat" /></p>
-                        </t>
-                    </t>
+                    <div
+                        t-field="doc.partner_shipping_id"
+                        t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
+                    />
+                    <p t-if="doc.partner_shipping_id.vat"><t
+                            t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"
+                        />: <span t-field="doc.partner_shipping_id.vat" /></p>
                 </t>
                 <t t-if="doc.picking_ids and doc.picking_ids[0].location_id.id">
                     <t t-set="information_block">