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

[jftempo]

=== modified file 'bin/addons/account_corrections/wizard/analytic_distribution_wizard.py'
--- bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2020-09-22 13:17:55 +0000
+++ bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2021-05-07 16:01:07 +0000
@@ -283,38 +283,25 @@
                 old_line = self.pool.get('funding.pool.distribution.line').browse(cr, uid, wiz_line.distribution_line_id.id)
 
                 if old_line:
-                    #US-714: For HQ Entries, always create the COR and REV even the period is closed
-                    original_al_id = ana_line_obj.search(cr, uid, [('distrib_line_id', '=', 'funding.pool.distribution.line,%d'%old_line.id), ('is_reversal', '=', False), ('is_reallocated', '=', False)])
-
-                    is_HQ_entries = False
-                    if original_al_id and len(original_al_id) == 1:
-                        original_al = ana_line_obj.browse(cr, uid, original_al_id[0], context)
-                        if original_al.journal_id.type == 'hq':
-                            is_HQ_entries = True
-
-                    # In case it's an HQ entries, just generate the REV and COR
-                    if is_HQ_entries:
-                        to_reverse.append(wiz_line)
-                    else:
-                        # existing line, test modifications
-                        # for FP, percentage, CC or destination changes regarding contracts
-                        if old_line.analytic_id.id != wiz_line.analytic_id.id \
-                                or old_line.percentage != wiz_line.percentage \
-                                or old_line.cost_center_id.id != wiz_line.cost_center_id.id \
-                                or old_line.destination_id.id != wiz_line.destination_id.id:
-                            # FP account changed or % modified
-                            if self.pool.get('account.analytic.account').is_blocked_by_a_contract(cr, uid, [old_line.analytic_id.id]):
-                                raise osv.except_osv(_('Error'), _("Funding pool is on a soft/hard closed contract: %s")%(old_line.analytic_id.code))
-
-                        if (old_line.cost_center_id.id != wiz_line.cost_center_id.id or
-                                old_line.destination_id.id != wiz_line.destination_id.id or
-                                old_line.percentage != wiz_line.percentage):
-                            if self._check_period_closed_on_fp_distrib_line(cr, uid, old_line.id):
-                                to_reverse.append(wiz_line)
-                            else:
-                                to_override.append(wiz_line)
-                        elif old_line.analytic_id.id != wiz_line.analytic_id.id:
+                    # existing line, test modifications
+                    # for FP, percentage, CC or destination changes regarding contracts
+                    if old_line.analytic_id.id != wiz_line.analytic_id.id \
+                            or old_line.percentage != wiz_line.percentage \
+                            or old_line.cost_center_id.id != wiz_line.cost_center_id.id \
+                            or old_line.destination_id.id != wiz_line.destination_id.id:
+                        # FP account changed or % modified
+                        if self.pool.get('account.analytic.account').is_blocked_by_a_contract(cr, uid, [old_line.analytic_id.id]):
+                            raise osv.except_osv(_('Error'), _("Funding pool is on a soft/hard closed contract: %s")%(old_line.analytic_id.code))
+
+                    if (old_line.cost_center_id.id != wiz_line.cost_center_id.id or
+                            old_line.destination_id.id != wiz_line.destination_id.id or
+                            old_line.percentage != wiz_line.percentage):
+                        if self._check_period_closed_on_fp_distrib_line(cr, uid, old_line.id, is_HQ_origin=is_HQ_origin):
+                            to_reverse.append(wiz_line)
+                        else:
                             to_override.append(wiz_line)
+                    elif old_line.analytic_id.id != wiz_line.analytic_id.id:
+                        to_override.append(wiz_line)
 
                     old_line_ok.append(old_line.id)
 

=== modified file 'bin/addons/account_hq_entries/hq_entries.py'
--- bin/addons/account_hq_entries/hq_entries.py	2021-05-05 16:04:38 +0000
+++ bin/addons/account_hq_entries/hq_entries.py	2021-05-07 16:01:07 +0000
@@ -44,6 +44,7 @@
         res = {}
         logger = netsvc.Logger()
         ad_obj = self.pool.get('analytic.distribution')
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
         # 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',
@@ -87,6 +88,13 @@
                     res[line.id] = 'invalid'
                     logger.notifyChannel('account_hq_entries', netsvc.LOG_WARNING, _('%s: inactive DEST (%s)') % (line.id or '', dest.code or ''))
                     continue
+            if line.destination_id and line.cost_center_id and line.date and \
+                    dest_cc_link_obj.is_inactive_dcl(cr, uid, line.destination_id.id, line.cost_center_id.id, line.date, context=context):
+                res[line.id] = 'invalid'
+                logger.notifyChannel('account_hq_entries', netsvc.LOG_WARNING,
+                                     _('%s: inactive combination (%s - %s)') %
+                                     (line.id or '', line.destination_id.code or '', line.cost_center_id.code or ''))
+                continue
             # G Check
             if line.analytic_id:
                 fp = self.pool.get('account.analytic.account').browse(cr, uid, line.analytic_id.id, context={'date': line.document_date})
@@ -485,6 +493,9 @@
     def _check_cc(self, cr, uid, ids, context=None):
         """
         At synchro time sets HQ entry to Not Run if the Cost Center used in the line doesn't exist or is inactive
+
+        Note: if the CC is active but the Dest/CC combination is inactive, the sync update is NOT blocked:
+              the HQ entry will be created with an invalid AD to be fixed before validation.
         """
         if isinstance(ids, (int, long)):
             ids = [ids]

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_split.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_split.py	2020-11-02 17:29:34 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_split.py	2021-05-07 16:01:07 +0000
@@ -42,7 +42,9 @@
         # Process
         for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = {'state_info': False, 'state': 'none'}
-            state, info = self.pool.get('analytic.distribution').analytic_state_from_info(cr, uid, line.account_id.id, line.destination_id.id, line.cost_center_id.id, line.analytic_id.id, context=context)
+            state, info = self.pool.get('analytic.distribution').analytic_state_from_info(cr, uid, line.account_id.id, line.destination_id.id,
+                                                                                          line.cost_center_id.id, line.analytic_id.id,
+                                                                                          posting_date=line.wizard_id.date, context=context)
             res[line.id].update({'state_info': info, 'state': state,})
         return res
 

=== modified file 'bin/addons/analytic_distribution/account_commitment.py'
--- bin/addons/analytic_distribution/account_commitment.py	2020-05-07 10:01:57 +0000
+++ bin/addons/analytic_distribution/account_commitment.py	2021-05-07 16:01:07 +0000
@@ -169,6 +169,7 @@
         aal_obj = self.pool.get('account.analytic.line')
         curr_obj = self.pool.get('res.currency')
         user_obj = self.pool.get('res.users')
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
         # Browse elements if 'date' in vals
         if vals.get('date', False):
             date = vals.get('date')
@@ -188,8 +189,21 @@
                             raise osv.except_osv(_('Warning'), _('No analytic distribution found for %s %s') % (cl.account_id.code, cl.initial_amount))
                         for distrib_lines in [distrib.cost_center_lines, distrib.funding_pool_lines, distrib.free_1_lines, distrib.free_2_lines]:
                             for distrib_line in distrib_lines:
-                                if (distrib_line.analytic_id.date_start and date < distrib_line.analytic_id.date_start) or (distrib_line.analytic_id.date and date > distrib_line.analytic_id.date):
-                                    raise osv.except_osv(_('Error'), _('The analytic account %s is not active for given date.') % (distrib_line.analytic_id.name,))
+                                if distrib_line.analytic_id and \
+                                    (distrib_line.analytic_id.date_start and date < distrib_line.analytic_id.date_start or
+                                    distrib_line.analytic_id.date and date >= distrib_line.analytic_id.date):
+                                    raise osv.except_osv(_('Error'), _('The analytic account %s is not active for given date.') %
+                                                         (distrib_line.analytic_id.name,))
+                        dest_cc_tuples = set()  # check each Dest/CC combination only once
+                        for distrib_cc_l in distrib.cost_center_lines:
+                            if distrib_cc_l.analytic_id:  # non mandatory field
+                                dest_cc_tuples.add((distrib_cc_l.destination_id, distrib_cc_l.analytic_id))
+                        for distrib_fp_l in distrib.funding_pool_lines:
+                            dest_cc_tuples.add((distrib_fp_l.destination_id, distrib_fp_l.cost_center_id))
+                        for dest, cc in dest_cc_tuples:
+                            if dest_cc_link_obj.is_inactive_dcl(cr, uid, dest.id, cc.id, date, context=context):
+                                raise osv.except_osv(_('Error'), _("The combination \"%s - %s\" is not active at this date: %s") %
+                                                     (dest.code or '', cc.code or '', date))
                         # update the dates and fctal amounts of the related analytic lines
                         context.update({'currency_date': date})  # same date used for doc, posting and source date of all lines
                         for aal in cl.analytic_lines:

=== modified file 'bin/addons/analytic_distribution/analytic_account_view.xml'
--- bin/addons/analytic_distribution/analytic_account_view.xml	2020-10-08 13:11:14 +0000
+++ bin/addons/analytic_distribution/analytic_account_view.xml	2021-05-07 16:01:07 +0000
@@ -132,13 +132,28 @@
                             </field>
                         </page>
                         <page string="Cost Centers" attrs="{'invisible': [('category', '!=', 'DEST')]}">
-                            <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"/>
+                            <field name="allow_all_cc" colspan="4" on_change="on_change_allow_all_cc(allow_all_cc, dest_cc_link_ids)"/>
+                            <button name="button_dest_cc_clear" type="object" string="Remove all" icon="gtk-clear" colspan="4"
+                                    confirm="Do you really want to remove all the Cost Centers selected?"
+                            />
                             <separator/>
-                            <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"/>
+                            <group colspan="6" col="4">
+                                <button icon="gtk-add" string="Add several Cost Centers" colspan="1"
+                                        name="open_multiple_cc_selection_wizard" type="object"
+                                        context="{'current_destination_id': record_id}"/>
+                                <label string="" colspan="3"/>
+                            </group>
+                            <field name="dest_cc_link_ids" nolabel="1" colspan="4"
+                                   on_change="on_change_cc_ids(dest_cc_link_ids)"
+                                   context="{'current_destination_id': record_id}">
+                                <tree string="Cost Centers" editable="bottom">
+                                    <field name="current_id" invisible="1"/>
+                                    <field name="cc_id" string="Code"
+                                           on_change="on_change_cc_id(cc_id)"
+                                           attrs="{'readonly': [('current_id', '!=', False)]}"/>
+                                    <field name="cc_name" string="Name"/>
+                                    <field name="active_from"/>
+                                    <field name="inactive_from"/>
                                 </tree>
                             </field>
                         </page>
@@ -262,9 +277,10 @@
             <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
             <field name="arch" type="xml">
                 <tree string="Analytic Accounts" position="replace">
-                    <tree toolbar="1" colors="red:(date and date&lt;=current_date or dest_without_cc==True)"
-                          string="Analytic Accounts">
+                    <tree toolbar="1" colors="red:(date and date&lt;=current_date or dest_without_cc==True);grey:selected_in_dest"
+                          notselectable="selected_in_dest" string="Analytic Accounts">
                         <field name="dest_without_cc" invisible="1"/>
+                        <field name="selected_in_dest" invisible="1"/>
                         <field name="name"/>
                         <field name="code"/>
                         <field name="description"/>

=== modified file 'bin/addons/analytic_distribution/analytic_distribution.py'
--- bin/addons/analytic_distribution/analytic_distribution.py	2020-11-02 17:29:34 +0000
+++ bin/addons/analytic_distribution/analytic_distribution.py	2021-05-07 16:01:07 +0000
@@ -36,13 +36,16 @@
         if context is None:
             context = {}
         analytic_acc_obj = self.pool.get('account.analytic.account')
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
+        ret = True   # by default if either dest or cc is missing
         if destination_id and cost_center_id:
-            dest = analytic_acc_obj.browse(cr, uid, destination_id, fields_to_fetch=['category', 'allow_all_cc', 'dest_cc_ids'], context=context)
-            cc = analytic_acc_obj.browse(cr, uid, cost_center_id, fields_to_fetch=['category'], context=context)
-            if dest and cc and dest.category == 'DEST' and cc.category == 'OC' and not dest.allow_all_cc and \
-                    cc.id not in [c.id for c in dest.dest_cc_ids]:
-                return False
-        return True
+            if analytic_acc_obj.search_exist(cr, uid, [('id', '=', destination_id), ('allow_all_cc', '=', True)], context=context):
+                ret = True
+            elif dest_cc_link_obj.search_exist(cr, uid, [('dest_id', '=', destination_id), ('cc_id', '=', cost_center_id)], context=context):
+                ret = True
+            else:
+                ret = False
+        return ret
 
     def check_fp_cc_compatibility(self, cr, uid, fp_id, cost_center_id, context=None):
         """
@@ -146,6 +149,7 @@
         if context is None:
             context = {}
         analytic_acc_obj = self.pool.get('account.analytic.account')
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
         # Have an analytic distribution on another account than analytic-a-holic account make no sense. So their analytic distribution is valid
         if account_id:
             account =  self.pool.get('account.account').read(cr, uid, account_id, ['is_analytic_addicted'])
@@ -153,7 +157,8 @@
                 return 'valid'
         if not distrib_id:
             if parent_id:
-                return self._get_distribution_state(cr, uid, parent_id, False, account_id, context, amount=amount)
+                return self._get_distribution_state(cr, uid, parent_id, False, account_id, context=context,
+                                                    doc_date=doc_date, posting_date=posting_date, manual=manual, amount=amount)
             return 'none'
         distrib = self.browse(cr, uid, distrib_id)
         if not distrib.funding_pool_lines:
@@ -183,6 +188,9 @@
                         return 'invalid'
                     if not analytic_acc_obj.is_account_active(fp_line.cost_center_id, posting_date):
                         return 'invalid'
+                    if dest_cc_link_obj.is_inactive_dcl(cr, uid, fp_line.destination_id.id, fp_line.cost_center_id.id,
+                                                        posting_date, context=context):
+                        return 'invalid'
                 if doc_date and fp_line.analytic_id and not analytic_acc_obj.is_account_active(fp_line.analytic_id, doc_date):
                     return 'invalid'
             if fp_line.destination_id.id not in account.get('destination_ids', []):
@@ -206,7 +214,7 @@
                     return 'invalid'
         return 'valid'
 
-    def analytic_state_from_info(self, cr, uid, account_id, destination_id, cost_center_id, analytic_id, context=None):
+    def analytic_state_from_info(self, cr, uid, account_id, destination_id, cost_center_id, analytic_id, posting_date=False, context=None):
         """
         Give analytic state from the given information.
         Return result and some info if needed.
@@ -217,6 +225,7 @@
         # Prepare some values
         res = 'valid'
         info = ''
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
         account = self.pool.get('account.account').browse(cr, uid, account_id, context=context)
         # DISTRIBUTION VERIFICATION
         # Check that destination is compatible with account
@@ -225,6 +234,9 @@
         # 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')
+        # Check that their combination is active
+        if posting_date and dest_cc_link_obj.is_inactive_dcl(cr, uid, destination_id, cost_center_id, posting_date, context=context):
+            return 'invalid', _('Inactive DEST/CC combination')
         # 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')
@@ -236,10 +248,11 @@
     def check_cc_distrib_active(self, cr, uid, distrib_br, posting_date=False, prefix='', from_supply=False):
         """
         Checks the Cost Center Distribution Lines of the distribution in param.:
-        raises an error if the CC or the Dest. used is not active at the posting date selected (or today's date)
+        raises an error if the CC, the Dest., or their combination is not active at the posting date selected (or today's date)
         If needed a "prefix" can be added to the error message.
         """
         cc_distrib_line_obj = self.pool.get('cost.center.distribution.line')
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
         if distrib_br:
             if not posting_date:
                 posting_date = time.strftime('%Y-%m-%d')
@@ -257,6 +270,11 @@
                     else:
                         raise osv.except_osv(_('Error'), _('%sDestination %s is either inactive at the date %s, or it allows no Cost Center.') %
                                              (prefix, cline.destination_id.code or '', posting_date))
+                if cline.destination_id and cline.analytic_id and \
+                        dest_cc_link_obj.is_inactive_dcl(cr, uid, cline.destination_id.id, cline.analytic_id.id, posting_date):
+                    raise osv.except_osv(_('Error'), _("%sThe combination \"%s - %s\" is not active at this date: %s") %
+                                         (prefix, cline.destination_id.code or '', cline.analytic_id.code or '', posting_date))
+
 
 
 analytic_distribution()

=== modified file 'bin/addons/analytic_distribution/analytic_line.py'
--- bin/addons/analytic_distribution/analytic_line.py	2020-12-01 17:29:45 +0000
+++ bin/addons/analytic_distribution/analytic_line.py	2021-05-07 16:01:07 +0000
@@ -413,6 +413,8 @@
             ids = [ids]
         # Prepare some value
         ad_obj = self.pool.get('analytic.distribution')
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
+        period_obj = self.pool.get('account.period')
         account = self.pool.get('account.analytic.account').read(cr, uid, account_id, ['category', 'date_start', 'date'], context=context)
         account_type = account and account.get('category', False) or False
         res = []
@@ -422,6 +424,9 @@
         date_start = account and account.get('date_start', False) or False
         date_stop = account and account.get('date', False) or False
         # Date verification for all lines and fetch all necessary elements sorted by analytic distribution
+        cmp_dates = {}
+        wiz_period_open = period_obj.search_exist(cr, uid, [('date_start', '<=', wiz_date), ('date_stop', '>=', wiz_date),
+                                                            ('special', '=', False), ('state', '=', 'draft')], context=context)
         for aline in self.browse(cr, uid, ids):
             # UTP-800: Change date comparison regarding FP. If FP, use document date. Otherwise use date.
             aline_cmp_date = aline.date
@@ -435,13 +440,25 @@
                 if aline.journal_id.type == 'hq' or aline.period_id and aline.period_id.state in ['done', 'mission-closed']:
                     aline_cmp_date = wiz_date
                     # these lines will be reverted, check if the reverted line is active
-                    oc_dest_date_start = max(aline.cost_center_id.date_start, aline.destination_id.date_start)
-                    oc_dest_date_stop = min(aline.cost_center_id.date or '9999-01-01', aline.destination_id.date or '9999-01-01')
-                    if (oc_dest_date_start and wiz_date < oc_dest_date_start) or (oc_dest_date_stop and wiz_date >= oc_dest_date_stop):
+                    if not wiz_period_open:
                         expired_date_ids.append(aline.id)
+                    else:
+                        oc_dest_date_start = max(aline.cost_center_id.date_start, aline.destination_id.date_start)
+                        oc_dest_date_stop = min(aline.cost_center_id.date or '9999-01-01', aline.destination_id.date or '9999-01-01')
+                        if (oc_dest_date_start and wiz_date < oc_dest_date_start) or (oc_dest_date_stop and wiz_date >= oc_dest_date_stop):
+                            expired_date_ids.append(aline.id)
+                        else:
+                            # check the Dest/CC link validity with the original Dest and CC which will be used in the REV
+                            destination_id = aline.destination_id and aline.destination_id.id or False
+                            cost_center_id = aline.cost_center_id and aline.cost_center_id.id or False
+                            if destination_id and cost_center_id and \
+                                    dest_cc_link_obj.is_inactive_dcl(cr, uid, destination_id, cost_center_id, wiz_date, context=context):
+                                expired_date_ids.append(aline.id)
             if (date_start and aline_cmp_date < date_start) or (date_stop and aline_cmp_date >= date_stop):
                 expired_date_ids.append(aline.id)
+            cmp_dates[aline.id] = aline_cmp_date
         # Process regarding account_type
+        ids = [i for i in ids if i not in expired_date_ids]  # exclude the AJI in expired_date_ids
         if account_type == 'OC':
             for aline in self.browse(cr, uid, ids):
                 # Verify that:
@@ -449,10 +466,11 @@
                 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
-                if ad_obj.check_dest_cc_compatibility(cr, uid, aline.destination_id and aline.destination_id.id or False,
-                                                      account_id, context=context):
-                    if ad_obj.check_fp_cc_compatibility(cr, uid, aline.account_id.id, account_id, context=context):
-                        res.append(aline.id)
+                dest_id = aline.destination_id and aline.destination_id.id or False
+                if ad_obj.check_dest_cc_compatibility(cr, uid, dest_id, account_id, context=context) and \
+                    ad_obj.check_fp_cc_compatibility(cr, uid, aline.account_id.id, account_id, context=context) and \
+                        not dest_cc_link_obj.is_inactive_dcl(cr, uid, dest_id, account_id, cmp_dates[aline.id], context=context):
+                    res.append(aline.id)
         elif account_type == 'FUNDING':
             # Browse all analytic line to verify them
             for aline in self.browse(cr, uid, ids):
@@ -475,19 +493,16 @@
             for aline in self.browse(cr, uid, ids, context=context):
                 # 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 \
+                cc_id = aline.cost_center_id and aline.cost_center_id.id or False
+                if ad_obj.check_dest_cc_compatibility(cr, uid, account_id, cc_id, 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):
+                                                           account_id, context=context) and \
+                        not dest_cc_link_obj.is_inactive_dcl(cr, uid, account_id, cc_id, cmp_dates[aline.id], context=context):
                     res.append(aline.id)
         else:
             # Case of FREE1 and FREE2 lines
             for i in ids:
                 res.append(i)
-        # Delete elements that are in expired_date_ids
-        for e in expired_date_ids:
-            if e in res:
-                res.remove(e)
         return res
 
     def check_dest_cc_fp_compatibility(self, cr, uid, ids,
@@ -513,6 +528,7 @@
                         new_cc_id, new_cc_br,
                         new_fp_id, new_fp_br):
             ad_obj = self.pool.get('analytic.distribution')
+            dest_cc_link_obj = self.pool.get('dest.cc.link')
             if not general_account_br.is_analytic_addicted:
                 res.append((id, entry_sequence, ''))
                 return False
@@ -549,6 +565,9 @@
             if not check_date(new_cc_br, posting_date):
                 res.append((id, entry_sequence, _('CC date')))
                 return False
+            if new_dest_id and new_cc_id and dest_cc_link_obj.is_inactive_dcl(cr, uid, new_dest_id, new_cc_id, posting_date, context=context):
+                res.append((id, entry_sequence, _('DEST/CC combination date')))
+                return False
             if new_fp_id != msf_pf_id and not \
                     check_date(new_fp_br, posting_date):
                 res.append((id, entry_sequence, _('FP date')))

=== modified file 'bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py'
--- bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2021-04-26 09:35:14 +0000
+++ bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2021-05-07 16:01:07 +0000
@@ -1008,6 +1008,7 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
         distrib_obj = self.pool.get('analytic.distribution')
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
         for w in self.browse(cr, uid, ids):
             # UF-1678
             # For Cost center and destination analytic accounts, check is done on POSTING date. It HAVE TO BE in context to be well processed (filter_active is a function that need a context)
@@ -1021,6 +1022,9 @@
                     if not fpline.destination_id.filter_active:
                         raise osv.except_osv(_('Error'), _('Destination %s is either inactive at the date %s, or it allows no Cost Center.')
                                              % (fpline.destination_id.code or '', w.posting_date))
