[IMP] on employee/ contract view
bzr revid: osenda-20110412091057-755fpczz212ztopf
This commit is contained in:
parent
fe5f075f5f
commit
05dbf2d8c5
|
@ -60,10 +60,10 @@ class hr_employee_be(osv.osv):
|
|||
_inherit = 'hr.employee'
|
||||
_description = 'same as before'
|
||||
_columns = {
|
||||
'statut_fiscal':fields.selection([('without income','Without Income'),('with income','With Income')], 'Statut Fiscal'),
|
||||
'handicap':fields.boolean('Handicap'),
|
||||
'handicap_child':fields.boolean('Handicap Children'),
|
||||
'statut_fiscal':fields.selection([('without income','Without Income'),('with income','With Income')], 'Tax status for spouse'),
|
||||
'handicap':fields.boolean('Disabled'),
|
||||
'handicap_child':fields.boolean('Disabled Children'),
|
||||
'resident':fields.boolean('Residente'),
|
||||
'number_handicap':fields.integer('Number of Handicap'),
|
||||
'number_handicap':fields.integer('Number of disabled children'),
|
||||
}
|
||||
hr_employee_be()
|
||||
|
|
|
@ -12,14 +12,11 @@
|
|||
<xpath expr="/form/notebook/page/group/field[@name='working_hours']" position="after">
|
||||
<field name="horaire_effectif"/>
|
||||
</xpath>
|
||||
<xpath expr="/form/notebook/page/group/field[@name='advantages']" position="before">
|
||||
<xpath expr="/form/notebook/page/group/field[@name='advantages']" position="after">
|
||||
<field name="reim_travel"/>
|
||||
<field name="company_car_emp"/>
|
||||
<field name="company_car_wkr"/>
|
||||
<field name="mis_ex_onss"/>
|
||||
<field name="ch_value"/>
|
||||
<field name="ch_worker"/>
|
||||
<field name="insurance"/>
|
||||
<field name="advantage"/>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Miscellaneous" colspan="2"/>
|
||||
|
@ -28,6 +25,15 @@
|
|||
<field name="vol_tax"/>
|
||||
</group>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="/form/notebook/page/group/field[@name='trial_date_end']" position="after">
|
||||
<group colspan="2" col="2">
|
||||
<separator string="by Worker" colspan="2"/>
|
||||
<field name="insurance"/>
|
||||
<field name="ch_worker"/>
|
||||
<field name="company_car_wkr"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -53,12 +59,12 @@
|
|||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="/form/notebook/page/group/field[@name='marital']" position="after">
|
||||
<field name="statut_fiscal" attrs="{'invisible':[('marital','!=','married')]}" colspan="1" help="Only if Married"/>
|
||||
<field name="handicap" attrs="{'invisible':[('marital','!=','married')]}" colspan="1" help="Only if Married"/>
|
||||
<field name="statut_fiscal" attrs="{'invisible':[('marital','!=','married')]}" colspan="1" help="if spouse has professionnel income or not"/>
|
||||
<field name="handicap" attrs="{'invisible':[('marital','!=','married')]}" colspan="1" help="if spouse is declared as disabled"/>
|
||||
</xpath>
|
||||
<xpath expr="/form/notebook/page/group/field[@name='children']" position="after">
|
||||
<field name="handicap_child"/>
|
||||
<field name="number_handicap" attrs="{'invisible':[('handicap_child','!=',True)]}" colspan="1"/>
|
||||
<field name="number_handicap" attrs="{'invisible':[('handicap_child','!=',True)]}" colspan="1" help="number of dependent children declared as disabled"/>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
|
|
Loading…
Reference in New Issue