[IMP]: product: Improvement in product category demo, improved xml_id refereneces (work in progress)

bzr revid: rpa@tinyerp.com-20120628093001-k113siqn5sbp3xf2

addons/delivery/delivery_demo.xml

@@ -13,7 +13,7 @@
             <field name="name">Delivery by Poste</field>
             <field name="default_code">Delivery</field>
             <field name="type">service</field>
-            <field name="categ_id" ref="product.product_category_services"/>
+            <field name="categ_id" ref="product.product_category_6"/>
         </record>
 
         <!-- Carrier -->

addons/event_sale/event_demo.xml

@@ -13,7 +13,7 @@
         <field name="name">Technical Training</field>
         <field name="event_ok">True</field>
         <field name="event_type_id" ref="event.event_type_4"/>
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="type">service</field>
         <field name="list_price">2500.0</field>
         <field name="standard_price">1000.0</field>

addons/hr_expense/hr_expense_data.xml

@@ -5,7 +5,7 @@
     Resource: product.uom.categ
     -->
        <record id="cat_expense" model="product.category">
-            <field name="parent_id" ref="product.cat0"/>
+            <field name="parent_id" ref="product.product_category_0"/>
             <field name="name">Expenses</field>
         </record>
 

addons/membership/membership_demo.xml

@@ -9,7 +9,7 @@
         <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
         <field name="name">Golden Membership</field>
         <field name="list_price">180</field>
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="type">service</field>
     </record>
     <record id="membership_1" model="product.product">
@@ -17,7 +17,7 @@
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
         <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
         <field name="name">Silver Membership</field>
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="list_price">80</field>
         <field name="type">service</field>
     </record>
@@ -26,7 +26,7 @@
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
         <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
         <field name="name">Basic Membership</field>
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="list_price">40</field>
         <field name="type">service</field>
     </record>

addons/membership/test/test_membership.yml

@@ -4,7 +4,7 @@
   I'm creating "Gold Membership" which has Membership fee 80 EURO and It's started from 1st June to 31st Dec.
 -
   !record {model: product.product, id: product_product_membershipproduct0}:
-    categ_id: product.cat1
+    categ_id: product.product_category_1
     membership: 1
     membership_date_from: !eval datetime.today().strftime("%Y-%m-%d")
     membership_date_to: !eval "(datetime.now() + timedelta(6*31)).strftime('%Y-%m-%d')" 
@@ -85,7 +85,7 @@
   I'm creating new "Regular Membership" which has Membership fee 50 EURO and It's started from 1st June to 31st Dec.
 -
   !record {model: product.product, id: product_product_membershipproduct1}:
-    categ_id: product.cat1
+    categ_id: product.product_category_1
     membership: 1
     membership_date_from: !eval datetime.today().strftime("%Y-%m-%d")
     membership_date_to: !eval "(datetime.now() + timedelta(6*31)).strftime('%Y-%m-%d')" 

addons/mrp/mrp_demo.xml

@@ -18,8 +18,8 @@
             <field name="name">Costing Account For Cycle of Assembly.</field>
         </record>
 
-        <record id="product.product_category_assembly" model="product.category">
+        <record id="product.product_category_18" model="product.category">
-            <field name="parent_id" ref="product.product_category_services"/>
+            <field name="parent_id" ref="product.product_category_6"/>
             <field name="name">Assembly Service</field>
         </record>
 
@@ -29,7 +29,7 @@
             <field name="uom_po_id" ref="product.uom_hour"/>
             <field name="type">service</field>
             <field name="name">Assembly Service Cost</field>
-            <field name="categ_id" ref="product.product_category_assembly"/>
+            <field name="categ_id" ref="product.product_category_18"/>
         </record>
 
 
@@ -912,7 +912,7 @@
         <field name="factor">1.0</field>
    </record>
     <record id="product_orangejuice" model="product.product">
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="name">Orange Juice</field>
         <field name="procure_method">make_to_order</field>
         <field name="supply_method">produce</field>
@@ -921,7 +921,7 @@
         <field name="uom_po_id" ref="product_uom_litre"/>
     </record>
     <record id="product_orange" model="product.product">
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="name">Orange</field>
         <field name="procure_method">make_to_stock</field>
         <field name="supply_method">buy</field>
