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

[jftempo]

=== modified file 'bin/addons/account/account.py'
--- bin/addons/account/account.py	2020-08-07 12:54:32 +0000
+++ bin/addons/account/account.py	2020-11-02 12:53:09 +0000
@@ -517,6 +517,25 @@
             res['value'] = {'prevent_multi_curr_rec': False}
         return res
 
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """
+        Displays specific views when G/L accounts are selected from a Funding Pool, a Financing Contract or a Donor
+        """
+        if context is None:
+            context = {}
+        ir_model_obj = self.pool.get('ir.model.data')
+        if context.get('from_fp') or context.get('from_grant_management'):
+            view = False
+            module = 'account'
+            if view_type == 'search':
+                search_view_name = context.get('from_grant_management') and 'view_account_contract_search' or 'view_account_fp_search'
+                view = ir_model_obj.get_object_reference(cr, uid, module, search_view_name)
+            elif view_type == 'tree':
+                view = ir_model_obj.get_object_reference(cr, uid, module, 'view_account_fp_tree')
+            if view:
+                view_id = view[1]
+        return super(account_account, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
+
 
 account_account()
 

=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2020-09-08 16:37:35 +0000
+++ bin/addons/account/account_view.xml	2020-11-02 12:53:09 +0000
@@ -239,6 +239,57 @@
             </field>
         </record>
 
+        <!-- G/L account Search View to be displayed from FP -->
+        <record id="view_account_fp_search" model="ir.ui.view">
+            <field name="name">account.account.fp.search</field>
+            <field name="model">account.account</field>
+            <field name="type">search</field>
+            <field name="priority" eval="90"/>
+            <field name="arch" type="xml">
+                <search>
+                    <group>
+                        <field name="code"/>
+                        <field name="name"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!-- G/L account Search View to be displayed from contracts/donors -->
+        <record id="view_account_contract_search" model="ir.ui.view">
+            <field name="name">account.account.contract.search</field>
+            <field name="model">account.account</field>
+            <field name="type">search</field>
+            <field name="priority" eval="91"/>
+            <field name="arch" type="xml">
+                <search>
+                    <group>
+                        <filter name="active" string="Active" icon="terp-check" domain="[('filter_active', '=', True)]" />
+                        <filter name="inactive" string="Inactive" icon="gtk-dialog-error" domain="[('filter_active', '=', False)]" />
+                        <field name="code"/>
+                        <field name="name"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!-- G/L account Tree View to be displayed from FP and contracts/donors -->
+        <record id="view_account_fp_tree" model="ir.ui.view">
+            <field name="name">account.account.fp.tree</field>
+            <field name="model">account.account</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="90"/>
+            <field name="arch" type="xml">
+                <tree string="G/L Accounts" colors="grey:selected_in_fp or selected_in_contract"
+                      notselectable="selected_in_fp or selected_in_contract" >
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="selected_in_fp" invisible="1"/>
+                    <field name="selected_in_contract" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="view_account_list" model="ir.ui.view">
             <field name="name">account.account.list</field>
             <field name="model">account.account</field>

=== 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:09 +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:09 +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
@@ -119,12 +119,13 @@
                     continue
             else: # CASE 4/
                 # C Check, except B
-                if (line.account_id.id, 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 line.analytic_id.tuple_destination_account_ids if not x.disabled] and line.analytic_id.id != fp_id:
+                if not ad_obj.check_fp_acc_dest_compatibility(cr, uid, line.analytic_id.id, line.account_id.id,
+                                                              line.destination_id.id, context=context):
                     res[line.id] = 'invalid'
                     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
@@ -458,7 +459,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 = {}
@@ -466,11 +467,9 @@
         arch = etree.fromstring(view['arch'])
         fields = arch.xpath('field[@name="analytic_id"]')
         if fields:
-            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
-            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), "
+                                    "('fp_compatible_with_acc_dest_ids', '=', (account_id, destination_id))]")
         # Change Destination field
         dest_fields = arch.xpath('field[@name="destination_id"]')
         for field in dest_fields:
@@ -479,32 +478,8 @@
         return view
 
     def onchange_destination(self, cr, uid, ids, destination_id=False, funding_pool_id=False, account_id=False):
-        """
-        Check given funding pool with destination
-        """
-        # Prepare some values
-        res = {}
-        # If all elements given, then search FP compatibility
-        if destination_id and funding_pool_id and account_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
-            # Delete funding_pool_id if not valid with tuple "account_id/destination_id".
-            # but do an exception for MSF Private FUND analytic account
-            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_line.tuple_destination_account_ids if not x.disabled] and funding_pool_id != fp_id:
-                res = {'value': {'analytic_id': False}}
-        # If no destination, do nothing
-        elif not destination_id:
-            res = {}
-        # Otherway: delete FP
-        else:
-            res = {'value': {'analytic_id': False}}
-        # If destination given, search if given
-        return res
+        return self.pool.get('analytic.distribution').\
+            onchange_ad_destination(cr, uid, ids, destination_id=destination_id, funding_pool_id=funding_pool_id, account_id=account_id)
 
     def _check_cc(self, cr, uid, ids, context=None):
         """

=== 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:09 +0000
@@ -271,36 +271,6 @@
         return super(hq_entries_split, self).create(cr, uid, vals,
                                                     context=context)
 
-    # UFTP-200: Add the correct funding pool domain to the split line based on the account_id and cost_center
-    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
-        """
-        if context is None:
-            context = {}
-        view = super(hq_entries_split, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
-        fields = view['fields']
-        if view_type=='form' and fields:
-            if fields.get('line_ids') and fields.get('line_ids')['views']:
-                # get the default PF and include into the domain for analytic_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
-
-                viewtemp = fields.get('line_ids')['views']
-                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)
-
-                # Change Destination field
-                dest_fields = arch.xpath('field[@name="destination_id"]')
-                for field in dest_fields:
-                    field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'DEST'), ('destination_ids', '=', account_id)]")
-                    viewtemp['tree']['arch'] = etree.tostring(arch)
-        return view
-
     def button_validate(self, cr, uid, ids, context=None):
         """
         Validate wizard lines and create new split HQ lines.

=== 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:09 +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,17 @@
             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!
+            # no restrictions are related to the G/L accounts because the wizard isn't linked to one single line with a specific account_id
             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!
+                field.set('domain', "[('category', '=', 'FUNDING'), ('type', '!=', 'view'), "
+                                    "('fp_compatible_with_cc_ids', '=', cost_center_id)]")
             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:09 +0000
@@ -48,10 +48,13 @@
                                    domain="[('restricted_area', '=', 'hq_lines_correction'), ('filter_active', '=', True)]"
                             />
                             <field name="amount"/>
-                            <field name="destination_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"/>
+                            <field name="destination_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"
+                                   domain="[('category', '=', 'DEST'), ('type', '!=', 'view'), ('destination_ids', '=', account_id)]"/>
                             <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),
+                                            ('fp_compatible_with_acc_dest_ids', '=', (account_id, destination_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:09 +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
@@ -53,16 +54,12 @@
         except ValueError:
             fp_id = 0
         if account.id != fp_id:
-            if account.tuple_destination_account_ids:
+            if account.tuple_destination_account_ids or account.fp_account_ids:
+                # note: this includes restrictions on Cost Centers
                 search.append(('is_fp_compat_with', '=', account.id))
             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]))
-            else:
-                # trick to avoid problem with FP that have NO CC.
-                search.append(('cost_center_id', '=', 0))
         for criterium in [('account_id', '!=', account.id), ('journal_id.type', '!=', 'engagement'), ('is_reallocated', '=', False), ('is_reversal', '=', False)]:
             search.append(criterium)
         search.append(('contract_open','=', True))

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2020-03-05 17:13:57 +0000
+++ bin/addons/account_override/account.py	2020-11-02 12:53:09 +0000
@@ -363,6 +363,83 @@
                     ret[link['account_id'][0]] = True
         return ret
 
+    def _get_selected_in_fp(self, cr, uid, account_ids, name=False, args=False, context=None):
+        """
+        Returns True for the G/L accounts already selected in the Funding Pool:
+        they will be displayed in grey in the list and won't be re-selectable.
+        """
+        if context is None:
+            context = {}
+        if isinstance(account_ids, (int, long)):
+            account_ids = [account_ids]
+        selected = []
+        acc = context.get('accounts_selected')
+        if acc and isinstance(acc, list) and len(acc) == 1 and len(acc[0]) == 3:
+            selected = acc[0][2]
+        res = {}
+        for account_id in account_ids:
+            res[account_id] = account_id in selected
+        return res
+
+    def _get_false(self, cr, uid, ids, *a, **b):
+        """
+        Returns False for all ids
+        """
+        return {}.fromkeys(ids, False)
+
+    def _search_selectable_in_contract(self, cr, uid, ids, field_name, arg, context=None):
+        """
+        Returns a domain with the G/L accounts selectable in the contract in context.
+        The accounts must appear either in the G/L accounts or in the Account/Destination combinations linked to the
+        Funding Pools selected in the contract.
+        """
+        if context is None:
+            context = {}
+        contract_obj = self.pool.get('financing.contract.contract')
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        acc_ids = set()
+        if context.get('contract_id'):
+            contract = contract_obj.browse(cr, uid, context['contract_id'], fields_to_fetch=['funding_pool_ids'], context=context)
+            for contract_fp_line in contract.funding_pool_ids:
+                acc_ids.update([t[0] for t in
+                                analytic_acc_obj.get_acc_dest_linked_to_fp(cr, uid, contract_fp_line.funding_pool_id.id, context=context)])
+        return [('id', 'in', list(acc_ids))]
+
+    def _get_selected_in_contract(self, cr, uid, account_ids, name=False, args=False, context=None):
+        """
+        Returns True for the G/L accounts already selected in the contract or donor in context:
+        they will be displayed in grey in the list and won't be re-selectable.
+
+        As soon as an account has been selected in either G/L accounts only, acc/dest combinaisons, or quadruplets,
+        it is seen as already used.
+        """
+        if context is None:
+            context = {}
+        if isinstance(account_ids, (int, long)):
+            account_ids = [account_ids]
+        res = {}
+        selected = {}
+        current_obj = current_id = False
+        if context.get('contract_id'):
+            current_obj = self.pool.get('financing.contract.contract')
+            current_id = context['contract_id']
+        elif context.get('donor_id'):
+            current_obj = self.pool.get('financing.contract.donor')
+            current_id = context['donor_id']
+        if current_obj and current_id:
+            active_id = context.get('active_id', False)
+            for line in current_obj.browse(cr, uid, current_id, fields_to_fetch=['actual_line_ids'], context=context).actual_line_ids:
+                if not active_id or line.id != active_id:  # skip the current reporting line
+                    for account_destination in line.account_destination_ids:
+                        selected[account_destination.account_id.id] = True
+                    for account_quadruplet in line.account_quadruplet_ids:
+                        selected[account_quadruplet.account_id.id] = True
+                    for account in line.reporting_account_ids:
+                        selected[account.id] = True
+        for account_id in account_ids:
+            res[account_id] = account_id in selected
+        return res
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True, translate=True),
         'activation_date': fields.date('Active from', required=True),
@@ -400,6 +477,14 @@
         'has_partner_type_empty': fields.boolean('Empty'),  # US-1307 empty
 
         'inactivated_for_dest': fields.function(_get_inactivated_for_dest, method=True, type='boolean', string='Is inactive for destination given in context'),
+
+        'selected_in_fp': fields.function(_get_selected_in_fp, string='Selected in Funding Pool', method=True, store=False, type='boolean'),
+        # G/L acc. which CAN BE selected in the Financing Contract:
+        'selectable_in_contract': fields.function(_get_false, string='Selectable in Contract', method=True, store=False,
+                                                  type='boolean', fnct_search=_search_selectable_in_contract),
+        # G/L acc. which ARE currently selected in the Financing Contract or Donor:
+        'selected_in_contract': fields.function(_get_selected_in_contract, string='Selected in Contract or Donor', method=True,
+                                                store=False, type='boolean'),
     }
 
     _defaults = {

=== modified file 'bin/addons/analytic_distribution/account.py'
--- bin/addons/analytic_distribution/account.py	2019-05-13 09:18:37 +0000
+++ bin/addons/analytic_distribution/account.py	2020-11-02 12:53:09 +0000
@@ -81,8 +81,8 @@
         return ret
 
     _columns = {
-        'account_id': fields.many2one('account.account', "G/L Account", required=True, domain="[('type', '!=', 'view'), ('is_analytic_addicted', '=', True)]", readonly=True),
-        'destination_id': fields.many2one('account.analytic.account', "Analytical Destination Account", required=True, domain="[('type', '!=', 'view'), ('category', '=', 'DEST')]", readonly=True),
+        'account_id': fields.many2one('account.account', "G/L Account", required=True, domain="[('type', '!=', 'view'), ('is_analytic_addicted', '=', True)]", readonly=True, select=1),
+        'destination_id': fields.many2one('account.analytic.account', "Analytical Destination Account", required=True, domain="[('type', '!=', 'view'), ('category', '=', 'DEST')]", readonly=True, select=1),
         'funding_pool_ids': fields.many2many('account.analytic.account', 'funding_pool_associated_destinations', 'tuple_id', 'funding_pool_id', "Funding Pools"),
         'name': fields.function(_get_tuple_name, method=True, type='char', size=254, string="Name", readonly=True,
                                 store={
@@ -183,6 +183,8 @@
         # Prepare some values
         if not ids:
             return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         if context is None:
             context = {}
         # Check default destination presence
@@ -196,7 +198,8 @@
                     all_ids.append(dd_id)
                     super(account_account, self).write(cr, uid, [a.id], {'destination_ids': [(6, 0, all_ids)]})
             link_obj = self.pool.get('account.destination.link')
-            link_ids = link_obj.search(cr, uid, [('account_id', 'in', ids), ('disabled', '=', True)], context=context)
+            link_ids = link_obj.search(cr, uid, [('account_id', 'in', ids), ('destination_id', '=', dd_id), ('disabled', '=', True)],
+                                       context=context)
             if link_ids:
                 link_obj.write(cr, uid, link_ids, {'disabled': False}, context=context)
             return res

=== 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:09 +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:09 +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,15 @@
                         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]:
+                    use_default_pf = False
+                    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):
+                        use_default_pf = True
+                    elif 'destination_id' in vals and not ad_obj.check_fp_acc_dest_compatibility(cr, uid, l.employee_id.funding_pool_id.id,
+                                                                                                 l.account_id.id, vals['destination_id'],
+                                                                                                 context=context):
+                        use_default_pf = True
+                    if use_default_pf:
                         # 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 +467,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.py'
--- bin/addons/analytic_distribution/analytic_account.py	2017-02-10 08:51:30 +0000
+++ bin/addons/analytic_distribution/analytic_account.py	2020-11-02 12:53:09 +0000
@@ -38,11 +38,6 @@
         if not default:
             default = {}
 
-        # US-348: Reset some values when duplicating an analytic account
-        # But: duplication of funding pool should carry over the account codes (US-723)
-        account = self.browse(cr, uid, a_id, context=context)
-        if account.category != 'FUNDING':
-            default['tuple_destination_account_ids'] = []
         default['destination_ids'] = []
 
         # Copy analytic distribution

=== 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:09 +0000
@@ -83,19 +83,42 @@
                             <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"/>
                                 </tree>
                             </field>
                         </page>
-                        <page string="Destinations" attrs="{'invisible': [('category', '!=', 'FUNDING')]}">
-                            <button name="button_dest_clear" type="object" string="Remove all" icon="gtk-clear" colspan="1"/>
+                        <page string="Accounts/Destinations" attrs="{'invisible': [('category', '!=', 'FUNDING')]}">
+                            <field name="select_accounts_only"/>
+                            <button name="button_dest_clear" type="object" string="Remove all accounts/destinations"
+                                    icon="gtk-clear" colspan="4"
+                                    attrs="{'invisible': [('select_accounts_only', '=', True)]}"
+                            />
+                            <button name="button_fp_account_clear" type="object" string="Remove all accounts"
+                                    icon="gtk-clear" colspan="4"
+                                    attrs="{'invisible': [('select_accounts_only', '=', False)]}"
+                            />
                             <separator/>
-                            <field name="tuple_destination_account_ids" nolabel="1" context="{'dest_in_use':tuple_destination_account_ids}"/>
+                            <field name="tuple_destination_account_ids" nolabel="1" colspan="4"
+                                   context="{'dest_in_use': tuple_destination_account_ids}"
+                                   attrs="{'invisible': [('select_accounts_only', '=', True)]}"
+                            />
+                            <field name="fp_account_ids" colspan="4" nolabel="1"
+                                   context="{'from_fp': True, 'accounts_selected': fp_account_ids}"
+                                   attrs="{'invisible': [('select_accounts_only', '=', False)]}">
+                                <tree string="G/L Accounts">
+                                    <field name="code"/>
+                                    <field name="name"/>
+                                </tree>
+                            </field>
                         </page>
                         <page string="Expense accounts" attrs="{'invisible': [('category', '!=', 'DEST')]}">
                             <field name="destination_ids" nolabel="1" domain="[('type', '!=', 'view'), ('is_analytic_addicted', '=', True)]" context="{'destination_id': record_id}">
@@ -112,7 +135,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:09 +0000
@@ -44,6 +44,98 @@
                 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 check_fp_acc_dest_compatibility(self, cr, uid, fp_id, account_id, dest_id, context=None):
+        """
+        Checks the compatibility between the FP and the "G/L Account/Destination" combination.
+        Returns False if they aren't compatible.
+        """
+        if context is None:
+            context = {}
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        account_obj = self.pool.get('account.account')
+        ir_model_data_obj = self.pool.get('ir.model.data')
+        res = True
+        if fp_id and account_id and dest_id:
+            # The Funding Pool PF is compatible with every combination
+            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', 'select_accounts_only', 'fp_account_ids',
+                                                              'tuple_destination_account_ids'],
+                                             context=context)
+                if fp and fp.category == 'FUNDING':
+                    # continue only if the account and destination selected are compatible with one another
+                    account_selected = account_obj.browse(cr, uid, account_id, fields_to_fetch=['destination_ids'], context=context)
+                    if dest_id not in [d.id for d in account_selected.destination_ids]:
+                        res = False
+                    else:
+                        # when the link is made to G/L accounts only: all Destinations compatible with the acc. are allowed
+                        if fp.select_accounts_only and account_id in [a.id for a in fp.fp_account_ids]:
+                            res = True
+                        # otherwise the combination "account + dest" must be checked
+                        elif not fp.select_accounts_only and (account_id, dest_id) in \
+                                [(t.account_id.id, t.destination_id.id) for t in fp.tuple_destination_account_ids if not t.disabled]:
+                            res = True
+                        else:
+                            res = False
+        return res
+
+    def onchange_ad_destination(self, cr, uid, ids, destination_id=False, funding_pool_id=False, account_id=False,
+                                fp_field_name='funding_pool_id'):
+        """
+        Resets the FP in case the Dest/Acc combination selected isn't compatible with it.
+        """
+        res = {}
+        if destination_id and funding_pool_id and account_id and \
+                not self.check_fp_acc_dest_compatibility(cr, uid, funding_pool_id, account_id, destination_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):
         """
@@ -70,12 +162,6 @@
         if amount is not None and amount is not False and abs(amount) <= 1:
             if not all(len(d) <= 1 for d in [distrib.funding_pool_lines, distrib.free_1_lines, distrib.free_2_lines]):
                 return 'invalid_small_amount'
-        # 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
         account = self.pool.get('account.account').read(cr, uid, account_id, ['destination_ids'])
         # Check Cost Center lines regarding destination/account and destination/CC links
         for cc_line in distrib.cost_center_lines:
@@ -105,12 +191,10 @@
                 return 'invalid'
             if not fp_line.analytic_id:
                 return 'invalid'
-            # If fp_line is MSF Private Fund, all is ok
-            if fp_line.analytic_id.id == fp_id:
-                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]:
+            if not self.check_fp_acc_dest_compatibility(cr, uid, fp_line.analytic_id.id, account_id,
+                                                        fp_line.destination_id.id, context=context):
                 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:
@@ -135,14 +219,6 @@
         info = ''
         ana_obj = self.pool.get('account.analytic.account')
         account = self.pool.get('account.account').browse(cr, uid, account_id, context=context)
-        fp = ana_obj.browse(cr, uid, analytic_id, context=context)
-        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
-        is_private_fund = False
-        if analytic_id == fp_id:
-            is_private_fund = True
         # DISTRIBUTION VERIFICATION
         # Check that destination is compatible with account
         if destination_id not in [x.id for x in account.destination_ids]:
@@ -150,13 +226,12 @@
         # Check that Destination and Cost Center are compatible
         if not self.check_dest_cc_compatibility(cr, uid, destination_id, cost_center_id, context=context):
             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]:
-                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]:
-                return 'invalid', _('account/destination tuple not compatible with given FP analytic account')
+        # Check that cost center is compatible with FP
+        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
+        if not self.check_fp_acc_dest_compatibility(cr, uid, analytic_id, account_id, destination_id, context=context):
+            return 'invalid', _('account/destination tuple not compatible with given FP analytic account')
         return res, info
 
     def check_cc_distrib_active(self, cr, uid, distrib_br, posting_date=False, prefix='', from_supply=False):

=== 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:09 +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:09 +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])
-            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]
+            fp_id = arg[2]
+            tuple_list = analytic_acc_obj.get_acc_dest_linked_to_fp(cr, uid, fp_id, context=context)
+            cost_center_ids = [c.id for c in analytic_acc_obj.get_cc_linked_to_fp(cr, uid, fp_id, context=context)]
             for cc in cost_center_ids:
                 for t in tuple_list:
                     if res:
@@ -417,11 +418,6 @@
         res = []
         if not account_type:
             return res
-        try:
-            msf_private_fund = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution',
-                                                                                   'analytic_account_msf_private_funds')[1]
-        except ValueError:
-            msf_private_fund = 0
         expired_date_ids = []
         date_start = account and account.get('date_start', False) or False
         date_stop = account and account.get('date', False) or False
@@ -455,16 +451,9 @@
                     continue
                 if ad_obj.check_dest_cc_compatibility(cr, uid, aline.destination_id and aline.destination_id.id or False,
                                                       account_id, context=context):
-                    if aline.account_id and aline.account_id.id == msf_private_fund:
+                    if ad_obj.check_fp_cc_compatibility(cr, uid, aline.account_id.id, account_id, context=context):
                         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 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 []
-            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
             for aline in self.browse(cr, uid, ids):
                 # Verify that:
@@ -472,21 +461,24 @@
                 check_accounts = self.pool.get('account.analytic.account').is_blocked_by_a_contract(cr, uid, [aline.account_id.id])
                 if check_accounts and aline.account_id.id in check_accounts:
                     continue
-                # No verification if account is MSF Private Fund because of its compatibility with all elements.
-                if account_id == msf_private_fund:
-                    res.append(aline.id)
-                    continue
                 # Verify that:
                 # - the line have a cost_center_id field (we expect it's a line with a funding pool account)
                 # - 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 aline.destination_id and \
+                    ad_obj.check_fp_cc_compatibility(cr, uid, account_id, aline.cost_center_id.id, context=context) and \
+                    ad_obj.check_fp_acc_dest_compatibility(cr, uid, account_id, aline.general_account_id.id,
+                                                           aline.destination_id.id, context=context):
                     res.append(aline.id)
         elif account_type == "DEST":
             for aline in self.browse(cr, uid, ids, context=context):
-                if ad_obj.check_dest_cc_compatibility(cr, uid, account_id, aline.cost_center_id and aline.cost_center_id.id or False, context=context) and \
-                        aline.general_account_id and account_id in [x.id for x in aline.general_account_id.destination_ids]:
+                # the following check is included into check_fp_acc_dest_compatibility:
+                # account_id in [x.id for x in aline.general_account_id.destination_ids]
+                if ad_obj.check_dest_cc_compatibility(cr, uid, account_id, aline.cost_center_id and aline.cost_center_id.id or False,
+                                                      context=context) and \
+                    ad_obj.check_fp_acc_dest_compatibility(cr, uid, aline.account_id.id, aline.general_account_id.id,
+                                                           account_id, context=context):
                     res.append(aline.id)
         else:
             # Case of FREE1 and FREE2 lines
@@ -538,23 +530,17 @@
                     res.append((id, entry_sequence, _('CC/DEST')))
                     return False
 
-            # 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:
-                    # not compatible with CC
-                    res.append((id, entry_sequence, _('CC')))
-                    return False
+            # - cost center and funding pool compatibility
+            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
 
-                # - destination / account
-                acc_dest = (general_account_br.id, new_dest_id)
-                if acc_dest not in [x.account_id and x.destination_id and \
-                                    (x.account_id.id, x.destination_id.id) \
-                                    for x in new_fp_br.tuple_destination_account_ids if not x.disabled]:
-                    # not compatible with dest/account
-                    res.append((id, entry_sequence, _('account/dest')))
-                    return False
+            # - destination / account
+            if not ad_obj.check_fp_acc_dest_compatibility(cr, uid, new_fp_id, general_account_br.id, new_dest_id, context=context):
+                # not compatible with account/dest
+                res.append((id, entry_sequence, _('account/dest')))
+                return False
 
             # check active date
             if not check_date(new_dest_br, posting_date):

=== 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:09 +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:09 +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>
@@ -222,9 +222,11 @@
     <para style="P8">
       <font color="white"> </font>
     </para>
-    <para style="P6">Account/Destination:</para>
+    <para style="P6">[[ o.select_accounts_only and translate("G/L Accounts:") or translate("Account/Destination:") ]]</para>
 
+    <!-- Account/Destination -->
     <blockTable repeatRows="1" style="Table4" colWidths="95.0,165.0,95.0,165.0">
