Antony Lesuisse (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-fix-warning into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-fix-warning/+merge/129044
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-fix-warning/+merge/129044
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-fix-warning.
=== modified file 'openerp/addons/base/ir/ir_translation.py'
--- openerp/addons/base/ir/ir_translation.py 2012-09-19 15:53:39 +0000
+++ openerp/addons/base/ir/ir_translation.py 2012-10-17 10:02:24 +0000
@@ -408,7 +408,7 @@
if trans_file:
_logger.info('module %s: loading translation file (%s) for language %s', module_name, lang_code, lang)
tools.trans_load(cr, trans_file, lang, verbose=False, module_name=module_name, context=context)
- elif lang_code != 'en':
+ elif lang_code != 'en_US':
_logger.warning('module %s: no translation for language %s', module_name, lang_code)
return True
=== modified file 'openerp/addons/base/security/ir.model.access.csv'
--- openerp/addons/base/security/ir.model.access.csv 2012-10-01 14:49:41 +0000
+++ openerp/addons/base/security/ir.model.access.csv 2012-10-17 10:02:24 +0000
@@ -7,7 +7,8 @@
"access_ir_cron_user","ir_cron user","model_ir_cron","group_user",1,0,0,0
"access_ir_default_group_system","ir_default group_system","model_ir_default",,1,1,1,1
"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_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,0,0,0
+"access_ir_fields_converter_group_system","ir_fields_converter","model_ir_fields_converter","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
=== modified file 'openerp/addons/base/test/test_osv_expression.yml'
--- openerp/addons/base/test/test_osv_expression.yml 2012-08-22 12:30:11 +0000
+++ openerp/addons/base/test/test_osv_expression.yml 2012-10-17 10:02:24 +0000
@@ -83,7 +83,7 @@
Test one2many operator with False
-
!assert {model: res.partner, search: "[('child_ids', '=', False)]"}:
- - address in (False, None, [])
+ - child_ids in (False, None, [])
-
Test many2many operator with empty search list
-
=== modified file 'openerp/tests/addons/test_impex/tests/test_load.py'
--- openerp/tests/addons/test_impex/tests/test_load.py 2012-10-09 09:25:19 +0000
+++ openerp/tests/addons/test_impex/tests/test_load.py 2012-10-17 10:02:24 +0000
@@ -1088,7 +1088,7 @@
['value'], [['2012-02-03 11:11:11']])
self.assertFalse(result['messages'])
self.assertEqual(
- values(self.read(domain=[('id', '=', result['ids'])])),
+ values(self.read(domain=[('id', 'in', result['ids'])])),
['2012-02-03 01:11:11'])
def test_notz(self):
@@ -1098,5 +1098,5 @@
result = self.import_(['value'], [['2012-02-03 11:11:11']])
self.assertFalse(result['messages'])
self.assertEqual(
- values(self.read(domain=[('id', '=', result['ids'])])),
+ values(self.read(domain=[('id', 'in', result['ids'])])),
['2012-02-03 11:11:11'])
_______________________________________________
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
