From 78d2fa901673ea2010b16e37d5b807bf0dc99466 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 25 Nov 2020 16:01:11 +0000
Subject: [PATCH] [FIX] delivery: default invoicing policy

Since commit https://github.com/odoo/odoo/commit/3ad4abe171e8e7e86ed0e7b7f000e734d8a2ad92
the default invoicing policy of a product is set to 'delivery'. This is
not ok for the delivery products: a delivery product is never delivered.

This is confusing to end users, because they do not realize that a
delivery line is not included in an invoice. This is especially true if
the delivery is free.

This commit sets the default policy to 'order' for master data and for
newly created products from the shipping form view.

opw-2387437

closes odoo/odoo#62357

X-original-commit: 4c2768846809f6687d03eb0d7f501e57c2c93a90
Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
---
 addons/delivery/data/delivery_data.xml  | 1 +
 addons/delivery/data/delivery_demo.xml  | 1 +
 addons/delivery/views/delivery_view.xml | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/delivery/data/delivery_data.xml b/addons/delivery/data/delivery_data.xml
index eb71e21b6db..b363d8bda92 100644
--- a/addons/delivery/data/delivery_data.xml
+++ b/addons/delivery/data/delivery_data.xml
@@ -13,6 +13,7 @@
             <field name="sale_ok" eval="False"/>
             <field name="purchase_ok" eval="False"/>
             <field name="list_price">0.0</field>
+            <field name="invoice_policy">order</field>
         </record>
         <record id="free_delivery_carrier" model="delivery.carrier">
             <field name="name">Free delivery charges</field>
diff --git a/addons/delivery/data/delivery_demo.xml b/addons/delivery/data/delivery_demo.xml
index 63f11f573e3..ad9f22c3918 100644
--- a/addons/delivery/data/delivery_demo.xml
+++ b/addons/delivery/data/delivery_demo.xml
@@ -12,6 +12,7 @@
             <field name="sale_ok" eval="False"/>
             <field name="purchase_ok" eval="False"/>
             <field name="list_price">20.0</field>
+            <field name="invoice_policy">order</field>
         </record>
 
         <record id="delivery_carrier" model="delivery.carrier">
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index f9969bb1794..bac707d6121 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -107,7 +107,7 @@
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>
                             <group name="delivery_details">
-                                <field name="product_id" context="{'default_type': 'service', 'default_sale_ok': False, 'default_purchase_ok': False}" />
+                                <field name="product_id" context="{'default_type': 'service', 'default_sale_ok': False, 'default_purchase_ok': False, 'default_invoice_policy': 'order'}" />
                                 <field name="invoice_policy" widget="radio" attrs="{'invisible': ['|', ('delivery_type', 'in', ('fixed', 'base_on_rule')), ('integration_level', '=', 'rate')]}"/>
                                 <label for="margin" string="Margin on Rate"/>
                                 <div>