+      [[ not o.select_accounts_only or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="P8">Account code</para>
@@ -257,6 +259,28 @@
       </tr>
     </blockTable>
 
+    <!-- G/L Accounts -->
+    <blockTable repeatRows="1" style="Table4" colWidths="260.0,260.0">
+      [[ o.select_accounts_only or removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="P8">Account code</para>
+        </td>
+        <td>
+          <para style="P8">Account name</para>
+        </td>
+      </tr>
+      <tr>
+      [[ repeatIn(o.fp_account_ids, 'acc') ]]
+        <td>
+          <para style="P7">[[ acc.code ]]</para>
+        </td>
+        <td>
+          <para style="P7">[[ acc.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+
     <para style="P5">
       <font color="white"> </font>
     </para>

=== 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:09 +0000
@@ -237,12 +237,17 @@
                     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), "
+                                            "('fp_compatible_with_acc_dest_ids', '=', (parent.account_id, destination_id))]")
                 # Change Destination field
                 dest_fields = tree.xpath('/tree/field[@name="destination_id"]')
                 for field in dest_fields:
@@ -404,60 +409,18 @@
     }
 
     def onchange_destination(self, cr, uid, ids, destination_id=False, analytic_id=False, account_id=False):
-        """
-        Check given funding pool with destination
-        """
-        # 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
-
-        # If all elements given, then search FP compatibility
-        if destination_id and analytic_id and account_id:
-            fp_line = self.pool.get('account.analytic.account').browse(cr, uid, analytic_id)
-            # Delete analytic_id if not valid with tuple "account_id/destination_id".
-            # but do an exception for MSF Private FUND analytic account
-            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_line.tuple_destination_account_ids if not x.disabled] and analytic_id != fp_id:
-                res = {'value': {'analytic_id': False}}
-        # If no destination, do nothing
-        elif not destination_id \
-                or analytic_id == fp_id:  # PF always compatible
-            res = {}
-        # Otherway: delete FP
-        else:
-            res = {'value': {'analytic_id': False}}
-        return res
+        return self.pool.get('analytic.distribution').onchange_ad_destination(cr, uid, ids, destination_id=destination_id,
+                                                                              funding_pool_id=analytic_id, account_id=account_id,
+                                                                              fp_field_name='analytic_id')
 
     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:09 +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:09 +0000
@@ -290,6 +290,108 @@
                 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)
+                    cc_inst_ids = [inst.id for inst in cc.cc_instance_ids]
+                    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 cc_inst_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 _search_fp_compatible_with_acc_dest_ids(self, cr, uid, obj, name, args, context=None):
+        """
+        Returns a domain with all funding pools compatible with the selected Account/Destination combination.
+        It requires a tuple with (account, destination), e.g.: to get the FPs compatible with the G/L account 20 and the
+        destination 30, use the dom [('fp_compatible_with_acc_dest_ids', '=', (20, 30))]
+        """
+        fp_ids = []
+        if context is None:
+            context = {}
+        ir_model_data_obj = self.pool.get('ir.model.data')
+        account_obj = self.pool.get('account.account')
+        for arg in args:
+            if arg[0] == 'fp_compatible_with_acc_dest_ids':
+                operator = arg[1]
+                if operator != '=':
+                    raise osv.except_osv(_('Error'), _('Filter not implemented on Funding Pools.'))
+                acc_dest = arg[2]
+                acc_id = dest_id = False
+                if acc_dest and isinstance(acc_dest, tuple) and len(acc_dest) == 2:
+                    acc_id = acc_dest[0]
+                    dest_id = acc_dest[1]
+                # The Funding Pool PF is compatible with everything and must always be displayed
+                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
+                fp_ids.append(pf_id)
+                if acc_id and dest_id:
+                    account_selected = account_obj.browse(cr, uid, acc_id, fields_to_fetch=['destination_ids'], context=context)
+                    # search for compatible FPs only if the account and destination selected are compatible with one another
+                    if dest_id in [d.id for d in account_selected.destination_ids]:
+                        # note: when the link is made to G/L accounts only, all Destinations compatible with the acc. are allowed
+                        cr.execute('''
+                            SELECT fp.id
+                            FROM
+                                account_analytic_account fp
+                                  LEFT JOIN fp_account_rel ON fp_account_rel.fp_id = fp.id
+                                  LEFT JOIN funding_pool_associated_destinations ON funding_pool_associated_destinations.funding_pool_id = fp.id
+                                  LEFT JOIN account_destination_link link ON link.id = funding_pool_associated_destinations.tuple_id
+                            WHERE
+                                fp.category = 'FUNDING' AND
+                                fp.type != 'view' AND
+                                fp.id != %(pf_id)s AND
+                                (
+                                    fp.select_accounts_only = 't' AND 
+                                    fp_account_rel.account_id = %(acc_id)s
+                                OR
+                                    fp.select_accounts_only = 'f' AND 
+                                    link.account_id = %(acc_id)s AND 
+                                    link.destination_id = %(dest_id)s AND 
+                                    link.disabled = 'f'
+                                )
+                        ''', {'pf_id': pf_id, 'acc_id': acc_id, 'dest_id': dest_id})
+                        other_fp_ids = [x[0] for x in cr.fetchall()]
+                        fp_ids.extend(other_fp_ids)
+        return [('id', 'in', fp_ids)]
+
     def _get_cc_instance_ids(self, cr, uid, ids, fields, arg, context=None):
         """
         Computes the values for fields.function fields, retrieving:
@@ -299,7 +401,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 +414,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 +422,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 +438,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 +463,22 @@
         '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),
+        'fp_compatible_with_acc_dest_ids': fields.function(_get_fake, method=True, store=False,
+                                                           string='Funding Pools compatible with the Account/Destination combination',
+                                                           type='many2many', relation='account.analytic.account',
+                                                           fnct_search=_search_fp_compatible_with_acc_dest_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 +491,21 @@
         '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"),
+        'select_accounts_only': fields.boolean(string="Select Accounts Only"),
+        'fp_account_ids': fields.many2many('account.account', 'fp_account_rel', 'fp_id', 'account_id', string='G/L Accounts',
+                                           domain="[('type', '!=', 'view'), ('is_analytic_addicted', '=', True), ('active', '=', 't')]",
+                                           help="G/L accounts linked to the Funding Pool", order_by='code'),
     }
 
     _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,
+        'select_accounts_only': lambda *a: False,
     }
 
     def _check_code_unicity(self, cr, uid, ids, context=None):
@@ -453,30 +577,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 +673,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 +689,15 @@
             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
+                vals['select_accounts_only'] = False
+                vals['fp_account_ids'] = [(6, 0, [])]
+            # Funding Pools: either "Account/Destination combinations" or "G/L accounts only" must be stored
+            if vals['category'] == 'FUNDING' and 'select_accounts_only' in vals:
+                if vals['select_accounts_only']:
+                    vals['tuple_destination_account_ids'] = [(6, 0, [])]
+                else:
+                    vals['fp_account_ids'] = [(6, 0, [])]
         return vals
 
     def _check_date(self, vals):
@@ -720,6 +863,56 @@
             '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 get_acc_dest_linked_to_fp(self, cr, uid, fp_id, context=None):
+        """
+        Returns a tuple of all combinations of (account_id, destination_id) compatible with the FP in parameter:
+        - if "Select Accounts Only" is ticked: the accounts selected and the Destinations compatible with them
+        - else the Account/Destination combinations selected.
+
+        Note: this method matches with what has been selected in the Accounts/Destinations tab of the FP form.
+              It returns an empty list for PF.
+        """
+        if context is None:
+            context = {}
+        combinations = []
+        fp = self.browse(cr, uid, fp_id,
+                         fields_to_fetch=['category', 'select_accounts_only', 'fp_account_ids', 'tuple_destination_account_ids'],
+                         context=context)
+        if fp.category == 'FUNDING':
+            if fp.select_accounts_only:
+                for account in fp.fp_account_ids:
+                    for dest in account.destination_ids:
+                        combinations.append((account.id, dest.id))
+            else:
+                combinations = [(t.account_id.id, t.destination_id.id) for t in fp.tuple_destination_account_ids if not t.disabled]
+        return combinations
+
     def button_cc_clear(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'cost_center_ids':[(6, 0, [])]}, context=context)
         return True
@@ -735,6 +928,13 @@
         self.write(cr, uid, ids, {'tuple_destination_account_ids':[(6, 0, [])]}, context=context)
         return True
 
+    def button_fp_account_clear(self, cr, uid, ids, context=None):
+        """
+        Removes all G/L accounts selected in the Funding Pool view
+        """
+        self.write(cr, uid, ids, {'fp_account_ids': [(6, 0, [])]}, context=context)
+        return True
+
     def get_destinations_by_accounts(self, cr, uid, ids, context=None):
         """
         Returns a view with the Destinations by accounts (for the FP selected if any, otherwise for all the FP)

=== modified file 'bin/addons/financing_contract/contract.py'
--- bin/addons/financing_contract/contract.py	2019-10-10 16:20:57 +0000
+++ bin/addons/financing_contract/contract.py	2020-11-02 12:53:09 +0000
@@ -62,6 +62,10 @@
         return True
 
     def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        format_obj = self.pool.get('financing.contract.format')
         # US-113: Check if the call is from sync update
         if context.get('sync_update_execution') and vals.get('contract_id', False):
             # US-113: and if there is any financing contract existed for this format, if no, then ignore this call
@@ -75,26 +79,18 @@
 
         #US-345: the following block cannot be executed in the sync context, because it would then reset all costcenters from the funding pools!
         # making that the deleted costcenters from the sender were not taken into account
-        if not context.get('sync_update_execution') and 'contract_id' in vals and 'funding_pool_id' in vals:
-            # get the cc ids from for this funding pool
-            quad_obj = self.pool.get('financing.contract.account.quadruplet')
-            quad_ids = quad_obj.search(cr, uid, [('funding_pool_id','=',vals['funding_pool_id'])],context=context)
-            quad_rows = quad_obj.browse(cr, uid, quad_ids,context=context)
-            quad_cc_ids = []
-            for quad in quad_rows:
-                cc_id_temp = quad.cost_center_id.id
-                if cc_id_temp not in quad_cc_ids:
-                    quad_cc_ids.append(cc_id_temp)
+        if not context.get('sync_update_execution') and vals.get('contract_id') and vals.get('funding_pool_id'):
+            # get the Cost Centers linked to the Funding Pool
+            fp_cc_ids = [c.id for c in analytic_acc_obj.get_cc_linked_to_fp(cr, uid, vals['funding_pool_id'], context=context)]
 
             # get the format instance
-            format_obj = self.pool.get('financing.contract.format')
             cc_rows = format_obj.browse(cr, uid, vals['contract_id'], context=context).cost_center_ids
             cc_ids = []
             for cc in cc_rows:
                 cc_ids.append(cc.id)
 
             # append the ccs from the fp only if not already there
-            cc_ids = list(set(cc_ids).union(quad_cc_ids))
+            cc_ids = list(set(cc_ids).union(fp_cc_ids))
             # replace the associated cc list -NOT WORKING
             format_obj.write(cr, uid, vals['contract_id'],{'cost_center_ids':[(6,0,cc_ids)]}, context=context)
         # UFTP-121: Check that FP is not used yet.
@@ -337,6 +333,7 @@
                                      ondelete="cascade", required=True),
         'fp_added_flag': fields.boolean('Flag when new FP is added'),
         'instance_level': fields.function(_get_instance_level, method=True, string="Current instance level", type="char", readonly=True),  # UFTP-343
+        'quad_gen_date': fields.datetime('Date of last generation of quad'),
     }
 
     _defaults = {

=== modified file 'bin/addons/financing_contract/financing_contract_account_quadruplet.py'
--- bin/addons/financing_contract/financing_contract_account_quadruplet.py	2017-10-02 15:51:29 +0000
+++ bin/addons/financing_contract/financing_contract_account_quadruplet.py	2020-11-02 12:53:09 +0000
@@ -21,18 +21,48 @@
 
 from osv import fields, osv
 from tools import sql
+import time
 
 class financing_contract_account_quadruplet(osv.osv):
     _name = 'financing.contract.account.quadruplet'
     _rec_name = 'cost_center_id'
     _description = 'FP / CC / destination valid values view'
-    _auto = False
-
+    _log_access = False
+    _auto = True
+
+    def migrate_old_quad(self, cr, uid, ids, context=None):
+        '''
+            ids: list of record in the old view
+            return list of new record
+        '''
+
+        new_ids = []
+        for old_id in ids:
+            # DO UPDATE: to return an id
+            cr.execute('''
+                INSERT INTO financing_contract_account_quadruplet
+                    (account_destination_name, account_id, cost_center_id, disabled, account_destination_link_id, funding_pool_id, account_destination_id)
+                ( select
+                    account_destination_name, account_id, cost_center_id, disabled, account_destination_link_id, funding_pool_id, account_destination_id
+                from
+                    financing_contract_account_quadruplet_old
+                where
+                    id=%s
+                ) ON CONFLICT ON CONSTRAINT financing_contract_account_quadruplet_check_unique DO UPDATE SET disabled=EXCLUDED.disabled
+                RETURNING id ''', (old_id,))
+            ret = cr.fetchone()
+            if ret:
+                new_ids.append(ret[0])
+        return new_ids
 
     def _auto_init(self, cr, context=None):
+        sql.drop_view_if_exists(cr, 'financing_contract_account_quadruplet')
+        sql.drop_view_if_exists(cr, 'financing_contract_account_quadruplet_view')
         res = super(financing_contract_account_quadruplet, self)._auto_init(cr, context)
-        sql.drop_view_if_exists(cr, 'financing_contract_account_quadruplet')
-        cr.execute("""CREATE OR REPLACE VIEW financing_contract_account_quadruplet AS (
+        sql.drop_view_if_exists(cr, 'financing_contract_account_quadruplet_old')
+
+        # old sql view kept to manage migration and old sync updates
+        cr.execute('''CREATE OR REPLACE VIEW financing_contract_account_quadruplet_old AS (
             SELECT abs(('x'||substr(md5(fp.code || cc.code || lnk.name),1,16))::bit(32)::int) as id,
             lnk.destination_id AS account_destination_id, cc.id AS cost_center_id, fp.id AS funding_pool_id, lnk.name AS account_destination_name, lnk.account_id, lnk.disabled, lnk.id as account_destination_link_id
             FROM account_analytic_account fp,
@@ -44,9 +74,133 @@
              AND fpacc.cost_center_id = cc.id
              AND lnk.id = fpad.tuple_id
              AND fp.id = fpad.funding_pool_id
-           ORDER BY lnk.name, cc.code DESC)""")
+           ORDER BY lnk.name, cc.code DESC)
+        ''')
+
+        cr.execute("""CREATE OR REPLACE VIEW financing_contract_account_quadruplet_view AS (
+            SELECT account_destination_id, cost_center_id, funding_pool_id, account_destination_name, account_id, disabled, account_destination_link_id FROM
+            (
+            -- all cc = f, G/L = f
+            SELECT
+            lnk.destination_id AS account_destination_id, cc.id AS cost_center_id, fp.id AS funding_pool_id, lnk.name AS account_destination_name, lnk.account_id, lnk.disabled, lnk.id as account_destination_link_id
+            FROM account_analytic_account fp,
+                 account_analytic_account cc,
+                 funding_pool_associated_cost_centers fpacc,
+                 funding_pool_associated_destinations fpad,
+                 account_destination_link lnk
+           WHERE
+                fpacc.funding_pool_id = fp.id AND
+                fpacc.cost_center_id = cc.id AND
+                lnk.id = fpad.tuple_id AND
+                fp.id = fpad.funding_pool_id
+
+           UNION
+
+            -- all cc = t, G/L = t
+            select
+            lnk.destination_id AS account_destination_id, cc.id AS cost_center_id, fp.id AS funding_pool_id, lnk.name AS account_destination_name, lnk.account_id, lnk.disabled, lnk.id as account_destination_link_id
+            FROM
+                account_analytic_account fp,
+                account_analytic_account cc,
+                fp_account_rel,
+                account_target_costcenter target,
+                account_destination_link lnk,
+                account_account  gl_account
+            where
+                fp.allow_all_cc_with_fp = 't' and
+                cc.type != 'view' and
+                cc.category = 'OC' and
+                target.cost_center_id = cc.id and
+                target.instance_id = fp.instance_id and
+                fp.select_accounts_only = 't' and
+                fp_account_rel.fp_id = fp.id and
+                fp_account_rel.account_id= gl_account.id and
+                lnk.account_id = gl_account.id
+
+            UNION
+
+            -- all cc = f, G/L = t
+            select
+            lnk.destination_id AS account_destination_id, cc.id AS cost_center_id, fp.id AS funding_pool_id, lnk.name AS account_destination_name, lnk.account_id, lnk.disabled, lnk.id as account_destination_link_id
+            FROM
+                account_analytic_account fp,
+                account_analytic_account cc,
+                funding_pool_associated_cost_centers fpacc,
+                fp_account_rel,
+                account_destination_link lnk,
+                account_account  gl_account
+            where
+                fp.allow_all_cc_with_fp = 'f' and
+                fpacc.funding_pool_id = fp.id and
+                fpacc.cost_center_id = cc.id and
+                fp.select_accounts_only = 't' and
+                fp_account_rel.fp_id = fp.id and
+                fp_account_rel.account_id= gl_account.id and
+                lnk.account_id = gl_account.id
+
+            UNION
+
+            -- all cc = t , G/L = f
+            select
+            lnk.destination_id AS account_destination_id, cc.id AS cost_center_id, fp.id AS funding_pool_id, lnk.name AS account_destination_name, lnk.account_id, lnk.disabled, lnk.id as account_destination_link_id
+            FROM
+                account_analytic_account fp,
+                account_analytic_account cc,
+                funding_pool_associated_destinations fpad,
+                account_target_costcenter target,
+                account_destination_link lnk
+            where
+                fp.allow_all_cc_with_fp = 't' and
+                cc.type != 'view' and
+                cc.category = 'OC' and
+                target.cost_center_id = cc.id and
+                target.instance_id = fp.instance_id and
+                fp.select_accounts_only = 'f' and
+                lnk.id = fpad.tuple_id and
+                fp.id = fpad.funding_pool_id
+            ) AS combinations
+           )""")
         return res
 
+    def gen_quadruplet(self, cr, uid, context=None):
+        '''
+            triggered by unifield-web to generate the list of quadruplets for this contract
+            record the last generation date to refresh only if the contract, a dest link or a ana. acccount is modified
+        '''
+        if context is None:
+            context = {}
+        contract_id = context.get('contract_id', False)
+        if contract_id:
+            ctr_obj = self.pool.get('financing.contract.contract')
+            contract = ctr_obj.browse(cr, uid, context['contract_id'], fields_to_fetch=['funding_pool_ids', 'cost_center_ids', 'quad_gen_date'], context=context)
+            cr.execute('''select max(last_modification) from ir_model_data where module='sd' and (
+                model in ('account.analytic.account', 'account.destination.link') or (model = 'financing.contract.contract' and res_id = %s)
+            )''', (contract_id,))
+            last_obj_modified = cr.fetchone()[0]
+            if not contract.quad_gen_date or last_obj_modified > contract.quad_gen_date or contract.quad_gen_date > time.strftime('%Y-%m-%d %H:%M:%S'):
+                # ignore quad_gen_date in the future
+                cc_ids = [cc.id for cc in contract.cost_center_ids]
+                fp_ids = [fp.funding_pool_id.id for fp in contract.funding_pool_ids]
+                if not cc_ids:
+                    # do not traceback if cc / fp not set on contract
+                    cc_ids = [0]
+                if not fp_ids:
+                    fp_ids = [0]
+                cr.execute('''
+                    INSERT INTO financing_contract_account_quadruplet
+                        (account_destination_name, account_id, cost_center_id, disabled, account_destination_link_id, funding_pool_id, account_destination_id)
+                    (select
+                        account_destination_name, account_id, cost_center_id, disabled, account_destination_link_id, funding_pool_id, account_destination_id
+                        from
+                            financing_contract_account_quadruplet_view
+                        where
+                            funding_pool_id in %s and
+                            cost_center_id in %s
+                    )
+                    ON CONFLICT ON CONSTRAINT financing_contract_account_quadruplet_check_unique DO UPDATE SET disabled=EXCLUDED.disabled''', (tuple(fp_ids), tuple(cc_ids)))
+                cr.execute('update financing_contract_contract set quad_gen_date=%s where id=%s', (last_obj_modified, contract_id))
+
+        return True
 
     # The result set with {ID:Flag} if Flag=True, the line will be grey, otherwise, it is selectable
     def _get_used_in_contract(self, cr, uid, ids, field_name, arg, context=None):
@@ -67,8 +221,8 @@
         # TODO this should be renamed format_id
         cr.execute('''select account_quadruplet_id
                         from financing_contract_actual_account_quadruplets
