[FIX] account_voucher: fixed error in yamls due to new constraint added in revision...

bzr revid: qdp-launchpad@openerp.com-20111122115133-789x19p4af4qlvvz

diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
index 39e9c21..b41c33e 100644 (file)
--- a/addons/account_voucher/test/account_voucher_report.yml
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -4,7 +4,6 @@
   !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
     account_id: account.cash
     company_id: base.main_company
-    currency_id: base.EUR
     journal_id: account.bank_journal
     name: Voucher Axelor
     narration: Basic PC

diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index b37a874..e19e7e3 100644 (file)
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -35,6 +35,16 @@
     rate: 1.052632
 
 -
+  I create a cash account with currency USD
+-
+  !record {model: account.account, id: account_cash_usd_id}:
+    currency_id: base.USD
+    name: "cash account in usd"
+    code: "Xcash usd"
+    type: 'liquidity'
+    user_type: "account.account_type_cash_moves"
+
+-
   I create a bank journal with USD as currency
 -
   !record {model: account.journal, id: bank_journal_USD}:
@@ -43,8 +53,8 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
+    default_debit_account_id: account_cash_usd_id
+    default_credit_account_id: account_cash_usd_id
     currency: base.USD
     company_id: base.main_company
     view_id: account.account_journal_bank_view

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 11e1e3c..6728759 100644 (file)
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -49,7 +49,6 @@
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
-    currency: base.EUR
     company_id: base.main_company
     view_id: account.account_journal_bank_view
 -
@@ -61,8 +60,8 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
+    default_debit_account_id: account_cash_usd_id
+    default_credit_account_id: account_cash_usd_id
     currency: base.USD
     company_id: base.main_company
     view_id: account.account_journal_bank_view

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 c72825c..ec4d653 100644 (file)
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -49,7 +49,6 @@
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
-    currency: base.EUR
     company_id: base.main_company
     view_id: account.account_journal_bank_view
 -
@@ -61,8 +60,8 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
+    default_debit_account_id: account_cash_usd_id
+    default_credit_account_id: account_cash_usd_id
     currency: base.USD
     company_id: base.main_company
     view_id: account.account_journal_bank_view

diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index 5649bf0..09034fa 100644 (file)
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -26,7 +26,6 @@
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
-    currency: base.EUR
     company_id: base.main_company
     view_id: account.account_journal_bank_view
 -

diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index 972b097..b3abbb2 100644 (file)
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -30,6 +30,16 @@
     name: !eval "'%s-03-01' %(datetime.now().year)"
     rate: 1.25000
 -
+  I create a cash account with currency CHF
+-
+  !record {model: account.account, id: account_cash_chf_id}:
+    currency_id: base.CHF
+    name: "cash account in chf"
+    code: "Xcash chf"
+    type: 'liquidity'
+    user_type: "account.account_type_cash_moves"
+
+-
   I create a bank journal with CHF as currency
 -
   !record {model: account.journal, id: bank_journal_CHF}:
@@ -38,8 +48,8 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
+    default_debit_account_id: account_cash_chf_id
+    default_credit_account_id: account_cash_chf_id
     currency: base.CHF
     company_id: base.main_company
     view_id: account.account_journal_bank_view