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

[IMP] hr_payroll: remove commented codes from hr_payroll_report.xml and hr_payroll.py files 

bzr revid: psi@tinyerp.co.in-20110524131257-u5qc6qwhneeta3ds
This commit is contained in:
psi (Open ERP) 2011-05-24 18:42:57 +05:30
parent 19489bb6a4
commit fc4e99ccba
2 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/hr_payroll/hr_payroll.py
View File

@ -767,17 +767,6 @@ class hr_salary_rule(osv.osv):
'amount_percentage_base':fields.char('Percentage based on',size=1024, required=False, readonly=False, help='result will be affected to a variable'),
'child_ids':fields.one2many('hr.salary.rule', 'parent_rule_id', 'Child Salary Rule'),
'register_id':fields.many2one('hr.contribution.register', 'Contribution Register', help="Contribution register based on company", required=False),
# 'register_id':fields.property(
# 'hr.contribution.register',
# type='many2one',
# relation='hr.contribution.register',
# string="Contribution Register",
# method=True,
# view_load=True,
# help="Contribution register based on company",
# required=False
# ),
'input_ids': fields.one2many('hr.rule.input', 'input_id', 'Inputs'),
'note':fields.text('Description'),
}

44
addons/hr_payroll/hr_payroll_report.xml
View File

@ -18,14 +18,6 @@
rml="hr_payroll/report/report_payslip_details.rml"
string="PaySlip Details" />
<report
auto="False"
id="payroll_advice"
model="hr.payroll.advice"
name="payroll.advice"
rml="hr_payroll/report/report_payroll_advice.rml"
string="Bank Payment Advice" />
<report
auto="False"
menu="False"
@ -35,41 +27,5 @@
rml="hr_payroll/report/report_contribution_register.rml"
string="PaySlip Lines By Conribution Register" />
<report
auto="False"
id="year_salary_report"
model="hr.payslip"
name="year.salary"
rml="hr_payroll/report/report_year_report.rml"
menu = "False"
string="Year Salary Report" />
<report
auto="False"
id="year_payroll_register"
model="hr.payroll.register"
name="hr.payroll.register.sheet"
rml="hr_payroll/report/payroll_register.rml"
menu = "True"
string="Print Statement" />
<report
auto="False"
id="year_employees_detail"
model="hr.payslip"
name="employees.salary"
rml="hr_payroll/report/report_employees_detail.rml"
menu = "False"
string="Employees Salary Detail" />
<report
auto="False"
id="salary_structure_register"
model="hr.employee"
name="salary.structure"
rml="hr_payroll/report/report_emp_salary_structure.rml"
menu = "True"
string="Salary Structure" groups="base.group_hr_manager"/>
</data>
</openerp>