From 85b8e20b5dc369dacccfcf3b540dc1f7083486f5 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 22 Nov 2011 12:51:33 +0100 Subject: [PATCH] [FIX] account_voucher: fixed error in yamls due to new constraint added in revision 5763 bzr revid: qdp-launchpad@openerp.com-20111122115133-789x19p4af4qlvvz --- .../test/account_voucher_report.yml | 1 - addons/account_voucher/test/case1_usd_usd.yml | 14 ++++++++++++-- .../test/case2_usd_eur_debtor_in_eur.yml | 5 ++--- .../test/case2_usd_eur_debtor_in_usd.yml | 5 ++--- addons/account_voucher/test/case3_eur_eur.yml | 1 - addons/account_voucher/test/case4_cad_chf.yml | 14 ++++++++++++-- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml index 39e9c2144a2..b41c33e4470 100644 --- 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 b37a87405cc..e19e7e3ee46 100644 --- a/addons/account_voucher/test/case1_usd_usd.yml +++ b/addons/account_voucher/test/case1_usd_usd.yml @@ -34,6 +34,16 @@ name: !eval "'%s-04-01' %(datetime.now().year)" 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 - @@ -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 11e1e3cc0c2..67287591778 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 @@ -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 c72825cb0c7..ec4d653c8ab 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 @@ -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 5649bf0d4bb..09034fadf51 100644 --- 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 972b09702be..b3abbb25e01 100644 --- a/addons/account_voucher/test/case4_cad_chf.yml +++ b/addons/account_voucher/test/case4_cad_chf.yml @@ -29,6 +29,16 @@ currency_id: base.CHF 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 - @@ -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