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

[jftempo]

=== modified file 'bin/addons/account_corrections/wizard/analytic_distribution_wizard.py'
--- bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2020-02-06 16:52:43 +0000
+++ bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2020-11-02 12:53:01 +0000
@@ -269,6 +269,11 @@
                                      _('The Cost Center %s is not compatible with the Destination %s.') %
                                      (wiz_line.cost_center_id.code or '', wiz_line.destination_id.code or ''))
 
+            if not ad_obj.check_fp_cc_compatibility(cr, uid, wiz_line.analytic_id.id, wiz_line.cost_center_id.id, context=context):
+                raise osv.except_osv(_('Error'),
+                                     _('The Cost Center %s is not compatible with the Funding Pool %s.') %
+                                     (wiz_line.cost_center_id.code or '', wiz_line.analytic_id.code or ''))
+
             if not wiz_line.distribution_line_id or wiz_line.distribution_line_id.id not in old_line_ids:
                 # new distribution line
                 #if self.pool.get('account.analytic.account').is_blocked_by_a_contract(cr, uid, [wiz_line.analytic_id.id]):

=== modified file 'bin/addons/account_hq_entries/hq_entries.py'
--- bin/addons/account_hq_entries/hq_entries.py	2019-03-28 13:35:11 +0000
+++ bin/addons/account_hq_entries/hq_entries.py	2020-11-02 12:53:01 +0000
@@ -106,7 +106,7 @@
                 continue
             if line.analytic_id and not line.destination_id: # CASE 2/
                 # D Check, except B check
-                if line.cost_center_id.id not in [x.id for x in line.analytic_id.cost_center_ids] and line.analytic_id.id != fp_id:
+                if not ad_obj.check_fp_cc_compatibility(cr, uid, line.analytic_id.id, line.cost_center_id.id, context=context):
                     res[line.id] = 'invalid'
                     logger.notifyChannel('account_hq_entries', netsvc.LOG_WARNING, _('%s: CC (%s) not found in FP (%s)') % (line.id or '', line.cost_center_id.code or '', line.analytic_id.code or ''))
                     continue
@@ -124,7 +124,7 @@
                     logger.notifyChannel('account_hq_entries', netsvc.LOG_WARNING, _('%s: Tuple Account/DEST (%s/%s) not found in FP (%s)') % (line.id or '', line.account_id.code or '', line.destination_id.code or '', line.analytic_id.code or ''))
                     continue
                 # D Check, except B check
-                if line.cost_center_id.id not in [x.id for x in line.analytic_id.cost_center_ids] and line.analytic_id.id != fp_id:
+                if not ad_obj.check_fp_cc_compatibility(cr, uid, line.analytic_id.id, line.cost_center_id.id, context=context):
                     res[line.id] = 'invalid'
                     logger.notifyChannel('account_hq_entries', netsvc.LOG_WARNING, _('%s: CC (%s) not found in FP (%s)') % (line.id or '', line.cost_center_id.code or '', line.analytic_id.code or ''))
                     continue
@@ -470,7 +470,10 @@
                 fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
             except ValueError:
                 fp_id = 0
-            fields[0].set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'FUNDING'), '|', '&', ('cost_center_ids', '=', cost_center_id), ('tuple_destination', '=', (account_id, destination_id)), ('id', '=', %s)]" % fp_id)
+            fields[0].set('domain', "[('category', '=', 'FUNDING'), ('type', '!=', 'view'), "
+                                    "'|', "
+                                    "'&', ('fp_compatible_with_cc_ids', '=', cost_center_id), ('tuple_destination', '=', (account_id, destination_id)), "
+                                    "('id', '=', %s)]" % fp_id)
         # Change Destination field
         dest_fields = arch.xpath('field[@name="destination_id"]')
         for field in dest_fields:

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_split.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_split.py	2018-08-17 08:28:25 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_split.py	2020-11-02 12:53:01 +0000
@@ -292,7 +292,10 @@
                 arch = etree.fromstring(viewtemp['tree']['arch']) # the analytic_id is found in the line_ids, one level down
                 fields = arch.xpath('field[@name="analytic_id"]')
                 if fields:
-                    fields[0].set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'FUNDING'), '|', '&', ('cost_center_ids', '=', cost_center_id), ('tuple_destination', '=', (account_id, destination_id)), ('id', '=', %s)]" % fp_id)
+                    fields[0].set('domain', "[('category', '=', 'FUNDING'), ('type', '!=', 'view'),"
+                                            "'|', "
+                                            "'&', ('fp_compatible_with_cc_ids', '=', cost_center_id), ('tuple_destination', '=', (account_id, destination_id)), "
+                                            "('id', '=', %s)]" % fp_id)
 
                 # Change Destination field
                 dest_fields = arch.xpath('field[@name="destination_id"]')

=== modified file 'bin/addons/account_hq_entries/wizard/hq_reallocation.py'
--- bin/addons/account_hq_entries/wizard/hq_reallocation.py	2019-02-06 09:25:31 +0000
+++ bin/addons/account_hq_entries/wizard/hq_reallocation.py	2020-11-02 12:53:01 +0000
@@ -51,7 +51,7 @@
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
-        Change funding pool domain in order to include MSF Private fund
+        Adapts domain for AD fields
         """
         if not context:
             context = {}
@@ -68,39 +68,18 @@
             for field in fields:
                 field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('id', 'child_of', [%s])]" % oc_id)
             # Change FP field
-            try:
-                fp_id = data_obj.get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
-            except ValueError:
-                fp_id = 0
             fp_fields = form.xpath('//field[@name="analytic_id"]')
             # Do not use line with account_id, because of NO ACCOUNT_ID PRESENCE!
             for field in fp_fields:
-                field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'FUNDING'), '|', ('cost_center_ids', '=', cost_center_id), ('id', '=', %s)]" % fp_id)
+                field.set('domain', "[('category', '=', 'FUNDING'), ('type', '!=', 'view'), "
+                                    "('fp_compatible_with_cc_ids', '=', cost_center_id)]")
             # NO NEED TO CHANGE DESTINATION_ID FIELD because NO ACCOUNT_ID PRESENCE!
             view['arch'] = etree.tostring(form)
         return view
 
     def onchange_cost_center(self, cr, uid, ids, cost_center_id=False, analytic_id=False):
-        """
-        Check given cost_center with funding pool
-        """
-        # Prepare some values
-        res = {}
-        if cost_center_id and analytic_id:
-            fp_line = self.pool.get('account.analytic.account').browse(cr, uid, analytic_id)
-            # Search MSF Private Fund element, because it's valid with all accounts
-            try:
-                fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution',
-                                                                            'analytic_account_msf_private_funds')[1]
-            except ValueError:
-                fp_id = 0
-            if cost_center_id not in [x.id for x in fp_line.cost_center_ids] and analytic_id != fp_id:
-                res = {'value': {'analytic_id': False}}
-        elif not cost_center_id:
-            res = {}
-        else:
-            res = {'value': {'analytic_id': False}}
-        return res
+        return self.pool.get('analytic.distribution').\
+            onchange_ad_cost_center(cr, uid, ids, cost_center_id=cost_center_id, funding_pool_id=analytic_id, fp_field_name='analytic_id')
 
     def button_validate(self, cr, uid ,ids, context=None):
         """

=== modified file 'bin/addons/account_hq_entries/wizard/wizard_view.xml'
--- bin/addons/account_hq_entries/wizard/wizard_view.xml	2019-01-08 11:20:04 +0000
+++ bin/addons/account_hq_entries/wizard/wizard_view.xml	2020-11-02 12:53:01 +0000
@@ -51,7 +51,7 @@
                             <field name="destination_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"/>
                             <field name="cost_center_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"/>
                             <field name="analytic_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"
-                                   domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open'), ('cost_center_ids', '=', cost_center_id)]"
+                                   domain="[('category', '=', 'FUNDING'), ('type', '!=', 'view'), ('fp_compatible_with_cc_ids', '=', cost_center_id)]"
                                    string="Funding Pool"
                                    context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('document_date')}"/>
                             <field name="state"/>

