From 38c375783fdcc5969092be3d03079a0811522045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Voet=20=28ryv=29?= <ryv@odoo.com>
Date: Thu, 14 May 2020 11:20:15 +0200
Subject: [PATCH] [FIX] (purchase_)mrp(_account): fix order stats button MO

Task: 2241471
---
 addons/mrp/views/mrp_production_views.xml     | 24 +++++++++----------
 .../views/mrp_production_views.xml            |  2 +-
 .../views/mrp_production_views.xml            |  3 ++-
 .../sale_mrp/views/mrp_production_views.xml   |  1 +
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index f1d5a82f4d5..334d549627b 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -88,18 +88,8 @@
                     <field name="reserve_visible" invisible="1"/>
                     <field name="consumption" invisible="1"/>
                     <field name="is_planned" invisible="1"/>
+                    <field name="workorder_ids" invisible="1"/>
                     <div class="oe_button_box" name="button_box">
-                        <button name="%(stock.action_stock_report)d" icon="fa-arrow-up" class="oe_stat_button" string="Traceability" type="action" states="done" groups="stock.group_production_lot"/>
-                        <button name="%(action_mrp_production_moves)d" type="action" string="Product Moves" class="oe_stat_button" icon="fa-exchange" attrs="{'invisible': [('state', 'not in', ('progress', 'done'))]}"/>
-                        <button type="object" name="action_view_mo_delivery" class="oe_stat_button" icon="fa-truck"  groups="base.group_user" attrs="{'invisible': [('delivery_count', '=', 0)]}">
-                            <field name="delivery_count" widget="statinfo" string="Transfers"/>
-                        </button>
-                        <button class="oe_stat_button" name="action_see_move_scrap" type="object" icon="fa-arrows-v" attrs="{'invisible': [('scrap_count', '=', 0)]}">
-                            <div class="o_field_widget o_stat_info">
-                                <span class="o_stat_value"><field name="scrap_count"/></span>
-                                <span class="o_stat_text">Scraps</span>
-                            </div>
-                        </button>
                         <button class="oe_stat_button" name="action_view_mrp_production_childs" type="object" icon="fa-wrench" attrs="{'invisible': [('mrp_production_child_count', '=', 0)]}">
                             <div class="o_field_widget o_stat_info">
                                 <span class="o_stat_value"><field name="mrp_production_child_count"/></span>
@@ -118,7 +108,17 @@
                                 <span class="o_stat_text">Backorder MO's</span>
                             </div>
                         </button>
-                        <field name="workorder_ids" invisible="1"/>
+                        <button class="oe_stat_button" name="action_see_move_scrap" type="object" icon="fa-arrows-v" attrs="{'invisible': [('scrap_count', '=', 0)]}">
+                            <div class="o_field_widget o_stat_info">
+                                <span class="o_stat_value"><field name="scrap_count"/></span>
+                                <span class="o_stat_text">Scraps</span>
+                            </div>
+                        </button>
+                        <button type="object" name="action_view_mo_delivery" class="oe_stat_button" icon="fa-truck"  groups="base.group_user" attrs="{'invisible': [('delivery_count', '=', 0)]}">
+                            <field name="delivery_count" widget="statinfo" string="Transfers"/>
+                        </button>
+                        <button name="%(stock.action_stock_report)d" icon="fa-arrow-up" class="oe_stat_button" string="Traceability" type="action" states="done" groups="stock.group_production_lot"/>
+                        <button name="%(action_mrp_production_moves)d" type="action" string="Product Moves" class="oe_stat_button" icon="fa-exchange" attrs="{'invisible': [('state', 'not in', ('progress', 'done'))]}"/>
                     </div>
                     <div class="oe_title">
                         <h1><field name="name" placeholder="Manufacturing Reference" nolabel="1"/></h1>
diff --git a/addons/mrp_account/views/mrp_production_views.xml b/addons/mrp_account/views/mrp_production_views.xml
index 4b693206991..4b1083c7a41 100644
--- a/addons/mrp_account/views/mrp_production_views.xml
+++ b/addons/mrp_account/views/mrp_production_views.xml
@@ -8,7 +8,7 @@
             <xpath expr="//field[@name='product_id']" position="before">
                 <field name="show_valuation" invisible="1"/>
             </xpath>
-            <xpath expr="//button[@name='action_view_mrp_production_sources']" position="after">
+            <xpath expr="//div[@name='button_box']" position="inside">
                 <button string="Valuation" type="object"
                     name="action_view_stock_valuation_layers"
                     class="oe_stat_button" icon="fa-dollar" groups="base.group_no_one"
diff --git a/addons/purchase_mrp/views/mrp_production_views.xml b/addons/purchase_mrp/views/mrp_production_views.xml
index bcfd3b70fe1..8aaffd649b2 100644
--- a/addons/purchase_mrp/views/mrp_production_views.xml
+++ b/addons/purchase_mrp/views/mrp_production_views.xml
@@ -3,9 +3,10 @@
     <record id="mrp_production_form_view_purchase" model="ir.ui.view">
         <field name="name">mrp.production.inherited.form.purchase</field>
         <field name="model">mrp.production</field>
+        <field name="priority">32</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@name='button_box']" position="inside">
+            <xpath expr="//button[@name='action_view_mrp_production_childs']" position="before">
                 <button class="oe_stat_button" name="action_view_purchase_orders" type="object" icon="fa-credit-card" groups="purchase.group_purchase_user" attrs="{'invisible': [('purchase_order_count', '=', 0)]}">
                     <div class="o_field_widget o_stat_info">
                         <span class="o_stat_value"><field name="purchase_order_count"/></span>
diff --git a/addons/sale_mrp/views/mrp_production_views.xml b/addons/sale_mrp/views/mrp_production_views.xml
index c1607cb0e20..114b532fd0c 100644
--- a/addons/sale_mrp/views/mrp_production_views.xml
+++ b/addons/sale_mrp/views/mrp_production_views.xml
@@ -3,6 +3,7 @@
     <record id="mrp_production_form_view_sale" model="ir.ui.view">
         <field name="name">mrp.production.inherited.form.sale</field>
         <field name="model">mrp.production</field>
+        <field name="priority">64</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//button[@name='action_view_mrp_production_childs']" position="before">