[FIX] typo

bzr revid: al@openerp.com-20110827213751-yq8mgdmiuhqizsbs
2011-08-27 23:37:51 +02:00
parent be328ad7c3
commit 1ed2aba648
1 changed files with 1 additions and 1 deletions
@@ -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)