[IMP] hr_payroll: used removeParaNode if there isn't any description on payslip
bzr revid: psi@tinyerp.co.in-20110523091029-a1doow4k02y67ax7
This commit is contained in:
parent
cbcf51e5a5
commit
59d55a993d
|
@ -30,7 +30,7 @@ class payslip_report(report_sxw.rml_parse):
|
|||
def __init__(self, cr, uid, name, context):
|
||||
super(payslip_report, self).__init__(cr, uid, name, context)
|
||||
self.localcontext.update({
|
||||
'get_payslip_lines': self.get_payslip_lines,
|
||||
'get_payslip_lines': self.get_payslip_lines,
|
||||
})
|
||||
|
||||
def get_payslip_lines(self, obj):
|
||||
|
|
|
@ -186,7 +186,7 @@
|
|||
<font face="Helvetica" size="14.0"/>
|
||||
<font face="Helvetica-Bold" size="14.0">Note</font>
|
||||
</para>
|
||||
<para style="P8">([[o.name]])</para>
|
||||
<para style="P8">([[o.name or removeParentNode('para')]])</para>
|
||||
<blockTable colWidths="63.0,206.0,89.0,181.0" style="Table2">
|
||||
<tr>
|
||||
<td>
|
||||
|
|
|
@ -30,8 +30,8 @@ class payslip_details_report(report_sxw.rml_parse):
|
|||
def __init__(self, cr, uid, name, context):
|
||||
super(payslip_details_report, self).__init__(cr, uid, name, context)
|
||||
self.localcontext.update({
|
||||
'get_details_by_rule_category': self.get_details_by_rule_category,
|
||||
'get_lines_by_contribution_register': self.get_lines_by_contribution_register,
|
||||
'get_details_by_rule_category': self.get_details_by_rule_category,
|
||||
'get_lines_by_contribution_register': self.get_lines_by_contribution_register,
|
||||
})
|
||||
|
||||
def get_details_by_rule_category(self, obj):
|
||||
|
@ -70,20 +70,20 @@ class payslip_details_report(report_sxw.rml_parse):
|
|||
level = 0
|
||||
for parent in parents:
|
||||
res.append({
|
||||
'rule_category': parent.name,
|
||||
'name': parent.name,
|
||||
'code': parent.code,
|
||||
'level': level,
|
||||
'total': category_total,
|
||||
'rule_category': parent.name,
|
||||
'name': parent.name,
|
||||
'code': parent.code,
|
||||
'level': level,
|
||||
'total': category_total,
|
||||
})
|
||||
level += 1
|
||||
for line in payslip_line.browse(self.cr, self.uid, value):
|
||||
res.append({
|
||||
'rule_category': line.name,
|
||||
'name': line.name,
|
||||
'code': line.code,
|
||||
'total': line.total,
|
||||
'level': level
|
||||
'rule_category': line.name,
|
||||
'name': line.name,
|
||||
'code': line.code,
|
||||
'total': line.total,
|
||||
'level': level
|
||||
})
|
||||
return res
|
||||
|
||||
|
@ -102,9 +102,9 @@ class payslip_details_report(report_sxw.rml_parse):
|
|||
})
|
||||
for line in payslip_line.browse(self.cr, self.uid, value):
|
||||
res.append({
|
||||
'name': line.name,
|
||||
'code': line.code,
|
||||
'total': line.total,
|
||||
'name': line.name,
|
||||
'code': line.code,
|
||||
'total': line.total,
|
||||
})
|
||||
return res
|
||||
|
||||
|
|
|
@ -220,7 +220,7 @@
|
|||
<font face="Helvetica" size="14.0"/>
|
||||
<font face="Helvetica-Bold" size="14.0">Note</font>
|
||||
</para>
|
||||
<para style="P10">([[o.name]])</para>
|
||||
<para style="P10">([[o.name or removeParentNode('para') ]])</para>
|
||||
<blockTable colWidths="63.0,206.0,89.0,181.0" style="Table2">
|
||||
<tr>
|
||||
<td>
|
||||
|
|
Loading…
Reference in New Issue