From 992301ddfe8b280895f210574ff36921a8c8b60d Mon Sep 17 00:00:00 2001
From: yannick <yannick@serveur-perso>
Date: Sat, 21 Apr 2012 18:21:15 +0200
Subject: [PATCH] Updating l10n_fr_hr_payroll in preparation of the merge
 request

bzr revid: yannick@serveur-perso-20120421162115-semk6axc1wh3rsve
---
 addons/l10n_fr_hr_payroll/__openerp__.py       | 14 ++++++++++----
 .../l10n_fr_hr_payroll_data.xml                | 18 +++++++++++++-----
 .../l10n_fr_hr_payroll/report/fiche_paye.rml   |  8 ++++----
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py
index 669a0b31ac9..6a3beb52718 100755
--- a/addons/l10n_fr_hr_payroll/__openerp__.py
+++ b/addons/l10n_fr_hr_payroll/__openerp__.py
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 {
-    'name': 'French Payroll Rules',
+    'name': 'French Payroll',
     'category': 'Localization/Payroll',
-    'author': 'SYNERPGY',
+    'author': 'Yannick Buron (SYNERPGY)',
     'depends': ['hr_payroll', 'hr_payroll_account', 'l10n_fr'],
     'version': '1.0',
     'description': """
@@ -29,9 +29,15 @@ French Payroll Rules
 =======================
 
     -Configuration of hr_payroll for french localization
-	-Contributions Rules
-	-Accounting configuration
+	-All main contributions rules for french payslip, for 'cadre' and 'non-cadre'
 	-New payslip report	
+
+    TODO :
+    -Integration with holidays module for deduction and allowance
+    -Integration with hr_payroll_account for the automatic account_move_line creation from the payslip
+    -Continue to integrate the contribution. Only the main contribution are currently implemented
+    -Remake the report under webkit
+    -The payslip.line with appears_in_payslip = False should appears in the payslip interface, but not in the payslip report
     """,
 
     'active': False,
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml
index e7a0e44d21e..31d3ebe9654 100755
--- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml
@@ -1050,6 +1050,7 @@
         <field name="sequence">2280</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
         <field name="register_id" ref="hr_cci_register"/>
     </record>
 	
@@ -1074,6 +1075,7 @@
         <field name="sequence">2290</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
         <field name="register_id" ref="hr_cci_register"/>
     </record>
 	
@@ -1100,6 +1102,7 @@
         <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
         <field name="condition_range_max">9</field>
         <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
         <field name="register_id" ref="hr_cci_register"/>
     </record>
 	
@@ -1130,6 +1133,7 @@
         <field name="condition_range_min">10</field>
         <field name="condition_range_max">19</field>
         <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
         <field name="register_id" ref="hr_cci_register"/>
     </record>
 
@@ -1159,6 +1163,7 @@
         <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
         <field name="condition_range_min">20</field>
         <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
         <field name="register_id" ref="hr_cci_register"/>
     </record>
 
@@ -1224,27 +1229,30 @@
         <!-- Salary Structure -->
 
 
-    <record id="hr_payroll.structure_base" model="hr.payroll.structure">
+    <record id="hr_payroll_salary_structure_base" model="hr.payroll.structure">
+        <field name="code">Fr-Base</field>
         <field name="name">Cotisations de base Employe Francais</field>
         <field eval="[(6, 0, [ref('hr_payroll.hr_rule_basic'), ref('hr_payroll.hr_rule_taxable'),ref('hr_payroll.hr_rule_net'), ref('hr_rule_secu'), ref('hr_rule_tranche_a'), ref('hr_rule_tranche_b'), ref('hr_rule_tranche_c'), ref('hr_rule_tranche_1'), ref('hr_rule_tranche_2'), ref('hr_rule_total'), ref('hr_rule_total_charges_salariales'), ref('hr_rule_total_retenues'), ref('hr_rule_cumul_imposable'), ref('hr_rule_total_charges_patronales'), ref('hr_payroll_rules_C1_employe'), ref('hr_payroll_rules_C2_employe'), ref('hr_payroll_rules_C3_employe'), ref('hr_payroll_rules_C4_employe'), ref('hr_payroll_rules_C5_employe'), ref('hr_payroll_rules_C7_employe'), ref('hr_payroll_rules_C8_employe'), ref('hr_payroll_rules_C9_employe'), ref('hr_payroll_rules_C10_employe'), ref('hr_payroll_rules_C11_employe'), ref('hr_payroll_rules_C22_employe'), ref('hr_payroll_rules_C23_employe'), ref('hr_payroll_rules_C24_employe'), ref('hr_payroll_rules_C25_employe'), ref('hr_payroll_rules_C26_employe'), ref('hr_payroll_rules_C27_employe'), ref('hr_payroll_rules_C28_employe'), ref('hr_payroll_rules_C29_employe'), ref('hr_payroll_rules_C30_employe'), ref('hr_payroll_rules_C40_employe')])]" name="rule_ids"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field name="parent_id" ref="hr_payroll.structure_base"/>
     </record>
 
 
     <record id="hr_payroll_salary_structure_employe_non_cadre" model="hr.payroll.structure">
-        <field name="code">E-NC</field>
+        <field name="code">Fr-NC</field>
         <field name="name">Employe non-cadre</field>
         <field eval="[(6, 0, [ref('hr_payroll_rules_C12_employe'), ref('hr_payroll_rules_C13_employe'), ref('hr_payroll_rules_C14_employe'), ref('hr_payroll_rules_C15_employe')])]" name="rule_ids"/>
         <field name="company_id" ref="base.main_company"/>    
-        <field name="parent_id" ref="hr_payroll.structure_base"/>
+        <field name="parent_id" ref="hr_payroll_salary_structure_base"/>
     </record>
 
 
     <record id="hr_payroll_salary_structure_employe_cadre" model="hr.payroll.structure">
-        <field name="code">E-C</field>
+        <field name="code">Fr-C</field>
         <field name="name">Employe cadre</field>
         <field eval="[(6, 0, [ref('hr_payroll_rules_C16_employe'), ref('hr_payroll_rules_C17_employe'), ref('hr_payroll_rules_C18_employe'), ref('hr_payroll_rules_C19_employe'), ref('hr_payroll_rules_C20_employe'), ref('hr_payroll_rules_C21_employe'), ref('hr_payroll_rules_C38_employe'), ref('hr_payroll_rules_C39_employe')])]" name="rule_ids"/>
         <field name="company_id" ref="base.main_company"/>    
-        <field name="parent_id" ref="hr_payroll.structure_base"/>
+        <field name="parent_id" ref="hr_payroll_salary_structure_base"/>
     </record>
 
 
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
index 039ce60a354..e155f23f69d 100644
--- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Fiche de paye" author="Yannick Buron" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -338,7 +338,7 @@
             <para style="terp_default_7">[[ p.name or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_7">[[ ((p.amount_select== 'percentage') or removeParentNode('para')) and '' ]] [[ p.base or '' ]]</para>
+            <para style="terp_default_7">[[ ((p.amount_select== 'percentage') or removeParentNode('para')) and '' ]] [[ p.amount or '' ]]</para>
             <para style="terp_default_7">[[ ((p.amount_select== 'fix') or removeParentNode('para')) and '' ]] [[ p.quantity or '' ]]</para>
             <para style="terp_default_7">[[ ((p.amount_select&lt;&gt; 'fix' and p.amount_select&lt;&gt; 'percentage') or removeParentNode('para')) and '' ]]</para>
           </td>
@@ -347,13 +347,13 @@
             <para style="terp_default_7">[[ ((p.amount_select &lt;&gt; 'percentage') or removeParentNode('para')) and '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_7">[[ p.amount or '' ]]</para>
+            <para style="terp_default_7">[[ p.total or '' ]]</para>
           </td>
           <td>
             <para style="terp_default_7">[[ get_employer_line(o, p).rate or '']] </para>
           </td>
           <td>
-            <para style="terp_default_7">[[ get_employer_line(o,p).amount or '' ]]</para>
+            <para style="terp_default_7">[[ get_employer_line(o,p).total or '' ]]</para>
           </td>
         </tr>
       </blockTable>