From 320abf6be9cc16921e344d2e244f559557772c89 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 9 May 2014 19:08:36 +0530
Subject: [PATCH] [FIX]: Remove rml tag removeParentNode. improve condition.

---
 .../views/report_l10nfrfichepaye.xml          | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
index 8aa0d4e125d..6ee98168614 100644
--- a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
+++ b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
@@ -24,8 +24,8 @@
                                 </tr>
                                 <tr>
                                     <td>
-                                        <span t-esc="o.employee_id.name or '_'"/>
-                                        <span t-esc="display_address(o.employee_id.address_home_id) or '_' "/>
+                                        <div t-field="o.employee_id.address_home_id"
+                                          t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'/>
                                     </td>
                                 </tr>
                             </table>
@@ -79,19 +79,20 @@
                                     <span t-esc="p.name or ''"/>
                                 </td>
                                 <td>
-                                    <span t-esc="((p.amount_select== 'percentage') or removeParentNode('span')) and ''"/>
-                                    <span t-esc="p.amount or ''"/>
-                                    <span t-esc="((p.amount_select== 'fix') or removeParentNode('span')) and ''"/>
-                                    <span t-esc="p.quantity or ''"/>
-                                    <span t-esc="((p.amount_select&lt;&gt; 'fix' and p.amount_select&lt;&gt; 'percentage') or removeParentNode('span')) and ''"/>
+                                    <t t-if="p.amount_select== 'percentage'">
+                                        <span t-esc="p.amount or ''"/>
+                                    </t> 
+                                    <t t-if="p.amount_select== 'fix'">
+                                        <span t-esc="p.quantity or ''"/>
+                                    </t>
                                 </td>
                                 <td>
-                                    <span t-esc="((p.amount_select == 'percentage') or removeParentNode('span')) and ''"/>
-                                    <span t-esc="p.rate or ''"/>
-                                    <span t-esc="((p.amount_select &lt;&gt; 'percentage') or removeParentNode('span')) and ''"/>
+                                    <t t-if="p.amount_select == 'percentage'">
+                                        <span t-esc="p.rate or ''"/>
+                                    </t>
                                 </td>
                                 <td>
-                                    <span t-esc="p.total or '"/>
+                                    <span t-esc="p.total or ''"/>
                                 </td>
                                 <td>
                                     <span t-esc="get_employer_line(o, p) and get_employer_line(o, p).rate or ''"/>