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/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_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml
index 5b9ffa3d51c..06617b7af97 100644
--- a/addons/account_followup/test/account_followup.yml
+++ b/addons/account_followup/test/account_followup.yml
@@ -25,7 +25,7 @@
%(company_currency)s\n\nThanks,\n--\n%(user_signature)s\n%(company_name)s'
email_subject: Invoices Reminder
partner_ids:
- - base.res_partner_desertic_hispafuentes
+ - base.res_partner_12
partner_lang: 1
-
I send a follow-up mail to partner.
diff --git a/addons/account_payment/account_payment_demo.xml b/addons/account_payment/account_payment_demo.xml
index 33f3687f4cf..c405d56eeef 100644
--- a/addons/account_payment/account_payment_demo.xml
+++ b/addons/account_payment/account_payment_demo.xml
@@ -4,7 +4,7 @@
Reserve Bank
00987654321
-
+
bank
diff --git a/addons/account_payment/test/account_payment_demo.yml b/addons/account_payment/test/account_payment_demo.yml
index 14add1475c7..27b81e9f0f6 100644
--- a/addons/account_payment/test/account_payment_demo.yml
+++ b/addons/account_payment/test/account_payment_demo.yml
@@ -8,6 +8,6 @@
!record {model: payment.line, id: payment_line_0}:
name: Test
communication: Test
- partner_id: base.res_partner_agrolait
+ partner_id: base.res_partner_2
order_id: payment_order_2
amount_currency: 100.00
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index 7e5482aa931..9cfb9d61229 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -12,7 +12,7 @@
- account_id: account.a_recv
amount: 1000.0
name: Voucher for Axelor
- partner_id: base.res_partner_desertic_hispafuentes
+ partner_id: base.res_partner_12
period_id: account.period_6
reference: none
@@ -59,7 +59,7 @@
- account_id: account.cash
amount: 1000.0
name: Voucher Axelor
- partner_id: base.res_partner_desertic_hispafuentes
+ partner_id: base.res_partner_12
period_id: account.period_6
reference: none
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index a30c85ffb71..45c352955f4 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -82,10 +82,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
-
I Validate invoice by clicking on Validate button
@@ -115,10 +115,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
-
I Validate invoice by clicking on Validate button
@@ -149,7 +149,7 @@
company_id: base.main_company
journal_id: bank_journal_USD
name: 'First payment: Case 1 USD/USD'
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-03-01")
payment_option: 'with_writeoff'
@@ -176,7 +176,7 @@
I check that writeoff amount computed is -10.0
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (voucher_id.writeoff_amount == -10.0), "Writeoff amount is not -10.0"
-
@@ -184,14 +184,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that the move of my first voucher is valid
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -205,7 +205,7 @@
I check that my write-off is correct. 9 debit and 10 amount_currency
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -243,7 +243,7 @@
company_id: base.main_company
journal_id: bank_journal_USD
name: 'Second payment: Case 1'
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-04-01")
payment_option: 'with_writeoff'
@@ -269,7 +269,7 @@
I check that writeoff amount computed is -5.0
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (voucher_id.writeoff_amount == -5.0), "Writeoff amount is not -5.0"
-
@@ -277,14 +277,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that the move of my second voucher is valid
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -302,7 +302,7 @@
I check that my writeoff is correct. 4.75 debit and 5 amount_currency
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
index 85d710f235a..cc4c238aaaf 100644
--- a/addons/account_voucher/test/case2_suppl_usd_eur.yml
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -53,10 +53,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
check_total : 200
-
@@ -88,10 +88,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
check_total : 100.0
-
@@ -122,7 +122,7 @@
company_id: base.main_company
journal_id: bank_journal_EUR
name: 'First payment: Case 2 SUPPL USD/EUR',
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-03-01")
payment_option: 'with_writeoff'
@@ -149,14 +149,14 @@
I check that writeoff amount computed is -15.0
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (voucher_id.writeoff_amount == -15.0), "Writeoff amount is not -15.0"
-
I check that currency rate difference is 34.0
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (voucher_id.currency_rate_difference == 34.0), "Currency rate difference is not 34.0"
-
@@ -164,14 +164,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that the move of my voucher is valid
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -187,7 +187,7 @@
I check that my writeoff is correct. -15 in credit with no amount_currency
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -226,7 +226,7 @@
amount: 45.0
company_id: base.main_company
journal_id: bank_journal_USD
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-04-01")
payment_option: 'with_writeoff'
@@ -254,14 +254,14 @@
I check that writeoff amount computed is -5.0
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (voucher_id.writeoff_amount == 5.0), "Writeoff amount is not 5.0"
-
I check that currency rate difference is 8.50
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (voucher_id.currency_rate_difference == 8.50), "Currency rate difference is not 8.50"
-
@@ -269,14 +269,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that my voucher state is posted
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert voucher_id.state == 'posted', "Voucher state is not posted"
-
@@ -289,7 +289,7 @@
I check that my writeoff is correct. 4.75 in credit and 5 in amount_currency
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
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 150843cd250..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,10 +88,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
-
I Validate invoice by clicking on Validate button
@@ -121,10 +121,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
-
I Validate invoice by clicking on Validate button
@@ -153,7 +153,7 @@
amount: 200.0
company_id: base.main_company
journal_id: bank_journal_EUR
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-03-01")
payment_option: 'with_writeoff'
@@ -182,14 +182,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that the move of my voucher is valid
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -221,7 +221,7 @@
amount: 80
company_id: base.main_company
journal_id: bank_journal_USD
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-04-01")
payment_option: 'with_writeoff'
@@ -249,7 +249,7 @@
I check that writeoff amount computed is 2.22
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (round(voucher_id.writeoff_amount, 2) == 2.22), "Writeoff amount is not 2.22$"
-
@@ -257,14 +257,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that my voucher state is posted
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert voucher_id.state == 'posted', "Voucher state is not posted"
-
@@ -277,7 +277,7 @@
I check that my writeoff is correct. 2.11 in credit and 2.22 in amount_currency
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
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 b7c116bdc12..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,10 +88,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
-
I Validate invoice by clicking on Validate button
@@ -121,10 +121,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
-
I Validate invoice by clicking on Validate button
@@ -153,7 +153,7 @@
amount: 200.0
company_id: base.main_company
journal_id: bank_journal_EUR
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-03-01")
payment_option: 'with_writeoff'
@@ -182,14 +182,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that the move of my voucher is valid
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -201,7 +201,7 @@
I check that the debtor account has 2 new lines with 144.44 and 77.78 in amount_currency columns and their credit columns are 130 and 70
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -236,7 +236,7 @@
amount: 80.0
company_id: base.main_company
journal_id: bank_journal_USD
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-04-01")
payment_option: 'with_writeoff'
@@ -264,7 +264,7 @@
I check that writeoff amount computed is 2.22
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (round(voucher_id.writeoff_amount, 2) == 2.22), "Writeoff amount is not 2.22$"
-
@@ -272,14 +272,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that my voucher state is posted
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert voucher_id.state == 'posted', "Voucher state is not posted"
-
@@ -292,7 +292,7 @@
I check that my writeoff is correct. 2.11 in credit and 2.22 in amount_currency
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index c99f0d968c9..d70bd41a2ff 100644
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -42,10 +42,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
-
I Validate invoice by clicking on Validate button
@@ -75,10 +75,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
-
I Validate invoice by clicking on Validate button
@@ -107,7 +107,7 @@
amount: 120.0
company_id: base.main_company
journal_id: bank_journal_EUR
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-03-01")
payment_option: 'with_writeoff'
@@ -135,7 +135,7 @@
I check that writeoff amount computed is 0.00
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (voucher_id.writeoff_amount == 0.00), "Writeoff amount is not 0.00"
-
@@ -143,14 +143,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that the move of my first voucher is valid
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -162,7 +162,7 @@
I check that the debtor account has 2 new lines with 0.00 and 0.00 in amount_currency columns and their credit are 20 and 100 respectively
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -197,7 +197,7 @@
amount: 120.0
company_id: base.main_company
journal_id: bank_journal_EUR
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-04-01")
payment_option: 'with_writeoff'
@@ -225,7 +225,7 @@
I check that writeoff amount computed is 0.00
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'),('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'),('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (voucher_id.writeoff_amount == 0.00), "Writeoff amount is not 0"
-
@@ -233,14 +233,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'), ('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that the move of my second voucher is valid
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -252,7 +252,7 @@
I check that the debtor account has 2 new lines with 0.00 and 0.00 in amount_currency columns and their credit are 70 and 50
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index 9d9b4d77994..5ca901cdbca 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -76,10 +76,10 @@
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_seagate
+ partner_id: base.res_partner_19
reference_type: none
-
I Validate invoice by clicking on Validate button
@@ -108,7 +108,7 @@
amount: 200
company_id: base.main_company
journal_id: bank_journal_CHF
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_3
date: !eval time.strftime("%Y-03-01")
payment_option: 'with_writeoff'
@@ -135,7 +135,7 @@
I check that writeoff amount computed is 13.26
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
assert (round(voucher_id.writeoff_amount,2) == 13.26), "Writeoff amount is not 13.26 CHF"
-
@@ -143,14 +143,14 @@
-
!python {model: account.voucher}: |
import netsvc
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_19'))])
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
-
I check that the move of my voucher is valid
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -167,7 +167,7 @@
I check that my writeoff is correct. 11.05 credit and 13.26 amount_currency
-
!python {model: account.voucher}: |
- voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+ voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_19'))])
voucher_id = self.browse(cr, uid, voucher[0])
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml
index 53db4ffaf80..2ca2ded1a72 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -55,10 +55,10 @@
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_seagate
+ partner_id: base.res_partner_19
-
I validate the invoice.
-
@@ -88,7 +88,7 @@
company_id: base.main_company
journal_id: bank_journal_USD1
name: 'payment: Case EUR/USD'
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_5
date: !eval time.strftime("%Y-02-01")
payment_option: 'with_writeoff'
diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml
index 8d861154a48..585ce23aace 100644
--- a/addons/account_voucher/test/sales_payment.yml
+++ b/addons/account_voucher/test/sales_payment.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_seagate
+ partner_id: base.res_partner_19
-
I check that the customer invoice is in draft state
@@ -40,14 +40,14 @@
import netsvc
vals = {}
journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
- res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), journal_id, 0.0, 1, ttype='receipt', date=False)
+ res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_19"), journal_id, 0.0, 1, ttype='receipt', date=False)
vals = {
'account_id': ref('account.cash'),
'amount': 450.0,
'company_id': ref('base.main_company'),
'currency_id': ref('base.EUR'),
'journal_id': ref('account.bank_journal'),
- 'partner_id': ref('base.res_partner_seagate'),
+ 'partner_id': ref('base.res_partner_19'),
'period_id': ref('account.period_8'),
'type': 'receipt',
}
diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml
index 7ea4f7d1c55..f39d784bd42 100644
--- a/addons/account_voucher/test/sales_receipt.yml
+++ b/addons/account_voucher/test/sales_receipt.yml
@@ -10,7 +10,7 @@
- account_id: account.a_sale
amount: 30000.0
type: cr
- partner_id: base.res_partner_seagate
+ partner_id: base.res_partner_19
period_id: account.period_9
type: sale
@@ -48,14 +48,14 @@
import netsvc
vals = {}
journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
- res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), journal_id, 0.0, 1, ttype='receipt', date=False)
+ res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_19"), journal_id, 0.0, 1, ttype='receipt', date=False)
vals = {
'account_id': ref('account.cash'),
'amount': 30000.0,
'company_id': ref('base.main_company'),
'currency_id': ref('base.EUR'),
'journal_id': ref('account.bank_journal'),
- 'partner_id': ref('base.res_partner_seagate'),
+ 'partner_id': ref('base.res_partner_19'),
'period_id': ref('account.period_8'),
'type': 'receipt',
}
diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
index 82752d1dc7d..44838514935 100644
--- a/addons/base_calendar/crm_meeting_data.xml
+++ b/addons/base_calendar/crm_meeting_data.xml
@@ -13,7 +13,7 @@
- Phone Call
+ Off-site Meeting
diff --git a/addons/base_calendar/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml
index ad88c11bb1b..abba52ee8fe 100644
--- a/addons/base_calendar/crm_meeting_demo.xml
+++ b/addons/base_calendar/crm_meeting_demo.xml
@@ -1,79 +1,80 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Follow-up for Project proposal
+ Meeting to discuss project plan and hash out the details of implementation.
+
-
-
+
+
+ open
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+ Initial discussion
+ Discussion with partner for product.
+
+
+
+
+
+ draft
+
+
+
+
+
+ Pricing Discussion
+ Internal meeting for discussion for new pricing for product and services.
+
+
+
+
+ done
+
+
+
+
+
+ Requirements review
+
+
+
+
+ open
+
+
+
+
+
+ Changes in Designing
+ info@opensides.be
+
+
+
+
+ draft
+
+
+
+
+
+ Presentation for new Services
+
+
+
+
+ done
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 5e5f408673a..e12f7840312 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -14,17 +14,17 @@
100
-
- website
+
+ Website
-
- phone
+
+ Phone
-
- direct
+
+ Direct
-
- email
+
+ Email
sales
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index ac0f3e3daa8..dab366c65f7 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -14,24 +14,42 @@
-
- Meetings
- ir.ui.menu
-
-
-
-
-
+
+ Meetings
+ ir.ui.menu
+
+
+
+
+
Sales Marketing Department
- Sales Marketing
+ SMD
-
-
-
-
- OpenERP partners
- True
-
-
+
+
+
+ Support Department
+ SPD
+
+
+
+
+ Direct Marketing
+ DM
+
+
+
+
+ Online Support
+ OS
+
+
+
+
+ OpenERP partners
+ True
+
+
+
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 306a35924a9..d9f2d8d0284 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -86,11 +86,11 @@
- Mail Campaign 1
+ Email Campaign - Services
- Mail Campaign 2
+ Email Campaign - Products
@@ -102,7 +102,7 @@
- Google Adwords 2
+ Banner Ads
@@ -116,37 +116,37 @@
- Interest in Computer
+ Product
- Interest in Accessories
+ Software
- Need Services
+ Services
- Need Information
+ Information
- Need a Website Design
+ Design
- Potential Reseller
+ Training
- Need Consulting
+ Consulting
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 7ed3bc2a86b..ea26a24cad8 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -5,218 +5,273 @@
Demo Leads
-->
-
-
-
+
lead
-
-
-
-
-
-
-
+ Plan to Attend a Training
+ Jason Dunagan
+ Le Club SARL
+ jason@leclub.fr
+
+ Training Manager
+ 73, rue Léon Dierx
-
-
+ Paris
+ 93190
+ +33 1 25 54 45 69
+
+
+
+ 1
+
+
+
+ Hello,
+I am Jason from Le Club SARL,
+I am intertested to attend Training organized in your company,
+Can you send details,
-
-
-
-
-
-
+
+
lead
-
-
-
-
-
-
+ Interest in Your New Software
+ Marc Dufour
+ The Oil Company
+ md@oilcompany.fr
+
+ Purchase Manager
-
-
-
+ Bordeaux
+
+
+
+ 4
+
+
+
+ Want to know features and benifits to use the new software.
-
-
-
-
-
-
-
+
+
lead
-
-
-
-
+ Need Info about Web Design
+ John Miller
+ The Kompany
+ contact@thkompany.com
+
-
-
+ New-York
+
+
+
+ 2
+
+
+
-
-
-
-
-
-
-
-
+
+
lead
-
-
-
+ Need a New Website
+ Henry Campbell
+ Burstein-Applebee
+ hmc@yahoo.com
+
-
-
+ Drury
+
+
+
+ 3
+
+
+
-
-
-
-
-
-
-
+
+
lead
-
-
-
-
-
-
-
-
+ Need a Quotation for Computers with Accessories
+ Carrie Helle
+ Stonage IT
+ helle@stonageit.be
+
+ Purchase Manager
+ 50 West street,
+
+ Franklinville
+ NJ 08322
+ +1 813 494 5005
+
+
+
+ 3
+
+
+
+ Hi, Can you send a quotation for 20 Computers with speakers?
+Regards,
+Carrie Helle,
+Purchase Manager
+Stonage IT,
+Franklinville
+Contact: +1 813 494 5005
-
-
-
-
-
-
-
-
-
-
+
+
lead
-
-
-
-
-
+ Need Info about your Services
+ Tina Pinero
+ Opensides
+ tina@opensides.be
+
+ Consultant
-
-
-
-
-
-
-
-
-
+ Roma
+
+
+
+ 3
+
+
+
-
-
+
+
+
lead
-
-
-
-
-
+ Info about Your Company?
+ Wendi Baltz
+ Gardner Group
+
+ Journalist
-
-
-
-
-
-
-
-
-
-
-
- lead
+ Kiev
+
+
+
+ 5
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+ lead
+ Product catalogue
+ Logan
+ ESM Expert
+ logan12_expert@gmail.com
+
+ Sales
-
-
-
-
+ Cambridge
+
+
+
+ 4
+
+
+
-
-
+
+
+
lead
-
-
-
-
-
-
-
-
-
+ Partnership Details
+ Delisle Albert
+ Marketing Business
+ d.albert@marketing-business.com
+
+ Sales
-
-
-
-
+ Oxford
+
+
+
+ 2
+
+
+
-
-
- lead
-
-
-
-
-
-
-
-
+
+
lead
+ Information about laptop
+ Andrew
+ Komerci
+
+ Medical illustrator
+
+ Sevilla
+
+
+
+ 2
+
+
+
+ hi,
+I want to know specification and cost of laptops of your company.
+Thanks,
+Andrew
+
+
+
+
+ lead
+ Need estimated cost for new project
+ Thomas Passot
+ Agrolait
+ p.thomas@agrolait.com
+
+ Functional Consultant
+
+
+
+
+ 3
+
-
-
-
-
-
-
-
-
+
-
-
+
+
+
lead
+ Need Quotation for 100 PC and 100 Keyboards
+ Bojing Hú
+ Incom Corporation
+ bhu.a100@gmail.com
+
+
+ Shenzhen
+
+
+
+ 2
+
-
-
-
-
-
-
+
+
+
+
@@ -224,71 +279,280 @@
Demo Opportunities
-->
-
-
-
+
+
opportunity
-
-
-
-
-
-
-
-
-
-
-
-
-
- opportunity
-
-
-
-
-
-
-
-
+ Plan to buy 60 keyboards and mouses
+
+
+ Will McEncroe
+ willmac@rediffmail.com
+ 1 rue Rockfeller
+
+ Melbourne
+
+
+
+ 1
+
+
+ Meeting for pricing information.
+
+
-
-
-
-
+
+
+
+
+ opportunity
+ Interest in your Graphic Design Project
+
+
+ Agrolait
+ info@agrolait.com
+
+ 69 rue de Chimay
+
+ Wavre
+ 1300
+
+
+
+ 3
+
+
+ Send Catalogue by Email
+
+
+
+
+
+
+
+ opportunity
+ Plan to buy a Laptop
+
+
+ 12 rue Albert Einstein
+
+ Istanbul
+
+
+ 1
+
+
+ Call to ask system requirement
+
+
+
+
+
+
+
+ opportunity
+ Need a new design for my website
+
+
+ Robin Smith
+ Global Solutions
+
+ Union Road
+
+ Liverpool
+ L25 4RL
+
+
+ 2
+
+
+ Convert to quote
+
+
+
+
+
+
+
+ opportunity
+ Pricing Information of Services
+
+
+ Oliver Passot
BalmerInc S.A.
Rue des Palais 51, bte 33
- Bruxelles
-
-
-
-
- opportunity
-
-
-
+ Brussels
+
+
+
+ 4
+
+
+ Send price list regarding our interventions
+
-
-
-
-
-
-
-
-
- Lucie Vonck
- Chaussée de Namur
- Grand-Rosière
-
-
- 8
+
+
+
+ opportunity
+ Student's training plan in your Organization
+
+
+ Leland Martinez
+ Toronto University
+ 2488 Queens Bay
+
+ Toronto
+
+
+ 4
+
+
+ Call to define real needs about training
+
+
+
+
+
+
+
+ opportunity
+ Interest in your customizable Pcs
+
+
+ Robin Smith
+ Global Solutions
+
+
+ Liverpool
+ L25 4RL
+
+
+ 1
+
+
+ Ask for the good receprion of the proposition
+
+
+
+
+
+
+
+ opportunity
+ Interest in your Partnership Contract
+
+ John M. Brown
+ Epic Technologies
+ john.b@tech.info
+
+
+
+ 2
+
+
+
+
+
+
+
+ opportunity
+ “Resource Planning” project develpment
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+ opportunity
+ Need script to Import external data
+
+
+ Benjamin Flores
+ Nebula Business
+
+
+
+
+ 3
+
+
+
+
+
+
+
+ opportunity
+ Want to subscribe to your online solution
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+ opportunity
+ Need 20 Days of Consultancy
+
+
+ info@mycompany.net
+
+ Lima
+
+
+
+ 5
+
+
+
+
+
+
+
+
+ opportunity
+ Need to customize the solution
+
+
+ Henry Jordan
+ E-light Industry
+ henry@elight.com
+ Palermo, Capital Federal
+ C1414CMS Capital Federal
+
+ Buenos Aires
+ B7313
+
+
+ 2
+ Conf call with technical service
+
+
+
+
+
+
Kitchen design
crm.lead
-
+
html
email
@@ -298,7 +562,7 @@
Reply
crm.lead
-
+
html
comment
@@ -307,7 +571,7 @@