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

[jftempo]

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2019-05-14 14:58:02 +0000
+++ bin/addons/account_override/account.py	2019-05-28 09:09:44 +0000
@@ -418,6 +418,8 @@
         """
         Use "-" instead of " " between name and code for account's default name
         """
+        if context is None:
+            context = {}
         if not ids:
             return []
         reads = self.read(cr, uid, ids, ['name', 'code'], context=context)
@@ -425,7 +427,10 @@
         for record in reads:
             name = record['name']
             if record['code']:
-                name = record['code'] + ' - '+name
+                if context.get('account_only_code'):
+                    name = record['code']
+                else:
+                    name = record['code'] + ' - '+name
             res.append((record['id'], name))
         return res
 
 
=== modified file 'bin/addons/msf_doc_import/msf_import_export.py'
--- bin/addons/msf_doc_import/msf_import_export.py	2019-05-14 15:12:35 +0000
+++ bin/addons/msf_doc_import/msf_import_export.py	2019-05-28 09:09:44 +0000
@@ -648,6 +648,9 @@
         acc_analytic_obj = self.pool.get('account.analytic.account')
         acc_dest_obj = self.pool.get('account.destination.link')
 
+        cost_centers_cache = {}
+        gl_account_cache = {}
+        parent_ok_cache = {}
         import_data_obj = self.pool.get('import_data')
         prod_nomenclature_obj = self.pool.get('product.nomenclature')
 
@@ -725,6 +728,16 @@
         fields_def = impobj.fields_get(cr, uid, context=context)
         i = 0
 
+        # custom process to retrieve CC, Destination_ids
+        custom_m2m = []
+        if import_brw.model_list_selection == 'destinations':
+            custom_m2m = ['dest_cc_ids', 'destination_ids']
+        elif import_brw.model_list_selection == 'funding_pools':
+            custom_m2m = ['cost_center_ids', 'tuple_destination_account_ids']
+        for c_m2m in custom_m2m:
+            if c_m2m in fields_def:
+                fields_def[c_m2m]['type'] = 'many2many_custom'
+
         def _get_obj(header, value, fields_def):
             list_obj = header.split('.')
             relation = fields_def[list_obj[0]]['relation']
@@ -964,6 +977,7 @@
 
                 # Funding Pools
                 if import_brw.model_list_selection == 'funding_pools':
+                    ids_to_update = acc_analytic_obj.search(cr, uid, [('code', '=ilike', data.get('code')), ('category', '=', 'FUNDING')])
                     context['from_import_menu'] = True
                     data['category'] = 'FUNDING'
                     # Parent Analytic Account
@@ -1016,10 +1030,13 @@
                     data['category'] = 'DEST'
                     # Parent Analytic Account
                     if data.get('parent_id'):
-                        parent_id = acc_analytic_obj.browse(cr, uid, data['parent_id'], fields_to_fetch=['type', 'category'], context=context)
-                        parent_type = parent_id.type or ''
-                        parent_category = parent_id.category or ''
-                        if parent_type != 'view' or parent_category != 'DEST':
+                        if data['parent_id'] not in parent_ok_cache:
+                            parent_id = acc_analytic_obj.browse(cr, uid, data['parent_id'], fields_to_fetch=['type', 'category'], context=context)
+                            parent_type = parent_id.type or ''
+                            parent_category = parent_id.category or ''
+                            if parent_type == 'view' and parent_category == 'DEST':
+                                parent_ok_cache[data['parent_id']] = True
+                        if not parent_ok_cache.get(data['parent_id']):
                             raise Exception(_('The Parent Analytic Account must be a View type Destination.'))
                     # Type
                     if data['type'] not in ['normal', 'view']:
@@ -1029,11 +1046,15 @@
                         if data.get('allow_all_cc'):
                             raise Exception(_("Please either list the Cost Centers to allow, or allow all Cost Centers."))
                         dest_cc_list = []
-                        for cost_center in data.get('dest_cc_ids').split(','):
+                        split_char = ';'
+                        if split_char not in data.get('dest_cc_ids'):
+                            split_char = ','
+                        for cost_center in data.get('dest_cc_ids').split(split_char):
                             cc = cost_center.strip()
-                            cc_dom = [('category', '=', 'OC'), ('type', '=', 'normal'),
-                                      '|', ('code', '=', cc), ('name', '=', cc)]
-                            cc_ids = impobj.search(cr, uid, cc_dom, order='id', limit=1, context=context)
+                            if cc not in cost_centers_cache:
+                                cc_dom = [('category', '=', 'OC'), ('type', '=', 'normal'), ('code', '=', cc)]
+                                cost_centers_cache[cc] = impobj.search(cr, uid, cc_dom, order='id', limit=1, context=context)
+                            cc_ids = cost_centers_cache.get(cc)
                             if cc_ids:
                                 dest_cc_list.append(cc_ids[0])
                             else:
