Merge lp:~julie-w/unifield-server/US-5443 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_journal/project/project.py'
--- bin/addons/account_journal/project/project.py	2017-09-18 12:35:40 +0000
+++ bin/addons/account_journal/project/project.py	2019-06-12 15:18:02 +0000
@@ -120,7 +120,11 @@
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
+        user_obj = self.pool.get('res.users')
         self._check_code_duplication(cr, uid, vals, context=context)
+        if 'instance_id' not in vals:
+            # Prop. instance by default at creation time is the current one: add it in vals to make it appear in the Track Changes
+            vals['instance_id'] = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id'], context=context).company_id.instance_id.id
         return super(account_analytic_journal, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
 
=== modified file 'bin/addons/msf_audittrail/__openerp__.py'
--- bin/addons/msf_audittrail/__openerp__.py	2019-05-14 07:28:06 +0000
+++ bin/addons/msf_audittrail/__openerp__.py	2019-06-12 15:18:02 +0000
@@ -51,6 +51,8 @@
         'data/audittrail_res_users.yml',
         'data/audittrail_hr_employee.yml',
         'data/audittrail_res_partner.yml',
+        'data/audittrail_account_analytic_journal.yml',
+        'data/audittrail_account_journal.yml',
         'data/audittrail_account_account.yml',
         'audittrail_report.xml',
         'audittrail_invoice_data.yml',
 
=== added file 'bin/addons/msf_audittrail/data/audittrail_account_analytic_journal.yml'
--- bin/addons/msf_audittrail/data/audittrail_account_analytic_journal.yml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_audittrail/data/audittrail_account_analytic_journal.yml	2019-06-12 15:18:02 +0000
@@ -0,0 +1,27 @@
+-
+  For Analytic Journals (account.analytic.journal), track the creation, modification, and deletion
+-
+  !python {model: audittrail.rule}: |
+    name = 'Analytic Journals'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'account.analytic.journal')], context=context)
+    rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
+    if object_ids:
+        fields = ['name', 'code', 'instance_id', 'type', 'active']
+
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'account.analytic.journal'), ('name', 'in', fields)], context=context)
+
+        vals = {
+            'name': name,
+            'object_id': object_ids[0],
+            'log_write': True,
+            'log_unlink': True,
+            'log_create': True,
+            'field_ids': [(6, 0, fields_ids)],
+        }
+
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
 
=== added file 'bin/addons/msf_audittrail/data/audittrail_account_journal.yml'
--- bin/addons/msf_audittrail/data/audittrail_account_journal.yml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_audittrail/data/audittrail_account_journal.yml	2019-06-12 15:18:02 +0000
@@ -0,0 +1,28 @@
+-
+  For Journals (account.journal), track the creation, modification, and deletion
+-
+  !python {model: audittrail.rule}: |
+    name = 'Journals'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'account.journal')], context=context)
+    rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
+    if object_ids:
+        fields = ['name', 'code', 'type', 'default_debit_account_id', 'default_credit_account_id', 'instance_id', 'currency',
+                  'analytic_journal_id', 'bank_account_name', 'bank_account_number', 'bank_swift_code', 'bank_address', 'bank_journal_id']
+
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'account.journal'), ('name', 'in', fields)], context=context)
+
+        vals = {
+            'name': name,
+            'object_id': object_ids[0],
+            'log_write': True,
+            'log_unlink': True,
+            'log_create': True,
+            'field_ids': [(6, 0, fields_ids)],
+        }
+
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
 
=== modified file 'bin/addons/msf_instance/add_instance.py'
--- bin/addons/msf_instance/add_instance.py	2019-05-02 09:38:25 +0000
+++ bin/addons/msf_instance/add_instance.py	2019-06-12 15:18:02 +0000
@@ -25,6 +25,7 @@
 class account_analytic_journal(osv.osv):
     _name = 'account.analytic.journal'
     _inherit = 'account.analytic.journal'