=== modified file 'bin/addons/account_mcdb/mass_reallocation_search.py'
--- bin/addons/account_mcdb/mass_reallocation_search.py	2013-10-04 14:54:39 +0000
+++ bin/addons/account_mcdb/mass_reallocation_search.py	2020-11-02 12:53:01 +0000
@@ -37,8 +37,9 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
+        analytic_acc_obj = self.pool.get('account.analytic.account')
         # Only process first id
-        account = self.pool.get('account.analytic.account').browse(cr, uid, ids, context=context)[0]
+        account = analytic_acc_obj.browse(cr, uid, ids, context=context)[0]
         if account.category != 'FUNDING':
             raise osv.except_osv(_('Error'), _('This action only works for Funding Pool accounts!'))
         # Take all elements to create a domain
@@ -58,8 +59,9 @@
             else:
                 # trick to avoid problem with FP that have NO destination link. So we need to search a "False" Destination.
                 search.append(('destination_id', '=', 0))
-            if account.cost_center_ids:
-                search.append(('cost_center_id', 'in', [x.id for x in account.cost_center_ids]))
+            cost_centers = analytic_acc_obj.get_cc_linked_to_fp(cr, uid, account.id, context=context)
+            if cost_centers:
+                search.append(('cost_center_id', 'in', [c.id for c in cost_centers]))
             else:
                 # trick to avoid problem with FP that have NO CC.
                 search.append(('cost_center_id', '=', 0))

=== modified file 'bin/addons/analytic_distribution/account_commitment_view.xml'
--- bin/addons/analytic_distribution/account_commitment_view.xml	2020-05-07 08:28:47 +0000
+++ bin/addons/analytic_distribution/account_commitment_view.xml	2020-11-02 12:53:01 +0000
@@ -204,8 +204,8 @@
             <field name="arch" type="xml">
                 <form string="Intl Commitments Analytic Reallocation">
                     <group  colspan="6" col="6">
+                        <field name="cost_center_id" required="0" on_change="onchange_cost_center(cost_center_id, funding_pool_id)" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
                         <field name="destination_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
-                        <field name="cost_center_id" required="0" on_change="onchange_cost_center(cost_center_id, funding_pool_id)" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
                         <field name="funding_pool_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
                     </group>
                     <newline/>

=== modified file 'bin/addons/analytic_distribution/account_move_line.py'
--- bin/addons/analytic_distribution/account_move_line.py	2020-02-24 17:11:37 +0000
+++ bin/addons/analytic_distribution/account_move_line.py	2020-11-02 12:53:01 +0000
@@ -412,6 +412,7 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
+        ad_obj = self.pool.get('analytic.distribution')
         aml_duplication = '__copy_data_seen' in context and 'account.move.line' in context['__copy_data_seen'] or False
         from_duplication = context.get('copy', False) or aml_duplication
         if context.get('from_je_import', False) or from_duplication:
@@ -432,7 +433,8 @@
                         vals.update({'destination_id': l.account_id.default_destination_id.id})
                 if l.employee_id.funding_pool_id:
                     vals.update({'analytic_id': l.employee_id.funding_pool_id.id})
-                    if vals.get('cost_center_id') not in [cc.id for cc in l.employee_id.funding_pool_id.cost_center_ids]:
+                    if not ad_obj.check_fp_cc_compatibility(cr, uid, l.employee_id.funding_pool_id.id, l.employee_id.cost_center_id.id,
+                                                            context=context):
                         # Fetch default funding pool: MSF Private Fund
                         try:
                             msf_fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
@@ -458,7 +460,7 @@
                         to_change = True
 
                     if to_change:
-                        distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {'name': 'check_employee_analytic_distribution'})
+                        distrib_id = ad_obj.create(cr, uid, {'name': 'check_employee_analytic_distribution'}, context=context)
                         vals.update({'distribution_id': distrib_id, 'percentage': 100.0, 'currency_id': l.currency_id.id})
                         # Create funding pool lines
                         self.pool.get('funding.pool.distribution.line').create(cr, uid, vals)

=== modified file 'bin/addons/analytic_distribution/analytic_account_view.xml'
--- bin/addons/analytic_distribution/analytic_account_view.xml	2020-01-30 10:18:45 +0000
+++ bin/addons/analytic_distribution/analytic_account_view.xml	2020-11-02 12:53:01 +0000
@@ -83,9 +83,13 @@
                             <field name="date" select="2"/>
                         </page>
                         <page string="Cost centers" attrs="{'invisible': [('category', '!=', 'FUNDING')]}">
-                            <button name="button_cc_clear" type="object" string="Remove all" icon="gtk-clear" colspan="1"/>
+                            <field name="allow_all_cc_with_fp" colspan="4"
+                                   on_change="on_change_allow_all_cc_with_fp(allow_all_cc_with_fp, cost_center_ids)"/>
+                            <button name="button_cc_clear" type="object" string="Remove all" icon="gtk-clear" colspan="4"/>
                             <separator/>
-                            <field name="cost_center_ids" nolabel="1" domain="[('type', '!=', 'view'), ('category', '=', 'OC')]">
+                            <field name="cost_center_ids" nolabel="1" colspan="4"
+                                   domain="[('type', '!=', 'view'), ('category', '=', 'OC')]"
+                                   on_change="on_change_cc_with_fp(cost_center_ids)">
                                 <tree string="Cost Centers" >
                                     <field name="code"/>
                                     <field name="name"/>
@@ -112,7 +116,7 @@
                             <field name="allow_all_cc" colspan="4" on_change="on_change_allow_all_cc(allow_all_cc, dest_cc_ids)"/>
                             <button name="button_dest_cc_clear" type="object" string="Remove all" icon="gtk-clear" colspan="4"/>
                             <separator/>
-                            <field name="dest_cc_ids" nolabel="1" colspan="4" on_change="on_change_dest_cc_ids(dest_cc_ids)">
+                            <field name="dest_cc_ids" nolabel="1" colspan="4" on_change="on_change_cc_ids(dest_cc_ids)">
                                 <tree string="Cost Centers">
                                     <field name="code"/>
                                     <field name="name"/>

=== modified file 'bin/addons/analytic_distribution/analytic_distribution.py'
--- bin/addons/analytic_distribution/analytic_distribution.py	2020-01-30 17:08:29 +0000
+++ bin/addons/analytic_distribution/analytic_distribution.py	2020-11-02 12:53:01 +0000
@@ -44,6 +44,48 @@
                 return False
         return True
 
