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 5cb7de70d90..659af12905e 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
@@ -134,7 +134,6 @@
         <field name="name">Salaire de base</field>
         <field name="code">BASE</field>
         <field name="sequence">1</field>
-        <field name="type">total</field>
     </record>
 
     <record id="hr_payroll.hr_rule_taxable" model="hr.salary.rule">
@@ -143,7 +142,6 @@
         <field name="sequence">1000</field>
         <field name="category_id" ref="hr_payroll.GROSS"/>
         <field name="amount_python_compute">result = categories.BASE + categories.INDM - categories.DED</field>
-        <field name="type">total</field>
 
     </record>
 
@@ -151,7 +149,6 @@
         <field name="name">Plafond Securite Sociale</field>
         <field name="code">SECU</field>
         <field name="sequence">1010</field>
-        <field name="type">total</field>
         <field name="category_id" ref="SECU"/>
         <field name="appears_on_payslip" eval="False"/>
         <field name="condition_select">none</field>
@@ -163,7 +160,6 @@
         <field name="name">Plafond Tranche A</field>
         <field name="code">TA</field>
         <field name="sequence">1011</field>
-        <field name="type">total</field>
         <field name="category_id" ref="other_totals"/>
         <field name="appears_on_payslip" eval="False"/>
         <field name="condition_select">none</field>
@@ -175,7 +171,6 @@
         <field name="name">Plafond Tranche B</field>
         <field name="code">TB</field>
         <field name="sequence">1012</field>
-        <field name="type">total</field>
         <field name="category_id" ref="other_totals"/>
         <field name="appears_on_payslip" eval="False"/>
         <field name="condition_select">none</field>
@@ -187,7 +182,6 @@
         <field name="name">Plafond Tranche C</field>
         <field name="code">TC</field>
         <field name="sequence">1013</field>
-        <field name="type">total</field>
         <field name="category_id" ref="other_totals"/>
         <field name="appears_on_payslip" eval="False"/>
         <field name="condition_select">none</field>
@@ -199,7 +193,6 @@
         <field name="name">Plafond Tranche 1</field>
         <field name="code">T1</field>
         <field name="sequence">1014</field>
-        <field name="type">total</field>
         <field name="category_id" ref="other_totals"/>
         <field name="appears_on_payslip" eval="False"/>
         <field name="condition_select">none</field>
@@ -211,7 +204,6 @@
         <field name="name">Plafond Tranche 2</field>
         <field name="code">T2</field>
         <field name="sequence">1015</field>
-        <field name="type">total</field>
         <field name="category_id" ref="other_totals"/>
         <field name="appears_on_payslip" eval="False"/>
         <field name="condition_select">none</field>
@@ -224,7 +216,6 @@
         <field name="name">Total des charges salariales</field>
         <field name="sequence">2510</field>
         <field name="code">SALC</field>
-        <field name="type">total</field>
         <field name="category_id" ref="other_totals"/>
         <field name="appears_on_payslip" eval="True"/>
         <field name="condition_select">none</field>
@@ -236,7 +227,6 @@
     <record id="hr_rule_total_retenues" model="hr.salary.rule">
         <field name="name">Total Retenues</field>
         <field name="sequence">99999</field>
-        <field name="type">total</field>
         <field name="category_id" ref="other_totals"/>
         <field name="code">RET</field>
         <field name="condition_select">none</field>
@@ -248,7 +238,6 @@
     <record id="hr_rule_cumul_imposable" model="hr.salary.rule">
         <field name="name">Cumul Imposable</field>
         <field name="sequence">99999</field>
-        <field name="type">total</field>
         <field name="category_id" ref="C_IMP"/>
         <field name="code">C_IMP</field>
         <field name="condition_select">none</field>
@@ -261,7 +250,6 @@
     <record id="hr_payroll.hr_rule_net" model="hr.salary.rule">
         <field name="name">Net</field>
         <field name="sequence">100000</field>
-        <field name="type">total</field>
         <field name="category_id" ref="hr_payroll.NET"/>
         <field name="amount_python_compute">result = BRUT - categories.RETENUES</field>
     </record>
@@ -270,7 +258,6 @@
         <field name="name">Total Charges Patronales</field>
         <field name="sequence">150000</field>
         <field name="code">TCOMP</field>
-        <field name="type">total</field>
         <field name="category_id" ref="other_totals"/>
         <field name="appears_on_payslip" eval="False"/>
         <field name="condition_select">none</field>
@@ -283,7 +270,6 @@
         <field name="name">Cout total pour l'entreprise</field>
         <field name="sequence">200000</field>
         <field name="code">TOTAL</field>
-        <field name="type">total</field>
         <field name="category_id" ref="TOTAL"/>
         <field name="appears_on_payslip" eval="False"/>
         <field name="condition_select">none</field>
@@ -301,7 +287,6 @@
         <field name="name">Assurance maladie, maternite, invalidite, deces, solidaritee des personnes agees et handicapees</field>
         <field name="code">C1</field>
         <field name="sequence">2040</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.75</field>
@@ -316,7 +301,6 @@
         <field name="name">Assurance maladie, maternite, invalidite, deces, solidaritee des personnes agees et handicapees</field>
         <field name="code">C1P</field>
         <field name="sequence">2045</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">13.10</field>
@@ -332,7 +316,6 @@
         <field name="name">Vieillesse plafonnee</field>
         <field name="code">C2</field>
         <field name="sequence">2050</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">6.65</field>
@@ -347,7 +330,6 @@
         <field name="name">Vieillesse plafonnee</field>
         <field name="code">C2P</field>
         <field name="sequence">2055</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">8.3</field>
@@ -363,7 +345,6 @@
         <field name="name">Vieillesse deplafonnee</field>
         <field name="code">C3</field>
         <field name="sequence">2060</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.1</field>
@@ -378,7 +359,6 @@
         <field name="name">Vieillesse deplafonnee</field>
         <field name="code">C3P</field>
         <field name="sequence">2065</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">1.6</field>
@@ -388,12 +368,25 @@
 
 
 
+    <record id="hr_payroll_rules_C4_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Allocations familiales</field>
+        <field name="code">C4</field>
+        <field name="sequence">2070</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+	
     <record id="hr_payroll_rules_C4_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C4_employe"/>
         <field name="name">Allocations familiales</field>
         <field name="code">C4P</field>
         <field name="sequence">2075</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">5.4</field>
@@ -412,7 +405,6 @@
         <field name="name">Assurance chomage</field>
         <field name="code">C10</field>
         <field name="sequence">2080</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">2.40</field>
@@ -427,7 +419,6 @@
         <field name="name">Assurance chomage</field>
         <field name="code">C10P</field>
         <field name="sequence">2085</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">4</field>
@@ -437,13 +428,25 @@
 
 
 
+    <record id="hr_payroll_rules_C11_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">AGS (FNGS)</field>
+        <field name="code">C11</field>
+        <field name="sequence">2090</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TB)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
 
     <record id="hr_payroll_rules_C11_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C11_employe"/>
         <field name="name">AGS (FNGS)</field>
         <field name="code">C11P</field>
         <field name="sequence">2095</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.3</field>
@@ -457,7 +460,6 @@
         <field name="name">ARRCO Non-cadre Tranche 1</field>
         <field name="code">C12</field>
         <field name="sequence">2100</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">3</field>
@@ -472,7 +474,6 @@
         <field name="name">ARRCO Non-cadre Tranche 1</field>
         <field name="code">C12P</field>
         <field name="sequence">2105</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">4.5</field>
@@ -488,7 +489,6 @@
         <field name="name">ARRCO Non-cadre Tranche 2</field>
         <field name="code">C14</field>
         <field name="sequence">2110</field>
-        <field name="type">normal</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > T1</field>
         <field name="amount_select">percentage</field>
@@ -504,7 +504,6 @@
         <field name="name">ARRCO Non-cadre Tranche 2</field>
         <field name="code">C14P</field>
         <field name="sequence">2115</field>
-        <field name="type">employer</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > T1</field>
         <field name="amount_select">percentage</field>
@@ -522,7 +521,6 @@
         <field name="name">AGFF Non-cadre Tranche 1</field>
         <field name="code">C13</field>
         <field name="sequence">2120</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.8</field>
@@ -531,13 +529,12 @@
         <field name="register_id" ref="hr_retraite_register"/>
     </record>
 
