From dd23daec01a3bc78e63d12b075c73c6bb74ae60b Mon Sep 17 00:00:00 2001
From: Pratima Gupta <pgu@odoo.com>
Date: Tue, 5 May 2020 10:24:25 +0000
Subject: [PATCH] [FIX] sale_stock: deley alert is invisible on sales order

Here before this commit, if delivery is late for any sale order,
a warning alert is expected, but was missing on it.

commitment_date_div which contains field json_popover was replaced
by new div without json_popover, was leading the issue.

Fixes#2246833

closes odoo/odoo#50813

Signed-off-by: Simon Lejeune (sle) <sle@openerp.com>
---
 addons/sale_stock/views/sale_order_views.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/sale_stock/views/sale_order_views.xml b/addons/sale_stock/views/sale_order_views.xml
index 50dcdcfe9f9..6a071b18457 100644
--- a/addons/sale_stock/views/sale_order_views.xml
+++ b/addons/sale_stock/views/sale_order_views.xml
@@ -25,10 +25,6 @@
                     <field name="incoterm" widget="selection" groups="sale_stock.group_display_incoterm"/>
                     <field name="picking_policy" required="True"/>
                 </xpath>
-                <xpath expr="//page[@name='other_information']//field[@name='expected_date']" position="after">
-                    <field name="show_json_popover" invisible="1"/>
-                    <field string=" " name="json_popover" widget="stock_rescheduling_popover" attrs="{'invisible': [('show_json_popover', '=', False)]}"/>
-                </xpath>
                 <xpath expr="//div[@name='commitment_date_div']" position="replace">
                     <div class="o_row">
                         <field name="commitment_date"/>
@@ -36,6 +32,10 @@
                     </div>
                     <field name="effective_date" attrs="{'invisible': [('effective_date', '=', False)]}"/>
                 </xpath>
+                <xpath expr="//page[@name='other_information']//field[@name='expected_date']" position="after">
+                    <field name="show_json_popover" invisible="1"/>
+                    <field string=" " name="json_popover" widget="stock_rescheduling_popover" attrs="{'invisible': [('show_json_popover', '=', False)]}"/>
+                </xpath>
                 <xpath expr="//page/field[@name='order_line']/form/group/group/field[@name='price_unit']" position="before">
                     <field name="product_packaging" attrs="{'invisible': [('product_id', '=', False)]}" context="{'default_product_id': product_id, 'tree_view_ref':'product.product_packaging_tree_view', 'form_view_ref':'product.product_packaging_form_view'}" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" />
                 </xpath>