-                        where actual_line_id in (select id from financing_contract_format_line
-                                                where format_id = %s and is_quadruplet is true)''', (contract.format_id.id,))
+                        where account_quadruplet_id in %s and actual_line_id in (select id from financing_contract_format_line
+                                                where format_id = %s and is_quadruplet is true)''', (tuple(ids), contract.format_id.id,))
         rows = cr.fetchall()
         for id in [x[0] for x in rows]:
             exclude[id] = True
@@ -78,9 +232,13 @@
             if not active_id or line.id != active_id:
                 for account_destination in line.account_destination_ids:
                     # search the quadruplet to exclude
-                    quadruplet_ids_to_exclude = self.search(cr, uid, [('account_id', '=', account_destination.account_id.id),('account_destination_id','=',account_destination.destination_id.id)])
+                    quadruplet_ids_to_exclude = self.search(cr, uid, [('id', 'in', ids), ('account_id', '=', account_destination.account_id.id),('account_destination_id','=',account_destination.destination_id.id)])
                     for item in quadruplet_ids_to_exclude:
                         exclude[item] = True
+                for account in line.reporting_account_ids:
+                    # exclude the quadruplets when the account has been selected in lines with "accounts only"
+                    for quad in self.search(cr, uid, [('account_id', '=', account.id)], order='NO_ORDER', context=context):
+                        exclude[quad] = True
 
         for id in ids:
             ids_to_exclude[id] = id in exclude
@@ -90,35 +248,20 @@
         res = {}
         if context is None:
             context = {}
-        exclude = {}
+        res = {}
 
         if not context.get('contract_id'):
             for id in ids:
                 res[id] = False
             return res
 
-        ctr_obj = self.pool.get('financing.contract.contract')
-        contract = ctr_obj.browse(cr, uid, context['contract_id'])
-        # financing_contract_funding_pool_line.contract_id is a FK for financing_contract_format.id
-        # TODO this should be renamed format_id during refactoring
-        exclude = {}
-        cr.execute('''select id from financing_contract_account_quadruplet
-                        where funding_pool_id in
-                             (select funding_pool_id
-                             from financing_contract_funding_pool_line
-                             where contract_id = %s)
-                      and exists (select 'X'
-                                from financing_contract_cost_center cc
-                                where cc.contract_id = %s
-                                and cc.cost_center_id =
-                                    financing_contract_account_quadruplet.cost_center_id)''', (contract.format_id.id,contract.format_id.id))
-        for id in [x[0] for x in cr.fetchall()]:
-            exclude[id] = True
-        for id in ids:
-            res[id] = id in exclude
+        for _id in ids:
+            res[_id] = False
+
+        for _id in self.search(cr, uid, [('can_be_used', '=', True)], context=context):
+            res[_id] = True
         return res
 
-
     def _search_can_be(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         if context is None:
@@ -130,67 +273,30 @@
             return res
 
         ctr_obj = self.pool.get('financing.contract.contract')
-        contract = ctr_obj.browse(cr, uid, context['contract_id'])
-        cr.execute('''select id from financing_contract_account_quadruplet
-                        where funding_pool_id in
-                             (select funding_pool_id
-                             from financing_contract_funding_pool_line
-                             where contract_id = %s)
-                      and exists (select 'X'
-                                from financing_contract_cost_center cc
-                                where cc.contract_id = %s
-                                and cc.cost_center_id =
-                                    financing_contract_account_quadruplet.cost_center_id)''', (contract.format_id.id,contract.format_id.id))
-        someids = []
-        someids += [x[0] for x in cr.fetchall()]
-        return [('id','in',someids)]
-
-
-
-    def _search_used_in_contract(self, cr, uid, obj, name, args, context=None):
-        if not args:
-            return []
-        if context is None:
-            context = {}
-        assert args[0][1] == '=' and args[0][2], 'Filter not implemented'
-        if not context.get('contract_id'):
-            return []
-
-        ctr_obj = self.pool.get('financing.contract.contract')
-        contract = ctr_obj.browse(cr, uid, context['contract_id'])
-
-        exclude = []
-        for line in contract.actual_line_ids:
-            if context.get('active_id', False) and line.id != context['active_id']:
-                for account_destination in line.account_destination_ids:
-                    cr.execute('''select account_quadruplet_id
-                                  from financing_contract_actual_account_quadruplets
-                                  where actual_line_id in (select l.id from financing_contract_contract c,
-                                                          financing_contract_format f,
-                                                          financing_contract_format_line l
-                                                          where c.id = %s
-                                                          and f.id = c.format_id
-                                                          and l.format_id = f.id)''', (contract.format_id.id,))
-                    exclude += [x[0] for x in cr.fetchall()]
-                for account_quadruplet in line.account_quadruplet_ids:
-                    exclude.append(account_quadruplet.id)
-        return [('id', 'not in', exclude)]
-
-    #columns for view
+        contract = ctr_obj.browse(cr, uid, context['contract_id'], fields_to_fetch=['funding_pool_ids', 'cost_center_ids'])
+        cc_ids = [cc.id for cc in contract.cost_center_ids]
+        fp_ids = [fp.funding_pool_id.id for fp in contract.funding_pool_ids]
+        return [('cost_center_id', 'in', cc_ids), ('funding_pool_id', 'in', fp_ids)]
+
     _columns = {
-        'account_destination_id': fields.many2one('account.destination.link', 'Account/Destination', relate=True, readonly=True),
-        'cost_center_id': fields.many2one('account.analytic.account', 'Cost Centre', relate=True, readonly=True),
-        'funding_pool_id': fields.many2one('account.analytic.account', 'Funding Pool', relate=True, readonly=True),
-        'account_destination_name': fields.char('Account', size=64, readonly=True),
-        'used_in_contract': fields.function(_get_used_in_contract, method=True, type='boolean', string='Used', fnct_search=_search_used_in_contract),
+        'account_destination_id': fields.many2one('account.analytic.account', 'Destination', relate=True, readonly=True, select=1),
+        'cost_center_id': fields.many2one('account.analytic.account', 'Cost Centre', relate=True, readonly=True, select=1),
+        'funding_pool_id': fields.many2one('account.analytic.account', 'Funding Pool', relate=True, readonly=True, select=1),
+        'account_destination_name': fields.char('Account', size=64, readonly=True, select=1),
+        'used_in_contract': fields.function(_get_used_in_contract, method=True, type='boolean', string='Used'),
         'can_be_used': fields.function(_can_be_used_in_contract, method=True, type='boolean', string='Can', fnct_search=_search_can_be),
-        'account_id': fields.many2one('account.destination.link', 'Account ID', relate=True, readonly=True),
-        'account_destination_link_id': fields.many2one('account.destination.link', 'Link id', readonly=True),
+        'account_id': fields.many2one('account.account', 'Account ID', relate=True, readonly=True, select=1),
+        'account_destination_link_id': fields.many2one('account.destination.link', 'Link id', readonly=True, select=1),
         'disabled': fields.boolean('Disabled'),
     }
 
-    _order = 'account_destination_name asc, funding_pool_id asc, cost_center_id asc'
+    _sql_constraints = {
+        ('check_unique',
+         'unique (account_destination_id, cost_center_id, funding_pool_id, account_id, account_destination_link_id)',
+         'not unique!')
+    }
+    _order = 'account_destination_name asc, funding_pool_id asc, cost_center_id asc, id'
+
 
 financing_contract_account_quadruplet()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== modified file 'bin/addons/financing_contract/financing_contract_view.xml'
--- bin/addons/financing_contract/financing_contract_view.xml	2020-01-30 10:18:45 +0000
+++ bin/addons/financing_contract/financing_contract_view.xml	2020-11-02 12:53:09 +0000
@@ -105,20 +105,54 @@
                                             <field name="overhead_type" colspan="2" attrs="{'required': [('line_type', '=', 'overhead')]}"/>
                                             <field name="overhead_percentage" colspan="2" attrs="{'required': [('line_type', '=', 'overhead')]}"/>
                                         </group>
-                                        <button name="button_delete_all_quads" type="object" string="Remove all quads" icon="gtk-clear" colspan="1"
-                                                attrs="{'invisible': [('is_quadruplet', '=', False)]}" />
-                                        <button name="button_delete_all_couples" type="object" string="Remove all couples" icon="gtk-clear" colspan="1"
-                                                attrs="{'invisible': [('is_quadruplet', '=', True)]}" />
-                                        <field name="is_quadruplet" attrs="{'invisible': [('line_type', '=', 'view')]}"/>
+                                        <group colspan="6" col="20">
+                                            <button name="button_delete_all_quads" type="object" string="Remove all quads"
+                                                    icon="gtk-clear" colspan="4"
+                                                    attrs="{'invisible': ['|',
+                                                                          ('is_quadruplet', '=', False),
+                                                                          ('line_type', '=', 'view')]}" />
+                                            <button name="button_delete_all_couples" type="object" string="Remove all couples"
+                                                    icon="gtk-clear" colspan="4"
+                                                    attrs="{'invisible': ['|', '|',
+                                                                          ('is_quadruplet', '=', True),
+                                                                          ('reporting_select_accounts_only', '=', True),
+                                                                          ('line_type', '=', 'view')]}"
+                                            />
+                                            <button name="button_remove_all_accounts" type="object" string="Remove all accounts"
+                                                    icon="gtk-clear" colspan="4"
+                                                    attrs="{'invisible': ['|',
+                                                                          ('reporting_select_accounts_only', '=', False),
+                                                                          ('line_type', '=', 'view')]}" />
+                                            <label string="" colspan="1"/>
+                                            <field name="is_quadruplet" attrs="{'invisible': [('line_type', '=', 'view')]}"
+                                                   colspan="2"
+                                                   on_change="on_change_is_quadruplet(is_quadruplet)"
+                                            />
+                                            <field name="reporting_select_accounts_only" attrs="{'invisible': [('line_type', '=', 'view')]}"
+                                                   colspan="2"
+                                                   on_change="on_change_reporting_select_accounts_only(reporting_select_accounts_only)"
+                                            />
+                                            <label string="" colspan="3"/>
+                                        </group>
                                         <field name="account_destination_ids" colspan="4" string="Account/Destination" nolabel="1"
                                                context="{'search_default_active': 1}"
