From c75b61d3e711faf2e99d6e2278d6ccc85c1d1a04 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 22 Jan 2015 17:19:56 +0100 Subject: [PATCH] [FIX] account_voucher: now that currency rates created at installation does not use current year (be33101), tests must create their own rates instead of trying to change default one --- addons/account_voucher/test/case1_usd_usd.yml | 11 +++++------ .../test/case1_usd_usd_payment_rate.yml | 11 +++++------ .../test/case2_usd_eur_debtor_in_eur.yml | 10 ++++------ .../test/case2_usd_eur_debtor_in_usd.yml | 10 ++++------ addons/account_voucher/test/case_eur_usd.yml | 10 ++++------ 5 files changed, 22 insertions(+), 30 deletions(-) diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml index 84ae118ab16..0bdd1d7eef3 100644 --- a/addons/account_voucher/test/case1_usd_usd.yml +++ b/addons/account_voucher/test/case1_usd_usd.yml @@ -13,12 +13,11 @@ - I create currency USD in OpenERP for January of 1.333333 Rate - - !python {model: res.currency.rate}: | - from datetime import datetime - curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0] - date = '%s-01-01' %(datetime.now().year) - ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)]) - self.write(cr, uid, ids, {'rate': 1.333333}) + !record {model: res.currency.rate, id: jan_usd}: + currency_id: base.USD + name: !eval "'%s-01-01' %(datetime.now().year)" + rate: 1.333333 + - I create currency USD in OpenERP for February of 1.250000 Rate - diff --git a/addons/account_voucher/test/case1_usd_usd_payment_rate.yml b/addons/account_voucher/test/case1_usd_usd_payment_rate.yml index c0aa617783c..8c207de8054 100644 --- a/addons/account_voucher/test/case1_usd_usd_payment_rate.yml +++ b/addons/account_voucher/test/case1_usd_usd_payment_rate.yml @@ -13,12 +13,11 @@ - I create currency USD in OpenERP for January of 1.333333 Rate - - !python {model: res.currency.rate}: | - from datetime import datetime - curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0] - date = '%s-01-01' %(datetime.now().year) - ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)]) - self.write(cr, uid, ids, {'rate': 1.333333}) + !record {model: res.currency.rate, id: jan_usd}: + currency_id: base.USD + name: !eval "'%s-01-01' %(datetime.now().year)" + rate: 1.333333 + - I create currency USD in OpenERP for February of 1.250000 Rate - 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 45c86eb7ad0..d8f46594c5a 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 @@ -20,12 +20,10 @@ - I create currency USD in OpenERP for January of 1.333333 Rate - - !python {model: res.currency.rate}: | - from datetime import datetime - curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0] - date = '%s-01-01' %(datetime.now().year) - ids = self.search(cr, uid, [('currency_id', '=', curr_id), ('name', '=', date)]) - self.write(cr, uid, ids, {'rate': 1.333333}) + !record {model: res.currency.rate, id: jan_usd}: + currency_id: base.USD + name: !eval "'%s-01-01' %(datetime.now().year)" + rate: 1.333333 - I create currency USD in OpenERP for February of 1.250000 Rate - 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 f353cd8c6fc..f06c992e317 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 @@ -20,12 +20,10 @@ - I create currency USD in OpenERP for January of 1.333333 Rate - - !python {model: res.currency.rate}: | - from datetime import datetime - curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0] - date = '%s-01-01' %(datetime.now().year) - ids = self.search(cr, uid, [('currency_id', '=', curr_id), ('name', '=', date)]) - self.write(cr, uid, ids, {'rate': 1.333333}) + !record {model: res.currency.rate, id: jan_usd}: + currency_id: base.USD + name: !eval "'%s-01-01' %(datetime.now().year)" + rate: 1.333333 - I create currency USD in OpenERP for February of 1.250000 Rate - diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml index 69304c342c9..fc2e91d1ba1 100644 --- a/addons/account_voucher/test/case_eur_usd.yml +++ b/addons/account_voucher/test/case_eur_usd.yml @@ -10,12 +10,10 @@ - I update the Currency USD in OpenERP for January with rate 1.200000 - - !python {model: res.currency.rate}: | - from datetime import datetime - curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0] - date = '%s-01-01' %(datetime.now().year) - ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)]) - self.write(cr, uid, ids, {'rate': 1.200000}) + !record {model: res.currency.rate, id: jan_usd}: + currency_id: base.USD + name: !eval "'%s-01-01' %(datetime.now().year)" + rate: 1.333333 - I update the Currency USD in OpenERP for February with rate 1.400000 -