+    def check_fp_cc_compatibility(self, cr, uid, fp_id, cost_center_id, context=None):
+        """
+        Checks the compatibility between the FP and the Cost Center (cf. CC tab in the FP form).
+        Returns False if they aren't compatible.
+
+        If "Allow all Cost Centers" is ticked: only CC linked to the prop. instance of the FP are allowed.
+        """
+        if context is None:
+            context = {}
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        ir_model_data_obj = self.pool.get('ir.model.data')
+        res = True
+        if fp_id and cost_center_id:
+            # The Funding Pool PF is compatible with every CC
+            try:
+                pf_id = ir_model_data_obj.get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
+            except ValueError:
+                pf_id = 0
+            if fp_id != pf_id:
+                fp = analytic_acc_obj.browse(cr, uid, fp_id,
+                                             fields_to_fetch=['category', 'allow_all_cc_with_fp', 'instance_id', 'cost_center_ids'],
+                                             context=context)
+                cc = analytic_acc_obj.browse(cr, uid, cost_center_id, fields_to_fetch=['category', 'type', 'cc_instance_ids'], context=context)
+                if fp and cc and fp.category == 'FUNDING' and cc.category == 'OC':
+                    if fp.allow_all_cc_with_fp and cc.type != 'view' and fp.instance_id and \
+                            fp.instance_id.id in [inst.id for inst in cc.cc_instance_ids]:
+                        res = True
+                    elif cc.id in [c.id for c in fp.cost_center_ids]:
+                        res = True
+                    else:
+                        res = False
+        return res
+
+    def onchange_ad_cost_center(self, cr, uid, ids, cost_center_id=False, funding_pool_id=False, fp_field_name='funding_pool_id'):
+        """
+        Resets the FP in case the CC selected isn't compatible with it.
+        """
+        res = {}
+        if cost_center_id and funding_pool_id and not self.check_fp_cc_compatibility(cr, uid, funding_pool_id, cost_center_id):
+            res = {'value': {fp_field_name: False}}
+        return res
+
     def _get_distribution_state(self, cr, uid, distrib_id, parent_id, account_id, context=None,
                                 doc_date=False, posting_date=False, manual=False, amount=False):
         """
@@ -110,7 +152,7 @@
                 continue
             if (account_id, fp_line.destination_id.id) not in [x.account_id and x.destination_id and (x.account_id.id, x.destination_id.id) for x in fp_line.analytic_id.tuple_destination_account_ids if not x.disabled]:
                 return 'invalid'
-            if fp_line.cost_center_id.id not in [x.id for x in fp_line.analytic_id.cost_center_ids]:
+            if not self.check_fp_cc_compatibility(cr, uid, fp_line.analytic_id.id, fp_line.cost_center_id.id, context=context):
                 return 'invalid'
         # Check the date validity of the free accounts used in manual entries
         if manual and doc_date:
@@ -152,7 +194,7 @@
             return 'invalid', _('Cost Center not compatible with destination')
         if not is_private_fund:
             # Check that cost center is compatible with FP (except if FP is MSF Private Fund)
-            if cost_center_id not in [x.id for x in fp.cost_center_ids]:
+            if not self.check_fp_cc_compatibility(cr, uid, analytic_id, cost_center_id, context=context):
                 return 'invalid', _('Cost Center not compatible with FP')
             # Check that tuple account/destination is compatible with FP (except if FP is MSF Private Fund):
             if (account_id, destination_id) not in [x.account_id and x.destination_id and (x.account_id.id, x.destination_id.id) for x in fp.tuple_destination_account_ids if not x.disabled]:

=== modified file 'bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml'
--- bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml	2020-02-10 14:51:45 +0000
+++ bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml	2020-11-02 12:53:01 +0000
@@ -32,7 +32,7 @@
                     <field name="destination_id" on_change="onchange_destination(destination_id, analytic_id, parent.account_id)"
                            context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('posting_date')}"/>
                     <field name="analytic_id"
-                           domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open'), ('cost_center_ids', '=', cost_center_id)]"
+                           domain="[('category', '=', 'FUNDING'), ('type', '!=', 'view'), ('fp_compatible_with_cc_ids', '=', cost_center_id)]"
                            string="Funding Pool" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('document_date')}"/>
                     <field name="percentage" sum="Total Percentage" digits="(16,2)"/>
                     <field name="amount" sum="Total Amount"/>

=== modified file 'bin/addons/analytic_distribution/analytic_line.py'
--- bin/addons/analytic_distribution/analytic_line.py	2019-12-12 14:07:37 +0000
+++ bin/addons/analytic_distribution/analytic_line.py	2020-11-02 12:53:01 +0000
@@ -46,6 +46,7 @@
         if not args:
             return []
         res = []
+        analytic_acc_obj = self.pool.get('account.analytic.account')
         # We just support '=' operator
         for arg in args:
             if not arg[1]:
@@ -54,9 +55,9 @@
                 raise osv.except_osv(_('Warning'), _('This filter is not implemented yet!'))
             if not arg[2]:
                 raise osv.except_osv(_('Warning'), _('Some search args are missing!'))
-            analytic_account = self.pool.get('account.analytic.account').browse(cr, uid, arg[2])
+            analytic_account = analytic_acc_obj.browse(cr, uid, arg[2], fields_to_fetch=['tuple_destination_account_ids'], context=context)
             tuple_list = [x.account_id and x.destination_id and (x.account_id.id, x.destination_id.id) for x in analytic_account.tuple_destination_account_ids if not x.disabled]
-            cost_center_ids = [x and x.id for x in analytic_account.cost_center_ids]
+            cost_center_ids = [c.id for c in analytic_acc_obj.get_cc_linked_to_fp(cr, uid, analytic_account.id, context=context)]
             for cc in cost_center_ids:
                 for t in tuple_list:
                     if res:
@@ -457,12 +458,10 @@
                                                       account_id, context=context):
                     if aline.account_id and aline.account_id.id == msf_private_fund:
                         res.append(aline.id)
-                    elif aline.account_id and aline.cost_center_id and aline.account_id.cost_center_ids:
-                        if account_id in [x and x.id for x in aline.account_id.cost_center_ids] or aline.account_id.id == msf_private_fund:
-                            res.append(aline.id)
+                    elif aline.account_id and ad_obj.check_fp_cc_compatibility(cr, uid, aline.account_id.id, account_id, context=context):
+                        res.append(aline.id)
         elif account_type == 'FUNDING':
-            fp = self.pool.get('account.analytic.account').read(cr, uid, account_id, ['cost_center_ids', 'tuple_destination_account_ids'], context=context)
-            cc_ids = fp and fp.get('cost_center_ids', []) or []
+            fp = self.pool.get('account.analytic.account').read(cr, uid, account_id, ['tuple_destination_account_ids'], context=context)
             tuple_destination_account_ids = fp and fp.get('tuple_destination_account_ids', []) or []
             tuple_list = [x.account_id and x.destination_id and (x.account_id.id, x.destination_id.id) for x in self.pool.get('account.destination.link').browse(cr, uid, tuple_destination_account_ids) if not x.disabled]
             # Browse all analytic line to verify them
@@ -481,7 +480,9 @@
                 # - the cost_center is in compatible cost center from the new funding pool
                 # - the general account is in compatible account/destination tuple
                 # - the destination is in compatible account/destination tuple
-                if aline.cost_center_id and aline.cost_center_id.id in cc_ids and aline.general_account_id and aline.destination_id and (aline.general_account_id.id, aline.destination_id.id) in tuple_list:
+                if aline.cost_center_id and ad_obj.check_fp_cc_compatibility(cr, uid, account_id, aline.cost_center_id.id, context=context)\
+                        and aline.general_account_id and aline.destination_id and\
+                        (aline.general_account_id.id, aline.destination_id.id) in tuple_list:
                     res.append(aline.id)
         elif account_type == "DEST":
             for aline in self.browse(cr, uid, ids, context=context):
@@ -541,8 +542,7 @@
             # check funding pool (expect for MSF Private Fund)
             if not new_fp_id == msf_pf_id:  # all OK for MSF Private Fund
                 # - cost center and funding pool compatibility
-                cc_ids = [cc.id for cc in new_fp_br.cost_center_ids]
-                if not new_cc_id in cc_ids:
+                if not ad_obj.check_fp_cc_compatibility(cr, uid, new_fp_id, new_cc_id, context=context):
                     # not compatible with CC
                     res.append((id, entry_sequence, _('CC')))
                     return False

=== modified file 'bin/addons/analytic_distribution/report/funding_pool.py'
--- bin/addons/analytic_distribution/report/funding_pool.py	2019-04-03 13:47:21 +0000
+++ bin/addons/analytic_distribution/report/funding_pool.py	2020-11-02 12:53:01 +0000
@@ -29,6 +29,7 @@
         self.localcontext.update({
             'locale': locale,
             'today': self.today,
+            'all_cc': lambda f: self.pool.get('account.analytic.account').get_cc_linked_to_fp(cr, uid, f, context=context),
         })
 
     def today(self):

=== modified file 'bin/addons/analytic_distribution/report/funding_pool.rml'
--- bin/addons/analytic_distribution/report/funding_pool.rml	2019-04-17 10:00:14 +0000
+++ bin/addons/analytic_distribution/report/funding_pool.rml	2020-11-02 12:53:01 +0000
@@ -206,7 +206,7 @@
         </td>
       </tr>
         <tr>
-      <para style="P17">[[repeatIn(o.cost_center_ids,'line')]]</para>
+      <para style="P17">[[repeatIn(all_cc(o.id), 'line')]]</para>
           <td>
             <para style="P7">[[ line.code or '' ]]</para>
           </td>

=== modified file 'bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py'
--- bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2020-07-16 15:42:42 +0000
+++ bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2020-11-02 12:53:01 +0000
@@ -237,12 +237,18 @@
                     elif (context.get('from_invoice', False) and isinstance(context.get('from_invoice'), int)) or (context.get('from_commitment', False) and isinstance(context.get('from_commitment'), int)) \
                             or (context.get('from_model', False) and isinstance(context.get('from_model'), int)) \
                             or (context.get('from_move', False) and isinstance(context.get('from_move'), int)) \
-                            or (context.get('from_cash_return', False) and isinstance(context.get('from_cash_return'), int)):
-                        # Filter is only on cost_center and MSF Private Fund on invoice header
-                        field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'FUNDING'), ('hide_closed_fp', '=', True), '|', ('cost_center_ids', '=', cost_center_id), ('id', '=', %s)]" % fp_id)
+                            or (context.get('from_cash_return', False) and isinstance(context.get('from_cash_return'), int))\
+                            or (context.get('direct_invoice_id', False) and isinstance(context.get('direct_invoice_id'), int)):
+                        # Filter is only on cost_centers on invoice header
+                        field.set('domain', "[('category', '=', 'FUNDING'), ('type', '!=', 'view'), "
+                                            "('hide_closed_fp', '=', True), ('fp_compatible_with_cc_ids', '=', cost_center_id)]")
                     else:
                         # Add account_id constraints for invoice lines
-                        field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'FUNDING'), ('hide_closed_fp', '=', True), '|', '&', ('cost_center_ids', '=', cost_center_id), ('tuple_destination', '=', (parent.account_id, destination_id)), ('id', '=', %s)]" % fp_id)
+                        field.set('domain', "[('category', '=', 'FUNDING'), ('type', '!=', 'view'), "
+                                            "('hide_closed_fp', '=', True), "
+                                            "'|', "
+                                            "'&', ('fp_compatible_with_cc_ids', '=', cost_center_id), ('tuple_destination', '=', (parent.account_id, destination_id)), "
+                                            "('id', '=', %s)]" % fp_id)
                 # Change Destination field
                 dest_fields = tree.xpath('/tree/field[@name="destination_id"]')
                 for field in dest_fields:
@@ -433,31 +439,13 @@
         return res
 
     def onchange_cost_center(self, cr, uid, ids, cost_center_id=False, analytic_id=False):
-        """
-        Check given cost_center with funding pool
-        """
-        # Prepare some values
-        res = {}
-        # Search MSF Private Fund element, because it's valid with all accounts
-        try:
-            fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution',
-                                                                        'analytic_account_msf_private_funds')[1]
-        except ValueError:
-            fp_id = 0
+        return self.pool.get('analytic.distribution').\
+            onchange_ad_cost_center(cr, uid, ids, cost_center_id=cost_center_id, funding_pool_id=analytic_id, fp_field_name='analytic_id')
 
-        if cost_center_id and analytic_id:
-            fp_line = self.pool.get('account.analytic.account').browse(cr, uid, analytic_id)
-            if cost_center_id not in [x.id for x in fp_line.cost_center_ids] and analytic_id != fp_id:
-                res = {'value': {'analytic_id': False}}
-        elif not cost_center_id \
-                or analytic_id == fp_id:  # PF always compatible:
-            res = {}
-        else:
-            res = {'value': {'analytic_id': False}}
-        return res
 
 analytic_distribution_wizard_fp_lines()
 
+
 class analytic_distribution_wizard_f1_lines(osv.osv_memory):
     _name = 'analytic.distribution.wizard.f1.lines'
     _description = 'analytic.distribution.wizard.lines'

=== modified file 'bin/addons/analytic_distribution/wizard/commitment_analytic_reallocation.py'
--- bin/addons/analytic_distribution/wizard/commitment_analytic_reallocation.py	2015-02-09 12:53:11 +0000
+++ bin/addons/analytic_distribution/wizard/commitment_analytic_reallocation.py	2020-11-02 12:53:01 +0000
@@ -38,7 +38,7 @@
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
-        Change funding pool domain in order to include MSF Private fund
+        Adapts domain for AD fields
         """
         if context is None:
             context = {}
