From 1871c502e51ca654ec512913d9a281749059d4ab Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 9 May 2014 12:14:00 +0530
Subject: [PATCH 1/3] [REM]l10n_fr_hr_payroll: Remove Report declaration of rml
 from view.

---
 addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
index 755c7d5451f..5e788c3635b 100644
--- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
@@ -52,16 +52,5 @@
             </field>
         </record>
 
-
-        <report
-            auto="False"
-            header="False"
-            id="fiche_paye"
-            model="hr.payslip"
-            name="fiche.paye"
-            rml="l10n_fr_hr_payroll/report/fiche_paye.rml"
-            string="Fiche de Paie" />
-
-
     </data>
 </openerp>

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 2/3] [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 ''"/>

From 584fd2cbf748a4c27e0d8b2b936351ae75469884 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 15 May 2014 18:46:06 +0530
Subject: [PATCH 3/3] [IMP]: Improve l10n_fr_hr_payroll report. add some div
 with bootstrap css class instead of inline css.

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

diff --git a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
index 6ee98168614..c39da57d091 100644
--- a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
+++ b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
@@ -7,16 +7,16 @@
             <t t-call="report.internal_layout">
                 <div class="page">
                     <div class="oe_structure"/>
-                    <div class="row">
+                    <div class="row">   
                         <div class="col-xs-4">
                             <h2>Bulletin de paie</h2>
                             <h4>Paie du <span t-esc="formatLang(o.date_from, date=True)"/> au <span t-esc="formatLang(o.date_to, date=True)"/></h4>
                         </div>
                         <div class="col-xs-4 pull-right">
-                            <table class="table table-bordered">
+                            <table class="table table-bordered" stype="border: 2px solid black;">
                                 <tr>
                                     <td>
-                                        <div t-field="o.employee_id.company_id.partner_id" 
+                                        <div t-field="o.employee_id.company_id.partner_id"  
                                     t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}' />SIRET:
                                         <span t-esc="o.employee_id.company_id.siret or '_'"/> APE:
                                         <span t-esc="o.employee_id.company_id.ape or '_'"/>
@@ -67,16 +67,14 @@
                                 <th>Quantité / Base</th>
                                 <th>Taux</th>
                                 <th>Montant</th>
-                                <th>Charges Patronales</th>
+                                <th colspan="2">Charges Patronales</th>
                             </tr>
                         </thead>
                         <tbody>
                             <tr t-foreach="get_payslip_lines(o.line_ids)" t-as="p">
                                 <td>
                                     <span t-esc="p.code or ''"/>
-                                </td>
-                                <td>
-                                    <span t-esc="p.name or ''"/>
+                                     <span t-esc="p.name or ''" class="col-xs-offset-1"/>
                                 </td>
                                 <td>
                                     <t t-if="p.amount_select== 'percentage'">
@@ -96,25 +94,33 @@
                                 </td>
                                 <td>
                                     <span t-esc="get_employer_line(o, p) and get_employer_line(o, p).rate or ''"/>
-                                </td>
-                                <td>
-                                    <span t-esc="get_employer_line(o,p) and get_employer_line(o,p).total or ''"/>
+                                     <span t-esc="get_employer_line(o,p) and get_employer_line(o,p).total or ''"/>
                                 </td>
                             </tr>
                         </tbody>
                     </table>
-                    <table class="table table-condensed">
-                        <tr>
-                            <td>
-                                <strong>Mode de réglement</strong> : <span t-esc="o.payment_mode or ''"/><br/>
-                                <t t-if="o.paid is True"><strong>Payé</strong></t><br/>
-                                <strong>Conv. Coll.</strong> : <span t-esc="o.employee_id.company_id.conv_coll or ''"/>
-                            </td>
-                            <td><strong>Net à payer </strong>: <span t-esc="get_total_by_rule_category(o, 'NET')"/></td>
-                            <td><strong>Total Charges Patronales</strong> : <span t-esc="get_total_by_rule_category(o, 'COMP')"/></td>
-                        </tr>
-                    </table>
-                    <table class="table table-condensed text-center">
+                     <div class="row">
+                        <div class="col-xs-12">
+                            <table class="table  table-round-border">
+                                <tr>
+                                    <td>
+                                        <div class="pull-right">         
+                                        <strong>Net à payer </strong>: <span t-esc="get_total_by_rule_category(o, 'NET')"/>
+                                        <strong>Total Charges Patronales</strong> : <span t-esc="get_total_by_rule_category(o, 'COMP')"/>
+                                        </div>
+                                        <div class="mt15">
+                                             <strong>Mode de réglement</strong> : <span t-esc="o.payment_mode or ''"/> 
+                                        </div>
+                                        <div class="mt15">
+                                             <t t-if="o.paid is True"><strong>Payé</strong></t>
+                                        </div>
+                                        
+                                   </td>
+                                </tr>   
+                            </table>
+                        </div>
+                     </div>   
+                    <table class="table table-bordered text-center">
                         <thead>
                             <tr>
                                 <th>Salaire Brut</th>
@@ -137,7 +143,7 @@
                         </tbody>
                     </table>
 
-                    <p>DANS VOTRE INTERET ET POUR VOUS AIDER A FAIRE VALOIR VOS DROITS, CONSERVEZ CE 
+                    <p class="mt32">DANS VOTRE INTERET ET POUR VOUS AIDER A FAIRE VALOIR VOS DROITS, CONSERVEZ CE 
 BULLETIN DE PAIE SANS LIMITATION DE DUREE</p>
                 </div>
             </t>