diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-01-31 12:08:04 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-01-31 12:08:04 +0200 |
| commit | b69c19fbb2a56de017f466c76d06addd968c96ce (patch) | |
| tree | 18fd5664613588c2901a5ede849592ddba2b3e9d /bin/addons/base/module | |
| parent | f84b1e90e73969887f9e1ae6e43548c3d853c7e8 (diff) | |
| parent | 27240361ca5ead2597ae8f0c63043bab0e969001 (diff) | |
Merge branch 'master' of openobject-server into mdv-gpl3-py26
Conflicts:
bin/netsvc.py
bin/tools/translate.py
bzr revid: p_christ@hol.gr-20090131100804-pu97gelwjh1flk3h
Diffstat (limited to 'bin/addons/base/module')
| -rw-r--r-- | bin/addons/base/module/module.py | 2 | ||||
| -rw-r--r-- | bin/addons/base/module/report/ir_module_reference.rml | 2 | ||||
| -rw-r--r-- | bin/addons/base/module/report/ir_module_reference.sxw | bin | 13836 -> 13707 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py index 9eb5e46e575..8176565a871 100644 --- a/bin/addons/base/module/module.py +++ b/bin/addons/base/module/module.py @@ -469,7 +469,7 @@ class module(osv.osv): for lang in filter_lang: f = os.path.join(modpath, 'i18n', lang + '.po') if os.path.exists(f): - logger.notifyChannel("init", netsvc.LOG_INFO, 'module %s: loading translation file for language %s' % (mod.name, lang)) + logger.notifyChannel("i18n", netsvc.LOG_INFO, 'module %s: loading translation file for language %s' % (mod.name, lang)) tools.trans_load(cr.dbname, f, lang, verbose=False) diff --git a/bin/addons/base/module/report/ir_module_reference.rml b/bin/addons/base/module/report/ir_module_reference.rml index 52ffd04fd7f..1e09766e3e6 100644 --- a/bin/addons/base/module/report/ir_module_reference.rml +++ b/bin/addons/base/module/report/ir_module_reference.rml @@ -230,7 +230,7 @@ <blockTable colWidths="510.0" repeatRows="1" style="Tableau3"> <tr> <td> - <para style="terp_tblheader_Details">Object: [[ object.name ]] [[ objdoc(object.model) ]]</para> + <para style="terp_tblheader_Details">Object: [[ object.model ]] [[ objdoc(object.model) ]]</para> </td> </tr> </blockTable> diff --git a/bin/addons/base/module/report/ir_module_reference.sxw b/bin/addons/base/module/report/ir_module_reference.sxw Binary files differindex ad3ecff7717..48e94634f98 100644 --- a/bin/addons/base/module/report/ir_module_reference.sxw +++ b/bin/addons/base/module/report/ir_module_reference.sxw |