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

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)
         
 

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>