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

[IMP] hr_payroll: added NET rule in data file and removed 'sequence' field 

bzr revid: mtr@mtr-20110401051048-f20cz98tdqmlrewd
This commit is contained in:
mtr 2011-04-01 10:40:48 +05:30
parent 9ea2084e08
commit 794e3ee8b2
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/hr_payroll/hr_payroll.py
View File

@ -1401,7 +1401,7 @@ class hr_payslip_line(osv.osv):
'amount': fields.float('Amount / Percentage', digits_compute=dp.get_precision('Account'), help="For rule of type percentage, enter % ratio between 0-1."),
'total': fields.float('Sub Total', digits_compute=dp.get_precision('Account')),
'company_contrib': fields.float('Company Contribution', readonly=True, digits_compute=dp.get_precision('Account')),
'sequence': fields.integer('Sequence'),
'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
'note':fields.text('Description'),
}
_order = 'sequence'
@ -1438,7 +1438,6 @@ class hr_salary_rule(osv.osv):
'condition_select': fields.selection([('range', 'Range'), ('python', 'Python Expression')], "Condition based on"),
'computational_expression':fields.char('Computational Expression',size=1024, required=True, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all heads code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
'conditions':fields.char('Condition', size=1024, required=True, readonly=False, help='Applied this rule for calculation if condition is true.You can specify condition like basic > 1000.'),
'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."),
'python_compute':fields.text('Python Code'),
'display_child_rules': fields.boolean('Display Child Rules', help="Used for the display of Child Rules on payslip"),

18
addons/hr_payroll/hr_payroll_data.xml
View File

@ -124,6 +124,24 @@
<!-- <field name="sequence" eval="80"/>-->
</record>
<record id="NET" model="hr.salary.head">
<field name="code">TP</field>
<field name="type" ref="AL"/>
<field name="name">Total Payment</field>
<!-- <field name="sequence" eval="80"/>-->
</record>
<record id="hr_salary_rule_net" model="hr.salary.rule">
<field name="amount_type">code</field>
<field name="code">NET</field>
<field name="type" ref="AL"/>
<field name="category_id" ref="NET"/>
<field name="name">NET</field>
<field name="sequence" eval="500"/>
<field name="python_compute">total = basic+allowance+deduction</field>
</record>
<!-- <record id="OTHERD" model="hr.allounce.deduction.categoty">
<field name="code">OTHERD</field>
<field name="type">otherdeduct</field>

4
addons/hr_payroll/hr_payroll_demo.xml
View File

@ -6,7 +6,6 @@
<record id="hr_payslip_line_houserantallowance1" model="hr.salary.rule">
<field name="amount_type">per</field>
<field eval="5" name="sequence"/>
<field eval="0.4" name="amount"/>
<field name="code">HRA</field>
<field name="type" ref="AL"/>
@ -18,7 +17,6 @@
<record id="hr_payslip_line_convanceallowance1" model="hr.salary.rule">
<field name="amount_type">fix</field>
<field eval="10" name="sequence"/>
<field eval="800.0" name="amount"/>
<field name="code">CA</field>
<field name="type" ref="AL"/>
@ -37,7 +35,6 @@
<field name="category_id" ref="hr_payroll.PT"/>
<!-- <field name="function_id" ref="hr_payroll.structure_001"/>-->
<field name="name">Professional Tax</field>
<field name="sequence" eval="55"/>
</record>
<record id="hr_payslip_line_providentfund1" model="hr.salary.rule">
@ -49,7 +46,6 @@
<field name="category_id" ref="hr_payroll.PF"/>
<!-- <field name="function_id" ref="hr_payroll.structure_001"/>-->
<field name="name">Provident Fund</field>
<field name="sequence" eval="50"/>
</record>
<!-- Salary Structure -->