diff --git a/addons/account/demo/account_invoice_demo.yml b/addons/account/demo/account_invoice_demo.yml index be5023e33f4..a03fdc6818f 100644 --- a/addons/account/demo/account_invoice_demo.yml +++ b/addons/account/demo/account_invoice_demo.yml @@ -10,12 +10,12 @@ type: 'out_invoice' date_invoice: !eval time.strftime('%Y-%m')+'-01' invoice_line_ids: - - name: 'Dell Inspiron Laptop without OS' - product_id: product.product_product_49 + - name: '' + product_id: product.consu_delivery_02 price_unit: 642.0 quantity: 5 - - name: 'Linutop' - product_id: product.product_product_50 + - name: '' + product_id: product.consu_delivery_03 price_unit: 280.0 quantity: 5.0 - @@ -27,12 +27,12 @@ type: 'out_invoice' date_invoice: !eval time.strftime('%Y-%m')+'-08' invoice_line_ids: - - name: '8-port Switch' - product_id: product.product_product_51 + - name: '' + product_id: product.consu_delivery_03 price_unit: 50.0 quantity: 3 - - name: '30m RJ45 wire' - product_id: product.product_product_52 + - name: '' + product_id: product.consu_delivery_01 price_unit: 25 quantity: 20 - @@ -44,38 +44,16 @@ type: 'out_invoice' date_invoice: !eval time.strftime('%Y-%m')+'-08' invoice_line_ids: - - name: 'TypeMatrix Dvorak Keyboard' - product_id: product.product_product_53 + - name: '' + product_id: product.consu_delivery_01 price_unit: 90.0 quantity: 5 - - name: 'Ergonomic Mouse' - product_id: product.product_product_54 + - name: '' + product_id: product.consu_delivery_03 price_unit: 15.0 quantity: 5.0 - !workflow {model: account.invoice, action: invoice_open, ref: demo_invoice_3} -- - !record {model: account.invoice, id: demo_invoice_invest_sale}: - company_id: base.main_company - partner_id: base.res_partner_3 - type: 'out_invoice' - date_invoice: !eval time.strftime('%Y-%m')+'-08' -- - !python {model: ir.model.data} : | - account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_sale_of_land_account')])]) - line_vals = { - 'invoice_id': ref('demo_invoice_invest_sale'), - 'name': "Land located at '50.635336,4.863298'", - 'price_unit': 210600, - } - if account_id: - line_vals['account_id'] = account_id[0] - tax_id = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'sale'), ('amount', '>', 0)]) - if tax_id: - line_vals['invoice_line_tax_ids'] = [(6, 0, [tax_id[0]])] - self._update(cr, uid, 'account.invoice.line', 'account', line_vals, 'sale_of_land_line') - self.pool.get('account.invoice').browse(cr, uid, ref('demo_invoice_invest_sale'))._onchange_invoice_line_ids() - self.pool.get('account.invoice').signal_workflow(cr, uid, [ref('demo_invoice_invest_sale')], 'invoice_open') - Set the context for supplier bills because the 'type' field is readonly in invoice form views, so it value won't be considered by the yaml import - @@ -91,15 +69,15 @@ type: 'in_invoice' date_invoice: !eval time.strftime('%Y-%m')+'-01' invoice_line_ids: - - name: 'Toner Cartridge' + - name: '' price_unit: 10.0 quantity: 1.0 - product_id: product.product_product_39 + product_id: product.product_delivery_01 uom_id: product.product_uom_unit - - name: 'Zed+ Antivirus' + - name: '' price_unit: 4.0 quantity: 1.0 - product_id: product.product_product_43 + product_id: product.product_order_01 uom_id: product.product_uom_unit - !record {model: account.invoice, id: demo_invoice_january_wages}: diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml index f6dc9d4e267..d7c00b8d461 100644 --- a/addons/account/test/account_invoice_state.yml +++ b/addons/account/test/account_invoice_state.yml @@ -5,7 +5,7 @@ company_id: base.main_company currency_id: base.EUR invoice_line_ids: - - name: '[PCSC234] PC Assemble SC234' + - name: 'Computer SC234' price_unit: 450.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account/views/account_unit_test.xml b/addons/account/views/account_unit_test.xml index 250a7166c05..7f09e31abeb 100644 --- a/addons/account/views/account_unit_test.xml +++ b/addons/account/views/account_unit_test.xml @@ -20,7 +20,7 @@ Basic computer with Dvorak keyboard and left-handed mouse - + 250 1 @@ -28,7 +28,7 @@ Little server with raid 1 and 512ECC ram - + 800 2 diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml index ff05a2d3a99..18ebfa7ba84 100644 --- a/addons/membership/membership_demo.xml +++ b/addons/membership/membership_demo.xml @@ -2,36 +2,24 @@ - - + + True - Gold Membership - 180 - - service - + - + True - Silver Membership - - 80 - service - + - + True - Basic Membership - - 40 - service - + diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml index 974babcc799..f07417b2c1c 100644 --- a/addons/mrp/mrp_demo.xml +++ b/addons/mrp/mrp_demo.xml @@ -238,467 +238,161 @@ - + - - + + - 5 + 10 + - - - 2 - - 5 - - - - - - - - - - 5 - - - - - - 4 - - 5 - - - - - - - 10 - - - - - 1 - - 5 - - - - - - - - - - 5 - - - - - - 1 - - 2 - - - - - - 1 - - 4 - - - - + 1 - 6 - + 5 + - - - - 10 - - - - + + 1 - 2 - - - - - - 1 - - 4 - - - - - - 1 - - 6 - - - - - - - - - 5 + - - + + 1 - 4 - + 5 + - + + + 1 + + 5 + + + + 1 - 6 - + 5 + - - - 1 - - 8 - - - - - - - 10 - - - + 1 - 2 - + 5 + - - - 1 - - 4 - - - - - - 1 - - 6 - - - - + 1 - 10 - - - - - - - - - 5 - - - - - - 5 - - - - - - - - 5 - default - phantom - - - - 1 - - 1 - - - - - 1 - - 1 - - - - - 1 - - 1 - - - - - - - - - - 5 - phantom - - - - - - 1 - - 2 - - - - - - 1 - - 4 - - - - - - 1 - - 6 - - - - - - 1 - - 8 - - - - - - 2 - - 10 - - - - - - - 4 - - phantom - - - - - 1 - - 2 - - - - - - 1 - - 4 - - - - - - 1 - - 6 - - - - - - 1 - - 8 - - - - - - 1 - - 10 - + - + - + - 5 + 15 phantom - - - 1 - - 2 - - - - - - 1 - - 4 - - - - - - 1 - - 6 - - - - - - 1 - - 8 - - - - - - 1 - - 10 - - - - - - - - - - 1 - - - - 1 - - 1 - - - - - - 1 - - 2 - - - - - - 1 - - 3 - - - - - - 1 - - 1 - - - - - + 1 - 1 - - + 5 + - - + + 1 - 1 - + 5 + + + + 1 + + 5 + + - - - - 3 - - - - - + + + 1 + + 5 + + - - - - - - - - - + + + 1 + + 5 + + - - + + + 1 + + 5 + + + + + + 1 + + 5 + + + + + + + 3 + + + + + + + + + + + + + + + + + + diff --git a/addons/mrp/test/bom_with_service_type_product.yml b/addons/mrp/test/bom_with_service_type_product.yml index 1fd5c832a4f..711c0d99e7b 100644 --- a/addons/mrp/test/bom_with_service_type_product.yml +++ b/addons/mrp/test/bom_with_service_type_product.yml @@ -12,13 +12,14 @@ - product_id: product.product_product_2 product_uom: product.product_uom_unit product_qty: 1.0 - - product_id: product.product_product_44 + - product_id: product.consu_delivery_01 product_uom: product.product_uom_unit product_qty: 1.0 - I make the production order using BoM having one service type product and one consumable product. - !record {model: mrp.production, id: mrp_production_servicetype_mo1}: + name: 'MO-Test' product_id: product.product_product_3 product_qty: 1.0 bom_id: mrp_bom_test1 diff --git a/addons/mrp/test/order_demo.yml b/addons/mrp/test/order_demo.yml index d25ef12032f..ec8b2dcc6ae 100644 --- a/addons/mrp/test/order_demo.yml +++ b/addons/mrp/test/order_demo.yml @@ -4,14 +4,14 @@ !context uid: 'res_users_mrp_user' - - I create Production Order of PC Assemble SC349 to produce 5.0 Unit. + I create Production Order of Computer SC234 to produce 5.0 Unit. - !record {model: mrp.production, id: mrp_production_test1}: product_id: product.product_product_3 product_qty: 5.0 location_src_id: stock.stock_location_14 location_dest_id: stock.stock_location_output - bom_id: mrp_bom_9 + bom_id: mrp_bom_kit routing_id: mrp.mrp_routing_1 diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml index c2537e1e663..38638fc6cfc 100644 --- a/addons/mrp/test/order_process.yml +++ b/addons/mrp/test/order_process.yml @@ -14,7 +14,7 @@ - !python {model: mrp.production}: | order = self.browse(cr, uid, ref("mrp_production_test1"), context=context) - assert len(order.product_lines) == 5, "Production lines are not generated proper." + assert len(order.product_lines) == 7, "Production lines are not generated proper." - Now I check workcenter lines. - diff --git a/addons/mrp_byproduct/test/mrp_byproduct.yml b/addons/mrp_byproduct/test/mrp_byproduct.yml index 758a7fc2efd..23a458241a5 100644 --- a/addons/mrp_byproduct/test/mrp_byproduct.yml +++ b/addons/mrp_byproduct/test/mrp_byproduct.yml @@ -4,11 +4,11 @@ - I add a sub product in Bill of material for product External Hard Disk. - - !record {model: mrp.bom, id: mrp.mrp_bom_9}: - product_id: product.product_product_28 + !record {model: mrp.bom, id: mrp.mrp_bom_kit}: + product_id: product.product_delivery_02 product_uom: product.product_uom_unit sub_products: - - product_id: product.product_product_33 + - product_id: product.product_delivery_01 product_uom: product.product_uom_unit product_qty: 2.0 subproduct_type: fixed @@ -16,10 +16,10 @@ I create a production order for External Hard Disk. - !record {model: mrp.production, id: mrp_production_mo0}: - product_id: product.product_product_28 + product_id: product.product_delivery_02 product_qty: 2.0 product_uom: product.product_uom_unit - bom_id: mrp.mrp_bom_9 + bom_id: mrp.mrp_bom_kit location_src_id: stock.stock_location_stock - I compute the data of production order. @@ -40,7 +40,7 @@ This move is created automatically when I confirmed the production order. - !python {model: stock.move}: | - move_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_33'))]) + move_ids = self.search(cr, uid, [('product_id','=',ref('product.product_delivery_01'))]) assert move_ids, 'No moves are created !' - I want to start the production so I force the reservation of products. @@ -74,6 +74,6 @@ - !python {model: stock.move}: | production_order = self.pool.get('mrp.production').browse(cr, uid, ref("mrp_production_mo0")) - move_ids = self.search(cr, uid, [('origin','=',production_order.name), ('product_id','in',[ref("product.product_product_28"),ref("product.product_product_33")])]) + move_ids = self.search(cr, uid, [('origin','=',production_order.name), ('product_id','in',[ref("product.product_delivery_02"),ref("product.product_delivery_01")])]) moves = self.browse(cr, uid, move_ids) assert all(move.state == 'done' for move in moves), 'Moves are not done!' diff --git a/addons/mrp_operations/mrp_operations_demo.yml b/addons/mrp_operations/mrp_operations_demo.yml index 196d978bcc1..b7e37885c4d 100644 --- a/addons/mrp_operations/mrp_operations_demo.yml +++ b/addons/mrp_operations/mrp_operations_demo.yml @@ -1,7 +1,7 @@ - !record {model: mrp.production, id: mrp_production_op}: location_src_id: stock.stock_location_stock - product_id: product.product_product_5 + product_id: product.product_product_3 product_qty: 5.0 allow_reorder: True - @@ -10,15 +10,10 @@ product_id: product.product_product_5 product_qty: 2.0 - - !function {model: mrp.production, name: action_compute, id: mrp_production_op1}: - - model: mrp.production - eval: "[obj(ref('mrp_production_op1')).id]" -- - !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_op1} -- - !record {model: mrp.production, id: mrp_production_mo1}: - location_src_id: stock.stock_location_stock - product_id: product.product_product_16 - product_qty: 5.0 -- - !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1} + !python {model: mrp.production}: | + # test compute, then confirm + self.action_compute(cr, uid, ref('mrp_production_op1'), properties=[self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'mrp.mrp_property_4')], context=context) + self.action_confirm(cr, uid, ref('mrp_production_op1'), context=context) + + self.action_compute(cr, uid, ref('mrp_production_op'), properties=[self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'mrp.mrp_property_4')], context=context) + self.action_confirm(cr, uid, ref('mrp_production_op'), context=context) diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml index 37f3e8de630..b9fc7784dbf 100644 --- a/addons/point_of_sale/point_of_sale_demo.xml +++ b/addons/point_of_sale/point_of_sale_demo.xml @@ -553,53 +553,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/addons/procurement/test/procurement.yml b/addons/procurement/test/procurement.yml index 1f89e28bbdb..daba7374ec2 100644 --- a/addons/procurement/test/procurement.yml +++ b/addons/procurement/test/procurement.yml @@ -4,7 +4,7 @@ !record {model: procurement.order, id: procurement_order0}: company_id: base.main_company name: Procurement Test - product_id: product.product_product_32 + product_id: product.product_delivery_01 product_qty: 15.0 product_uom: product.product_uom_unit - diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml index e9ce67f56c7..07b93f2563a 100644 --- a/addons/product/product_demo.xml +++ b/addons/product/product_demo.xml @@ -6,10 +6,6 @@ - - Internal @@ -27,13 +23,7 @@ Physical - - - - - + Prepaid Consulting 40 @@ -42,6 +32,63 @@ Example of product to invoice on order. + SERV_ORDER + + + + Cost-plus Contract + + 200.0 + 180.0 + service + + + SERV_DEL + + + + External Audit + + 160 + 180 + service + + + Example of products to invoice based on cost. + SERV_COST + + + + Switch, 24 ports + + 55.0 + 70.0 + consu + + + PROD_DEL + + + + Datacard + + 35.0 + 40.0 + consu + + + PROD_DEL02 + + + + Zed+ Antivirus + + 235.0 + 280.0 + consu + + + PROD_ORDER @@ -55,18 +102,6 @@ Example of products to invoice based on delivery. - - External Audit - - 160 - 180 - service - - - Example of products to invoice based on cost. - - - Support Services @@ -94,7 +129,7 @@ HDD SH-1 PCSC234 - + Memory @@ -139,21 +174,21 @@ HDD SH-1 7.9‑inch (diagonal) LED-backlit, 128Gb Dual-core A5 with quad-core graphics FaceTime HD Camera, 1.2 MP Photos - A2323 + E-COM01 - A2324 + E-COM02 - A2325 + E-COM03 - A2326 + E-COM04 @@ -188,8 +223,6 @@ FaceTime HD Camera, 1.2 MP Photos 50.40 - - Bose Mini Bluetooth Speaker @@ -199,7 +232,7 @@ FaceTime HD Camera, 1.2 MP Photos Bose's smallest portable Bluetooth speaker - B3423 + E-COM05 @@ -212,7 +245,7 @@ FaceTime HD Camera, 1.2 MP Photos Custom computer shipped in kit. - B3424 + E-COM06 @@ -223,7 +256,7 @@ FaceTime HD Camera, 1.2 MP Photos consu - A1232 + E-COM07 0.330 @@ -235,7 +268,7 @@ FaceTime HD Camera, 1.2 MP Photos consu - A8767 + E-COM08 @@ -246,7 +279,7 @@ FaceTime HD Camera, 1.2 MP Photos consu - A1090 + E-COM09 9.54 @@ -258,7 +291,7 @@ FaceTime HD Camera, 1.2 MP Photos consu - AK789 + E-COM10 @@ -269,11 +302,9 @@ FaceTime HD Camera, 1.2 MP Photos consu - M-Opt + E-COM11 - - iPod @@ -282,11 +313,11 @@ FaceTime HD Camera, 1.2 MP Photos consu - A6678 + E-COM12 - A6679 + E-COM13 @@ -307,7 +338,7 @@ FaceTime HD Camera, 1.2 MP Photos 6.40 - + Mouse, Wireless @@ -331,28 +362,6 @@ FaceTime HD Camera, 1.2 MP Photos RAM-SR5 - - RAM SR2 (kit) - - 87.0 - 95.0 - consu - - - RAM-SR2 - - - - RAM SR3 - - 80.0 - 85.0 - consu - - - RAM-SR3 - - Computer Case @@ -375,29 +384,6 @@ FaceTime HD Camera, 1.2 MP Photos HDD-SH1 - - HDD SH-2 (mto) - - 1020.0 - 1150.0 - consu - - - HDD-SH2 - - - - HDD on Demand - - 1100.0 - 1250.0 - consu - - - On demand hard-disk having capacity based on requirement. - HDD-DEM - - Motherboard I9P57 @@ -408,18 +394,6 @@ FaceTime HD Camera, 1.2 MP Photos MBi9 - - - Motherboard A20Z7 - - 1790.0 - 2000.0 - consu - - - MBa20 - - Processor Core i5 2.70 Ghz @@ -431,17 +405,6 @@ FaceTime HD Camera, 1.2 MP Photos CPUi5 - - Processor AMD 8-Core - - 1910.0 - 1980.0 - consu - - - CPUa8 - - Graphics Card @@ -468,21 +431,6 @@ QWERTY keyboard LAP-E5 - - Laptop S3450 - - 3000.0 - 3245.0 - consu - - - 17" Monitor -6GB RAM -Hi-Speed 234Q Processor -QWERTY keyboard - LAP-S3 - - Laptop Customized @@ -495,357 +443,7 @@ QWERTY keyboard LAP-CUS - - External Hard disk - - 390.0 - 405.0 - consu - - - EXT-HDD - - - - - Pen drive, SP-2 - - 90.0 - 100.0 - consu - - - PD-SP2 - - - - - Pen drive, SP-4 - - 126.0 - 145.0 - consu - - - PD-SP4 - - - - Multimedia Speakers - - 134.0 - 150.0 - consu - - - . - MM-SPK - - - - Headset standard - - 57.0 - 62.0 - consu - - - Hands free headset for laptop PC with in-line microphone and headphone plug. - HEAD - - - - Headset USB - - 60.0 - 65.0 - consu - - - Headset for laptop PC with USB connector. - HEAD-USB - - - - - Webcam - - 38.0 - 45.0 - consu - - - WCAM - - - - - Blank CD - - 18.40 - 20.0 - consu - - - CD - - - - - Blank DVD-RW - - 21.60 - 24.0 - consu - - - DVD - - - - - Printer, All-in-one - - 4258.0 - 4410.0 - consu - - - All in one hi-speed printer with fax and scanner. - PRINT - - - - - Ink Cartridge - - 60.0 - 65.0 - consu - - - INK - - - - - Toner Cartridge - - 66.0 - 70.0 - consu - - - TONER - - - - - Windows 7 Professional - - 330.0 - 470.0 - consu - - - Win7 - - - - - Windows Home Server 2011 - - 540.0 - 620.0 - consu - - - WServer - - - - - Office Suite - - 110.0 - 170.0 - consu - - - Office Editing Software with word processing, spreadsheets, presentations, graphics, and databases... - OSuite - - - - - Zed+ Antivirus - - 235.0 - 280.0 - consu - - - Zplus - - - - - GrapWorks Software - - 155.0 - 173.0 - consu - - - Full featured image editing software. - GRAPs/w - - - - - Router R430 - - 55.0 - 60.0 - consu - - - ROUT_430 - - - - - Datacard - - 35.0 - 40.0 - consu - - - DC - - - - - Switch, 24 ports - - 55.0 - 70.0 - consu - - - SW24 - - - - - USB Adapter - - 13.0 - 18.0 - consu - - - ADPT - - - - - Dell Inspiron Laptop without OS - - 46900.0 - 44000.0 - consu - - - DELL15 - - - - - Linutop - - 26400.0 - 25000.0 - consu - - - LIN12 - - - - - 8-port Switch - - 725.0 - 600.0 - consu - - - SIW162 - - - - - 30m RJ45 wire - - 300.0 - 250.0 - consu - - - RJ45 - - - - - TypeMatrix Dvorak Keyboard - - 3500.0 - 3000.0 - consu - - - TDKEY1 - - - - - Ergonomic Mouse - - 400.0 - 300.0 - consu - - - ERMO85 - - - - - Desktop Computer Table - - 2000.0 - 1800.0 - consu - - - DSKTAB96 - - - - - Desktop Lamp - - 200.0 - 180.0 - consu - - - DSKLM12 - - - + Basic Computer 25000.0 @@ -855,10 +453,10 @@ QWERTY keyboard Dvorak keyboard left-handed mouse - BASICCOMP + CONS_DEL03 - + Little server 45000.0 @@ -868,10 +466,10 @@ QWERTY keyboard raid 1 512ECC ram - LTLSRVR + CONS_DEL02 - + Server 65000.0 @@ -881,7 +479,33 @@ QWERTY keyboard raid 10 2048ECC ram - SERVER + CONS_DEL01 + + + + + + Gold Membership + 180 + + service + + + + + Silver Membership + + 80 + service + + + + + Basic Membership + + 40 + service + + + + + + + + diff --git a/addons/product/product_pricelist_demo.yml b/addons/product/product_pricelist_demo.yml index 583eb806887..19b1a237d42 100644 --- a/addons/product/product_pricelist_demo.yml +++ b/addons/product/product_pricelist_demo.yml @@ -20,13 +20,13 @@ - name: 1 surchange on Laptop applied_on : '1_product' sequence: 1 - product_id: product_product_25 + product_id: product_delivery_01 compute_price: 'formula' base: 'list_price' price_surcharge: 1 - name: 5% Discount on all Computer related products applied_on : '2_product_category' - sequence: 1 + sequence: 4 min_quantity: 2 compute_price: 'formula' base: 'list_price' diff --git a/addons/membership/static/img/membership_0-image.jpg b/addons/product/static/img/membership_0-image.jpg similarity index 100% rename from addons/membership/static/img/membership_0-image.jpg rename to addons/product/static/img/membership_0-image.jpg diff --git a/addons/membership/static/img/membership_1-image.jpg b/addons/product/static/img/membership_1-image.jpg similarity index 100% rename from addons/membership/static/img/membership_1-image.jpg rename to addons/product/static/img/membership_1-image.jpg diff --git a/addons/membership/static/img/membership_2-image.jpg b/addons/product/static/img/membership_2-image.jpg similarity index 100% rename from addons/membership/static/img/membership_2-image.jpg rename to addons/product/static/img/membership_2-image.jpg diff --git a/addons/product/static/img/product_product_14-image.jpg b/addons/product/static/img/product_product_14-image.jpg deleted file mode 100644 index 98e9f5e7851..00000000000 Binary files a/addons/product/static/img/product_product_14-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_15-image.jpg b/addons/product/static/img/product_product_15-image.jpg deleted file mode 100644 index 98e9f5e7851..00000000000 Binary files a/addons/product/static/img/product_product_15-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_18-image.jpg b/addons/product/static/img/product_product_18-image.jpg deleted file mode 100644 index 95eed34fcbe..00000000000 Binary files a/addons/product/static/img/product_product_18-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_19-image.jpg b/addons/product/static/img/product_product_19-image.jpg deleted file mode 100644 index 8704982173a..00000000000 Binary files a/addons/product/static/img/product_product_19-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_21-image.jpg b/addons/product/static/img/product_product_21-image.jpg deleted file mode 100644 index 5989039c922..00000000000 Binary files a/addons/product/static/img/product_product_21-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_23-image.jpg b/addons/product/static/img/product_product_23-image.jpg deleted file mode 100644 index dbbae134da7..00000000000 Binary files a/addons/product/static/img/product_product_23-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_26-image.jpg b/addons/product/static/img/product_product_26-image.jpg deleted file mode 100644 index 919d29fc1e3..00000000000 Binary files a/addons/product/static/img/product_product_26-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_28-image.jpg b/addons/product/static/img/product_product_28-image.jpg deleted file mode 100644 index e7444d34a59..00000000000 Binary files a/addons/product/static/img/product_product_28-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_29-image.jpg b/addons/product/static/img/product_product_29-image.jpg deleted file mode 100644 index 171b9067280..00000000000 Binary files a/addons/product/static/img/product_product_29-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_30-image.jpg b/addons/product/static/img/product_product_30-image.jpg deleted file mode 100644 index 3a1b3db54d9..00000000000 Binary files a/addons/product/static/img/product_product_30-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_31-image.jpg b/addons/product/static/img/product_product_31-image.jpg deleted file mode 100644 index 707767ab325..00000000000 Binary files a/addons/product/static/img/product_product_31-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_33-image.jpg b/addons/product/static/img/product_product_33-image.jpg deleted file mode 100644 index f1153fba043..00000000000 Binary files a/addons/product/static/img/product_product_33-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_34-image.jpg b/addons/product/static/img/product_product_34-image.jpg deleted file mode 100644 index d9c8a15d872..00000000000 Binary files a/addons/product/static/img/product_product_34-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_35-image.jpg b/addons/product/static/img/product_product_35-image.jpg deleted file mode 100644 index 90b8631a1a1..00000000000 Binary files a/addons/product/static/img/product_product_35-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_36-image.jpg b/addons/product/static/img/product_product_36-image.jpg deleted file mode 100644 index d86457e81c7..00000000000 Binary files a/addons/product/static/img/product_product_36-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_37-image.jpg b/addons/product/static/img/product_product_37-image.jpg deleted file mode 100644 index 01c52a1eb18..00000000000 Binary files a/addons/product/static/img/product_product_37-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_38-image.jpg b/addons/product/static/img/product_product_38-image.jpg deleted file mode 100644 index 0b775760bab..00000000000 Binary files a/addons/product/static/img/product_product_38-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_39-image.jpg b/addons/product/static/img/product_product_39-image.jpg deleted file mode 100644 index a971b97216d..00000000000 Binary files a/addons/product/static/img/product_product_39-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_40-image.jpg b/addons/product/static/img/product_product_40-image.jpg deleted file mode 100644 index 739ecdec4f8..00000000000 Binary files a/addons/product/static/img/product_product_40-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_41-image.jpg b/addons/product/static/img/product_product_41-image.jpg deleted file mode 100644 index 8d8a3959f42..00000000000 Binary files a/addons/product/static/img/product_product_41-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_42-image.jpg b/addons/product/static/img/product_product_42-image.jpg deleted file mode 100644 index b2d57463ac1..00000000000 Binary files a/addons/product/static/img/product_product_42-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_44-image.jpg b/addons/product/static/img/product_product_44-image.jpg deleted file mode 100644 index 290cbe547a5..00000000000 Binary files a/addons/product/static/img/product_product_44-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_45-image.jpg b/addons/product/static/img/product_product_45-image.jpg deleted file mode 100644 index c5357b03571..00000000000 Binary files a/addons/product/static/img/product_product_45-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_47-image.jpg b/addons/product/static/img/product_product_47-image.jpg deleted file mode 100644 index 9fda398ba56..00000000000 Binary files a/addons/product/static/img/product_product_47-image.jpg and /dev/null differ diff --git a/addons/product/static/img/product_product_48-image.jpg b/addons/product/static/img/product_product_48-image.jpg deleted file mode 100644 index 60ed049df88..00000000000 Binary files a/addons/product/static/img/product_product_48-image.jpg and /dev/null differ diff --git a/addons/product/test/product_pricelist.yml b/addons/product/test/product_pricelist.yml index a95a56f23f6..08d26fdbba7 100644 --- a/addons/product/test/product_pricelist.yml +++ b/addons/product/test/product_pricelist.yml @@ -13,7 +13,7 @@ - !python {model: product.product}: | from openerp.tools import float_compare - product = self.browse(cr, uid, ref("product_product_25"), context=context) + product = self.browse(cr, uid, ref("product_delivery_01"), context=context) assert float_compare(product.price, product.lst_price + 1, precision_digits=2) == 0, "Wrong sale price: Laptop." - I check sale price of IT component. @@ -28,7 +28,7 @@ !python {model: product.product}: | from openerp.tools import float_compare context.update({'quantity':5}) - product = self.browse(cr, uid, ref("product_product_26"), context=context) + product = self.browse(cr, uid, ref("product_product_25"), context=context) assert float_compare(product.price, product.lst_price-product.lst_price*(0.05), precision_digits=2) == 0, "Wrong sale price: IT component if more than 3 Unit." - I check sale price of LCD Monitor. diff --git a/addons/product/tests/test_pricelist.py b/addons/product/tests/test_pricelist.py index 3e9cd7ee3c8..1aa3c6d8c9e 100644 --- a/addons/product/tests/test_pricelist.py +++ b/addons/product/tests/test_pricelist.py @@ -11,8 +11,8 @@ class TestPricelist(TransactionCase): self.product_pricelist = self.registry('product.pricelist') self.uom = self.registry('product.uom') - self.usb_adapter_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_product_48')[1] - self.datacard_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_product_46')[1] + self.usb_adapter_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_delivery_01')[1] + self.datacard_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_delivery_02')[1] self.unit_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_uom_unit')[1] self.dozen_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_uom_dozen')[1] self.tonne_id = self.ir_model_data.xmlid_to_res_id(cr, uid, 'product.product_uom_ton') diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml index da6578d61e8..d2154ba48b4 100644 --- a/addons/purchase/purchase_demo.xml +++ b/addons/purchase/purchase_demo.xml @@ -10,23 +10,11 @@ - + - - - - - - - - - - - - - + diff --git a/addons/purchase/purchase_order_demo.yml b/addons/purchase/purchase_order_demo.yml index f96d33b7593..8b7ed7c44b5 100644 --- a/addons/purchase/purchase_order_demo.yml +++ b/addons/purchase/purchase_order_demo.yml @@ -6,7 +6,7 @@ - !record {model: purchase.order.line, id: purchase_order_line_1}: order_id: purchase.purchase_order_1 - product_id: product.product_product_15 + product_id: product.product_delivery_01 name: RAM SR3 price_unit: 79.80 product_qty: 15.0 @@ -36,13 +36,13 @@ !record {model: purchase.order, id: purchase_order_2}: partner_id: base.res_partner_3 order_line: - - product_id: product.product_product_31 + - product_id: product.product_delivery_02 name: Multimedia Speakers price_unit: 132.50 product_qty: 20.0 product_uom: product.product_uom_unit date_planned: !eval time.strftime('%Y-%m-%d') - - product_id: product.product_product_29 + - product_id: product.product_delivery_01 name: Pen drive, SP-2 price_unit: 89 product_qty: 5 @@ -64,7 +64,7 @@ !record {model: purchase.order, id: purchase_order_4}: partner_id: base.res_partner_4 order_line: - - product_id: product.product_product_14 + - product_id: product.product_delivery_02 name: RAM SR2 (kit) price_unit: 85.50 product_qty: 6.0 @@ -104,19 +104,19 @@ !record {model: purchase.order, id: purchase_order_6}: partner_id: base.res_partner_1 order_line: - - product_id: product.product_product_38 + - product_id: product.product_delivery_02 name: Ink Cartridge price_unit: 58 product_qty: 9 product_uom: product.product_uom_unit date_planned: !eval time.strftime('%Y-%m-%d') - - product_id: product.product_product_39 + - product_id: product.product_delivery_01 name: Toner Cartridge product_qty: 3 price_unit: 65 product_uom: product.product_uom_unit date_planned: !eval time.strftime('%Y-%m-%d') - - product_id: product.product_product_44 + - product_id: product.consu_delivery_01 name: GrapWorks Software product_qty: 4 price_unit: 154.5 @@ -133,7 +133,7 @@ price_unit: 13.5 product_uom: product.product_uom_unit date_planned: !eval time.strftime('%Y-%m-%d') - - product_id: product.product_product_34 + - product_id: product.product_delivery_02 name: Webcam product_qty: 15 price_unit: 38.0 diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index a4889496e1c..9d307e75b14 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -32,7 +32,7 @@ Pen drive, 16GB - + 5 145.00 @@ -41,7 +41,7 @@ Headset USB - + 2 65.00 @@ -96,7 +96,7 @@ Toner Cartridge - + 1 70.00 @@ -123,7 +123,7 @@ Webcam - + 10 45.00 @@ -132,7 +132,7 @@ Multimedia Speakers - + 3 150.00 @@ -141,7 +141,7 @@ Switch, 24 ports - + 2 70.00 @@ -160,30 +160,12 @@ External Hard disk - + 1 405.00 - - - Blank DVD-RW - - 3 - - 24.00 - - - - - Printer, All-in-one - - 1 - - 4410.00 - - @@ -225,7 +207,7 @@ GrapWorks Software - + 1 173.00 @@ -234,7 +216,7 @@ Datacard - + 1 40.00 @@ -243,7 +225,7 @@ USB Adapter - + 1 18.00 diff --git a/addons/sale/sale_demo.yml b/addons/sale/sale_demo.yml index c176dd59fbf..1e31d88448b 100644 --- a/addons/sale/sale_demo.yml +++ b/addons/sale/sale_demo.yml @@ -32,8 +32,8 @@ self._update(cr, uid, 'account.invoice', 'sale', vals, 'test_crm_sale_invoice_2') if account_sale_id: vals = { - 'name': 'Basic computer with Dvorak keyboard and left-handed mouse', - 'product_id': ref('product.product_product_57'), + 'name': '', + 'product_id': ref('product.consu_delivery_03'), 'invoice_id': ref('test_crm_sale_invoice_1'), 'price_unit': 250, 'quantity': 1, @@ -41,8 +41,8 @@ } self._update(cr, uid, 'account.invoice.line', 'sale', vals, 'test_crm_sale_invoice_1_line_1') vals = { - 'name': 'Little server with raid 1 and 512ECC ram', - 'product_id': ref('product.product_product_58'), + 'name': '', + 'product_id': ref('product.consu_delivery_02'), 'invoice_id': ref('test_crm_sale_invoice_1'), 'price_unit': 800, 'quantity': 2, @@ -50,8 +50,8 @@ } self._update(cr, uid, 'account.invoice.line', 'sale', vals, 'test_crm_sale_invoice_1_line_2') vals = { - 'name': 'Server with raid 10 and 2048ECC ram', - 'product_id': ref('product.product_product_59'), + 'name': '', + 'product_id': ref('product.consu_delivery_01'), 'invoice_id': ref('test_crm_sale_invoice_1'), 'price_unit': 4800, 'quantity': 4, @@ -59,8 +59,8 @@ } self._update(cr, uid, 'account.invoice.line', 'sale', vals, 'test_crm_sale_invoice_1_line_3') vals = { - 'name': 'Basic formation with Dvorak', - 'product_id': ref('product.product_product_53'), + 'name': '', + 'product_id': ref('product.consu_delivery_01'), 'invoice_id': ref('test_crm_sale_invoice_2'), 'price_unit': 500, 'quantity': 1, diff --git a/addons/sale/sale_product_demo.xml b/addons/sale/sale_product_demo.xml index 43ffa55a7d6..c7287431017 100644 --- a/addons/sale/sale_product_demo.xml +++ b/addons/sale/sale_product_demo.xml @@ -1,131 +1,43 @@ - + delivery - + delivery - + delivery - + delivery - + delivery - + delivery - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - + order - + delivery - + delivery - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - - delivery - - - + delivery @@ -133,10 +45,6 @@ delivery - - delivery - - delivery @@ -145,30 +53,14 @@ delivery - - delivery - - delivery - - delivery - - delivery - - delivery - - - - delivery - - delivery @@ -177,14 +69,6 @@ delivery - - delivery - - - - delivery - - delivery @@ -261,11 +145,11 @@ delivery - + cost - + order diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml index 2bc80d8853f..903bd3d9395 100644 --- a/addons/sale/sale_unit_test.xml +++ b/addons/sale/sale_unit_test.xml @@ -20,8 +20,8 @@ - [HDD-SH2] HDD SH-2 - + Switch, 24 ports + 90 3 diff --git a/addons/sale/tests/test_sale_common.py b/addons/sale/tests/test_sale_common.py index a7144af6d57..fea031a4308 100644 --- a/addons/sale/tests/test_sale_common.py +++ b/addons/sale/tests/test_sale_common.py @@ -29,10 +29,10 @@ class TestSale(AccountingTestCase): }) # create quotation with differend kinds of products (all possible combinations) self.products = { - 'prod_order': self.env.ref('product.product_product_43'), - 'prod_del': self.env.ref('product.product_product_47'), - 'serv_order': self.env.ref('product.product_product_0'), - 'serv_del': self.env.ref('product.product_product_56'), + 'prod_order': self.env.ref('product.product_order_01'), + 'prod_del': self.env.ref('product.product_delivery_01'), + 'serv_order': self.env.ref('product.service_order_01'), + 'serv_del': self.env.ref('product.service_delivery'), } self.partner = self.env.ref('base.res_partner_1') diff --git a/addons/sale/tests/test_sale_order.py b/addons/sale/tests/test_sale_order.py index f9effb697e3..af5ffecca9b 100644 --- a/addons/sale/tests/test_sale_order.py +++ b/addons/sale/tests/test_sale_order.py @@ -103,7 +103,7 @@ class TestSaleOrder(TestSale): def test_cost_invoicing(self): """ Test confirming a vendor invoice to reinvoice cost on the so """ - serv_cost = self.env.ref('product.product_product_1b') + serv_cost = self.env.ref('product.service_cost_01') prod_gap = self.env.ref('product.product_product_1') so = self.env['sale.order'].create({ 'partner_id': self.partner.id, diff --git a/addons/sale_margin/data/sale_margin_demo.xml b/addons/sale_margin/data/sale_margin_demo.xml index 8c1a96535a4..1a4e6d698e1 100644 --- a/addons/sale_margin/data/sale_margin_demo.xml +++ b/addons/sale_margin/data/sale_margin_demo.xml @@ -18,14 +18,6 @@ 390.00 - - 21.60 - - - - 4258.00 - - 2870.00 diff --git a/addons/sale_mrp/test/cancellation_propagated.yml b/addons/sale_mrp/test/cancellation_propagated.yml index 84b795b1d32..aebeecd922f 100644 --- a/addons/sale_mrp/test/cancellation_propagated.yml +++ b/addons/sale_mrp/test/cancellation_propagated.yml @@ -26,7 +26,7 @@ product_qty: 1.0 type: normal bom_line_ids: - - product_id: product.product_product_44 + - product_id: product.consu_delivery_01 product_uom: product.product_uom_unit product_qty: 1.0 - @@ -54,7 +54,7 @@ Confirm sales order - !python {model: sale.order}: | - self.action_confirm(cr, uid, ref("sale_order_product_manu"), context=context) + self.action_confirm(cr, uid, [ref("sale_order_product_manu")], context=context) - I run scheduler. - diff --git a/addons/sale_mrp/test/sale_mrp.yml b/addons/sale_mrp/test/sale_mrp.yml index faa3b1a3e9a..881b84d0e31 100644 --- a/addons/sale_mrp/test/sale_mrp.yml +++ b/addons/sale_mrp/test/sale_mrp.yml @@ -80,7 +80,7 @@ I confirm the sale order - !python {model: sale.order}: | - self.action_confirm(cr, uid, ref("sale_order_so0"), context=context) + self.action_confirm(cr, uid, [ref("sale_order_so0")], context=context) - I verify that a procurement has been generated for sale order - diff --git a/addons/sale_mrp/tests/test_move_explode.py b/addons/sale_mrp/tests/test_move_explode.py index a7e3bdea946..ffdc857ce64 100644 --- a/addons/sale_mrp/tests/test_move_explode.py +++ b/addons/sale_mrp/tests/test_move_explode.py @@ -15,25 +15,31 @@ class TestMoveExplode(common.TransactionCase): self.Product = self.env['product.product'] #product that has a phantom bom - self.product_bom = self.env.ref('product.product_product_3') + self.product_bom = self.env.ref('product.product_product_5') #bom with that product - self.bom = self.env.ref('mrp.mrp_bom_9') + self.bom = self.env.ref('mrp.mrp_bom_kit') #partner agrolait self.partner = self.env.ref('base.res_partner_1') - #bom: PC Assemble (with property: DDR 512MB) - self.bom_prop = self.env.ref('mrp.mrp_bom_property_0') + #bom: (with property: DDR 512MB) + self.bom_prop = self.env.ref('mrp.mrp_bom_manufacture') + self.bom_prop.write({'property_ids': [(6,0,[self.env['ir.model.data'].xmlid_to_res_id('mrp.mrp_property_8')])]}) self.template = self.env.ref('product.product_product_3_product_template') - #property: DDR 512MB - self.mrp_property = self.env.ref('mrp.mrp_property_0') - #product: RAM SR2 - self.product_bom_prop = self.env.ref('product.product_product_14') - #phantom bom for RAM SR2 with three lines containing properties - self.bom_prop_line = self.env.ref('mrp.mrp_bom_property_line') - #product: iPod included in the phantom bom - self.product_A = self.env.ref('product.product_product_11') - #product: Mouse, Wireless included in the phantom bom - self.product_B = self.env.ref('product.product_product_12') + self.mrp_property = self.env.ref('mrp.mrp_property_8') + self.product_bom_prop = self.env.ref('product.product_product_5') + #phantom bom for 17 with seven lines containing properties + self.bom_prop_line = self.env.ref('mrp.mrp_bom_kit') + # write different properties on the bom and on 2 bom lines + self.bom_prop_line.write({'property_ids': [(6,0,[self.env['ir.model.data'].xmlid_to_res_id('mrp.mrp_property_0')])], 'product_id': self.env['ir.model.data'].xmlid_to_res_id('product.product_product_5')}) + #product: Motherboard included in the phantom bom + self.product_A = self.env.ref('product.product_product_20') + #product: 24 Graphic card in the phantom bom + self.product_B = self.env.ref('product.product_product_24') + for bom_line in self.bom_prop_line.bom_line_ids: + if bom_line.product_id.id in [self.env.ref('product.product_product_20').id, self.env.ref('product.product_product_24').id]: + bom_line.write({'property_ids': [(6, 0, [self.env['ir.model.data'].xmlid_to_res_id('mrp.mrp_property_8')])]}) + else: + bom_line.write({'property_ids': [(6, 0, [self.env['ir.model.data'].xmlid_to_res_id('mrp.mrp_property_0')])]}) #pricelist self.pricelist = self.env.ref('product.list0') @@ -41,28 +47,25 @@ class TestMoveExplode(common.TransactionCase): def test_00_sale_move_explode(self): """check that when creating a sale order with a product that has a phantom BoM, move explode into content of the BoM""" - #create sale order with one sale order line containing product with a phantom bom + # Remove properties on the bom an on the bom lines + self.bom.write({'property_ids': [(6,0,[])]}) + for line in self.bom.bom_line_ids: + line.write({'property_ids': [(6,0,[])]}) + # Create sale order with one sale order line containing product with a phantom bom so_vals = { 'partner_id': self.partner.id, 'partner_invoice_id': self.partner.id, 'partner_shipping_id': self.partner.id, + 'order_line': [(0, 0, {'name': self.product_bom.name, 'product_id': self.product_bom.id, 'product_uom_qty': 1, 'product_uom': self.product_bom.uom_id.id})], 'pricelist_id': self.pricelist.id, } self.so = self.SaleOrder.create(vals=so_vals) - sol_vals = { - 'order_id': self.so.id, - 'name': self.product_bom.name, - 'product_id': self.product_bom.id, - 'product_uom': self.product_bom.uom_id.id, - 'product_uom_qty': 1.0, - } - self.SaleOrderLine.create(values=sol_vals) #confirm sale order self.so.action_confirm() #get all move associated to that sale_order move_ids = self.so.picking_ids.mapped('move_lines').ids #we should have same amount of move as the component in the phatom bom - bom_component_length = self.MrpBom._bom_explode(self.bom, self.product_bom, 1.0, []) + bom_component_length = self.MrpBom._bom_explode(self.bom, self.product_bom, 1.0, properties=[]) self.assertEqual(len(move_ids), len(bom_component_length[0])) def test_00_bom_find(self): diff --git a/addons/sale_mrp/tests/test_sale_mrp_flow.py b/addons/sale_mrp/tests/test_sale_mrp_flow.py index 1404f1c10cb..15a5c96c851 100644 --- a/addons/sale_mrp/tests/test_sale_mrp_flow.py +++ b/addons/sale_mrp/tests/test_sale_mrp_flow.py @@ -341,7 +341,7 @@ class TestSaleMrpFlow(common.TransactionCase): """ Test delivered quantity on SO based on delivered quantity in pickings.""" # intial so self.partner = self.env.ref('base.res_partner_1') - self.product = self.env.ref('product.product_product_3') + self.product = self.env.ref('product.product_product_5') so_vals = { 'partner_id': self.partner.id, 'partner_invoice_id': self.partner.id, diff --git a/addons/sale_service/tests/test_sale_service.py b/addons/sale_service/tests/test_sale_service.py index 4d06312c84e..e906d94c3f7 100644 --- a/addons/sale_service/tests/test_sale_service.py +++ b/addons/sale_service/tests/test_sale_service.py @@ -24,7 +24,6 @@ class TestSaleService(TestSale): task = project.task_ids.filtered(lambda t: t.name == '%s:%s' % (so.name, prod_task.name)) self.assertTrue(task, 'Sale Service: task is not created') self.assertEqual(task.partner_id, so.partner_id, 'Sale Service: customer should be the same on task and on SO') - # register timesheet on task self.env['account.analytic.line'].create({ 'name': 'Test Line', diff --git a/addons/sale_stock/tests/test_sale_stock.py b/addons/sale_stock/tests/test_sale_stock.py index 95874b67d7b..b70a6ff508f 100644 --- a/addons/sale_stock/tests/test_sale_stock.py +++ b/addons/sale_stock/tests/test_sale_stock.py @@ -55,7 +55,8 @@ class TestSaleStock(TestSale): del_qties = [sol.qty_delivered for sol in self.so.order_line] del_qties_truth = [2.0 if sol.product_id.type in ['product', 'consu'] else 0.0 for sol in self.so.order_line] self.assertEqual(del_qties, del_qties_truth, 'Sale Stock: delivered quantities are wrong after complete delivery') - # invoice on delivery + # Without timesheet, we manually set the delivered qty for the product serv_del + self.so.order_line[1]['qty_delivered'] = 2.0 inv_id = self.so.action_invoice_create() self.assertEqual(self.so.invoice_status, 'invoiced', 'Sale Stock: so invoice_status should be "fully invoiced" after complete delivery and invoicing') @@ -111,7 +112,7 @@ class TestSaleStock(TestSale): """ # intial so self.partner = self.env.ref('base.res_partner_1') - self.product = self.env.ref('product.product_product_47') + self.product = self.env.ref('product.product_delivery_01') so_vals = { 'partner_id': self.partner.id, 'partner_invoice_id': self.partner.id, diff --git a/addons/sale_timesheet/data/sale_timesheet_demo.xml b/addons/sale_timesheet/data/sale_timesheet_demo.xml index 9e9c2603f72..4544c8f50de 100644 --- a/addons/sale_timesheet/data/sale_timesheet_demo.xml +++ b/addons/sale_timesheet/data/sale_timesheet_demo.xml @@ -2,7 +2,7 @@ - + timesheet diff --git a/addons/sale_timesheet/tests/test_sale_timesheet.py b/addons/sale_timesheet/tests/test_sale_timesheet.py index 78f676bce9b..67f270d8969 100644 --- a/addons/sale_timesheet/tests/test_sale_timesheet.py +++ b/addons/sale_timesheet/tests/test_sale_timesheet.py @@ -9,7 +9,7 @@ class TestSaleTimesheet(TestSale): def test_timesheet_order(self): """ Test timesheet invoicing with 'invoice on order' timetracked products """ # intial so - prod_ts = self.env.ref('product.product_product_0') + prod_ts = self.env.ref('product.service_order_01') so_vals = { 'partner_id': self.partner.id, 'partner_invoice_id': self.partner.id, diff --git a/addons/stock/procurement_demo.xml b/addons/stock/procurement_demo.xml index 26fbc813e0b..0e4cc5cdd13 100644 --- a/addons/stock/procurement_demo.xml +++ b/addons/stock/procurement_demo.xml @@ -50,14 +50,6 @@ product - - product - - - - product - - product @@ -66,30 +58,14 @@ product - - product - - - - product - - product - - product - - product - - product - - product @@ -98,76 +74,15 @@ product - - product - - product - + product - - product - - - - product - - - - product - - - - product - - - - product - - - - product - - - - product - - - - product - - - - product - - - - product - - - - product - - - - - product - - - - product - - - - product - - - + product diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml index 50ac06887b6..cd8d723dc02 100644 --- a/addons/stock/stock_demo.xml +++ b/addons/stock/stock_demo.xml @@ -101,20 +101,6 @@ 26.0 - - - - - 32.0 - - - - - - - 37.0 - - @@ -122,13 +108,6 @@ 39.0 - - - - - 45.0 - - diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml index 074b0048185..e75dfdd3d44 100644 --- a/addons/stock/stock_demo.yml +++ b/addons/stock/stock_demo.yml @@ -106,7 +106,7 @@ location_id: stock.stock_location_stock location_dest_id: stock.stock_location_customers move_lines: - - product_id: product.product_product_31 + - product_id: product.product_delivery_02 product_uom: product.product_uom_unit product_uom_qty: 45.0 picking_type_id: stock.picking_type_out @@ -151,7 +151,7 @@ location_id: stock.stock_location_suppliers location_dest_id: stock.stock_location_stock move_lines: - - product_id: product.product_product_48 + - product_id: product.product_delivery_01 product_uom: product.product_uom_unit product_uom_qty: 35.0 picking_type_id: stock.picking_type_in @@ -193,7 +193,7 @@ location_id: stock.stock_location_suppliers location_dest_id: stock.stock_location_stock move_lines: - - product_id: product.product_product_31 + - product_id: product.product_delivery_02 product_uom: product.product_uom_unit product_uom_qty: 50.0 picking_type_id: stock.picking_type_in @@ -224,7 +224,7 @@ location_id: stock.stock_location_suppliers location_dest_id: stock.stock_location_shop0 move_lines: - - product_id: product.product_product_48 + - product_id: product.product_delivery_01 product_uom: product.product_uom_unit product_uom_qty: 180.0 picking_type_id: chi_picking_type_in @@ -232,7 +232,7 @@ location_dest_id: stock.stock_location_shop0 state: done pack_operation_ids: - - product_id: product.product_product_48 + - product_id: product.product_delivery_01 product_qty: 100 product_uom_id: product.product_uom_unit location_id: stock.stock_location_suppliers @@ -245,7 +245,7 @@ location_id: stock.stock_location_suppliers location_dest_id: stock.stock_location_shop0 move_lines: - - product_id: product.product_product_32 + - product_id: product.product_delivery_01 product_uom: product.product_uom_unit product_uom_qty: 45.0 picking_type_id: chi_picking_type_in @@ -310,7 +310,7 @@ location_id: stock.stock_location_shop0 location_dest_id: stock.stock_location_customers move_lines: - - product_id: product.product_product_31 + - product_id: product.product_delivery_02 product_uom: product.product_uom_unit product_uom_qty: 45.0 picking_type_id: chi_picking_type_out diff --git a/addons/stock/stock_orderpoint.xml b/addons/stock/stock_orderpoint.xml index 5bbca72765b..8f0c4b7bdb9 100644 --- a/addons/stock/stock_orderpoint.xml +++ b/addons/stock/stock_orderpoint.xml @@ -3,20 +3,12 @@ - - 25.0 - 5.0 - - - - - 10.0 5.0 - + @@ -27,28 +19,12 @@ - - 50.0 - 10.0 - - - - - - - 15.0 - 5.0 - - - - - 5.0 3.0 - + diff --git a/addons/website_membership/demo/membership.xml b/addons/website_membership/demo/membership.xml index fa70e22b1f0..9b43983711a 100644 --- a/addons/website_membership/demo/membership.xml +++ b/addons/website_membership/demo/membership.xml @@ -6,13 +6,13 @@ - + - + - + diff --git a/addons/website_portal_sale/data/demo.xml b/addons/website_portal_sale/data/demo.xml index 799240fc5d9..4072f56214f 100644 --- a/addons/website_portal_sale/data/demo.xml +++ b/addons/website_portal_sale/data/demo.xml @@ -25,7 +25,7 @@ Pen drive, 16GB - + 5 145.00 @@ -34,7 +34,7 @@ Headset USB - + 2 65.00 diff --git a/addons/website_sale/data/demo.xml b/addons/website_sale/data/demo.xml index 6a94c31f0b1..f1b11957d97 100644 --- a/addons/website_sale/data/demo.xml +++ b/addons/website_sale/data/demo.xml @@ -676,109 +676,34 @@ Weight: 31 grams - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/addons/website_sale_options/data/demo.xml b/addons/website_sale_options/data/demo.xml index 933468cc3a1..94628dbd841 100644 --- a/addons/website_sale_options/data/demo.xml +++ b/addons/website_sale_options/data/demo.xml @@ -29,7 +29,7 @@ W0001 - + W0002