+                    if dest_cc_link_obj.is_inactive_dcl(cr, uid, fpline.destination_id.id, fpline.cost_center_id.id, w.posting_date):
+                        raise osv.except_osv(_('Error'), _("The combination \"%s - %s\" is not active at this date: %s") %
+                                             (fpline.destination_id.code or '', fpline.cost_center_id.code or '', w.posting_date))
             # UF-1678
             # For funding pool analytic account, check is done on DOCUMENT date. It HAVE TO BE in context to be well processed (filter_active is a function that need a context)
             if w.distribution_id and w.document_date:
@@ -1081,7 +1085,7 @@
             self.wizard_verifications(cr, uid, wiz.id, context=context)
             # And do distribution creation if necessary
             distrib_id = wiz.distribution_id and wiz.distribution_id.id or False
-            if not distrib_id:
+            if not distrib_id or not self.pool.get('analytic.distribution').exists(cr, uid, distrib_id, context=context):
                 # create a new analytic distribution
                 analytic_vals = {}
                 if wiz.partner_type:#UF-2138: added the ref to partner type of FO/PO

=== modified file 'bin/addons/analytic_override/__init__.py'
--- bin/addons/analytic_override/__init__.py	2014-03-14 09:40:12 +0000
+++ bin/addons/analytic_override/__init__.py	2021-05-07 16:01:07 +0000
@@ -22,5 +22,7 @@
 import analytic_distribution
 import analytic_account
 import analytic_line
+import dest_cc_link
+import multiple_cc_selection_wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'bin/addons/analytic_override/__openerp__.py'
--- bin/addons/analytic_override/__openerp__.py	2014-10-29 13:47:46 +0000
+++ bin/addons/analytic_override/__openerp__.py	2021-05-07 16:01:07 +0000
@@ -32,6 +32,8 @@
     "init_xml" : [],
     "update_xml": [
         'security/ir.model.access.csv',
+        'dest_cc_link.xml',
+        'multiple_cc_selection_wizard.xml',
     ],
     'test': [],
     'demo_xml': [

=== modified file 'bin/addons/analytic_override/analytic_account.py'
--- bin/addons/analytic_override/analytic_account.py	2020-10-30 17:31:31 +0000
+++ bin/addons/analytic_override/analytic_account.py	2021-05-07 16:01:07 +0000
@@ -40,8 +40,8 @@
         if context is None:
             context = {}
         res = {}
-        for a in self.browse(cr, uid, ids, fields_to_fetch=['category', 'type', 'allow_all_cc', 'dest_cc_ids'], context=context):
-            if a.category == 'DEST' and a.type == 'normal' and not a.allow_all_cc and not a.dest_cc_ids:
+        for a in self.browse(cr, uid, ids, fields_to_fetch=['category', 'type', 'allow_all_cc', 'dest_cc_link_ids'], context=context):
+            if a.category == 'DEST' and a.type != 'view' and not a.allow_all_cc and not a.dest_cc_link_ids:
                 res[a.id] = True
             else:
                 res[a.id] = False
@@ -95,7 +95,7 @@
                 arg.append(('category', '!=', 'DEST'))
                 arg.append(('type', '=', 'view'))
                 arg.append(('allow_all_cc', '=', True))
-                arg.append(('dest_cc_ids', '!=', False))
+                arg.append(('dest_cc_link_ids', '!=', False))
             # filter: inactive
             elif x[0] == 'filter_active' and x[2] is False:
                 arg.append('|')
@@ -106,9 +106,9 @@
                 arg.append('&')
                 arg.append('&')
                 arg.append(('category', '=', 'DEST'))
-                arg.append(('type', '=', 'normal'))
+                arg.append(('type', '!=', 'view'))
                 arg.append(('allow_all_cc', '=', False))
-                arg.append(('dest_cc_ids', '=', False))
+                arg.append(('dest_cc_link_ids', '=', False))
         return arg
 
     def _get_fake(self, cr, uid, ids, *a, **b):
@@ -282,11 +282,20 @@
                 cc = arg[2]
                 if operator != '=' or not isinstance(cc, (int, long)):
                     raise osv.except_osv(_('Error'), _('Filter not implemented on Destinations.'))
-                all_dest_ids = self.search(cr, uid, [('category', '=', 'DEST')], context=context)
-                compatible_dest_ids = []
-                for dest in self.browse(cr, uid, all_dest_ids, fields_to_fetch=['allow_all_cc', 'dest_cc_ids'], context=context):
-                    if dest.allow_all_cc or (cc and cc in [c.id for c in dest.dest_cc_ids]):
-                        compatible_dest_ids.append(dest.id)
+                if not cc:
+                    # by default if no CC is selected display only the Destinations compatible with all CC
+                    compatible_dest_ids = self.search(cr, uid, [('category', '=', 'DEST'),
+                                                                ('type', '!=', 'view'),
+                                                                ('allow_all_cc', '=', True)], context=context)
+                else:
+                    compatible_dest_sql = """
+                        SELECT id
+                        FROM account_analytic_account
+                        WHERE category = 'DEST' AND type != 'view'
+                        AND (allow_all_cc = 't' OR id IN (SELECT dest_id FROM dest_cc_link WHERE cc_id = %s));
+                    """
+                    cr.execute(compatible_dest_sql, (cc,))
+                    compatible_dest_ids = [x[0] for x in cr.fetchall()]
                 dom.append(('id', 'in', compatible_dest_ids))
         return dom
 
@@ -442,6 +451,54 @@
             }
         return res
 
+    def _get_selected_in_dest(self, cr, uid, cc_ids, name=False, args=False, context=None):
+        """
+        Returns True for the Cost Centers already selected in the Destination:
+        they will be displayed in grey in the list and won't be re-selectable.
+        """
+        if context is None:
+            context = {}
+        if isinstance(cc_ids, (int, long)):
+            cc_ids = [cc_ids]
+        selected = []
+        dest_id = context.get('current_destination_id') or False
+        if dest_id:
+            dest = self.browse(cr, uid, dest_id, fields_to_fetch=['dest_cc_link_ids'], context=context)
+            selected = [dest_cc_link.cc_id.id for dest_cc_link in dest.dest_cc_link_ids]
+        res = {}
+        for cc_id in cc_ids:
+            res[cc_id] = cc_id in selected
+        return res
+
+    def _get_dest_cc_link_dates(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Returns a dict with key = id of the analytic account,
+        and value = dict with dest_cc_link_active_from and dest_cc_link_inactive_from dates separated by commas (String).
+        Note that the date format is the same in EN and FR, and that empty dates are not ignored.
+        E.g.: '2021-03-02,2021-03-01,,2021-03-03,'
+
+        This is used in Destination Import Tools, in particular for the Export of existing entries used as examples.
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = {}
+        for a in self.browse(cr, uid, ids, fields_to_fetch=['category', 'dest_cc_link_ids'], context=context):
+            active_date_list = []
+            inactive_date_list = []
+            if a.category == 'DEST':
+                for cc_link in a.dest_cc_link_ids:
+                    active_date_str = "%s" % (cc_link.active_from or "")
+                    active_date_list.append(active_date_str)
+                    inactive_date_str = "%s" % (cc_link.inactive_from or "")
+                    inactive_date_list.append(inactive_date_str)
+            res[a.id] = {
+                'dest_cc_link_active_from': ",".join(active_date_list),
+                'dest_cc_link_inactive_from': ",".join(inactive_date_list),
+            }
+        return res
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=1),
         'code': fields.char('Code', size=24),
@@ -463,6 +520,17 @@
         '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')]"),
+        'dest_cc_link_ids': fields.one2many('dest.cc.link', 'dest_id', string="Cost Centers", required=False),
+        'dest_cc_link_active_from': fields.function(_get_dest_cc_link_dates, method=True, type='char',
+                                                    store=False, readonly=True,
+                                                    string='Activation Combination Dest / CC from',
+                                                    help="Technical field used for Import Tools only",
+                                                    multi="dest_cc_link_dates"),
+        'dest_cc_link_inactive_from': fields.function(_get_dest_cc_link_dates, method=True, type='char',
+                                                      store=False, readonly=True,
+                                                      string='Inactivation Combination Dest / CC from',
+                                                      help="Technical field used for Import Tools only",
+                                                      multi="dest_cc_link_dates"),
         '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,
@@ -498,6 +566,8 @@
         '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'),
+        'selected_in_dest': fields.function(_get_selected_in_dest, string='Selected in Destination', method=True,
+                                            type='boolean', store=False),
     }
 
     _defaults ={
@@ -577,39 +647,49 @@
         res['domain']['parent_id'] = [('category', '=', category), ('type', '=', 'view')]
         return res
 
-    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):
+    def on_change_allow_all_cc(self, cr, uid, ids, allow_all_cc, cc_ids, acc_type='destination', field_name='allow_all_cc',
+                               m2m=False, 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 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': _(msg)
-            }
-            res['warning'] = warning
-            res['value'] = {field_name: False, }
+        if allow_all_cc:
+            if m2m:
+                cc_filled_in = cc_ids and cc_ids[0][2] or False  # e.g. [(6, 0, [1, 2])]
+            else:
+                cc_filled_in = cc_ids or False
+            if cc_filled_in:
+                # 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': _(msg)
+                }
+                res['warning'] = warning
+                res['value'] = {field_name: False, }
         return res
 
     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)
+                                           field_name='allow_all_cc_with_fp', m2m=True, context=context)
 
-    def on_change_cc_ids(self, cr, uid, ids, cc_ids, field_name='allow_all_cc', context=None):
+    def on_change_cc_ids(self, cr, uid, ids, cc_ids, field_name='allow_all_cc', m2m=False, context=None):
         """
         If at least a CC is selected, unticks the box "Allow all Cost Centers"
         """
         res = {}
-        if cc_ids and cc_ids[0][2]:  # e.g. [(6, 0, [1, 2])]
+        if m2m:
+            cc_filled_in = cc_ids and cc_ids[0][2] or False  # e.g. [(6, 0, [1, 2])]
+        else:
+            cc_filled_in = cc_ids or False
+        if cc_filled_in:
             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)
+        return self.on_change_cc_ids(cr, uid, ids, cost_center_ids, field_name='allow_all_cc_with_fp', m2m=True, context=context)
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if not context:
@@ -685,6 +765,7 @@
             if vals['category'] != 'DEST':
                 vals['destination_ids'] = [(6, 0, [])]
                 vals['dest_cc_ids'] = [(6, 0, [])]
+                vals['dest_cc_link_ids'] = []  # related dest.cc.links (if any) are deleted in _clean_dest_cc_link
                 vals['allow_all_cc'] = False  # default value
             if vals['category'] != 'FUNDING':
                 vals['tuple_destination_account_ids'] = [(6, 0, [])]
@@ -727,6 +808,7 @@
         default['tuple_destination_summary'] = []
         default['line_ids'] = []
         default['dest_cc_ids'] = []
+        default['dest_cc_link_ids'] = []
         return super(analytic_account, self).copy(cr, uid, a_id, default, context=context)
 
     def _check_name_unicity(self, cr, uid, ids, context=None):
@@ -785,6 +867,57 @@
                     self.log(cr, uid, analytic_account_id, _('At least one Analytic Journal Item using the Analytic Account %s '
                                                              'has a Posting Date outside the activation dates selected.') % (analytic_acc.code))
 
