odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] remove line_ids (hr.payslip lines) from employee object 

bzr revid: mra@mra-laptop-20110314084555-jxm2en3l9yiy8tyb
This commit is contained in:
Mustufa Rangwala 2011-03-14 14:15:55 +05:30
parent a523e73c1e
commit e50705e393
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_payroll/hr_payroll.py
View File

@ -1304,7 +1304,7 @@ class hr_employee(osv.osv):
_description = 'Employee'
_columns = {
'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
# 'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
'basic': fields.function(_calculate_basic, method=True, multi='dc', type='float', string='Basic Salary', digits_compute=dp.get_precision('Account')),
}

19
addons/hr_payroll/hr_payroll_view.xml
View File

@ -31,11 +31,6 @@
</group>
</page>
</xpath>
<!--<xpath expr="/form/notebook/page[@string='Categories']" position="after">
<page string="Salary Rules">
<field name="emp_sal_rule_ids" nolabel="1" widget="one2many_list"/>
</page>
</xpath>-->
</data>
</field>
</record>
@ -571,7 +566,7 @@
groups="base.group_hr_manager"/>
<!-- Salary Rules -->
<record id="hr_salary_rule_tree" model="ir.ui.view">
<field name="name">hr.salary.rule.tree</field>
<field name="model">hr.salary.rule</field>
@ -645,14 +640,14 @@
</form>
</field>
</record>
<record id="action_salary_rule_form" model="ir.actions.act_window">
<field name="name">Salary Rules</field>
<field name="res_model">hr.salary.rule</field>
<field name="view_type">form</field>
<field name="view_id" ref="hr_salary_rule_tree"/>
</record>
<menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>
<!-- Salary Head Type -->
@ -667,7 +662,7 @@
</tree>
</field>
</record>
<record id="salary_head_type_form" model="ir.ui.view">
<field name="name">salary.head.type.form</field>
<field name="model">hr.salary.head.type</field>
@ -679,16 +674,16 @@
</form>
</field>
</record>
<record id="action_salary_head_type" model="ir.actions.act_window">
<field name="name">Salary Head Types</field>
<field name="res_model">hr.salary.head.type</field>
<field name="view_type">form</field>
<field name="view_id" ref="salary_head_type_tree"/>
</record>
<menuitem id="menu_action_salary_head_type" action="action_salary_head_type" parent="payroll_configure" sequence="10"/>
</data>
</openerp>