From 8dfb00969cd1a0d9fc9c9e0642f5cad59ce38064 Mon Sep 17 00:00:00 2001
From: "tfr@openerp.com" <>
Date: Mon, 16 Jan 2012 15:04:53 +0100
Subject: [PATCH] [FIX] Fix base contact, when create an address from a contact
 you can link to a partner + delete useless definition of partner_id in
 location + add domain when select a location

bzr revid: tfr@openerp.com-20120116140453-k3m6busjbk29aygr
---
 addons/base_contact/base_contact.py       | 1 -
 addons/base_contact/base_contact_view.xml | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 40653f01ff3..7df5c444ecb 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -120,7 +120,6 @@ class res_partner_location(osv.osv):
         'city': fields.char('City', size=128),
         'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
         'country_id': fields.many2one('res.country', 'Country'),
-        'partner_id': fields.many2one('res.partner', 'Partner Name', ondelete='set null', select=True, help="Keep empty for a private address, not related to partner."),
         'company_id': fields.many2one('res.company', 'Company',select=1),
         'job_ids': fields.one2many('res.partner.address', 'location_id', 'Contacts'),
         'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 10d8de984c2..16a9a966e25 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -50,7 +50,8 @@
                        </group>
                        <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Functions and Addresses">
-                                <field name="location_id"/>
+                                <field name="partner_id" />
+                                <field name="location_id" domain="[('partner_id', '=', partner_id)]"/>
                                 <field name="function" />
                                 <separator string="Professional Info" colspan="4"/>
                                 <field name="phone"/>
@@ -135,7 +136,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <separator string="Postal Address" position="after">
-                <field name="location_id" on_change="onchange_location_id(location_id)"/>
+                <field name="location_id" on_change="onchange_location_id(location_id)" domain="[('partner_id', '=', parent.id)]"/>
             </separator>
             <xpath expr="//field[@string='Contact Name']" position="replace">
                 <field name="contact_id"/>