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

[jftempo]

Unmerged revisions

5946. By Julie Nuguet on 2022-05-12

US-7545 [IMP] Financing Contracts: typo

5945. By Julie Nuguet on 2021-02-17

US-7545 [IMP] Analytic Accounts / get_cc_linked_to_fp: allow_all_cc is now a boolean instead of an instance

5944. By Julie Nuguet on 2021-02-16

US-7545 [MERGE] Merge with the latest version of the trunk lp:unifield-server

5943. By Julie Nuguet on 2021-02-16

US-7545 [IMP] Financing Contracts

1) Fix the following UC:
- add FP1 and PF to a contract
- create a reporting line with quadruplets for both FP
- remove FP1 and the CC from the contract
- all quads were reset, although those linked to PF were still valid

2) Add "TODO" for the remaining parts

5942. By Julie Nuguet on 2021-02-16

US-7545 [IMP] Financing Contracts: restrict the generation of quadruplets to:
1) if PF is selected => PF + all CC linked to the contract Prop. Instance
2) the other FP selected + the CC selected

5941. By Julie Nuguet on 2021-02-15

US-7545 [IMP] Financing Contracts: missing field in fields_to_fetch

5940. By Julie Nuguet on 2021-02-15

US-7545 [IMP] Financing Contracts: when PF is selected don't fill in the CC list automatically anymore but make the related combinations still usable

5939. By Julie Nuguet on 2021-02-15

US-7545 [IMP] Financing Contracts: by defaut display the contracts ordered by "Eligibility date to"

5938. By Julie Nuguet on 2021-02-12

US-7545 [IMP] Analytic Accounts get_cc_linked_to_fp: don't browse all CC for the UC where CC are selected in the FP form (perf)

5937. By Julie Nuguet on 2021-02-12

US-7545 [IMP] Financing Contracts / add_general_domain: remove "by reference" copy (avoid modifying "domain" in case "res" is modified)

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2022-05-08 14:15:29 +0000
+++ bin/addons/account_override/account.py	2022-06-16 12:50:12 +0000
@@ -391,12 +391,19 @@
         """
         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.
+        Funding Pools selected in the contract. In case PF has been selected, all accounts allowing an AD are selectable.
         """
         if context is None:
             context = {}
+<<<<<<< TREE
+=======
+        contract_obj = self.pool.get('financing.contract.contract')
+        acc_obj = self.pool.get('account.account')
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+>>>>>>> MERGE-SOURCE
         acc_ids = set()
         if context.get('contract_id'):
+<<<<<<< TREE
             cr.execute('''
                 select
                     distinct(rel.account_id)
@@ -433,6 +440,21 @@
                 ''', (context['contract_id'], ))
             acc_ids.update([x[0] for x in cr.fetchall()])
 
+=======
+            contract = contract_obj.browse(cr, uid, context['contract_id'], fields_to_fetch=['funding_pool_ids'], context=context)
+            try:
+                pf_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution',
+                                                                            'analytic_account_msf_private_funds')[1]
+            except ValueError:
+                pf_id = 0
+            funding_pool_ids = [contract_fp_line.funding_pool_id.id for contract_fp_line in contract.funding_pool_ids]
+            if pf_id in funding_pool_ids:
+                acc_ids.update(acc_obj.search(cr, uid, [('type', '!=', 'view'), ('is_analytic_addicted', '=', True)], context=context))
+            else:
+                for funding_pool_id in funding_pool_ids:
+                    acc_ids.update([t[0] for t in
+                                    analytic_acc_obj.get_acc_dest_linked_to_fp(cr, uid, funding_pool_id, context=context)])
+>>>>>>> MERGE-SOURCE
         return [('id', 'in', list(acc_ids))]
 
     def _get_selected_in_contract(self, cr, uid, account_ids, name=False, args=False, context=None):

=== modified file 'bin/addons/analytic_override/analytic_account.py'
--- bin/addons/analytic_override/analytic_account.py	2022-04-27 14:31:31 +0000
+++ bin/addons/analytic_override/analytic_account.py	2022-06-16 12:50:12 +0000
@@ -1017,14 +1017,15 @@
             'target': 'current',
         }
 
