Merge lp:~jfb-tempo-consulting/unifield-server/US-9869 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_homere_interface/hr.py'
--- bin/addons/msf_homere_interface/hr.py	2022-06-20 09:31:19 +0000
+++ bin/addons/msf_homere_interface/hr.py	2022-09-26 07:25:06 +0000
@@ -150,6 +150,7 @@
         'payment_method_id': fields.many2one('hr.payment.method', string='Payment Method', required=False, ondelete='restrict'),
         'bank_name': fields.char('Bank Name', size=256, required=False),
         'bank_account_number': fields.char('Bank Account Number', size=128, required=False),
+        'instance_creator': fields.char('Instance creator of the employee', size=64, readonly=1),
     }
 
     _defaults = {
@@ -238,6 +239,13 @@
         # Some verifications
         if not context:
             context = {}
+        if not context.get('sync_update_execution') and not vals.get('instance_creator'):
+            c = self.pool.get('res.users').browse(cr, uid, uid).company_id
+            instance_code = c and c.instance_id and c.instance_id.code
+
+            if instance_code:
+                vals['instance_creator'] = instance_code
+
         if vals.get('name'):
             vals['name'] = vals['name'].strip()
         allow_edition = False
@@ -267,6 +275,10 @@
         # Some verifications
         if not context:
             context = {}
+
+        if 'instance_creator' in vals:
+            del(vals['instance_creator'])
+
         # Prepare some values
         local = False
         ex = False
@@ -416,5 +428,14 @@
         processed, rejected, headers = import_obj.button_validate(cr, uid, [import_id], auto_import=True)
         return processed, rejected, headers
 
+    def update_exported_fields(self, cr, uid, fields):
+        res = super(hr_employee, self).update_exported_fields(cr, uid, fields)
+        if res:
+            res += [
+                ['company_id', _('Company')],
+                ['instance_creator', _('Instance creator of the employee')]
+            ]
+        return res
+
 hr_employee()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/msf_homere_interface/hr_view.xml'
--- bin/addons/msf_homere_interface/hr_view.xml	2020-09-01 08:22:26 +0000
+++ bin/addons/msf_homere_interface/hr_view.xml	2022-09-26 07:25:06 +0000
@@ -19,6 +19,7 @@
                     <field colspan="6" name="name" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)]}"/>
                     <field name="user_id" on_change="onchange_user(user_id)" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)]}"/>
                     <field name="company_id" widget="selection" on_change="onchange_company(company_id)" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)]}"/>
+                    <field name="instance_creator" />
                     <field name="active" />
                     <field name="employee_type" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)]}" on_change="onchange_type(employee_type)"/>
                     <newline/>

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2022-08-05 15:36:47 +0000
+++ bin/addons/msf_profile/data/patches.xml	2022-09-26 07:25:06 +0000
@@ -811,5 +811,9 @@
         <record id="us_9229_fix_rt" model="patch.scripts">
             <field name="method">us_9229_fix_rt</field>
         </record>
+
+        <record id="set_creator_on_employee" model="patch.scripts">
+            <field name="method">set_creator_on_employee</field>
+        </record>
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-08-23 13:15:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-09-26 07:25:06 +0000
@@ -32538,7 +32538,7 @@
 msgid "MSF Financing Module"
 msgstr "MSF Financing Module"
 
-#. modules: tender_flow, account_override, account_journal, register_accounting, procurement_cycle, finance, base_setup, stock_override, analytic, purchase_followup, report_webkit, stock, product, procurement_request, hr, consumption_calculation, msf_instance, purchase_override, specific_rules, base, purchase, account, resource, procurement_auto, sale, sales_followup, procurement, msf_profile, msf_supply_doc_export
+#. modules: tender_flow, account_override, account_journal, register_accounting, procurement_cycle, finance, base_setup, stock_override, analytic, purchase_followup, report_webkit, stock, product, procurement_request, hr, consumption_calculation, msf_instance, purchase_override, specific_rules, base, purchase, account, resource, procurement_auto, sale, sales_followup, procurement, msf_profile, msf_supply_doc_export, msf_homere_interface
 #: field:account.account,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.bank.statement,company_id:0
@@ -32654,6 +32654,7 @@
 #: field:stock.delivery.wizard,company_id:0
 #: field:supplier.performance.wizard,company_id:0
 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:266