+    def _clean_dest_cc_link(self, cr, uid, ids, vals, context=None):
+        """
+        In case Dest CC Links are reset in an analytic account: deletes the related existing Dest CC Links if any.
+        Probable UC: Dest CC Links selected on a destination, then account changed to another category.
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if 'dest_cc_link_ids' in vals and not vals['dest_cc_link_ids']:
+            dcl_ids = []
+            for analytic_acc in self.browse(cr, uid, ids, fields_to_fetch=['dest_cc_link_ids'], context=context):
+                dcl_ids.extend([dcl.id for dcl in analytic_acc.dest_cc_link_ids])
+            if dcl_ids:
+                self.pool.get('dest.cc.link').unlink(cr, uid, dcl_ids, context=context)
+        return True
+
+    def _dest_cc_ids_must_be_updated(self, vals, context):
+        """
+        Returns True if dest_cc_ids in vals must be changed to dest_cc_link_ids (the goal of this method is to ensure
+        that the same condition is used everywhere and that the UC where all CC are removed is taken into account)
+        """
+        if context and vals and context.get('sync_update_execution') and vals.get('dest_cc_ids') and vals['dest_cc_ids'][0][2] is not None:
+            return True
+        return False
+
+    def _update_synched_dest_cc_ids(self, cr, uid, dest_ids, vals, context):
+        """
+        For synch made before or while US-7295 was released: changes the dest_cc_ids into dest_cc_link_ids
+        """
+        if self._dest_cc_ids_must_be_updated(vals, context):
+            dest_cc_link_obj = self.pool.get('dest.cc.link')
+            if isinstance(dest_ids, (int, long)):
+                dest_ids = [dest_ids]
+            for dest_id in dest_ids:
+                dest = self.browse(cr, uid, dest_id, fields_to_fetch=['dest_cc_link_ids'], context=context)
+                # note: after US-7295 patch script no instance has any dest_cc_ids, all CC links are necessarily dest.cc.link
+                current_cc_ids = [dest_cc_link.cc_id.id for dest_cc_link in dest.dest_cc_link_ids]
+                new_cc_ids = vals['dest_cc_ids'][0][2] or []  # take into account the UC where all CC are removed
+                # delete the CC to be deleted
+                cc_to_be_deleted = [c for c in current_cc_ids if c not in new_cc_ids]
+                if cc_to_be_deleted:
+                    dcl_to_be_deleted = dest_cc_link_obj.search(cr, uid, [('dest_id', '=', dest_id), ('cc_id', 'in', cc_to_be_deleted)],
+                                                                order='NO_ORDER', context=context)
+                    dest_cc_link_obj.unlink(cr, uid, dcl_to_be_deleted, context=context)
+                # create the CC to be created
+                for cc_id in [c for c in new_cc_ids if c not in current_cc_ids]:
+                    dest_cc_link_obj.create(cr, uid, {'dest_id': dest_id, 'cc_id': cc_id}, context=context)
+            del vals['dest_cc_ids']
+        return True
+
     def create(self, cr, uid, vals, context=None):
         """
         Some verifications before analytic account creation
@@ -797,6 +930,9 @@
         self._check_date(vals)
         self.set_funding_pool_parent(cr, uid, vals)
         vals = self.remove_inappropriate_links(vals, context=context)
+        vals_copy = vals.copy()
+        if self._dest_cc_ids_must_be_updated(vals, context):
+            del vals['dest_cc_ids']  # replaced by dest_cc_link_ids in _update_synched_dest_cc_ids (called after create as it uses the new id)
         # for auto instance creation, fx gain has been stored, need HQ sync + instance sync to get CC
         if context.get('sync_update_execution') and vals.get('code') and vals.get('category') == 'OC':
             param = self.pool.get('ir.config_parameter')
@@ -804,9 +940,11 @@
             if init_cc_fx_gain and vals.get('code') == init_cc_fx_gain:
                 vals['for_fx_gain_loss'] = True
                 param.set_param(cr, 1, 'INIT_CC_FX_GAIN', '')
-        ids = super(analytic_account, self).create(cr, uid, vals, context=context)
-        self._check_name_unicity(cr, uid, ids, context=context)
-        return ids
+        analytic_acc_id = super(analytic_account, self).create(cr, uid, vals, context=context)
+        self._check_name_unicity(cr, uid, analytic_acc_id, context=context)
+        self._clean_dest_cc_link(cr, uid, analytic_acc_id, vals, context=context)
+        self._update_synched_dest_cc_ids(cr, uid, analytic_acc_id, vals_copy, context)
+        return analytic_acc_id
 
     def write(self, cr, uid, ids, vals, context=None):
         """
@@ -822,7 +960,9 @@
         self._check_date(vals)
         self.set_funding_pool_parent(cr, uid, vals)
         vals = self.remove_inappropriate_links(vals, context=context)
+        self._update_synched_dest_cc_ids(cr, uid, ids, vals, context)
         res = super(analytic_account, self).write(cr, uid, ids, vals, context=context)
+        self._clean_dest_cc_link(cr, uid, ids, vals, context=context)
         self.check_access_rule(cr, uid, ids, 'write', context=context)
         if context.get('from_web', False) or context.get('from_import_menu', False):
             cat_instance = self.read(cr, uid, ids, ['category', 'instance_id', 'is_pf'], context=context)[0]
@@ -919,9 +1059,15 @@
 
     def button_dest_cc_clear(self, cr, uid, ids, context=None):
         """
-        Removes all Cost Centers selected in the Destination view
+        Removes all Dest / CC combinations selected in the Cost Centers tab of the Destination form
         """
-        self.write(cr, uid, ids, {'dest_cc_ids': [(6, 0, [])]}, context=context)
+        if context is None:
+            context = {}
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
+        for dest in self.browse(cr, uid, ids, fields_to_fetch=['dest_cc_link_ids'], context=context):
+            dest_cc_link_ids = [dcl.id for dcl in dest.dest_cc_link_ids]
+            if dest_cc_link_ids:
+                dest_cc_link_obj.unlink(cr, uid, dest_cc_link_ids, context=context)
         return True
 
     def button_dest_clear(self, cr, uid, ids, context=None):
@@ -968,6 +1114,28 @@
             return False
         return True
 
+    def open_multiple_cc_selection_wizard(self, cr, uid, ids, context=None):
+        """
+        Creates and displays a Multiple CC Selection Wizard linked to the current Destination
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        multiple_cc_wiz_obj = self.pool.get('multiple.cc.selection.wizard')
+        if ids:
+            multiple_cc_wiz_id = multiple_cc_wiz_obj.create(cr, uid, {'dest_id': ids[0]}, context=context)
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'multiple.cc.selection.wizard',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'target': 'new',
+                'res_id': [multiple_cc_wiz_id],
+                'context': context,
+            }
+        return True
+
 
 analytic_account()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/analytic_override/analytic_line.py'
--- bin/addons/analytic_override/analytic_line.py	2021-04-23 12:31:26 +0000
+++ bin/addons/analytic_override/analytic_line.py	2021-05-07 16:01:07 +0000
@@ -159,6 +159,7 @@
             return True
 
         account_obj = self.pool.get('account.analytic.account')
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
 
         #US-419: Use the document date and not posting date when checking the validity of analytic account
         # tech: replaced all date by document_date
@@ -171,6 +172,8 @@
                     raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (account.name or '',))
         if 'date' in vals and vals['date'] is not False:
             date = vals['date']
+            dest = False
+            cc = False
             if vals.get('cost_center_id', False):
                 cc = account_obj.browse(cr, uid, vals['cost_center_id'], context=context)
                 if date < cc.date_start or (cc.date != False and date >= cc.date):
@@ -181,6 +184,9 @@
                 if date < dest.date_start or (dest.date != False and date >= dest.date):
                     if 'from' not in context or context.get('from') != 'mass_reallocation':
                         raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (dest.name or '',))
+            if context.get('from') != 'mass_reallocation' and dest and cc and \
+                    dest_cc_link_obj.is_inactive_dcl(cr, uid, dest.id, cc.id, date, context=context):
+                raise osv.except_osv(_('Error'), _("The combination \"%s - %s\" is not active.") % (dest.code or '', cc.code or ''))
         return True
 
     def _check_document_date(self, cr, uid, ids):