@@ -936,7 +936,7 @@
         <field name="product_uom" ref="product.product_uom_kgm"/>
     </record>
     <record id="product_sugar" model="product.product">
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="name">Sugar</field>
         <field name="procure_method">make_to_stock</field>
         <field name="supply_method">buy</field>
@@ -951,7 +951,7 @@
         <field name="min_qty">2.0</field>
     </record>
     <record id="product_water" model="product.product">
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="name">Water</field>
         <field name="procure_method">make_to_order</field>
         <field name="supply_method">buy</field>
@@ -1032,7 +1032,7 @@
     </record>
 
     <record id="product_shirt" model="product.product">
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="name">Shirt</field>
         <field name="procure_method">make_to_stock</field>
         <field name="supply_method">produce</field>
@@ -1041,7 +1041,7 @@
         <field name="uom_po_id" ref="product.product_uom_unit"/>
     </record>
     <record id="product_cloth" model="product.product">
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="name">Cloth</field>
         <field name="procure_method">make_to_order</field>
         <field name="supply_method">buy</field>
@@ -1056,7 +1056,7 @@
         <field name="min_qty">300.0</field>
     </record>
     <record id="product_buttons" model="product.product">
-        <field name="categ_id" ref="product.cat1"/>
+        <field name="categ_id" ref="product.product_category_1"/>
         <field name="name">Shirt Buttons</field>
         <field name="procure_method">make_to_stock</field>
         <field name="supply_method">buy</field>

addons/multi_company/multi_company_demo.xml

@@ -187,7 +187,7 @@
         <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="Odoo1" model="product.category">
-            <field name="parent_id" ref="product.cat0"/>
+            <field name="parent_id" ref="product.product_category_0"/>
             <field name="name">Odoo Offers</field>
         </record>
         <record id="product_product_odoo1" model="product.product">

addons/point_of_sale/point_of_sale_demo.xml

@@ -321,7 +321,7 @@
           <field name="list_price">0.51</field>
           <field name="name">Coca-Cola Light 33cl</field>
           <field name="pos_categ_id" ref="coke"/>