+#: code:addons/msf_homere_interface/hr.py:435
 msgid "Company"
 msgstr "Société"
 
@@ -115817,3 +115818,10 @@
 msgid "Force Date and time of next execution"
 msgstr "Date et heure forcée de la prochiane exécution plannifiée"
 
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/hr.py:436
+#: field:hr.employee,instance_creator:0
+#, python-format
+msgid "Instance creator of the employee"
+msgstr "Instance de Création de l'employé"
+

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2022-08-05 15:36:47 +0000
+++ bin/addons/msf_profile/msf_profile.py	2022-09-26 07:25:06 +0000
@@ -56,6 +56,12 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    def set_creator_on_employee(self, cr, uid, *a, **b):
+        current_instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if current_instance:  # existing instances only
+            self.pool.get('sync.trigger.something.bidir_mission').create(cr, uid, {'name': 'instance_creator_employee', 'args': current_instance.code})
+        return True
+
     # UF26.0
     def fix_us_10163_ocbhq_funct_amount(self, cr, uid, *a, **b):
         ''' OCBHQ: fix amounts on EOY-2021-14020-OCBVE101-VES'''
@@ -5669,3 +5675,50 @@
         return super(sync_tigger_something_up, self).create(cr, uid, vals, context)
 
 sync_tigger_something_up()
+
+class sync_tigger_something_bidir_mission(osv.osv):
+    _name = 'sync.trigger.something.bidir_mission'
+
+    _columns = {
+        'name': fields.char('Name', size=256),
+        'args': fields.text('Args'),
+    }
+
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('name') == 'instance_creator_employee' and vals.get('args'):
+            # populate instance_creator on hr.employee
+            # triggered from sync to process sync in-pipe employee or after init sync
+            entity = self.pool.get('sync.client.entity')
+            if entity:
+                b = time.time()
+                cr.execute("""
+                    update hr_employee hr
+                        set instance_creator=instance.code
+                        from
+                            ir_model_data d,
+                            msf_instance instance
+                        where
+                            d.module = 'sd' and
+                            d.model = 'hr.employee' and
+                            d.res_id = hr.id and
+                            instance.instance_identifier = split_part(d.name, '/', 1) and
+                            coalesce(hr.instance_creator, '') = '' and
+                            hr.employee_type='local'
+                """)
+                self.pool.get('patch.scripts').log_info(cr, uid, 'Instance creator set on %d local employees in %d sec' % (cr.rowcount, time.time() - b))
+
+                c = self.pool.get('res.users').browse(cr, uid, uid).company_id
+                instance = c and c.instance_id and c.instance_id
+                main_parent = instance.code
+                if instance.parent_id:
+                    main_parent = instance.parent_id.code
+                    if instance.parent_id.parent_id:
+                        main_parent = instance.parent_id.parent_id.code
+                cr.execute("update hr_employee set instance_creator=%s where employee_type='ex' and coalesce(instance_creator, '') = ''", (main_parent, ))
+                self.pool.get('patch.scripts').log_info(cr, uid, 'Instance creator set on %d expat employees' % (cr.rowcount, ))
+
+        return super(sync_tigger_something_bidir_mission, self).create(cr, uid, vals, context)
+
+sync_tigger_something_bidir_mission()

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2022-06-22 13:46:44 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2022-09-26 07:25:06 +0000
@@ -71,11 +71,11 @@
 msf_sync_data_server.payment_method,FALSE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[]","['name']",HQ + MISSION,hr.payment.method,,Payment Method,Valid,,328
 msf_sync_data_server.payment_method2,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[]","['name']",OC,hr.payment.method,,Payment Method,Valid,,329
 msf_sync_data_server.job_description,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,[],"['code', 'description', 'expected_employees', 'name', 'requirements', 'state']",HQ + MISSION,hr.job,,Job Description,Valid,,330