+    _trace = True
 
     def _get_current_instance(self, cr, uid, ids, name, args, context=None):
         """
@@ -70,6 +71,7 @@
 class account_journal(osv.osv):
     _name = 'account.journal'
     _inherit = 'account.journal'
+    _trace = True
 
     def name_get(self, cr, uid, ids, context=None):
         if context is None:
@@ -114,22 +116,19 @@
     # the create and write check and replace with the "good" journal if necessary.
     def create(self, cr, uid, vals, context=None):
         analytic_obj = self.pool.get('account.analytic.journal')
+        user_obj = self.pool.get('res.users')
+        if 'instance_id' not in vals:  # ensure that the instance_id always exists, in particular for the Track Changes
+            vals['instance_id'] = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id'], context=context).company_id.instance_id.id
         if vals.get('type') and vals.get('type') not in ['situation', 'stock'] and vals.get('analytic_journal_id'):
             analytic_journal = analytic_obj.browse(cr, uid, vals['analytic_journal_id'], context=context)
 
-            instance_id = False
-            if 'instance_id' in vals:
-                instance_id = vals['instance_id']
-            else:
-                instance_id = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.instance_id.id
-
             if analytic_journal and \
                analytic_journal.name and \
                analytic_journal.instance_id and \
-               analytic_journal.instance_id.id != instance_id:
+               analytic_journal.instance_id.id != vals['instance_id']:
                 # replace the journal with the one with the same name, and the wanted instance
                 new_journal_ids = analytic_obj.search(cr, uid, [('name','=', analytic_journal.name),
-                                                                ('instance_id','=',instance_id)], context=context)
+                                                                ('instance_id', '=', vals['instance_id'])], context=context)
                 if len(new_journal_ids) > 0:
                     vals['analytic_journal_id'] = new_journal_ids[0]
         return super(account_journal, self).create(cr, uid, vals, context=context)
 
=== 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	2019-05-14 15:12:35 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2019-06-12 15:18:02 +0000
@@ -150,7 +150,7 @@
 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.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'])]","['lang', 'src', 'name', 'value', 'type', 'xml_id']",HQ + MISSION,ir.translation,,Translations,Valid,,731
+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
 msf_sync_data_server.cash_request,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,"[('state', '!=', 'draft')]","['name', 'prop_instance_id/id', 'month_period_id/id', 'request_date', 'consolidation_currency_id/id', 'transfer_account_id/id', 'bank_journal_id/id', 'state', 'instance_ids/id', 'transfer_to_come', 'security_envelope', 'buffer', 'total_to_transfer', 'past_transfer_ids/id']",HQ + MISSION,cash.request,,Cash Request,Valid,,740
 msf_sync_data_server.cash_request_transfer_currency,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,"[('cash_request_id.state', '!=', 'draft')]","['currency_id/id', 'percentage', 'cash_request_id/id']",HQ + MISSION,cash.request.transfer.currency,,Cash Request Transfer Currency,Valid,,741
 msf_sync_data_server.cash_request_commitment,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,"[('cash_request_id.state', '!=', 'draft')]","['instance_id/id', 'instance_level', 'period_id/id', 'cash_request_id/id', 'total_commitment']",HQ + MISSION,cash.request.commitment,,Cash Request Commitment,Valid,,742
 
=== modified file 'bin/addons/msf_tools/msf_tools.py'
--- bin/addons/msf_tools/msf_tools.py	2019-05-06 09:49:19 +0000
+++ bin/addons/msf_tools/msf_tools.py	2019-06-12 15:18:02 +0000
@@ -667,10 +667,19 @@
                 return prod[0]['product_tmpl_id'][0]
         return res_id
 
-    def _audit_product_name(self, cr, uid, ids, vals, context=None):
-        if context.get('sync_update_execution') and vals.get('name') == 'product.template,name' and vals.get('lang'):
-            templ_obj = self.pool.get('product.template')
-            audit_rule_ids = templ_obj.check_audit(cr, uid, 'write')
+    def _audit_translatable_fields(self, cr, uid, ids, vals, context=None):
+        """
+        Fills in the Track Changes for translatable fields at synchro time,
+        e.g. track the updates received on journal name in the Track Changes of the Journal object
+        """
+        fields = ['product.template,name', 'account.account,name', 'account.analytic.account,name',
+                  'account.journal,name', 'account.analytic.journal,name']
+        if context is None:
+            context = {}
+        if context.get('sync_update_execution') and vals.get('name') in fields and vals.get('lang'):
+            obj_name = vals['name'].split(',')[0]
+            obj = self.pool.get(obj_name)
+            audit_rule_ids = obj.check_audit(cr, uid, 'write')
             if audit_rule_ids:
                 new_ctx = context.copy()
                 new_ctx['lang'] = vals['lang']
@@ -678,14 +687,14 @@
                 if not template_id and ids:
                     template_id = self.browse(cr, uid, ids[0], fields_to_fetch=['res_id'], context=new_ctx).res_id
                 if template_id:
-                    previous = templ_obj.read(cr, uid, [template_id], ['name'], context=new_ctx)[0]
+                    previous = obj.read(cr, uid, [template_id], ['name'], context=new_ctx)[0]
                     audit_obj = self.pool.get('audittrail.rule')
-                    audit_obj.audit_log(cr, uid, audit_rule_ids, templ_obj, template_id, 'write', previous, {template_id: {'name': vals['value']}} , context=context)
+                    audit_obj.audit_log(cr, uid, audit_rule_ids, obj, template_id, 'write', previous, {template_id: {'name': vals['value']}} , context=context)
 
 
 
     def write(self, cr, uid, ids, vals, clear=False, context=None):
-        self._audit_product_name(cr, uid, ids, vals, context=context)
+        self._audit_translatable_fields(cr, uid, ids, vals, context=context)
         return super(ir_translation, self).write(cr, uid, ids, vals, clear=clear, context=context)
 
 
@@ -731,8 +740,8 @@
                 self.write(cr, uid, ids, vals, context=context)
                 return ids[0]
 
-        if context.get('sync_update_execution') and vals.get('res_id') and vals.get('name') == 'product.template,name' and vals.get('lang'):
-            self._audit_product_name(cr, uid, False, vals, context=context)
+        if context.get('sync_update_execution') and vals.get('res_id') and vals.get('lang'):
+            self._audit_translatable_fields(cr, uid, False, vals, context=context)
 
         return super(ir_translation, self).create(cr, uid, vals, clear=clear, context=context)