-    def get_cc_linked_to_fp(self, cr, uid, fp_id, context=None):
+    def get_cc_linked_to_fp(self, cr, uid, fp_id, pf=False, pf_restrict_instance_id=False, 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.
+              It returns an empty list for PF, unless "pf" is set to True. Then it returns either all CC, or all CC
+              linked to the "pf_restrict_instance_id" if it is set.
         """
         if context is None:
             context = {}
@@ -1033,14 +1034,34 @@
                          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:
+            try:
+                pf_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution',
+                                                                            'analytic_account_msf_private_funds')[1]
+            except ValueError:
+                pf_id = 0
+            is_pf = pf and fp.id == pf_id
+            allow_all_cc = fp.instance_id and fp.allow_all_cc_with_fp
+            if not is_pf and not allow_all_cc:
+                # UC1: CC selected in the FP form
                 cc_list = fp.cost_center_ids or []
+            else:
+                # inactive CC are included on purpose, to match with the selectable CC in the FP form
+                all_cc_ids = self.search(cr, uid, [('category', '=', 'OC'), ('type', '!=', 'view')], order='code', context=context)
+                all_cc = all_cc_ids and self.browse(cr, uid, all_cc_ids, context=context) or []
+                prop_instance_id = False
+                if is_pf and pf_restrict_instance_id:
+                    # UC2: PF with restriction on a Prop. Instance
+                    prop_instance_id = pf_restrict_instance_id
+                elif allow_all_cc:
+                    # UC3: Allow all Cost Centers
+                    prop_instance_id = fp.instance_id.id
+                if prop_instance_id:
+                    for cc in all_cc:
+                        if prop_instance_id in [inst.id for inst in cc.cc_instance_ids]:
+                            cc_list.append(cc)
+                elif is_pf:
+                    # UC4: PF with no restriction on Prop. Instance
+                    cc_list = all_cc
         return cc_list
 
     def get_acc_dest_linked_to_fp(self, cr, uid, fp_id, context=None):

=== modified file 'bin/addons/financing_contract/contract.py'
--- bin/addons/financing_contract/contract.py	2022-03-15 14:23:18 +0000
+++ bin/addons/financing_contract/contract.py	2022-06-16 12:50:12 +0000
@@ -65,12 +65,17 @@
         if context is None:
             context = {}
         analytic_acc_obj = self.pool.get('account.analytic.account')
+        contract_obj = self.pool.get('financing.contract.contract')
         format_obj = self.pool.get('financing.contract.format')
         contract_obj = self.pool.get('financing.contract.contract')
         # 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
+<<<<<<< TREE
             exist = contract_obj.search_exists(cr, uid, [('format_id', '=', vals['contract_id'])])
+=======
+            exist = contract_obj.search_exist(cr, uid, [('format_id', '=', vals['contract_id'])])
+>>>>>>> MERGE-SOURCE
             if not exist:
                 return None
             # new fp from sync: request new quad generation
@@ -83,8 +88,8 @@
         #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 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 Cost Centers linked to the Funding Pool (empty list for PF)
+            fp_cc_ids = [c.id for c in analytic_acc_obj.get_cc_linked_to_fp(cr, uid, vals['funding_pool_id'], pf=False, context=context)]
 
             # get the format instance
             cc_rows = format_obj.browse(cr, uid, vals['contract_id'], context=context).cost_center_ids
@@ -136,7 +141,20 @@
     _name = "financing.contract.contract"
     _inherits = {"financing.contract.format": "format_id"}
     _trace = True
+<<<<<<< TREE
     _order = 'id desc'
+=======
+    # _order: see search_web
+
+    def search_web(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        """
+        Changes the default display order of the contracts.
+        The field "eligibility_to_date" can't be used directly in _order as it belongs to financing.contract.format.
+        """
+        if not count and not order:
+            order = 'eligibility_to_date desc, id desc'
+        return super(financing_contract_contract, self).search_web(cr, uid, args, offset, limit, order, context, count)
+>>>>>>> MERGE-SOURCE
 
     def contract_open_proxy(self, cr, uid, ids, context=None):
         # utp-1030/7: check grant amount when going on in workflow
@@ -237,11 +255,6 @@
     def add_general_domain(self, cr, uid, domain, browse_format_id, reporting_type, context=None):
         format_line_obj = self.pool.get('financing.contract.format.line')
         general_domain = format_line_obj._get_general_domain(cr, uid, browse_format_id, reporting_type, context=context)
-        # UTP-1063: Don't use MSF Private Funds anymore
-        try:
-            fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
-        except Exception:
-            fp_id = 0
 
         #US-385: Move the funding pool and cost center outside the loop, put them at header of the domain
         temp_domain = []
@@ -250,9 +263,9 @@
         if general_domain.get('funding_pool_domain', False):
             temp_domain = ['&', '&'] + [cc_domain] + [eval(general_domain['funding_pool_domain'])] + date_domain
 
-        res = [('account_id', '!=', fp_id)]
+        res = []
         if domain:
-            res = ['&'] + res + domain
+            res = domain[:]
 
         if temp_domain:
             res = ['&'] + temp_domain + res
@@ -551,19 +564,21 @@
         Check if contract gives some FP. If not raise an error.
         Otherwise launch the report.
         """
-        # Some verifications
-        if not context:
+        if context is None:
             context = {}
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        for contract in self.browse(cr, uid, ids, context=context):
+        contract_ids = context.get('active_ids', [])
+        if not contract_ids:
+            raise osv.except_osv(_('Error'), _('No contract selected.'))
+        if isinstance(contract_ids, (int, long)):
+            contract_ids = [contract_ids]
+        for contract in self.browse(cr, uid, contract_ids, fields_to_fetch=['format_id', 'name'], context=context):
             if not contract.format_id.funding_pool_ids:
                 raise osv.except_osv(_('Error'), _('No FP selected in the financing contract: %s') % (contract.name or ''))
         # We launch the report
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'financing.allocated.expenses.2',
-            'datas': {'ids': ids},
+            'datas': {'ids': contract_ids},
             'context': context,
         }
 
