From 3031ab8f0f723cb650188367d0b9892ebb0aafde Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Fri, 13 Jul 2018 10:00:44 +0200 Subject: [PATCH] [IMP] mrp,purchase,pos: Improve demo data SPECIFICATIONS ============== PoS --- https://drive.google.com/a/odoo.com/file/d/1BkVVQTR7V_kZpNsOO0CwqTQtxAH9boLB/view?usp=drivesdk Add new products : Cola, Water, Orange Juice (+ images) in internal category : All/Saleable/PoS available in PoS Traceability ------------ The [FURN_9666] Table (MTO) should be tracked by serial number There should be one purchase order already received for 1 Table Top There should be one purchase order already received for 4 Table legs There should be one MO done for the table (consuming the products received in the PO you've created) > The goal is to have a complete traceability report for one table Delete SN/LN : https://drive.google.com/a/odoo.com/file/d/1cxdE-2laGYaZ2rnSFKjEbVg6k6MVyLdw/view?usp=drivesdk Assign crm.lead to the admin user : when opening the pipe, there must be some leads and opportunities Products -------- https://drive.google.com/a/odoo.com/file/d/1qaO7MlufZbj7bw6z5S8DtmKPYiK0sQNK/view?usp=drivesdk route buy should be ticked on pedal bin product remove some ecommerce categories: https://drive.google.com/a/odoo.com/file/d/1sgIJE49BHVDcoF5CXngbJAvWb2fN_3Wk/view?usp=drivesdk --- addons/mrp/data/mrp_demo.xml | 16 +--- addons/mrp/models/mrp_workorder.py | 3 + .../point_of_sale/data/point_of_sale_data.xml | 2 +- .../data/pos_restaurant_demo.xml | 46 +++++++++- addons/pos_restaurant/static/img/th-coke.jpg | Bin 0 -> 11357 bytes .../static/img/th-minute_maid.jpg | Bin 0 -> 5585 bytes addons/pos_restaurant/static/img/th-water.jpg | Bin 0 -> 10524 bytes addons/product/data/product_demo.xml | 2 +- .../product/tests/test_product_pricelist.py | 4 +- addons/purchase_mrp/__manifest__.py | 2 - .../data/purchase_stock_demo.xml | 3 + addons/stock/data/stock_demo2.xml | 11 +-- addons/stock/models/stock_production_lot.py | 2 +- addons/website_sale/data/demo.xml | 84 +----------------- .../static/src/js/website_sale.test.js | 2 +- .../src/js/website_sale_tour_wishlist.js | 12 +-- 16 files changed, 66 insertions(+), 123 deletions(-) create mode 100644 addons/pos_restaurant/static/img/th-coke.jpg create mode 100644 addons/pos_restaurant/static/img/th-minute_maid.jpg create mode 100644 addons/pos_restaurant/static/img/th-water.jpg diff --git a/addons/mrp/data/mrp_demo.xml b/addons/mrp/data/mrp_demo.xml index dd0a3d3f568..cf802539c11 100644 --- a/addons/mrp/data/mrp_demo.xml +++ b/addons/mrp/data/mrp_demo.xml @@ -169,6 +169,7 @@ Solid wood table. FURN_9666 + serial @@ -470,18 +471,6 @@ 0000000000030 - - 0000000000031 - - - - 0000000000032 - - - - 0000000000033 - - @@ -503,7 +492,6 @@ 40 - @@ -511,7 +499,6 @@ 50 - @@ -519,7 +506,6 @@ 50 - diff --git a/addons/mrp/models/mrp_workorder.py b/addons/mrp/models/mrp_workorder.py index cc7a98635ea..b58e5eb29f4 100644 --- a/addons/mrp/models/mrp_workorder.py +++ b/addons/mrp/models/mrp_workorder.py @@ -305,6 +305,9 @@ class MrpWorkorder(models.Model): @api.multi def record_production(self): + if not self: + return True + self.ensure_one() if self.qty_producing <= 0: raise UserError(_('Please set the quantity you are currently producing. It should be different from zero.')) diff --git a/addons/point_of_sale/data/point_of_sale_data.xml b/addons/point_of_sale/data/point_of_sale_data.xml index 24a0f58e400..eef8edee6ce 100644 --- a/addons/point_of_sale/data/point_of_sale_data.xml +++ b/addons/point_of_sale/data/point_of_sale_data.xml @@ -37,7 +37,7 @@ - Main + Shop diff --git a/addons/pos_restaurant/data/pos_restaurant_demo.xml b/addons/pos_restaurant/data/pos_restaurant_demo.xml index 69b39eafb63..55a20022b25 100644 --- a/addons/pos_restaurant/data/pos_restaurant_demo.xml +++ b/addons/pos_restaurant/data/pos_restaurant_demo.xml @@ -11,9 +11,47 @@ - + + + PoS + - + + Drinks + + + + True + 2.20 + Coca-Cola + + + + + + + True + 2.20 + Water + + + + + + + True + 2.20 + Minute Maid + + + + + + + + Bar + + True True True @@ -27,7 +65,7 @@ Main Floor rgb(136,137,242) - + @@ -167,7 +205,7 @@ Patio rgb(130, 233, 171) - + diff --git a/addons/pos_restaurant/static/img/th-coke.jpg b/addons/pos_restaurant/static/img/th-coke.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a8802d0bc8301edc99e39e9ff9c68225a45a8b11 GIT binary patch literal 11357 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 P>;G@c{m%v&-j@FhStt9- literal 0 HcmV?d00001 diff --git a/addons/pos_restaurant/static/img/th-minute_maid.jpg b/addons/pos_restaurant/static/img/th-minute_maid.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c3f152db22950dce1951ebbe77adfcb731e18f54 GIT binary patch literal 5585 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 literal 0 HcmV?d00001 diff --git a/addons/pos_restaurant/static/img/th-water.jpg b/addons/pos_restaurant/static/img/th-water.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e031e38ba4c82882114f5657af6af3f2f9898052 GIT binary patch literal 10524 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 Nvpe$-{|LLC{x7x#HKhOm literal 0 HcmV?d00001 diff --git a/addons/product/data/product_demo.xml b/addons/product/data/product_demo.xml index 09756c5a28d..dd730d92904 100644 --- a/addons/product/data/product_demo.xml +++ b/addons/product/data/product_demo.xml @@ -159,7 +159,7 @@ - Desk Customizable + Customizable Desk 500.0 750.0 diff --git a/addons/product/tests/test_product_pricelist.py b/addons/product/tests/test_product_pricelist.py index a2ed546cf39..43db6f7c49b 100644 --- a/addons/product/tests/test_product_pricelist.py +++ b/addons/product/tests/test_product_pricelist.py @@ -65,11 +65,11 @@ class TestProductPricelist(TransactionCase): def test_10_calculation_price_of_products_pricelist(self): """Test calculation of product price based on pricelist""" - # I check sale price of Desk Customizable + # I check sale price of Customizable Desk context = {} context.update({'pricelist': self.customer_pricelist.id, 'quantity': 1}) ipad_retina_display = self.ipad_retina_display.with_context(context) - msg = "Wrong sale price: Desk Customizable. should be %s instead of %s" % (ipad_retina_display.price, (ipad_retina_display.lst_price-ipad_retina_display.lst_price*(0.10))) + msg = "Wrong sale price: Customizable Desk. should be %s instead of %s" % (ipad_retina_display.price, (ipad_retina_display.lst_price-ipad_retina_display.lst_price*(0.10))) self.assertEqual(float_compare(ipad_retina_display.price, (ipad_retina_display.lst_price-ipad_retina_display.lst_price*(0.10)), precision_digits=2), 0, msg) # I check sale price of Laptop. diff --git a/addons/purchase_mrp/__manifest__.py b/addons/purchase_mrp/__manifest__.py index ce84472e8d9..78e6636355f 100644 --- a/addons/purchase_mrp/__manifest__.py +++ b/addons/purchase_mrp/__manifest__.py @@ -15,8 +15,6 @@ from purchase order. """, 'website': 'https://www.odoo.com/page/manufacturing', 'depends': ['mrp', 'purchase'], - 'data': [], - 'demo': [], 'installable': True, 'auto_install': True, } diff --git a/addons/purchase_stock/data/purchase_stock_demo.xml b/addons/purchase_stock/data/purchase_stock_demo.xml index 42b66d63aae..9f61d5f181d 100644 --- a/addons/purchase_stock/data/purchase_stock_demo.xml +++ b/addons/purchase_stock/data/purchase_stock_demo.xml @@ -18,6 +18,9 @@ + + + diff --git a/addons/stock/data/stock_demo2.xml b/addons/stock/data/stock_demo2.xml index 43186a14195..eb181e16d21 100644 --- a/addons/stock/data/stock_demo2.xml +++ b/addons/stock/data/stock_demo2.xml @@ -52,18 +52,13 @@ - + 0000000000017 - - 0000000000024 - - - - Inventory for icecream + Inventory for Cable Management Box product @@ -73,7 +68,6 @@ 50.0 - @@ -82,7 +76,6 @@ 40.0 - diff --git a/addons/stock/models/stock_production_lot.py b/addons/stock/models/stock_production_lot.py index 5f0009e9504..c34451a73ee 100644 --- a/addons/stock/models/stock_production_lot.py +++ b/addons/stock/models/stock_production_lot.py @@ -39,7 +39,7 @@ class ProductionLot(models.Model): @api.multi def write(self, vals): - if 'product_id' in vals: + if 'product_id' in vals and any([vals['product_id'] != lot.product_id.id for lot in self]): move_lines = self.env['stock.move.line'].search([('lot_id', 'in', self.ids)]) if move_lines: raise UserError(_( diff --git a/addons/website_sale/data/demo.xml b/addons/website_sale/data/demo.xml index 55705457947..a61012731c7 100644 --- a/addons/website_sale/data/demo.xml +++ b/addons/website_sale/data/demo.xml @@ -135,85 +135,10 @@ Lamps 22 - - Tables - 23 - Multimedia 24 - - Devices - 5 - - - - - Screen - 11 - - - - Pen Drive - 9 - - - - External Hard Drive - 6 - - - - Keyboard / Mouse - 8 - - - - Printer - 10 - - - - Speakers - 13 - - - - Headset - 7 - - - - Software - 12 - - - - Laptops - 1 - - - - Computers - 2 - - - - - Computer all-in-one - 3 - - - - Server - 4 - - - - Network - 14 - Services @@ -277,9 +202,6 @@ - - - @@ -405,7 +327,7 @@ - Desk Customizable + Customizable Desk 1 @@ -426,7 +348,7 @@ - Desk Customizable + Customizable Desk 1 @@ -468,7 +390,7 @@ - Desk Customizable + Customizable Desk 3 diff --git a/addons/website_sale_options/static/src/js/website_sale.test.js b/addons/website_sale_options/static/src/js/website_sale.test.js index d1e8f74ce22..ae6e4108647 100644 --- a/addons/website_sale_options/static/src/js/website_sale.test.js +++ b/addons/website_sale_options/static/src/js/website_sale.test.js @@ -43,7 +43,7 @@ tour.register('shop_customize', { { content: "select product", extra_trigger: 'body:not(:has(.oe_website_sale .oe_product_cart:eq(2)))', - trigger: '.oe_product_cart a:contains("Desk Customizable")', + trigger: '.oe_product_cart a:contains("Customizable Desk")', }, { content: "open customize menu", diff --git a/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js b/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js index 921bbe32ffd..1728fef9f92 100644 --- a/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js +++ b/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js @@ -47,18 +47,18 @@ tour.register('shop_wishlist', { }, }, { - content: "check that logged in and search for desk customizable", + content: "check that logged in and search for Customizable Desk", extra_trigger: 'li span:contains(Administrator)', trigger: 'form input[name="search"]', - run: "text Desk Customizable", + run: "text Customizable Desk", }, { content: "submit search", trigger: 'form:has(input[name="search"]) .oe_search_button', }, { - content: "click on desk customizable", - trigger: '.oe_product_cart a:contains("Desk Customizable")', + content: "click on Customizable Desk", + trigger: '.oe_product_cart a:contains("Customizable Desk")', }, { content: "select desk cutomizable", @@ -75,8 +75,8 @@ tour.register('shop_wishlist', { trigger: 'a[href="/shop/wishlist"]', }, { - content: "remove desk customizable", - trigger: 'tr:contains("Desk Customizable") a.o_wish_rm:first', + content: "remove Customizable Desk", + trigger: 'tr:contains("Customizable Desk") a.o_wish_rm:first', }, { content: "check that wishlist contains 1 item",