Merge lp:~openerp-dev/openobject-addons/trunk-opw-582890-rgo into lp:openobject-addons

[Ravi Gohil (OpenERP)]

Hello,

This fix is against OPW Ref: 582890 where client faced a problem if he migrate from V6.0 to newer version where some of his data will be lost for "Marital Status" field of hr.employee object.

In V6.0, the marital status field is a m2o field, so user can create possible legal marital status as per the country rules.

In newer versions, this field changed to simple selection field with fixed values(Single, Married, Widower, Divorced), but there can be other legal marital status as per the country rules which a user expect in this list.

So, if customer want to migrate from V6.0 to V7.0, the status other than above four will be lost. hence, I changed the selection field to m2o field and made test cases adaptive to this change.

Kindly review the fix.

Thanks.

Unmerged revisions

8407. By Ravi Gohil (OpenERP) on 2012-12-19

[FIX] hr: added hr.employee.marital.status object to be used as m2o in hr.employee to handle data lose in migrated from older version : (Maintenance Case : 582890)

=== modified file 'hr/hr.py'
--- hr/hr.py	2012-12-10 11:16:54 +0000
+++ hr/hr.py	2012-12-19 13:32:09 +0000
@@ -69,6 +69,17 @@
 
 hr_employee_category()
 
+class hr_employee_marital_status(osv.osv):
+    _name = "hr.employee.marital.status"
+    _description = "Employee Marital Status"
+    _columns = {
+        'name': fields.char('Marital Status', size=32, required=True, translate=True),
+        'description': fields.text('Status Description'),
+        'is_married': fields.boolean('Married ?'),
+    }
+  
+hr_employee_marital_status()
+
 class hr_job(osv.osv):
 
     def _no_of_employee(self, cr, uid, ids, name, args, context=None):
@@ -166,7 +177,8 @@
         'identification_id': fields.char('Identification No', size=32),
         'otherid': fields.char('Other Id', size=64),
         'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
-        'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'),
+        'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
+        'is_married': fields.boolean('Married ?', help="It will be set based on the configuration of 'Married ?' field of 'Employee Marital Status' object"),
         'department_id':fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner', 'Working Address'),
         'address_home_id': fields.many2one('res.partner', 'Home Address'),
@@ -226,6 +238,12 @@
             resource_ids.append(employee.resource_id.id)
         return self.pool.get('resource.resource').unlink(cr, uid, resource_ids, context=context)
 
+    def onchange_marital_status(self, cr, uid, ids, marital_status, context=None):
+        if marital_status:
+            marital_status = self.pool.get('hr.employee.marital.status').browse(cr, uid, marital_status, context=context)
+            return {'value': {'is_married': marital_status.is_married}}
+        return {'value': {}}
+
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:
             address = self.pool.get('res.partner').browse(cr, uid, address, context=context)
 
=== modified file 'hr/hr_data.xml'
--- hr/hr_data.xml	2012-11-29 22:26:45 +0000
+++ hr/hr_data.xml	2012-12-19 13:32:09 +0000
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <!-- Employee Marital Statusses -->
+        <record id="hr_employee_marital_status_single" model="hr.employee.marital.status">
+            <field name="name">Single</field>
+        </record>
+        <record id="hr_employee_marital_status_married" model="hr.employee.marital.status">
+            <field name="name">Married</field>
+            <field eval="1" name="is_married"/>
+        </record>
+        <record id="hr_employee_marital_status_divorced" model="hr.employee.marital.status">
+            <field name="name">Divorced</field>
+        </record>
+        <record id="hr_employee_marital_status_widower" model="hr.employee.marital.status">
+            <field name="name">Widower</field>
+        </record>
+
         <!-- notify all employees of module installation -->
         <record model="mail.message" id="module_install_notification">
             <field name="model">mail.group</field>
 
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml	2012-12-08 10:33:38 +0000
+++ hr/hr_view.xml	2012-12-19 13:32:09 +0000
@@ -68,7 +68,8 @@
                                     </group>
                                     <group string="Status">
                                         <field name="gender"/>
-                                        <field name="marital"/>
+                                        <field name="marital" widget="selection" on_change="onchange_marital_status(marital)"/>
+                                        <field name="is_married" invisible="1"/>
                                     </group>
                                     <group string="Birth">
                                         <field name="birthday"/>
@@ -212,6 +213,41 @@
             <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
         </record>
 
+        <!-- Employee marital status -->
+        <record id="hr_hr_employee_marital_status_tree" model="ir.ui.view">
+            <field name="name">hr.hr.employee.marital.status.tree</field>
+            <field name="model">hr.employee.marital.status</field>
+            <field name="arch" type="xml">
+                <tree string="Marital Status">
+                    <field name="name" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
+            <field name="name">hr.hr.employee.marital.status</field>
+            <field name="model">hr.employee.marital.status</field>
+            <field name="arch" type="xml">
+                <form string="Marital Status">
+                    <field name="name"/>
+                    <field name="is_married"/>
+                    <separator colspan="4" string="Description"/>
+                    <field colspan="4" name="description" nolabel="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_hr_marital_status" model="ir.actions.act_window">
+            <field name="name">Marital Status</field>
+            <field name="res_model">hr.employee.marital.status</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="hr_hr_employee_marital_status_tree"/>
+        </record>
+
+        <menuitem action="action_hr_marital_status" id="hr_menu_marital_status"
+            parent="hr.menu_hr_configuration" sequence="3" groups="base.group_hr_manager"/>
+
         <!-- Employee architecture -->
         <record id="view_partner_tree2" model="ir.ui.view">
             <field name="name">hr.employee.tree</field>
 
=== modified file 'hr/security/ir.model.access.csv'
--- hr/security/ir.model.access.csv	2012-11-29 22:26:45 +0000
+++ hr/security/ir.model.access.csv	2012-12-19 13:32:09 +0000
@@ -7,4 +7,5 @@
 access_hr_department_user,hr.department.user,model_hr_department,base.group_hr_user,1,1,1,1
 access_hr_department_employee,hr.department.employee,model_hr_department,base.group_user,1,0,0,0
 access_hr_job_user,hr.job user,model_hr_job,base.group_hr_user,1,1,1,1
+access_hr_employee_marital_status_manager,hr.employee.marital.status.manager,model_hr_employee_marital_status,base.group_hr_manager,1,1,1,1
 access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,base.group_hr_user,1,1,1,0
 
=== modified file 'hr_contract/test/test_hr_contract.yml'
--- hr_contract/test/test_hr_contract.yml	2012-02-13 15:27:55 +0000
+++ hr_contract/test/test_hr_contract.yml	2012-12-19 13:32:09 +0000
@@ -10,7 +10,7 @@
     gender: male
     name: Mark Johnson
     children: 2
-    marital: 'married'
+    marital: hr.hr_employee_marital_status_married
     place_of_birth: Belgium
     vehicle: 'No'
     vehicle_distance: 12
 
=== modified file 'hr_payroll_account/test/hr_payroll_account.yml'
--- hr_payroll_account/test/hr_payroll_account.yml	2012-11-29 22:26:45 +0000
+++ hr_payroll_account/test/hr_payroll_account.yml	2012-12-19 13:32:09 +0000
@@ -19,7 +19,7 @@
     country_id: base.in
     department_id: hr.dep_rd
     gender: male
-    marital: single
+    marital: hr.hr_employee_marital_status_single
     name: John
     bank_account_id: res_partner_bank_0
     vehicle_distance: 0.0
 
=== modified file 'l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml'
--- l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml	2012-11-29 22:26:45 +0000
+++ l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml	2012-12-19 13:32:09 +0000
@@ -113,7 +113,7 @@
         <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 employee.spouse_fiscal_status=='with income')) and (employee.resident_bool!=True))</field>
+        <field name="condition_python">result = (((employee.marital.is_married==False) or (employee.marital.is_married==True and employee.spouse_fiscal_status=='with income')) and (employee.resident_bool!=True))</field>
     </record>
     <record id="hr_payroll_rules_baremeII" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll_head_pp"/>
@@ -124,7 +124,7 @@
         <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=='married' and employee.spouse_fiscal_status=='without income') and (employee.resident_bool!=True))</field>
+        <field name="condition_python">result = ((employee.marital.is_married==True and employee.spouse_fiscal_status=='without income') and (employee.resident_bool!=True))</field>
     </record>
     <record id="hr_payroll_rules_baremeIII" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll_head_pp"/>
 
=== modified file 'l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml'
--- l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml	2012-11-29 22:26:45 +0000
+++ l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml	2012-12-19 13:32:09 +0000
@@ -16,7 +16,7 @@
         </record>
 
         <record id="hr_payroll.hr_employee_payroll" model="hr.employee">
-            <field name="marital">single</field>
+            <field name="marital" ref="hr.hr_employee_marital_status_single"/>
         </record>
 
     </data>
 
=== modified file 'l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml'
--- l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml	2012-11-29 22:26:45 +0000
+++ l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml	2012-12-19 13:32:09 +0000
@@ -46,8 +46,8 @@
                     <field name="resident_bool" eval="False"/> 
                 </xpath>
                 <xpath expr="//field[@name='marital']" position="after">
-                    <field name="spouse_fiscal_status" attrs="{'invisible':[('marital','!=','married')],'required':[('marital','=','married')]}" colspan="1" help="if spouse has professionnel income or not"/> 
-                    <field name="disabled_spouse_bool" attrs="{'invisible':[('marital','!=','married')]}" colspan="1"/>
+                    <field name="spouse_fiscal_status" attrs="{'invisible':[('is_married','!=',True)],'required':[('is_married','=',True)]}" colspan="1" help="if spouse has professionnel income or not"/> 
+                    <field name="disabled_spouse_bool" attrs="{'invisible':[('is_married','!=',True)]}" colspan="1"/>
                 </xpath>
                 <xpath expr="//field[@name='children']" position="after">
                     <field name="disabled_children_bool"/>