=== added file 'bin/addons/analytic_override/dest_cc_link.py'
--- bin/addons/analytic_override/dest_cc_link.py	1970-01-01 00:00:00 +0000
+++ bin/addons/analytic_override/dest_cc_link.py	2021-05-07 16:01:07 +0000
@@ -0,0 +1,174 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2021 MSF, TeMPO Consulting.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+
+class dest_cc_link(osv.osv):
+    _name = "dest.cc.link"
+    _description = "Destination / Cost Center Combination"
+    _rec_name = "cc_id"
+    _trace = True
+
+    def _get_current_id(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Returns a dict with key = value = current DB id.
+
+        current_id is an internal field used to make the CC read-only except for new lines (= without DB id).
+        The goal is to prevent the edition of a Dest CC Link with a CC linked to a different coordo than the previous CC.
+        """
+        res = {}
+        for i in ids:
+            res[i] = i
+        return res
+
+    def _get_cc_code(self, cr, uid, ids, name, args, context=None):
+        """
+        Returns a dict with key = Dest CC Link id, and value = related Cost Center code.
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = {}
+        for dcl in self.browse(cr, uid, ids, fields_to_fetch=['cc_id'], context=context):
+            res[dcl.id] = dcl.cc_id.code or ''
+        return res
+
+    def _get_dest_cc_link_to_update(self, cr, uid, analytic_acc_ids, context=None):
+        """
+        Returns the list of Dest CC Links for which the CC code should be updated.
+        """
+        if context is None:
+            context = {}
+        if isinstance(analytic_acc_ids, (int, long)):
+            analytic_acc_ids = [analytic_acc_ids]
+        return self.pool.get('dest.cc.link').search(cr, uid, [('cc_id', 'in', analytic_acc_ids)], order='NO_ORDER', context=context)
+
+    _columns = {
+        'dest_id': fields.many2one('account.analytic.account', string="Destination", required=True,
+                                   domain="[('category', '=', 'DEST'), ('type', '!=', 'view')]", ondelete='cascade', select=1),
+        'cc_id': fields.many2one('account.analytic.account', string="Cost Center", required=True, sort_column='cc_code',
+                                 domain="[('category', '=', 'OC'), ('type', '!=', 'view')]", ondelete='cascade', select=1),
+        'cc_code': fields.function(_get_cc_code, method=True, string="Cost Center Code", type='char', size=24,
+                                   readonly=True,
+                                   store={
+                                       'account.analytic.account': (_get_dest_cc_link_to_update, ['code'], 10),
+                                       'dest.cc.link': (lambda self, cr, uid, ids, c=None: ids, ['cc_id'], 20),
+                                   }),
+        'cc_name': fields.related('cc_id', 'name', type="char", string="Cost Center Name", readonly=True, write_relate=False, store=False),
+        'active_from': fields.date('Activation Combination Dest / CC from', required=False),
+        'inactive_from': fields.date('Inactivation Combination Dest / CC from', required=False),
+        'current_id': fields.function(_get_current_id, method=1, type='integer', internal=1, string="DB Id (used by the UI)"),
+    }
+
+    _order = 'dest_id, cc_code, id'
+
+    _sql_constraints = [
+        ('dest_cc_uniq', 'UNIQUE(dest_id, cc_id)', 'Each Cost Center can only be added once to the same Destination.'),
+        ('dest_cc_date_check', 'CHECK(active_from < inactive_from)', 'The Activation date of the "Combination Dest / CC" '
+                                                                     'must be before the Inactivation date.')
+    ]
+
+    def _check_analytic_lines(self, cr, uid, ids, context=None):
+        """
+        Displays a non-blocking message on the top of the page in case some AJI using the Dest/CC link have been booked
+        outside its activation dates.
+        """
+        if context is None:
+            context = {}
+        if not context.get('sync_update_execution'):
+            aal_obj = self.pool.get('account.analytic.line')
+            if isinstance(ids, (int, long)):
+                ids = [ids]
+            for dcl in self.browse(cr, uid, ids, context=context):
+                if dcl.active_from or dcl.inactive_from:
+                    dcl_dom = [('cost_center_id', '=', dcl.cc_id.id), ('destination_id', '=', dcl.dest_id.id)]
+                    if dcl.active_from and dcl.inactive_from:
+                        dcl_dom.append('|')
+                    if dcl.active_from:
+                        dcl_dom.append(('date', '<', dcl.active_from))
+                    if dcl.inactive_from:
+                        dcl_dom.append(('date', '>=', dcl.inactive_from))
+                    if aal_obj.search_exist(cr, uid, dcl_dom, context=context):
+                        self.log(cr, uid, dcl.id, _('At least one Analytic Journal Item using the combination \"%s - %s\" '
+                                                    'has a Posting Date outside the activation dates selected.') %
+                                 (dcl.dest_id.code or '', dcl.cc_id.code or ''))
+
+    def create(self, cr, uid, vals, context=None):
+        """
+        Creates the Dest CC Combination, and:
+        - displays an informative message on the top of the page if existing AJIs are using the combination outside its activation interval.
+        - unticks the box "Allow all Cost Centers" from the related Dest.
+          (UC: edit a Dest. having the box ticked, untick the box, add a CC and click on Cancel.
+           CC isn't removed by the Cancel button as it is a o2m, so the box should remain unticked.)
+        """
+        if context is None:
+            context = {}
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        res = super(dest_cc_link, self).create(cr, uid, vals, context=context)
+        self._check_analytic_lines(cr, uid, res, context=context)
+        dest_id = self.read(cr, uid, res, ['dest_id'], context=context)['dest_id'][0]
+        if analytic_acc_obj.search_exist(cr, uid, [('id', '=', dest_id), ('allow_all_cc', '=', True)], context=context):
+            analytic_acc_obj.write(cr, uid, dest_id, {'allow_all_cc': False}, context=context)
+        return res
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        See _check_analytic_lines
+        """
+        res = super(dest_cc_link, self).write(cr, uid, ids, vals, context=context)
+        self._check_analytic_lines(cr, uid, ids, context=context)
+        return res
+
+    def is_inactive_dcl(self, cr, uid, dest_id, cc_id, posting_date, context=None):
+        """
+        Returns True if the Dest CC Link with the dest_id and cc_id exists and that the posting_date
+        is outside its validity date range.
+        """
+        if context is None:
+            context = {}
+        inactive_dcl = False
+        if dest_id and cc_id and posting_date:
+            dcl_ids = self.search(cr, uid, [('dest_id', '=', dest_id), ('cc_id', '=', cc_id)], limit=1, context=context)
+            if dcl_ids:
+                dcl = self.browse(cr, uid, dcl_ids[0], fields_to_fetch=['active_from', 'inactive_from'], context=context)
+                inactive_dcl = (dcl.active_from and posting_date < dcl.active_from) or (dcl.inactive_from and posting_date >= dcl.inactive_from)
+        return inactive_dcl
+
+    def on_change_cc_id(self, cr, uid, ids, cc_id):
+        """
+        Fills in the CC Name as soon as a CC is selected
+        """
+        res = {}
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        if cc_id:
+            name = analytic_acc_obj.read(cr, uid, cc_id, ['name'])['name']
+        else:
+            name = False
+        res['value'] = {'cc_name': name, }
+        return res
+
+
+dest_cc_link()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/analytic_override/dest_cc_link.xml'
--- bin/addons/analytic_override/dest_cc_link.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/analytic_override/dest_cc_link.xml	2021-05-07 16:01:07 +0000
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<openerp>
+      <data>
+            <!-- DEST CC LINK - FORM VIEW -->
+            <record id="view_dest_cc_link_form" model="ir.ui.view">
+                <field name="name">dest.cc.link.form</field>
+                <field name="model">dest.cc.link</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+                    <form noteditable="1">
+                        <field name="cc_id"/>
+                        <newline/>
+                        <field name="active_from"/>
+                        <field name="inactive_from"/>
+                    </form>
+                </field>
+            </record>
+
+            <!-- DEST CC LINK - TREE VIEW -->
+            <record id="view_dest_cc_link_tree" model="ir.ui.view">
+                <field name="name">dest.cc.link.tree</field>
+                <field name="model">dest.cc.link</field>
+                <field name="type">tree</field>
+                <field name="arch" type="xml">
+                    <tree>
+                        <field name="cc_id"/>
+                        <field name="active_from"/>
+                        <field name="inactive_from"/>
+                    </tree>
+                </field>
+            </record>
+
+            <!-- DEST CC LINK - SEARCH VIEW -->
+            <record id="view_dest_cc_link_search" model="ir.ui.view">
+                <field name="name">dest.cc.link.search</field>
+                <field name="model">dest.cc.link</field>
+                <field name="type">search</field>
+                <field name="arch" type="xml">
+                    <search>
+                        <group>
+                            <field name="cc_id"/>
+                            <field name="active_from"/>
+                            <field name="inactive_from"/>
+                        </group>
+                    </search>
+                </field>
+            </record>
+       </data>
+</openerp>

=== added file 'bin/addons/analytic_override/multiple_cc_selection_wizard.py'
--- bin/addons/analytic_override/multiple_cc_selection_wizard.py	1970-01-01 00:00:00 +0000
+++ bin/addons/analytic_override/multiple_cc_selection_wizard.py	2021-05-07 16:01:07 +0000
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2021 MSF, TeMPO Consulting.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+
+
+class multiple_cc_selection_wizard(osv.osv_memory):
+    _name = 'multiple.cc.selection.wizard'
+
+    _columns = {
+        'dest_id': fields.many2one('account.analytic.account', string="Destination", required=True,
+                                   domain="[('category', '=', 'DEST'), ('type', '!=', 'view')]"),
+        'cc_ids': fields.many2many('account.analytic.account', 'multiple_cc_wiz_rel', 'wizard_id', 'cost_center_id',
+                                   string="Cost Centers", domain="[('category', '=', 'OC'), ('type', '!=', 'view')]"),
+    }
+
+    def multiple_cc_add(self, cr, uid, ids, context=None):
+        """
+        Adds the Cost Centers selected in the wizard to the current destination
+        without filling in the activation and inactivation dates of the related combinations.
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        wiz = self.browse(cr, uid, ids[0], context=context)
+        if wiz.cc_ids:
+            for cc in wiz.cc_ids:
+                # note: this automatically unticks the box "Allow all Cost Centers" (as for a manual CC addition)
+                dest_cc_link_obj.create(cr, uid, {'dest_id': wiz.dest_id.id, 'cc_id': cc.id}, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+
+multiple_cc_selection_wizard()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/analytic_override/multiple_cc_selection_wizard.xml'
--- bin/addons/analytic_override/multiple_cc_selection_wizard.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/analytic_override/multiple_cc_selection_wizard.xml	2021-05-07 16:01:07 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- MULTIPLE CC SELECTION WIZARD - FORM VIEW -->
+        <record id="multiple_cc_selection_wizard_form_view" model="ir.ui.view">
+            <field name="name">multiple.cc.selection.wizard.form</field>
+            <field name="model">multiple.cc.selection.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Add several Cost Centers">
+                    <label nolabel="1" colspan="6"
+                           string="This wizard enables you to select several Cost Centers at once to be added to the Destination. The activation and inactivation dates of the related Dest / CC combinations will remain empty."/>
+                    <field name="cc_ids" nolabel="1" colspan="6">
+                        <tree string="Cost Centers">
+                            <field name="code"/>
+                            <field name="name"/>
+                        </tree>
+                    </field>
+                    <group colspan="6" col="4">
+                        <label string="" colspan="2"/>
+                        <button icon="gtk-cancel" string="Cancel" special="cancel" colspan="1"/>
+                        <button icon="gtk-add" string="Add" name="multiple_cc_add" type="object" colspan="1"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'bin/addons/financing_contract/financing_contract_account_quadruplet.py'
--- bin/addons/financing_contract/financing_contract_account_quadruplet.py	2020-11-20 15:52:12 +0000
+++ bin/addons/financing_contract/financing_contract_account_quadruplet.py	2021-05-07 16:01:07 +0000
@@ -89,14 +89,15 @@
                  funding_pool_associated_destinations fpad,
                  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
+            LEFT JOIN dest_cc_link ON dest_cc_link.dest_id = dest.id
+            
            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 AND
                 lnk.destination_id = dest.id AND
-                (dest.allow_all_cc = 't' or dest_cc_rel.cost_center_id = cc.id)
+                (dest.allow_all_cc = 't' or dest_cc_link.cc_id = cc.id)
 
            UNION
 
@@ -111,7 +112,7 @@
                 account_destination_link lnk,
                 account_account  gl_account,
                 account_analytic_account dest
-            LEFT JOIN destination_cost_center_rel dest_cc_rel ON dest_cc_rel.destination_id = dest.id
+            LEFT JOIN dest_cc_link ON dest_cc_link.dest_id = dest.id
             where
                 fp.allow_all_cc_with_fp = 't' and
                 cc.type != 'view' and
@@ -123,7 +124,7 @@
                 fp_account_rel.account_id= gl_account.id and
                 lnk.account_id = gl_account.id and
                 lnk.destination_id = dest.id and
-                (dest.allow_all_cc = 't' or dest_cc_rel.cost_center_id = cc.id)
+                (dest.allow_all_cc = 't' or dest_cc_link.cc_id = cc.id)
 
             UNION
 
@@ -138,7 +139,7 @@
                 account_destination_link lnk,
                 account_account  gl_account,
                 account_analytic_account dest
-            LEFT JOIN destination_cost_center_rel dest_cc_rel ON dest_cc_rel.destination_id = dest.id
+            LEFT JOIN dest_cc_link ON dest_cc_link.dest_id = dest.id
             where
                 fp.allow_all_cc_with_fp = 'f' and
                 fpacc.funding_pool_id = fp.id and
@@ -148,7 +149,7 @@
                 fp_account_rel.account_id= gl_account.id and
                 lnk.account_id = gl_account.id and
                 lnk.destination_id = dest.id and
-                (dest.allow_all_cc = 't' or dest_cc_rel.cost_center_id = cc.id)
+                (dest.allow_all_cc = 't' or dest_cc_link.cc_id = cc.id)
 
             UNION
 
@@ -162,7 +163,7 @@
                 account_target_costcenter target,
                 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
+            LEFT JOIN dest_cc_link ON dest_cc_link.dest_id = dest.id
             where
                 fp.allow_all_cc_with_fp = 't' and
                 cc.type != 'view' and
@@ -173,7 +174,7 @@
                 lnk.id = fpad.tuple_id and
                 fp.id = fpad.funding_pool_id and
                 lnk.destination_id = dest.id and
-                (dest.allow_all_cc = 't' or dest_cc_rel.cost_center_id = cc.id)
+                (dest.allow_all_cc = 't' or dest_cc_link.cc_id = cc.id)
             ) AS combinations
            )""")
         return res

=== modified file 'bin/addons/msf_audittrail/__openerp__.py'
--- bin/addons/msf_audittrail/__openerp__.py	2021-05-05 16:04:38 +0000
+++ bin/addons/msf_audittrail/__openerp__.py	2021-05-07 16:01:07 +0000
@@ -57,7 +57,11 @@
         'data/audittrail_account_account.yml',
         'data/audittrail_account_tax.yml',
         'data/audittrail_res_company.yml',
+<<<<<<< TREE
         'data/audittrail_hq_entry.yml',
+=======
+        'data/audittrail_dest_cc_link.yml',
+>>>>>>> MERGE-SOURCE
         'audittrail_report.xml',
         'audittrail_invoice_data.yml',
     ],

=== added file 'bin/addons/msf_audittrail/data/audittrail_dest_cc_link.yml'
--- bin/addons/msf_audittrail/data/audittrail_dest_cc_link.yml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_audittrail/data/audittrail_dest_cc_link.yml	2021-05-07 16:01:07 +0000
@@ -0,0 +1,39 @@
+-
+  For Dest CC Links (dest.cc.link), track the changes on the Destinations
+-
+  !python {model: audittrail.rule}: |
+    name = 'Dest / CC Combinations'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'dest.cc.link')], context=context)
+    rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
+    if object_ids:
+        # Create the rule
+        fields = ['cc_id', 'active_from', 'inactive_from']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'dest.cc.link'), ('name', 'in', fields)], context=context)
+        field_name = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'dest.cc.link'), ('name', '=', 'cc_id')], context=context)
+        field_parent = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'dest.cc.link'), ('name', '=', 'dest_id')], context=context)
+
+        name_id = False
+        parent_id = False
+
+        if field_parent:
+            parent_id = field_parent[0]
+            if field_name:
+                name_id = field_name[0]
+
+        vals = {
+            'name': name,
+            'object_id': object_ids[0],
+            'log_write': True,
+            'log_unlink': True,
+            'log_create': True,
+            'field_ids': [(6, 0, fields_ids)],
+            'parent_field_id': parent_id,
+            'name_get_field_id': name_id,
+        }
+
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)

=== modified file 'bin/addons/msf_doc_import/msf_import_export.py'
--- bin/addons/msf_doc_import/msf_import_export.py	2019-05-27 10:02:18 +0000
+++ bin/addons/msf_doc_import/msf_import_export.py	2021-05-07 16:01:07 +0000
@@ -32,6 +32,7 @@
 from tempfile import TemporaryFile
 from lxml import etree
 from lxml.etree import XMLSyntaxError
+from datetime import datetime
 
 from msf_doc_import.wizard.abstract_wizard_import import ImportHeader
 from msf_doc_import.msf_import_export_conf import MODEL_DICT
@@ -626,6 +627,58 @@
             # thread.join(wait_time)
         return self.bg_import(cr, uid, wiz, expected_headers, rows, raise_on_error=raise_on_error,  context=context)
 
+    def _handle_dest_cc_dates(self, cr, uid, data, dest_cc_list, dest_cc_tuple_list, context=None):
+        """
+        Gets and checks the dest_cc_link_active_from and dest_cc_link_inactive_from dates.
+        Updates the dest_cc_tuple_list with tuples containing (cost_center, active_date, inactive_date)
+        """
+        if context is None:
+            context = {}
+        dest_cc_active_date_list = []
+        dest_cc_inactive_date_list = []
+        active_from = (True, 'dest_cc_link_active_from', _("Activation Combination Dest / CC from"))
+        inactive_from = (False, 'dest_cc_link_inactive_from', _("Inactivation Combination Dest / CC from"))
+        for t in [active_from, inactive_from]:
+            active = t[0]
+            col_name = t[1]
+            col_str = t[2]
+            dest_cc_date_list = []
+            if data.get(col_name):
+                split_char = ';'
+                if split_char not in data.get(col_name):
+                    split_char = ','
+                for cost_center_date in data.get(col_name).split(split_char):
+                    cc_date = cost_center_date.strip()
+                    if cc_date:
+                        cc_date = cc_date.replace(' 00:00:00.00', '')  # can be if there is only one date in the cell
+                        try:
+                            cc_date = datetime.strptime(cc_date, "%Y-%m-%d")
+                        except ValueError:
+                            raise Exception(_('The dates in the column "%s" should use the format YYYY-MM-DD.') % col_str)
+                    else:
+                        cc_date = False  # the related Dest/CC combination has no activation/inactivation date
+                    dest_cc_date_list.append(cc_date)
+                del data[col_name]
+            if len(dest_cc_date_list) > len(dest_cc_list):
+                raise Exception(_('The number of dates in the column "%s" exceeds the number of Cost Centers indicated.') % col_str)
+            if active:
+                dest_cc_active_date_list = dest_cc_date_list[:]
+            else:
+                dest_cc_inactive_date_list = dest_cc_date_list[:]
+        for num, cc in enumerate(dest_cc_list):
+            try:
+                dest_cc_active_date = dest_cc_active_date_list[num]
+            except IndexError:
+                dest_cc_active_date = False
+            try:
+                dest_cc_inactive_date = dest_cc_inactive_date_list[num]
+            except IndexError:
+                dest_cc_inactive_date = False
+            if dest_cc_active_date and dest_cc_inactive_date and dest_cc_active_date >= dest_cc_inactive_date:
+                cc_code = self.pool.get('account.analytic.account').read(cr, uid, cc, ['code'], context=context)['code'] or ''
+                raise Exception(_('The activation date related to the Cost Center %s must be before the inactivation date.') % cc_code)
+            dest_cc_tuple_list.append((cc, dest_cc_active_date, dest_cc_inactive_date))
+
     def bg_import(self, cr, uid, import_brw, headers, rows, raise_on_error=False, context=None):
         """
         Run the import of lines in background
