diff --git a/addons/account/demo/account_invoice_demo.xml b/addons/account/demo/account_invoice_demo.xml index 7c4ae29498b..fbd7ed2a1ae 100644 --- a/addons/account/demo/account_invoice_demo.xml +++ b/addons/account/demo/account_invoice_demo.xml @@ -26,7 +26,7 @@ - + [RPAN100] Rear Panel SHE100 @@ -39,7 +39,7 @@ - + [RCK200] Rack 200cm diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml index f7969c658e0..1f1a412c19e 100644 --- a/addons/account/test/account_change_currency.yml +++ b/addons/account/test/account_change_currency.yml @@ -10,7 +10,7 @@ name: '[PC1] Basic PC' price_unit: 450.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_12 diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml index a980823590d..b2d87e753de 100644 --- a/addons/account/test/account_customer_invoice.yml +++ b/addons/account/test/account_customer_invoice.yml @@ -22,7 +22,7 @@ reference_type: none name: 'Test Customer Invoice' invoice_line: - - product_id: product.product_product_pc3 + - product_id: product.product_product_5 quantity: 10.0 - I manually assign tax on invoice diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml index 2281f8cf2ce..6553635a781 100644 --- a/addons/account/test/account_invoice_state.yml +++ b/addons/account/test/account_invoice_state.yml @@ -10,7 +10,7 @@ name: '[PC1] Basic PC' price_unit: 450.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.bank_journal partner_id: base.res_partner_12 diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml index 12146aeac97..3bc4a778794 100644 --- a/addons/account/test/account_sequence_test.yml +++ b/addons/account/test/account_sequence_test.yml @@ -23,7 +23,7 @@ name: '[PC3] Medium PC' price_unit: 900.0 quantity: 10.0 - product_id: product.product_product_pc3 + product_id: product.product_product_5 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_3 diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml index abe618ff07e..ccebd2ea90c 100644 --- a/addons/account/test/account_supplier_invoice.yml +++ b/addons/account/test/account_supplier_invoice.yml @@ -30,7 +30,7 @@ - account_id: account.a_expense name: '[PC1] Basic PC' price_unit: 300.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 quantity: 10.0 uos_id: product.product_uom_unit invoice_line_tax_id: diff --git a/addons/account/test/price_accuracy00.yml b/addons/account/test/price_accuracy00.yml index 639b39b6c25..2f6dbadccf1 100644 --- a/addons/account/test/price_accuracy00.yml +++ b/addons/account/test/price_accuracy00.yml @@ -24,7 +24,7 @@ account_id: account.a_recv date_invoice: !eval time.strftime('%Y-%m-%d') invoice_line: - - product_id: product.product_product_pc1 + - product_id: product.product_product_3 quantity: &qty 11.11 account_id: account.a_sale uos_id: product.product_uom_unit diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml index f94d1896810..516be311cf8 100644 --- a/addons/account/test/test_edi_invoice.yml +++ b/addons/account/test/test_edi_invoice.yml @@ -13,14 +13,14 @@ name: selling product type: 'out_invoice' invoice_line: - - product_id: product.product_product_pc1 + - product_id: product.product_product_3 uos_id: 1 quantity: 1.0 price_unit: 10.0 name: 'basic pc' account_id: account.a_pay invoice_line: - - product_id: product.product_product_pc3 + - product_id: product.product_product_5 uos_id: 1 quantity: 5.0 price_unit: 100.0 @@ -106,7 +106,7 @@ "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"], "name": "Basic PC", "price_unit": 10.0, - "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_pc1", "[PC1] Basic PC"], + "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PC1] Basic PC"], "quantity": 1.0 }, { @@ -116,7 +116,7 @@ "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"], "name": "Medium PC", "price_unit": 100.0, - "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_pc3", "[PC3] Medium PC"], + "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC3] Medium PC"], "quantity": 5.0 }] } diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml index 87875a4210b..bbb9fa94cd5 100644 --- a/addons/account_voucher/test/case1_usd_usd.yml +++ b/addons/account_voucher/test/case1_usd_usd.yml @@ -82,7 +82,7 @@ name: '[PC1] Basic PC' price_unit: 200.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 @@ -115,7 +115,7 @@ name: '[PC1] Basic PC' price_unit: 100.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml index 0ca70d7bf5b..cc4c238aaaf 100644 --- a/addons/account_voucher/test/case2_suppl_usd_eur.yml +++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml @@ -53,7 +53,7 @@ name: '[PC1] Basic PC' price_unit: 200.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 @@ -88,7 +88,7 @@ name: '[PC1] Basic PC' price_unit: 100.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml index 078ab7916d1..c37783247db 100644 --- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml +++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml @@ -88,7 +88,7 @@ name: '[PC1] Basic PC' price_unit: 200.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 @@ -121,7 +121,7 @@ name: '[PC1] Basic PC' price_unit: 100.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml index 27357c2e65a..36593a2b9cd 100644 --- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml +++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml @@ -88,7 +88,7 @@ name: '[PC1] Basic PC' price_unit: 200.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 @@ -121,7 +121,7 @@ name: '[PC1] Basic PC' price_unit: 100.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml index 8c94dde293f..d70bd41a2ff 100644 --- a/addons/account_voucher/test/case3_eur_eur.yml +++ b/addons/account_voucher/test/case3_eur_eur.yml @@ -42,7 +42,7 @@ name: '[PC1] Basic PC' price_unit: 150.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 @@ -75,7 +75,7 @@ name: '[PC1] Basic PC' price_unit: 80.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml index 45800656b12..5ca901cdbca 100644 --- a/addons/account_voucher/test/case4_cad_chf.yml +++ b/addons/account_voucher/test/case4_cad_chf.yml @@ -76,7 +76,7 @@ name: '[PC1] Basic PC' price_unit: 200.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml index c373c24708b..15c5fc8593e 100644 --- a/addons/account_voucher/test/case_eur_usd.yml +++ b/addons/account_voucher/test/case_eur_usd.yml @@ -55,7 +55,7 @@ name: '[PC1] Basic PC' price_unit: 1000.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml index 82bad9d390c..585ce23aace 100644 --- a/addons/account_voucher/test/sales_payment.yml +++ b/addons/account_voucher/test/sales_payment.yml @@ -10,7 +10,7 @@ name: '[PC1] Basic PC' price_unit: 450.0 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit journal_id: account.sales_journal partner_id: base.res_partner_19 diff --git a/addons/l10n_ch/test/l10n_ch_dta.yml b/addons/l10n_ch/test/l10n_ch_dta.yml index 7ef00493c4b..3d4ae91d580 100644 --- a/addons/l10n_ch/test/l10n_ch_dta.yml +++ b/addons/l10n_ch/test/l10n_ch_dta.yml @@ -28,7 +28,7 @@ name: '[PC1] Basic PC' price_unit: 700.0 quantity: 10.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit invoice_id: dta_account_invoice diff --git a/addons/l10n_ch/test/l10n_ch_v11.yml b/addons/l10n_ch/test/l10n_ch_v11.yml index 7db3a16d6c3..4bacbf730f8 100644 --- a/addons/l10n_ch/test/l10n_ch_v11.yml +++ b/addons/l10n_ch/test/l10n_ch_v11.yml @@ -29,7 +29,7 @@ name: '[PC1] Basic PC' price_unit: 888.00 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit invoice_id: v11_test_invoice diff --git a/addons/l10n_ch/test/l10n_ch_v11_part.yml b/addons/l10n_ch/test/l10n_ch_v11_part.yml index 94edef860f5..811ee77bc4a 100644 --- a/addons/l10n_ch/test/l10n_ch_v11_part.yml +++ b/addons/l10n_ch/test/l10n_ch_v11_part.yml @@ -30,7 +30,7 @@ name: '[PC1] Basic PC' price_unit: 250.00 quantity: 1.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 uos_id: product.product_uom_unit invoice_id: v11_part_test_invoice diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml index 7cc37310930..8c9a9ae6007 100644 --- a/addons/mrp/mrp_demo.xml +++ b/addons/mrp/mrp_demo.xml @@ -238,7 +238,7 @@ 1.0 normal - + @@ -247,21 +247,21 @@ 1.0 - + Assembly Medium PC 8 1.0 - + Assembly Customizable PC 11 1.0 - + HDD on demand @@ -302,7 +302,7 @@ 1.0 normal - + Complete PC with peripherals @@ -326,7 +326,7 @@ 1.0 - + @@ -334,7 +334,7 @@ 40 1.0 - + @@ -354,7 +354,7 @@ 1.0 - + Mainboard ASUStek A7N8X @@ -362,7 +362,7 @@ 1.0 - + Processor AMD Athlon 2200+ @@ -370,7 +370,7 @@ 1.0 - + Regular Case Fan @@ -378,7 +378,7 @@ 1.0 - + DDR 256MB PC333 @@ -386,7 +386,7 @@ 1.0 - + DDR 512MB PC400 @@ -394,7 +394,7 @@ 1.0 - + DDR 1024MB PC400 @@ -402,7 +402,7 @@ 1.0 - + HDD Seagate 7200.8 80GB @@ -410,7 +410,7 @@ 1.0 - + HDD Seagate 7200.8 120GB @@ -419,7 +419,7 @@ 1.0 normal - + RAM on demand @@ -444,7 +444,7 @@ 1.0 normal - + Processor on demand @@ -453,7 +453,7 @@ 1.0 normal - + ATX Middle-size case @@ -462,7 +462,7 @@ 1.0 normal - + HDD Seagate 7200.8 80GB @@ -471,7 +471,7 @@ 1.0 normal - + High speed processor config @@ -480,7 +480,7 @@ 1.0 normal - + HDD Seagate 7200.8 120GB @@ -489,7 +489,7 @@ 1.0 normal - + Regular processor config @@ -498,7 +498,7 @@ 1.0 normal - + ATX middle-size case @@ -507,7 +507,7 @@ 1.0 normal - + HDD Seagate 7200.8 120GB @@ -516,7 +516,7 @@ 1.0 normal - + processor @@ -525,7 +525,7 @@ 1.0 normal - + mainboard @@ -534,7 +534,7 @@ 1.0 normal - + fan @@ -543,7 +543,7 @@ 1.0 normal - + RAM @@ -552,7 +552,7 @@ 1.0 normal - + @@ -590,7 +590,7 @@ 1.0 normal - + HDD Seagate 7200.8 80GB @@ -599,7 +599,7 @@ 1.0 normal - + ATX Middle-size case @@ -608,7 +608,7 @@ 1.0 normal - + KIT @@ -627,7 +627,7 @@ 1.0 normal - + 133 - + 1.0 RCK100 1331 - + 1.0 @@ -714,7 +714,7 @@ 1332 - + 4.0 @@ -727,14 +727,14 @@ --> 135 - + 1.0 SPAN100 1351 - + 0.083 @@ -748,7 +748,7 @@ Assembly Section 123 - + 1.0 @@ -757,7 +757,7 @@ 1231 - + 0.25 @@ -770,7 +770,7 @@ --> 131 - + 1.0 Rear panel SHE100 @@ -778,7 +778,7 @@ 1311 - + 0.25 @@ -790,7 +790,7 @@ Default BOM for Shelf of 200cm SHE200 137 - + 1.0 @@ -805,7 +805,7 @@ --> 147 - + 1.0 @@ -815,7 +815,7 @@ Assembly Section 149 - + 4.0 @@ -824,7 +824,7 @@ Side Panel 151 - + 2.0 @@ -832,7 +832,7 @@ 153 - + 3.0 @@ -842,7 +842,7 @@ Metal Cleats 155 - + 12.0 @@ -852,7 +852,7 @@ Default BOM for KIT Shelf of 100cm SHE100KIT 139 - + 1.0 phantom @@ -867,7 +867,7 @@ Assembly Section 143 - + 4.0 @@ -876,7 +876,7 @@ Side Panel 145 - + 2.0 @@ -893,7 +893,7 @@ - + 3 @@ -1115,7 +1115,7 @@ - + diff --git a/addons/mrp/test/order_demo.yml b/addons/mrp/test/order_demo.yml index 72a18572a73..9d9acf7ee5b 100644 --- a/addons/mrp/test/order_demo.yml +++ b/addons/mrp/test/order_demo.yml @@ -2,7 +2,7 @@ In order to test process of production order, I create Bill of material of Shelf 100cm. - !record {model: mrp.bom, id: mrp_bom_defaultbomforshelfofcm0}: - product_id: product.product_product_shelfofcm0 + product_id: product.product_product_29 - !record {model: mrp.bom, id: mrp_bom_assemblysection1}: routing_id: mrp.mrp_routing_0 @@ -15,7 +15,7 @@ !record {model: mrp.production, id: mrp_production_shelf100cm}: location_src_id: stock.stock_location_stock location_dest_id: stock.stock_location_output - product_id: product.product_product_shelfofcm0 + product_id: product.product_product_29 bom_id: mrp_bom_defaultbomforshelfofcm0 routing_id: mrp.mrp_routing_1 product_uom: product.product_uom_dozen diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml index ee78e036d44..80eeca02516 100644 --- a/addons/mrp/test/order_process.yml +++ b/addons/mrp/test/order_process.yml @@ -17,27 +17,27 @@ woodmm10 = False metalcleats = False for line in order.product_lines: - if line.product_id.id == ref('product.product_product_sidepanel0'): #SIDEPAN 2 Unit + if line.product_id.id == ref('product.product_product_41'): #SIDEPAN 2 Unit assert not sidepanel, "Production line is already generated for SIDEPAN." assert line.product_qty == (2.0*factor), "Qty is not correspond." assert line.product_uom.id == ref('product.product_uom_unit'), "UOM is not correspond" sidepanel = True - elif line.product_id.id == ref('product.product_product_woodlintelm0'): #LIN40 4*0.25 Meter + elif line.product_id.id == ref('product.product_product_45'): #LIN40 4*0.25 Meter assert not woodlintelm, "Production line is already generated for LIN40." assert line.product_qty == (4*0.25*factor), "Qty is not correspond." assert line.product_uom.id == ref('product.product_uom_meter'), "UOM is not correspond" woodlintelm = True - elif line.product_id.id == ref('product.product_product_woodmm0'): #WOOD002 0.25 m + elif line.product_id.id == ref('product.product_product_32'): #WOOD002 0.25 m assert not woodmm0, "Production line is already generated for WOOD002." assert line.product_qty == (0.25*factor), "Qty is not correspond." assert line.product_uom.id == ref('product.product_uom_meter'), "UOM is not correspond" woodmm0 = True - elif line.product_id.id == ref('product.product_product_metalcleats0'): #METC000 4*3 Unit + elif line.product_id.id == ref('product.product_product_46'): #METC000 4*3 Unit assert not metalcleats, "Production line is already generated for METC000." assert line.product_qty == (4*3*factor), "Qty is not correspond." assert line.product_uom.id == ref('product.product_uom_unit'), "UOM is not correspond" metalcleats = True - elif line.product_id.id == ref('product.product_product_woodmm10'): #WOOD010 0.083*3 m + elif line.product_id.id == ref('product.product_product_34'): #WOOD010 0.083*3 m assert not woodmm10, "Production line is already generated for WOOD010." assert line.product_qty == (0.083*3*factor), "Qty is not correspond." assert line.product_uom.id == ref('product.product_uom_meter'), "UOM is not correspond" @@ -223,7 +223,7 @@ order = self.browse(cr, uid, ref("mrp_production_shelf100cm")) for move in order.move_lines: move.action_consume(move.product_qty) - if move.product_id.id == ref("product.product_product_metalcleats0"): + if move.product_id.id == ref("product.product_product_46"): move.action_scrap(5.0, scrap_location_id) - I produce product. diff --git a/addons/mrp_jit/test/mrp_jit.yml b/addons/mrp_jit/test/mrp_jit.yml index 922dc3611bd..7a7a73dfe95 100644 --- a/addons/mrp_jit/test/mrp_jit.yml +++ b/addons/mrp_jit/test/mrp_jit.yml @@ -7,7 +7,7 @@ date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_id: stock.stock_location_stock name: PROC/TEST/0001 - product_id: product.product_product_pc2 + product_id: product.product_product_4 product_qty: 10.0 product_uom: product.product_uom_unit product_uos_qty: 0.0 diff --git a/addons/mrp_operations/mrp_operations_demo.yml b/addons/mrp_operations/mrp_operations_demo.yml index 7bfef8a4c7b..3bb440be1aa 100644 --- a/addons/mrp_operations/mrp_operations_demo.yml +++ b/addons/mrp_operations/mrp_operations_demo.yml @@ -1,13 +1,13 @@ - !record {model: mrp.production, id: mrp_production_op}: location_src_id: stock.stock_location_stock - product_id: product.product_product_cpu3 + product_id: product.product_product_10 product_qty: 5.0 allow_reorder: True - !record {model: mrp.production, id: mrp_production_op1}: location_src_id: stock.stock_location_stock - product_id: product.product_product_cpu3 + product_id: product.product_product_10 product_qty: 2.0 - !function {model: mrp.production, name: action_compute, id: mrp_production_op1}: @@ -18,7 +18,7 @@ - !record {model: mrp.production, id: mrp_production_mo1}: location_src_id: stock.stock_location_stock - product_id: product.product_product_cpu_gen + product_id: product.product_product_16 product_qty: 5.0 - !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1} diff --git a/addons/mrp_repair/mrp_repair_demo.yml b/addons/mrp_repair/mrp_repair_demo.yml index 56aad9ae16d..5421b376348 100644 --- a/addons/mrp_repair/mrp_repair_demo.yml +++ b/addons/mrp_repair/mrp_repair_demo.yml @@ -6,7 +6,7 @@ location_dest_id: stock.stock_location_14 location_id: stock.stock_location_stock name: '[PC1] Basic PC' - product_id: product.product_product_pc1 + product_id: product.product_product_3 product_qty: 1.0 product_uom: product.product_uom_unit product_uos_qty: 1.0 @@ -25,7 +25,7 @@ location_id: stock.stock_location_stock name: '[HDD1] HDD Seagate 7200.8 80GB' price_unit: 50.0 - product_id: product.product_product_hdd1 + product_id: product.product_product_11 product_uom: product.product_uom_unit product_uom_qty: 1.0 state: draft @@ -33,12 +33,12 @@ type: add fees_lines: - name: 'HDD1 Seagate repair fees' - product_id: product.product_product_hdd1 + product_id: product.product_product_11 product_uom_qty: 1.0 product_uom: product.product_uom_unit price_unit: 50.0 partner_id: base.res_partner_9 - product_id: product.product_product_pc1 + product_id: product.product_product_3 - !record {model: stock.move, id: stock.stock_move_stockmvmrp1}: company_id: base.main_company @@ -47,7 +47,7 @@ location_dest_id: stock.stock_location_14 location_id: stock.stock_location_stock name: '[PC3] Medium PC' - product_id: product.product_product_pc3 + product_id: product.product_product_5 product_qty: 1.0 product_uom: product.product_uom_unit product_uos_qty: 1.0 @@ -66,7 +66,7 @@ location_id: stock.stock_location_stock name: '[HDD2] HDD Seagate 7200.8 120GB' price_unit: 50.0 - product_id: product.product_product_hdd2 + product_id: product.product_product_12 product_uom: product.product_uom_unit product_uom_qty: 1.0 state: draft @@ -74,12 +74,12 @@ type: add fees_lines: - name: 'HDD2 Seagate repair fees' - product_id: product.product_product_hdd2 + product_id: product.product_product_12 product_uom_qty: 1.0 product_uom: product.product_uom_unit price_unit: 50.0 partner_id: base.res_partner_9 - product_id: product.product_product_pc3 + product_id: product.product_product_5 - !record {model: stock.move, id: stock.stock_move_stockmvmrp2}: company_id: base.main_company @@ -88,7 +88,7 @@ location_dest_id: stock.stock_location_14 location_id: stock.stock_location_stock name: '[PC4] Customizable PC' - product_id: product.product_product_pc4 + product_id: product.product_product_6 product_qty: 1.0 product_uom: product.product_uom_unit product_uos_qty: 1.0 @@ -107,7 +107,7 @@ location_id: stock.stock_location_stock name: '[HDD3] HDD Seagate 7200.8 160GB' price_unit: 50.0 - product_id: product.product_product_hdd3 + product_id: product.product_product_13 product_uom: product.product_uom_unit product_uom_qty: 1.0 state: draft @@ -115,9 +115,9 @@ type: add fees_lines: - name: 'HDD3 Seagate repair fees' - product_id: product.product_product_hdd3 + product_id: product.product_product_13 product_uom_qty: 1.0 product_uom: product.product_uom_unit price_unit: 50.0 partner_id: base.res_partner_9 - product_id: product.product_product_pc4 + product_id: product.product_product_6 diff --git a/addons/mrp_subproduct/test/mrp_subproduct.yml b/addons/mrp_subproduct/test/mrp_subproduct.yml index 608bfd72db6..9e7c6c371a5 100644 --- a/addons/mrp_subproduct/test/mrp_subproduct.yml +++ b/addons/mrp_subproduct/test/mrp_subproduct.yml @@ -5,11 +5,11 @@ I add a sub product in Bill of material for product Cabinet. - !record {model: mrp.bom, id: mrp_bom_arm1}: - product_id: product.product_product_arm + product_id: product.product_product_28 name: ARM100 + Subproduct product_uom: product.product_uom_unit sub_products: - - product_id: product.product_product_woodentable0 + - product_id: product.product_product_33 product_uom: product.product_uom_unit product_qty: 2.0 subproduct_type: fixed @@ -17,7 +17,7 @@ I create a production order for Cabinet. - !record {model: mrp.production, id: mrp_production_mo0}: - product_id: product.product_product_arm + product_id: product.product_product_28 product_qty: 10.0 product_uom: product.product_uom_unit bom_id: mrp_bom_arm1 @@ -42,7 +42,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_woodentable0'))]) + move_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_33'))]) assert move_ids, 'No moves are created !' - I want to start the production so I force the reservation of products. @@ -70,6 +70,6 @@ I see that stock moves of Cabinet including Wooden Table are done now. - !python {model: stock.move}: | - move_ids = self.search(cr, uid, [('product_id','in',[ref("product.product_product_arm"),ref("product.product_product_sidepanel0")])]) + move_ids = self.search(cr, uid, [('product_id','in',[ref("product.product_product_28"),ref("product.product_product_41")])]) moves = self.browse(cr, uid, move_ids) assert all(move.state == 'done' for move in moves), 'Moves are not done!' diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index ce752b7ddc2..e4940930423 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -105,64 +105,64 @@ Resource: product.product --> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml index 87d29b8a2d5..6cad701a08f 100644 --- a/addons/point_of_sale/point_of_sale_demo.xml +++ b/addons/point_of_sale/point_of_sale_demo.xml @@ -60,7 +60,7 @@ - + POS/019 @@ -130,13 +130,13 @@ Stock move (POS 12) - + No Discount - + @@ -165,7 +165,7 @@ [PC3] Medium PC - + 450 2 @@ -175,7 +175,7 @@ [PC2] Basic+ PC (assembly on order) - + 450 2 @@ -185,7 +185,7 @@ [PC1] Basic PC - + 450 5 diff --git a/addons/point_of_sale/test/01_order_to_payment.yml b/addons/point_of_sale/test/01_order_to_payment.yml index 7c6b4817666..40960d805af 100644 --- a/addons/point_of_sale/test/01_order_to_payment.yml +++ b/addons/point_of_sale/test/01_order_to_payment.yml @@ -14,7 +14,7 @@ - I assign this 10 percent tax on the PC1 product as a sale tax - - !record {model: product.product, id: product.product_product_pc1}: + !record {model: product.product, id: product.product_product_3}: taxes_id: [account_tax_10_incl] - | I create a VAT tax of 5%, which is added to the public price @@ -29,7 +29,7 @@ - I assign this 5 percent tax on the PC2 product as a sale tax - - !record {model: product.product, id: product.product_product_pc2}: + !record {model: product.product, id: product.product_product_4}: taxes_id: [account_tax_05_incl] - I create a PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PC2 at 300 EUR. (Tax Excl) @@ -38,12 +38,12 @@ company_id: base.main_company lines: - name: OL/0001 - product_id: product.product_product_pc1 + product_id: product.product_product_3 price_unit: 450 discount: 0.0 qty: 2.0 - name: OL/0002 - product_id: product.product_product_pc2 + product_id: product.product_product_4 price_unit: 300 discount: 0.0 qty: 3.0 diff --git a/addons/point_of_sale/test/02_order_to_invoice.yml b/addons/point_of_sale/test/02_order_to_invoice.yml index 95eec81831c..2280f15ca48 100644 --- a/addons/point_of_sale/test/02_order_to_invoice.yml +++ b/addons/point_of_sale/test/02_order_to_invoice.yml @@ -6,12 +6,12 @@ partner_id: base.res_partner_1 lines: - name: OL/0001 - product_id: product.product_product_pc1 + product_id: product.product_product_3 price_unit: 450 discount: 5.0 qty: 2.0 - name: OL/0002 - product_id: product.product_product_pc2 + product_id: product.product_product_4 price_unit: 300 discount: 5.0 qty: 3.0 diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml index a8df2e0b142..fdad7477fe5 100644 --- a/addons/procurement/stock_orderpoint.xml +++ b/addons/procurement/stock_orderpoint.xml @@ -9,7 +9,7 @@ 5.0 - + @@ -17,7 +17,7 @@ 10.0 - + @@ -25,7 +25,7 @@ 10.0 - + @@ -33,7 +33,7 @@ 10.0 - + @@ -41,7 +41,7 @@ 3.0 - + @@ -49,7 +49,7 @@ 10.0 - + diff --git a/addons/procurement/test/procurement.yml b/addons/procurement/test/procurement.yml index f769715e572..2f9dd286a2a 100644 --- a/addons/procurement/test/procurement.yml +++ b/addons/procurement/test/procurement.yml @@ -8,7 +8,7 @@ location_id: stock.stock_location_stock logic: max name: OP/00008 - product_id: product.product_product_cpu2 + product_id: product.product_product_19 product_max_qty: 15.0 product_min_qty: 5.0 product_uom: product.product_uom_kgm @@ -18,7 +18,7 @@ Check product quantity and update it, if needed for apply a minimum stock rule. - !python {model: product.product}: | - product = self.browse(cr, uid, ref('product.product_product_cpu2')) + product = self.browse(cr, uid, ref('product.product_product_19')) if product.virtual_available < 5.0: change_qty = self.pool.get('stock.change.product.qty') id = change_qty.create(cr, uid, {'location_id' : ref('stock.stock_location_stock'), 'new_quantity': 4, 'product_id': product.id}) @@ -34,7 +34,7 @@ I check that procurement order is based on minimum stock rule. - !python {model: procurement.order}: | - proc_ids = self.search(cr, uid, [('product_id','=', ref('product.product_product_cpu2'))]) + proc_ids = self.search(cr, uid, [('product_id','=', ref('product.product_product_19'))]) assert proc_ids, 'No Procurement created.' proc_order = self.browse(cr, uid, proc_ids)[0] assert proc_order.product_qty == 11.0,"Procurement product quantity is not corresponded." @@ -42,7 +42,7 @@ I check product quantity. - !python {model: product.product}: | - product = self.browse(cr, uid, ref('product.product_product_cpu2')) + product = self.browse(cr, uid, ref('product.product_product_19')) assert product.virtual_available == 15.0,"After run the scheduler product's virtual stock is not updated." - For test the Procurement Request wizard, Again I have to update product quantity. @@ -50,9 +50,9 @@ !python {model: product.product}: | mk_procure = self.pool.get('make.procurement') procur_order = self.pool.get('procurement.order') - product = self.browse(cr, uid, ref('product.product_product_cpu2')) + product = self.browse(cr, uid, ref('product.product_product_19')) - context.update({'active_model': 'product.product','active_id':ref('product.product_product_cpu2')}) + context.update({'active_model': 'product.product','active_id':ref('product.product_product_19')}) values = {'warehouse_id': ref('base.main_company'), 'uom_id': ref('product.product_uom_unit'), 'qty': 5} id = mk_procure.create(cr, uid, values, context) procurement = mk_procure.make_procurement(cr, uid, [id], context) @@ -62,7 +62,7 @@ for procurement in procur_order.browse(cr, uid, [proc_id]): if procurement.state == 'confirmed': assert procurement.state == 'confirmed',"Procurement state should be 'Confirmed'." - assert procurement.product_id.id == ref('product.product_product_cpu2'),"Product is not correspond." + assert procurement.product_id.id == ref('product.product_product_19'),"Product is not correspond." assert procurement.product_qty == 5,"Product Quantity is not correspond." assert procurement.product_uom.id == ref('product.product_uom_unit'),"Product's UOM is not correspond." context.update({'proc': proc_id}) diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml index 9764f8fbbfd..90da9837db8 100644 --- a/addons/product/product_demo.xml +++ b/addons/product/product_demo.xml @@ -84,15 +84,6 @@ Resource: product.product --> - - 38.25 - 25.5 - - - service - Onsite Senior Intervention - - 30.75 20.5 @@ -102,7 +93,16 @@ Onsite Intervention - + + 38.25 + 25.5 + + + service + Onsite Senior Intervention + + + PC1 produce 450.0 @@ -114,7 +114,7 @@ product - + PC2 produce 750.0 @@ -127,7 +127,7 @@ product - + PC3 produce 900.0 @@ -139,7 +139,7 @@ product - + PC4 produce 1200.0 @@ -152,7 +152,7 @@ end - + MB1 88.0 54.0 @@ -163,7 +163,7 @@ product - + MB2 270.0 180.0 @@ -175,7 +175,7 @@ draft - + CPU1 75.0 50.0 @@ -186,7 +186,7 @@ product - + CPU3 150.0 100.0 @@ -197,7 +197,7 @@ product - + HDD1 50.0 40.0 @@ -208,7 +208,7 @@ product - + HDD2 75.0 60.0 @@ -219,7 +219,7 @@ product - + HDD3 95.0 80.0 @@ -231,7 +231,7 @@ product - + FAN 8.0 5.0 @@ -242,7 +242,7 @@ product - + FAN2 18.5 10.0 @@ -253,7 +253,7 @@ product - + CPU_GEN produce 300.0 @@ -266,7 +266,7 @@ product - + RAM 60.0 40.0 @@ -277,7 +277,7 @@ product - + RAM512 90.0 60.0 @@ -288,7 +288,7 @@ product - + CPU2 produce 450.0 @@ -301,18 +301,6 @@ product - - - TOW1 - 37.5 - 25.0 - - - 7.0 - ATX Mid-size Tower - product - - HDD_GEN produce @@ -394,7 +382,18 @@ product - + + TOW1 + 37.5 + 25.0 + + + 7.0 + ATX Mid-size Tower + product + + + ARM100 produce 450.0 @@ -407,11 +406,8 @@ product - - + SHE100 produce 130.0 @@ -423,7 +419,7 @@ - + SHE200 produce @@ -435,7 +431,7 @@ product - + SPAN100 produce @@ -445,7 +441,7 @@ product - + WOOD002 buy 5.0 @@ -457,7 +453,7 @@ product - + WOODTAB produce @@ -471,7 +467,7 @@ - + WOOD010 buy 7.0 @@ -484,7 +480,7 @@ - + PROJ produce @@ -497,7 +493,7 @@ - + EMPL produce @@ -510,7 +506,7 @@ - + REST produce @@ -522,7 +518,7 @@ - + WORK produce service @@ -536,7 +532,7 @@ - + RPAN100 produce 10.0 @@ -549,7 +545,7 @@ - + RPAN200 buy 13.0 @@ -562,7 +558,7 @@ - + SIDEPAN buy 3.0 @@ -575,7 +571,7 @@ - + RCK100 produce 5.0 @@ -588,7 +584,7 @@ - + RCK200 buy 4.0 @@ -601,8 +597,7 @@ - - + PROFIL produce 1.0 @@ -614,7 +609,7 @@ - + LIN40 buy 8.0 @@ -627,7 +622,7 @@ - + METC000 buy @@ -639,7 +634,7 @@ - + HOT produce @@ -651,7 +646,7 @@ - + SHE100KIT produce @@ -673,91 +668,91 @@ 10 1 - + 5 10 1 - + 5 1 1 - + 1 1 1 - + 1 1 1 - + 2 1 1 - + 2 1 1 - + 2 1 1 - + 1 1 1 - + 1 1 1 - + 1 1 1 - + 1 1 1 - + 1 1 1 - + 1 @@ -786,7 +781,7 @@ 10 1 5 - + 5 @@ -794,7 +789,7 @@ 10 1 5 - + 5 @@ -802,7 +797,7 @@ 10 1 5 - + 5 @@ -811,7 +806,7 @@ --> - + 5 1 @@ -819,7 +814,7 @@ - + 5 1 @@ -827,7 +822,7 @@ - + 5 1 @@ -835,7 +830,7 @@ - + 5 1 @@ -843,7 +838,7 @@ - + 5 1 @@ -851,7 +846,7 @@ - + 5 1 @@ -859,7 +854,7 @@ - + 2 1 @@ -867,7 +862,7 @@ - + 5 1 @@ -875,7 +870,7 @@ - + 5 1 diff --git a/addons/product/product_pricelist_demo.yml b/addons/product/product_pricelist_demo.yml index 682bf9234e6..09d5e9d3699 100644 --- a/addons/product/product_pricelist_demo.yml +++ b/addons/product/product_pricelist_demo.yml @@ -1,5 +1,5 @@ - - !record {model: product.product, id: product_product_pc2}: + !record {model: product.product, id: product_product_4}: uom_id: product_uom_unit categ_id: product_category_9 - @@ -15,12 +15,12 @@ base_pricelist_id: list0 - name: 10% Discount on PC2 sequence: 1 - product_id: product_product_pc2 + product_id: product_product_4 base: !eval (ref('product.list_price')) price_discount: -0.10 - name: 1 surchange on PC3 sequence: 1 - product_id: product_product_pc3 + product_id: product_product_5 base: !eval (ref('product.list_price')) price_surcharge: 1 - name: 5% Discount on all IT components @@ -48,7 +48,7 @@ sequence: 1 price_min_margin: 2 price_max_margin: -5 - product_id: product_product_pc2 + product_id: product_product_4 base: -2 - !record {model: pricelist.partnerinfo, id: supplier_pricelist0_product_pc2}: diff --git a/addons/product/test/product_pricelist.yml b/addons/product/test/product_pricelist.yml index 58003f6a566..4fbd0d2b731 100644 --- a/addons/product/test/product_pricelist.yml +++ b/addons/product/test/product_pricelist.yml @@ -5,19 +5,19 @@ - !python {model: product.product}: | context.update({'pricelist': ref("customer_pricelist"), 'quantity':1}) - product = self.browse(cr, uid, ref("product_product_pc2"), context=context) + product = self.browse(cr, uid, ref("product_product_4"), context=context) assert product.price == product.lst_price-product.lst_price*(0.10), "Sell price is not correspond." - I check sale price of PC3. - !python {model: product.product}: | - product = self.browse(cr, uid, ref("product_product_pc3"), context=context) + product = self.browse(cr, uid, ref("product_product_5"), context=context) assert product.price == product.lst_price + 1, "Sell price is not correspond." - I check sale price of IT componet. - !python {model: product.product}: | - product = self.browse(cr, uid, ref("product_product_mb1"), context=context) + product = self.browse(cr, uid, ref("product_product_7"), context=context) assert product.price == product.lst_price, "Sell price is not correspond." - @@ -25,14 +25,14 @@ - !python {model: product.product}: | context.update({'quantity':5}) - product = self.browse(cr, uid, ref("product_product_mb1"), context=context) + product = self.browse(cr, uid, ref("product_product_7"), context=context) assert product.price == product.lst_price-product.lst_price*(0.05), "Sell price is not correspond." - I check sale price of PC4. - !python {model: product.product}: | context.update({'quantity':1}) - product = self.browse(cr, uid, ref("product_product_pc4"), context=context) + product = self.browse(cr, uid, ref("product_product_6"), context=context) assert product.price == product.lst_price, "Sell price is not correspond." - @@ -40,7 +40,7 @@ - !python {model: product.product}: | context.update({'quantity':1, 'date': '2011-12-31'}) - product = self.browse(cr, uid, ref("product_product_pc4"), context=context) + product = self.browse(cr, uid, ref("product_product_6"), context=context) assert product.price == product.lst_price-product.lst_price*(0.30), "Sell price is not correspond." - @@ -48,21 +48,21 @@ - !python {model: product.product}: | context.update({'quantity':1, 'date': False, 'partner': ref('base.res_partner_4'), 'pricelist': ref("supplier_pricelist")}) - product = self.browse(cr, uid, ref("product_product_pc2"), context=context) + product = self.browse(cr, uid, ref("product_product_4"), context=context) assert product.price == 450, "cost price is not correspond." - I check cost price of PC2 if more than 3 Unit. - !python {model: product.product}: | context.update({'quantity':3}) - product = self.browse(cr, uid, ref("product_product_pc2"), context=context) + product = self.browse(cr, uid, ref("product_product_4"), context=context) assert product.price == 400, "cost price is not correspond." - I print the sale prices report. - !python {model: product.product}: | - ctx = {'model': 'product.product', 'date': '2011-12-30', 'active_ids': [ref('product.product_product_pc1'), ref('product.product_product_pc2'), ref('product.product_product_pc3'), ref('product.product_product_pc4')]} + ctx = {'model': 'product.product', 'date': '2011-12-30', 'active_ids': [ref('product.product_product_3'), ref('product.product_product_4'), ref('product.product_product_5'), ref('product.product_product_6')]} data_dict = { 'qty1': 1, 'qty2': 5, diff --git a/addons/product_margin/test/product_margin.yml b/addons/product_margin/test/product_margin.yml index fa8241ab206..b1dee4a423d 100644 --- a/addons/product_margin/test/product_margin.yml +++ b/addons/product_margin/test/product_margin.yml @@ -11,7 +11,7 @@ !python {model: product.margin}: | self.action_open_window(cr, uid, [ref("product_margin_wiz0")], {"lang": 'en_US', "search_default_filter_to_sell": "1", "tz": False, "active_model": "product.product", "disable_log": True, - "active_ids": [ref("product.product_product_pc3")], "active_id": ref("product.product_product_pc3")}) + "active_ids": [ref("product.product_product_5")], "active_id": ref("product.product_product_5")}) - I read the fields of the product. - @@ -20,6 +20,6 @@ 'total_margin', 'sales_gap', 'purchase_num_invoiced', 'expected_margin', 'turnover'] self.read(cr, uid, [ref("product_margin_wiz0")], fields, {"lang": 'en_US', "search_default_filter_to_sell": "1", "tz": False, "active_model": "product.product", - "bin_size": True, "active_ids": [ref("product.product_product_pc3")], - "active_id": ref("product.product_product_pc3")}) + "bin_size": True, "active_ids": [ref("product.product_product_5")], + "active_id": ref("product.product_product_5")}) diff --git a/addons/purchase/purchase_order_demo.yml b/addons/purchase/purchase_order_demo.yml index 849186baf45..59a18ef7c40 100644 --- a/addons/purchase/purchase_order_demo.yml +++ b/addons/purchase/purchase_order_demo.yml @@ -3,10 +3,10 @@ partner_id: base.res_partner_1 invoice_method: order order_line: - - product_id: product.product_product_pc2 + - product_id: product.product_product_4 price_unit: 150.50 product_qty: 5.0 - - product_id: product.product_product_pc1 + - product_id: product.product_product_3 price_unit: 450.20 product_qty: 2.0 @@ -15,14 +15,14 @@ partner_id: base.res_partner_3 invoice_method: picking order_line: - - product_id: product.product_product_pc3 + - product_id: product.product_product_5 price_unit: 900 - !record {model: purchase.order, id: order_purchase3}: partner_id: base.res_partner_12 order_line: - - product_id: product.product_product_0 + - product_id: product.product_product_2 price_unit: 900.20 product_qty: 10.0 - product_id: product.product_product_1 @@ -33,13 +33,13 @@ !record {model: purchase.order, id: order_purchase4}: partner_id: base.res_partner_4 order_line: - - product_id: product.product_product_pc2 + - product_id: product.product_product_4 price_unit: 40 product_qty: 5 - - product_id: product.product_product_mb1 + - product_id: product.product_product_7 price_unit: 45 product_qty: 15.0 - - product_id: product.product_product_mb2 + - product_id: product.product_product_6 price_unit: 45 product_qty: 15 @@ -47,29 +47,29 @@ !record {model: purchase.order, id: order_purchase5}: partner_id: base.res_partner_19 order_line: - - product_id: product.product_product_cpu1 + - product_id: product.product_product_9 product_qty: 3 - - product_id: product.product_product_cpu3 + - product_id: product.product_product_10 product_qty: 13 - - product_id: product.product_product_hdd1 + - product_id: product.product_product_11 product_qty: 10 - !record {model: purchase.order, id: order_purchase6}: partner_id: base.res_partner_22 order_line: - - product_id: product.product_product_hdd2 + - product_id: product.product_product_12 product_qty: 10 - - product_id: product.product_product_ram + - product_id: product.product_product_17 product_qty: 10 - - product_id: product.product_product_ram512 + - product_id: product_product_18 product_qty: 10 - !record {model: purchase.order, id: order_purchase7}: partner_id: base.res_partner_12 order_line: - - product_id: product.product_product_0 + - product_id: product.product_product_2 product_qty: 5 - product_id: product.product_product_1 product_qty: 15 diff --git a/addons/purchase/test/process/edi_purchase_order.yml b/addons/purchase/test/process/edi_purchase_order.yml index 6649807f077..2d11ced77eb 100644 --- a/addons/purchase/test/process/edi_purchase_order.yml +++ b/addons/purchase/test/process/edi_purchase_order.yml @@ -6,14 +6,14 @@ location_id: stock.stock_location_3 pricelist_id: 1 order_line: - - product_id: product.product_product_pc1 + - product_id: product.product_product_3 product_qty: 1.0 product_uom: 1 price_unit: 150.0 name: 'Basic PC' date_planned: '2011-08-31' order_line: - - product_id: product.product_product_pc3 + - product_id: product.product_product_5 product_qty: 10.0 product_uom: 1 price_unit: 20.0 @@ -92,7 +92,7 @@ "date_planned": "2011-09-30", "sequence": 10, "price_unit": 150.0, - "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_pc1", "[PC1] Basic PC"], + "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_3", "[PC1] Basic PC"], }, { "__id": "sale:724f93ec-ddd0-11e0-88ec-701a04e25543.sale_order_line-LXEqeadasdad", @@ -106,7 +106,7 @@ "sequence": 11, "date_planned": "2011-09-15", "price_unit": 20.0, - "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_pc3", "[PC3] Medium PC"], + "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_5", "[PC3] Medium PC"], }], } new_purchase_order_id = purchase_order_pool.edi_import(cr, uid, edi_document, context=context) diff --git a/addons/purchase/test/process/run_scheduler.yml b/addons/purchase/test/process/run_scheduler.yml index c0a6fe57d9b..b8c4019ed1a 100644 --- a/addons/purchase/test/process/run_scheduler.yml +++ b/addons/purchase/test/process/run_scheduler.yml @@ -7,7 +7,7 @@ location_id: stock.stock_location_stock name: Test scheduler for RFQ procure_method: make_to_order - product_id: product.product_product_woodlintelm0 + product_id: product.product_product_45 product_qty: 15.0 - I confirm on procurement order. diff --git a/addons/purchase_double_validation/test/purchase_double_validation_demo.yml b/addons/purchase_double_validation/test/purchase_double_validation_demo.yml index b951e9d669e..e0369e3fda7 100644 --- a/addons/purchase_double_validation/test/purchase_double_validation_demo.yml +++ b/addons/purchase_double_validation/test/purchase_double_validation_demo.yml @@ -2,12 +2,12 @@ !record {model: purchase.order, id: order_purchase11}: partner_id: base.res_partner_12 order_line: - - product_id: product.product_product_pc4 + - product_id: product.product_product_6 product_qty: 10 - !record {model: purchase.order, id: order_purchase12}: partner_id: base.res_partner_22 order_line: - - product_id: product.product_product_hdd2 + - product_id: product.product_product_12 product_qty: 10 diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml index 80337a29eed..87cb93b7644 100644 --- a/addons/purchase_requisition/purchase_requisition_demo.xml +++ b/addons/purchase_requisition/purchase_requisition_demo.xml @@ -6,7 +6,7 @@ - + @@ -21,7 +21,7 @@ - + 5 @@ -39,7 +39,7 @@ [HDD3] HDD Seagate 7200.8 160GB - + 60 5 @@ -56,7 +56,7 @@ [HDD3] HDD Seagate 7200.8 160GB - + 50 3 diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml index 524c1c0d7be..38e66788dcf 100644 --- a/addons/purchase_requisition/test/purchase_requisition.yml +++ b/addons/purchase_requisition/test/purchase_requisition.yml @@ -2,10 +2,10 @@ I create the procurement order and run that procurement. - !python {model: make.procurement}: | - context.update({'active_model':'product.product', 'active_ids': [ref('product.product_product_hdd3')], 'active_id': ref('product.product_product_hdd3')}) + context.update({'active_model':'product.product', 'active_ids': [ref('product.product_product_13')], 'active_id': ref('product.product_product_13')}) - !record {model: make.procurement, id: procurement_product_hdd3}: - product_id: product.product_product_hdd3 + product_id: product.product_product_13 qty: 15 uom_id: product.product_uom_unit warehouse_id: stock.stock_warehouse_shop0 diff --git a/addons/purchase_requisition/test/purchase_requisition_demo.yml b/addons/purchase_requisition/test/purchase_requisition_demo.yml index 42913f3e96e..5e441f26ea3 100755 --- a/addons/purchase_requisition/test/purchase_requisition_demo.yml +++ b/addons/purchase_requisition/test/purchase_requisition_demo.yml @@ -4,7 +4,7 @@ !record {model: purchase.requisition, id: requisition1}: exclusive: exclusive line_ids: - - product_id: product.product_product_cpu1 + - product_id: product.product_product_9 product_qty: 10.0 product_uom_id: product.product_uom_unit diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index c65790cf3fa..7e4ef57acc0 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -21,7 +21,7 @@ New server config + material - + 123.20 make_to_stock @@ -30,7 +30,7 @@ [PC1] Basic PC - + 450.50 3 @@ -40,7 +40,7 @@ [PC3] Medium PC - + 900 5 @@ -50,7 +50,7 @@ [MB1] Mainboard ASUStek A7N8X - + 88 5 @@ -77,7 +77,7 @@ [PC2] Computer assembled on demand - + 540 make_to_order @@ -85,7 +85,7 @@ [MB1] Mainboard ASUStek (purchased on order) - + 88 8 @@ -107,7 +107,7 @@ [PC1] Basic PC - + 3 450 @@ -117,7 +117,7 @@ [PC2] Basic+ PC (assembly on order) - + 750 3 @@ -138,7 +138,7 @@ [PC1] Basic PC - + 2 450 @@ -148,7 +148,7 @@ [PC3] Medium PC - + 900 5 @@ -170,7 +170,7 @@ [PC2] Basic+ PC (assembly on order) - + 4 750 @@ -180,7 +180,7 @@ [CPU1] Processor AMD Athlon XP 1800+ - + 75 3 @@ -202,7 +202,7 @@ Onsite Senior Intervention - + 4 250 @@ -235,7 +235,7 @@ [MB1] Mainboard ASUStek A7N8X - + 15 250 @@ -245,7 +245,7 @@ [MB2] Mainboard ASUStek A7V8X-X - + 5 500 diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml index 5ce1156a206..3db5f729b41 100644 --- a/addons/sale/sale_unit_test.xml +++ b/addons/sale/sale_unit_test.xml @@ -14,7 +14,7 @@ [PC1] Basic PC - + 450 2 @@ -24,7 +24,7 @@ [RAM512] DDR 512MB PC400 - + 90 3 diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml index 554be1eee23..148eed4f18f 100644 --- a/addons/sale/test/edi_sale_order.yml +++ b/addons/sale/test/edi_sale_order.yml @@ -7,13 +7,13 @@ partner_shipping_id: base.res_partner_address_3 pricelist_id: 1 order_line: - - product_id: product.product_product_pc1 + - product_id: product.product_product_3 product_uom_qty: 1.0 product_uom: 1 price_unit: 150.0 name: 'Basic pc' order_line: - - product_id: product.product_product_pc3 + - product_id: product.product_product_5 product_uom_qty: 10.0 product_uom: 1 price_unit: 200.0 @@ -75,7 +75,7 @@ "name": "Basic PC", "date_planned": "2011-09-30", "price_unit": 150.0, - "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_pc1", "[PC1] Basic PC"], + "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_3", "[PC1] Basic PC"], "product_qty": 1.0, "product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "Unit"], }, @@ -88,7 +88,7 @@ "name": "Medium PC", "date_planned": "2011-09-15", "price_unit": 100.0, - "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_pc3", "[PC3] Medium PC"], + "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_5", "[PC3] Medium PC"], "product_qty": 2.0, "product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "Unit"], }], diff --git a/addons/sale/test/sale_order_demo.yml b/addons/sale/test/sale_order_demo.yml index d61361754ee..1c810521a3d 100644 --- a/addons/sale/test/sale_order_demo.yml +++ b/addons/sale/test/sale_order_demo.yml @@ -7,7 +7,7 @@ payment_term: account.account_payment_term - !record {model: sale.order.line, id: line}: - product_id: product.product_product_mb1 + product_id: product.product_product_7 price_unit: 190.50 product_uom_qty: 8 diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml index c466d0a995d..57cc23fa030 100644 --- a/addons/stock/stock_demo.xml +++ b/addons/stock/stock_demo.xml @@ -56,7 +56,7 @@ --> - + 14.0 @@ -78,91 +78,91 @@ - + 8.0 - + 18.0 - + 10.0 - + 22.0 - + 8.0 - + 26.0 - + 32.0 - + 37.0 - + 39.0 - + 45.0 - + 10.0 - + 2.0 - + 80.0 diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml index f5fd9011898..7ea2f3dba5e 100644 --- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml +++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml @@ -10,7 +10,7 @@ move_lines: - company_id: base.main_company location_id: stock.stock_location_stock - product_id: product.product_product_pc1 + product_id: product.product_product_3 product_qty: 3.0 product_uom: product.product_uom_unit location_dest_id: stock.stock_location_customers diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml index 9e6b6e7d860..7028a232a34 100644 --- a/addons/stock_location/stock_location_demo_cpu1.xml +++ b/addons/stock_location/stock_location_demo_cpu1.xml @@ -1,7 +1,7 @@ - + This product is configured with example of push/pull flows @@ -19,7 +19,7 @@ - + transparent none @@ -30,7 +30,7 @@ - + manual none @@ -41,7 +41,7 @@ - + @@ -54,7 +54,7 @@ Receive from Warehouse - + @@ -73,7 +73,7 @@ - + diff --git a/addons/stock_location/stock_location_demo_cpu3.yml b/addons/stock_location/stock_location_demo_cpu3.yml index 74c9998b1b6..8bb27c9be43 100644 --- a/addons/stock_location/stock_location_demo_cpu3.yml +++ b/addons/stock_location/stock_location_demo_cpu3.yml @@ -47,7 +47,7 @@ - !record {model: stock.location.path, id: push_pick}: name: Pick List - product_id: product.product_product_cpu3 + product_id: product.product_product_10 journal_id: journal_pick location_from_id: stock.stock_location_output location_dest_id: location_pack_zone diff --git a/addons/stock_planning/test/stock_planning.yml b/addons/stock_planning/test/stock_planning.yml index fec5bfaf2cd..b10bb7c0990 100644 --- a/addons/stock_planning/test/stock_planning.yml +++ b/addons/stock_planning/test/stock_planning.yml @@ -140,7 +140,7 @@ product_uom_qty: 13.0 state: draft delay: 2.0 - product_id: product.product_product_pc1 + product_id: product.product_product_3 product_uos_qty: 13.0 th_weight: 0.0 type: make_to_stock @@ -150,7 +150,7 @@ product_uom_qty: 5.0 state: draft delay: 3.0 - product_id: product.product_product_pc3 + product_id: product.product_product_5 product_uos_qty: 5.0 th_weight: 0.0 type: make_to_stock @@ -165,7 +165,7 @@ Now I want to calculate sales history for both the products PC1-Basic PC and PC3-Medium PC and forecast the quantity. - !python {model: stock.sale.forecast}: | - forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1'))]) + forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_3'))]) write_dict = {'product_qty': 30.0, 'analyzed_period1_id': ref("stock_period_03"), 'analyzed_user_id': ref("base.user_root"), @@ -181,7 +181,7 @@ Now I applying onchange and unlink forecast record for the product PC3 - !python {model: stock.sale.forecast}: | - forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc3'))]) + forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_5'))]) self.unlink(cr, uid, forecast_ids, {"lang": "en_US", "tz": False, "search_default_create_uid": 1, "active_model": "ir.ui.menu", "department_id": False, "active_ids": [ref("stock_planning.menu_stock_sale_forecast_all")], "active_id": @@ -225,10 +225,10 @@ I calculate the planning in master procurement schedule. - !python {model: stock.planning}: | - planning_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1')),('period_id','=',ref('stock_period_03'))]) + planning_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_3')),('period_id','=',ref('stock_period_03'))]) self.write(cr, uid, planning_ids, {'to_procure': 30.0,'planned_outgoing': 40.0,'supply_warehouse_id': ref("stock_warehouse_0")}) self.onchange_company(cr, uid, planning_ids, ref('stock.res_partner_2')) - self.onchange_uom(cr, uid, planning_ids, ref('product.product_uom_unit'), ref('product.product_product_pc1'),ref('product.product_uom_unit'), False, False) + self.onchange_uom(cr, uid, planning_ids, ref('product.product_uom_unit'), ref('product.product_product_3'),ref('product.product_uom_unit'), False, False) self.product_id_change(cr, uid, planning_ids, ref('product.product_product_20')) context = {"lang": "en_US", "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_planning")], @@ -241,7 +241,7 @@ I create a procurement order for the incoming products left. - !python {model: stock.planning}: | - planning_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1')),('period_id','=',ref('stock_period_03'))]) + planning_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_3')),('period_id','=',ref('stock_period_03'))]) plann = self.browse(cr, uid, planning_ids) assert plann[0].incoming_left, 'Incoming Left must be greater than 0 !' self.procure_incomming_left(cr, uid, planning_ids, {"lang": 'en_US', "tz": @@ -253,5 +253,5 @@ - !python {model: procurement.order}: | import datetime - proc_ids = self.search(cr, uid, [('origin','=','MPS(admin) %s, week 29' % (datetime.datetime.now().year)),('product_id','=',ref("product.product_product_pc1"))]) + proc_ids = self.search(cr, uid, [('origin','=','MPS(admin) %s, week 29' % (datetime.datetime.now().year)),('product_id','=',ref("product.product_product_3"))]) assert proc_ids,'No Procurements!'