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

[jftempo]

=== modified file 'bin/addons/base/ir/ir_model.py'
--- bin/addons/base/ir/ir_model.py	2020-09-23 08:29:29 +0000
+++ bin/addons/base/ir/ir_model.py	2021-11-03 13:34:01 +0000
@@ -126,6 +126,21 @@
                     res[obj['id']] = rel_obj._order
         return res
 
+    def _get_exists(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        list_pool = self.pool.obj_list()
+        for model in self.read(cr, uid, ids, ['model'], context=context):
+            res[model['id']] = model['model'] in list_pool
+        return res
+
+    def _search_exists(self, cr, uid, model, name, domain, context=None):
+        if not domain:
+            return []
+        field, operator, value = domain[0]
+        if operator not in ['=']:
+            raise osv.except_osv(_('Invalid search'), _('The exists field can only be compared with = operator.'))
+        return [('model', bool(value) and 'in' or 'not in', self.pool.obj_list())]
+
     _columns = {
         'name': fields.char('Object Name', size=64, translate=True, required=True),
         'model': fields.char('Object', size=64, required=True, select=1),
@@ -139,6 +154,7 @@
         'modules': fields.function(_in_modules, method=True, type='char', size=128, string='In modules', help='List of modules in which the object is defined or inherited'),
         'view_ids': fields.function(_view_ids, method=True, type='one2many', obj='ir.ui.view', string='Views'),
         'default_order': fields.function(_get_default_order, method=True, string="Default Order", type="char"),
+        'exists': fields.function(_get_exists, method=True, string='Model in-use', type='boolean', fnct_search=_search_exists),
     }
 
     _defaults = {
@@ -216,7 +232,6 @@
     def get_unique_xml_name(self, cr, uid, uuid, table_name, res_id):
         model = self.browse(cr, uid, res_id, fields_to_fetch=['model'])
         a = 'ir_model_%s' % model.model.replace('.', '')
-        print a
         return a
 
 ir_model()

=== modified file 'bin/addons/msf_doc_import/msf_import_export.py'
--- bin/addons/msf_doc_import/msf_import_export.py	2021-07-02 10:31:57 +0000
+++ bin/addons/msf_doc_import/msf_import_export.py	2021-11-03 13:34:01 +0000
@@ -22,7 +22,7 @@
 import base64
 import time
 import logging
-
+import release
 import tools
 
 from osv import fields
@@ -99,6 +99,8 @@
         file_name = file_name.replace(' ', '_')
         if template_only:
             file_name = _('%s_Import_Template') % file_name
+        elif selection in ('user_groups', 'user_access', 'record_rules', 'access_control_list', 'access_control_list_empty', 'field_access_rules', 'field_access_rule_lines', 'button_access_rules', 'window_actions'):
+            file_name = _('%s_Export_%s_%s') % (file_name, release.version.split('-')[0], time.strftime('%Y%m%d'))
         else:
             file_name = _('%s_Export_%s') % (file_name, time.strftime('%Y%m%d'))
         return file_name

=== modified file 'bin/addons/msf_doc_import/msf_import_export_conf.py'
--- bin/addons/msf_doc_import/msf_import_export_conf.py	2021-03-17 17:32:47 +0000
+++ bin/addons/msf_doc_import/msf_import_export_conf.py	2021-11-03 13:34:01 +0000
@@ -175,14 +175,14 @@
         'domain_type': 'non_functionnal',
         'model': 'ir.model.access',
         'lang': 'en_MF',
-        'domain': [('from_system', '=', False)],
+        'domain': [('from_system', '=', False), ('model_id.exists', '=', True)],
     },
     'access_control_list_empty': {
         'name': 'Objects without ACL',
         'domain_type': 'non_functionnal',
         'model': 'ir.model.access.empty',
         'lang': 'en_MF',
-        'domain': [('model_id.osv_memory', '=', False)],
+        'domain': [('model_id.osv_memory', '=', False), ('model_id.exists','=', True)],
     },
     'field_access_rules': {
         'name': 'Field Access Rules',