Merge lp:~unifield-team/unifield-wm/bklg-9 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/bklg-9]

2370. By Vincent GREINER on 2015-02-06

BKLG-9 [FIX] hr expat import: when proceeded directly go to regular tree view (we do not take care about 'transaction import tree view')

2371. By Vincent GREINER on 2015-02-06

BKLG-9 [IMP] hr expat import: do not import file if any entry has no staff number

2372. By Vincent GREINER on 2015-02-09

[FIX] after expat import going to regular employee tree without bypassing import confirmation wizard...

2373. By Vincent GREINER on 2015-02-09

BKLG-9 [IMP] expat import: in confirmation wizard display the count of updated entries

2374. By Vincent GREINER on 2015-02-09

BKLG-9 [FIX] expat import: confirmation wizard return duplicate

2375. By Vincent GREINER on 2015-02-10

BKLG-9 [FIX] expat import: protect import when importing a file with a line with one cell (no code cell value)

=== modified file 'msf_homere_interface/hr_payroll_wizard.xml'
--- msf_homere_interface/hr_payroll_wizard.xml	2013-10-28 12:59:14 +0000
+++ msf_homere_interface/hr_payroll_wizard.xml	2015-02-10 16:01:23 +0000
@@ -85,7 +85,7 @@
                     <field name="filename" attrs="{'invisible': [('filename', '=', False)]}"/>
                     <group colspan="4" col="6">
                         <field name="created" attrs="{'invisible': [('state', '=', 'none')]}"/>
-                        <field name="updated" invisible="1"/> <!-- attrs="{'invisible': ['!', ('updated', '=', False), ('state', 'in', ['none', 'payroll'])]}"/-->
+                        <field name="updated" invisible="context.get('from', False) != 'expat_employee_import'"/> <!-- attrs="{'invisible': ['!', ('updated', '=', False), ('state', 'in', ['none', 'payroll'])]}"/-->
                         <field name="total" attrs="{'invisible': [('state', 'in', ['none', 'payroll'])]}"/>
                     </group>
                     <field name="error_line_ids" nolabel="1" colspan="4" attrs="{'invisible': [('nberrors', '=', 0)]}">

=== modified file 'msf_homere_interface/hr_view.xml'
--- msf_homere_interface/hr_view.xml	2013-10-25 14:35:48 +0000
+++ msf_homere_interface/hr_view.xml	2015-02-10 16:01:23 +0000
@@ -38,7 +38,7 @@
                             <separator colspan="2" string="Social IDs"/>
                             <field name="ssnid" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)]}"/>
                             <field name="sinid" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)]}"/>
-                            <field name="identification_id" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)], 'required': [('employee_type', '=', 'local')]}"/>
+                            <field name="identification_id" attrs="{'readonly': ['|', '&amp;', ('employee_type', '=', 'local'), ('allow_edition', '=', False), '&amp;', ('employee_type', '=', 'ex'), ('identification_id', '!=', False)], 'required': [('employee_type', 'in', ('local', 'ex'))]}"/>
                             <field name="passport_id" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)]}"/>
                         </group>
                         <group col="2" colspan="2">

=== modified file 'msf_homere_interface/wizard/hr_expat_import.py'
--- msf_homere_interface/wizard/hr_expat_import.py	2013-04-05 09:17:24 +0000
+++ msf_homere_interface/wizard/hr_expat_import.py	2015-02-10 16:01:23 +0000
@@ -41,6 +41,7 @@
         """
         Import XLS file
         """
+        hr_emp_obj = self.pool.get('hr.employee')
         # Some verifications
         if not context:
             context = {}
@@ -62,25 +63,36 @@
             reader = fileobj.getRows()
             reader.next()
             for line in reader:
-                processed += 1
                 name = line.cells and line.cells[0] and line.cells[0].data or False
                 if not name:
                     continue
-                code = line.cells and line.cells[1] and line.cells[1].data or False
-                # Create Expat employee
-                self.pool.get('hr.employee').create(cr, uid, {'name': line.cells[0].data, 'active': True, 'type': 'ex', 'identification_id': code})
-                created += 1
-            
-            context.update({'message': ' '})
-            
+                code = line.cells and len(line.cells) > 1 and line.cells[1] and line.cells[1].data or False
+                if not code:
+                    msg = "At least one employee in the import file does not" \
+                        " have an ID number; make sure all employees in the" \
+                        " file have an ID number and run the import again."
+                    raise osv.except_osv(_('Error'), _(msg))
+                processed += 1
+
+                ids = hr_emp_obj.search(cr, uid,
+                    [('identification_id', '=', code)])
+                if ids:
+                    # Update name of Expat employee
+                    hr_emp_obj.write(cr, uid, [ids[0]], {'name': name})
+                    updated += 1
+                else:
+                    # Create Expat employee
+                    hr_emp_obj.create(cr, uid, {'name': line.cells[0].data, 'active': True, 'type': 'ex', 'identification_id': code})
+                    created += 1
+            
+            context.update({'message': ' ', 'from': 'expat_import'})
+
             view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_homere_interface', 'payroll_import_confirmation')
             view_id = view_id and view_id[1] or False
-            
+
             # This is to redirect to Employee Tree View
             context.update({'from': 'expat_employee_import'})
-            
             res_id = self.pool.get('hr.payroll.import.confirmation').create(cr, uid, {'created': created, 'updated': updated, 'total': processed, 'state': 'employee'}, context=context)
-            
             return {
                 'name': 'Expat Employee Import Confirmation',
                 'type': 'ir.actions.act_window',

=== modified file 'msf_homere_interface/wizard/hr_payroll_employee_import.py'
--- msf_homere_interface/wizard/hr_payroll_employee_import.py	2014-10-09 08:53:34 +0000
+++ msf_homere_interface/wizard/hr_payroll_employee_import.py	2015-02-10 16:01:23 +0000
@@ -117,8 +117,12 @@
                 domain = ""
                 context.update({'search_default_non_validated': 1})
             if context.get('from') == 'expat_employee_import':
-                result = ('editable_view_employee_tree', 'hr.employee')
                 context.update({'search_default_employee_type_expatriate': 1})
+                action = self.pool.get('ir.actions.act_window').for_xml_id(cr,
+                    uid, 'hr', 'open_view_employee_list_my', context=context)
+                action['target'] = 'same'
+                action['context'] = context
+                return action
             if context.get('from') == 'nat_staff_import':
                 result = ('inherit_view_employee_tree', 'hr.employee')
                 context.update({'search_default_employee_type_local': 1, 'search_default_active': 1})