pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] stock: delivery address in picking reports

Browse Source 
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#123365

X-original-commit: 5802295f3935648c4f2c5f9a45f223dcb1f7a7b8
Signed-off-by: Ahmed Khalaf (ahkh) <ahkh@odoo.com>
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
This commit is contained in:
Ahmed Khalaf
2023-06-05 14:49:40 +02:00
parent d2637f617d
commit f8cb7d15ef
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/report/report_deliveryslip.xml
+6 -2
View File
@@ -25,16 +25,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 name="vendor_address" 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 name="warehouse_address" 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 name="customer_address" t-if="o.picking_type_id.code=='outgoing' and partner">
<div name="customer_address" 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", "vat"], "no_marker": True, "phone_icons": True}'/>
</div>
addons/stock/report/report_stockpicking_operations.xml
+7 -3
View File
@@ -26,17 +26,21 @@
</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", "vat"], "no_marker": True, "phone_icons": True}'/>
</div>
</div>