-msf_sync_data_server.expatriate_employees,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('employee_type','=','ex'),('name','!=','Administrator')]","['birthday', 'code', 'cost_center_id/id', 'country_id/id', 'destination_id/id','employee_type', 'filter_for_third_party', 'free1_id/id', 'free2_id/id', 'funding_pool_id/id', 'gender', 'homere_codeterrain', 'homere_id_staff', 'homere_id_unique', 'homere_uuid_key', 'identification_id', 'job_id/id', 'marital/id', 'mobile_phone', 'name', 'name_resource', 'notes', 'passport_id', 'private_phone', 'resource_type', 'sinid', 'ssnid', 'work_email', 'work_location', 'work_phone']",HQ + MISSION,hr.employee,,Expatriate Employees,Valid,,331
+msf_sync_data_server.expatriate_employees,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('employee_type','=','ex'),('name','!=','Administrator')]","['birthday', 'code', 'cost_center_id/id', 'country_id/id', 'destination_id/id','employee_type', 'filter_for_third_party', 'free1_id/id', 'free2_id/id', 'funding_pool_id/id', 'gender', 'homere_codeterrain', 'homere_id_staff', 'homere_id_unique', 'homere_uuid_key', 'identification_id', 'job_id/id', 'marital/id', 'mobile_phone', 'name', 'name_resource', 'notes', 'passport_id', 'private_phone', 'resource_type', 'sinid', 'ssnid', 'work_email', 'work_location', 'work_phone', 'instance_creator']",HQ + MISSION,hr.employee,,Expatriate Employees,Valid,,331
 msf_sync_data_server.expatriate_employees_tree,FALSE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('parent_id', '!=', '')]",['parent_id/id'],HQ + MISSION,hr.employee,,Expatriate Employees Tree,Valid,,332
 msf_sync_data_server.expatriate_employees_activation,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('employee_type','=','ex'),('name','!=','Administrator')]",['active'],MISSION,hr.employee,,Expatriate Employees Activation,Valid,,333
 msf_sync_data_server.expatriate_employees_coach,FALSE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,"[('coach_id', '!=', '')]",['coach_id/id'],HQ + MISSION,hr.employee,,Expatriate Employees Coach,Valid,,334
-msf_sync_data_server.local_employees,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('employee_type','=','local'),('name','!=','Administrator')]","['birthday', 'code', 'cost_center_id/id', 'destination_id/id', 'employee_type', 'filter_for_third_party', 'free1_id/id', 'free2_id/id', 'funding_pool_id/id', 'gender', 'homere_codeterrain', 'homere_id_staff', 'homere_id_unique', 'homere_uuid_key', 'identification_id', 'job_id/id', 'marital/id', 'mobile_phone', 'name', 'name_resource', 'notes', 'passport_id', 'private_phone', 'resource_type', 'sinid', 'ssnid', 'work_email', 'work_location', 'work_phone', 'contract_start_date', 'contract_end_date', 'payment_method_id/id', 'bank_name', 'bank_account_number']",HQ + MISSION,hr.employee,,Local Employees,Valid,"{'active': False}",335
+msf_sync_data_server.local_employees,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('employee_type','=','local'),('name','!=','Administrator')]","['birthday', 'code', 'cost_center_id/id', 'destination_id/id', 'employee_type', 'filter_for_third_party', 'free1_id/id', 'free2_id/id', 'funding_pool_id/id', 'gender', 'homere_codeterrain', 'homere_id_staff', 'homere_id_unique', 'homere_uuid_key', 'identification_id', 'job_id/id', 'marital/id', 'mobile_phone', 'name', 'name_resource', 'notes', 'passport_id', 'private_phone', 'resource_type', 'sinid', 'ssnid', 'work_email', 'work_location', 'work_phone', 'contract_start_date', 'contract_end_date', 'payment_method_id/id', 'bank_name', 'bank_account_number', 'instance_creator']",HQ + MISSION,hr.employee,,Local Employees,Valid,"{'active': False}",335
 msf_sync_data_server.register,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('state','!=','draft'),('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['balance_end_real', 'balance_start', 'closing_date', 'comments', 'date', 'instance_id/id', 'journal_id/id', 'name', 'notes', 'open_advance_amount', 'period_id/id','closing_balance_frozen','closing_balance_frozen_date','unrecorded_expenses_amount', 'register_closed_by']",MISSION,account.bank.statement,instance_id,Register,Valid,,400
 msf_sync_data_server.register_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['account_id/id', 'amount_in', 'amount_out', 'analytic_distribution_id/id', 'cheque_number', 'date', 'direct_invoice', 'direct_state', 'document_date', 'employee_id/id', 'instance_id/id', 'name', 'note', 'partner_id/id', 'reconciled', 'ref', 'sequence', 'statement_id/id', 'transfer_amount','transfer_journal_id/id', 'type', 'from_cash_return']",MISSION,account.bank.statement.line,instance_id,Register Line,Valid,,401
 msf_sync_data_server.register_cashbox_line_starting,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('starting_id','in',('account.bank.statement','id',[('state','!=','draft')])),('starting_id', '!=', ''),('ending_id', '=', '')]","['instance_id/id', 'number', 'pieces', 'starting_id/id']",MISSION,account.cashbox.line,instance_id,Register Cashbox Line (starting),Valid,,402
