Devishree Brahmbhatt (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-warning-dbr into lp:openobject-server.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-warning-dbr/+merge/113687
Hello,
Improve code for remove the warning.
Thanks,
DBR
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-warning-dbr/+merge/113687
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-server/trunk-warning-dbr into lp:openobject-server.
=== modified file 'openerp/addons/base/ir/ir.xml'
--- openerp/addons/base/ir/ir.xml 2012-07-02 21:08:02 +0000
+++ openerp/addons/base/ir/ir.xml 2012-07-06 05:06:52 +0000
@@ -598,7 +598,6 @@
<field name="name">ir.needaction_users_rel.tree</field>
<field name="model">ir.needaction_users_rel</field>
<field name="type">tree</field>
- <field name="sequence">10</field>
<field name="arch" type="xml">
<tree string="Subscription">
<field name="user_id"/>
=== modified file 'openerp/addons/base/security/ir.model.access.csv'
--- openerp/addons/base/security/ir.model.access.csv 2012-06-04 21:32:12 +0000
+++ openerp/addons/base/security/ir.model.access.csv 2012-07-06 05:06:52 +0000
@@ -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
=== modified file 'openerp/addons/base/test/test_osv_expression.yml'
--- openerp/addons/base/test/test_osv_expression.yml 2012-06-22 00:11:50 +0000
+++ openerp/addons/base/test/test_osv_expression.yml 2012-07-06 05:06:52 +0000
@@ -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()
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