@@ -607,6 +622,7 @@
             ids = [ids]
         if context is None:
             context = {}
+        analytic_acc_obj = self.pool.get('account.analytic.account')
 
         if 'donor_id' in vals:
             donor = self.pool.get('financing.contract.donor').browse(cr, uid, vals['donor_id'], context=context)
@@ -625,6 +641,7 @@
 
             # if there is some FP in this contract format, then perform the "recovery" of cost center ids, if not just use the one from the form
             if f_value.funding_pool_ids:
+                # TODO JN: anything to change here?
                 cc_rows = f_value.cost_center_ids # retrieve all the cc stored previously in the DB
                 cc_ids = []
                 for cc in cc_rows:
@@ -645,14 +662,50 @@
         if fp_added_flag: # if the previous save has been recovered thanks to the flag set to True, then reset it back to False
             cr.execute('''update financing_contract_contract set fp_added_flag = 'f' where id = %s''', (ids[0],))
 
+<<<<<<< TREE
         format =  self.browse(cr,uid,ids,context=context)[0].format_id
+=======
+        # uf-2342 delete any assigned quads that are no longer valid due to changes in the contract
+        # get list of all valid ids for this contract
+        # TODO JN: make a loop on contract ids?
+        financing_contract = self.browse(cr, uid, ids, context=context)[0]
+        format = financing_contract.format_id
+        funding_pool_ids = [x.funding_pool_id.id for x in format.funding_pool_ids]
+>>>>>>> MERGE-SOURCE
 
         if not context.get('sync_update_execution'):
             earmarked_funding_pools = [x.funded for x in format.funding_pool_ids]
             if not any(earmarked_funding_pools) and format.reporting_type == 'allocated':
                 raise osv.except_osv(_('Error'), _("At least one funding pool should be defined as earmarked in the funding pool list of this financing contract."))
 