-    <record id="hr_payroll_rules_C14_employer" model="hr.salary.rule">
+    <record id="hr_payroll_rules_C13_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
         <field name="parent_rule_id" ref="hr_payroll_rules_C13_employe"/>
         <field name="name">AGFF Non-cadre Tranche 1</field>
         <field name="code">C13P</field>
         <field name="sequence">2125</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">1.2</field>
@@ -552,7 +549,6 @@
         <field name="name">AGFF Non-cadre Tranche 2</field>
         <field name="code">C15</field>
         <field name="sequence">2130</field>
-        <field name="type">normal</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > T1</field>
         <field name="amount_select">percentage</field>
@@ -568,7 +564,6 @@
         <field name="name">AGFF Non-cadre Tranche 2</field>
         <field name="code">C15P</field>
         <field name="sequence">2135</field>
-        <field name="type">employer</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > T1</field>
         <field name="amount_select">percentage</field>
@@ -585,7 +580,6 @@
         <field name="name">ARRCO Cadre Tranche A</field>
         <field name="code">C16</field>
         <field name="sequence">2140</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">3</field>
@@ -600,7 +594,6 @@
         <field name="name">ARRCO Cadre Tranche A</field>
         <field name="code">C16P</field>
         <field name="sequence">2145</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">4.5</field>
@@ -616,7 +609,6 @@
         <field name="name">AGIRC et GMP Cadre Tranche B</field>
         <field name="code">C17</field>
         <field name="sequence">2150</field>
-        <field name="type">normal</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > TA</field>
         <field name="amount_select">percentage</field>
@@ -632,7 +624,6 @@
         <field name="name">AGIRC et GMP Cadre Tranche B</field>
         <field name="code">C17P</field>
         <field name="sequence">2155</field>
-        <field name="type">employer</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > TA</field>
         <field name="amount_select">percentage</field>
@@ -643,13 +634,26 @@
 
 <!-- TO DO : Ajouter input pour les taux -->
 
+    <record id="hr_payroll_rules_C38_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">AGIRC Cadre Tranche C</field>
+        <field name="code">C38</field>
+        <field name="sequence">2160</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > TB</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">min(categories.BRUT-TB,TC-TB)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
 
     <record id="hr_payroll_rules_C38_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+		<field name="parent_rule_id" ref="hr_payroll_rules_C38_employe"/>
         <field name="name">AGIRC Cadre Tranche C</field>
-        <field name="code">C18P</field>
+        <field name="code">C38P</field>
         <field name="sequence">2165</field>
-        <field name="type">employer</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > TB</field>
         <field name="amount_select">percentage</field>
@@ -665,7 +669,6 @@
         <field name="name">AGFF Cadre Tranche A</field>
         <field name="code">C18</field>
         <field name="sequence">2170</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.8</field>
@@ -680,7 +683,6 @@
         <field name="name">AGFF Cadre Tranche A</field>
         <field name="code">C18P</field>
         <field name="sequence">2175</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">1.2</field>
@@ -695,7 +697,6 @@
         <field name="name">AGFF Non-cadre Tranche B</field>
         <field name="code">C18</field>
         <field name="sequence">2180</field>
-        <field name="type">normal</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > TA</field>
         <field name="amount_select">percentage</field>
@@ -711,7 +712,6 @@
         <field name="name">AGFF Cadre Tranche B</field>
         <field name="code">C18P</field>
         <field name="sequence">2185</field>
-        <field name="type">employer</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > TA</field>
         <field name="amount_select">percentage</field>
@@ -726,7 +726,6 @@
         <field name="name">CET</field>
         <field name="code">C19</field>
         <field name="sequence">2190</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.13</field>
@@ -741,7 +740,6 @@
         <field name="name">CET</field>
         <field name="code">C19P</field>
         <field name="sequence">2195</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.22</field>
@@ -755,7 +753,6 @@
         <field name="name">APEC</field>
         <field name="code">C20</field>
         <field name="sequence">2200</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.024</field>
@@ -770,7 +767,6 @@
         <field name="name">APEC</field>
         <field name="code">C20P</field>
         <field name="sequence">2205</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.036</field>
@@ -779,13 +775,26 @@
     </record>
 
 
+	
+    <record id="hr_payroll_rules_C21_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Assurance deces cadres</field>
+        <field name="code">C21</field>
+        <field name="sequence">2210</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
 
     <record id="hr_payroll_rules_C21_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C21_employe"/>
         <field name="name">Assurance deces cadres</field>
         <field name="code">C21P</field>
         <field name="sequence">2215</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">1.5</field>
