From 237173eeff5feee1a0f3ff3733c942dbec9796ae Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Thu, 28 Jun 2012 15:00:01 +0530 Subject: [PATCH] [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 | 2 +- addons/event_sale/event_demo.xml | 2 +- addons/hr_expense/hr_expense_data.xml | 2 +- addons/membership/membership_demo.xml | 6 +- addons/membership/test/test_membership.yml | 4 +- addons/mrp/mrp_demo.xml | 20 +-- addons/multi_company/multi_company_demo.xml | 2 +- addons/point_of_sale/point_of_sale_demo.xml | 2 +- addons/product/__openerp__.py | 2 +- addons/product/i18n/product.pot | 12 +- addons/product/product.py | 2 +- addons/product/product_data.xml | 4 +- addons/product/product_demo.xml | 154 ++++++++---------- addons/product/product_pricelist_demo.yml | 2 +- .../worktask_entry_to_timesheetline_entry.yml | 2 +- addons/sale/sale_demo.xml | 2 +- addons/sale_mrp/test/sale_mrp.yml | 2 +- addons/stock/stock_demo.yml | 2 +- .../test/stock_no_autopicking.yml | 8 +- addons/stock_planning/test/stock_planning.yml | 4 +- 20 files changed, 108 insertions(+), 128 deletions(-) diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml index a5db7ff042c..dac3d47c778 100644 --- a/addons/delivery/delivery_demo.xml +++ b/addons/delivery/delivery_demo.xml @@ -13,7 +13,7 @@ Delivery by Poste Delivery service - + diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml index 6dd696225a3..3acd3c81f57 100644 --- a/addons/event_sale/event_demo.xml +++ b/addons/event_sale/event_demo.xml @@ -13,7 +13,7 @@ Technical Training True - + service 2500.0 1000.0 diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml index 0e940c74cc0..ff1e6994d69 100644 --- a/addons/hr_expense/hr_expense_data.xml +++ b/addons/hr_expense/hr_expense_data.xml @@ -5,7 +5,7 @@ Resource: product.uom.categ --> - + Expenses diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml index 8f9b45e8263..0fd28701cf9 100644 --- a/addons/membership/membership_demo.xml +++ b/addons/membership/membership_demo.xml @@ -9,7 +9,7 @@ Golden Membership 180 - + service @@ -17,7 +17,7 @@ Silver Membership - + 80 service @@ -26,7 +26,7 @@ Basic Membership - + 40 service diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml index c37dcb0ec66..357fcbcfc3e 100644 --- a/addons/membership/test/test_membership.yml +++ b/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')" diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml index e60c203889e..7cc37310930 100644 --- a/addons/mrp/mrp_demo.xml +++ b/addons/mrp/mrp_demo.xml @@ -18,8 +18,8 @@ Costing Account For Cycle of Assembly. - - + + Assembly Service @@ -29,7 +29,7 @@ service Assembly Service Cost - + @@ -912,7 +912,7 @@ 1.0 - + Orange Juice make_to_order produce @@ -921,7 +921,7 @@ - + Orange make_to_stock buy @@ -936,7 +936,7 @@ - + Sugar make_to_stock buy @@ -951,7 +951,7 @@ 2.0 - + Water make_to_order buy @@ -1032,7 +1032,7 @@ - + Shirt make_to_stock produce @@ -1041,7 +1041,7 @@ - + Cloth make_to_order buy @@ -1056,7 +1056,7 @@ 300.0 - + Shirt Buttons make_to_stock buy diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index 15e523b1bc0..ce752b7ddc2 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -187,7 +187,7 @@ - + Odoo Offers diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml index d4056da1296..87d29b8a2d5 100644 --- a/addons/point_of_sale/point_of_sale_demo.xml +++ b/addons/point_of_sale/point_of_sale_demo.xml @@ -321,7 +321,7 @@ 0.51 Coca-Cola Light 33cl - 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_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 0.53 diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py index 9b4d2cadee1..664a6ab85d7 100644 --- a/addons/product/__openerp__.py +++ b/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": """ diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot index f48eda55081..8d5ec26afe1 100644 --- a/addons/product/i18n/product.pot +++ b/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 "" diff --git a/addons/product/product.py b/addons/product/product.py index f81378be04e..a1fd582bc7a 100644 --- a/addons/product/product.py +++ b/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 diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml index 223b6bc368e..592cfd00272 100644 --- a/addons/product/product_data.xml +++ b/addons/product/product_data.xml @@ -4,7 +4,7 @@ - + All products @@ -178,7 +178,7 @@ parameter) will see those record just disappear. Service on Timesheet - + service diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml index d668085166a..9764f8fbbfd 100644 --- a/addons/product/product_demo.xml +++ b/addons/product/product_demo.xml @@ -10,87 +10,67 @@ Resource: product.category --> - - - Sellable + + + Saleable - - - Private + + + Internal - - Computer Stuff + + Other Products - - Dello Computer + + Computers - - - Accessories - - - + + Services + + + Network Components + - - Onsite Intervention + + Desktops - - Phone Help + + Laptops - - - PC + + + Accessories - - IT components + + Components + + Printer & Scanners + + + + Software + + - IT components kits + Raw Materials - - - - - Marketable Products + + Assembly Service + - - - - - Shelves + + + On site Intervention - - - Other Products - - - - - - Raw Materials - - - - - - Marketable Services - - - - - - Misc - - - Box 20x20x40 box @@ -132,7 +112,7 @@ 7.0 Basic PC product - + PC2 @@ -145,7 +125,7 @@ 18.0 Basic+ PC (assembly on order) product - + PC3 @@ -157,7 +137,7 @@ 7.0 Medium PC product - + PC4 @@ -169,7 +149,7 @@ make_to_order Customizable PC product - + end @@ -271,7 +251,7 @@ 7.0 Silent fan product - + CPU_GEN @@ -295,7 +275,7 @@ 7.0 DDR 256MB PC400 product - + RAM512 @@ -425,7 +405,7 @@ 3.0 Cabinet product - +