From 523f873124f41bfb6b266171ab51e571698d59d8 Mon Sep 17 00:00:00 2001
From: hveficent <hector.villarreal@eficent.com>
Date: Mon, 6 May 2019 13:34:48 +0200
Subject: [PATCH] [11.0][FIX] stock_request_tier_validation: update tier
 definitions

---
 stock_request_tier_validation/__manifest__.py |  2 +-
 .../data/stock_request_tier_definition.xml    |  6 ++-
 .../views/stock_request_order_view.xml        | 39 ++++++++++++++++---
 .../views/stock_request_view.xml              | 39 ++++++++++++++++---
 4 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/stock_request_tier_validation/__manifest__.py b/stock_request_tier_validation/__manifest__.py
index 87fcb9939..9103c6623 100644
--- a/stock_request_tier_validation/__manifest__.py
+++ b/stock_request_tier_validation/__manifest__.py
@@ -4,7 +4,7 @@
     "name": "Stock Request Tier Validation",
     "summary": "Extends the functionality of Stock Requests to "
                "support a tier validation process.",
-    "version": "11.0.1.0.0",
+    "version": "11.0.1.0.1",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
     "author": "Eficent, Odoo Community Association (OCA)",
diff --git a/stock_request_tier_validation/data/stock_request_tier_definition.xml b/stock_request_tier_validation/data/stock_request_tier_definition.xml
index 258a1b501..1c3cbb468 100644
--- a/stock_request_tier_validation/data/stock_request_tier_definition.xml
+++ b/stock_request_tier_validation/data/stock_request_tier_definition.xml
@@ -6,7 +6,8 @@
 
         <record id="stock_request_default_tier_definition" model="tier.definition">
             <field name="model_id" ref="model_stock_request"/>
-            <field name="python_code">1==1</field>
+            <field name="definition_type">domain</field>
+            <field name="definition_domain"/>
             <field name="review_type">group</field>
             <field name="reviewer_group_id" ref='stock_request.group_stock_request_manager'/>
             <field name="active">False</field>
@@ -14,7 +15,8 @@
 
         <record id="stock_request_order_default_tier_definition" model="tier.definition">
             <field name="model_id" ref="model_stock_request_order"/>
-            <field name="python_code">1==1</field>
+            <field name="definition_type">domain</field>
+            <field name="definition_domain"/>
             <field name="review_type">group</field>
             <field name="reviewer_group_id" ref='stock_request.group_stock_request_manager'/>
             <field name="active">False</field>
diff --git a/stock_request_tier_validation/views/stock_request_order_view.xml b/stock_request_tier_validation/views/stock_request_order_view.xml
index 2b070a5da..46ee7d8af 100644
--- a/stock_request_tier_validation/views/stock_request_order_view.xml
+++ b/stock_request_tier_validation/views/stock_request_order_view.xml
@@ -59,11 +59,9 @@
                     <p><i class="fa fa-thumbs-down"/> Operation has been <b>rejected</b>.</p>
                 </div>
             </header>
-            <notebook position="inside">
-                <page string="Reviews" name="tier_validation">
-                    <field name="review_ids" readonly="1"/>
-                </page>
-            </notebook>
+            <div name="button_box" position="inside">
+                <field name="review_ids" widget="review_popup" attrs="{'invisible':[('review_ids', '=', [])]}"/>
+            </div>
         </field>
     </record>
 
@@ -85,4 +83,35 @@
         </field>
     </record>
 
+    <record id="tier_review_order_form_wiz" model="ir.ui.view">
+        <field name="name">stock.request.order.reviews</field>
+        <field name="model">stock.request.order</field>
+        <field name="arch" type="xml">
+            <form string="Tier Review">
+                <group>
+                    <field name="review_ids" nolabel="1" readonly="1">
+                        <tree create="false"
+                              decoration-danger="status=='rejected'"
+                              decoration-warning="status=='pending'"
+                              decoration-success="status=='approved'">
+                            <field name="sequence"/>
+                            <field name="requested_by"/>
+                            <field name="review_type"/>
+                            <field name="name"/>
+                            <field name="status"/>
+                            <field name="done_by"/>
+                        </tree>
+                    </field>
+                </group>
+                <footer>
+                    <button name="dismiss_popup"
+                            type="object"
+                            string="Dismiss"
+                            class="oe_highlight"
+                    />
+                </footer>
+            </form>
+        </field>
+    </record>
+
 </odoo>
diff --git a/stock_request_tier_validation/views/stock_request_view.xml b/stock_request_tier_validation/views/stock_request_view.xml
index 6f7cf931f..d879dd4e8 100644
--- a/stock_request_tier_validation/views/stock_request_view.xml
+++ b/stock_request_tier_validation/views/stock_request_view.xml
@@ -59,11 +59,9 @@
                     <p><i class="fa fa-thumbs-down"/> Operation has been <b>rejected</b>.</p>
                 </div>
             </header>
-            <notebook position="inside">
-                <page string="Reviews" name="tier_validation">
-                    <field name="review_ids" readonly="1"/>
-                </page>
-            </notebook>
+            <div name="button_box" position="inside">
+                <field name="review_ids" widget="review_popup" attrs="{'invisible':[('review_ids', '=', [])]}"/>
+            </div>
         </field>
     </record>
 
@@ -85,4 +83,35 @@
         </field>
     </record>
 
+    <record id="tier_review_form_wiz" model="ir.ui.view">
+        <field name="name">stock.request.order.reviews</field>
+        <field name="model">stock.request.order</field>
+        <field name="arch" type="xml">
+            <form string="Tier Review">
+                <group>
+                    <field name="review_ids" nolabel="1" readonly="1">
+                        <tree create="false"
+                              decoration-danger="status=='rejected'"
+                              decoration-warning="status=='pending'"
+                              decoration-success="status=='approved'">
+                            <field name="sequence"/>
+                            <field name="requested_by"/>
+                            <field name="review_type"/>
+                            <field name="name"/>
+                            <field name="status"/>
+                            <field name="done_by"/>
+                        </tree>
+                    </field>
+                </group>
+                <footer>
+                    <button name="dismiss_popup"
+                            type="object"
+                            string="Dismiss"
+                            class="oe_highlight"
+                    />
+                </footer>
+            </form>
+        </field>
+    </record>
+
 </odoo>