From 59d55a993d11fa20cdb0175d5ae7a4008f921c2d Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 23 May 2011 14:40:29 +0530
Subject: [PATCH] [IMP] hr_payroll: used removeParaNode if there isn't any
 description on payslip

bzr revid: psi@tinyerp.co.in-20110523091029-a1doow4k02y67ax7
---
 addons/hr_payroll/report/report_payslip.py    |  2 +-
 addons/hr_payroll/report/report_payslip.rml   |  2 +-
 .../report/report_payslip_details.py          | 30 +++++++++----------
 .../report/report_payslip_details.rml         |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index f666e2f4606..0fc37b44ac7 100644
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -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):
diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml
index 2cc45847d0a..6e9cc84235d 100644
--- a/addons/hr_payroll/report/report_payslip.rml
+++ b/addons/hr_payroll/report/report_payslip.rml
@@ -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>
diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py
index 6bc737a385f..be40a2ec02a 100644
--- a/addons/hr_payroll/report/report_payslip_details.py
+++ b/addons/hr_payroll/report/report_payslip_details.py
@@ -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
 
diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml
index 132e793cb3a..43ad71a7c9e 100644
--- a/addons/hr_payroll/report/report_payslip_details.rml
+++ b/addons/hr_payroll/report/report_payslip_details.rml
@@ -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>