@@ -647,6 +700,7 @@
         acc_obj = self.pool.get('account.account')
         acc_analytic_obj = self.pool.get('account.analytic.account')
         acc_dest_obj = self.pool.get('account.destination.link')
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
 
         cost_centers_cache = {}
         gl_account_cache = {}
@@ -731,7 +785,7 @@
         # custom process to retrieve CC, Destination_ids
         custom_m2m = []
         if import_brw.model_list_selection == 'destinations':
-            custom_m2m = ['dest_cc_ids', 'destination_ids']
+            custom_m2m = ['destination_ids']
         elif import_brw.model_list_selection == 'funding_pools':
             custom_m2m = ['cost_center_ids', 'tuple_destination_account_ids']
         for c_m2m in custom_m2m:
@@ -1025,6 +1079,7 @@
                         data['tuple_destination_account_ids'] = [(6, 0, [])]
 
                 # Destinations
+                dest_cc_tuple_list = []
                 if import_brw.model_list_selection == 'destinations':
                     context['from_import_menu'] = True
                     data['category'] = 'DEST'
@@ -1042,14 +1097,14 @@
                     if data['type'] not in ['normal', 'view']:
                         raise Exception(_('The Type must be either "Normal" or "View".'))
                     # Cost Centers
-                    if data.get('dest_cc_ids'):
+                    dest_cc_list = []
+                    if data.get('dest_cc_link_ids'):
                         if data.get('allow_all_cc'):
                             raise Exception(_("Please either list the Cost Centers to allow, or allow all Cost Centers."))
-                        dest_cc_list = []
                         split_char = ';'
-                        if split_char not in data.get('dest_cc_ids'):
+                        if split_char not in data.get('dest_cc_link_ids'):
                             split_char = ','
-                        for cost_center in data.get('dest_cc_ids').split(split_char):
+                        for cost_center in data.get('dest_cc_link_ids').split(split_char):
                             cc = cost_center.strip()
                             if cc not in cost_centers_cache:
                                 cc_dom = [('category', '=', 'OC'), ('type', '=', 'normal'), ('code', '=', cc)]
@@ -1059,9 +1114,7 @@
                                 dest_cc_list.append(cc_ids[0])
                             else:
                                 raise Exception(_('Cost Center "%s" not found.') % cc)
-                        data['dest_cc_ids'] = [(6, 0, dest_cc_list)]
-                    else:
-                        data['dest_cc_ids'] = [(6, 0, [])]
+                    self._handle_dest_cc_dates(cr, uid, data, dest_cc_list, dest_cc_tuple_list, context=context)
                     # Accounts
                     if data.get('destination_ids'):  # "destinations_ids" corresponds to G/L accounts...
                         acc_list = []
@@ -1089,8 +1142,6 @@
                             # in case of empty columns on non-required fields, existing values should be deleted
                             if 'date' not in data:
                                 data['date'] = False
-                            if 'dest_cc_ids' not in data:
-                                data['dest_cc_ids'] = [(6, 0, [])]
                             if 'allow_all_cc' not in data:
                                 data['allow_all_cc'] = False
                             if 'destination_ids' not in data:
@@ -1164,6 +1215,7 @@
 
                 data.update(forced_values)
 
+                id_created = False
                 if data.get('comment') == '[DELETE]':
                     impobj.unlink(cr, uid, ids_to_update, context=context)
                     nb_lines_deleted += len(ids_to_update)
@@ -1182,11 +1234,66 @@
                             line_created = impobj.create(cr, uid, data, context=context)
                             lines_already_updated.append(line_created)
                     else:
-                        impobj.create(cr, uid, data, context=context)
+                        id_created = impobj.create(cr, uid, data, context=context)
                     nb_succes += 1
                     processed.append((row_index+1, line_data))
                     if allow_partial:
                         cr.commit()
+                # For Dest CC Links: create, update or delete the links if necessary
+                if import_brw.model_list_selection == 'destinations':
+                    if isinstance(ids_to_update, (int, long)):
+                        ids_to_update = [ids_to_update]
+                    if not dest_cc_tuple_list and ids_to_update:
+                        # UC1: Dest CC Link column empty => delete all current Dest/CC combinations attached to the Dest
+                        old_dcl_ids = dest_cc_link_obj.search(cr, uid, [('dest_id', 'in', ids_to_update)], order='NO_ORDER', context=context)
+                        if old_dcl_ids:
+                            dest_cc_link_obj.unlink(cr, uid, old_dcl_ids, context=context)
+                    else:
+                        # UC2: new dest
+                        if id_created:
+                            for cc, active_date, inactive_date in dest_cc_tuple_list:
+                                dest_cc_link_obj.create(cr, uid, {'cc_id': cc, 'dest_id': id_created,
+                                                                  'active_from': active_date, 'inactive_from': inactive_date},
+                                                        context=context)
+                        elif ids_to_update:
+                            for dest_id in ids_to_update:
+                                dest = acc_analytic_obj.browse(cr, uid, dest_id, fields_to_fetch=['dest_cc_link_ids'], context=context)
+                                current_cc_ids = [dest_cc_link.cc_id.id for dest_cc_link in dest.dest_cc_link_ids]
+                                new_cc_ids = []
+                                for cc, active_date, inactive_date in dest_cc_tuple_list:
+                                    new_cc_ids.append(cc)
+                                    # UC3: new combinations in existing Destinations
+                                    if cc not in current_cc_ids:
+                                        dest_cc_link_obj.create(cr, uid, {'cc_id': cc, 'dest_id': dest_id,
+                                                                          'active_from': active_date, 'inactive_from': inactive_date},
+                                                                context=context)
+                                    else:
+                                        # UC4: combinations to be updated with new dates
+                                        dcl_ids = dest_cc_link_obj.search(cr, uid,
+                                                                          [('dest_id', '=', dest_id), ('cc_id', '=', cc)],
+                                                                          limit=1, context=context)
+                                        if dcl_ids:
+                                            dest_cc_link = dest_cc_link_obj.read(cr, uid, dcl_ids[0],
+                                                                                 ['active_from', 'inactive_from'], context=context)
+                                            if dest_cc_link['active_from']:
+                                                current_active_dt = datetime.strptime(dest_cc_link['active_from'], "%Y-%m-%d")
+                                            else:
+                                                current_active_dt = False
+                                            if dest_cc_link['inactive_from']:
+                                                current_inactive_dt = datetime.strptime(dest_cc_link['inactive_from'], "%Y-%m-%d")
+                                            else:
+                                                current_inactive_dt = False
+                                            if (current_active_dt != active_date) or (current_inactive_dt != inactive_date):
+                                                dest_cc_link_obj.write(cr, uid, dest_cc_link['id'],
+                                                                       {'active_from': active_date, 'inactive_from': inactive_date},
+                                                                       context=context)
+                                # UC5: combinations to be deleted in existing Destinations
+                                cc_to_be_deleted = [c for c in current_cc_ids if c not in new_cc_ids]
+                                if cc_to_be_deleted:
+                                    dcl_to_be_deleted = dest_cc_link_obj.search(cr, uid,
+                                                                                [('dest_id', '=', dest_id), ('cc_id', 'in', cc_to_be_deleted)],
+                                                                                order='NO_ORDER', context=context)
+                                    dest_cc_link_obj.unlink(cr, uid, dcl_to_be_deleted, context=context)
             except (osv.except_osv, orm.except_orm) , e:
                 logging.getLogger('import data').info('Error %s' % e.value)
                 if raise_on_error:

