From 14ebc46e3ac80413b2883fe5ebe12b6e51e0b921 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 9 Feb 2011 10:02:31 +0100 Subject: [PATCH 1/5] [FIX] tools.translate: add missing imports after previous merge bzr revid: odo@openerp.com-20110209090231-odqbf8leyurdh945 --- openerp/tools/translate.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index 73b9378246f..6b23ddd25a8 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -37,9 +37,11 @@ from os.path import join from datetime import datetime from lxml import etree +import config import misc from misc import UpdateableStr from misc import SKIPPED_ELEMENT_TYPES +import osutil _LOCALE2WIN32 = { 'af_ZA': 'Afrikaans_South Africa', From e0a95e80c1b3ccf79bd157a146ad8c519d299da3 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Wed, 9 Feb 2011 17:35:35 +0530 Subject: [PATCH 2/5] [FIX] Multi-Company Environment :Configuration of consolidated type of account is not possible due to the _check_type constraints lp bug: https://launchpad.net/bugs/715695 fixed bzr revid: ara@tinyerp.com-20110209120535-o3htlw38zves04fm --- addons/account/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index b9cc9473579..602b3679ed4 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -424,7 +424,7 @@ class account_account(osv.osv): context = {} accounts = self.browse(cr, uid, ids, context=context) for account in accounts: - if account.child_id and account.type != 'view': + if account.child_id and account.type not in ('view', 'consolidation'): return False return True From d02beb5f697b83c97681fb4c4fd08a3e96134db7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 9 Feb 2011 15:35:42 +0100 Subject: [PATCH 3/5] [IMP] web_livechat: use rpc.RPCProxy instead of rpc.session.execute (as direct session access will probably get restricted soon on the web client) bzr revid: xmo@openerp.com-20110209143542-m5vp1smqev2xap48 --- addons/web_livechat/__openerp__.py | 2 +- addons/web_livechat/web/editors.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py index d744a16dd65..8ad23602610 100644 --- a/addons/web_livechat/__openerp__.py +++ b/addons/web_livechat/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { 'name': 'Live Chat Support', - 'version': '1.0', + 'version': '1.1', 'category': 'Generic Modules/Others', 'description': "Enable live chat support for whom have a maintenance contract", 'author': 'OpenERP s.a.', diff --git a/addons/web_livechat/web/editors.py b/addons/web_livechat/web/editors.py index 1c50ca0ec48..bb3dd3da354 100644 --- a/addons/web_livechat/web/editors.py +++ b/addons/web_livechat/web/editors.py @@ -32,7 +32,7 @@ class BaseTemplateEditor(openobject.templating.TemplateEditor): output = output[:end_head] + """ <% - cp.session['livechat'] = rpc.session.execute('object', 'execute', 'publisher_warranty.contract', 'is_livechat_enable') + cp.session['livechat'] = rpc.RPCProxy('publisher_warranty.contract').is_livechat_enable() %> % if cp.session['livechat']: