odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] lp:~openerp-dev/openobject-server/trunk-warning-fix-tch 

bzr revid: tpa@tinyerp.com-20121011102325-wjvwssyyfnavhz7h
This commit is contained in:
Turkesh Patel (Open ERP) 2012-10-11 15:53:25 +05:30
parent 0623db1978 92dd592b5f
commit f1a0dcf87e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/ir/ir_translation.py
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

3
openerp/addons/base/security/ir.model.access.csv
View File

@ -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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
7 access_ir_cron_user ir_cron user model_ir_cron group_user 1 0 0 0
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 0 1 0 1 0
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