From 568cba01fb0e5e0d6067a0ea05b7edc669f6e388 Mon Sep 17 00:00:00 2001
From: Ilyas <irazor147@gmail.com>
Date: Fri, 7 Jul 2023 12:45:10 +0200
Subject: [PATCH] upd

---
 .../demo/demo_data.xml                        | 66 +++++++++++--------
 .../views/views.xml                           |  8 ++-
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/sale_commission_product_criteria_domain/demo/demo_data.xml b/sale_commission_product_criteria_domain/demo/demo_data.xml
index 31535ea5a..936db7ca7 100644
--- a/sale_commission_product_criteria_domain/demo/demo_data.xml
+++ b/sale_commission_product_criteria_domain/demo/demo_data.xml
@@ -6,6 +6,17 @@
         <field name="commission_type">product_restricted</field>
     </record>
 
+    <!--  Commission Groups  -->
+    <record id="demo_cig_spain" model="commission.items.group">
+        <field name="name">Spain</field>
+        <field name="commission_id" ref="demo_commission_rules_restrict" />
+    </record>
+
+    <record id="demo_cig_italy" model="commission.items.group">
+        <field name="name">Italy</field>
+        <field name="commission_id" ref="demo_commission_rules_restrict" />
+    </record>
+
     <!--  Commission Items  -->
     <record id="demo_crr_item_1" model="commission.item">
         <field name="commission_id" ref="demo_commission_rules_restrict" />
@@ -14,6 +25,7 @@
         <field name="applied_on">3_global</field>
         <field name="commission_type">fixed</field>
         <field name="fixed_amount">10</field>
+        <field name="group_id" ref="demo_cig_italy" />
     </record>
 
     <record id="demo_crr_item_2" model="commission.item">
@@ -24,6 +36,7 @@
         <field name="commission_type">fixed</field>
         <field name="fixed_amount">20</field>
         <field name="categ_id" ref="product.product_category_5" />
+        <field name="group_id" ref="demo_cig_spain" />
     </record>
 
     <record id="demo_crr_item_3" model="commission.item">
@@ -37,6 +50,7 @@
             name="product_tmpl_id"
             ref="product.product_product_4_product_template"
         />
+        <field name="group_id" ref="demo_cig_spain" />
     </record>
 
     <record id="demo_crr_item_4" model="commission.item">
@@ -47,48 +61,48 @@
         <field name="commission_type">percentage</field>
         <field name="percent_amount">15</field>
         <field name="product_id" ref="product.product_product_4" />
+        <field name="group_id" ref="demo_cig_spain" />
     </record>
 
-    <record id="demo_cti_spain" model="commission.item">
-        <field name="commission_id" ref="demo_commission_rules_restrict" />
-        <field name="group_id" ref="demo_cig_spain" />
-        <field name="sequence" eval="22" />
-        <field name="based_on">sol</field>
+    <record id="demo_crr_item_5_disc" model="commission.item">
+        <field
+            name="commission_id"
+            ref="sale_commission_product_criteria.demo_commission_rules"
+        />
+        <field name="sequence" eval="1" />
+        <field name="based_on">discount</field>
         <field name="applied_on">1_product</field>
         <field name="commission_type">fixed</field>
-        <field name="fixed_amount">55</field>
+        <field name="fixed_amount">7.50</field>
+        <field name="discount_from">10.01</field>
+        <field name="discount_to">100</field>
         <field
             name="product_tmpl_id"
-            model="product.template"
-            eval="obj().env.ref('product.product_product_8').product_tmpl_id"
+            ref="product.product_product_11_product_template"
         />
+        <field name="group_id" ref="demo_cig_italy" />
     </record>
 
-    <record id="demo_cti_italy" model="commission.item">
-        <field name="commission_id" ref="demo_commission_rules_restrict" />
-        <field name="group_id" ref="demo_cig_italy" />
-        <field name="sequence" eval="23" />
-        <field name="based_on">sol</field>
+    <record id="demo_crr_item_6_disc" model="commission.item">
+        <field
+            name="commission_id"
+            ref="sale_commission_product_criteria.demo_commission_rules"
+        />
+        <field name="sequence" eval="2" />
+        <field name="based_on">discount</field>
         <field name="applied_on">1_product</field>
         <field name="commission_type">fixed</field>
-        <field name="fixed_amount">66</field>
+        <field name="fixed_amount">15</field>
+        <field name="discount_from">0</field>
+        <field name="discount_to">10</field>
         <field
             name="product_tmpl_id"
-            model="product.template"
-            eval="obj().env.ref('product.product_product_8').product_tmpl_id"
+            ref="product.product_product_1_product_template"
         />
+        <field name="group_id" ref="demo_cig_spain" />
     </record>
 
-    <record id="demo_cig_spain" model="commission.items.group">
-        <field name="name">Spain</field>
-        <field name="commission_id" ref="demo_commission_rules_restrict" />
-    </record>
-
-    <record id="demo_cig_italy" model="commission.items.group">
-        <field name="name">Italy</field>
-        <field name="commission_id" ref="demo_commission_rules_restrict" />
-    </record>
-
+    <!-- Agents -->
     <record id="demo_agent_rules_restricted" model="res.partner">
         <field name="name">Agent Rules Restricted</field>
         <field name="is_company">True</field>
diff --git a/sale_commission_product_criteria_domain/views/views.xml b/sale_commission_product_criteria_domain/views/views.xml
index c9498c966..dd041abf2 100644
--- a/sale_commission_product_criteria_domain/views/views.xml
+++ b/sale_commission_product_criteria_domain/views/views.xml
@@ -44,7 +44,11 @@
                     <group>
                         <group>
                             <field name="agent_id" />
-                            <field name="group_ids" widget="many2many_tags" required="1"/>
+                            <field
+                                name="group_ids"
+                                widget="many2many_tags"
+                                required="1"
+                            />
                             <field name="agent_group_ids" invisible="1" />
                             <field name="partner_agent_ids" invisible="1" />
                             <field name="partner_id" invisible="1" />
@@ -62,7 +66,7 @@
         <field name="arch" type="xml">
             <tree string="Agents Items Restriction">
                 <field name="agent_id" />
-                <field name="group_ids" widget="many2many_tags" required="1"/>
+                <field name="group_ids" widget="many2many_tags" required="1" />
                 <field name="agent_group_ids" invisible="1" />
                 <field name="partner_agent_ids" invisible="1" />
                 <field name="partner_id" invisible="1" />