From 897a4baecf62256ca5e4f08f048e90ab0c090776 Mon Sep 17 00:00:00 2001
From: "Antoine Vandevenne (anv)" <anv@odoo.com>
Date: Fri, 27 Sep 2019 16:33:05 +0000
Subject: [PATCH] [IMP] product(_matrix): clean demo product for matrix

Before this commit, the product 'My Company Tshirt' had too much PTAL and PTAV which lead to an overloaded matrix.

This commit removes the 'Sleeves' attribute, reorder the other attributes and remove the Size attributes '2XL' and '3XL'.

task-2052537

closes odoo/odoo#37543

Signed-off-by: Damien Bouvy (dbo) <dbo@odoo.com>
---
 addons/product/data/product_demo.xml          |  5 +-
 .../data/product_matrix_demo.xml              | 70 ++++++-------------
 2 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/addons/product/data/product_demo.xml b/addons/product/data/product_demo.xml
index db05606e7ab..d3f2ede9e2f 100644
--- a/addons/product/data/product_demo.xml
+++ b/addons/product/data/product_demo.xml
@@ -132,7 +132,7 @@
 
         <record id="product_attribute_1" model="product.attribute">
             <field name="name">Legs</field>
-            <field name="sequence">1</field>
+            <field name="sequence">10</field>
         </record>
         <record id="product_attribute_value_1" model="product.attribute.value">
             <field name="name">Steel</field>
@@ -147,7 +147,7 @@
 
         <record id="product_attribute_2" model="product.attribute">
             <field name="name">Color</field>
-            <field name="sequence">2</field>
+            <field name="sequence">20</field>
         </record>
         <record id="product_attribute_value_3" model="product.attribute.value">
             <field name="name">White</field>
@@ -162,6 +162,7 @@
 
         <record id="product_attribute_3" model="product.attribute">
             <field name="name">Duration</field>
+            <field name="sequence">30</field>
         </record>
         <record id="product_attribute_value_5" model="product.attribute.value">
             <field name="name">1 year</field>
diff --git a/addons/product_matrix/data/product_matrix_demo.xml b/addons/product_matrix/data/product_matrix_demo.xml
index 981a2437c0e..479458bb981 100644
--- a/addons/product_matrix/data/product_matrix_demo.xml
+++ b/addons/product_matrix/data/product_matrix_demo.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo noupdate="1">
+    
+    <!-- Size -->
     <record id="product_attribute_size" model="product.attribute">
         <field name="name">Size</field>
+        <field name="sequence">19</field>
     </record>
     <record id="product_attribute_value_size_xs" model="product.attribute.value">
         <field name="name">XS</field>
@@ -28,46 +31,8 @@
         <field name="attribute_id" ref="product_attribute_size"/>
         <field name="sequence">5</field>
     </record>
-    <record id="product_attribute_value_size_xxl" model="product.attribute.value">
-        <field name="name">2XL</field>
-        <field name="attribute_id" ref="product_attribute_size"/>
-        <field name="sequence">6</field>
-    </record>
-    <record id="product_attribute_value_size_xxxl" model="product.attribute.value">
-        <field name="name">3XL</field>
-        <field name="attribute_id" ref="product_attribute_size"/>
-        <field name="sequence">7</field>
-    </record>
-
-    <record id="product_attribute_gender" model="product.attribute">
-        <field name="name">Gender</field>
-    </record>
-    <record id="product_attribute_value_m" model="product.attribute.value">
-        <field name="name">Men</field>
-        <field name="attribute_id" ref="product_attribute_gender"/>
-        <field name="sequence">1</field>
-    </record>
-    <record id="product_attribute_value_w" model="product.attribute.value">
-        <field name="name">Women</field>
-        <field name="attribute_id" ref="product_attribute_gender"/>
-        <field name="sequence">2</field>
-    </record>
-
-    <record id="product_attribute_sleeves" model="product.attribute">
-        <field name="name">Sleeves</field>
-    </record>
-    <record id="product_attribute_value_ss" model="product.attribute.value">
-        <field name="name">Short Sleeves</field>
-        <field name="attribute_id" ref="product_attribute_sleeves"/>
-        <field name="sequence">1</field>
-    </record>
-    <record id="product_attribute_value_ls" model="product.attribute.value">
-        <field name="name">Long Sleeves</field>
-        <field name="attribute_id" ref="product_attribute_sleeves"/>
-        <field name="sequence">2</field>
-    </record>
-
-    <!-- Color Attribute Values -->
+    
+    <!-- Color -->
     <record id="product_attribute_value_color_1" model="product.attribute.value">
         <field name="name">Blue</field>
         <field name="attribute_id" ref="product.product_attribute_2"/>
@@ -88,6 +53,22 @@
         <field name="attribute_id" ref="product.product_attribute_2"/>
         <field name="sequence">6</field>
     </record>
+    
+    <!-- Gender -->
+    <record id="product_attribute_gender" model="product.attribute">
+        <field name="name">Gender</field>
+        <field name="sequence">21</field>
+    </record>
+    <record id="product_attribute_value_m" model="product.attribute.value">
+        <field name="name">Men</field>
+        <field name="attribute_id" ref="product_attribute_gender"/>
+        <field name="sequence">1</field>
+    </record>
+    <record id="product_attribute_value_w" model="product.attribute.value">
+        <field name="name">Women</field>
+        <field name="attribute_id" ref="product_attribute_gender"/>
+        <field name="sequence">2</field>
+    </record>
 
     <record id="matrix_product_template_shirt" model="product.template">
         <field name="name">My Company Tshirt (GRID)</field>
@@ -110,20 +91,13 @@
           ref('product_attribute_value_size_s'),
           ref('product_attribute_value_size_m'),
           ref('product_attribute_value_size_l'),
-          ref('product_attribute_value_size_xl'),
-          ref('product_attribute_value_size_xxl'),
-          ref('product_attribute_value_size_xxxl')])]"/>
+          ref('product_attribute_value_size_xl')])]"/>
     </record>
     <record id="product_template_attribute_line_gender" model="product.template.attribute.line">
         <field name="product_tmpl_id" ref="matrix_product_template_shirt"/>
         <field name="attribute_id" ref="product_attribute_gender"/>
         <field name="value_ids" eval="[(6, 0, [ref('product_attribute_value_m'), ref('product_attribute_value_w')])]"/>
     </record>
-    <record id="product_template_attribute_line_sleeves" model="product.template.attribute.line">
-        <field name="product_tmpl_id" ref="matrix_product_template_shirt"/>
-        <field name="attribute_id" ref="product_attribute_sleeves"/>
-        <field name="value_ids" eval="[(6, 0, [ref('product_attribute_value_ss'), ref('product_attribute_value_ls')])]"/>
-    </record>
     <record id="product_template_attribute_line_color" model="product.template.attribute.line">
         <field name="product_tmpl_id" ref="matrix_product_template_shirt"/>
         <field name="attribute_id" ref="product.product_attribute_2"/>