[IMP] hr_payroll: Add new tab Holiday on hr.payslip object and comment unwanted calculation for gross and net, remove wage_type_id
bzr revid: psi@tinyerp.co.in-20110225134314-zopq8bwlwmh61glr
This commit is contained in:
psi (Open ERP)
@@ -71,11 +71,11 @@ class hr_contract_wage_type(osv.osv):
|
||||
_columns = {
|
||||
'name': fields.char('Wage Type Name', size=50, required=True, select=True),
|
||||
'period_id': fields.many2one('hr.contract.wage.type.period', 'Wage Period', required=True),
|
||||
'type': fields.selection([('gross','Gross'), ('net','Net')], 'Type', required=True),
|
||||
'factor_type': fields.float('Factor for hour cost', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee')
|
||||
# 'type': fields.selection([('gross','Gross'), ('net','Net')], 'Type', required=True),
|
||||
'factor_type': fields.float('Factor for hour cost', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work based on the contract of the employee')
|
||||
}
|
||||
_defaults = {
|
||||
'type': 'gross',
|
||||
# 'type': 'gross',
|
||||
'factor_type': 1.8
|
||||
}
|
||||
hr_contract_wage_type()
|
||||
@@ -103,7 +103,7 @@ class hr_contract(osv.osv):
|
||||
'trial_date_start': fields.date('Trial Start Date'),
|
||||
'trial_date_end': fields.date('Trial End Date'),
|
||||
'working_hours': fields.many2one('resource.calendar','Working Schedule'),
|
||||
'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
|
||||
# 'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
|
||||
'wage': fields.float('Wage', digits=(16,2), required=True),
|
||||
'advantages': fields.text('Advantages'),
|
||||
'advantages_net': fields.float('Net Advantages Value', digits=(16,2)),
|
||||
|
||||
@@ -132,9 +132,9 @@
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Contract">
|
||||
<group col='15' colspan='4'>
|
||||
<filter string="Current" icon="terp-check" name="current" domain="['|',('date_end','>=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
|
||||
<filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','<', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Current" icon="terp-check" name="current" domain="['|',('date_end','>=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
|
||||
<filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','<', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="working_hours"/>
|
||||
@@ -143,11 +143,11 @@
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By..." colspan="4" col="20">
|
||||
<filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
|
||||
<filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
|
||||
</group>
|
||||
</search>
|
||||
@@ -165,7 +165,7 @@
|
||||
<field name="employee_id" />
|
||||
<field name="job_id"/>
|
||||
<field name="wage"/>
|
||||
<field name="wage_type_id" widget="selection"/>
|
||||
<!-- field name="wage_type_id" widget="selection"/-->
|
||||
<field name="type_id" widget="selection"/>
|
||||
</group>
|
||||
<notebook>
|
||||
@@ -175,10 +175,10 @@
|
||||
<field name="date_start" />
|
||||
<field name="date_end" />
|
||||
<field name="working_hours"/>
|
||||
<separator colspan="2" string="Trial Period"/>
|
||||
<separator colspan="2" string="Trial Period"/>
|
||||
<field name="trial_date_start" />
|
||||
<field name="trial_date_end" />
|
||||
</group>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<separator colspan="2" string="Advantages"/>
|
||||
<field name="advantages_net"/>
|
||||
@@ -204,10 +204,10 @@
|
||||
<field name="type_id"/>
|
||||
<field name="job_id"/>
|
||||
<!--field name="department_id"/-->
|
||||
<field name="working_hours"/>
|
||||
<field name="working_hours"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
<field name="wage_type_id" invisible="1"/>
|
||||
<!-- field name="wage_type_id" invisible="1"/-->
|
||||
<field name="wage" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
@@ -270,11 +270,11 @@
|
||||
<menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/>
|
||||
|
||||
<!-- Contracts Button on Employee Form -->
|
||||
<act_window
|
||||
<act_window
|
||||
context="{'search_default_employee_id': [active_id]}"
|
||||
id="act_hr_employee_2_hr_contract"
|
||||
name="Contracts"
|
||||
res_model="hr.contract"
|
||||
id="act_hr_employee_2_hr_contract"
|
||||
name="Contracts"
|
||||
res_model="hr.contract"
|
||||
src_model="hr.employee"
|
||||
groups="base.group_hr_manager"/>
|
||||
|
||||
|
||||
+572
-251
File diff suppressed because it is too large
Load Diff
@@ -137,7 +137,7 @@
|
||||
<field name="employee_id" select="1"/>
|
||||
<field name="job_id"/>
|
||||
<field name="wage"/>
|
||||
<field name="wage_type_id" widget="selection"/>
|
||||
<!--field name="wage_type_id" widget="selection"/-->
|
||||
<field name="type_id" widget="selection"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
@@ -368,8 +368,8 @@
|
||||
<field name="register_id" invisible="1"/>
|
||||
<field name="name"/>
|
||||
<field name="date"/>
|
||||
<field name="grows"/>
|
||||
<field name="net"/>
|
||||
<!--field name="grows"/-->
|
||||
<!--field name="net"/-->
|
||||
<field name="state"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
</tree>
|
||||
@@ -383,7 +383,7 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="Payslip">
|
||||
<group col="6" colspan="4">
|
||||
<field name="employee_id"/>
|
||||
<field name="employee_id" on_change="onchange_employee_id(date, employee_id)"/>
|
||||
<field name="name"/>
|
||||
<field name="number" select="1"/>
|
||||
<field name="date"/>
|
||||
@@ -446,14 +446,17 @@
|
||||
<field name="basic_before_leaves"/>
|
||||
<field name="leaves"/>
|
||||
<field name="basic"/>
|
||||
<field name="allounce"/>
|
||||
<field name="deduction"/>
|
||||
<field name="other_pay"/>
|
||||
<field name="grows"/>
|
||||
<field name="net"/>
|
||||
<!--field name="allounce"/-->
|
||||
<!--field name="deduction"/-->
|
||||
<!--field name="other_pay"/-->
|
||||
<!--field name="grows"/-->
|
||||
<!--field name="net"/-->
|
||||
<field name="total_pay"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Holidays">
|
||||
<field name="holiday_ids" colspan="4" nolabel="1" editable="bottom"/>
|
||||
</page>
|
||||
<page string="Other Informations">
|
||||
<group col="2" colspan="1">
|
||||
<separator colspan="2" string="Other Informations"/>
|
||||
@@ -839,9 +842,9 @@
|
||||
<field name="date"/>
|
||||
<field name="basic"/>
|
||||
<field name="allounce"/>
|
||||
<field name="grows"/>
|
||||
<!--field name="grows"/-->
|
||||
<field name="deduction"/>
|
||||
<field name="net"/>
|
||||
<!--field name="net"/-->
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
</field>
|
||||
@@ -850,11 +853,11 @@
|
||||
<field name="allounce"/>
|
||||
<field name="deduction"/>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<!-- group col="2" colspan="2">
|
||||
<separator colspan="4" string="Salary Information"/>
|
||||
<field name="grows"/>
|
||||
<field name="net"/>
|
||||
</group>
|
||||
</group-->
|
||||
</page>
|
||||
</notebook>
|
||||
<group col="8" colspan="4">
|
||||
|
||||
Reference in New Issue
Block a user