[IMP] hr_payroll:added field 'python_code' and improved view of Salary Rules

bzr revid: mtr@mtr-20110307104513-mjcjedxtozza6wdf

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index cd48b8d..4caaf0e 100644 (file)
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1254,6 +1254,7 @@ class hr_salary_rule(osv.osv):
         'conditions':fields.char('Condition', size=1024, required=True, readonly=False, help='Applied this head for calculation if condition is true'),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
         'active':fields.boolean('Active', required=False),
+        'python_code': fields.text('Python code'),
      }
     _defaults = {
         'conditions': 'True',

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index e338609..dab1151 100644 (file)
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -600,31 +600,37 @@
                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    <field name="appears_on_payslip"/>
                 </group>
-                <group col="6" colspan="6">
-                       <group col="2" colspan="2">
-                           <separator colspan="4" string="Calculations"/>
-                           <field name="category_id" on_change="onchange_category(category_id)"/>
-                           <field name="type"/>
-                           <field name="amount_type"/>
-                           <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
-                           <field name="conditions"/>
-                           <field name="condition_range_min"/>
-                        <field name="condition_range_max"/>
-                       </group>
-                       <group col="2" colspan="2">
-                               <group col="2" colspan="2">
-                               <separator colspan="4" string="Company contribution"/>
-                                   <field name="register_id"/>
-                                   <field name="company_contrib"/>
+                <notebook colspan="6">
+                    <page string="General">
+                               <group col="6" colspan="6">
+                                       <group col="2" colspan="2">
+                                           <separator colspan="4" string="Calculations"/>
+                                           <field name="category_id" on_change="onchange_category(category_id)"/>
+                                           <field name="type"/>
+                                           <field name="amount_type"/>
+                                           <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
+                                           <field name="conditions"/>
+                                           <field name="condition_range_min"/>
+                                       <field name="condition_range_max"/>
+                                       </group>
+                                       <group col="2" colspan="2">
+                                               <group col="2" colspan="2">
+                                               <separator colspan="4" string="Company contribution"/>
+                                                   <field name="register_id"/>
+                                                   <field name="company_contrib"/>
+                                               </group>
+                                               <group col="2" colspan="4">
+                                           <separator colspan="4" string="Computational Expression"/>
+                                           <field name="computational_expression" colspan="4" nolabel="1"/>
+                                       </group>
+                                       <group col="2" colspan="2">
+                                           <separator colspan="2" string="Applicable code (if Amount Type = Python code)"/>
+                                           <field name="python_code"  nolabel="1" attrs="{'readonly':[('amount_type','!=','code')],'required':[('amount_type','=','code')]}"/>
+                                       </group>
+                                  </group>
                                </group>
-                               <group col="2" colspan="4">
-                            <separator colspan="4" string="Computational Expression"/>
-                            <field name="computational_expression" colspan="4" nolabel="1"/>
-                        </group>
-                       </group>
-                </group>
-                <notebook colspan="4">
-                    <page string="Child Rules" groups="base.group_extended">
+                    </page>
+                    <page string="Child Rules">
                        <separator colspan="4" string="Children definition"/>
                        <field name="child_depend"/>
                        <field colspan="4" name="child_ids" nolabel="1"/>