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

[IMP] stock: delivery slip address format

Browse Source 
Make delivery slip show addresses the same way as picking operations

Task 2334764

closes odoo/odoo#67776

Signed-off-by: William Henrotin <Whenrow@users.noreply.github.com>
This commit is contained in:
yhu-odoo
2021-06-24 10:40:35 +00:00
parent 825bc6b1d7
commit af13e76629
3 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/models/stock_move.py
-11
View File
@@ -582,17 +582,6 @@ class StockMove(models.Model):
move_to_recompute_state._recompute_state()
if receipt_moves_to_reassign:
receipt_moves_to_reassign._action_assign()
# when assign picking for inter-warehouse transfers, set the warehouses as partners on pickings
if 'picking_id' in vals:
picking = self.picking_id
partner = self.env['res.partner']
if picking.location_dest_id == picking.company_id.internal_transit_location_id:
partner = self.move_dest_ids.location_dest_id.warehouse_id.partner_id
if picking.location_id == picking.company_id.internal_transit_location_id:
partner = self.move_orig_ids.location_id.warehouse_id.partner_id
if len(partner) == 1:
picking.partner_id = partner
return res
def _delay_alert_get_documents(self):
addons/stock/models/stock_rule.py
+9
View File
@@ -297,6 +297,15 @@ class StockRule(models.Model):
if not self.location_id.should_bypass_reservation():
move_dest_ids = values.get('move_dest_ids', False) and [(4, x.id) for x in values['move_dest_ids']] or []
# when create chained moves for inter-warehouse transfers, set the warehouses as partners
if not partner and move_dest_ids:
move_dest = values['move_dest_ids']
if location_id == company_id.internal_transit_location_id:
partners = move_dest.location_dest_id.warehouse_id.partner_id
if len(partners) == 1:
partner = partners
move_dest.partner_id = partner
move_values = {
'name': name[:2000],
'company_id': self.company_id.id or self.location_src_id.company_id.id or self.location_id.company_id.id or company_id.id,
addons/stock/report/report_deliveryslip.xml
+30 -6
View File
@@ -5,14 +5,38 @@
<t t-call="web.external_layout">
<t t-set="o" t-value="o.with_context(lang=o.partner_id.lang)" />
<t t-set="partner" t-value="o.partner_id or (o.move_lines and o.move_lines[0].partner_id) or False"/>
<t t-if="partner" name="partner_header">
<t t-set="address">
<div t-esc="partner"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True}'/>
</t>
</t>
<div class="page">
<div class="row">
<div class="col-6" name="div_outgoing_address">
<div t-if="o.move_ids_without_package and o.move_ids_without_package[0].partner_id and o.move_ids_without_package[0].partner_id.id != o.partner_id.id">
<span><strong>Delivery Address:</strong></span>
<div t-field="o.move_ids_without_package[0].partner_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
</div>
<div t-if="o.picking_type_id.code != 'internal' and (not o.move_ids_without_package or not o.move_ids_without_package[0].partner_id) and o.picking_type_id.warehouse_id.partner_id">
<span><strong>Warehouse Address:</strong></span>
<div t-field="o.picking_type_id.warehouse_id.partner_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
</div>
</div>
<div class="col-5 offset-1" name="div_incoming_address">
<div t-if="o.picking_type_id.code=='incoming' and partner">
<span><strong>Vendor Address:</strong></span>
</div>
<div t-if="o.picking_type_id.code=='internal' and partner">
<span><strong>Warehouse Address:</strong></span>
</div>
<div t-if="o.picking_type_id.code=='outgoing' and partner">
<span><strong>Customer Address:</strong></span>
</div>
<div t-if="partner" name="partner_header">
<div t-field="partner.self"
t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True, "phone_icons": True}'/>
<p t-if="partner.sudo().vat"><t t-esc="o.company_id.country_id.vat_label or 'Tax ID'"/>: <span t-field="partner.sudo().vat"/></p>
</div>
</div>
</div>
<h2>
<span t-field="o.name"/>
</h2>