-
+<<<<<<< TREE
+
+=======
+        cost_center_ids = [x.id for x in format.cost_center_ids]
+
+        quad_obj = self.pool.get('financing.contract.account.quadruplet')
+        quad_domain = []
+        try:
+            pf_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution',
+                                                                        'analytic_account_msf_private_funds')[1]
+        except ValueError:
+            pf_id = 0
+        if pf_id in funding_pool_ids:
+            # all CC linked to the contract Prop. Instance
+            pf_cc_ids = [cc.id for cc in
+                         analytic_acc_obj.get_cc_linked_to_fp(cr, uid, pf_id, pf=True,
+                                                              pf_restrict_instance_id=financing_contract.instance_id.id, context=context)]
+            funding_pool_ids.remove(pf_id)
+            quad_domain.append('|')
+            quad_domain.append('&')
+            quad_domain.append(('cost_center_id', 'in', pf_cc_ids))
+            quad_domain.append(('funding_pool_id', '=', pf_id))
+        quad_domain.append('&')
+        quad_domain.append(('cost_center_id', 'in', cost_center_ids))
+        quad_domain.append(('funding_pool_id', 'in', funding_pool_ids))
+        valid_quad_ids = quad_obj.search(cr, uid, quad_domain, context=context)
+
+>>>>>>> MERGE-SOURCE
         # filter current assignments and re-write entries if necessary
         format_obj = self.pool.get('financing.contract.format')
         format_line_obj = self.pool.get('financing.contract.format.line')

=== modified file 'bin/addons/financing_contract/financing_contract_account_quadruplet.py'
--- bin/addons/financing_contract/financing_contract_account_quadruplet.py	2022-03-15 09:14:07 +0000
+++ bin/addons/financing_contract/financing_contract_account_quadruplet.py	2022-06-16 12:50:12 +0000
@@ -99,7 +99,13 @@
                 lnk.id = fpad.tuple_id AND
                 fp.id = fpad.funding_pool_id AND
                 lnk.destination_id = dest.id AND
+<<<<<<< TREE
                 (dest.allow_all_cc = 't' or dest_cc_link.cc_id = cc.id)
+=======
+                (dest.allow_all_cc = 't' or dest_cc_rel.cost_center_id = cc.id) AND
+                fp.id != (SELECT res_id FROM ir_model_data WHERE 
+                          module='analytic_distribution' and name='analytic_account_msf_private_funds' LIMIT 1)
+>>>>>>> MERGE-SOURCE
 
            UNION
 
@@ -126,7 +132,13 @@
                 fp_account_rel.account_id= gl_account.id and
                 lnk.account_id = gl_account.id and
                 lnk.destination_id = dest.id and
+<<<<<<< TREE
                 (dest.allow_all_cc = 't' or dest_cc_link.cc_id = cc.id)
+=======
+                (dest.allow_all_cc = 't' or dest_cc_rel.cost_center_id = cc.id) AND
+                fp.id != (SELECT res_id FROM ir_model_data WHERE 
+                          module='analytic_distribution' and name='analytic_account_msf_private_funds' LIMIT 1)
+>>>>>>> MERGE-SOURCE
 
             UNION
 
@@ -151,7 +163,13 @@
                 fp_account_rel.account_id= gl_account.id and
                 lnk.account_id = gl_account.id and
                 lnk.destination_id = dest.id and
+<<<<<<< TREE
                 (dest.allow_all_cc = 't' or dest_cc_link.cc_id = cc.id)
+=======
+                (dest.allow_all_cc = 't' or dest_cc_rel.cost_center_id = cc.id) AND
+                fp.id != (SELECT res_id FROM ir_model_data WHERE 
+                          module='analytic_distribution' and name='analytic_account_msf_private_funds' LIMIT 1)
+>>>>>>> MERGE-SOURCE
 
             UNION
 
@@ -176,7 +194,32 @@
                 lnk.id = fpad.tuple_id and
                 fp.id = fpad.funding_pool_id and
                 lnk.destination_id = dest.id and
+<<<<<<< TREE
                 (dest.allow_all_cc = 't' or dest_cc_link.cc_id = cc.id)
+=======
+                (dest.allow_all_cc = 't' or dest_cc_rel.cost_center_id = cc.id) AND
+                fp.id != (SELECT res_id FROM ir_model_data WHERE 
+                          module='analytic_distribution' and name='analytic_account_msf_private_funds' LIMIT 1)
+                
+            UNION
+            
+            -- PF
+            SELECT
+            lnk.destination_id AS account_destination_id, cc.id AS cost_center_id, 
+            (SELECT res_id FROM ir_model_data WHERE 
+                module='analytic_distribution' and name='analytic_account_msf_private_funds' LIMIT 1) 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 cc,
+                account_destination_link lnk,
+                account_analytic_account dest
+            LEFT JOIN destination_cost_center_rel dest_cc_rel ON dest_cc_rel.destination_id = dest.id
+            WHERE
+                cc.type != 'view' AND
+                cc.category = 'OC' AND
+                lnk.destination_id = dest.id AND
+                (dest.allow_all_cc = 't' OR dest_cc_rel.cost_center_id = cc.id)
+>>>>>>> MERGE-SOURCE
             ) AS combinations
            )""")
         return res
@@ -191,6 +234,7 @@
         contract_id = context.get('contract_id', False)
         if contract_id:
             ctr_obj = self.pool.get('financing.contract.contract')
+<<<<<<< TREE
             contract = ctr_obj.browse(cr, uid, context['contract_id'], fields_to_fetch=['funding_pool_ids', 'cost_center_ids', 'quad_gen_date'], context=context)
             # last_modification: is modified when the record is Save&Edit on the instance
             # date_update: is modified by a sync update
@@ -202,6 +246,14 @@
                     module='sd' and
                     model in ('account.analytic.account', 'account.destination.link', 'dest.cc.link')
             ''')
+=======
+            analytic_acc_obj = self.pool.get('account.analytic.account')
+            contract = ctr_obj.browse(cr, uid, context['contract_id'], fields_to_fetch=['funding_pool_ids', 'cost_center_ids',
+                                                                                        'quad_gen_date', 'instance_id'], 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,))
+>>>>>>> MERGE-SOURCE
             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
@@ -209,17 +261,42 @@
                 timer = time.time()
                 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]
+                # do not traceback if cc / fp not set on contract
                 if not cc_ids:
-                    # do not traceback if cc / fp not set on contract
                     cc_ids = [0]
                 if not fp_ids:
                     fp_ids = [0]
+<<<<<<< TREE
+=======
+                pf_cc_ids = [0]  # CC to link to PF ONLY IF PF has been selected in the contract form
+                try:
+                    pf_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution',
+                                                                                'analytic_account_msf_private_funds')[1]
+                except ValueError:
+                    pf_id = 0
+                if pf_id in fp_ids:
+                    # all CC linked to the contract Prop. Instance
+                    pf_cc_ids = [cc.id for cc in
+                                 analytic_acc_obj.get_cc_linked_to_fp(cr, uid, pf_id, pf=True,
+                                                                      pf_restrict_instance_id=contract.instance_id.id, context=context)]
+                    fp_ids.remove(pf_id)
+                    if not fp_ids:
+                        fp_ids = [0]
+>>>>>>> MERGE-SOURCE
                 cr.execute('''
                     update financing_contract_account_quadruplet set disabled='t'
                     where
+<<<<<<< TREE
                         funding_pool_id in %s and
                         cost_center_id in %s
                 ''', (tuple(fp_ids), tuple(cc_ids)))
+=======
+                        (funding_pool_id = %s and cost_center_id in %s)
+                        or
+                        (funding_pool_id in %s and cost_center_id in %s)
+                ''', (pf_id, tuple(pf_cc_ids), tuple(fp_ids), tuple(cc_ids)))
+
+>>>>>>> MERGE-SOURCE
                 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)
@@ -228,10 +305,12 @@
                         from
                             financing_contract_account_quadruplet_view
                         where
-                            funding_pool_id in %s and
-                            cost_center_id in %s
+                            (funding_pool_id = %s and cost_center_id in %s)
+                            or
+                            (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)))
+                    ON CONFLICT ON CONSTRAINT financing_contract_account_quadruplet_check_unique DO UPDATE SET disabled=EXCLUDED.disabled''',
+                           (pf_id, tuple(pf_cc_ids), 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))
                 self._logger.info('Gen time: %s' % (time.time() - timer))
         return True
@@ -307,10 +386,29 @@
             return res
 
         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'])
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        contract = ctr_obj.browse(cr, uid, context['contract_id'], fields_to_fetch=['funding_pool_ids', 'cost_center_ids', 'instance_id'])
+        quad_domain = []
         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)]
+        try:
+            pf_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution',
+                                                                        'analytic_account_msf_private_funds')[1]
+        except ValueError:
+            pf_id = 0
+        if pf_id in fp_ids:
+            pf_cc_ids = [cc.id for cc in
+                         analytic_acc_obj.get_cc_linked_to_fp(cr, uid, pf_id, pf=True,
+                                                              pf_restrict_instance_id=contract.instance_id.id, context=context)]
+            quad_domain.append('|')
+            quad_domain.append('&')
+            quad_domain.append(('cost_center_id', 'in', pf_cc_ids))
+            quad_domain.append(('funding_pool_id', '=', pf_id))
+            fp_ids.remove(pf_id)
+        quad_domain.append('&')
+        quad_domain.append(('cost_center_id', 'in', cc_ids))
+        quad_domain.append(('funding_pool_id', 'in', fp_ids))
+        return quad_domain
 
     _columns = {
         'account_destination_id': fields.many2one('account.analytic.account', 'Destination', relate=True, readonly=True, select=1),

=== modified file 'bin/addons/financing_contract/financing_contract_view.xml'
--- bin/addons/financing_contract/financing_contract_view.xml	2022-03-14 13:07:19 +0000
+++ bin/addons/financing_contract/financing_contract_view.xml	2022-06-16 12:50:12 +0000
@@ -41,7 +41,7 @@
                                 <field colspan="4" name="funding_pool_ids" nolabel="1"
                                        attrs="{'readonly': [('state', 'in', ('soft_closed', 'hard_closed'))]}">
                                     <tree string="Funding pools" editable="top">
-                                        <field name="funding_pool_id" domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('code', '!=', 'PF')]"/>
+                                        <field name="funding_pool_id" domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING')]"/>
                                         <field name="funded"/>
                                         <field name="total_project" readonly="1"/>
                                     </tree>

=== modified file 'bin/addons/financing_contract/format_line.py'
--- bin/addons/financing_contract/format_line.py	2022-03-22 09:19:05 +0000
+++ bin/addons/financing_contract/format_line.py	2022-06-16 12:50:12 +0000
@@ -194,7 +194,9 @@
         gen_domain = {}
         gen_domain['date_domain'] = date_domain
 
-        cost_center_domain = self._create_domain('cost_center_id', browse_format.cost_center_ids)
+        # TODO JN: adapt the cost_center_domain. Use this stub in the meantime:
+        #cost_center_domain = self._create_domain('cost_center_id', browse_format.cost_center_ids)
+        cost_center_domain = '(\'cost_center_id\', \'!=\', 0)'
         gen_domain['cost_center_domain'] = cost_center_domain
 
 
@@ -311,6 +313,9 @@
             Method to compute the allocated budget/amounts, depending on the information in the line
         """
         res = {}
+        if context is None:
+            context = {}
+        curr_obj = self.pool.get('res.currency')
         # 1st step: get the real list of actual lines to compute
         actual_line_ids = []
         overhead = self._is_overhead_present(cr, uid, ids, context=context)
@@ -340,6 +345,16 @@
             if line.id not in res:
                 self._get_view_amount(line, total_budget_costs, res)
 
+        # convert the amounts from the reporting currency of the contract to the output currency selected in the wizard
+        res_in_curr = {}
+        if context.get('contract_fx_date') and context.get('reporting_currency_id') and context.get('out_currency') and \
+                context['reporting_currency_id'] != context['out_currency']:
+            date_context = context.copy()
+            date_context.update({'currency_date': context['contract_fx_date']})  # use the rate at "Eligibility from" date
+            for r_id in res:
+                res_in_curr[r_id] = curr_obj.compute(cr, uid, context['reporting_currency_id'], context['out_currency'],
+                                                     res[r_id] or 0.0, round=False, context=date_context)
+            res = res_in_curr
         return res
 
     def _get_actual_amount(self, cr, uid, ids, field_name=None, arg=None, context=None):
@@ -392,7 +407,8 @@
                     if analytic_domain:
                         analytic_domain = self.pool.get('financing.contract.contract').add_general_domain(cr, uid, analytic_domain, line.format_id, report_type, context)
                     # selection of analytic lines
-                    if 'reporting_currency' in context:  # TODO Why do we only get analytic lines if reporting_currency in context
+                    if 'out_currency' in context:  # used for the computation in output currency
+                        # note: only analytic lines are retrieved in this report
                         analytic_line_obj = self.pool.get('account.analytic.line')
                         analytic_lines = analytic_line_obj.search(cr, uid, analytic_domain ,context=context)
                         # list of analytic journal_ids which are in the engagement journals
@@ -413,7 +429,7 @@
                             real_sum += self.pool.get('res.currency').compute(cr,
                                                                               uid,
                                                                               analytic_line.currency_id.id,
-                                                                              context['reporting_currency'],
+                                                                              context['out_currency'],
                                                                               analytic_line.amount_currency or 0.0,
                                                                               round=False,
                                                                               context=date_context)

=== modified file 'bin/addons/financing_contract/report/financing_interactive_xls.mako'
--- bin/addons/financing_contract/report/financing_interactive_xls.mako	2018-06-08 08:56:46 +0000
+++ bin/addons/financing_contract/report/financing_interactive_xls.mako	2022-06-16 12:50:12 +0000
@@ -405,6 +405,14 @@
 </Row>
 <Row>
 <Cell ss:StyleID="s21">
+<Data ss:Type="String">${_('Output currency:')}</Data>
+</Cell>
+<Cell ss:StyleID="s21">
+<Data ss:Type="String">${ getOutputCurrency(o) |x}</Data>
+</Cell>
+</Row>
+<Row>
+<Cell ss:StyleID="s21">
 <Data ss:Type="String">${_('Eligible from:')}</Data>
 </Cell>
 % if isDate(o.eligibility_from_date):

=== modified file 'bin/addons/financing_contract/report/project_expenses_xls.mako'
--- bin/addons/financing_contract/report/project_expenses_xls.mako	2020-02-03 17:00:37 +0000
+++ bin/addons/financing_contract/report/project_expenses_xls.mako	2022-06-16 12:50:12 +0000
@@ -609,7 +609,7 @@
   </Cell>
   <Cell  ss:StyleID="s49"></Cell>
   <Cell ss:StyleID="s49">
-    <Data ss:Type="Number">${getTotalRptCurrency()}</Data>
+    <Data ss:Type="Number">${getTotalRptCurrency(o)}</Data>
   </Cell>
   <Cell  ss:StyleID="s49"></Cell>
 </Row>

=== modified file 'bin/addons/financing_contract/report/report_interactive.py'
--- bin/addons/financing_contract/report/report_interactive.py	2018-06-05 14:03:07 +0000
+++ bin/addons/financing_contract/report/report_interactive.py	2022-06-16 12:50:12 +0000
@@ -14,6 +14,7 @@
             'getLines':self.getLines,
             'getTot':self.getTot,
             'getCostCenter':self.getCostCenter,
+            'getOutputCurrency': self.getOutputCurrency,
             'checkType':self.checkType,
             'checkType2':self.checkType2,
         })
@@ -45,6 +46,17 @@
             ccs += [cc.code]
         return ', '.join(ccs)
 
+    def getOutputCurrency(self, contract):
+        """
+        Returns the name of the currency in which the report is displayed
+        """
+        data = hasattr(self, 'datas') and getattr(self, 'datas') or {}
+        if data.get('out_currency'):
+            currency = self.pool.get('res.currency').read(self.cr, self.uid, data['out_currency'], ['name'])['name']
+        else:
+            currency = contract.reporting_currency.name
+        return currency
+
     def getTot(self,o):
         if self.tot[o]:
             return self.tot[o]
@@ -52,10 +64,14 @@
 
     def getLines(self,contract):
         pool = pooler.get_pool(self.cr.dbname)
+        data = hasattr(self, 'datas') and getattr(self, 'datas') or {}
 
         self.context.update({'mako': True})
-        if 'out_currency' in self.datas:
-            self.context.update({'out_currency': self.datas['out_currency']})
+        if data.get('out_currency'):
+            out_currency = data['out_currency']
+        else:
+            out_currency = contract.reporting_currency.id
+        self.context.update({'out_currency': out_currency})
 
         csv_data = pool.get('wizard.interactive.report')._get_interactive_data(self.cr, self.uid, contract.id, context=self.context)
 

=== modified file 'bin/addons/financing_contract/report/report_project_expenses.py'
--- bin/addons/financing_contract/report/report_project_expenses.py	2020-10-30 10:04:46 +0000
+++ bin/addons/financing_contract/report/report_project_expenses.py	2022-06-16 12:50:12 +0000
@@ -17,7 +17,7 @@
         self.len1 = 0
         self.len2 = 0
         self.lines = {}
-        self.totalRptCurrency = 0
+        self.totalRptCurrency = {}
         self.totalBookAmt = 0
         self.localcontext.update({
             'getLines':self.getLines,
@@ -27,7 +27,6 @@
             'getSub1':self.getSub1,
             'getSub2':self.getSub2,
             'getLines2':self.getLines2,
-            'totalRptCurrency': self.totalRptCurrency,
             'totalBookAmt':self.totalBookAmt,
             'getTotalRptCurrency': self.getTotalRptCurrency,
             'getTotalBookAmt': self.getTotalBookAmt,
@@ -37,8 +36,8 @@
     def getTotalBookAmt(self):
         return self.totalBookAmt
 
-    def getTotalRptCurrency(self):
-        return self.totalRptCurrency
+    def getTotalRptCurrency(self, contract):
+        return self.totalRptCurrency.get(contract.id, 0.0)
 
     def getLines2(self,):
         return self.lines
@@ -65,7 +64,9 @@
         self.len1 += 1
         self.len2 += 1
         self.totalBookAmt += analytic_line.amount_currency
-        self.totalRptCurrency += amount
+        if contract.id not in self.totalRptCurrency:
+            self.totalRptCurrency[contract.id] = 0.0
+        self.totalRptCurrency[contract.id] += amount
         return amount
 
     def getAccountName(self,analytic_line):

=== modified file 'bin/addons/financing_contract/wizard/wizard_interactive_report.py'
--- bin/addons/financing_contract/wizard/wizard_interactive_report.py	2018-06-08 12:35:09 +0000
+++ bin/addons/financing_contract/wizard/wizard_interactive_report.py	2022-06-16 12:50:12 +0000
@@ -93,9 +93,10 @@
         contract = contract_obj.browse(cr, uid, contract_id, context=context)
 
         # Update the context
-        context.update({'reporting_currency': context['out_currency'],
+        context.update({'reporting_currency_id': contract.reporting_currency.id,
                         'reporting_type': contract.reporting_type,
-                        'currency_table_id': contract.currency_table_id.id})
+                        'currency_table_id': contract.currency_table_id.id,
+                        'contract_fx_date': contract.eligibility_from_date})
 
         header_data = self._get_contract_header(cr, uid, contract, context=context)
         footer_data = self._get_contract_footer(cr, uid, contract, context=context)

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-05-25 14:15:34 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-06-16 12:50:12 +0000
@@ -67285,8 +67285,9 @@
 msgid "Total Absolute value"
 msgstr "Valeur absolue totale"
 
-#. module: msf_budget
+#. modules: msf_budget, financing_contract
 #: code:addons/msf_budget/report/report_local_expenses.py:72
+#: report:addons/financing_contract/report/financing_interactive_xls.mako:408
 #, python-format
 msgid "Output currency:"
 msgstr "Devise d'impression:"
@@ -68379,6 +68380,12 @@
 msgid "No File Selected."
 msgstr "Aucun fichier sélectionné."
 
+#. module: financing_contract
+#: code:addons/financing_contract/contract.py:546
+#, python-format
+msgid "No contract selected."
+msgstr "Aucun contrat sélectionné."
+
 #. module: kit
 #: view:kit.mass.import:0
 msgid "Import log messages"