From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Oct 2012 15:44:36 +0000 (+0200)
Subject: [MERGE] from trunk
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=1e4a677f0580f100a7fe83364ed9cc1acb02e842;p=odoo%2Fodoo.git

[MERGE] from trunk

bzr revid: xmo@openerp.com-20121010154436-wz29sdkbs9vvhjba
---

1e4a677f0580f100a7fe83364ed9cc1acb02e842
diff --cc openerp/addons/base/ir/ir_actions.py
index b14f4cd,d3b0045..8ec1bea
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@@ -328,9 -329,8 +328,9 @@@ class act_wizard(osv.osv)
  act_wizard()
  
  class act_url(osv.osv):
-     _name = 'ir.actions.url'
+     _name = 'ir.actions.act_url'
      _table = 'ir_act_url'
 +    _inherit = 'ir.actions.actions'
      _sequence = 'ir_actions_id_seq'
      _order = 'name'
      _columns = {