@@ -55,40 +55,19 @@
             for field in fields:
                 field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('id', 'child_of', [%s])]" % oc_id)
             # Change FP field
-            try:
-                fp_id = data_obj.get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
-            except ValueError:
-                fp_id = 0
             fp_fields = form.xpath('//field[@name="funding_pool_id"]')
             # Do not use line with account_id, because of NO ACCOUNT_ID PRESENCE!
             for field in fp_fields:
-                field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'FUNDING'), '|', ('cost_center_ids', '=', cost_center_id), ('id', '=', %s)]" % fp_id)
+                field.set('domain', "[('category', '=', 'FUNDING'), ('type', '!=', 'view'), "
+                                    "('fp_compatible_with_cc_ids', '=', cost_center_id)]")
             # NO NEED TO CHANGE DESTINATION_ID FIELD because NO ACCOUNT_ID PRESENCE!
             # Apply changes
             view['arch'] = etree.tostring(form)
         return view
 
     def onchange_cost_center(self, cr, uid, ids, cost_center_id=False, funding_pool_id=False):
-        """
-        Check given cost_center with funding pool
-        """
-        # Prepare some values
-        res = {}
-        if cost_center_id and funding_pool_id:
-            fp_line = self.pool.get('account.analytic.account').browse(cr, uid, funding_pool_id)
-            # Search MSF Private Fund element, because it's valid with all accounts
-            try:
-                fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 
-                'analytic_account_msf_private_funds')[1]
-            except ValueError:
-                fp_id = 0
-            if cost_center_id not in [x.id for x in fp_line.cost_center_ids] and funding_pool_id != fp_id:
-                res = {'value': {'funding_pool_id': False}}
-        elif not cost_center_id:
-            res = {}
-        else:
-            res = {'value': {'funding_pool_id': False}}
-        return res
+        return self.pool.get('analytic.distribution').\
+            onchange_ad_cost_center(cr, uid, ids, cost_center_id=cost_center_id, funding_pool_id=funding_pool_id)
 
     def button_validate(self, cr, uid ,ids, context=None):
         """

=== modified file 'bin/addons/analytic_override/analytic_account.py'
--- bin/addons/analytic_override/analytic_account.py	2020-10-09 14:34:01 +0000
+++ bin/addons/analytic_override/analytic_account.py	2020-11-02 12:53:01 +0000
@@ -290,6 +290,50 @@
                 dom.append(('id', 'in', compatible_dest_ids))
         return dom
 
+    def _search_fp_compatible_with_cc_ids(self, cr, uid, obj, name, args, context=None):
+        """
+        Returns a domain with all funding pools compatible with the selected Cost Center
+        E.g.: to get the FPs compatible with the CC 2, use the dom [('fp_compatible_with_cc_ids', '=', 2)]
+        """
+        dom = []
+        if context is None:
+            context = {}
+        ir_model_data_obj = self.pool.get('ir.model.data')
+        for arg in args:
+            if arg[0] == 'fp_compatible_with_cc_ids':
+                operator = arg[1]
+                cc_id = arg[2]
+                if operator != '=':
+                    raise osv.except_osv(_('Error'), _('Filter not implemented on Funding Pools.'))
+                cc = False
+                if cc_id and isinstance(cc_id, (int, long)):
+                    cc = self.browse(cr, uid, cc_id, fields_to_fetch=['category', 'type', 'cc_instance_ids'], context=context)
+                    if cc.category != 'OC' or cc.type == 'view':
+                        raise osv.except_osv(_('Error'), _('Filter only compatible with a normal-type Cost Center.'))
+                compatible_fp_ids = []
+                # The Funding Pool PF is compatible with every CC
+                try:
+                    pf_id = ir_model_data_obj.get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
+                except ValueError:
+                    pf_id = 0
+                compatible_fp_ids.append(pf_id)
+                if cc:
+                    other_fp_ids = self.search(cr, uid, [('category', '=', 'FUNDING'), ('type', '!=', 'view'), ('id', '!=', pf_id)],
+                                               context=context)
+                    for fp in self.browse(cr, uid, other_fp_ids,
+                                          fields_to_fetch=['allow_all_cc_with_fp', 'instance_id', 'cost_center_ids'],
+                                          context=context):
+                        if fp.allow_all_cc_with_fp and fp.instance_id and fp.instance_id.id in [inst.id for inst in cc.cc_instance_ids]:
+                            compatible = True
+                        elif cc.id in [c.id for c in fp.cost_center_ids]:
+                            compatible = True
+                        else:
+                            compatible = False
+                        if compatible:
+                            compatible_fp_ids.append(fp.id)
+                dom.append(('id', 'in', compatible_fp_ids))
+        return dom
+
     def _get_cc_instance_ids(self, cr, uid, ids, fields, arg, context=None):
         """
         Computes the values for fields.function fields, retrieving:
@@ -299,7 +343,8 @@
           ...as Cost centre picked for PO/FO reference => po_fo_cc_instance_ids
           (Note that those fields should theoretically always be linked to one single instance,
            but they are set as one2many in order to be consistent with the type of fields used in the related object.)
-        - the Missions where the Cost Center is added to => cc_missions
+        - the Instances where the Cost Center is added to => cc_instance_ids
+        - the related Missions => cc_missions
         """
         if context is None:
             context = {}
@@ -311,6 +356,7 @@
             top_instance_ids = []
             target_instance_ids = []
             po_fo_instance_ids = []
+            all_instance_ids = []
             missions = set()
             missions_str = ""
             target_cc_ids = acc_target_cc_obj.search(cr, uid, [('cost_center_id', '=', analytic_acc_id)], context=context)
@@ -318,6 +364,7 @@
                 field_list = ['instance_id', 'is_target', 'is_po_fo_cost_center', 'is_top_cost_center']
                 for target_cc in acc_target_cc_obj.browse(cr, uid, target_cc_ids, fields_to_fetch=field_list, context=context):
                     instance = target_cc.instance_id
+                    all_instance_ids.append(instance.id)
                     if instance.mission:
                         missions.add(instance.mission)
                     if target_cc.is_top_cost_center:
@@ -333,6 +380,7 @@
                 'is_target_cc_instance_ids': target_instance_ids,
                 'po_fo_cc_instance_ids': po_fo_instance_ids,
                 'cc_missions': missions_str,
+                'cc_instance_ids': all_instance_ids,
             }
         return res
 
@@ -357,13 +405,18 @@
         'dest_cc_ids': fields.many2many('account.analytic.account', 'destination_cost_center_rel',
                                         'destination_id', 'cost_center_id', string='Cost Centers',
                                         domain="[('type', '!=', 'view'), ('category', '=', 'OC')]"),
-        'allow_all_cc': fields.boolean(string="Allow all Cost Centers"),
+        'allow_all_cc': fields.boolean(string="Allow all Cost Centers"),  # for the Destinations
+        'allow_all_cc_with_fp': fields.boolean(string="Allow all Cost Centers"),  # for the Funding Pools
         'dest_compatible_with_cc_ids': fields.function(_get_fake, method=True, store=False,
                                                        string='Destinations compatible with the Cost Center',
                                                        type='many2many', relation='account.analytic.account',
                                                        fnct_search=_search_dest_compatible_with_cc_ids),
         'dest_without_cc': fields.function(_get_dest_without_cc, type='boolean', method=True, store=False,
                                            string="Destination allowing no Cost Center",),
+        'fp_compatible_with_cc_ids': fields.function(_get_fake, method=True, store=False,
+                                                     string='Funding Pools compatible with the Cost Center',
+                                                     type='many2many', relation='account.analytic.account',
+                                                     fnct_search=_search_fp_compatible_with_cc_ids),
         'top_cc_instance_ids': fields.function(_get_cc_instance_ids, method=True, store=False, readonly=True,
                                                string="Instances having the CC as Top CC",
                                                type="one2many", relation="msf.instance", multi="cc_instances"),
@@ -376,12 +429,16 @@
         'cc_missions': fields.function(_get_cc_instance_ids, method=True, store=False, readonly=True,
                                        string="Missions where the CC is added to",
                                        type='char', multi="cc_instances"),
+        'cc_instance_ids': fields.function(_get_cc_instance_ids, method=True, store=False, readonly=True,
+                                           string="Instances where the CC is added to",
+                                           type="one2many", relation="msf.instance", multi="cc_instances"),
     }
 
     _defaults ={
         'date_start': lambda *a: (datetime.today() + relativedelta(months=-3)).strftime('%Y-%m-%d'),
         'for_fx_gain_loss': lambda *a: False,
         'allow_all_cc': lambda *a: False,
+        'allow_all_cc_with_fp': lambda *a: False,
     }
 
     def _check_code_unicity(self, cr, uid, ids, context=None):
@@ -453,30 +510,40 @@
         res['domain']['parent_id'] = [('category', '=', category), ('type', '=', 'view')]
         return res
 
-    def on_change_allow_all_cc(self, cr, uid, ids, allow_all_cc, dest_cc_ids, context=None):
+    def on_change_allow_all_cc(self, cr, uid, ids, allow_all_cc, cc_ids, acc_type='destination', field_name='allow_all_cc', context=None):
         """
         If the user tries to tick the box "Allow all Cost Centers" whereas CC are selected,
         informs him that he has to remove the CC first
+        (acc_type = name of the Analytic Account Type to which the CC are linked, displayed in the warning msg)
         """
         res = {}
-        if allow_all_cc and dest_cc_ids and dest_cc_ids[0][2]:  # e.g. [(6, 0, [1, 2])]
+        if allow_all_cc and cc_ids and cc_ids[0][2]:  # e.g. [(6, 0, [1, 2])]
+            # NOTE: the msg is stored in a variable on purpose, otherwise the ".po" translation files would wrongly contain Python code
+            msg = 'Please remove the Cost Centers linked to the %s before ticking this box.' % acc_type.title()
             warning = {
                 'title': _('Warning!'),
-                'message': _('Please remove the Cost Centers linked to the Destination before ticking this box.')
+                'message': _(msg)
             }
             res['warning'] = warning
-            res['value'] = {'allow_all_cc': False, }
+            res['value'] = {field_name: False, }
         return res
 
-    def on_change_dest_cc_ids(self, cr, uid, ids, dest_cc_ids, context=None):
+    def on_change_allow_all_cc_with_fp(self, cr, uid, ids, allow_all_cc_with_fp, cost_center_ids, context=None):
+        return self.on_change_allow_all_cc(cr, uid, ids, allow_all_cc_with_fp, cost_center_ids, acc_type='funding pool',
+                                           field_name='allow_all_cc_with_fp', context=context)
+
+    def on_change_cc_ids(self, cr, uid, ids, cc_ids, field_name='allow_all_cc', context=None):
         """
         If at least a CC is selected, unticks the box "Allow all Cost Centers"
         """
         res = {}
-        if dest_cc_ids and dest_cc_ids[0][2]:  # e.g. [(6, 0, [1, 2])]
-            res['value'] = {'allow_all_cc': False, }
+        if cc_ids and cc_ids[0][2]:  # e.g. [(6, 0, [1, 2])]
+            res['value'] = {field_name: False, }
         return res
 
+    def on_change_cc_with_fp(self, cr, uid, ids, cost_center_ids, context=None):
+        return self.on_change_cc_ids(cr, uid, ids, cost_center_ids, field_name='allow_all_cc_with_fp', context=context)
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if not context:
             context = {}
@@ -539,12 +606,12 @@
             vals['parent_id'] = funding_pool_parent
 
     def remove_inappropriate_links(self, vals, context=None):
-        '''
-        Remove relations that are incoherent regarding the category selected. For instance an account with
-        category "Funding Pool" can have associated cost centers, whereas a "Destination" shouldn't.
+        """
+        Removes relations that are inconsistent regarding the category selected. For instance an account with the
+        category "Funding Pool" can have associated cost centers, whereas a "Cost Center" shouldn't.
         (That would happen if the category is modified after that the relations have been created).
         :return: corrected vals
