[IMP] hr_payroll:added field schedule_pay on hr.contract and improved view of company...

bzr revid: mtr@mtr-20110318131333-2msspn1nonnyd7g2

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index d287251..f6cbb78 100644 (file)
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -96,6 +96,15 @@ class hr_contract(osv.osv):
     _columns = {
         'struct_id': fields.many2one('hr.payroll.structure', 'Salary Structure'),
         'basic': fields.float('Basic Salary', digits_compute=dp.get_precision('Account')), # i think we can remove this because we have wage field on contract ?
+        'schedule_pay': fields.selection([
+            ('monthly', 'Monthly'),
+            ('quarterly', 'Quarterly'),
+            ('semi-annually', 'Semi-annually'),
+            ('annually', 'Annually'),
+            ('weekly', 'Weekly'),
+            ('bi-weekly', 'Bi-weekly'),
+            ('bi-monthly', 'Bi-monthly'),
+            ], 'Scheduled Pay', select=True),
     }
 
 hr_contract()

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 80d29f1..aaa727b 100644 (file)
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -47,6 +47,9 @@
                 <xpath expr="/form/notebook/page/group/field[@name='advantages']" position="before">
                     <field name="struct_id" select="1"/>
                 </xpath>
+                 <xpath expr="/form/notebook/page/group/field[@name='working_hours']" position="after">
+                    <field name="schedule_pay"/>
+                </xpath>
             </data>
             </field>
         </record>
@@ -596,7 +599,6 @@
                    <field name="sequence" />
                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    <field name="appears_on_payslip"/>
-                   <field name="company_contribution"/>
                 </group>
                 <notebook colspan="6">
                     <page string="General">
@@ -616,10 +618,13 @@
                             <group col="2" colspan="2">
                                 <group col="2" colspan="2">
                                 <separator colspan="4" string="Company contribution"/>
-                                    <field name="amt_type" attrs="{'required':[('company_contribution','=',True)]}"/>
-                                    <field name="contribute_per"/>
-                                    <field name="register_id"/>
-                                    <field name="company_contrib"/>
+                                    <field name="company_contribution"/>
+                                    <group col="2" colspan="2" attrs="{'readonly':[('company_contribution','=',False)]}">
+                                           <field name="amt_type" />
+                                           <field name="contribute_per"/>
+                                           <field name="register_id"/>
+                                           <field name="company_contrib"/>
+                                    </group>
                                 </group>
                                 <group col="2" colspan="4">
                                     <separator colspan="4" string="Computational Expression"/>