From fbd5d24aaa6f0dfa3077f1bab002f48002bab11c Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Wed, 4 Jul 2012 14:48:45 +0530 Subject: [PATCH 1/2] [IMP]server-log-warning bzr revid: pna@tinyerp.com-20120704091845-sox7tsm9pjpqn812 --- openerp/addons/base/ir/ir.xml | 1 - .../addons/base/security/ir.model.access.csv | 4 ++++ .../addons/base/test/test_osv_expression.yml | 23 +++++++++---------- openerp/tools/amount_to_text_en.py | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 88843b207f9..483f3f6ab37 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -598,7 +598,6 @@ ir.needaction_users_rel.tree ir.needaction_users_rel tree - 10 diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv index cc382fcbd11..8f9ac8a6eaa 100644 --- a/openerp/addons/base/security/ir.model.access.csv +++ b/openerp/addons/base/security/ir.model.access.csv @@ -9,10 +9,14 @@ "access_ir_exports_group_system","ir_exports group_system","model_ir_exports","base.group_user",1,1,1,1 "access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,1,1,1 "access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1 +"access_ir_model_constraint_group_erp_manager","ir_model_constraint group_erp_manager","model_ir_model_constraint","group_erp_manager",1,1,1,1 +"access_ir_model_relation_group_erp_manager","ir_model_relation group_erp_manager","model_ir_model_relation","group_erp_manager",1,1,1,1 "access_ir_model_access_group_erp_manager","ir_model_access_group_erp_manager","model_ir_model_access","group_erp_manager",1,1,1,1 "access_ir_model_data_group_erp_manager","ir_model_data group_erp_manager","model_ir_model_data","group_erp_manager",1,1,1,1 "access_ir_model_fields_group_erp_manager","ir_model_fields group_erp_manager","model_ir_model_fields","group_erp_manager",1,1,1,1 "access_ir_model_all","ir_model_all","model_ir_model",,1,0,0,0 +"access_ir_model_constraint","ir_model_constraint","model_ir_model_constraint",,1,0,0,0 +"access_ir_model_relation","ir_model_relation","model_ir_model_relation",,1,0,0,0 "access_ir_model_access_all","ir_model_access_all","model_ir_model_access",,1,0,0,0 "access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0 diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml index fa7a69b74e9..03e8b7686b8 100644 --- a/openerp/addons/base/test/test_osv_expression.yml +++ b/openerp/addons/base/test/test_osv_expression.yml @@ -220,8 +220,7 @@ # that don't have OpenERP has a parent company, you expect to find, # among others, the companies that don't have parent company. # - # ('parent_id', 'not in', [0]) must give the same result than - # ('parent_id', 'not in', []), i.e. a empty set or a set with non- + # existing values be treated similarly if we simply check that some # existing value belongs to them. @@ -229,7 +228,7 @@ res_0.sort() res_1 = self.search(cr, uid, [('parent_id', 'not in', [max_partner_id + 1])]) # get all rows, included null parent_id res_1.sort() - res_2 = self.search(cr, uid, [('parent_id', 'not in', False)]) # get rows with not null parent_id, deprecated syntax + res_2 = self.search(cr, uid, [('parent_id', '!=', False)]) # get rows with not null parent_id, deprecated syntax res_2.sort() res_3 = self.search(cr, uid, [('parent_id', 'not in', [])]) # get all rows, included null parent_id res_3.sort() @@ -249,7 +248,7 @@ res_5.sort() res_6 = self.search(cr, uid, [('parent_id', 'in', [max_partner_id + 1])]) res_6.sort() - res_7 = self.search(cr, uid, [('parent_id', 'in', False)]) + res_7 = self.search(cr, uid, [('parent_id', '=', False)]) res_7.sort() res_8 = self.search(cr, uid, [('parent_id', 'in', [])]) res_8.sort() @@ -270,7 +269,7 @@ res_10.sort() res_11 = self.search(cr, uid, ['!', ('parent_id', 'in', [max_partner_id + 1])]) res_11.sort() - res_12 = self.search(cr, uid, ['!', ('parent_id', 'in', False)]) + res_12 = self.search(cr, uid, ['!', ('parent_id', '=', False)]) res_12.sort() res_13 = self.search(cr, uid, ['!', ('parent_id', 'in', [])]) res_13.sort() @@ -291,7 +290,7 @@ res_16.sort() assert res_16 == partner_ids - res_17 = self.search(cr, uid, [('website', 'not in', False)]) + res_17 = self.search(cr, uid, [('website', '!=', False)]) res_17.sort() assert res_17 == with_website @@ -306,21 +305,21 @@ assert res_101 == [], 'res_101: expected %r, got %r' % ([], res_101) assert res_102 == company_ids, 'res_102: expected %r, got %r' % (company_ids, res_102) - - Property of the query (one2many not in False). + Property of the query (one2many != False). - !python {model: res.currency }: | ids = self.search(cr, uid, []) referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)]) - companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', 'not in', False)])) + companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '!=', False)])) assert referenced_companies == companies - - Property of the query (one2many in False). + Property of the query (one2many = False). - !python {model: res.currency }: | ids = self.search(cr, uid, []) referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)]) unreferenced_companies = set(self.pool.get('res.company').search(cr, uid, [])).difference(referenced_companies) - companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', 'in', False)])) + companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '=', False)])) assert unreferenced_companies == companies - Equivalent queries. @@ -331,7 +330,7 @@ res_1 = self.search(cr, uid, [('name', 'not like', 'probably_unexisting_name')]) res_2 = self.search(cr, uid, [('id', 'not in', [max_currency_id + 1003])]) res_3 = self.search(cr, uid, [('id', 'not in', [])]) - res_4 = self.search(cr, uid, [('id', 'not in', False)]) + res_4 = self.search(cr, uid, [('id', '!=', False)]) res_0.sort() res_1.sort() res_2.sort() @@ -414,7 +413,7 @@ # get the companies referenced by some currency (this is normally the main company) res_10 = self.search(cr, uid, [('currency_ids', 'not like', 'probably_unexisting_name')]) res_11 = self.search(cr, uid, [('currency_ids', 'not in', [max_currency_id + 1])]) - res_12 = self.search(cr, uid, [('currency_ids', 'not in', False)]) + res_12 = self.search(cr, uid, [('currency_ids', '!=', False)]) res_13 = self.search(cr, uid, [('currency_ids', 'not in', [])]) res_10.sort() res_11.sort() diff --git a/openerp/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py index 9a1ac939e6b..9e0d908f16e 100644 --- a/openerp/tools/amount_to_text_en.py +++ b/openerp/tools/amount_to_text_en.py @@ -116,7 +116,7 @@ def amount_to_text(nbr, lang='en', currency='euro'): _logger.warning(_("no translation function found for lang: '%s'"), lang) #TODO: (default should be en) same as above lang = 'en' - return _translate_funcs[lang](abs(nbr), currency) + return _translate_funcs[lang](abs(nbr), currency='euro') if __name__=='__main__': from sys import argv From 59d182672fef83a646be8ca084c4ef45565a8cd1 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 5 Jul 2012 16:03:48 +0530 Subject: [PATCH 2/2] [IMP]remove specific allocation of currency="euro" bzr revid: dbr@tinyerp.com-20120705103348-rzux5u9zi40ir3kn --- openerp/tools/amount_to_text_en.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py index 9e0d908f16e..9a1ac939e6b 100644 --- a/openerp/tools/amount_to_text_en.py +++ b/openerp/tools/amount_to_text_en.py @@ -116,7 +116,7 @@ def amount_to_text(nbr, lang='en', currency='euro'): _logger.warning(_("no translation function found for lang: '%s'"), lang) #TODO: (default should be en) same as above lang = 'en' - return _translate_funcs[lang](abs(nbr), currency='euro') + return _translate_funcs[lang](abs(nbr), currency) if __name__=='__main__': from sys import argv