From 08acc882f1af8d7ab046715b89d21154e679b86e Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 19 Nov 2010 15:11:52 +0530 Subject: [PATCH 1/2] [IMP]:improved landscape header for landscape report bzr revid: apa@tinyerp.com-20101119094152-rhiaqx5mnotdn7xo --- bin/addons/base/res/res_company.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py index a2ed3c05840..09f448d0e8b 100644 --- a/bin/addons/base/res/res_company.py +++ b/bin/addons/base/res/res_company.py @@ -203,16 +203,16 @@ class res_company(osv.osv): return """
- + - [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]] + [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]] - [[ company.partner_id.name ]] + [[ company.partner_id.name ]] - 25 720 1085 720 + 25 550 808 550
""" From 31de6c01a5a55f6db27500abb5625e85e11b1939 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 19 Nov 2010 17:25:11 +0530 Subject: [PATCH 2/2] [REVERT]:reverted nch change in res_config.py bzr revid: apa@tinyerp.com-20101119115511-idgp5fa0vqz2c3p2 --- bin/addons/base/res/res_config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py index 8552e608586..83b4c2b68d3 100644 --- a/bin/addons/base/res/res_config.py +++ b/bin/addons/base/res/res_config.py @@ -113,8 +113,9 @@ class res_config_configurable(osv.osv_memory): current_user_menu = self.pool.get('res.users')\ .browse(cr, uid, uid).menu_id # return the action associated with the menu - return {'menu_reload':True, 'type': 'object'} - + return self.pool.get(current_user_menu.type)\ + .read(cr, uid, current_user_menu.id) + def start(self, cr, uid, ids, context=None): ids2 = self.pool.get('ir.actions.todo').search(cr, uid, [], context=context) for todo in self.pool.get('ir.actions.todo').browse(cr, uid, ids2, context=context): @@ -392,7 +393,7 @@ class res_config_installer(osv.osv_memory): cr, uid, modules.search(cr, uid, [('name','in',to_install)]), 'to install', ['uninstalled'], context=context) - cr.commit() #TOFIX: after remove this statement, installation wizard is fail + cr.commit() #TOFIX: after remove this statement, installation wizard is fail pooler.restart_pool(cr.dbname, update_module=True) res_config_installer()