=== modified file 'bin/addons/msf_doc_import/msf_import_export_conf.py'
--- bin/addons/msf_doc_import/msf_import_export_conf.py	2019-05-27 09:37:55 +0000
+++ bin/addons/msf_doc_import/msf_import_export_conf.py	2021-05-07 16:01:07 +0000
@@ -549,7 +549,9 @@
             'type',
             'date_start',
             'date',  # "inactive from"
-            'dest_cc_ids',
+            'dest_cc_link_ids',
+            'dest_cc_link_active_from',
+            'dest_cc_link_inactive_from',
             'destination_ids',
             'allow_all_cc',
         ],

=== modified file 'bin/addons/msf_homere_interface/hr_payroll.py'
--- bin/addons/msf_homere_interface/hr_payroll.py	2020-10-13 10:14:53 +0000
+++ bin/addons/msf_homere_interface/hr_payroll.py	2021-05-07 16:01:07 +0000
@@ -43,6 +43,7 @@
         # Prepare some values
         res = {}
         ad_obj = self.pool.get('analytic.distribution')
+        dest_cc_link_obj = self.pool.get('dest.cc.link')
         # 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',
@@ -84,6 +85,10 @@
                 if dest and dest.filter_active is False:
                     res[line.id] = 'invalid'
                     continue
+            if line.destination_id and line.cost_center_id:
+                if dest_cc_link_obj.is_inactive_dcl(cr, uid, line.destination_id.id, line.cost_center_id.id, line.date, context=context):
+                    res[line.id] = 'invalid'
+                    continue
             # G Check
             if line.funding_pool_id:
                 fp = self.pool.get('account.analytic.account').browse(cr, uid, line.funding_pool_id.id, context={'date': line.document_date})
@@ -202,6 +207,26 @@
             ])
         return to_update
 
+    def _get_trigger_state_dest_cc_link(self, cr, uid, ids, context=None):
+        """
+        Returns the list of Payroll Entries for which the AD state should be re-computed
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        cc_ids = []
+        dest_ids = []
+        payroll_obj = self.pool.get('hr.payroll.msf')
+        for dest_cc_link in self.browse(cr, uid, ids, context=context):
+            cc_ids.append(dest_cc_link.cc_id.id)
+            dest_ids.append(dest_cc_link.dest_id.id)
+        payroll_ids = payroll_obj.search(cr, uid, [('state', '=', 'draft'),
+                                                   '|',
+                                                   ('cost_center_id', 'in', cc_ids),
+                                                   ('destination_id', 'in', dest_ids)], order='NO_ORDER', context=context)
+        return payroll_ids
+
     def _has_third_party(self, cr, uid, ids, name, arg, context=None):
         """
         Returns True if the Payroll entry is linked to either an Employee or a Supplier
@@ -242,12 +267,14 @@
                                               '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', 'allow_all_cc',
