From f470fa47e303fbc0a43c42b1df7520018c53483a Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Mon, 25 May 2020 08:26:57 +0200
Subject: [PATCH] Improve usability

---
 .../models/stock_reserve_rule.py              |   7 +-
 .../views/stock_reserve_rule_views.xml        | 123 +++++++++---------
 2 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/stock_reserve_rule/models/stock_reserve_rule.py b/stock_reserve_rule/models/stock_reserve_rule.py
index c4f473f77..af7ef4cab 100644
--- a/stock_reserve_rule/models/stock_reserve_rule.py
+++ b/stock_reserve_rule/models/stock_reserve_rule.py
@@ -41,7 +41,12 @@ class StockReserveRule(models.Model):
         comodel_name="res.company", default=lambda self: self.env.user.company_id.id
     )
 
-    location_id = fields.Many2one(comodel_name="stock.location", required=True)
+    location_id = fields.Many2one(
+        comodel_name="stock.location",
+        required=True,
+        help="Rule applied only in this location and sub-locations.",
+    )
+    )
 
     rule_removal_ids = fields.One2many(
         comodel_name="stock.reserve.rule.removal", inverse_name="rule_id"
diff --git a/stock_reserve_rule/views/stock_reserve_rule_views.xml b/stock_reserve_rule/views/stock_reserve_rule_views.xml
index fb0c80148..f2ac7d28d 100644
--- a/stock_reserve_rule/views/stock_reserve_rule_views.xml
+++ b/stock_reserve_rule/views/stock_reserve_rule_views.xml
@@ -4,64 +4,69 @@
         <field name="name">stock.reserve.rule.form</field>
         <field name="model">stock.reserve.rule</field>
         <field name="arch" type="xml">
-            <form string="Stock Reservation Rule">
-                <div class="oe_button_box" name="button_box">
-                </div>
-                <widget
-                    name="web_ribbon"
-                    title="Archived"
-                    bg_color="bg-danger"
-                    attrs="{'invisible': [('active', '=', True)]}"
-                />
-                <label for="name" class="oe_edit_only" />
-                <h1>
-                    <field name="name" />
-                </h1>
-                <group string="Rule Applicability" name="configuration">
-                    <group>
-                        <field name="active" invisible="1" />
-                        <field name="location_id" />
-                        <field name="sequence" />
-                    </group>
-                    <group>
-                        <field
-                            name="rule_domain"
-                            widget="domain"
-                            options="{'model': 'stock.move', 'in_dialog': true}"
-                        />
-                        <field name="company_id" groups="base.group_multi_company" />
-                    </group>
-                </group>
-                <group string="Removal Rules" name="rule" col="1">
-                    <field name="rule_removal_ids" nolabel="1">
-                        <tree string="Removal Rules">
-                            <field name="sequence" widget="handle" />
-                            <field name="name" />
+            <form string="Reservation Rule">
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                    </div>
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <label for="name" class="oe_edit_only" />
+                    <h1>
+                        <field name="name" />
+                    </h1>
+                    <group string="Rule Applicability" name="configuration">
+                        <group>
+                            <field name="active" invisible="1" />
                             <field name="location_id" />
-                            <field name="removal_strategy" />
-                        </tree>
-                        <form string="Removal Rule">
-                            <group>
+                            <field name="sequence" />
+                        </group>
+                        <group>
+                            <field
+                                name="rule_domain"
+                                widget="domain"
+                                options="{'model': 'stock.move', 'in_dialog': true}"
+                            />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                    </group>
+                    <group string="Removal Rules" name="rule" col="1">
+                        <field name="rule_removal_ids" nolabel="1">
+                            <tree string="Removal Rules">
+                                <field name="sequence" widget="handle" />
                                 <field name="name" />
-                                <field
-                                    name="location_id"
-                                    domain="[('id', 'child_of', parent.location_id)]"
-                                />
+                                <field name="location_id" />
                                 <field name="removal_strategy" />
-                                <field
-                                    name="packaging_type_ids"
-                                    widget="many2many_tags"
-                                    attrs="{'invisible': [('removal_strategy', '!=', 'packaging')]}"
-                                />
-                                <field
-                                    name="quant_domain"
-                                    widget="domain"
-                                    options="{'model': 'stock.quant', 'in_dialog': true}"
-                                />
-                            </group>
-                        </form>
-                    </field>
-                </group>
+                            </tree>
+                            <form string="Removal Rule">
+                                <group>
+                                    <field name="name" />
+                                    <field
+                                        name="location_id"
+                                        domain="[('id', 'child_of', parent.location_id)]"
+                                    />
+                                    <field name="removal_strategy" />
+                                    <field
+                                        name="packaging_type_ids"
+                                        widget="many2many_tags"
+                                        attrs="{'invisible': [('removal_strategy', '!=', 'packaging')]}"
+                                    />
+                                    <field
+                                        name="quant_domain"
+                                        widget="domain"
+                                        options="{'model': 'stock.quant', 'in_dialog': true}"
+                                    />
+                                </group>
+                            </form>
+                        </field>
+                    </group>
+                </sheet>
             </form>
         </field>
     </record>
@@ -69,7 +74,7 @@
         <field name="name">stock.reserve.rule.search</field>
         <field name="model">stock.reserve.rule</field>
         <field name="arch" type="xml">
-            <search string="Stock Reservation Rule">
+            <search string="Reservation Rule">
                 <field name="name" />
                 <field name="location_id" />
                 <separator />
@@ -85,7 +90,7 @@
         <field name="name">stock.reserve.rule</field>
         <field name="model">stock.reserve.rule</field>
         <field name="arch" type="xml">
-            <tree string="Stock Reservation Rule">
+            <tree string="Reservation Rule">
                 <field name="sequence" widget="handle" />
                 <field name="name" />
                 <field name="location_id" />
@@ -94,7 +99,7 @@
         </field>
     </record>
     <record id="action_stock_reserve_rule" model="ir.actions.act_window">
-        <field name="name">Stock Reservation Rules</field>
+        <field name="name">Reservation Rules</field>
         <field name="res_model">stock.reserve.rule</field>
         <field name="type">ir.actions.act_window</field>
         <field name="view_id" ref="view_stock_reserve_rule_tree" />
@@ -102,7 +107,7 @@
         <field name="context" />
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
-                Add a Stock Reservation Rule
+                Add a Reservation Rule
             </p>
         </field>
     </record>