-                                               attrs="{'invisible': [('|'), ('line_type', '=', 'view'), ('is_quadruplet', '=', True)]}">
-                                        </field>
+                                               attrs="{'invisible': ['|', '|',
+                                                                     ('line_type', '=', 'view'),
+                                                                     ('is_quadruplet', '=', True),
+                                                                     ('reporting_select_accounts_only', '=', True)]}"
+                                        />
                                         <field name="account_quadruplet_ids" colspan="4" string="Account/Destination/Funding Pool/Cost Centre" nolabel="1"
                                                context="{'search_default_active': 1}"
                                                attrs="{'invisible': [('|'), ('line_type', '=', 'view'), ('is_quadruplet', '!=', True)]}"
                                                domain="[('can_be_used','=',True)]">
                                         </field>
+                                        <field name="reporting_account_ids" colspan="4" string="G/L Accounts" nolabel="1"
+                                               context="{'from_grant_management': True, 'search_default_active': 1}"
+                                               attrs="{'invisible': ['|',
+                                                                     ('line_type', '=', 'view'),
+                                                                     ('reporting_select_accounts_only', '=', False)]}"
+                                               domain="[('selectable_in_contract', '=', True)]"
+                                        />
                                     </form>
                                 </field>
                             </page>
@@ -175,7 +209,6 @@
                 <field name="type">tree</field>
                 <field name="arch" type="xml">
                     <tree string="Account/Destination/Funding Pool/Cost Centre" colors="grey:used_in_contract;red:disabled" notselectable="used_in_contract" editable="top" noteditable="1">
-                        <field name="can_be_used" invisible="1"/>
                         <field name="account_destination_name"/>
                         <field name="funding_pool_id"/>
                         <field name="cost_center_id"/>
@@ -304,9 +337,19 @@
                                             <field name="overhead_type" colspan="2" attrs="{'required': [('line_type', '=', 'overhead')]}"/>
                                             <field name="overhead_percentage" colspan="2" attrs="{'required': [('line_type', '=', 'overhead')]}"/>
                                         </group>
+                                        <field name="reporting_select_accounts_only" attrs="{'invisible': [('line_type', '=', 'view')]}"
+                                               colspan="2"/>
                                         <field name="account_destination_ids" colspan="4" string="Account/Destination"
                                                context="context" 
-                                               attrs="{'invisible': [('line_type', '=', 'view')]}"/>
+                                               attrs="{'invisible': ['|',
+                                                                    ('line_type', '=', 'view'),
+                                                                    ('reporting_select_accounts_only', '=', True)]}"/>
+                                        <field name="reporting_account_ids" colspan="4" string="G/L Accounts"
+                                               context="{'from_grant_management': True, 'search_default_active': 1}"
+                                               attrs="{'invisible': ['|',
+                                                                     ('line_type', '=', 'view'),
+                                                                     ('reporting_select_accounts_only', '=', False)]}"
+                                        />
                                     </form>
                                 </field>
                             </page>

=== modified file 'bin/addons/financing_contract/format.py'
--- bin/addons/financing_contract/format.py	2015-05-28 08:50:00 +0000
+++ bin/addons/financing_contract/format.py	2020-11-02 12:53:09 +0000
@@ -97,39 +97,17 @@
                     duplet_ids_to_exclude = self.search(cr, uid, [('account_id', '=', account_quadruplet.account_id.id),('destination_id','=',account_quadruplet.account_destination_id.id)])
                     for item in duplet_ids_to_exclude:
                         exclude[item] = True
+                for account in line.reporting_account_ids:
+                    # exclude the acc/dest combinations when the account has been selected in lines with "accounts only"
+                    for acc_dest in self.search(cr, uid, [('account_id', '=', account.id)], order='NO_ORDER', context=context):
+                        exclude[acc_dest] = True
 
         for id in ids:
             ids_to_exclude[id] = id in exclude
         return ids_to_exclude
 
-    def _search_used_in_contract(self, cr, uid, obj, name, args, context=None):
-        if not args:
-            return []
-        if context is None:
-            context = {}
-        assert args[0][1] == '=' and args[0][2], 'Filter not implemented'
-        if not context.get('contract_id') and not context.get('donor_id'):
-            return []
-
-        if context.get('contract_id'):
-            ctr_obj = self.pool.get('financing.contract.contract')
-            id_toread = context['contract_id']
-        elif context.get('donor_id'):
-            ctr_obj = self.pool.get('financing.contract.donor')
-            id_toread = context['donor_id']
-
-        exclude = {}
-        for line in ctr_obj.browse(cr, uid, id_toread).actual_line_ids:
-            if not context.get('active_id', False) or line.id != context['active_id']:
-                for account_destination in line.account_destination_ids:
-                    exclude[account_destination.id] = True
-                for account_quadruplet in line.account_quadruplet_ids:
-                    exclude[account_quadruplet.account_destination_id.id] = True
-
-        return [('id', 'not in', exclude.keys())]
-
     _columns = {
-        'used_in_contract': fields.function(_get_used_in_contract, method=True, type='boolean', string='Used', fnct_search=_search_used_in_contract),
+        'used_in_contract': fields.function(_get_used_in_contract, method=True, type='boolean', string='Used'),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):

=== modified file 'bin/addons/financing_contract/format_line.py'
--- bin/addons/financing_contract/format_line.py	2019-10-30 16:33:21 +0000
+++ bin/addons/financing_contract/format_line.py	2020-11-02 12:53:09 +0000
@@ -22,7 +22,7 @@
 from osv import fields, osv
 from analytic_distribution.destination_tools import many2many_sorted
 from account_override import ACCOUNT_RESTRICTED_AREA
-
+from tools.safe_eval import safe_eval
 
 class financing_contract_format_line(osv.osv):
 
@@ -63,50 +63,47 @@
         return domain
 
     # get list of accounts for duplet format lines
-    def _create_account_couple_domain(self, account_destination_list, general_domain):
-        if len(account_destination_list) == 0:
-            return False # Just make this condition to False
-        elif len(account_destination_list) == 1:
-            temp_domain = ['&',
-                           ('general_account_id', '=', account_destination_list[0].account_id.id),
-                           ('destination_id', '=', account_destination_list[0].destination_id.id)]
-
-            return temp_domain
-        else:
-            firstElement = self._create_account_couple_domain([account_destination_list[0]], general_domain)
-            secondElement = self._create_account_couple_domain(account_destination_list[1:], general_domain)
-
-            if firstElement and secondElement:
-                return ['|'] + firstElement + secondElement
-            elif firstElement:
-                return firstElement
-            return secondElement
+    def _create_account_couple_domain(self, account_destination_list):
+        """
+        Returns the domain corresponding to the list of acc/dest in param.
+        """
+        dom = []
+        if not account_destination_list:
+            return dom
+        first = True
+        for account_dest in account_destination_list:
+            dom += ['&', ('general_account_id', '=', account_dest.account_id.id), ('destination_id', '=', account_dest.destination_id.id)]
+            if not first:
+                dom.insert(0, '|')
+            else:
+                first = False
+        return dom
 
     # get list of accounts for quadruplet format lines
-    def _create_account_quadruplet_domain(self, account_quadruplet_list, funding_pool_ids=False):
-        if len(account_quadruplet_list) == 0:
-            return False
-        elif len(account_quadruplet_list) == 1:
-            if account_quadruplet_list[0].funding_pool_id.id in funding_pool_ids:
-                quad_element = account_quadruplet_list[0]
-                return ['&',
-                        '&',
-                        ('general_account_id', '=', quad_element.account_id.id),
-                        ('destination_id', '=', quad_element.account_destination_id.id),
-                        '&',
-                        ('cost_center_id', '=', quad_element.cost_center_id.id),
-                        ('account_id', '=', quad_element.funding_pool_id.id)]
-            else:
-                return False
-        else:
-            firstElement = self._create_account_quadruplet_domain([account_quadruplet_list[0]], funding_pool_ids)
-            secondElement = self._create_account_quadruplet_domain(account_quadruplet_list[1:], funding_pool_ids)
-
-            if firstElement and secondElement:
-                return ['|'] + firstElement + secondElement
-            elif firstElement:
-                return firstElement
-            return secondElement
+    def _create_account_quadruplet_domain(self, account_quadruplet_list, funding_pool_ids=None):
+        """
+        Returns the domain corresponding to the list of quadruplets in param.
+        """
+        dom = []
+        if not account_quadruplet_list:
+            return dom
+        if funding_pool_ids is None:
+            funding_pool_ids = []
+        first = True
+        for quad in account_quadruplet_list:
+            if quad.funding_pool_id.id in funding_pool_ids:
+                dom += ['&',
+                        '&',
+                        '&',
+                        ('general_account_id', '=', quad.account_id.id),
+                        ('destination_id', '=', quad.account_destination_id.id),
+                        ('cost_center_id', '=', quad.cost_center_id.id),
+                        ('account_id', '=', quad.funding_pool_id.id)]
+                if not first:
+                    dom.insert(0, '|')
+                else:
+                    first = False
+        return dom
 
     def _get_number_of_childs(self, cr, uid, ids, field_name=None, arg=None, context=None):
         # Verifications
@@ -150,14 +147,27 @@
         self.write(cr, uid, ids, {'account_destination_ids':[(6, 0, [])]}, context=context )
         return True
 
+    def button_remove_all_accounts(self, cr, uid, ids, context=None):
+        """
+        Removes all G/L accounts selected in the Reporting lines wizard
+        """
+        self.write(cr, uid, ids, {'reporting_account_ids': [(6, 0, [])]}, context=context)
+        return True
+
     # Get the list of accounts for both duplet and quadruplet
     def _get_accounts_couple_and_quadruplets(self, browse_line):
+        """
+        Returns a dict with a list of browse records for acc/dest, quadruplets and "accounts only"
+        """
         account_destination_result = []
         account_quadruplet_result = []
-
+        account_gl_result = []
         if browse_line.line_type != 'view':
             if browse_line.is_quadruplet:
                 account_quadruplet_result = [account_quadruplet for account_quadruplet in browse_line.account_quadruplet_ids]
+            elif browse_line.reporting_select_accounts_only:
+                # this syntax's goal is to get a list of browse records instead of a browse_record_list
+                account_gl_result = [a for a in browse_line.reporting_account_ids]
             else:
                 account_destination_result = [account_destination for account_destination in browse_line.account_destination_ids]
         else:
@@ -165,8 +175,12 @@
                 temp = self._get_accounts_couple_and_quadruplets(child_line)
                 account_destination_result += temp['account_destination_list']
                 account_quadruplet_result += temp['account_quadruplet_list']
-        return {'account_destination_list': account_destination_result,
-                'account_quadruplet_list': account_quadruplet_result}
+                account_gl_result += temp['account_gl_list']
+        return {
+            'account_destination_list': account_destination_result,
+            'account_quadruplet_list': account_quadruplet_result,
+            'account_gl_list': account_gl_result,
+        }
 
     def _get_general_domain(self, cr, uid, browse_format, domain_type, context=None):
         # Method to get the domain (allocated or project) of a line
@@ -205,6 +219,8 @@
             funding_pool_ids = [x for x in funding_pool_ids if x not in fp_ids]
             funding_pool_domain = self._create_domain('account_id', funding_pool_ids)
             gen_domain['funding_pool_domain'] = funding_pool_domain
+        else:
+            gen_domain['funding_pool_domain'] = "('account_id', 'in', [])"
 
         gen_domain['funding_pool_ids'] = [x.id for x in funding_pool_ids]
         return gen_domain
@@ -221,23 +237,35 @@
             if format.eligibility_from_date and format.eligibility_to_date:
                 #### DUY US-385: MOVE THIS TO OUTSIDE OF THE ALL THE LOOPS
                 general_domain = self._get_general_domain(cr, uid, format, domain_type, context=context)
+                accounts_criteria = ['&', '&', ] + non_corrected_domain
+                acc_domains = []
 
                 # Account + destination domain
                 account_destination_quadruplet_ids = self._get_accounts_couple_and_quadruplets(browse_line)
-                account_couple_domain = self._create_account_couple_domain(account_destination_quadruplet_ids['account_destination_list'], False)
+                account_couple_domain = self._create_account_couple_domain(account_destination_quadruplet_ids['account_destination_list'])
+                if account_couple_domain:
+                    acc_domains += [account_couple_domain]
                 # get the criteria for accounts of quadruplet mode
                 account_quadruplet_domain = self._create_account_quadruplet_domain(account_destination_quadruplet_ids['account_quadruplet_list'], general_domain['funding_pool_ids'])
-
-                if not account_couple_domain and not account_quadruplet_domain:
-                    return [('id', '=', '-1')]
-
-                accounts_criteria = ['&', '&', ] + non_corrected_domain
-                if account_couple_domain and account_quadruplet_domain:
-                    accounts_criteria += ['|'] + account_couple_domain + account_quadruplet_domain
-                elif account_couple_domain:
-                    accounts_criteria += account_couple_domain
-                elif account_quadruplet_domain:
-                    accounts_criteria += account_quadruplet_domain
+                if account_quadruplet_domain:
+                    acc_domains += [account_quadruplet_domain]
+                # "Accounts Only" Domain
+                account_only_domain = []
+                if account_destination_quadruplet_ids['account_gl_list']:
+                    acc_ids = [a.id for a in account_destination_quadruplet_ids['account_gl_list']]
+                    account_only_domain = [('general_account_id', 'in', acc_ids)]
+                if account_only_domain:
+                    acc_domains += [account_only_domain]
+
+                # note: it's possible to have more than one domain in case several lines are grouped into a view
+                if len(acc_domains) == 1:
+                    accounts_criteria += acc_domains[0]
+                elif len(acc_domains) == 2:
+                    accounts_criteria += ['|'] + acc_domains[0] + acc_domains[1]
+                elif len(acc_domains) == 3:
+                    accounts_criteria += ['|'] + ['|'] + acc_domains[0] + acc_domains[1] + acc_domains[2]
+                else:
+                    return [('id', '=', -1)]
 
                 return accounts_criteria
             else:
@@ -404,6 +432,67 @@
 
         return res
 
+    def _get_quadruplet_sync_list(self, cr, uid, ids, field_name=None, arg=None, context=None):
+        tmp_quad = {}
+        link_ids = set()
+        aa_ids = set()
+
+        for line in self.browse(cr, uid, ids, fields_to_fetch=['account_quadruplet_ids'], context=context):
+            for quad in line.account_quadruplet_ids:
+                link_ids.add(quad.account_destination_link_id.id)
+                aa_ids.add(quad.funding_pool_id.id)
+                aa_ids.add(quad.cost_center_id.id)
+                tmp_quad.setdefault(line.id, []).append([quad.account_destination_link_id.id, quad.funding_pool_id.id, quad.cost_center_id.id])
+
+        if link_ids:
+            link_sdref = self.pool.get('account.destination.link').get_sd_ref(cr, uid, list(link_ids), context=context)
+        if aa_ids:
+            aa_sdref = self.pool.get('account.analytic.account').get_sd_ref(cr, uid, list(aa_ids), context=context)
+
+        ret = {}
+        for _id in ids:
+            ret[_id] = []
+            for quad_list in tmp_quad.get(_id, []):
+                ret[_id].append([link_sdref.get(quad_list[0]), aa_sdref.get(quad_list[1]), aa_sdref.get(quad_list[2])])
+            ret[_id] = '%s' % ret[_id]
+        return ret
+
+
+    def _set_quadruplet_sync_list(self, cr, uid, id, name, value, arg, context):
+        quad_obj = self.pool.get('financing.contract.account.quadruplet')
+
+        value_list = safe_eval(value)
+        link_ids = set()
+        aa_ids = set()
+
+        cr.execute('delete from financing_contract_actual_account_quadruplets where actual_line_id = %s', (id, ))
+        for data in value_list:
+            link_ids.add(data[0])
+            aa_ids.add(data[1])
+            aa_ids.add(data[2])
+
+        if link_ids:
+            link_sdref = self.pool.get('account.destination.link').find_sd_ref(cr, uid, list(link_ids), context=context)
+        if aa_ids:
+            aa_sdref = self.pool.get('account.analytic.account').find_sd_ref(cr, uid, list(aa_ids), context=context)
+
+        for data in value_list:
+            quad_id = quad_obj.search(cr, uid, [('account_destination_link_id', '=', link_sdref.get(data[0])), ('funding_pool_id', '=', aa_sdref.get(data[1])), ('cost_center_id', '=', aa_sdref.get(data[2]))], context=context)
+            if not quad_id:
+                cr.execute('''INSERT INTO financing_contract_account_quadruplet (account_destination_name, account_id, cost_center_id, disabled, account_destination_link_id, funding_pool_id, account_destination_id) (select
+                    account_destination_name, account_id, cost_center_id, disabled, account_destination_link_id, funding_pool_id, account_destination_id
+                    from
+                        financing_contract_account_quadruplet_view
+                    where
+                        account_destination_link_id = %s and
+                        funding_pool_id = %s and
+                        cost_center_id = %s
+                ) RETURNING id
+                ''', (link_sdref.get(data[0]), aa_sdref.get(data[1]), aa_sdref.get(data[2])))
+                quad_id = cr.fetchone()
+            cr.execute('insert into financing_contract_actual_account_quadruplets (actual_line_id, account_quadruplet_id) values (%s, %s)', (id, quad_id[0]))
+
+        return True
 
     _columns = {
         'name': fields.char('Name', size=64, required=True),
@@ -411,7 +500,7 @@
         'format_id': fields.many2one('financing.contract.format', 'Format'),
         'is_quadruplet': fields.boolean('Input CC/FP at line level?'),
         'account_destination_ids': many2many_sorted('account.destination.link', 'financing_contract_actual_account_destinations', 'actual_line_id', 'account_destination_id', string='Accounts/Destinations', domain=ACCOUNT_RESTRICTED_AREA['contract_reporting_lines']),
-        'account_quadruplet_ids': many2many_sorted('financing.contract.account.quadruplet', 'financing_contract_actual_account_quadruplets', 'actual_line_id', 'account_quadruplet_id', string='Accounts/Destinations/Funding Pools/Cost Centres'),
+        'account_quadruplet_ids': fields.many2many('financing.contract.account.quadruplet', 'financing_contract_actual_account_quadruplets', 'actual_line_id', 'account_quadruplet_id', string='Accounts/Destinations/Funding Pools/Cost Centres', order_by='account_destination_name asc, funding_pool_id asc, cost_center_id asc, id'),
         'parent_id': fields.many2one('financing.contract.format.line', 'Parent line'),
         'child_ids': fields.one2many('financing.contract.format.line', 'parent_id', 'Child lines'),
         'line_type': fields.selection([('view','View'),
@@ -431,12 +520,23 @@
 
         'allocated_real': fields.function(_get_actual_amount, method=True, store=False, string="Funded - Actuals", type="float", readonly=True),
         'project_real': fields.function(_get_actual_amount, method=True, store=False, string="Total project - Actuals", type="float", readonly=True),
-        'quadruplet_update': fields.text('Internal Use Only'),
+        'quadruplet_update': fields.text('Internal Use Only (deprecated - kept to manage old sync update)'),
+        'quadruplet_sync_list': fields.function(_get_quadruplet_sync_list, method=True, string='Used to sync quad', type='text', fnct_inv=_set_quadruplet_sync_list),
         'instance_id': fields.many2one('msf.instance','Proprietary Instance'),
+        'reporting_select_accounts_only': fields.boolean(string="Select Accounts Only"),
+        'reporting_account_ids': fields.many2many('account.account', 'contract_format_line_account_rel', 'format_line_id', 'account_id',
+                                                  string='G/L Accounts',
+                                                  domain="[('type', '!=', 'view'),"
+                                                         " ('is_analytic_addicted', '=', True),"
+                                                         " ('active', 'in', ['t', 'f'])]",
+                                                  order_by='code'),
     }
 
+
+
     _defaults = {
         'is_quadruplet': False,
+        'reporting_select_accounts_only': False,
         'line_type': 'actual',
         'overhead_type': 'cost_percentage',
         'parent_id': lambda *a: False
@@ -445,36 +545,58 @@
     _order = 'code asc'
 
     # UF-2311: Calculate the quadruplet value before writing or creating the format line
-    def calculate_quaduplet(self, vals, context):
+    def calculate_quadruplet(self, cr, uid, vals, context):
+        if context is None:
+            context = {}
+        # UC "Account/Dest." selection when...
+        # ...either no boxes are ticked
+        if 'is_quadruplet' in vals and 'reporting_select_accounts_only' in vals and \
+                not vals['is_quadruplet'] and not vals['reporting_select_accounts_only']:
+            acc_dest_selected = True
+        # ...or "Select Accounts Only" isn't ticked in the Donors where no quadruplets are handled
+        elif context.get('donor_id') and 'reporting_select_accounts_only' in vals and not vals['reporting_select_accounts_only']:
+            acc_dest_selected = True
+        else:
+            acc_dest_selected = False
+        # View Line Type = no items selected
         if 'line_type' in vals and vals['line_type'] == 'view':
             vals['allocated_amount'] = 0.0
             vals['project_amount'] = 0.0
             vals['account_destination_ids'] = [(6, 0, [])]
             vals['account_quadruplet_ids'] = [(6, 0, [])]
-        elif 'is_quadruplet' in vals: # If the vals contains quadruplet value, then check if it is true or false
-            if vals.get('is_quadruplet', False):
-                # delete account/destinations
-                vals['account_destination_ids'] = [(6, 0, [])]
-                if context.get('sync_update_execution'):
-                    quads_list = []
-                    if vals.get('quadruplet_update', False):
-                        quadrup_str = vals['quadruplet_update']
-                        quads_list = map(int, quadrup_str.split(','))
-                    vals['account_quadruplet_ids'] = [(6, 0, quads_list)]
-                else:
-                    temp = vals['account_quadruplet_ids']
-                    if temp[0]:
-                        vals['quadruplet_update'] = str(temp[0][2]).strip('[]')
-            else:
-                vals['account_quadruplet_ids'] = [(6, 0, [])]
-                vals['quadruplet_update'] = '' # delete quadruplets
+            vals['quadruplet_update'] = ''
+            vals['reporting_account_ids'] = [(6, 0, [])]
+            vals['is_quadruplet'] = False
+            vals['reporting_select_accounts_only'] = False
+        # "Input CC/FP at line level" = quadruplets selected
+        elif vals.get('is_quadruplet'):
+            # reset the acc/dest and G/L accounts which might have been selected before ticking the box "Input CC/FP at line level"
+            vals['account_destination_ids'] = [(6, 0, [])]
+            vals['reporting_account_ids'] = [(6, 0, [])]
+            if context.get('sync_update_execution') and vals.get('quadruplet_update', False) and 'quadruplet_sync_list' not in vals:
+                # old sync update received
+                quadrup_str = vals['quadruplet_update']
+                quads_list = map(int, quadrup_str.split(','))
+                vals['account_quadruplet_ids'] = [(6, 0, self.pool.get('financing.contract.account.quadruplet').migrate_old_quad(cr, uid, quads_list))]
+        # "Select Accounts Only" = only G/L accounts selected: reset the acc/dest and quadruplets
+        elif vals.get('reporting_select_accounts_only'):
+            vals['account_destination_ids'] = [(6, 0, [])]
+            vals['account_quadruplet_ids'] = [(6, 0, [])]
+            vals['quadruplet_update'] = ''
+        # Accounts/Destinations selected: reset the G/L accounts and quadruplets
+        elif acc_dest_selected:
+            vals['reporting_account_ids'] = [(6, 0, [])]
+            vals['account_quadruplet_ids'] = [(6, 0, [])]
+            vals['quadruplet_update'] = ''
+        return True
+
 
     def create(self, cr, uid, vals, context=None):
         if not context:
             context = {}
 
         # calculate the quadruplet combination
-        self.calculate_quaduplet(vals, context)
+        self.calculate_quadruplet(cr, uid, vals, context)
         return super(financing_contract_format_line, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -488,12 +610,14 @@
         # US-180: Check if it comes from the sync update
         if context.get('sync_update_execution') and vals.get('format_id', False):
             # US-180: and if the financing contract of the contract format does not exist, then just ignore this update
-            exist = self.pool.get('financing.contract.contract').search(cr, uid, [('format_id', '=', vals['format_id'])])
+            exist = self.pool.get('financing.contract.contract').search_exists(cr, uid, [('format_id', '=', vals['format_id'])])
+            if not exist:
+                exist = self.pool.get('financing.contract.donor').search_exists(cr, uid, [('format_id', '=', vals['format_id'])])
             if not exist: # No contract found for this format line
                 return True
 
         # calculate the quadruplet combination
-        self.calculate_quaduplet(vals, context)
+        self.calculate_quadruplet(cr, uid, vals, context)
         return super(financing_contract_format_line, self).write(cr, uid, ids, vals, context=context)
 
     def copy_format_line(self, cr, uid, browse_source_line, destination_format_id, parent_id=None, context=None):
@@ -505,14 +629,37 @@
                 'parent_id': parent_id,
                 'line_type': browse_source_line.line_type,
                 'account_quadruplet_ids': [(6, 0, [])],
+                'reporting_select_accounts_only': browse_source_line.reporting_select_accounts_only,
             }
             account_destination_ids = [account_destination.id for account_destination in browse_source_line.account_destination_ids]
             format_line_vals['account_destination_ids'] = [(6, 0, account_destination_ids)]
+            # copy the list of "Accounts Only"
+            gl_account_ids = [a.id for a in browse_source_line.reporting_account_ids]
+            format_line_vals['reporting_account_ids'] = [(6, 0, gl_account_ids)]
             parent_line_id = self.pool.get('financing.contract.format.line').create(cr, uid, format_line_vals, context=context)
             for child_line in browse_source_line.child_ids:
                 self.copy_format_line(cr, uid, child_line, destination_format_id, parent_line_id, context=context)
         return
 
+    def on_change_is_quadruplet(self, cr, uid, ids, is_quadruplet, context=None):
+        """
+        Ticking "Input CC/FP at line level?" automatically unticks "Select Accounts Only"
+        """
+        res = {}
+        if is_quadruplet:
+            res['value'] = {'reporting_select_accounts_only': False, }
+        return res
+
+    def on_change_reporting_select_accounts_only(self, cr, uid, ids, reporting_select_accounts_only, context=None):
+        """
+        Ticking "Select Accounts Only" automatically unticks "Input CC/FP at line level?"
+        """
+        res = {}
+        if reporting_select_accounts_only:
+            res['value'] = {'is_quadruplet': False, }
+        return res
+
+
 financing_contract_format_line()
 
 

=== modified file 'bin/addons/financing_contract/report/financing_contract.py'
--- bin/addons/financing_contract/report/financing_contract.py	2016-02-26 10:24:24 +0000
+++ bin/addons/financing_contract/report/financing_contract.py	2020-11-02 12:53:09 +0000
@@ -74,6 +74,10 @@
                             str(quad.funding_pool_id.code),
                             str(quad.cost_center_id.code)]),
                         account_list, account_list_index)
+            elif line.reporting_account_ids:
+                # G/L Accounts Only selected
+                for account in line.reporting_account_ids:
+                    account_list_index = add_account_list_block_item(str(account.code), account_list, account_list_index)
             else:
                 # Case where we have some destination_ids
                 for account_destination in line.account_destination_ids:

