Skip to content

[FIX] stock_ux, stock_batch_picking_ux: drop removed partner mobile field #982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jue-adhoc wants to merge 1 commit into
base: 19.0
Choose a base branch
from
+6 −36
Open

[FIX] stock_ux, stock_batch_picking_ux: drop removed partner mobile field #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 6 additions & 30 deletions stock_batch_picking_ux/reports/picking_templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,31 +67,17 @@
,
<t class="oe_inline" t-esc="batch.partner_id.country_id.name"/>
^FS ^FO50,545^FDTel: ^FS
<t t-if="batch.partner_id and (batch.partner_id.phone != False or batch.partner_id.mobile != False)">
<t t-if="batch.partner_id.phone">
<t t-if="batch.partner_id and batch.partner_id.phone">
^FO100,545^FD
<t t-esc="batch.partner_id.phone"/>
^FS
</t>
<t t-else="">
^FO100,545^FD
<t t-esc="batch.partner_id.mobile"/>
^FS
</t>
</t>
<t t-if="batch.partner_id.parent_id and (batch.partner_id.parent_id.phone != False or batch.partner_id.parent_id.mobile != False) and (batch.partner_id.phone == False and batch.partner_id.mobile == False)">
<t t-if="batch.partner_id.parent_id.phone">
<t t-elif="batch.partner_id.parent_id and batch.partner_id.parent_id.phone">
Comment thread
jue-adhoc marked this conversation as resolved.
^FO100,545^FD
<t t-esc="batch.partner_id.parent_id.phone"/>
^FS
</t>
<t t-else="">
^FO100,545^FD
<t t-esc="batch.partner_id.parent_id.mobile"/>
^FS
</t>
</t>
<t t-else="">
^FS
</t>
^FS^FS ^FO50,655^GB700,3,3^FS
Expand Down Expand Up @@ -190,21 +176,11 @@ Fecha
,
<t class="oe_inline" t-esc="batch.partner_id.country_id.name"/>
<div style="font-weight: normal;">Tel:
<t t-if="batch.partner_id and (batch.partner_id.phone != False or batch.partner_id.mobile != False)">
<t t-if="batch.partner_id.phone">
<t t-esc="batch.partner_id.phone"/>
</t>
<t t-else="">
<t t-esc="batch.partner_id.mobile"/>
</t>
<t t-if="batch.partner_id and batch.partner_id.phone">
<t t-esc="batch.partner_id.phone"/>
</t>
<t t-if="batch.partner_id.parent_id and (batch.partner_id.parent_id.phone != False or batch.partner_id.parent_id.mobile != False) and (batch.partner_id.phone == False and batch.partner_id.mobile == False)">
<t t-if="batch.partner_id.parent_id.phone">
<t t-esc="batch.partner_id.parent_id.phone"/>
</t>
<t t-else="">
<t t-esc="batch.partner_id.parent_id.mobile"/>
</t>
<t t-elif="batch.partner_id.parent_id and batch.partner_id.parent_id.phone">
<t t-esc="batch.partner_id.parent_id.phone"/>
</t>
<t t-else="">
</t>
Expand Down
6 changes: 0 additions & 6 deletions stock_ux/report/picking_templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,9 @@
<t t-if="picking.partner_id and picking.partner_id.phone">
^FO100,545^FD<t t-esc="picking.partner_id.phone"/>^FS
</t>
<t t-elif="picking.partner_id and picking.partner_id.mobile">
^FO100,545^FD<t t-esc="picking.partner_id.mobile"/>^FS
</t>
<t t-elif="picking.partner_id.parent_id and picking.partner_id.parent_id.phone">
^FO100,545^FD<t t-esc="picking.partner_id.parent_id.phone"/>^FS
</t>
<t t-elif="picking.partner_id.parent_id and picking.partner_id.parent_id.mobile">
^FO100,545^FD<t t-esc="picking.partner_id.parent_id.mobile"/>^FS
</t>
<!-- Fin destino -->
<t t-if="picking._fields.get('carrier_id') and picking.carrier_id">
^FX Transportista ^CFJ,30 ^FO50,615^FDTransportista: ^FS ^FO260,615^FD<t t-esc="picking.carrier_id.name"/>^FS
Expand Down