@@ -795,14 +804,25 @@
 
 
 
-
+    <record id="hr_payroll_rules_C5_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Accident du travail</field>
+        <field name="code">C5</field>
+        <field name="sequence">2220</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
 
     <record id="hr_payroll_rules_C5_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C5_employe"/>
         <field name="name">Accident du travail</field>
         <field name="code">C5P</field>
         <field name="sequence">2225</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage_base">categories.BRUT</field>
@@ -815,7 +835,6 @@
         <field name="name">Prevoyance Cadre TA</field>
         <field name="code">C35</field>
         <field name="sequence">2230</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
@@ -828,7 +847,6 @@
         <field name="name">Prevoyance Cadre TA</field>
         <field name="code">C35P</field>
         <field name="sequence">2231</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
@@ -840,7 +858,6 @@
         <field name="name">Prevoyance Cadre TB</field>
         <field name="code">C36</field>
         <field name="sequence">2232</field>
-        <field name="type">normal</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > TA</field>
         <field name="amount_select">percentage</field>
@@ -854,7 +871,6 @@
         <field name="name">Prevoyance Cadre TB</field>
         <field name="code">C36P</field>
         <field name="sequence">2233</field>
-        <field name="type">employer</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.BRUT > TA</field>
         <field name="amount_select">percentage</field>
@@ -867,7 +883,6 @@
         <field name="name">Forfait Mutuelle</field>
         <field name="code">C37</field>
         <field name="sequence">2234</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">fix</field>
         <field name="register_id" ref="hr_prevoyance_register"/>
@@ -879,18 +894,30 @@
         <field name="name">Forfait Mutuelle</field>
         <field name="code">C37P</field>
         <field name="sequence">2235</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">fix</field>
         <field name="register_id" ref="hr_prevoyance_register"/>
     </record>
 
+	
+    <record id="hr_payroll_rules_C40_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Taxe Prevoyance</field>
+        <field name="code">C40</field>
+        <field name="sequence">2238</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.PREV != 0</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.PREV</field>
+        <field name="register_id" ref="hr_prevoyance_register"/>
+    </record>
+	
     <record id="hr_payroll_rules_C40_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C40_employe"/>
         <field name="name">Taxe Prevoyance</field>
         <field name="code">C40P</field>
         <field name="sequence">2239</field>
-        <field name="type">employer</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = categories.PREV != 0</field>
         <field name="amount_select">percentage</field>
@@ -899,12 +926,26 @@
         <field name="register_id" ref="hr_urssaf_register"/>
     </record>
 
+
+    <record id="hr_payroll_rules_C7_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">FNAL -20 Employes</field>
+        <field name="code">C7</field>
+        <field name="sequence">2240</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_max">19</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">min(categories.BRUT,SECU)</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>	
+
     <record id="hr_payroll_rules_C7_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C7_employe"/>
         <field name="name">FNAL -20 Employes</field>
         <field name="code">C7P</field>
         <field name="sequence">2245</field>
-        <field name="type">employer</field>
         <field name="condition_select">range</field>
         <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
         <field name="condition_range_max">19</field>
@@ -916,13 +957,25 @@
 
 
 
-
+    <record id="hr_payroll_rules_C8_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">FNAL +20 Employes</field>
+        <field name="code">C8</field>
+        <field name="sequence">2250</field>
+        <field name="condition_select">range</field>
+        <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_urssaf_register"/>
+    </record>
+	
     <record id="hr_payroll_rules_C8_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C8_employe"/>
         <field name="name">FNAL +20 Employes</field>
         <field name="code">C8P</field>
         <field name="sequence">2255</field>
-        <field name="type">employer</field>
         <field name="condition_select">range</field>
         <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
         <field name="condition_range_min">20</field>
@@ -932,15 +985,27 @@
         <field name="register_id" ref="hr_urssaf_register"/>
     </record>
 
+	
 
-
+    <record id="hr_payroll_rules_C9_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Versement Transport</field>
+        <field name="code">C9</field>
+        <field name="sequence">2260</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">10</field>
+        <field name="amount_select">percentage</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+	
 
     <record id="hr_payroll_rules_C9_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C9_employe"/>
         <field name="name">Versement Transport</field>
         <field name="code">C9P</field>
         <field name="sequence">2265</field>
