From 5d1e3ffb3fa184963bd7ca1c7983d1c47bd345f3 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Tue, 4 May 2010 14:21:28 +0530
Subject: [PATCH] [IMP]:improved code to allow ref=res_partner_asus with
 ref=base.res_partner_asus

bzr revid: rvo@tinyerp.co.in-20100504085128-4hgjn365kjhryat5
---
 bin/addons/base/res/partner/partner_demo.xml | 2 +-
 bin/tools/convert.py                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/res/partner/partner_demo.xml b/bin/addons/base/res/partner/partner_demo.xml
index 86b665c396b..f5d70a2490d 100644
--- a/bin/addons/base/res/partner/partner_demo.xml
+++ b/bin/addons/base/res/partner/partner_demo.xml
@@ -357,7 +357,7 @@
         <record id="res_partner_asustek_request" model="res.request">
         	<field name="name">ASUSTEK-Subject</field>
         	<field name="act_to" ref="user_demo"/>
-			<field name="ref_doc1" ref="base.res_partner_asus"/>
+			<field name="ref_doc1" ref="res_partner_asus"/>
         </record>
     </data>
 </openerp>
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 5ad184d6b19..df56bd7154a 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -741,11 +741,11 @@ form: module.record_id""" % (xml_id,)
         return rec_model, id
 
     def id_get(self, cr, model, id_str):
+        if id_str in self.idref:
+            return self.idref[id_str]
         return self.model_id_get(cr, model, id_str)[1]
 
     def model_id_get(self, cr, model, id_str):
-        if id_str in self.idref:
-            return '', self.idref[id_str]
         model_data_obj = self.pool.get('ir.model.data')
         mod = self.module
         if '.' in id_str: