[IMP] updated csv file, re-organized employee view, imp precompte rule

bzr revid: osenda-20110428080101-4cc6d8hb1ttenszd

5 files changed, 80 insertions, 27 deletions

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 9449523929b..41fb9d0f0dc 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -237,7 +237,8 @@
                             </field>
                         </page>
 <!-- TODO: put me back -->
-<!--                       <page string="Details By Salary Head">
+<!--
+                      <page string="Details By Salary Head">
                             <field name="details_by_salary_head" nolabel="1">
                                 <tree string="Salary Rules">
                                     <field name="category_id"/>
diff --git a/addons/hr_payroll_l10n_be/data/hr.salary.rule.csv b/addons/hr_payroll_l10n_be/data/hr.salary.rule.csv
index 1a9010e0265..1ce84969cb5 100644
--- a/addons/hr_payroll_l10n_be/data/hr.salary.rule.csv
+++ b/addons/hr_payroll_l10n_be/data/hr.salary.rule.csv
@@ -1411,11 +1411,24 @@
 1408,"fix",7485,7500,,-3480.71,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeIII","range","rules['GROSS']",
 1409,"fix",7500,7500,,-3488.73,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeIII","range","rules['GROSS']",
 ,,,,,,,,,,,,,
-1410,"fix",1,1,,31,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
-1411,"fix",2,2,,85,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
-1412,"fix",3,3,,229,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
-1413,"fix",4,4,,418,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
-1414,"fix",5,5,,618,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
-1415,"fix",6,6,,817,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
-1416,"fix",7,7,,1016,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
-1417,"fix",8,8,,1231,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
+1410,"fix",1,1,,31,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1411,"fix",2,2,,85,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1412,"fix",3,3,,229,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1413,"fix",4,4,,418,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1414,"fix",5,5,,618,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1415,"fix",6,6,,817,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1416,"fix",7,7,,1016,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1417,"fix",8,8,,1231,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1418,"fix",9,9,,1452,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1419,"fix",10,10,,1673,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child","range","employee.children",
+,,,,,,,,,,,,,
+1420,"fix",1,1,,62,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",141,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap",
+1421,"fix",2,2,,170,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",141,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap",
+1422,"fix",3,3,,458,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",141,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap",
+1423,"fix",4,4,,836,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",141,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap",
+1424,"fix",5,5,,1236,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",141,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap",
+1425,"fix",6,6,,1634,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",141,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap",
+1426,"fix",7,7,,2032,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",141,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap",
+1427,"fix",8,8,,2462,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",141,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap",
+1428,"fix",9,9,,2904,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",141,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap",
+1429,"fix",10,10,,3346,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",141,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.number_handicap",
diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py
index 63510aa96dd..2f667da1666 100644
--- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py
+++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py
@@ -58,12 +58,12 @@ hr_contract_be()
 class hr_employee_be(osv.osv):
 
     _inherit = 'hr.employee'
-    _description = 'same as before'
+    _description = 'add for all Belgian users'
     _columns = {
 	'statut_fiscal':fields.selection([('without income','Without Income'),('with income','With Income')], 'Tax status for spouse'),
-	'handicap':fields.boolean('Disabled'),
-        'handicap_child':fields.boolean('Disabled Children'),
-	'resident':fields.boolean('Residente'),
+	'handicap':fields.boolean('Disabled Spouse', help="if recipient spouse is declared disabled by law"),
+        'handicap_child':fields.boolean('Disabled Children', help="if recipient children is/are declared disabled by law"),
+	'resident':fields.boolean('Nonresident', help="if recipient lives in a foreign country"),
 	'number_handicap':fields.integer('Number of disabled children'),
     }
 hr_employee_be()
diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml
index 9e0cf2334a9..c0dd0417688 100644
--- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml
+++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml
@@ -75,7 +75,8 @@
 		<field name="sequence">120</field>
 		<field name="condition_select">python</field>
 		<field name="appears_on_payslip" eval="False"/>
-		<field name="condition_python">result = (employee.marital=='single') or (employee.marital=='married' and statut_fiscal=='with income')</field>
+<!--		<field name="condition_python">result = (employee.marital=='single') or (employee.marital=='married' and statut_fiscal=='with income')</field>-->
+		<field name="condition_python">result = (((employee.marital=='single') or (employee.marital=='married' and statut_fiscal=='with income')) and (employee.resident!=True))</field>
 	</record>
 
 	<record id="hr_payroll_rules_baremeII" model="hr.salary.rule">
@@ -98,28 +99,58 @@
 		<field name="amount_select">fix</field>
 		<field name="sequence">120</field>
 		<field name="condition_select">python</field>
-		<field name="condition_python">result = employee.marital=='divorced'</field>
+		<field name="condition_python">result = employee.resident==True</field>
 		<field name="appears_on_payslip" eval="False"/>
 	</record>
 
+        <record id="hr_payroll_rules_child_alw" model="hr.salary.rule">
+                <field name="category_id" ref="hr_payroll.DED"/>
+                <field name="name">Child Allowance Belgium</field>
+                <field name="code">Child.Allowance</field>
+                <field name="sequence">140</field>
+                <field name="amount_select">fix</field>
+                <field name="condition_select">none</field>
+        </record>
+
 
-	<record id="hr_payroll_rules_child_alw" model="hr.salary.rule">
+	<record id="hr_payroll_rules_child" model="hr.salary.rule">
 		<field name="category_id" ref="hr_payroll.DED"/>
+		<field name="parent_rule_id" ref="hr_payroll_rules_child_alw"/>
 		<field name="name">Child Allowance Belgium</field>
 		<field name="code">Ch.A</field>
 		<field name="amount_select">fix</field>
-		<field name="sequence">140</field>
-		<field name="note">Le bénéficiaire des revenus est un isolé OU le conjoint du bénéficiaire des revenus a également des
-					revenus professionnels (barème I/ barème II)
-					
-					A.Lorsque les rémunérations mensuelles brutes ne dépassent pas 7.500 EUR, le précompte professionnel est déterminé suivant le barème I.
-					Les réductions suivantes sont ensuite déduites du précompte professionnel déterminé suivant ce barème :
-					
-						a) Réduction pour enfants à charge</field>
+		<field name="sequence">141</field>
+		<field name="note">The recipient of income is an isolated or spouse beneficiary's income has also
+                                        earned income (Schedule I / II scale)
+
+                                        A. When the gross monthly earnings do not exceed € 7,500, the withholding tax is determined according to the Schedule I.
+                                        The following reductions are then deducted from the payroll tax determined in accordance with this schedule:
+
+                                                a) Reduction for dependent children</field>
 		<field name="condition_select">python</field>
 		<field name="condition_python">result = bool(employee.children)</field>
 	</record>
 
+	<record id="hr_payroll_rules_child_handicap" model="hr.salary.rule">
+                <field name="category_id" ref="hr_payroll.DED"/>
+		<field name="parent_rule_id" ref="hr_payroll_rules_child_alw"/>
+                <field name="name">Child Allowance for the Disabled Belgium</field>
+                <field name="code">Ch.Handicap</field>
+                <field name="amount_select">fix</field>
+                <field name="sequence">142</field>
+		<field name="note">"Disabled child" means:
+
+					the child reaches at least 66% of failure or reduced physical or mental capacity
+					the head of one or more conditions;
+
+
+					the child that is established, regardless of age, that due to developments and recognized
+					before age 65</field>
+                <field name="condition_select">python</field>
+                <field name="condition_python">result = bool(employee.number_handicap)</field>
+        </record>
+
+
 	<record id="hr_payroll_rules_company_car_parent" model="hr.salary.rule">
 		<field name="category_id" ref="hr_payroll_head_company_car"/>
 		<field name="name">Company Car</field>
diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml
index a2b64755ca0..769b6e8ea4a 100644
--- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml
+++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml
@@ -45,10 +45,11 @@
             <field name="name">hr.employee.employee.inherit.form</field>
             <field name="model">hr.employee</field>
             <field name="type">form</field>
+	    <field name="priority">25</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="marital" position="replace">
-                    <field name="marital" required="True"/>
+                   <!-- <field name="marital" required="True"/>--><!-- attrs="{'invisible':[('resident','=',True)], 'required':[('resident','!=',True)]}" colspan="1"/-->
                 </field>
             </field>
         </record>
@@ -68,12 +69,19 @@
             <field name="name">hr.hr.employee.view.for</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
-	    <field name="priority">20</field>
+	    <field name="priority">30</field>
             <field name="arch" type="xml">	
             <data>
+                <xpath expr="/form/notebook/page/group/field[@name='birthday']" position="after">
+                       	<field name="marital" required="True"/>
+                </xpath>
+
+                <xpath expr="/form/notebook/page/group/field[@name='gender']" position="before">
+			<field name="resident" eval="False"/> 
+		</xpath>
                 <xpath expr="/form/notebook/page/group/field[@name='marital']" position="after">
 			<field name="statut_fiscal" attrs="{'invisible':[('marital','!=','married')],'required':[('marital','=','married')]}" colspan="1" help="if spouse has professionnel income or not"/> 
-			<field name="handicap" attrs="{'invisible':[('marital','!=','married')]}" colspan="1" help="if spouse is declared as disabled"/>
+			<field name="handicap" attrs="{'invisible':[('marital','!=','married')]}" colspan="1"/>
 		</xpath>
 		<xpath expr="/form/notebook/page/group/field[@name='children']" position="after">
 			<field name="handicap_child"/>