=== modified file 'bin/addons/financing_contract/report/report_project_expenses.py'
--- bin/addons/financing_contract/report/report_project_expenses.py	2019-10-30 16:33:21 +0000
+++ bin/addons/financing_contract/report/report_project_expenses.py	2020-11-02 12:53:09 +0000
@@ -1,6 +1,8 @@
 from report import report_sxw
 from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
 from tools.translate import _
+import logging
+
 assert _  # pyflakes check
 
 class report_project_expenses2(report_sxw.rml_parse):
@@ -17,7 +19,6 @@
         self.lines = {}
         self.totalRptCurrency = 0
         self.totalBookAmt = 0
-        self.iter = []
         self.localcontext.update({
             'getLines':self.getLines,
             'getCostCenter':self.getCostCenter,
@@ -26,29 +27,12 @@
             'getSub1':self.getSub1,
             'getSub2':self.getSub2,
             'getLines2':self.getLines2,
-            'getFormula':self.getFormula,
             'totalRptCurrency': self.totalRptCurrency,
             'totalBookAmt':self.totalBookAmt,
             'getTotalRptCurrency': self.getTotalRptCurrency,
             'getTotalBookAmt': self.getTotalBookAmt,
         })
 
-    def getFormula(self):
-        formul = ''
-        iters = self.iter[1:]
-        temp = self.iter[1:]
-        tour = 1
-        for i in temp:
-            tour += 1
-            nb = 0
-            for x in iters:
-                nb += x + 1
-            rang = nb + 1
-            formul += '+R[-'+str(rang)+']C'
-            iters = self.iter[tour:]
-
-        return self.totalRptCurrency
-        return formul
 
     def getTotalBookAmt(self):
         return self.totalBookAmt
@@ -100,51 +84,46 @@
             return []
         contract_obj = self.pool.get('financing.contract.contract')
         format_line_obj = self.pool.get('financing.contract.format.line')
+        logger = logging.getLogger('contract.report')
+
         contract_domain = contract_obj.get_contract_domain(self.cr, self.uid, contract, reporting_type=self.reporting_type)
         analytic_line_obj = self.pool.get('account.analytic.line')
         analytic_lines = analytic_line_obj.search(self.cr, self.uid, contract_domain, context=None)
 
-        # list of analytic journal_ids which are in the engagement journals
+        # list of analytic journal_ids which are in the engagement journals: to be added in get_contract_domain ?
         exclude_journal_ids = self.pool.get('account.analytic.journal').search(self.cr, self.uid, [('type','=','engagement')])
-        exclude_line_ids = []
+
+        # gen a dict to store aji cond = reporting_line.code, reporting_line.name
+        line_code_name_by_cond = {}
+        reporting_lines_id = format_line_obj.search(self.cr, self.uid, [('format_id', '=', contract.format_id.id), ('line_type', '!=', 'view')])
+        for report_line in format_line_obj.browse(self.cr, self.uid, reporting_lines_id):
+            if report_line.is_quadruplet:
+                for quad in report_line.account_quadruplet_ids:
+                    line_code_name_by_cond[(quad.account_id.id, quad.account_destination_id.id, quad.cost_center_id.id, quad.funding_pool_id.id)] = (report_line.code, report_line.name)
+            elif not report_line.reporting_select_accounts_only:
+                for triplet in report_line.account_destination_ids:
+                    line_code_name_by_cond[(triplet.account_id.id, triplet.destination_id.id)] = (report_line.code, report_line.name)
+            else:
+                for gl_only in report_line.reporting_account_ids:
+                    line_code_name_by_cond[gl_only.id] = (report_line.code, report_line.name)
+
+        # iterate over aji, to link each aji to its reporting_line
         for analytic_line in analytic_line_obj.browse(self.cr, self.uid, analytic_lines, context=None):
             if analytic_line.journal_id.id in exclude_journal_ids:
-                exclude_line_ids.append(analytic_line.id)
-        analytic_lines = [x for x in analytic_lines if x not in exclude_line_ids]
-
-        # UFTP-16: First search in the triplet in format line, then in the second block below, search in quadruplet
-        for analytic_line in analytic_line_obj.browse(self.cr, self.uid, analytic_lines, context=None):
-            ids_adl = self.pool.get('account.destination.link').search(self.cr, self.uid,[('account_id', '=', analytic_line.general_account_id.id),('destination_id','=',analytic_line.destination_id.id) ])
-            ids_fcfl = format_line_obj.search(self.cr, self.uid, [('account_destination_ids','in',ids_adl), ('format_id', '=', contract.format_id.id)])
-            for fcfl in format_line_obj.browse(self.cr, self.uid, ids_fcfl):
-                ana_tuple = (analytic_line, fcfl.code, fcfl.name)
-                if lines.has_key(fcfl.code):
-                    if not ana_tuple in lines[fcfl.code]:
-                        lines[fcfl.code] += [ana_tuple]
-                else:
-                    lines[fcfl.code] = [ana_tuple]
-
-        # UFTP-16: First search in the triplet in format line, then in the second block below, search in quadruplet
-        for analytic_line in analytic_line_obj.browse(self.cr, self.uid, analytic_lines, context=None):
-            # US-460: Include also the funding pool in the criteria when searching for the quadruplet of the contract line
-            criteria_for_adl = [('account_id', '=', analytic_line.general_account_id.id),
-                                ('account_destination_id', '=', analytic_line.destination_id and analytic_line.destination_id.id or False),
-                                ('funding_pool_id', '=', analytic_line.account_id.id),
-                                ('cost_center_id', '=', analytic_line.cost_center_id and analytic_line.cost_center_id.id or False)]
-            ids_adl = self.pool.get('financing.contract.account.quadruplet').search(self.cr, self.uid, criteria_for_adl)
-
-            ids_fcfl = format_line_obj.search(self.cr, self.uid, [('account_quadruplet_ids','in',ids_adl), ('format_id', '=', contract.format_id.id)])
-            for fcfl in format_line_obj.browse(self.cr, self.uid, ids_fcfl):
-                ana_tuple = (analytic_line, fcfl.code, fcfl.name)
-                if lines.has_key(fcfl.code):
-                    if not ana_tuple in lines[fcfl.code]:
-                        lines[fcfl.code] += [ana_tuple]
-                else:
-                    lines[fcfl.code] = [ana_tuple]
+                continue
+            quad_key = (analytic_line.general_account_id.id, analytic_line.destination_id.id, analytic_line.cost_center_id.id, analytic_line.account_id.id)
+            if quad_key in line_code_name_by_cond:
+                lines.setdefault(line_code_name_by_cond[quad_key], []).append((analytic_line, line_code_name_by_cond[quad_key][0], line_code_name_by_cond[quad_key][1]))
+            elif quad_key[0:2] in line_code_name_by_cond:
+                triplet_key = quad_key[0:2]
+                lines.setdefault(line_code_name_by_cond[triplet_key], []).append((analytic_line, line_code_name_by_cond[triplet_key][0], line_code_name_by_cond[triplet_key][1]))
+            elif quad_key[0] in line_code_name_by_cond:
+                gl_key = quad_key[0]
+                lines.setdefault(line_code_name_by_cond[gl_key], []).append((analytic_line, line_code_name_by_cond[gl_key][0], line_code_name_by_cond[gl_key][1]))
+            else:
+                logger.warn('AJI id:%s, name: %s does not match any reporting lines on contract %s' % (analytic_line.id, analytic_line.entry_sequence, self.objects[0].code))
 
         self.lines = lines
-        for x in lines:
-            self.iter.append(len(lines[x]))
         return lines
 
 

=== 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:09 +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', 'select_accounts_only', 'fp_account_ids']
 
         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:09 +0000
@@ -180,10 +180,6 @@
         # Prepare some values
         # Do changes because of YAML tests
         cr = pooler.get_db(dbname).cursor()
-        try:
-            msf_fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
-        except ValueError:
-            msf_fp_id = 0
         created = 0
         processed = 0
         errors = []
@@ -517,23 +513,15 @@
                             errors.append(_('Line %s. The Cost Center %s is not compatible with the Destination %s.') %
                                           (current_line_num, line[cols['Cost Centre']], line[cols['Destination']]))
                             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)
-                            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]:
-                                errors.append(_('Line %s. The combination "account %s and destination %s" is not '
-                                                'compatible with the Funding Pool %s.') %
-                                              (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]:
-                                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
+                        if not ad_obj.check_fp_acc_dest_compatibility(cr, uid, r_fp, account.id, r_destination, context=context):
+                            errors.append(_('Line %s. The combination "account %s and destination %s" is not '
+                                            'compatible with the Funding Pool %s.') %
+                                          (current_line_num, line[cols['G/L Account']], line[cols['Destination']], line[cols['Funding Pool']]))
+                            continue
+                        if not ad_obj.check_fp_cc_compatibility(cr, uid, r_fp, 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
 
                     # US-937: use period of import file
                     if period_name.startswith('Period 16'):

=== 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:09 +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:09 +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/
@@ -114,11 +114,12 @@
                     continue
             else: # CASE 4/
                 # C Check, except B
-                if (line.account_id.id, 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 line.funding_pool_id.tuple_destination_account_ids if not x.disabled] and line.funding_pool_id.id != fp_id:
+                if not ad_obj.check_fp_acc_dest_compatibility(cr, uid, line.funding_pool_id.id, line.account_id.id,
+                                                              line.destination_id.id, context=context):
                     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
@@ -163,9 +164,9 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        fp = [0]
-        cc = [0]
-        dest = [0]
+        fp = [-1]
+        cc = [-1]
+        dest = [-1]
         for ana_account in self.read(cr, uid, ids, ['category']):
             if ana_account['category'] == 'OC':
                 cc.append(ana_account['id'])
@@ -174,8 +175,13 @@
             elif ana_account['category'] == 'FUNDING':
                 fp.append(ana_account['id'])
         if len(fp) > 1 or len(cc) > 1 or len(dest) > 1:
-            return self.pool.get('hr.payroll.msf').search(cr, uid, [('state', '=', 'draft'), '|', '|', ('funding_pool_id', 'in', fp), ('cost_center_id','in', cc), ('destination_id','in', dest)])
-
+            return self.pool.get('hr.payroll.msf').search(cr, uid,
+                                                          [('state', '=', 'draft'),
+                                                           '|', '|',
+                                                           ('funding_pool_id', 'in', fp),
+                                                           ('cost_center_id', 'in', cc),
+                                                           ('destination_id', 'in', dest)],
+                                                          order='NO_ORDER')
         return []
 
     def _get_trigger_state_account(self, cr, uid, ids, context=None):
@@ -235,7 +241,12 @@
                                           store={
                                               'hr.payroll.msf': (lambda self, cr, uid, ids, c=None: ids, ['account_id', 'cost_center_id', 'funding_pool_id', 'destination_id'], 10),
                                               'account.account': (_get_trigger_state_account, ['user_type_code', 'destination_ids'], 20),
-                                              'account.analytic.account': (_get_trigger_state_ana, ['date', 'date_start', 'cost_center_ids', 'tuple_destination_account_ids'], 20),
+                                              'account.analytic.account': (_get_trigger_state_ana, ['date', 'date_start', 'allow_all_cc',
+                                                                                                    'dest_cc_ids', 'allow_all_cc_with_fp',
+                                                                                                    'cost_center_ids', 'select_accounts_only',
+                                                                                                    'fp_account_ids',
+                                                                                                    'tuple_destination_account_ids'],
+                                                                           20),
                                               'account.destination.link': (_get_trigger_state_dest_link, ['account_id', 'destination_id'], 30),
                                           }
                                           ),
@@ -255,7 +266,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 = {}
@@ -272,13 +283,11 @@
             for field in fields:
                 field.set('domain', "[('category', '=', 'OC'), ('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"]')
             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), "
+                                    "('fp_compatible_with_acc_dest_ids', '=', (account_id, destination_id))]")
             # Change Destination field
             dest_fields = form.xpath('//field[@name="destination_id"]')
             for field in dest_fields:
@@ -288,32 +297,8 @@
         return view
 
     def onchange_destination(self, cr, uid, ids, destination_id=False, funding_pool_id=False, account_id=False):
