base contact - Improvement (main job)
bzr revid: fabian@tinyerp.com-20090506092415-b8wpoe9q4rwghogu
This commit is contained in:
parent
4abb38e4ce
commit
b0243644e5
|
@ -46,7 +46,8 @@ class res_partner_contact(osv.osv):
|
|||
'birthdate':fields.date('Birth Date'),
|
||||
'active' : fields.boolean('Active'),
|
||||
'partner_id':fields.related('job_ids','address_id','partner_id',type='many2one', relation='res.partner', string='Main Employer'),
|
||||
'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Job'),
|
||||
'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Function'),
|
||||
'job_id':fields.related('job_ids',type='many2one', relation='res.partner.job', string='Main Job'),
|
||||
'email': fields.char('E-Mail', size=240),
|
||||
}
|
||||
_defaults = {
|
||||
|
@ -87,6 +88,7 @@ class res_partner_address(osv.osv):
|
|||
_inherit='res.partner.address'
|
||||
_description ='Partner Address'
|
||||
_columns = {
|
||||
'job_id':fields.related('job_ids','contact_id','job_id',type='many2one', relation='res.partner.job', string='Main Job'),
|
||||
'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
|
||||
}
|
||||
res_partner_address()
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
<field name="active"/>
|
||||
<field name="partner_id" invisible="1" select="2"/>
|
||||
<field name="function_id" invisible="1" select="2"/>
|
||||
<field name="job_id" invisible="1" select="2" />
|
||||
<field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
|
||||
<form string="Functions and Addresses">
|
||||
<field name="function_id"/>
|
||||
|
@ -153,42 +154,42 @@
|
|||
</record>
|
||||
|
||||
<!-- don't display the categories, since it is displayed in an other tab-->
|
||||
<record model="ir.ui.view" id="view_partner_form_inherit2">
|
||||
<field name="name">res.partner.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="category_id" position="replace">
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_partner_form_inherit2">
|
||||
<field name="name">res.partner.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="category_id" position="replace">
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- don't display the categories label-->
|
||||
<record model="ir.ui.view" id="view_partner_form_inherit2bis">
|
||||
<field name="name">res.partner.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<separator colspan="4" string="Categories" position="replace"/>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_partner_form_inherit2bis">
|
||||
<field name="name">res.partner.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<separator colspan="4" string="Categories" position="replace"/>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_partner_form_inherit3">
|
||||
<field name="name">res.partner.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<notebook position="inside">
|
||||
<page string="Categories">
|
||||
<separator colspan="4" string="Categories"/>
|
||||
<field colspan="4" name="category_id" nolabel="1" select="2"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_partner_form_inherit3">
|
||||
<field name="name">res.partner.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<notebook position="inside">
|
||||
<page string="Categories">
|
||||
<separator colspan="4" string="Categories"/>
|
||||
<field colspan="4" name="category_id" nolabel="1" select="2"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<!-- Views for Addresses -->
|
||||
|
@ -268,6 +269,7 @@
|
|||
<field name="partner_id" position="replace">
|
||||
<field name='partner_id' select='1'/>
|
||||
<field name='type' select='2'/>
|
||||
<field name='job_id' invisible="1" select="2"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue