From 8a69cc5504369c565e8c11545b9164bcf4b905cc Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 16 Sep 2011 15:24:46 +0530
Subject: [PATCH 1/5] [FIX] After installing base_contact Contact in search
 view of partner not work

lp bug: https://launchpad.net/bugs/849420 fixed

bzr revid: dbr@tinyerp.com-20110916095446-6cwydtneyhng01by
---
 addons/base_contact/base_contact.py       | 18 +++++++++++++++++-
 addons/base_contact/base_contact_view.xml | 16 +++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index cf0bc610be8..8be20109591 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -131,7 +131,7 @@ class res_partner_address(osv.osv):
         if not len(ids):
             return []
         res = []
-        if context is None: 
+        if context is None:
             context = {}
         for r in self.read(cr, user, ids, ['zip', 'city', 'partner_id', 'street']):
             if context.get('contact_display', 'contact')=='partner' and r['partner_id']:
@@ -143,6 +143,22 @@ class res_partner_address(osv.osv):
                 res.append((r['id'], addr.strip() or '/'))
         return res
 
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
+        if not args:
+            args=[]
+        if not context:
+            context={}
+        if name:
+            ids = []
+            job_ids = self.pool.get('res.partner.job').search(cr, user, [('contact_id', operator, name)] + args, limit=limit, context=context)
+            partner_ids = self.pool.get('res.partner.job').browse(cr, user, job_ids)
+            partner_data = [(partner.name.name) for partner in partner_ids]
+            for partner in partner_data:
+                ids += self.search(cr, user, [('partner_id',operator,partner)] + args, limit=limit, context=context)
+        else:
+            ids = self.search(cr, user, args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context)
+
     _name = 'res.partner.address'
     _inherit = 'res.partner.address'
     _description ='Partner Address'
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 8029084b7c3..a65f107fb25 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -252,7 +252,20 @@
                 </notebook>
             </field>
         </record>
-
+       
+       <!-- Rename address to contact and add job_ids into search form-->
+ 
+        <record model="ir.ui.view" id="view_res_partner_filter_base_contact">
+            <field name="name">res.partner.select</field>
+            <field name="type">search</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_res_partner_filter"/>
+            <field name="arch" type="xml">
+                <field name="address" position="replace">
+                	<field name="address" string="Contact" select="1" />
+                </field>
+            </field>
+        </record>
 
     <!-- Views for Addresses -->
 
@@ -422,3 +435,4 @@
 
 </data>
 </openerp>
+

From 0c13fea7cd069ea761824f9fba79e873c1dec895 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 16 Sep 2011 18:02:07 +0530
Subject: [PATCH 2/5] [RMV]base_contact: Remove the extra added inherited view

bzr revid: dbr@tinyerp.com-20110916123207-voyla0qs0bx1j3te
---
 addons/base_contact/base_contact_view.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index a65f107fb25..0ac009169b3 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -252,20 +252,6 @@
                 </notebook>
             </field>
         </record>
-       
-       <!-- Rename address to contact and add job_ids into search form-->
- 
-        <record model="ir.ui.view" id="view_res_partner_filter_base_contact">
-            <field name="name">res.partner.select</field>
-            <field name="type">search</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_res_partner_filter"/>
-            <field name="arch" type="xml">
-                <field name="address" position="replace">
-                	<field name="address" string="Contact" select="1" />
-                </field>
-            </field>
-        </record>
 
     <!-- Views for Addresses -->
 

From 007af7601f455ab5b21a6e977efbfe25920c8756 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 16 Sep 2011 18:10:46 +0530
Subject: [PATCH 3/5] [IMP]base_contact:Improve the code

bzr revid: dbr@tinyerp.com-20110916124046-2p713bhbsi8g9zev
---
 addons/base_contact/base_contact.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 8be20109591..2f228bdf345 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -144,14 +144,13 @@ class res_partner_address(osv.osv):
         return res
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
+        ids = []
         if not args:
             args=[]
-        if not context:
-            context={}
+        jobs = self.pool.get('res.partner.job')
         if name:
-            ids = []
-            job_ids = self.pool.get('res.partner.job').search(cr, user, [('contact_id', operator, name)] + args, limit=limit, context=context)
-            partner_ids = self.pool.get('res.partner.job').browse(cr, user, job_ids)
+            job_ids = jobs.search(cr, user, [('contact_id', operator, name)] + args, limit=limit, context=context)
+            partner_ids = jobs.browse(cr, user, job_ids)
             partner_data = [(partner.name.name) for partner in partner_ids]
             for partner in partner_data:
                 ids += self.search(cr, user, [('partner_id',operator,partner)] + args, limit=limit, context=context)

From 2b997a1fce1f48105f67a6570953a40245edc50c Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 20 Sep 2011 11:39:49 +0530
Subject: [PATCH 4/5] [FIX] : Remove the conflict

bzr revid: dbr@tinyerp.com-20110920060949-j8wtqlq7huc9jvd1
---
 addons/auction/auction_demo.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 7f34eb6697c..e93cc3ea04d 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -39,7 +39,7 @@
         <field name="name">Auction Adjudications</field>
         <field name="code">A7x*</field>
         <field name="user_type" ref="account.account_type_income"/> 
-        <field name="type">receivable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_income_view"/>
     </record>
@@ -48,7 +48,7 @@
         <field name="name">Auction Adjudication Expenses</field>
         <field name="code">A6x*</field>
         <field name="user_type" ref="account.account_type_expense"/>
-        <field name="type">payable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_expense_view"/>
     </record>
@@ -56,7 +56,7 @@
     <record model="account.account" id="auction_income_costs">
         <field name="name">Auction Buyer Costs</field>
         <field name="code">A8x*</field>
-        <field name="type">payable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_income_view"/>
         <field name="user_type" ref="account.account_type_tax"/>
@@ -64,7 +64,7 @@
     <record model="account.account" id="auction_expense_costs">
         <field name="name">Auction Seller Costs</field>
         <field name="code">A9x*</field>
-        <field name="type">receivable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_expense_view"/>
         <field name="user_type" ref="account.account_type_tax"/>
@@ -251,7 +251,7 @@
     </record>
 
     <record id="auction_tax20" model="account.tax">
-       <field name="name">Frais de vente</field>
+       <field name="name">Frais de vente0</field>
        <field name="amount">0</field>
        <field name="domain">auction</field>
        <field name="base_code_id" ref="account_tax_code_id2"/>

From a9eaeb39598726af1e09956f462ee09bad501e75 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 20 Sep 2011 14:24:19 +0530
Subject: [PATCH 5/5] [IMP]base_contact : Improve the code

bzr revid: dbr@tinyerp.com-20110920085419-8vft3k6yu72eb54n
---
 addons/base_contact/base_contact.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 2f228bdf345..25cd38d60fb 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -144,18 +144,14 @@ class res_partner_address(osv.osv):
         return res
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
-        ids = []
         if not args:
             args=[]
+        ids = self.search(cr, user, [('name',operator,name)] + args, limit=limit, context=context)
         jobs = self.pool.get('res.partner.job')
         if name:
             job_ids = jobs.search(cr, user, [('contact_id', operator, name)] + args, limit=limit, context=context)
-            partner_ids = jobs.browse(cr, user, job_ids)
-            partner_data = [(partner.name.name) for partner in partner_ids]
-            for partner in partner_data:
+            for partner in [(partner.name.name) for partner in (jobs.browse(cr, user, job_ids))]:
                 ids += self.search(cr, user, [('partner_id',operator,partner)] + args, limit=limit, context=context)
-        else:
-            ids = self.search(cr, user, args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context)
 
     _name = 'res.partner.address'