-          <field name="product_image">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</field>
+          <field name="product_image">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZWYKpZjgAZJoAqjUInYrH85U4OOg/Hpn2oHYpXetx2+4F1BXqP/wBY5/CkFiifEyJKFlmMQOD86469O1AWNW21NLhA0c0Ugxn5W/8ArUwsSPqUMJUS5XccA9j+PSgLFtHV0V1OVYZBHcUCKesXsdjYMXI3S/u41P8AEx4pN2HFNsx/sM8loEWeW3cj70YDD8jyPzoAzV0jU7ZmI1GOVW6+arAn69c09Auynd2FzLMu68tY1HVA6AH8NtF0GpNb6LdSyb1v0A7BCXA/Oi6DU2Y9MkSEfaLmW5Zc43DYp9jjk/nSA2dLuFntFQBVeHCOoGMY6fpTQMwNUT7Z43ghklOy2tVkWMj5cszAn68VNrstTUYNW3N9lWJAW4GQPz4pshK4ksfymgDktWuraC8CSBCSe9JjOi0pEe3VkAwfQU0Jmg0IZcUxGHHvtfF1sqOwS5idXTs2BkH6j+tLqPoQX2P+E6lHHOnRn/yI9A+gzWGuLezLQzvFEQyvtxhSRwxz2B/nntWdS9jpwfK52au/6uhJNcvBoElwzhbqNFLpKu3BOPTHHv8A4UOb5L9Rxw0XiOXeLb2ONvrW2vr0y3s9zZ3PV4ZGB49UJ+8Pbr6ZpKr3VjSWXu14vmXRr9ex1dh9t062ia11PzLQqOZFDHnoQcdK0urXOL2cubltqa9rNcSxP9onaQiRhngcZ9BTJI/+Zm0sDskv/oIo6jXwsg1AoPHBADbzpyZPbHmNj+tLW5WnJ53ItZ+0zS2ljbNs89y0j4zhFxke+cioqXbSR04PkjGc5a2WnqzImS40vzoxG1zYryONzwAjlSP4k9v8KiScPNG9KpDEPfll+D8/JmZcQvcaSz2Pl39ltJ8iU5ltj/snrgfyqGrx01R1wkoVkp3jLutpep0FnG8Xhu2jEXluUUBEYtjn1/Wtor3EeZWkniJO99TXsVZYW3ZyXJyepqzkYic+JtP9opj+gpgV9SVx46DYOw6aozjjIkb/ABoe4+gmps8d3aOrsgO9MoBkk4OOfYE++Kzno0dOGSlproduct_category_2Yxmkltrk2jD7TtVgyHAkGe2c4JwR7Gm22tBRpwhNOW35f1v5nNLY6dqT3F2yuhQ4kjVgk0YHUkAYP5dupPFYcsZXZ6cq1aiowXye6fbzN1rjTdO0+ytTcbIJSqxOxOG6Hlug61ukuVJHlVKknVlKS1Na1ZMyBG3fvGJ4xg9f5EVRgMiI/4SmxGeTBMf8A0D/GmgJtRlhOveTk+cLZWx2KlmH8x+tDBEV9Zpf2b27sV3YKuOqsOhH41Mo8ysa0KzpTUkYqajK8Vxps/l2uq4GH+6txg8Yb3HH4/lkpPVPc75YeKcakbyh99vl5GdNZWuseY81rMs8H+tilOJQvqrfxfjn8KlxU+hpGrVw9kpKz2a2+a6fL8Se9uk03T47SOOCSxmCLbyXSFocHHLke+eD6jHQitopKOh5leU5VJOW99SbSFlsE+yraR2SljLiGXzFbdgDB9DtbA9AKozNuHB8XWA7i1uD+sdMQarGy+MIZPNO2SwKmPtlX4P8A48aGCJZnDKYlP7w4IHqM0mXBWd+hz0x0rUFuLK7gkSVp5GgYt975sHy2PuCdvrWHuSumepH6xS5Zxaa5Vf7uq/UgXRNaaLZZ675lq4IBkB3AdCO5H5ij2c+khyxeGTvOlaXlsaV3atZeGBb207bYAqvKIhJ8oPzEp3HXI9M1tFWjY8yvUdSq5NWuyj4dntzO0BtYfJkbEc9oxMLsuSeP4OGHHTPvTM2btuc+NbMelhMf/H46Yg1twni6xB6tZyAf99KaGCJVz9uGMH93z7c1PU0/5d/M529SS6lu5LewaeDefPtXPDMCRuQj7r8Zx3BB5rCWt7I9WlJQUFKdnbR/o+68zPsdQex8P6pcQNdAmRREZ+27jIPr/gKUZ8sG9TWtQVXE04y5dtbeRcmuzFDbSXM01rbeUptrpMrsBC5B7ZyOjDkdD2roi9EePXi1Vkn3Zs6EqvZvvuYLxo7hissSKFGQDxjPJByfcmmZMsWhB8bW3tp0p/8AIiU+wu5R8X3P2Xxdo0pPylGjYf7xA/nimBcup5ILuAwQLLI6NkFsFgCOB2zgk8+lZybTVjpowjOD5nZJ/wCf/DGNfXF2NSN1pxign3OlxGWLKwU4BdQOO3PuOayk3zXR3UoU/ZctS7Wln69n19Aa0v7vSb46lDFFG8iTJHGwYAAgse/Bxn8TT5ZOLuSqtKnWh7NtuzV3+H3HTKiNHsZQUIwVI4xW55T3IxDbabZOIY0hijDOQqgAdz0oSBmfoqmLxlawP9+PRyW+pkXP6in2AzPiYxj1XTJVyCqMQe2QymgOhoeYmu6NHcWMwWdCJIm/uSDqD+o/Gs6kW1ob4atGnP3ldPR+hTjm/teY3Flcf2drEQ2TwuOHx6juPftWafNqtGd0o/V48s1zU3s+xa0i01CO1uotVMISRiUWM8KD976D/wCvVQUrO5z4qpSc4unfTuaOkz/adLtps7i8Skn1OOauDvFHPiIclWS8ynrGoQyXUGjRyBri6cB0ByVjHLE+mQMfjV2MhmjF5/iXeuASlvpqxk9gWcMP60PcXQ6XWNFstctPs17HuCncjqcMh9QaGhp2POtY8HazoLvPpuokQv1KSGM/j2/HNK7Q7JnH6i+oeeLi5luHuF6So2/p7iolTUtTqw+MnRXLuuwx/GGvGBraW9nkiYYIKHJH1xmp5JtWubLF4eL5lT1NOHxLreo20NpBvtIIgFURAxZA6ZYnP61qlZWRwTm5ycn1Z13gXwzcJPPqNxtMsox5hbfgHk4I69u9CdyXod5ZadbWDTPCmJJ2DSuerkDAz9BxTQi0aGAhAIwRkGgDNu/Dei32Tc6ZbuT1OzB/SlZDuzOPw98Kl9x0lPp5r4/nRyj5i/Z+GNDsCDbaXboR0JTcf1oshXZqABQAAAB0ApiFFCAAAP/Z</field>
         </record>
         <record id="coca_light_decaf_33cl" model="product.product">
           <field name="list_price">0.53</field>

addons/product/__openerp__.py

@@ -25,7 +25,7 @@
     "version" : "1.1",
     "author" : "OpenERP SA",
     'category': 'Sales Management',
-    "depends" : ["base", "process", "decimal_precision"],
+    "depends" : ["base", "mail", "process", "decimal_precision"],
     "init_xml" : [],
     "demo_xml" : ["product_demo.xml"],
     "description": """

addons/product/i18n/product.pot

@@ -45,7 +45,7 @@ msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n"
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.cat1
+#: model:product.category,name:product.product_category_1
 msgid "Sellable"
 msgstr ""
 
@@ -428,7 +428,7 @@ msgid "Ending date for this pricelist version to be valid."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.cat0
+#: model:product.category,name:product.product_category_0
 msgid "All products"
 msgstr ""
 
@@ -691,7 +691,7 @@ msgid "This price will be considered as a price for the supplier UoM if any or t
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_accessories
+#: model:product.category,name:product.product_category_5
 msgid "Accessories"
 msgstr ""
 
@@ -1137,7 +1137,7 @@ msgid "Main Supplier who has highest priority in Supplier List."
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_services
+#: model:product.category,name:product.product_category_6
 #: view:product.product:0
 msgid "Services"
 msgstr ""
@@ -1221,7 +1221,7 @@ msgid "Minimal Quantity"
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.product_category_pc
+#: model:product.category,name:product.product_category_9
 msgid "PC"
 msgstr ""
 
@@ -2164,7 +2164,7 @@ msgid "Category Type"
 msgstr ""
 
 #. module: product
-#: model:product.category,name:product.cat2
+#: model:product.category,name:product.product_category_2
 msgid "Private"
 msgstr ""
 

addons/product/product.py

@@ -344,7 +344,7 @@ class product_template(osv.osv):
         md = self.pool.get('ir.model.data')
         res = False
         try:
-            res = md.get_object_reference(cr, uid, 'product', 'cat0')[1]
+            res = md.get_object_reference(cr, uid, 'product', 'product_category_0')[1]
         except ValueError:
             res = False
         return res

addons/product/product_data.xml

@@ -4,7 +4,7 @@
         <!--
 	Resource: product.uom.categ
 	-->
-        <record id="cat0" model="product.category">
+        <record id="product_category_0" model="product.category">
             <field name="name">All products</field>
         </record>
 
@@ -178,7 +178,7 @@ parameter) will see those record just disappear.
             <field name="uom_id" ref="product.uom_hour"/>
             <field name="uom_po_id" ref="product.uom_hour"/>
             <field name="name">Service on Timesheet</field>
-            <field name="categ_id" ref="product.cat0"/>
+            <field name="categ_id" ref="product.product_category_0"/>
             <field name="type">service</field>
             <field eval="False" name="purchase_ok"/>
         </record>

addons/product/product_demo.xml

@@ -10,87 +10,67 @@
     Resource: product.category
     -->
 
-        <record id="cat1" model="product.category">
+        <record id="product_category_1" model="product.category">
-            <field name="parent_id" ref="product.cat0"/>
+            <field name="parent_id" ref="product.product_category_0"/>
-            <field name="name">Sellable</field>
+            <field name="name">Saleable</field>
         </record>
-        <record id="cat2" model="product.category">
+        <record id="product_category_2" model="product.category">
-            <field name="parent_id" ref="product.cat0"/>
+            <field name="parent_id" ref="product.product_category_0"/>
-            <field name="name">Private</field>
+            <field name="name">Internal</field>
         </record>
         <record id="product_category_3" model="product.category">
-            <field name="parent_id" ref="cat1"/>
+            <field name="parent_id" ref="product_category_0"/>
-            <field name="name">Computer Stuff</field>
+            <field name="name">Other Products</field>
         </record>
         <record id="product_category_4" model="product.category">
-            <field name="parent_id" ref="product_category_3"/>
+            <field name="parent_id" ref="product_category_1"/>
-            <field name="name">Dello Computer</field>
+            <field name="name">Computers</field>
         </record>
-        <record id="product_category_accessories" model="product.category">
+        <record id="product_category_5" model="product.category">
-            <field name="parent_id" ref="product_category_3"/>
+            <field name="parent_id" ref="product_category_1"/>
-            <field name="name">Accessories</field>
-        </record>
-        <record id="product_category_services" model="product.category">
-            <field name="parent_id" ref="cat1"/>
             <field name="name">Services</field>
         </record>
+        <record id="product_category_6" model="product.category">
+            <field name="parent_id" ref="product_category_1"/>
+            <field name="name">Network Components</field>
+        </record>
         <record id="product_category_7" model="product.category">
-            <field name="parent_id" ref="product_category_services"/>
+            <field name="parent_id" ref="product_category_4"/>
-            <field name="name">Onsite Intervention</field>
+            <field name="name">Desktops</field>
         </record>
         <record id="product_category_8" model="product.category">
-            <field name="parent_id" ref="product_category_services"/>
+            <field name="parent_id" ref="product_category_4"/>
-            <field name="name">Phone Help</field>
+            <field name="name">Laptops</field>
         </record>
-        <record id="product_category_pc" model="product.category">
+        <record id="product_category_9" model="product.category">
-            <field name="parent_id" ref="product_category_3"/>
+            <field name="parent_id" ref="product_category_4"/>
-            <field name="name">PC</field>
+            <field name="name">Accessories</field>
         </record>
         <record id="product_category_10" model="product.category">
-            <field name="parent_id" ref="product_category_3"/>
+            <field name="parent_id" ref="product_category_4"/>
-            <field name="name">IT components</field>
+            <field name="name">Components</field>
         </record>
         <record id="product_category_11" model="product.category">
+            <field name="parent_id" ref="product_category_4"/>
+            <field name="name">Printer &amp; Scanners</field>
+        </record>
+        <record id="product_category_12" model="product.category">
+            <field name="parent_id" ref="product_category_4"/>
+            <field name="name">Software</field>
+        </record>
+        <record id="product_category_13" model="product.category">
             <field name="parent_id" ref="product_category_3"/>
-            <field name="name">IT components kits</field>
+            <field name="name">Raw Materials</field>
         </record>
-
+        <record id="product_category_14" model="product.category">
-
+            <field name="name">Assembly Service</field>
-
+            <field name="parent_id" ref="product_category_5"/>
-        <record id="product_category_marketableproduct0" model="product.category">
-                <field name="name">Marketable Products</field>
         </record>
-
+        <record id="product_category_15" model="product.category">
-
+            <field name="parent_id" ref="product_category_5"/>
-        <record id="product_category_shelves0" model="product.category">
+            <field name="name">On site Intervention</field>
-            <field name="parent_id" ref="product_category_marketableproduct0"/>
-                <field name="name">Shelves</field>
         </record>
 
-
-        <record id="product_category_otherproducts0" model="product.category">
-                <field name="name">Other Products</field>
-        </record>
-
-
-        <record id="product_category_rawmaterial0" model="product.category">
-            <field name="parent_id" ref="product_category_otherproducts0"/>
-                <field name="name">Raw Materials</field>
-        </record>
-
-
-        <record id="product_category_services0" model="product.category">
-            <field name="parent_id" ref="product_category_marketableproduct0"/>
-                <field name="name">Marketable Services</field>
-        </record>
-
-
-        <record id="product_category_misc0" model="product.category">
-            <field name="parent_id" ref="product_category_otherproducts0"/>
-            <field name="name">Misc</field>
-        </record>
-
-
         <record id="product_ul_box" model="product.ul">
             <field name="name">Box 20x20x40</field>
             <field name="type">box</field>
@@ -132,7 +112,7 @@
             <field name="sale_delay">7.0</field>
             <field name="name">Basic PC</field>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_pc"/>
+            <field name="categ_id" ref="product_category_9"/>
         </record>
         <record id="product_product_pc2" model="product.product">
             <field name="default_code">PC2</field>
@@ -145,7 +125,7 @@
             <field name="sale_delay">18.0</field>
             <field name="name">Basic+ PC (assembly on order)</field>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_pc"/>
+            <field name="categ_id" ref="product_category_9"/>
         </record>
         <record id="product_product_pc3" model="product.product">
             <field name="default_code">PC3</field>
@@ -157,7 +137,7 @@
             <field name="sale_delay">7.0</field>
             <field name="name">Medium PC</field>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_pc"/>
+            <field name="categ_id" ref="product_category_9"/>
         </record>
         <record id="product_product_pc4" model="product.product">
             <field name="default_code">PC4</field>
@@ -169,7 +149,7 @@
             <field name="procure_method">make_to_order</field>
             <field name="name">Customizable PC</field>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_pc"/>
+            <field name="categ_id" ref="product_category_9"/>
             <field name="state">end</field>
         </record>
         <record id="product_product_mb1" model="product.product">
@@ -271,7 +251,7 @@
             <field name="sale_delay">7.0</field>
             <field name="name">Silent fan</field>
             <field name="type">product</field>
-            <field name="categ_id" ref="cat1"/>
+            <field name="categ_id" ref="product_category_1"/>
         </record>
         <record id="product_product_cpu_gen" model="product.product">
             <field name="default_code">CPU_GEN</field>
@@ -295,7 +275,7 @@
             <field name="sale_delay">7.0</field>
             <field name="name">DDR 256MB PC400</field>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_pc"/>
+            <field name="categ_id" ref="product_category_9"/>
         </record>
         <record id="product_product_ram512" model="product.product">
             <field name="default_code">RAM512</field>
@@ -425,7 +405,7 @@
             <field name="sale_delay">3.0</field>
             <field name="name">Cabinet</field>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_misc0"/>
+            <field name="categ_id" ref="product_category_3"/>
         </record>
         <!--
     Resource: product.product NEW EVV
@@ -440,7 +420,7 @@
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Shelf of 100cm</field>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_shelves0"/>
+            <field name="categ_id" ref="product_category_13"/>
         </record>
 
         <record id="product_product_shelfofcm1" model="product.product">
@@ -453,7 +433,7 @@
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Shelf of 200cm</field>
             <field name="type">product</field>
-                <field name="categ_id" ref="product_category_shelves0"/>
+                <field name="categ_id" ref="product_category_13"/>
         </record>
         <record id="product_product_span100" model="product.product">
             <field name="default_code">SPAN100</field>
@@ -463,7 +443,7 @@
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Shelf Panel</field>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_shelves0"/>
+            <field name="categ_id" ref="product_category_13"/>
         </record>
         <record id="product_product_woodmm0" model="product.product">
             <field name="default_code">WOOD002</field>
@@ -475,7 +455,7 @@
             <field eval="2" name="seller_delay"/>
             <field eval="7.0" name="sale_delay"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_rawmaterial0"/>
+            <field name="categ_id" ref="product_category_15"/>
         </record>
         <record id="product_product_woodentable0" model="product.product">
             <field name="default_code">WOODTAB</field>
@@ -488,7 +468,7 @@
             <field eval="2" name="seller_delay"/>
             <field eval="7.0" name="sale_delay"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="cat1"/>
+            <field name="categ_id" ref="product_category_1"/>
         </record>
 
         <record id="product_product_woodmm10" model="product.product">
@@ -501,7 +481,7 @@
             <field eval="2" name="seller_delay"/>
             <field eval="7.0" name="sale_delay"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_rawmaterial0"/>
+            <field name="categ_id" ref="product_category_15"/>
         </record>
 
         <record id="product_product_kitchendesignproject0" model="product.product">
@@ -514,7 +494,7 @@
             <field name="uom_id" ref="uom_hour"/>
             <field name="uom_po_id" ref="uom_hour"/>
             <field name="name">Kitchen Design Project</field>
-            <field name="categ_id" ref="product_category_services0"/>
+            <field name="categ_id" ref="product_category_5"/>
         </record>
 
         <record id="product_product_employee0" model="product.product">
@@ -527,7 +507,7 @@
             <field name="uom_id" ref="uom_hour"/>
             <field name="uom_po_id" ref="uom_hour"/>
             <field name="name">Employee</field>
-            <field name="categ_id" ref="product_category_services0"/>
+            <field name="categ_id" ref="product_category_5"/>
         </record>
 
         <record id="product_product_restaurantexpenses0" model="product.product">
@@ -539,7 +519,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Restaurant Expenses</field>
-            <field name="categ_id" ref="product_category_otherproducts0"/>
+            <field name="categ_id" ref="product_category_14"/>
         </record>
 
         <record id="product_product_worker0" model="product.product">
@@ -553,7 +533,7 @@
             <field name="uom_id" ref="uom_hour"/>
             <field name="uom_po_id" ref="uom_hour"/>
             <field name="name">Worker</field>
-            <field name="categ_id" ref="product_category_services0"/>
+            <field name="categ_id" ref="product_category_5"/>
         </record>
 
         <record id="product_product_rearpanelarm0" model="product.product">
@@ -566,7 +546,7 @@
             <field name="name">Rear Panel SHE100</field>
             <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_misc0"/>
+            <field name="categ_id" ref="product_category_3"/>
         </record>
 
         <record id="product_product_rearpanelarm1" model="product.product">
@@ -579,7 +559,7 @@
             <field name="name">Rear Panel SHE200</field>
             <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_misc0"/>
+            <field name="categ_id" ref="product_category_3"/>
         </record>
 
         <record id="product_product_sidepanel0" model="product.product">
@@ -592,7 +572,7 @@
             <field name="name">Side Panel</field>
             <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_misc0"/>
+            <field name="categ_id" ref="product_category_3"/>
         </record>
 
         <record id="product_product_shelf0" model="product.product">
@@ -605,7 +585,7 @@
             <field name="name">Rack 100cm</field>
             <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_misc0"/>
+            <field name="categ_id" ref="product_category_3"/>
         </record>
 
         <record id="product_product_shelf1" model="product.product">
@@ -618,7 +598,7 @@
             <field name="name">Rack 200cm</field>
             <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_misc0"/>
+            <field name="categ_id" ref="product_category_3"/>
         </record>
 
 
@@ -631,7 +611,7 @@
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Assembly Section</field>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_misc0"/>
+            <field name="categ_id" ref="product_category_3"/>
         </record>
 
         <record id="product_product_woodlintelm0" model="product.product">
@@ -644,7 +624,7 @@
             <field name="name">Wood Lintel 4m</field>
             <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_misc0"/>
+            <field name="categ_id" ref="product_category_3"/>
         </record>
 
         <record id="product_product_metalcleats0" model="product.product">
@@ -656,7 +636,7 @@
             <field name="name">Metal Cleats</field>
             <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_misc0"/>
+            <field name="categ_id" ref="product_category_3"/>
         </record>
 
         <record id="product_product_hotelexpenses0" model="product.product">
@@ -668,7 +648,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Hotel Expenses</field>
-            <field name="categ_id" ref="product_category_otherproducts0"/>
+            <field name="categ_id" ref="product_category_14"/>
         </record>
 
         <record id="product_product_kitshelfofcm0" model="product.product">
@@ -682,7 +662,7 @@
             <field name="name">KIT Shelf of 100cm</field>
             <field eval="0" name="purchase_ok"/>
             <field name="type">product</field>
-            <field name="categ_id" ref="product_category_shelves0"/>
+            <field name="categ_id" ref="product_category_13"/>
         </record>
 
         <!--

addons/product/product_pricelist_demo.yml

@@ -1,7 +1,7 @@
 -
   !record {model: product.product, id: product_product_pc2}:
     uom_id: product_uom_unit
-    categ_id: product_category_pc
+    categ_id: product_category_9
 -
   !record {model: product.pricelist, id: customer_pricelist}:
     name: Customer Pricelist

addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml

@@ -13,7 +13,7 @@
   Create a product with type service used to specify employees designation
 -
   !record {model: product.product, id: product_product_hrmanger0}:
-    categ_id: product.product_category_services
+    categ_id: product.product_category_6
     cost_method: standard
     mes_type: fixed
     name: HR Manger

addons/sale/sale_demo.xml

@@ -261,7 +261,7 @@
         
         <record id="advance_product_0" model="product.product">
             <field name="name">Advance</field>
-            <field name="categ_id" ref="product.cat1"/>
+            <field name="categ_id" ref="product.product_category_1"/>
             <field name="type">service</field>
             <field name="list_price">150.0</field>
             <field name="standard_price">100.0</field>

addons/sale_mrp/test/sale_mrp.yml

@@ -8,7 +8,7 @@
 -
   I define product category Mobile Services.
 -
-  !record {model: product.category, id: product_category_services0}:
+  !record {model: product.category, id: product_category_16}:
     name: Mobile Services
 -
   I define product template for Slider Mobile.

addons/stock/stock_demo.yml

@@ -30,7 +30,7 @@
     default_code: 001
     name: Ice Cream
     type: product
-    categ_id: product.cat1
+    categ_id: product.product_category_1
     supply_method: buy
     list_price: 100.0
     standard_price: 70.0

addons/stock_no_autopicking/test/stock_no_autopicking.yml

@@ -18,7 +18,7 @@
   I create a record for product Tea.
 -
   !record {model: product.product, id: product_product_tea0}:
-    categ_id: product.cat1
+    categ_id: product.product_category_1
     name: Tea
     procure_method: make_to_stock
     supply_method: buy
@@ -33,7 +33,7 @@
   I create a record for product Sugar.
 -
   !record {model: product.product, id: product_product_sugar0}:
-    categ_id: product.cat1
+    categ_id: product.product_category_1
     name: Sugar
     procure_method: make_to_stock
     supply_method: buy
@@ -48,7 +48,7 @@
   I create a record for product Milk.
 -
   !record {model: product.product, id: product_product_milk0}:
-    categ_id: product.cat1
+    categ_id: product.product_category_1
     name: Milk
     procure_method: make_to_order
     supply_method: buy
@@ -63,7 +63,7 @@
   I create a record for product Cup of tea.
 -
   !record {model: product.product, id: product_product_cupoftea0}:
-    categ_id: product.cat1
+    categ_id: product.product_category_1
     name: Cup of Tea
     procure_method: make_to_order
     supply_method: produce

addons/stock_planning/test/stock_planning.yml

@@ -56,7 +56,7 @@
   !record {model: stock.sale.forecast.createlines, id: stock_sale_forecast_createlines_0}:
     company_id: base.main_company
     period_id: stock_period_03
-    product_categ_id: product.product_category_pc
+    product_categ_id: product.product_category_9
     warehouse_id: stock.warehouse0
 -
   Performing an osv_memory action create_forecast on module stock.sale.forecast.createlines
@@ -199,7 +199,7 @@
   !record {model: stock.planning.createlines, id: stock_planning_createlines_0}:
     company_id: base.main_company
     period_id: stock_period_03
-    product_categ_id: product.product_category_pc
+    product_categ_id: product.product_category_9
     warehouse_id: stock.warehouse0
 
 -