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

[IMP]field added for calulating salary rule for DA,view for the same 

bzr revid: kbh@tinyerp.com-20120629054118-4mqwotwzexl4daky
This commit is contained in:
Khushboo Bhatt (Open ERP) 2012-06-29 11:11:18 +05:30
parent bef07b18af
commit deb3b1161e
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
View File

@ -245,4 +245,13 @@ class hr_payslip(osv.osv):
hr_payslip()
class res_company(osv.osv):
_inherit = 'res.company'
_columns = {
'dearness_allowance': fields.boolean('Dearness Allowance')
}
res_company()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

17
addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
View File

@ -157,6 +157,23 @@
parent="hr_payroll.menu_hr_root_payroll"
/>
<record id="company_inherit" model="ir.ui.view">
<field name="name">res.company.inherit</field>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="priority">20</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<data>
<page string="Configuration" position="inside">
<group name="rule" string="Salary rules Configuration">
<field name="dearness_allowance"/>
</group>
</page>
</data>
</field>
</record>
<!-- Shortcuts -->
<act_window name="Payslips"