From c2623939500e31fd1df883a9a90ecc702e7043e0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Apr 2011 10:32:01 +0200
Subject: [PATCH] [IMP] tools.convert,rng: fixed support for <url> tag

bzr revid: odo@openerp.com-20110411083201-2ir0ed4o3xdal6tk
---
 openerp/import_xml.rng   | 11 +++++++++++
 openerp/tools/convert.py |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng
index 75c4e8b05e7..d301ae47ed3 100644
--- a/openerp/import_xml.rng
+++ b/openerp/import_xml.rng
@@ -188,6 +188,16 @@
         </rng:element>
     </rng:define>
 
+    <rng:define name="url">
+        <rng:element name="url">
+            <rng:attribute name="id" />
+            <rng:attribute name="name" />
+            <rng:attribute name="url" />
+            <rng:optional><rng:attribute name="target" /></rng:optional>
+            <rng:empty />
+        </rng:element>
+    </rng:define>
+
     <rng:define name="act_window">
         <rng:element name="act_window">
             <rng:attribute name="id" />
@@ -222,6 +232,7 @@
                     <rng:ref name="delete" />
                     <rng:ref name="wizard" />
                     <rng:ref name="act_window" />
+                    <rng:ref name="url" />
                     <rng:ref name="assert" />
                     <rng:ref name="report" />
                     <rng:ref name="workflow" />
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 5536f311eb8..0841f0b94ac 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -403,7 +403,7 @@ form: module.record_id""" % (xml_id,)
             self._remove_ir_values(cr, string, value, model)
 
     def _tag_url(self, cr, rec, data_node=None):
-        url = rec.get("string",'').encode('utf8')
+        url = rec.get("url",'').encode('utf8')
         target = rec.get("target",'').encode('utf8')
         name = rec.get("name",'').encode('utf8')
         xml_id = rec.get('id','').encode('utf8')
@@ -655,6 +655,12 @@ form: module.record_id""" % (xml_id,)
                 resw = cr.fetchone()
                 if (not values.get('name', False)) and resw:
                     values['name'] = resw[0]
+            elif a_type=='url':
+                a_id = self.id_get(cr, a_action)
+                cr.execute('select name from ir_act_url where id=%s', (int(a_id),))
+                resw = cr.fetchone()
+                if (not values.get('name')) and resw:
+                    values['name'] = resw[0]
         if rec.get('sequence'):
             values['sequence'] = int(rec.get('sequence'))
         if rec.get('icon'):