-                                                                                                    'dest_cc_ids', 'allow_all_cc_with_fp',
+                                                                                                    '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),
+                                              'dest.cc.link': (_get_trigger_state_dest_cc_link,
+                                                               ['cc_id', 'dest_id', 'active_from', 'inactive_from'], 40),
                                           }
                                           ),
         'partner_type': fields.function(_get_third_parties, type='reference', method=True, string="Third Parties", readonly=True,

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2021-02-25 15:48:01 +0000
+++ bin/addons/msf_profile/data/patches.xml	2021-05-07 16:01:07 +0000
@@ -647,9 +647,17 @@
             <field name="method">us_6796_hide_prod_status_inconsistencies</field>
         </record>
 
+<<<<<<< TREE
         <record id="us_8166_hide_consolidated_sm_report" model="patch.scripts">
             <field name="method">us_8166_hide_consolidated_sm_report</field>
         </record>
 
+=======
+        <!-- UF21.0 -->
+        <record id="us_7295_update_new_dest_cc_link" model="patch.scripts">
+            <field name="method">us_7295_update_new_dest_cc_link</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2021-05-06 15:52:15 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2021-05-07 16:01:07 +0000
@@ -21113,6 +21113,7 @@
 #: report:kitting.order.report:0
 #: field:replenishment.inventory.review.line.exp,name:0
 #: field:replenishment.segment.line.amc.month_exp,name:0
+#: view:account.analytic.account:0
 #, python-format
 msgid "Name"
 msgstr "Nom"
@@ -34812,6 +34813,7 @@
 #: field:products.situation.report,p_code:0
 #: report:addons/msf_tools/report/report_stock_pipe_per_product_instance_xls.mako:86
 #: field:account.target.costcenter,cost_center_code:0
+#: view:account.analytic.account:0
 #, python-format
 msgid "Code"
 msgstr "Code"
@@ -44531,9 +44533,10 @@
 msgid "No donation account found for this line: %s. (product: %s)"
 msgstr "No donation account found for this line: %s. (product: %s)"
 
-#. modules: account, base
+#. modules: account, base, analytic_override
 #: view:account.addtmpl.wizard:0
 #: view:res.widget.wizard:0
+#: view:multiple.cc.selection.wizard:0
 msgid "Add"
 msgstr "Ajouter"
 
@@ -47155,7 +47158,7 @@
 #: code:addons/analytic_distribution/wizard/commitment_analytic_reallocation.py:140
 #, python-format
 msgid "Non compatible entries found: %s"
-msgstr "Non compatible entries found: %s"
+msgstr "Ecritures non compatibles trouvées : %s"
 
 #. modules: delivery_mechanism, tender_flow, analytic_distribution_supply, product_nomenclature, return_claim, sync_client, res_currency_tables, supplier_catalogue, import_data, stock_batch_recall, stock, product, reason_types_moves, consumption_calculation, register_accounting, specific_rules, kit, base, account_period_closing_level, account_subscription, msf_cross_docking, purchase, account, msf_outgoing, resource, procurement_auto, msf_config_locations, sale, account_override, sourcing, sync_so, res_currency_functional, account_hq_entries
 #: code:addons/account/account.py:445
@@ -66095,6 +66098,9 @@
 #: report:addons/account/report/free_allocation_report.mako:176
 #: field:free.allocation.wizard,cost_center_ids:0
 #: field:account.analytic.account,dest_cc_ids:0
+#: field:account.analytic.account,dest_cc_link_ids:0
+#: view:multiple.cc.selection.wizard:0
+#: field:multiple.cc.selection.wizard,cc_ids:0
 msgid "Cost Centers"
 msgstr "Centres de Coût"
 
@@ -80576,6 +80582,7 @@
 #: code:addons/register_accounting/wizard/wizard_register_import.py:570
 #: report:addons/account/report/free_allocation_report.mako:205
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:606
+#: field:dest.cc.link,cc_id:0
 #, python-format
 msgid "Cost Center"
 msgstr "Centre de Coût"
@@ -94527,6 +94534,8 @@
 #: 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
+#: field:dest.cc.link,dest_id:0
+#: field:multiple.cc.selection.wizard,dest_id:0
 #, python-format
 msgid "Destination"
 msgstr "Destination"
@@ -95899,7 +95908,7 @@
 msgid "Search Uninvoiced Lines"
 msgstr "Rechercher Lignes non-facturées"
 
-#. modules: res_currency_functional, financing_contract, msf_tools, account_hq_entries, account_override, product_attributes, base_report_designer, register_accounting, procurement_cycle, msf_accrual, finance, sync_client, purchase_followup, account_mcdb, res_currency_tables, supplier_catalogue, procurement_request, purchase_compare_rfq, board, stock_override, msf_doc_import, analytic_distribution, threshold_value, msf_homere_interface, msf_instance, account_reconciliation, consumption_calculation, purchase_override, specific_rules, kit, base, account_period_closing_level, msf_currency_revaluation, msf_supply_doc_export, product_list, procurement_report, msf_budget, account_corrections, account, msf_outgoing, stock_move_tracking, purchase_allocation_report, procurement_auto, documents_done, sale, msf_config_locations, sales_followup, vertical_integration, procurement, sourcing, purchase, msf_audittrail, tender_flow, stock, msf_profile
+#. modules: res_currency_functional, financing_contract, msf_tools, account_hq_entries, account_override, product_attributes, base_report_designer, register_accounting, procurement_cycle, msf_accrual, finance, sync_client, purchase_followup, account_mcdb, res_currency_tables, supplier_catalogue, procurement_request, purchase_compare_rfq, board, stock_override, msf_doc_import, analytic_distribution, threshold_value, msf_homere_interface, msf_instance, account_reconciliation, consumption_calculation, purchase_override, specific_rules, kit, base, account_period_closing_level, msf_currency_revaluation, msf_supply_doc_export, product_list, procurement_report, msf_budget, account_corrections, account, msf_outgoing, stock_move_tracking, purchase_allocation_report, procurement_auto, documents_done, sale, msf_config_locations, sales_followup, vertical_integration, procurement, sourcing, purchase, msf_audittrail, tender_flow, stock, msf_profile, analytic_override
 #: view:account.addtmpl.wizard:0
 #: view:account.aged.trial.balance:0
 #: view:account.analytic.Journal.report:0
@@ -96133,6 +96142,7 @@
 #: view:product.stock_out:0
 #: view:replenishment.parent.segment:0
 #: view:view.expired.expiring.stock:0
+#: view:multiple.cc.selection.wizard:0
 #, python-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -99911,6 +99921,12 @@
 msgstr "%s: FP inactif (%s)"
 
 #. module: account_hq_entries
+#: code:addons/account_hq_entries/hq_entries.py:94
+#, python-format
+msgid "%s: inactive combination (%s - %s)"
+msgstr "%s: combinaison inactive (%s - %s)"
+
+#. module: account_hq_entries
 #: field:hq.entries,is_account_partner_compatible:0
 msgid "Account and partner compatible ?"
 msgstr "Compte et partenaire compatibles ?"
@@ -100222,11 +100238,23 @@
 msgstr "Date du CC"
 
 #. module: analytic_distribution
+#: code:addons/analytic_distribution/analytic_line.py:563
+#, python-format
+msgid "DEST/CC combination date"
+msgstr "Date de la combinaison DEST/CC"
+
+#. module: analytic_distribution
 #: code:addons/analytic_distribution/analytic_line.py:548
 #, python-format
 msgid "FP date"
 msgstr "Date du FP"
 
+#. module: analytic_distribution
+#: code:addons/analytic_distribution/analytic_distribution.py:237
+#, python-format
+msgid "Inactive DEST/CC combination"
+msgstr "Combinaison DEST/CC inactive"
+
 #. module: msf_printed_documents
 #: code:addons/msf_printed_documents/report/report_reception.py:80
 #, python-format
@@ -112023,3 +112051,124 @@
 #, python-format
 msgid "You must have at least one line to create the Internal Move"
 msgstr "Vous devez avoir au moins une ligne pour pouvoir créer le Mouvement Interne"
+
+#. module: analytic_distribution
+#: view:account.analytic.account:0
+msgid "Remove all"
+msgstr "Supprimer tout"
+
+#. module: analytic_distribution
+#: view:account.analytic.account:0
+msgid "Do you really want to remove all the Cost Centers selected?"
+msgstr "Voulez-vous vraiment supprimer tous les Centres de Coût sélectionnés ?"
+
+#. modules: analytic_override, analytic_distribution
+#: view:account.analytic.account:0
+#: view:multiple.cc.selection.wizard:0
+msgid "Add several Cost Centers"
+msgstr "Ajouter plusieurs Centres de Coût"
+
+#. modules: msf_doc_import, analytic_override
+#: field:account.analytic.account,dest_cc_link_active_from:0
+#: field:dest.cc.link,active_from:0
+#: code:addons/msf_doc_import/msf_import_export.py:639
+#, python-format
+msgid "Activation Combination Dest / CC from"
+msgstr "Activation Combinaison Dest / CC à partir du"
+
+#. modules: msf_doc_import, analytic_override
+#: field:account.analytic.account,dest_cc_link_inactive_from:0
+#: field:dest.cc.link,inactive_from:0
+#: code:addons/msf_doc_import/msf_import_export.py:640
+#, python-format
+msgid "Inactivation Combination Dest / CC from"
+msgstr "Inactivation Combinaison Dest / CC à partir du"
+
+#. module: analytic_override
+#: help:account.analytic.account,dest_cc_link_active_from:0
+#: help:account.analytic.account,dest_cc_link_inactive_from:0
+msgid "Technical field used for Import Tools only"
+msgstr "Champ technique utilisé pour les Outils d'Import uniquement"
+
+#. module: analytic_override
+#: field:account.analytic.account,selected_in_dest:0
+msgid "Selected in Destination"
+msgstr "Sélectionné dans la Destination"
+
+#. module: analytic_override
+#: model:ir.model,name:analytic_override.model_dest_cc_link
+msgid "Destination / Cost Center Combination"
+msgstr "Combinaison Destination / Centre de Coût"
+
+#. module: analytic_override
+#: field:dest.cc.link,cc_code:0
+msgid "Cost Center Code"
+msgstr "Code du Centre de Coût"
+
+#. module: analytic_override
+#: field:dest.cc.link,cc_name:0
+msgid "Cost Center Name"
+msgstr "Nom du Centre de Coût"
+
+#. module: analytic_override
+#: sql_constraint:dest.cc.link:0
+msgid "Each Cost Center can only be added once to the same Destination."
+msgstr "Chaque Centre de Coût ne peut être ajouté qu'une seule fois à une même Destination."
+
+#. module: analytic_override
+#: sql_constraint:dest.cc.link:0
+msgid "The Activation date of the \"Combination Dest / CC\" must be before the Inactivation date."
+msgstr "La date d'Activation de la \"Combinaison Dest / CC\" doit précéder la date d'Inactivation."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:663
+#, python-format
+msgid "The number of dates in the column \"%s\" exceeds the number of Cost Centers indicated."
+msgstr "Le nombre de dates dans la colonne \"%s\" dépasse le nombre de Centres de Coût indiqués."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:679
+#, python-format
+msgid "The activation date related to the Cost Center %s must be before the inactivation date."
+msgstr "La date d'activation associée au Centre de Coût %s doit précéder la date d'inactivation."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:657
+#, python-format
+msgid "The dates in the column \"%s\" should use the format YYYY-MM-DD."
+msgstr "Les dates dans la colonne \"%s\" doivent utiliser le format AAAA-MM-JJ."
+
+#. module: analytic_override
+#: view:multiple.cc.selection.wizard:0
+msgid "This wizard enables you to select several Cost Centers at once to be added to the Destination. The activation and inactivation dates of the related Dest / CC combinations will remain empty."
+msgstr "Cet assistant vous permet de sélectionner en une fois plusieurs Centres de Coût à ajouter à la Destination. Les dates d'activation et d'inactivation des Combinaisons Dest / CC associées resteront vides."
+
+#. module: analytic_override
+#: field:dest.cc.link,current_id:0
+msgid "DB Id (used by the UI)"
+msgstr "Id BD (utilisé par l'UI)"
+
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_line.py:192
+#, python-format
+msgid "The combination \"%s - %s\" is not active."
+msgstr "La combinaison \"%s - %s\" n'est pas active."
+
+#. module: analytic_distribution
+#: code:addons/analytic_distribution/wizard/analytic_distribution_wizard.py:1024
+#: code:addons/analytic_distribution/account_commitment.py:204
+#, python-format
+msgid "The combination \"%s - %s\" is not active at this date: %s"
+msgstr "La combinaison \"%s - %s\" n'est pas active à cette date : %s"
+
+#. module: analytic_distribution
+#: code:addons/analytic_distribution/analytic_distribution.py:264
+#, python-format
+msgid "%sThe combination \"%s - %s\" is not active at this date: %s"
+msgstr "%sLa combinaison \"%s - %s\" n'est pas active à cette date : %s"
+
+#. module: analytic_override
+#: code:addons/analytic_override/dest_cc_link.py:72
+#, python-format
+msgid "At least one Analytic Journal Item using the combination \"%s - %s\" has a Posting Date outside the activation dates selected."
+msgstr "Au moins une Ligne d'Ecriture Analytique utilisant la combinaison \"%s - %s\" a une Date de Comptabilisation en dehors des dates d'activation sélectionnées."

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2021-05-05 07:42:20 +0000
+++ bin/addons/msf_profile/msf_profile.py	2021-05-07 16:01:07 +0000
@@ -52,6 +52,7 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     # UF21.0
     def us_8166_hide_consolidated_sm_report(self, cr, uid, *a, **b):
         instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
@@ -61,6 +62,22 @@
         self.pool.get('ir.ui.menu').write(cr, uid, consolidated_sm_report_menu_id, {'active': instance.level == 'coordo'}, context={})
         return True
 
+=======
+    # UF21.0
+    def us_7295_update_new_dest_cc_link(self, cr, uid, *a, **b):
+        """
+        CC Tab of the Destinations: replaces the old field "dest_cc_ids" by the new field "dest_cc_link_ids"
+        => recreates the links without activation/inactivation dates
+        """
+        cr.execute("""
+                   INSERT INTO dest_cc_link(dest_id, cc_id)
+                   SELECT destination_id, cost_center_id FROM destination_cost_center_rel
+                   """)
+        cr.execute("DELETE FROM destination_cost_center_rel")
+        self._logger.warn('Destinations: %s Dest CC Links generated.', cr.rowcount)
+        return True
+
+>>>>>>> MERGE-SOURCE
     # UF20.0
     def us_7866_fill_in_target_cc_code(self, cr, uid, *a, **b):
         """

=== 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	2021-04-12 09:46:40 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2021-05-07 16:01:07 +0000
@@ -34,6 +34,7 @@
 msf_sync_data_server.fys_state,TRUE,TRUE,TRUE,TRUE,bidirectional,Up,[],"['state', 'fy_id/id', 'instance_id/id']",HQ + MISSION,account.fiscalyear.state,,Fiscal years states,Valid,,130
 msf_sync_data_server.cost_center_cc_intermission,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('category' , '=' , 'OC'), ('code', '=', 'cc-intermission')]","['category', 'code', 'date', 'date_start', 'description',  'name', 'type']",OC,account.analytic.account,,CC-Intermission,Valid,,140
 msf_sync_data_server.destination_cc,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('category' , '=' , 'DEST')]","['dest_cc_ids/id', 'allow_all_cc']",OC,account.analytic.account,,Destinations: Cost Center fields,Valid,,145
+msf_sync_data_server.dest_cc_link,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,"[]","['dest_id/id', 'cc_id/id', 'active_from', 'inactive_from']",OC,dest.cc.link,cc_id,Destination / Cost Center Combinations,Valid,,146
 msf_sync_data_server.gl_accounts_reconciliation,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['reconciliation_debit_account_id/id', 'reconciliation_credit_account_id/id']",OC,account.account,,GL Accounts Reconciliation Accounts,Valid,,150
 msf_sync_data_server.analytic_distribution,FALSE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,[],['name'],HQ + MISSION,analytic.distribution,,Analytic Distribution,Valid,,200
 msf_sync_data_server.cost_center_distribution_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,"[('partner_type','=','internal')]","['amount', 'analytic_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'partner_type', 'source_date']",HQ + MISSION,cost.center.distribution.line,analytic_id,Cost Center Distribution Line - Internal partner,Valid,,201

=== modified file 'bin/addons/sync_client/update.py'
--- bin/addons/sync_client/update.py	2021-01-18 14:22:04 +0000
+++ bin/addons/sync_client/update.py	2021-05-07 16:01:07 +0000
@@ -58,6 +58,7 @@
     'account.mcdb',
     'wizard.template',
     'account.analytic.account',
+    'dest.cc.link',
 ]
 
 

=== modified file 'bin/addons/sync_common/common.py'
--- bin/addons/sync_common/common.py	2020-10-20 07:15:50 +0000
+++ bin/addons/sync_common/common.py	2021-05-07 16:01:07 +0000
@@ -168,6 +168,7 @@
     'cash.request.liquidity.total',
     'hr.payment.method',
     'wizard.template',
+    'dest.cc.link',
 ]
 
 OC_LIST = ['OCA', 'OCB', 'OCBA', 'OCG', 'OCP']

=== modified file 'bin/addons/sync_so/specific_xml_id.py'
--- bin/addons/sync_so/specific_xml_id.py	2020-11-09 10:40:25 +0000
+++ bin/addons/sync_so/specific_xml_id.py	2021-05-07 16:01:07 +0000
@@ -307,6 +307,30 @@
 
 account_analytic_account()
 
+class dest_cc_link(osv.osv):
+    _inherit = 'dest.cc.link'
+
+    def get_destination_name(self, cr, uid, ids, dest_field, context=None):
+        '''
+            same destination as CC
+        '''
+        if not ids:
+            return []
+
+        if isinstance(ids, (long, int)):
+            ids = [ids]
+        res = dict.fromkeys(ids, False)
+        mapping = {}
+        uniq_cc_ids = {}
+        for dest_cc_link in self.browse(cr, uid, ids, fields_to_fetch=['cc_id'], context=context):
+            mapping[dest_cc_link.id] = dest_cc_link.cc_id.id
+            uniq_cc_ids[dest_cc_link.cc_id.id] = True
+        cc_destination = self.pool.get('account.analytic.account').get_destination_name(cr, uid, uniq_cc_ids.keys(), 'category', context)
+        for dest_cc_link_id in mapping:
+            res[dest_cc_link_id] = cc_destination.get(mapping[dest_cc_link_id], [])
+        return res
+
+dest_cc_link()
 
 #US-113: Sync only to the mission with attached prop instance
 class financing_contract_contract(osv.osv):

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2021-02-02 10:20:51 +0000
+++ bin/osv/orm.py	2021-05-07 16:01:07 +0000
@@ -733,12 +733,21 @@
 
                                 if no_data:
                                     dt = ''
+                                    rel_table_name = r[0]._table_name
+                                    name_relation = self.pool.get(rel_table_name)._rec_name
+                                    if isinstance(r[0][name_relation], browse_record):
+                                        rel = True
+                                        rel_table_name = r[0][name_relation]._table_name
+                                        all_rr = [rr[name_relation].id for rr in r]
+                                    else:
+                                        rel = False
+                                        all_rr = [rr.id for rr in r]
+                                    all_name_get = dict(self.pool.get(rel_table_name).name_get(cr, uid, all_rr, context=context))
                                     for rr in r:
-                                        name_relation = self.pool.get(rr._table_name)._rec_name
-                                        if isinstance(rr[name_relation], browse_record):
-                                            rr = rr[name_relation]
-                                        rr_name = self.pool.get(rr._table_name).name_get(cr, uid, [rr.id], context=context)
-                                        rr_name = rr_name and rr_name[0] and rr_name[0][1] or ''
+                                        if not rel:
+                                            rr_name = all_name_get.get(rr.id, '')
+                                        else:
+                                            rr_name = all_name_get.get(rr[name_relation].id, '')
                                         dt += tools.ustr(rr_name or '') + ','
                                     data[fpos] = dt[:-1]
                                     break