[MERGE] base_contact: fix usability issues
bzr revid: rco@openerp.com-20120124152005-37zvsfvespz31gbq
This commit is contained in:
commit
d6745985fe
|
@ -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',\
|
||||
|
|
|
@ -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"/>
|
||||
|
|
Loading…
Reference in New Issue