From 1ed2aba648770a887ca4d8ad174c41b57fe4e198 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 27 Aug 2011 23:37:51 +0200 Subject: [PATCH] [FIX] typo bzr revid: al@openerp.com-20110827213751-yq8mgdmiuhqizsbs --- openerp/addons/base/ir/ir_actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index f3798f69f7a..0df992ad66f 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -588,7 +588,7 @@ class actions_server(osv.osv): if context is None: context = {} - odef merge(match): + def merge(match): obj_pool = self.pool.get(action.model_id.model) id = context.get('active_id') obj = obj_pool.browse(cr, uid, id)