-        <field name="type">employer</field>
         <field name="condition_select">range</field>
         <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
         <field name="condition_range_min">10</field>
@@ -950,14 +1015,24 @@
 
 
 
-
+    <record id="hr_payroll_rules_C22_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Effort a la construction</field>
+        <field name="code">C22</field>
+        <field name="sequence">2270</field>
+        <field name="condition_select">range</field>
+        <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="register_id" ref="hr_urssaf_register"/>
+    </record>
 
     <record id="hr_payroll_rules_C22_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C22_employe"/>
         <field name="name">Effort a la construction</field>
         <field name="code">C22P</field>
         <field name="sequence">2275</field>
-        <field name="type">employer</field>
         <field name="condition_select">range</field>
         <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
         <field name="condition_range_min">20</field>
@@ -968,13 +1043,22 @@
     </record>
 
 
-
+    <record id="hr_payroll_rules_C23_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Taxe d'apprentissage</field>
+        <field name="code">C23</field>
+        <field name="sequence">2280</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+	
     <record id="hr_payroll_rules_C23_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C23_employe"/>
         <field name="name">Taxe d'apprentissage</field>
         <field name="code">C23P</field>
         <field name="sequence">2285</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.5</field>
@@ -983,12 +1067,22 @@
     </record>
 
 
+    <record id="hr_payroll_rules_C24_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Contribution additionnelle au developpement de l'apprentissage</field>
+        <field name="code">C24</field>
+        <field name="sequence">2290</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+	
     <record id="hr_payroll_rules_C24_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C24_employe"/>
         <field name="name">Contribution additionnelle au developpement de l'apprentissage</field>
         <field name="code">C24P</field>
         <field name="sequence">2295</field>
-        <field name="type">employer</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.18</field>
@@ -997,13 +1091,24 @@
     </record>
 
 
-
+    <record id="hr_payroll_rules_C25_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Formation professionnelle 10- salaries</field>
+        <field name="code">C25</field>
+        <field name="sequence">2300</field>
+        <field name="condition_select">range</field>
+        <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="register_id" ref="hr_cci_register"/>
+    </record>
+	
     <record id="hr_payroll_rules_C25_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C25_employe"/>
         <field name="name">Formation professionnelle 10- salaries</field>
         <field name="code">C25P</field>
         <field name="sequence">2305</field>
-        <field name="type">employer</field>
         <field name="condition_select">range</field>
         <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
         <field name="condition_range_max">9</field>
@@ -1015,13 +1120,25 @@
 
 
 
+    <record id="hr_payroll_rules_C26_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Formation professionnelle 10-19 salaries</field>
+        <field name="code">C26</field>
+        <field name="sequence">2310</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">10</field>
+        <field name="condition_range_max">19</field>
+        <field name="amount_select">percentage</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
 
     <record id="hr_payroll_rules_C26_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C26_employe"/>
         <field name="name">Formation professionnelle 10-19 salaries</field>
         <field name="code">C26P</field>
         <field name="sequence">2315</field>
-        <field name="type">employer</field>
         <field name="condition_select">range</field>
         <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
         <field name="condition_range_min">10</field>
@@ -1033,14 +1150,24 @@
     </record>
 
 
-
+    <record id="hr_payroll_rules_C27_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Formation professionnelle 20+ salaries</field>
+        <field name="code">C27</field>
+        <field name="sequence">2320</field>
+        <field name="condition_select">range</field>
+        <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="register_id" ref="hr_cci_register"/>
+    </record>
 
     <record id="hr_payroll_rules_C27_employer" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C27_employe"/>
         <field name="name">Formation professionnelle 20+ salaries</field>
         <field name="code">C27P</field>
         <field name="sequence">2325</field>
-        <field name="type">employer</field>
         <field name="condition_select">range</field>
         <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
         <field name="condition_range_min">20</field>
@@ -1056,7 +1183,6 @@
         <field name="name">CSG deductible</field>
         <field name="code">C29</field>
         <field name="sequence">2500</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">5.1</field>
@@ -1070,7 +1196,6 @@
         <field name="name">CSG non deductible</field>
         <field name="code">C28</field>
         <field name="sequence">2550</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">2.4</field>
@@ -1085,7 +1210,6 @@
         <field name="name">CRDS</field>
         <field name="code">C30</field>
         <field name="sequence">2560</field>
-        <field name="type">normal</field>
         <field name="condition_select">none</field>
         <field name="amount_select">percentage</field>
         <field name="amount_percentage">0.5</field>
@@ -1102,7 +1226,7 @@
 
     <record id="hr_payroll.structure_base" model="hr.payroll.structure">
         <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_employer'), ref('hr_payroll_rules_C5_employer'), ref('hr_payroll_rules_C7_employer'), ref('hr_payroll_rules_C8_employer'), ref('hr_payroll_rules_C9_employer'), ref('hr_payroll_rules_C10_employe'), ref('hr_payroll_rules_C11_employer'), ref('hr_payroll_rules_C22_employer'), ref('hr_payroll_rules_C23_employer'), ref('hr_payroll_rules_C24_employer'), ref('hr_payroll_rules_C25_employer'), ref('hr_payroll_rules_C26_employer'), ref('hr_payroll_rules_C27_employer'), ref('hr_payroll_rules_C28_employe'), ref('hr_payroll_rules_C29_employe'), ref('hr_payroll_rules_C30_employe'), ref('hr_payroll_rules_C40_employer')])]" name="rule_ids"/>
+        <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"/>
     </record>
 
 
@@ -1118,7 +1242,7 @@
     <record id="hr_payroll_salary_structure_employe_cadre" model="hr.payroll.structure">
         <field name="code">E-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_employer'), ref('hr_payroll_rules_C38_employer'), ref('hr_payroll_rules_C39_employe')])]" name="rule_ids"/>
+        <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"/>
     </record>
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
index 3419045a788..027e8bfaeb8 100755
--- a/addons/l10n_fr_hr_payroll/report/fiche_paye.py
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
@@ -39,7 +39,7 @@ class fiche_paye_parser(report_sxw.rml_parse):
         res = []
         ids = []
         for id in range(len(obj)):
-            if obj[id].appears_on_payslip == True and  ( obj[id].salary_rule_id.type != 'employer' or not obj[id].salary_rule_id.parent_rule_id ):
+            if obj[id].appears_on_payslip == True and not obj[id].salary_rule_id.parent_rule_id :
                 ids.append(obj[id].id)
         if ids:
             res = payslip_line.browse(self.cr, self.uid, ids)
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
index 2abc9cd53c0..039ce60a354 100644
--- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
@@ -343,20 +343,17 @@
             <para style="terp_default_7">[[ ((p.amount_select&lt;&gt; 'fix' and p.amount_select&lt;&gt; 'percentage') or removeParentNode('para')) and '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_7">[[ ((p.amount_select == 'percentage' and p.salary_rule_id.type &lt;&gt; 'employer') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]]</para>
-            <para style="terp_default_7">[[ ((p.amount_select &lt;&gt; 'percentage' or p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]]</para>
+            <para style="terp_default_7">[[ ((p.amount_select == 'percentage') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]]</para>
+            <para style="terp_default_7">[[ ((p.amount_select &lt;&gt; 'percentage') or removeParentNode('para')) and '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_7">[[ (( p.salary_rule_id.type &lt;&gt; 'employer') or removeParentNode('para')) and '' ]] [[ p.amount or '' ]]</para>
-            <para style="terp_default_7">[[ (( p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]]</para>
+            <para style="terp_default_7">[[ p.amount or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_7">[[ (( p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]]</para>
-            <para style="terp_default_7">[[ (( p.salary_rule_id.type &lt;&gt; 'employer') or removeParentNode('para')) and '' ]][[ get_employer_line(o, p).rate or '']] </para>
+            <para style="terp_default_7">[[ get_employer_line(o, p).rate or '']] </para>
           </td>
           <td>
-            <para style="terp_default_7">[[ (( p.salary_rule_id.type == 'employer') or removeParentNode('para')) and '' ]] [[ p.amount or '' ]]</para>
-            <para style="terp_default_7">[[ (( p.salary_rule_id.type &lt;&gt; 'employer') or removeParentNode('para')) and '' ]][[ get_employer_line(o,p).amount or '' ]]</para>
+            <para style="terp_default_7">[[ get_employer_line(o,p).amount or '' ]]</para>
           </td>
         </tr>
       </blockTable>