Skip to content
Snippets Groups Projects
Commit ca59d082 authored by Ahmed Khalaf's avatar Ahmed Khalaf
Browse files

[FIX] stock: delivery address in picking reports


Before this commit, when printing a The picking operation or delivery slip
reports for outgoing transfers, both the delivery and customer address are displayed
showing the same address.

The expected behavior is to have customer address only of there is a commercial
partner behind the delivery address, thus the customer address is hidden
if its not the case.

opw-3289441

closes odoo/odoo#123075

Signed-off-by: default avatarWilliam Henrotin (whe) <whe@odoo.com>
parent 1c67945d
Branches
Tags
No related merge requests found
......@@ -23,16 +23,20 @@
<t t-set="information_block">
<div class="row">
<div class="col-7" name="div_incoming_address">
<t t-set="show_partner" t-value="False" />
<div t-if="o.picking_type_id.code=='incoming' and partner">
<span><strong>Vendor Address:</strong></span>
<t t-set="show_partner" t-value="True" />
</div>
<div t-if="o.picking_type_id.code=='internal' and partner">
<span><strong>Warehouse Address:</strong></span>
<t t-set="show_partner" t-value="True" />
</div>
<div t-if="o.picking_type_id.code=='outgoing' and partner">
<div t-if="o.picking_type_id.code=='outgoing' and partner and partner != partner.commercial_partner_id">
<span><strong>Customer Address:</strong></span>
<t t-set="show_partner" t-value="True" />
</div>
<div t-if="partner" name="partner_header">
<div t-if="show_partner" name="partner_header">
<div t-field="partner.commercial_partner_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
<p t-if="partner.sudo().commercial_partner_id.vat"><t t-esc="o.company_id.country_id.vat_label or 'Tax ID'"/>: <span t-field="partner.sudo().commercial_partner_id.vat"/></p>
......
......@@ -26,19 +26,23 @@
</div>
</div>
<div class="col-5 offset-1" name="div_incoming_address">
<t t-set="show_partner" t-value="False" />
<div t-if="o.picking_type_id.code=='incoming' and o.partner_id">
<span><strong>Vendor Address:</strong></span>
<t t-set="show_partner" t-value="True" />
</div>
<div t-if="o.picking_type_id.code=='internal' and o.partner_id">
<span><strong>Warehouse Address:</strong></span>
<t t-set="show_partner" t-value="True" />
</div>
<div t-if="o.picking_type_id.code=='outgoing' and o.partner_id">
<div t-if="o.picking_type_id.code=='outgoing' and o.partner_id and o.partner_id != o.partner_id.commercial_partner_id">
<span><strong>Customer Address:</strong></span>
<t t-set="show_partner" t-value="True" />
</div>
<div t-if="o.partner_id" name="partner_header">
<div t-field="o.partner_id"
<div t-if="show_partner" name="partner_header">
<div t-field="o.partner_id.commercial_partner_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
<p t-if="o.sudo().partner_id.vat"><t t-esc="o.company_id.country_id.vat_label or 'Tax ID'"/>: <span t-field="o.sudo().partner_id.vat"/></p>
<p t-if="o.sudo().partner_id.commercial_partner_id.vat"><t t-esc="o.company_id.country_id.vat_label or 'Tax ID'"/>: <span t-field="o.sudo().partner_id.commercial_partner_id.vat"/></p>
</div>
</div>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment