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

[IMP] hr_payroll: Improve contribution register report, remove unwanted get_register function 

bzr revid: psi@tinyerp.co.in-20110523053311-9lj0z6lv00krbljd
This commit is contained in:
psi (Open ERP) 2011-05-23 11:03:11 +05:30
parent f3387aa616
commit e6ecd8a216
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/hr_payroll/report/report_contribution_register.py
View File

@ -33,7 +33,6 @@ class contribution_register_report(report_sxw.rml_parse):
super(contribution_register_report, self).__init__(cr, uid, name, context)
self.localcontext.update({
'get_payslip_lines': self._get_payslip_lines,
'get_registers': self._get_registers,
})
def set_context(self, objects, data, ids, report_type=None):
@ -41,15 +40,7 @@ class contribution_register_report(report_sxw.rml_parse):
self.date_to = data['form'].get('date_to', str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10])
return super(contribution_register_report, self).set_context(objects, data, ids, report_type=report_type)
def _get_registers(self,form):
result = []
periods = []
register_obj = self.pool.get('hr.contribution.register')
register_ids = form['contribution_register']
result = register_obj.browse(self.cr,self.uid, register_ids)
return result
def _get_payslip_lines(self, obj, form):
def _get_payslip_lines(self, obj):
payslip_obj = self.pool.get('hr.payslip')
payslip_line = self.pool.get('hr.payslip.line')
res = []

2
addons/hr_payroll/report/report_contribution_register.rml
View File

@ -116,7 +116,7 @@
</tr>
</blockTable>
<section>
<para style="P3">[[repeatIn(get_payslip_lines(o, data['form']),'r') ]]</para>
<para style="P3">[[repeatIn(get_payslip_lines(o),'r') ]]</para>
<blockTable colWidths="116.0,46.0,289.0,88.0" style="Table16">
<tr>
<td>