pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] removed a few warnings.

Browse Source 
bzr revid: vmt@openerp.com-20121022132759-64qupagcv9cdqnkq
This commit is contained in:
Vo Minh Thu
2012-10-22 15:27:59 +02:00
parent 955ebc8c67 a1cb39e65c
commit 749ee11eb2
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/ir_translation.py
+1 -1
View File
@@ -408,7 +408,7 @@ class ir_translation(osv.osv):
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
openerp/addons/base/security/ir.model.access.csv
+1
View File
@@ -8,6 +8,7 @@
"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_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
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
8 access_ir_default_group_system ir_default group_system model_ir_default 1 1 1 1
9 access_ir_exports_group_system ir_exports group_system model_ir_exports base.group_user 1 1 1 1
10 access_ir_exports_line_group_system ir_exports_line group_system model_ir_exports_line base.group_user 1 1 1 1
11 access_ir_fields_converter_group_system ir_fields_converter model_ir_fields_converter base.group_user 1 1 1 1
12 access_ir_model_group_erp_manager ir_model group_erp_manager model_ir_model group_erp_manager 1 1 1 1
13 access_ir_model_constraint_group_erp_manager ir_model_constraint group_erp_manager model_ir_model_constraint group_erp_manager 1 1 1 1
14 access_ir_model_relation_group_erp_manager ir_model_relation group_erp_manager model_ir_model_relation group_erp_manager 1 1 1 1
openerp/addons/base/test/test_osv_expression.yml
+1 -1
View File
@@ -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
-
openerp/tests/addons/test_impex/tests/test_load.py
+2 -2
View File
@@ -1088,7 +1088,7 @@ class test_datetime(ImporterCase):
['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 @@ class test_datetime(ImporterCase):
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'])