@@ -156,6 +156,7 @@
 msf_sync_data.sync_monitor,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('status', '=', 'ok'),('instance_id', '!=', False)]","['instance_id/id', 'nb_msg_pull', 'nb_data_pull', 'nb_msg_push', 'nb_data_push', 'nb_msg_not_run', 'nb_data_not_run', 'start', 'end', 'destination_instance_id/id']",OC,sync.monitor,destination_instance_id,Sync Monitor,Valid,,720
 msf_sync_data.sync_version_instance_monitor,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,[],"['backup_date', 'backup_path', 'backup_size', 'instance_id/id', 'version', 'postgresql_disk_space', 'unifield_disk_space', 'cloud_date', 'cloud_backup', 'cloud_size', 'nb_late_vi', 'vi_details', 'backup_type', 'wal_directory', 'ssh_config_dir', 'basebackup_date', 'rsync_date', 'machine', 'platform', 'processor']",OC,sync.version.instance.monitor,,Sync Version Instance Monitor,Valid,,725
 msf_sync_data_server.trigger_something,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Down,"[]","['name']",OC,sync.trigger.something,,Trigger Something,Valid,,11
+msf_sync_data_server.trigger_something_bidir_mission,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[]","['name', 'args']",HQ + MISSION,sync.trigger.something.bidir_mission,,Trigger Something Bidir Mission,Valid,,1210
 msf_sync_data.msf_instance_cloud,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['cloud_url', 'cloud_login', 'cloud_password', 'cloud_schedule_time', 'instance', 'cloud_retry_from', 'cloud_retry_to']",OC,msf.instance.cloud,instance,Cloud backup config,Valid,,728
 msf_sync_data_server.ir_translation,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Down,"[('res_id', '!=', 0), ('src', '!=', False), ('xml_id', '!=', False), ('lang', '!=', 'en_US'), ('type', '=', 'model'), ('name', 'in', ['res.partner.category,name','product.uom,name','product.template,description_purchase','product.template,description','product.template,description_sale','product.uom.categ,name','product.pricelist,name','product.category,name','product.nomenclature,name','product.product,form_value','product.product,function_value','product.product,fit_value','res.currency,currency_name','res.country,name','product.ul,name','product.price.type,name','product.pricelist.type,name','product.pricelist.version,name','account.analytic.account,name','account.fiscal.position,note','hr.employee.marital.status,name','account.period,name','account.tax.code,name','account.journal,name','account.tax,name','account.analytic.journal,name','account.account,name','stock.reason.type,name','product.template,name','product.justification.code,code'])]","['lang', 'src', 'name', 'value', 'type', 'xml_id']",OC,ir.translation,,Translations,Valid,,730
 msf_sync_data_server.ir_translation_journal_up,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('res_id', '!=', 0), ('src', '!=', False), ('xml_id', '!=', False), ('lang', '!=', 'en_US'), ('type', '=', 'model'), ('name', 'in', ['account.journal,name', 'account.analytic.journal,name'])]","['lang', 'src', 'name', 'value', 'type', 'xml_id']",HQ + MISSION,ir.translation,,Translations,Valid,,731

=== modified file 'bin/addons/sync_common/common.py'
--- bin/addons/sync_common/common.py	2021-03-30 12:22:59 +0000
+++ bin/addons/sync_common/common.py	2022-09-26 07:25:06 +0000
@@ -150,6 +150,7 @@
     'sync.trigger.something.up',
     'sync.trigger.something.target',
     'sync.trigger.something.target.lower',
+    'sync.trigger.something.bidir_mission',
     'sync.version.instance.monitor',
     'tender',
     'tender.line',