diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 03d127249fb..d04030c909e 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -163,8 +163,10 @@

-

@@ -309,9 +311,11 @@

-

diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml index ad4540b9806..7795c2700cc 100644 --- a/addons/account/account_unit_test.xml +++ b/addons/account/account_unit_test.xml @@ -5,7 +5,7 @@ - + draft out_invoice diff --git a/addons/account/demo/account_invoice_demo.xml b/addons/account/demo/account_invoice_demo.xml index 0ba0fe3712f..280eeeb9e94 100644 --- a/addons/account/demo/account_invoice_demo.xml +++ b/addons/account/demo/account_invoice_demo.xml @@ -16,7 +16,7 @@ - + @@ -26,10 +26,10 @@ - + - - [RPAN100] Rear Panel SHE100 + + Toner Cartridge @@ -39,10 +39,10 @@ - + - - [RCK200] Rack 200cm + + Zed+ Antivirus diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index 1e360f6c742..d44c7c460c7 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -109,8 +109,8 @@ - - + + diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml index 2ca0e50e784..b53b76969ab 100644 --- a/addons/account/project/analytic_account_demo.xml +++ b/addons/account/project/analytic_account_demo.xml @@ -85,14 +85,14 @@ normal open - + Seagate P2 normal open - + Magasin BML 1 @@ -106,20 +106,20 @@ - + open Agrolait normal - + Asustek normal - + DistriPC @@ -127,22 +127,22 @@ normal - - Sednacom + + Spark Systems normal - + open - - Thymbra + + Nebula normal - + open @@ -159,13 +159,13 @@ normal - + OpenERP SA AT Work normal - + Camp to Camp @@ -173,7 +173,7 @@ normal - + open diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml index dbbe3d5f676..1f1a412c19e 100644 --- a/addons/account/test/account_change_currency.yml +++ b/addons/account/test/account_change_currency.yml @@ -10,10 +10,10 @@ 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_desertic_hispafuentes + partner_id: base.res_partner_12 reference_type: none - 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 0825c3d2433..6553635a781 100644 --- a/addons/account/test/account_invoice_state.yml +++ b/addons/account/test/account_invoice_state.yml @@ -10,10 +10,10 @@ 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_desertic_hispafuentes + partner_id: base.res_partner_12 reference_type: none - I check that Initially customer invoice state is "Draft" diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index 7ce1843bfa3..64f8ccf838f 100644 --- a/addons/account/test/account_report.yml +++ b/addons/account/test/account_report.yml @@ -4,7 +4,7 @@ !record {model: account.invoice, id: test_invoice_1}: currency_id: base.EUR company_id: base.main_company - partner_id: base.res_partner_asus + partner_id: base.res_partner_1 state: draft type: out_invoice account_id: account.a_recv @@ -23,7 +23,7 @@ - !python {model: res.partner}: | import netsvc, tools, os - (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {}) + (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_1'),ref('base.res_partner_2'),ref('base.res_partner_12')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data) - 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 a8898bc9764..ccebd2ea90c 100644 --- a/addons/account/test/account_supplier_invoice.yml +++ b/addons/account/test/account_supplier_invoice.yml @@ -30,13 +30,13 @@ - 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: - tax10 journal_id: account.expenses_journal - partner_id: base.res_partner_desertic_hispafuentes + partner_id: base.res_partner_12 reference_type: none type: in_invoice - diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml index e612d7cc0f0..65ae2877125 100644 --- a/addons/account/test/account_validate_account_move.yml +++ b/addons/account/test/account_validate_account_move.yml @@ -20,7 +20,7 @@ debit: 0.0 journal_id: account.bank_journal name: Basic Computer - partner_id: base.res_partner_desertic_hispafuentes + partner_id: base.res_partner_12 period_id: account.period_6 ref: '2011010' tax_amount: 0.0 @@ -37,8 +37,8 @@ 'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'journal_id': 1, 'view_mode': False, 'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')}) - partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_desertic_hispafuentes'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False) - account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_desertic_hispafuentes')) + partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_12'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False) + account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_12')) vals = { 'journal_id': ref('account.bank_journal'), 'period_id': ref('account.period_6'), @@ -51,7 +51,7 @@ 'date': time.strftime('%Y-%m-%d'), 'debit': 2000.0, 'name': 'Basic Computer', - 'partner_id': ref('base.res_partner_desertic_hispafuentes'), + 'partner_id': ref('base.res_partner_12'), 'quantity': 0.0, 'move_id': ref('account_move_0'), 'date_maturity': partner['value']['date_maturity'], 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 9460bbcf085..516be311cf8 100644 --- a/addons/account/test/test_edi_invoice.yml +++ b/addons/account/test/test_edi_invoice.yml @@ -5,7 +5,7 @@ - !record {model: account.invoice, id: invoice_edi_1}: journal_id: 1 - partner_id: base.res_partner_agrolait + partner_id: base.res_partner_2 currency_id: base.EUR company_id: 1 account_id: account.a_pay @@ -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/wizard/pos_box.xml b/addons/account/wizard/pos_box.xml index 6136cca06ad..46f4eeb3699 100644 --- a/addons/account/wizard/pos_box.xml +++ b/addons/account/wizard/pos_box.xml @@ -6,17 +6,17 @@ cash.box.in form -
+ - - - - - - -