@@ -1044,10 +1065,15 @@
                     # Accounts
                     if data.get('destination_ids'):  # "destinations_ids" corresponds to G/L accounts...
                         acc_list = []
-                        for account in data.get('destination_ids').split(','):
+                        split_char = ';'
+                        if split_char not in data.get('destination_ids'):
+                            split_char = ','
+                        for account in data.get('destination_ids').split(split_char):
                             acc = account.strip()
-                            acc_dom = [('type', '!=', 'view'), ('is_analytic_addicted', '=', True), ('code', '=', acc)]
-                            acc_ids = acc_obj.search(cr, uid, acc_dom, order='id', limit=1, context=context)
+                            if acc not in gl_account_cache:
+                                acc_dom = [('type', '!=', 'view'), ('is_analytic_addicted', '=', True), ('code', '=', acc)]
+                                gl_account_cache[acc] = acc_obj.search(cr, uid, acc_dom, order='id', limit=1, context=context)
+                            acc_ids = gl_account_cache.get(acc)
                             if acc_ids:
                                 acc_list.append(acc_ids[0])
                             else:
@@ -1082,6 +1108,7 @@
 
                 # Cost Centers
                 if import_brw.model_list_selection == 'cost_centers':
+                    ids_to_update = acc_analytic_obj.search(cr, uid, [('code', '=ilike', data.get('code')), ('category', '=', 'OC')])
                     context['from_import_menu'] = True
                     data['category'] = 'OC'
                     # Parent Analytic Account
 
=== modified file 'bin/addons/msf_doc_import/msf_import_export_conf.py'
--- bin/addons/msf_doc_import/msf_import_export_conf.py	2019-05-14 15:12:35 +0000
+++ bin/addons/msf_doc_import/msf_import_export_conf.py	2019-05-28 09:09:44 +0000
@@ -98,27 +98,32 @@
     'funding_pools': {
         'name': 'Funding Pools',
         'domain_type': 'finance',
-        'model': 'account.analytic.account'
+        'model': 'account.analytic.account',
+        'domain': [('category', '=', 'FUNDING'), ('parent_id', '!=', False)]
     },
     'destinations': {
         'name': 'Destinations',
         'domain_type': 'finance',
-        'model': 'account.analytic.account'
+        'model': 'account.analytic.account',
+        'domain': [('category', '=', 'DEST'), ('parent_id', '!=', False)]
     },
     'cost_centers': {
         'name': 'Cost Centers',
         'domain_type': 'finance',
-        'model': 'account.analytic.account'
+        'model': 'account.analytic.account',
+        'domain': [('category', '=', 'OC'), ('parent_id', '!=', False)]
     },
     'free1': {
         'name': 'Free 1',
         'domain_type': 'finance',
-        'model': 'account.analytic.account'
+        'model': 'account.analytic.account',
+        'domain': [('category', '=', 'FREE1'), ('parent_id', '!=', False)]
     },
     'free2': {
         'name': 'Free 2',
         'domain_type': 'finance',
-        'model': 'account.analytic.account'
+        'model': 'account.analytic.account',
+        'domain': [('category', '=', 'FREE2'), ('parent_id', '!=', False)]
     },
     'analytic_journals': {
         'name': 'Analytic Journals',
@@ -503,8 +508,8 @@
     },
     'funding_pools': {
         'header_list': [
+            'code',
             'name',
-            'code',
             'parent_id.code',
             'type',
             'date_start',
@@ -522,8 +527,8 @@
     },
     'cost_centers': {
         'header_list': [
+            'code',
             'name',
-            'code',
             'parent_id.code',
             'type',
             'date_start',
@@ -538,8 +543,8 @@
     },
     'destinations': {
         'header_list': [
+            'code',
             'name',
-            'code',
             'parent_id.code',
             'type',
             'date_start',
 
=== modified file 'bin/addons/msf_doc_import/report/import_generic_template.py'
--- bin/addons/msf_doc_import/report/import_generic_template.py	2019-05-06 09:49:19 +0000
+++ bin/addons/msf_doc_import/report/import_generic_template.py	2019-05-28 09:09:44 +0000
@@ -147,6 +147,8 @@
         new_ctx = context.copy()
         if 'lang' in MODEL_DICT.get(data['selection'], {}):
             new_ctx['lang'] = MODEL_DICT[data['selection']]['lang']
+        if data['selection'] == 'destinations':
+            new_ctx['account_only_code'] = True
         for i in range(0, len(ids), chunk_size):
             ids_chunk = ids[i:i + chunk_size]
             context['translate_selection_field'] = True