-        '''
+        """
         if context is None:
             context = {}
         if 'category' in vals:
@@ -555,6 +622,7 @@
             if vals['category'] != 'FUNDING':
                 vals['tuple_destination_account_ids'] = [(6, 0, [])]
                 vals['cost_center_ids'] = [(6, 0, [])]
+                vals['allow_all_cc_with_fp'] = False  # default value
         return vals
 
     def _check_date(self, vals):
@@ -720,6 +788,32 @@
             'target': 'current',
         }
 
+    def get_cc_linked_to_fp(self, cr, uid, fp_id, context=None):
+        """
+        Returns a browse record list of all Cost Centers compatible with the Funding Pool in parameter:
+        - if "Allow all Cost Centers" is ticked: all CC linked to the prop. instance of the FP
+        - else all CC selected in the FP form.
+
+        Note: this method matches with what has been selected in the Cost centers tab of the FP form.
+              It returns an empty list for PF.
+        """
+        if context is None:
+            context = {}
+        cc_list = []
+        fp = self.browse(cr, uid, fp_id,
+                         fields_to_fetch=['category', 'allow_all_cc_with_fp', 'instance_id', 'cost_center_ids'],
+                         context=context)
+        if fp.category == 'FUNDING':
+            if fp.allow_all_cc_with_fp and fp.instance_id:
+                # inactive CC are included on purpose, to match with selectable CC in FP form
+                for cc_id in self.search(cr, uid, [('category', '=', 'OC'), ('type', '!=', 'view')], order='code', context=context):
+                    cc = self.browse(cr, uid, cc_id, context=context)
+                    if fp.instance_id.id in [inst.id for inst in cc.cc_instance_ids]:
+                        cc_list.append(cc)
+            else:
+                cc_list = fp.cost_center_ids or []
+        return cc_list
+
     def button_cc_clear(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'cost_center_ids':[(6, 0, [])]}, context=context)
         return True

=== modified file 'bin/addons/msf_audittrail/audittrail_invoice_data.yml'
--- bin/addons/msf_audittrail/audittrail_invoice_data.yml	2019-06-26 10:13:00 +0000
+++ bin/addons/msf_audittrail/audittrail_invoice_data.yml	2020-11-02 12:53:01 +0000
@@ -259,7 +259,7 @@
         # Create the rule
         fields = ['state', 'category', 'code', 'complete_name', 'cost_center_ids', 'date', 'date_start', 'name', 'parent_id',
                   'type', 'for_fx_gain_loss', 'instance_id', 'tuple_destination_account_ids', 'description', 'destination_ids',
-                  'dest_cc_ids', 'allow_all_cc']
+                  'dest_cc_ids', 'allow_all_cc', 'allow_all_cc_with_fp']
 
         fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'account.analytic.account'), ('name', 'in', fields)], context=context)
 

=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2020-06-25 08:27:13 +0000
+++ bin/addons/msf_doc_import/account.py	2020-11-02 12:53:01 +0000
@@ -519,9 +519,9 @@
                             continue
                         # if the Fund. Pool used is NOT "PF" check the compatibility with the (account, dest) and the CC
                         if r_fp != msf_fp_id:
-                            fp_fields = ['tuple_destination_account_ids', 'cost_center_ids']
                             fp = self.pool.get('account.analytic.account').browse(cr, uid, r_fp,
-                                                                                  fields_to_fetch=fp_fields, context=context)
+                                                                                  fields_to_fetch=['tuple_destination_account_ids'],
+                                                                                  context=context)
                             if (account.id, r_destination) not in \
                                 [t.account_id and t.destination_id and (t.account_id.id, t.destination_id.id)
                                  for t in fp.tuple_destination_account_ids if not t.disabled]:
@@ -530,7 +530,7 @@
                                               (current_line_num, line[cols['G/L Account']], line[cols['Destination']],
                                                line[cols['Funding Pool']]))
                                 continue
-                            if cc.id not in [c.id for c in fp.cost_center_ids]:
+                            if not ad_obj.check_fp_cc_compatibility(cr, uid, fp.id, cc.id, context=context):
                                 errors.append(_('Line %s. The Cost Center %s is not compatible with the Funding Pool %s.') %
                                               (current_line_num, line[cols['Cost Centre']], line[cols['Funding Pool']]))
                                 continue

=== modified file 'bin/addons/msf_homere_interface/hr.py'
--- bin/addons/msf_homere_interface/hr.py	2020-09-01 08:22:26 +0000
+++ bin/addons/msf_homere_interface/hr.py	2020-11-02 12:53:01 +0000
@@ -209,21 +209,26 @@
         (_check_unicity, "Another employee has the same Identification No.", ['identification_id']),
     ]
 
-    def _check_employe_dest_cc_compatibility(self, cr, uid, employee_id, context=None):
+    def _check_employee_cc_compatibility(self, cr, uid, employee_id, context=None):
         """
-        Raises an error in case the employee Destination and Cost Center are not compatible
+        Raises an error in case the employee "Destination and Cost Center" or "Funding Pool and Cost Center" are not compatible.
         """
         if context is None:
             context = {}
         ad_obj = self.pool.get('analytic.distribution')
-        employee_fields = ['destination_id', 'cost_center_id', 'name_resource']
+        employee_fields = ['destination_id', 'cost_center_id', 'funding_pool_id', 'name_resource']
         employee = self.browse(cr, uid, employee_id, fields_to_fetch=employee_fields, context=context)
         emp_dest = employee.destination_id
         emp_cc = employee.cost_center_id
+        emp_fp = employee.funding_pool_id
         if emp_dest and emp_cc:
             if not ad_obj.check_dest_cc_compatibility(cr, uid, emp_dest.id, emp_cc.id, context=context):
                 raise osv.except_osv(_('Error'), _('Employee %s: the Cost Center %s is not compatible with the Destination %s.') %
                                      (employee.name_resource, emp_cc.code or '', emp_dest.code or ''))
+        if emp_fp and emp_cc:
+            if not ad_obj.check_fp_cc_compatibility(cr, uid, emp_fp.id, emp_cc.id, context=context):
+                raise osv.except_osv(_('Error'), _('Employee %s: the Cost Center %s is not compatible with the Funding Pool %s.') %
+                                     (employee.name_resource, emp_cc.code or '', emp_fp.code or ''))
 
     def create(self, cr, uid, vals, context=None):
         """
@@ -246,7 +251,7 @@
             if (not context.get('from', False) or context.get('from') not in ['yaml', 'import']) and not context.get('sync_update_execution', False) and not allow_edition:
                 raise osv.except_osv(_('Error'), _('You are not allowed to create a local staff! Please use Import to create local staff.'))
         employee_id = super(hr_employee, self).create(cr, uid, vals, context)
-        self._check_employe_dest_cc_compatibility(cr, uid, employee_id, context=context)
+        self._check_employee_cc_compatibility(cr, uid, employee_id, context=context)
         return employee_id
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -298,7 +303,7 @@
             employee_id = super(hr_employee, self).write(cr, uid, emp.id, new_vals, context)
             if employee_id:
                 res.append(employee_id)
-            self._check_employe_dest_cc_compatibility(cr, uid, emp.id, context=context)
+            self._check_employee_cc_compatibility(cr, uid, emp.id, context=context)
         return res
 
     def unlink(self, cr, uid, ids, context=None):
@@ -328,7 +333,7 @@
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
-        Change funding pool domain in order to include MSF Private fund
+        Adapts domain for AD fields
         """
         if not context:
             context = {}
@@ -350,36 +355,16 @@
                 dest_field.set('domain', "[('category', '=', 'DEST'), ('type', '!=', 'view'), "
                                          "('dest_compatible_with_cc_ids', '=', cost_center_id)]")
             # Change FP field
-            try:
-                fp_id = data_obj.get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
-            except ValueError:
-                fp_id = 0
-            fp_fields = form.xpath('/'  + view_type + '//field[@name="funding_pool_id"]')
+            fp_fields = form.xpath('/' + view_type + '//field[@name="funding_pool_id"]')
             for field in fp_fields:
-                field.set('domain', "[('category', '=', 'FUNDING'), ('type', '!=', 'view'), ('state', '=', 'open'), '|', ('cost_center_ids', '=', cost_center_id), ('id', '=', %s)]" % fp_id)
+                field.set('domain', "[('category', '=', 'FUNDING'), ('type', '!=', 'view'), "
+                                    "('fp_compatible_with_cc_ids', '=', cost_center_id)]")
             view['arch'] = etree.tostring(form)
         return view
 
     def onchange_cc(self, cr, uid, ids, cost_center_id=False, funding_pool_id=False):
-        """
-        Update FP or CC regarding both.
-        """
-        # Prepare some values
-        vals = {}
-        if not cost_center_id or not funding_pool_id:
-            return {}
-        if cost_center_id and funding_pool_id:
-            fp = self.pool.get('account.analytic.account').browse(cr, uid, funding_pool_id)
-            try:
-                fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
-            except ValueError:
-                fp_id = 0
-            # Exception for MSF Private Fund
-            if funding_pool_id == fp_id:
-                return {}
-            if cost_center_id not in [x.id for x in fp.cost_center_ids]:
-                vals.update({'funding_pool_id': False})
-        return {'value': vals}
+        return self.pool.get('analytic.distribution').\
+            onchange_ad_cost_center(cr, uid, ids, cost_center_id=cost_center_id, funding_pool_id=funding_pool_id)
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
 

=== modified file 'bin/addons/msf_homere_interface/hr_payroll.py'
--- bin/addons/msf_homere_interface/hr_payroll.py	2019-05-14 15:12:35 +0000
+++ bin/addons/msf_homere_interface/hr_payroll.py	2020-11-02 12:53:01 +0000
@@ -103,7 +103,7 @@
                 continue
             if line.funding_pool_id and not line.destination_id: # CASE 2/
                 # D Check, except B check
-                if line.cost_center_id.id not in [x.id for x in line.funding_pool_id.cost_center_ids] and line.funding_pool_id.id != fp_id:
+                if not ad_obj.check_fp_cc_compatibility(cr, uid, line.funding_pool_id.id, line.cost_center_id.id, context=context):
                     res[line.id] = 'invalid'
                     continue
             elif not line.funding_pool_id and line.destination_id: # CASE 3/
@@ -118,7 +118,7 @@
                     res[line.id] = 'invalid'
                     continue
                 # D Check, except B check
-                if line.cost_center_id.id not in [x.id for x in line.funding_pool_id.cost_center_ids] and line.funding_pool_id.id != fp_id:
+                if not ad_obj.check_fp_cc_compatibility(cr, uid, line.funding_pool_id.id, line.cost_center_id.id, context=context):
                     res[line.id] = 'invalid'
                     continue
                 # E Check
@@ -255,7 +255,7 @@
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
-        Change funding pool domain in order to include MSF Private fund
+        Adapts domain for AD fields
         """
         if not context:
             context = {}
@@ -278,7 +278,10 @@
                 fp_id = 0
             fp_fields = form.xpath('//field[@name="funding_pool_id"]')
             for field in fp_fields:
-                field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'FUNDING'), '|', '&', ('cost_center_ids', '=', cost_center_id), ('tuple_destination', '=', (account_id, destination_id)), ('id', '=', %s)]" % fp_id)
+                field.set('domain', "[('category', '=', 'FUNDING'), ('type', '!=', 'view'), "
+                                    "'|', "
+                                    "'&', ('fp_compatible_with_cc_ids', '=', cost_center_id), ('tuple_destination', '=', (account_id, destination_id)), "
+                                    " ('id', '=', %s)]" % fp_id)
             # Change Destination field
             dest_fields = form.xpath('//field[@name="destination_id"]')
             for field in dest_fields:

=== modified file 'bin/addons/msf_homere_interface/hr_payroll_wizard.xml'
--- bin/addons/msf_homere_interface/hr_payroll_wizard.xml	2020-02-07 15:20:55 +0000
+++ bin/addons/msf_homere_interface/hr_payroll_wizard.xml	2020-11-02 12:53:01 +0000
@@ -18,7 +18,9 @@
                         <field name="destination_id" context="{'search_default_active': 1, 'hide_inactive': 1}"
                                domain="[('category', '=', 'DEST'), ('type', '!=', 'view'),
                                         ('dest_compatible_with_cc_ids', '=', cost_center_id)]"/>
-                        <field name="funding_pool_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
+                        <field name="funding_pool_id" context="{'search_default_active': 1, 'hide_inactive': 1}"
+                               domain="[('category', '=', 'FUNDING'), ('type', '!=', 'view'),
+                                        ('fp_compatible_with_cc_ids', '=', cost_center_id)]"/>
                     </group>
                     <newline/>
                     <field name="free1_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>

=== modified file 'bin/addons/msf_homere_interface/wizard/hr_analytic_reallocation.py'
--- bin/addons/msf_homere_interface/wizard/hr_analytic_reallocation.py	2015-07-22 09:03:35 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_analytic_reallocation.py	2020-11-02 12:53:01 +0000
@@ -40,7 +40,7 @@
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
-        Change funding pool domain in order to include MSF Private fund
+        Computes the domain for the Cost Center field
         """
         if not context:
             context = {}
@@ -56,41 +56,13 @@
             fields = form.xpath('//field[@name="cost_center_id"]')
             for field in fields:
                 field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('id', 'child_of', [%s])]" % oc_id)
-            # Change FP field
-            try:
-                fp_id = data_obj.get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
-            except ValueError:
-                fp_id = 0
-            fp_fields = form.xpath('//field[@name="funding_pool_id"]')
-            # Do not use line with account_id, because of NO ACCOUNT_ID PRESENCE!
-            for field in fp_fields:
-                field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'FUNDING'), '|', ('cost_center_ids', '=', cost_center_id), ('id', '=', %s)]" % fp_id)
-            # NO NEED TO CHANGE DESTINATION_ID FIELD because NO ACCOUNT_ID PRESENCE!
             # Apply changes
             view['arch'] = etree.tostring(form)
         return view
 
     def onchange_cost_center(self, cr, uid, ids, cost_center_id=False, funding_pool_id=False):
-        """
-        Check given cost_center with funding pool
-        """
-        # Prepare some values
-        res = {}
-        if cost_center_id and funding_pool_id:
-            fp_line = self.pool.get('account.analytic.account').browse(cr, uid, funding_pool_id)
-            # Search MSF Private Fund element, because it's valid with all accounts
-            try:
-                fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 
-                'analytic_account_msf_private_funds')[1]
-            except ValueError:
-                fp_id = 0
-            if cost_center_id not in [x.id for x in fp_line.cost_center_ids] and funding_pool_id != fp_id:
-                res = {'value': {'funding_pool_id': False}}
-        elif not cost_center_id:
-            res = {}
-        else:
-            res = {'value': {'funding_pool_id': False}}
-        return res
+        return self.pool.get('analytic.distribution').\
+            onchange_ad_cost_center(cr, uid, ids, cost_center_id=cost_center_id, funding_pool_id=funding_pool_id)
 
     def button_validate(self, cr, uid ,ids, context=None):
         """

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-10-28 17:16:11 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-11-02 12:53:01 +0000
@@ -61535,10 +61535,10 @@
 msgstr "Le total hors-taxe"
 
 #. module: register_accounting
-#: code:addons/register_accounting/wizard/wizard_cash_return.py:800
+#: code:addons/register_accounting/wizard/wizard_cash_return.py:824
 #, python-format
-msgid "All advance lines with account that depends on analytic distribution must have an allocation."
-msgstr "All advance lines with account that depends on analytic distribution must have an allocation."
+msgid "All advance lines with an account depending on an analytic distribution must have a valid allocation."
+msgstr "Toutes les lignes d'avance dont le compte dépend d'une distribution analytique doivent avoir une allocation valide."
 
 #. module: stock
 #: field:product.category,property_stock_account_output_categ:0
@@ -104790,7 +104790,20 @@
 msgstr "Filtre non mis en oeuvre sur les Destinations."
 
 #. module: analytic_override
+#: code:addons/analytic_override/analytic_account.py:307
+#, python-format
+msgid "Filter not implemented on Funding Pools."
+msgstr "Filtre non mis en oeuvre sur les Funding Pools."
+
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_account.py:312
+#, python-format
+msgid "Filter only compatible with a normal-type Cost Center."
+msgstr "Filtre compatible uniquement avec un Centre de Coût de type normal."
+
+#. module: analytic_override
 #: field:account.analytic.account,allow_all_cc:0
+#: field:account.analytic.account,allow_all_cc_with_fp:0
 msgid "Allow all Cost Centers"
 msgstr "Autoriser tous les Centres de Coût"
 
@@ -104806,17 +104819,34 @@
 msgstr "Destinations compatibles avec le Centre de Coût"
 
 #. module: analytic_override
+#: field:account.analytic.account,fp_compatible_with_cc_ids:0
+msgid "Funding Pools compatible with the Cost Center"
+msgstr "Funding Pools compatibles avec le Centre de Coût"
+
+#. module: analytic_override
 #: code:addons/analytic_override/analytic_account.py:347
 #, python-format
 msgid "Please remove the Cost Centers linked to the Destination before ticking this box."
 msgstr "Veuillez supprimer les Centres de Coût liés à la Destination avant de cocher cette case."
 
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_account.py:347
+#, python-format
+msgid "Please remove the Cost Centers linked to the Funding Pool before ticking this box."
+msgstr "Veuillez supprimer les Centres de Coût liés au Funding Pool avant de cocher cette case."
+
 #. module: account_corrections
 #: code:addons/account_corrections/wizard/analytic_distribution_wizard.py:246
 #, python-format
 msgid "The Cost Center %s is not compatible with the Destination %s."
 msgstr "Le Centre de Coût %s n'est pas compatible avec la Destination %s."
 
+#. module: account_corrections
+#: code:addons/account_corrections/wizard/analytic_distribution_wizard.py:274
+#, python-format
+msgid "The Cost Center %s is not compatible with the Funding Pool %s."
+msgstr "Le Centre de Coût %s n'est pas compatible avec le Funding Pool %s."
+
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/account.py:490
 #, python-format
@@ -105166,6 +105196,12 @@
 msgid "Employee %s: the Cost Center %s is not compatible with the Destination %s."
 msgstr "Employé %s : le Centre de Coût %s n'est pas compatible avec la Destination %s."
 
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/hr.py:229
+#, python-format
+msgid "Employee %s: the Cost Center %s is not compatible with the Funding Pool %s."
+msgstr "Employé %s : le Centre de Coût %s n'est pas compatible avec le Funding Pool %s."
+
 #. module: msf_supply_doc_export
 #: report:po.follow.up_rml:0
 msgid "Status:"
@@ -109907,6 +109943,11 @@
 msgid "Missions where the CC is added to"
 msgstr "Missions dans lesquelles le CC est ajouté"
 
+#. module: analytic_override
+#: field:account.analytic.account,cc_instance_ids:0
+msgid "Instances where the CC is added to"
+msgstr "Instances dans lesquelles le CC est ajouté"
+
 #. module: sync_client
 #: field:sync_client.survey.user,nb_displayed:0
 msgid "# Display"

=== 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	2020-09-01 08:22:26 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2020-11-02 12:53:01 +0000
@@ -26,7 +26,7 @@
 msf_sync_data_server.analytical_journal_project,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('instance_id.level', '=', 'project'),('code','!=','ENGI')]","['code', 'name', 'type','instance_id/id']",MISSION,account.analytic.journal,,Analytical Journal (Project),Valid,,121
 msf_sync_data_server.analytical_journal,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,[],"['code', 'name', 'type','instance_id/id']",OC,account.analytic.journal,instance_id,Analytical Journal,Valid,,122
 msf_sync_data_server.link_accounts_destination,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['account_id/id', 'destination_id/id', 'disabled']",OC,account.destination.link,,Link accounts Destination,Valid,,123
-msf_sync_data_server.funding_pool_to_coordo,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,"[('category' , '=' , 'FUNDING')]","['category', 'code', 'cost_center_ids/id', 'date', 'date_start', 'description', 'instance_id/id', 'name', 'tuple_destination_account_ids/id', 'type']",HQ + MISSION,account.analytic.account,instance_id,Funding Pool linked to a special coordo,Valid,,124
+msf_sync_data_server.funding_pool_to_coordo,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,"[('category' , '=' , 'FUNDING')]","['category', 'code', 'cost_center_ids/id', 'date', 'date_start', 'description', 'instance_id/id', 'name', 'tuple_destination_account_ids/id', 'type', 'allow_all_cc_with_fp']",HQ + MISSION,account.analytic.account,instance_id,Funding Pool linked to a special coordo,Valid,,124
 msf_sync_data_server.fp_tree0,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('category', 'in', ['FREE1', 'FREE2', 'DEST']),('parent_id', '!=', '')]","['parent_id/id', 'instance_id/id']",OC,account.analytic.account,instance_id,"DestF1F2 tree (only F1, F2 and Dest)",Valid,,126
 msf_sync_data_server.fp_tree,FALSE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,"[('category', 'in', ['FREE1', 'FREE2', 'DEST']),('parent_id', '!=', '')]",['parent_id/id'],MISSION,account.analytic.account,,"Analytic account tree (only F1, F2 and Dest) – Coordo/Projects only",Valid,,127
 msf_sync_data_server.currency_rate,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('rate' , '!=' , ''),('currency_id', '!=', ''), ('currency_id', 'in', ('res.currency', 'id', [('active', 'in', ['t', 'f']), ('currency_table_id', '=', '')]))]","['currency_id/id', 'name', 'rate']",OC,res.currency.rate,,Currency Rate,Valid,,128

=== modified file 'bin/addons/register_accounting/wizard/wizard_cash_return.py'
--- bin/addons/register_accounting/wizard/wizard_cash_return.py	2020-02-04 13:20:04 +0000
+++ bin/addons/register_accounting/wizard/wizard_cash_return.py	2020-11-02 12:53:01 +0000
@@ -820,7 +820,9 @@
         # check if any line with an analytic-a-holic account missing the distribution_id value
         for st_line in wizard.advance_line_ids:
             if st_line.account_id.is_analytic_addicted and st_line.analytic_distribution_state != 'valid':
-                raise osv.except_osv(_('Warning'), _('All advance lines with account that depends on analytic distribution must have an allocation.'))
+                raise osv.except_osv(_('Warning'),
+                                     _('All advance lines with an account depending on an analytic distribution '
+                                       'must have a valid allocation.'))
 
         # Do computation of total_amount of advance return lines
         self.compute_total_amount(cr, uid, ids, context=context)