From 9576d59f7ea21041bbb240d826c2a58539b54133 Mon Sep 17 00:00:00 2001
From: "Andrea Grazioso (agr-odoo)" <agr@odoo.com>
Date: Thu, 19 Jan 2023 11:49:35 +0000
Subject: [PATCH] [FIX] l10n_it_stock_ddt: support dropshipping in ddt
Have an IT company configured
Activate Dropship
Create a Product P with dropship enabled and vendor configured
Create a quotation to an IT customer, add P to a line, confirm.
Purchase will be created automatically, confirm it.
Go to dropship picking, confirm, print
The DDT report does not show up correctly:
- Warehouse address is the company address
- Customer address is the vendor address
opw-3128812
Part-of: odoo/odoo#121822
---
.../report/l10n_it_ddt_report.xml | 29 +++++++++++--------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/addons/l10n_it_stock_ddt/report/l10n_it_ddt_report.xml b/addons/l10n_it_stock_ddt/report/l10n_it_ddt_report.xml
index 32eee94f8797..3cbba6d047c2 100644
--- a/addons/l10n_it_stock_ddt/report/l10n_it_ddt_report.xml
+++ b/addons/l10n_it_stock_ddt/report/l10n_it_ddt_report.xml
@@ -3,29 +3,34 @@
<template id="report_ddt_view">
<t t-call="web.external_layout">
<t t-set="o" t-value="o.with_context(lang=lang)"/>
+ <t t-if="o.move_ids_without_package and o.move_ids_without_package[0].partner_id and o.location_dest_id.usage == 'customer' and o.location_id.usage == 'supplier'">
+ <t t-set="delivery_from" t-value="o.partner_id"/>
+ <t t-set="delivery_to" t-value="o.move_ids_without_package[0].partner_id"/>
+ </t>
+ <t t-elif="o.picking_type_id.warehouse_id.partner_id">
+ <t t-set="delivery_from" t-value="o.picking_type_id.warehouse_id.partner_id"/>
+ <t t-set="delivery_to" t-value="o.partner_id"/>
+ </t>
+ <t t-else="">
+ <t t-set="delivery_from" t-value="o.company_id.partner_id"/>
+ <t t-set="delivery_to" t-value="o.partner_id"/>
+ </t>
<div class="page">
<div class="row">
<div class="col-6">
<span><strong>Warehouse Address:</strong></span>
- <t t-set="delivery_from" t-value="o.picking_type_id.warehouse_id.partner_id or o.company_id.partner_id"/>
- <t t-if="o.picking_type_id.warehouse_id.partner_id">
- <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}'/>
- </t>
- <t t-else="">
- <div t-field="o.company_id.partner_id"
- t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
- </t>
+ <div t-esc="delivery_from"
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
<p t-if="delivery_from.vat">VAT: <span t-field="delivery_from.vat"/></p>
</div>
<div class="col-5 offset-1">
<div>
<span><strong>Customer Address:</strong></span>
- <div t-field="o.partner_id"
+ <div t-esc="delivery_to"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
- <p t-if="o.partner_id.vat">
+ <p t-if="delivery_to.vat">
<t t-set="default_vat_label">VAT</t>
- <t t-esc="o.company_id.account_fiscal_country_id.vat_label or default_vat_label"/>: <span t-field="o.partner_id.vat"/>
+ <t t-esc="delivery_to.country_id.vat_label or default_vat_label"/>: <span t-esc="delivery_to.vat"/>
</p>
</div>
</div>
--
GitLab