-        """
-        Check given funding pool with destination
-        """
-        # Prepare some values
-        res = {}
-        # If all elements given, then search FP compatibility
-        if destination_id and funding_pool_id and account_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
-            # Delete funding_pool_id if not valid with tuple "account_id/destination_id".
-            # but do an exception for MSF Private FUND analytic account
-            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_line.tuple_destination_account_ids if not x.disabled] and funding_pool_id != fp_id:
-                res = {'value': {'funding_pool_id': False}}
-        # If no destination, do nothing
-        elif not destination_id:
-            res = {}
-        # Otherway: delete FP
-        else:
-            res = {'value': {'funding_pool_id': False}}
-        # If destination given, search if given
-        return res
+        return self.pool.get('analytic.distribution').\
+            onchange_ad_destination(cr, uid, ids, destination_id=destination_id, funding_pool_id=funding_pool_id, account_id=account_id)
 
     def create(self, cr, uid, vals, context=None):
         """

=== 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:09 +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:09 +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_instance/account_target_costcenter.py'
--- bin/addons/msf_instance/account_target_costcenter.py	2019-05-14 07:28:06 +0000
+++ bin/addons/msf_instance/account_target_costcenter.py	2020-11-02 12:53:09 +0000
@@ -27,8 +27,8 @@
     _trace = True
 
     _columns = {
-        'instance_id': fields.many2one('msf.instance', 'Instance', required=True),
-        'cost_center_id': fields.many2one('account.analytic.account', 'Code', domain=[('category', '=', 'OC')], required=True),
+        'instance_id': fields.many2one('msf.instance', 'Instance', required=True, select=1),
+        'cost_center_id': fields.many2one('account.analytic.account', 'Code', domain=[('category', '=', 'OC')], required=True, select=1),
         'cost_center_name': fields.related('cost_center_id', 'name', string="Name", readonly=True, type="text"),
         'is_target': fields.boolean('Is target'),
         'is_top_cost_center': fields.boolean('Top cost centre for budget consolidation'),

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-10-09 13:44:47 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-11-02 12:53:09 +0000
@@ -610,5 +610,9 @@
             <field name="method">us_2725_uf_write_date_on_products</field>
         </record>
 
+        <record id="us_7243_migrate_contract_quad" model="patch.scripts">
+            <field name="method">us_7243_migrate_contract_quad</field>
+        </record>
+
     </data>
 </openerp>

=== 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:09 +0000
@@ -3460,7 +3460,7 @@
 #: view:financing.contract.account.quadruplet:0
 #: view:financing.contract.contract:0
 msgid "Account/Destination/Funding Pool/Cost Centre"
-msgstr "Account/Destination/Funding Pool/Cost Centre"
+msgstr "Compte/Destination/Funding Pool/Centre de Coût"
 
 #. module: sync_client
 #: field:sync.monitor,data_push_send:0
@@ -8938,7 +8938,7 @@
 #. module: financing_contract
 #: view:financing.contract.contract:0
 msgid "Remove all couples"
-msgstr "Remove all couples"
+msgstr "Supprimer toutes les paires"
 
 #. modules: purchase, tender_flow, msf_outgoing, stock
 #: view:stock.picking:0
@@ -15941,7 +15941,7 @@
 #. module: financing_contract
 #: view:financing.contract.contract:0
 msgid "Remove all quads"
-msgstr "Remove all quads"
+msgstr "Supprimer tous les quadruplets"
 
 #. modules: tender_flow, process, account_hq_entries, account_override, procurement_cycle, return_claim, finance, sync_client, account_mcdb, procurement_request, product_asset, board, stock_override, msf_button_access_rights, analytic_distribution, msf_homere_interface, hr, consumption_calculation, register_accounting, kit, base, procurement_report, threshold_value, purchase, account, msf_outgoing, resource, stock_move_tracking, msf_partner, procurement_auto, msf_field_access_rights, sale, transport_mgmt, procurement, sourcing, msf_audittrail, stock
 #: view:account.account:0
@@ -16349,8 +16349,14 @@
 
 #. module: analytic_distribution
 #: view:account.analytic.account:0
-msgid "Remove all"
-msgstr "Tout supprimer"
+msgid "Remove all accounts/destinations"
+msgstr "Supprimer tous les comptes/destinations"
+
+#. modules: analytic_distribution, financing_contract
+#: view:account.analytic.account:0
+#: view:financing.contract.contract:0
+msgid "Remove all accounts"
+msgstr "Supprimer tous les comptes"
 
 #. module: vertical_integration
 #: code:addons/vertical_integration/report/hq_report_oca.py:176
@@ -28883,8 +28889,9 @@
 msgid "This view can be used by accountants in order to quickly record entries in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account. OpenERP will propose to you automatically the Tax related to this account and the counterpart \"Account Payable\"."
 msgstr "Cette vue peut être utilisée par des comptables afin d'enregistrer rapidement des écritures comptables dans OpenERP. Si vous voulez enregistrer une facture fournisseur, commencez par enregistrer la ligne du compte de charge. OpenERP vous proposera automatiquement la taxe afférente à ce compte et la contrepartie \"Compte fournisseur\"."
 
-#. module: financing_contract
+#. modules: financing_contract, analytic_distribution
 #: field:financing.contract.format.line,account_destination_ids:0
+#: view:account.analytic.account:0
 msgid "Accounts/Destinations"
 msgstr "Comptes/Destinations"
 
@@ -53406,8 +53413,8 @@
 
 #. module: financing_contract
 #: field:financing.contract.format.line,quadruplet_update:0
-msgid "Internal Use Only"
-msgstr "Internal Use Only"
+msgid "Internal Use Only (deprecated - kept to manage old sync update)"
+msgstr "Usage Interne Uniquement (déprécié - conservé pour gérer les anciennes mises à jour via synch.)"
 
 #. modules: base_setup, unifield_setup, base
 #: selection:base.setup.company,country_id:0
@@ -60385,6 +60392,62 @@
 msgid "G/L Account"
 msgstr "Compte Grand Livre"
 
+#. modules: analytic_distribution, account, analytic_override, financing_contract
+#: view:account.analytic.account:0
+#: view:account.account:0
+#: field:account.analytic.account,fp_account_ids:0
+#: view:financing.contract.contract:0
+#: field:financing.contract.format.line,reporting_account_ids:0
+#: view:financing.contract.donor:0
+msgid "G/L Accounts"
+msgstr "Comptes Grand Livre"
+
+#. module: analytic_distribution
+#: report:funding.pool:0
+msgid "G/L Accounts:"
+msgstr "Comptes Grand Livre :"
+
+#. module: analytic_override
+#: help:account.analytic.account,fp_account_ids:0
+msgid "G/L accounts linked to the Funding Pool"
+msgstr "Comptes Grand Livre liés au Funding Pool"
+
+#. modules: analytic_override, financing_contract
+#: field:account.analytic.account,select_accounts_only:0
+#: field:financing.contract.format.line,reporting_select_accounts_only:0
+msgid "Select Accounts Only"
+msgstr "Sélectionner des Comptes Uniquement"
+
+#. module: account_override
+#: field:account.account,selected_in_fp:0
+msgid "Selected in Funding Pool"
+msgstr "Sélectionné dans le Funding Pool"
+
+#. module: account_override
+#: field:account.account,selectable_in_contract:0
+msgid "Selectable in Contract"
+msgstr "Sélectionnable dans le Contrat"
+
+#. module: account_override
+#: field:account.account,selected_in_contract:0
+msgid "Selected in Contract or Donor"
+msgstr "Sélectionné dans le Contrat ou le Bailleur"
+
+#. module: financing_contract
+#: sql_constraint:financing.contract.account.quadruplet:0
+msgid "not unique!"
+msgstr "non unique !"
+
+#. module: financing_contract
+#: field:financing.contract.format.line,quadruplet_sync_list:0
+msgid "Used to sync quad"
+msgstr "Utilisé pour synch. les quadruplets"
+
+#. module: financing_contract
+#: field:financing.contract.contract,quad_gen_date:0
+msgid "Date of last generation of quad"
+msgstr "Date de la dernière génération des quadruplets"
+
 #. module: purchase_override
 #: view:purchase.order.cancel.wizard:0
 msgid "Please confirm that you want to cancel all non-confirmed lines of this PO"
@@ -61535,10 +61598,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
@@ -69077,7 +69140,6 @@
 msgstr "Canceled End"
 
 #. modules: financing_contract, analytic_distribution
-#: field:financing.contract.account.quadruplet,account_destination_id:0
 #: field:account.analytic.account,tuple_destination_account_ids:0
 #: view:account.destination.link:0
 #: view:account.destination.link:0
@@ -94241,6 +94303,7 @@
 #: view:account.destination.summary:0
 #: code:addons/stock_override/report/report_stock_move.py:759
 #: report:addons/account/report/invoice_excel_export.mako:75
+#: field:financing.contract.account.quadruplet,account_destination_id:0
 #, python-format
 msgid "Destination"
 msgstr "Destination"
@@ -104790,7 +104853,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 +104882,39 @@
 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
+#: field:account.analytic.account,fp_compatible_with_acc_dest_ids:0
+msgid "Funding Pools compatible with the Account/Destination combination"
+msgstr "Funding Pools compatibles avec la combinaison Compte/Destination"
+
+#. 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 +105264,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 +110011,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_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-10-09 13:44:47 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-11-02 12:53:09 +0000
@@ -53,6 +53,25 @@
     }
 
     # UF19.0
+    def us_7243_migrate_contract_quad(self, cr, uid, *a, **b):
+        quad_obj = self.pool.get('financing.contract.account.quadruplet')
+        if not cr.table_exists('financing_contract_actual_account_quadruplets_old'):
+            cr.execute("create table financing_contract_actual_account_quadruplets_old as (select * from financing_contract_actual_account_quadruplets)")
+        already_migrated = {}
+        cr.execute('truncate financing_contract_actual_account_quadruplets')
+        cr.execute('select actual_line_id, account_quadruplet_id from financing_contract_actual_account_quadruplets_old')
+        nb_mig = 0
+        for x in cr.fetchall():
+            if x[1] not in already_migrated:
+                new_id = quad_obj.migrate_old_quad(cr, uid, [x[1]])
+                already_migrated[x[1]] = new_id and new_id[0]
+            if already_migrated.get(x[1]):
+                nb_mig += 1
+                cr.execute('insert into financing_contract_actual_account_quadruplets (actual_line_id, account_quadruplet_id) values (%s, %s)', (x[0], already_migrated[x[1]]))
+
+        self._logger.warn('%d quad migrated' % (nb_mig,))
+        return True
+
     def us_2725_uf_write_date_on_products(self, cr, uid, *a, **b):
         '''
         Set the uf_write_date of products which don't have one to the date of creation
@@ -3910,10 +3929,7 @@
             except Exception as e:
                 err_msg = 'Error with the patch scripts %s.%s :: %s' % (ps['model'], ps['method'], e)
                 self._logger.error(err_msg)
-                raise osv.except_osv(
-                    'Error',
-                    err_msg,
-                )
+                raise
 
 patch_scripts()
 

=== 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:09 +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', 'select_accounts_only', 'fp_account_ids/id']",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
@@ -103,12 +103,12 @@
 msf_sync_data_server.mission_stock_report_line_OC,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['ITC', 'UniData', 'ESC', 'HQ'])]","['central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code', 'product_state', 'product_active', 'state_ud', 'international_status_code', 'product_amc', 'product_consumption']",OC,stock.mission.report.line,,Mission Stock Report Line OC,Valid,,442
 msf_sync_data_server.financing_contract_formats_fc,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,[],"['cost_center_ids/id', 'eligibility_from_date', 'eligibility_to_date', 'format_name', 'overhead_percentage', 'overhead_type', 'reporting_type', 'hidden_instance_id/id']",HQ + MISSION,financing.contract.format,hidden_instance_id,Financing Contract Formats FC,Valid,,450
 msf_sync_data_server.financing_contract_formats,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[('hidden_instance_id','=',False)]","['hidden_instance_id/id','cost_center_ids/id', 'eligibility_from_date', 'eligibility_to_date', 'format_name', 'overhead_percentage', 'overhead_type', 'reporting_type']",HQ + MISSION,financing.contract.format,,Financing Contract Formats,Valid,,451
-msf_sync_data_server.financing_contract_format_lines,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[('instance_id', '=', False)]","['account_destination_ids/id', 'instance_id/id','allocated_budget_value', 'allocated_real_value', 'code', 'format_id/id', 'line_type', 'name', 'overhead_percentage', 'overhead_type', 'project_budget_value', 'project_real_value',  'is_quadruplet','quadruplet_update']",HQ + MISSION,financing.contract.format.line,,Financing Contract Format Lines,Valid,,452
+msf_sync_data_server.financing_contract_format_lines,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[('instance_id', '=', False)]","['account_destination_ids/id', 'instance_id/id','allocated_budget_value', 'allocated_real_value', 'code', 'format_id/id', 'line_type', 'name', 'overhead_percentage', 'overhead_type', 'project_budget_value', 'project_real_value', 'is_quadruplet', 'quadruplet_sync_list', 'reporting_select_accounts_only', 'reporting_account_ids/id']",HQ + MISSION,financing.contract.format.line,,Financing Contract Format Lines,Valid,,452
 msf_sync_data_server.financing_contract_format_lines_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('parent_id', '!=', ''), ('instance_id', '=', False)]",['parent_id/id'],HQ + MISSION,financing.contract.format.line,,Financing Contract Format Lines Tree,Valid,,453
 msf_sync_data_server.donors,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,[],"['active', 'code', 'format_id/id', 'name', 'reporting_currency/id']",HQ + MISSION,financing.contract.donor,,Donors,Valid,,454
 msf_sync_data_server.financing_contract,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,[],"['code', 'currency_table_id/id', 'donor_grant_reference', 'donor_id/id', 'eligibility_from_date', 'eligibility_to_date', 'format_id/id', 'grant_amount', 'hard_closed_date', 'hq_grant_reference', 'name', 'notes', 'open_date', 'reporting_currency/id', 'soft_closed_date', 'state', 'instance_id/id']",HQ + MISSION,financing.contract.contract,instance_id,Financing Contract,Valid,,455
 msf_sync_data_server.financing_contract_fp_line,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,[],"['contract_id/id', 'funded', 'funding_pool_id/id', 'total_project', 'instance_id/id']",HQ + MISSION,financing.contract.funding.pool.line,instance_id,Financing Contract FP Line,Valid,,456
-msf_sync_data_server.financing_contract_format_lines_fc,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,[],"['account_destination_ids/id', 'allocated_budget_value', 'allocated_real_value', 'code', 'format_id/id', 'instance_id/id', 'line_type', 'name', 'overhead_percentage', 'overhead_type', 'project_budget_value', 'project_real_value',  'is_quadruplet','quadruplet_update']",HQ + MISSION,financing.contract.format.line,instance_id,Financing Contract Format Lines FC,Valid,,457
+msf_sync_data_server.financing_contract_format_lines_fc,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,[],"['account_destination_ids/id', 'allocated_budget_value', 'allocated_real_value', 'code', 'format_id/id', 'instance_id/id', 'line_type', 'name', 'overhead_percentage', 'overhead_type', 'project_budget_value', 'project_real_value', 'is_quadruplet', 'quadruplet_sync_list', 'reporting_select_accounts_only', 'reporting_account_ids/id']",HQ + MISSION,financing.contract.format.line,instance_id,Financing Contract Format Lines FC,Valid,,457
 msf_sync_data_server.financing_contract_format_lines_tree_fc,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,"[('parent_id','!=','')]","['parent_id/id', 'instance_id/id']",HQ + MISSION,financing.contract.format.line,instance_id,Financing Contract Format Lines Tree FC,Valid,,458
 msf_sync_data_server.country,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['code', 'name']",OC,res.country,,Country,Valid,,500
 msf_sync_data_server.state,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['code', 'country_id/id', 'name']",OC,res.country.state,,State,Valid,,501

=== 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:09 +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)