Merge lp:~julie-w/unifield-server/US-5771 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	2018-09-28 16:00:25 +0000
+++ bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2019-05-06 14:14:05 +0000
@@ -148,6 +148,7 @@
             context = {}
         # Prepare some values
         wizard = self.browse(cr, uid, wizard_id)
+        ad_obj = self.pool.get('analytic.distribution')
         company_currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
         ml = wizard.move_line_id
         orig_date = ml.source_date or ml.date
@@ -240,6 +241,11 @@
                     break
 
         for wiz_line in self.pool.get('analytic.distribution.wizard.fp.lines').browse(cr, uid, wiz_line_ids):
+            if not ad_obj.check_dest_cc_compatibility(cr, uid, wiz_line.destination_id.id, wiz_line.cost_center_id.id, context=context):
+                raise osv.except_osv(_('Error'),
+                                     _('The Cost Center %s is not compatible with the Destination %s.') %
+                                     (wiz_line.cost_center_id.code or '', wiz_line.destination_id.code or ''))
+
             if not wiz_line.distribution_line_id or wiz_line.distribution_line_id.id not in old_line_ids:
                 # new distribution line
                 #if self.pool.get('account.analytic.account').is_blocked_by_a_contract(cr, uid, [wiz_line.analytic_id.id]):

=== modified file 'bin/addons/account_hq_entries/hq_entries.py'
--- bin/addons/account_hq_entries/hq_entries.py	2019-03-07 10:00:29 +0000
+++ bin/addons/account_hq_entries/hq_entries.py	2019-05-06 14:14:05 +0000
@@ -42,6 +42,7 @@
         # Prepare some values
         res = {}
         logger = netsvc.Logger()
+        ad_obj = self.pool.get('analytic.distribution')
         # 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',
@@ -57,6 +58,7 @@
         # E/ DEST in list of available DEST in ACCOUNT
         # F/ Check posting date with cost center and destination if exists
         # G/ Check document date with funding pool
+        # H/ Check Cost Center / Destination compatibility
         ## CASES where FP is filled in (or not) and/or DEST is filled in (or not).
         ## CC is mandatory, so always available:
         # 1/ no FP, no DEST => Distro = valid
@@ -132,6 +134,14 @@
                     res[line.id] = 'invalid'
                     logger.notifyChannel('account_hq_entries', netsvc.LOG_WARNING, _('%s: DEST (%s) not compatible with account (%s)') % (line.id or '', line.destination_id.code or '', account.code or ''))
                     continue
+            # H check
+            if line.destination_id and line.cost_center_id and \
+                    not ad_obj.check_dest_cc_compatibility(cr, uid, line.destination_id.id, line.cost_center_id.id, context=context):
+                res[line.id] = 'invalid'
+                logger.notifyChannel('account_hq_entries', netsvc.LOG_WARNING,
+                                     _('%s: CC (%s) not compatible with DEST (%s)') %
+                                     (line.id or '', line.cost_center_id.code or '', line.destination_id.code or ''))
+                continue
         return res
 
     def _get_cc_changed(self, cr, uid, ids, field_name, arg, context=None):

=== modified file 'bin/addons/analytic_distribution/account.py'
--- bin/addons/analytic_distribution/account.py	2018-09-18 12:25:20 +0000
+++ bin/addons/analytic_distribution/account.py	2019-05-06 14:14:05 +0000
@@ -120,80 +120,9 @@
     _columns = {
         'account_id': fields.many2one('account.account', "G/L Account"),
         'funding_pool_id': fields.many2one('account.analytic.account', 'Funding Pool'),
+        'destination_id': fields.many2one('account.analytic.account', 'Destination'),
     }
 
-    def fields_get(self, cr, uid, fields=None, context=None, with_uom_rounding=False):
-        fields = super(account_destination_summary, self).fields_get(cr, uid, fields, context)
-        dest_obj = self.pool.get('account.analytic.account')
-        destination_ids = dest_obj.search(cr, uid, [('type', '!=', 'view'), ('category', '=', 'DEST'), ('parent_id', '!=', False)])
-        for dest in dest_obj.read(cr, uid, destination_ids, ['name']):
-            fields['dest_%s'%(dest['id'])] = {'type': 'boolean', 'string': dest['name']}
-        return fields
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        view = super(account_destination_summary, self).fields_view_get(cr, uid, view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
-        if view_type == 'tree':
-            fields_to_add = []
-            form = etree.fromstring(view['arch'])
-            tree = form.xpath('//tree')
-            for field in view.get('fields', {}):
-                if field.startswith('dest_'):
-                    fields_to_add.append(int(field.split('_')[1]))
-
-            if fields_to_add:
-                for dest_order in self.pool.get('account.analytic.account').search(cr, uid, [('id', 'in', fields_to_add)], order='name'):
-                    new_field = etree.Element('field', attrib={'name': 'dest_%d'%dest_order})
-                    tree[0].append(new_field)
-            view['arch'] = etree.tostring(form)
-        return view
-
-    def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
-        first = False
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-            first = True
-        if fields_to_read is None:
-            fields_to_read = []
-        ret = super(account_destination_summary, self).read(cr, uid, ids, fields_to_read, context, load)
-        f_to_read = []
-        for field in fields_to_read:
-            if field.startswith('dest_'):
-                f_to_read.append(field)
-
-        if f_to_read:
-            cr.execute('''
-                SELECT
-                    sum.id,
-                    l.destination_id
-                FROM
-                    account_destination_link l,
-                    account_destination_summary sum,
-                    funding_pool_associated_destinations d
-                WHERE
-                    l.disabled = 'f' and
-                    d.tuple_id = l.id and
-                    sum.account_id = l.account_id and
-                    sum.funding_pool_id = d.funding_pool_id and
-                    sum.id in %s
-                ''',(tuple(ids),)
-            )
-            tmp_result = {}
-            for x in cr.fetchall():
-                tmp_result.setdefault(x[0], []).append(x[1])
-
-            for x in ret:
-                for dest in tmp_result.get(x['id'], []):
-                    x['dest_%s'%(dest,)] = True
-                for false_value in f_to_read:
-                    if false_value not in x:
-                        x[false_value] = False
-
-        if first:
-            return ret[0]
-        return ret
-
-
-
     def init(self, cr):
         # test if id exists in funding_pool_associated_destinations or create it
         cr.execute("SELECT attr.attname FROM pg_attribute attr, pg_class class WHERE attr.attrelid = class.oid AND class.relname = 'funding_pool_associated_destinations' AND attr.attname='id'")
@@ -206,7 +135,8 @@
                 SELECT
                     min(d.id) AS id,
                     l.account_id AS account_id,
-                    d.funding_pool_id AS funding_pool_id
+                    d.funding_pool_id AS funding_pool_id,
+                    l.destination_id AS destination_id
                 FROM
                     account_destination_link l,
                     funding_pool_associated_destinations d
@@ -214,10 +144,10 @@
                     d.tuple_id = l.id and
                     l.disabled = 'f'
                 GROUP BY
-                    l.account_id,d.funding_pool_id
+                    l.account_id, d.funding_pool_id, l.destination_id
             )
         """)
-    _order = 'account_id'
+    _order = 'funding_pool_id, account_id, destination_id'
 account_destination_summary()
 
 class account_account(osv.osv):

=== modified file 'bin/addons/analytic_distribution/analytic_account_view.xml'
--- bin/addons/analytic_distribution/analytic_account_view.xml	2018-04-03 13:02:04 +0000
+++ bin/addons/analytic_distribution/analytic_account_view.xml	2019-05-06 14:14:05 +0000
@@ -97,9 +97,6 @@
                             <separator/>
                             <field name="tuple_destination_account_ids" nolabel="1" context="{'dest_in_use':tuple_destination_account_ids}"/>
                         </page>
-                        <page string="Destinations by accounts" attrs="{'invisible': [('category', '!=', 'FUNDING')]}">
-                            <field name="tuple_destination_summary" nolabel="1" readonly="1"/>
-                        </page>
                         <page string="Expense accounts" attrs="{'invisible': [('category', '!=', 'DEST')]}">
                             <field name="destination_ids" nolabel="1" domain="[('type', '!=', 'view'), ('is_analytic_addicted', '=', True)]" context="{'destination_id': record_id}">
                                 <tree string="Expenses accounts list" colors="red:inactivated_for_dest">
@@ -111,6 +108,17 @@
                                 </tree>
                             </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"/>
+                            <separator/>
+                            <field name="dest_cc_ids" nolabel="1" colspan="4" on_change="on_change_dest_cc_ids(dest_cc_ids)">
+                                <tree string="Cost Centers">
+                                    <field name="code"/>
+                                    <field name="name"/>
+                                </tree>
+                            </field>
+                        </page>
                     </page>
                 </data>
             </field>
@@ -121,8 +129,10 @@
             <field name="model">account.destination.summary</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Destinations by accounts">
+                <tree string="Destinations by accounts" hide_new_button="1" hide_edit_button="1" hide_delete_button="1">
+                    <field name="funding_pool_id"/>
                     <field name="account_id" />
+                    <field name="destination_id"/>
                 </tree>
             </field>
         </record>
@@ -275,6 +285,67 @@
             <field name="context">{'search_default_active': 1, 'filter_inactive_accounts': 1, 'from_web': True, 'display_disabled': 1}</field>
         </record>
 
+        <!-- Destinations by accounts Search view -->
+        <record id="view_account_destination_summary_search" model="ir.ui.view">
+            <field name="name">account.destination.summary.search</field>
+            <field name="model">account.destination.summary</field>
+            <field name="type">search</field>
+            <field name="priority" eval="16"/>
+            <field name="arch" type="xml">
+                <search>
+                    <group>
+                        <field name="funding_pool_id" domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING')]"/>
+                        <field name="account_id" domain="[('type', '!=', 'view'), ('is_analytic_addicted', '=', True)]"/>
+                        <field name="destination_id" domain="[('type', '!=', 'view'), ('category', '=', 'DEST')]"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Funding Pool" name="group_funding_pool_id"
+                                icon="terp-folder-blue" domain="[]" context="{'group_by':'funding_pool_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="G/L account" name="group_account_id"
+                                icon="terp-folder-orange" domain="[]" context="{'group_by':'account_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Destination" name="group_destination_id"
+                                icon="terp-folder-violet" domain="[]" context="{'group_by':'destination_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!-- Destinations by accounts Form view -->
+        <record id="view_account_destination_summary_form" model="ir.ui.view">
+            <field name="name">account.destination.summary.form</field>
+            <field name="model">account.destination.summary</field>
+            <field name="type">form</field>
+            <field name="priority" eval="16"/>
+            <field name="arch" type="xml">
+                <!-- this form must be read-only: acc/dest links must be created in the Destination tab of the FP -->
+                <form noteditable="1" hide_delete_button="1" hide_new_button="1">
+                    <field name="funding_pool_id"/>
+                    <newline/>
+                    <field name="account_id"/>
+                    <field name="destination_id"/>
+                </form>
+            </field>
+        </record>
+
+        <!-- Destinations by accounts Menu entry -->
+        <record id="action_analytic_acc_dest_summary" model="ir.actions.server">
+            <field name="name">Destinations by accounts</field>
+            <field name="model_id" ref="model_account_analytic_account"/>
+            <field name="state">code</field>
+            <field name="code">action = obj.get_destinations_by_accounts(context=context)</field>
+        </record>
+        <record id="ir_destinations_by_accounts_search" model="ir.values">
+            <field name="key2">client_action_relate</field>
+            <field name="model">account.analytic.account</field>
+            <field name="name">destinations_by_accounts</field>
+            <field eval="'ir.actions.server,%d'%action_analytic_acc_dest_summary" name="value"/>
+            <field eval="True" name="object"/>
+            <field name="sequence" eval="110"/>
+        </record>
+
         <menuitem action="action_account_analytic_account_form"
                   id="account.account_analytic_def_account"
                   parent="account.menu_analytic_accounting"

=== modified file 'bin/addons/analytic_distribution/analytic_distribution.py'
--- bin/addons/analytic_distribution/analytic_distribution.py	2019-03-28 15:40:47 +0000
+++ bin/addons/analytic_distribution/analytic_distribution.py	2019-05-06 14:14:05 +0000
@@ -26,6 +26,22 @@
     _name = 'analytic.distribution'
     _inherit = 'analytic.distribution'
 
+    def check_dest_cc_compatibility(self, cr, uid, destination_id, cost_center_id, context=None):
+        """
+        Checks the compatibility between the Destination and the Cost Center (cf. CC tab in the Destination form).
+        Returns False if they aren't compatible.
+        """
+        if context is None:
+            context = {}
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        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
+
     def _get_distribution_state(self, cr, uid, distrib_id, parent_id, account_id, context=None):
         """
         Return distribution state
@@ -51,17 +67,23 @@
         except ValueError:
             fp_id = 0
         account = self.pool.get('account.account').read(cr, uid, account_id, ['destination_ids'])
-        # Check Cost Center lines with destination/account link
+        # Check Cost Center lines regarding destination/account and destination/CC links
         for cc_line in distrib.cost_center_lines:
             if cc_line.destination_id.id not in account.get('destination_ids', []):
                 return 'invalid'
+            if not self.check_dest_cc_compatibility(cr, uid, cc_line.destination_id.id,
+                                                    cc_line.analytic_id and cc_line.analytic_id.id or False, context=context):
+                return 'invalid'
         # Check Funding pool lines regarding:
         # - destination / account
+        # - destination / cost center
         # - If analytic account is MSF Private funds
         # - Cost center and funding pool compatibility
         for fp_line in distrib.funding_pool_lines:
             if fp_line.destination_id.id not in account.get('destination_ids', []):
                 return 'invalid'
+            if not self.check_dest_cc_compatibility(cr, uid, fp_line.destination_id.id, fp_line.cost_center_id.id, context=context):
+                return 'invalid'
             # If fp_line is MSF Private Fund, all is ok
             if fp_line.analytic_id.id == fp_id:
                 continue
@@ -96,6 +118,9 @@
         # Check that destination is compatible with account
         if destination_id not in [x.id for x in account.destination_ids]:
             return 'invalid', _('Destination not compatible with account')
+        # Check that Destination and Cost Center are compatible
+        if not self.check_dest_cc_compatibility(cr, uid, destination_id, cost_center_id, context=context):
+            return 'invalid', _('Cost Center not compatible with destination')
         if not is_private_fund:
             # Check that cost center is compatible with FP (except if FP is MSF Private Fund)
             if cost_center_id not in [x.id for x in fp.cost_center_ids]:

=== modified file 'bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml'
--- bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml	2018-06-22 09:57:41 +0000
+++ bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml	2019-05-06 14:14:05 +0000
@@ -10,8 +10,10 @@
             <field name="arch" type='xml'>
                 <tree string="" editable="top">
                     <field name="is_percentage_amount_touched" invisible="1" />
+                    <field name="analytic_id" domain="[('type', '!=', 'view'), ('category', '=', 'OC'), ('state', '=', 'open')]"
+                           string="Cost Center"
+                           context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('posting_date')}"/>
                     <field name="destination_id" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('posting_date')}"/>
-                    <field name="analytic_id" domain="[('type', '!=', 'view'), ('category', '=', 'OC'), ('state', '=', 'open')]" string="Cost Center" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('posting_date')}"/>
                     <field name="percentage" sum="Total Percentage" digits="(16,2)"/>
                     <field name="amount" sum="Total Amount"/>
                 </tree>
@@ -25,9 +27,13 @@
             <field name="arch" type='xml'>
                 <tree string="" editable="top">
                     <field name="is_percentage_amount_touched" invisible="1" />
-                    <field name="destination_id" on_change="onchange_destination(destination_id, analytic_id, parent.account_id)" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('posting_date')}"/>
-                    <field name="cost_center_id" on_change="onchange_cost_center(cost_center_id, analytic_id)" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('posting_date')}"/>
-                    <field name="analytic_id" domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open'), ('cost_center_ids', '=', cost_center_id)]" string="Funding Pool" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('document_date')}"/>
+                    <field name="cost_center_id" on_change="onchange_cost_center(cost_center_id, analytic_id)"
+                           context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('posting_date')}"/>
+                    <field name="destination_id" on_change="onchange_destination(destination_id, analytic_id, parent.account_id)"
+                           context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('posting_date')}"/>
+                    <field name="analytic_id"
+                           domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open'), ('cost_center_ids', '=', cost_center_id)]"
+                           string="Funding Pool" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('document_date')}"/>
                     <field name="percentage" sum="Total Percentage" digits="(16,2)"/>
                     <field name="amount" sum="Total Amount"/>
                 </tree>

=== modified file 'bin/addons/analytic_distribution/analytic_line.py'
--- bin/addons/analytic_distribution/analytic_line.py	2018-08-21 13:08:14 +0000
+++ bin/addons/analytic_distribution/analytic_line.py	2019-05-06 14:14:05 +0000
@@ -401,6 +401,7 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
         # Prepare some value
+        ad_obj = self.pool.get('analytic.distribution')
         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 = []
@@ -442,12 +443,13 @@
                 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 aline.account_id and aline.account_id.id == msf_private_fund:
-                    res.append(aline.id)
-                elif aline.account_id and aline.cost_center_id and aline.account_id.cost_center_ids:
-                    if account_id in [x and x.id for x in aline.account_id.cost_center_ids] or aline.account_id.id == msf_private_fund:
+                if ad_obj.check_dest_cc_compatibility(cr, uid, aline.destination_id and aline.destination_id.id or False,
+                                                      account_id, context=context):
+                    if aline.account_id and aline.account_id.id == msf_private_fund:
                         res.append(aline.id)
+                    elif aline.account_id and aline.cost_center_id and aline.account_id.cost_center_ids:
+                        if account_id in [x and x.id for x in aline.account_id.cost_center_ids] or aline.account_id.id == msf_private_fund:
+                            res.append(aline.id)
         elif account_type == 'FUNDING':
             fp = self.pool.get('account.analytic.account').read(cr, uid, account_id, ['cost_center_ids', 'tuple_destination_account_ids'], context=context)
             cc_ids = fp and fp.get('cost_center_ids', []) or []
@@ -473,7 +475,8 @@
                     res.append(aline.id)
         elif account_type == "DEST":
             for aline in self.browse(cr, uid, ids, context=context):
-                if aline.general_account_id and 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 \
+                        aline.general_account_id and account_id in [x.id for x in aline.general_account_id.destination_ids]:
                     res.append(aline.id)
         else:
             # Case of FREE1 and FREE2 lines
@@ -507,6 +510,7 @@
                         new_dest_id, new_dest_br,
                         new_cc_id, new_cc_br,
                         new_fp_id, new_fp_br):
+            ad_obj = self.pool.get('analytic.distribution')
             if not general_account_br.is_analytic_addicted:
                 res.append((id, entry_sequence, ''))
                 return False
@@ -518,6 +522,12 @@
                 res.append((id, entry_sequence, _('DEST')))
                 return False
 
+            # check cost center with destination
+            if new_dest_id and new_cc_id:
+                if not ad_obj.check_dest_cc_compatibility(cr, uid, new_dest_id, new_cc_id, context=context):
+                    res.append((id, entry_sequence, _('CC/DEST')))
+                    return False
+
             # check funding pool (expect for MSF Private Fund)
             if not new_fp_id == msf_pf_id:  # all OK for MSF Private Fund
                 # - cost center and funding pool compatibility

=== modified file 'bin/addons/analytic_distribution/report/funding_pool.py'
--- bin/addons/analytic_distribution/report/funding_pool.py	2014-10-29 16:27:26 +0000
+++ bin/addons/analytic_distribution/report/funding_pool.py	2019-05-06 14:14:05 +0000
@@ -21,7 +21,6 @@
 
 from report import report_sxw
 import locale
-import pooler
 import time
 
 class funding(report_sxw.rml_parse):
@@ -29,37 +28,11 @@
         super(funding, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'locale': locale,
-            'getDest': self.getDestinations,
-            'getBoolDest': self.getBoolDest,
             'today': self.today,
         })
 
     def today(self):
         return time.strftime('%Y-%m-%d',time.localtime())
 
-    def getDestinations(self):
-        """
-        Fetch destination analytic account:
-          * ID
-          * code
-        Then sort by code
-        """
-        res = [('Code', False), ('Name', False)] # We need the 2 first column header name
-        pool = pooler.get_pool(self.cr.dbname)
-        destination_ids = pool.get('account.analytic.account').search(self.cr, self.uid, [('category', '=', 'DEST'), ('type', '!=', 'view')], order='id')
-        data = pool.get('account.analytic.account').read(self.cr, self.uid, destination_ids, ['code'])
-        res += [(x.get('code'), x.get('id')) for x in data]
-        return res
-
-    def getBoolDest(self, line, o):
-        pool = pooler.get_pool(self.cr.dbname)
-        fields = []
-        for field in pool.get('account.destination.summary').fields_get(self.cr, self.uid, ['account_id']):
-            fields.append(field)
-        r = pool.get('account.destination.summary').read(self.cr, self.uid, line.id, fields)
-        if r[o]:
-            return 'x'
-        return ''
-
 report_sxw.report_sxw('report.funding.pool', 'account.analytic.account', 'addons/analytic_distribution/report/funding_pool.rml', parser=funding)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/analytic_distribution/report/funding_pool.rml'
--- bin/addons/analytic_distribution/report/funding_pool.rml	2017-08-28 12:25:59 +0000
+++ bin/addons/analytic_distribution/report/funding_pool.rml	2019-05-06 14:14:05 +0000
@@ -62,13 +62,7 @@
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -202,22 +196,22 @@
     </para>
     <para style="P6">Cost centers:</para>
 
-    <blockTable colWidths="260.0,258.0" style="Table11" repeatRows="1">
+    <blockTable colWidths="260.0,260.0" style="Table11" repeatRows="1">
       <tr>
         <td>
-          <para style="P2" alignment="LEFT">Cost center name</para>
+          <para style="P8">Cost center code</para>
         </td>
         <td>
-          <para style="P2" alignment="LEFT">Cost center code</para>
+          <para style="P8">Cost center name</para>
         </td>
       </tr>
         <tr>
       <para style="P17">[[repeatIn(o.cost_center_ids,'line')]]</para>
           <td>
-            <para style="P3" alignment="LEFT">[[ line.name ]]</para>
+            <para style="P7">[[ line.code or '' ]]</para>
           </td>
           <td>
-            <para style="P3" alignment="LEFT">[[ line.code ]]</para>
+            <para style="P7">[[ line.name or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -228,31 +222,37 @@
     <para style="P8">
       <font color="white"> </font>
     </para>
-    <para style="P6">Accounts:</para>
+    <para style="P6">Account/Destination:</para>
 
-    <!-- Seems that its not possible to change colWidths regarding a condition.
-         Cf. https://www.odoo.com/forum/help-1/question/reportlab-conditional-table-header-15143
-         Previous colWidths: colWidths="40.0,260.0,55.0,55.0,55.0,55.0"
-    -->
-    <blockTable repeatRows="1" style="Table4">
+    <blockTable repeatRows="1" style="Table4" colWidths="95.0,165.0,95.0,165.0">
       <tr>
         <td>
-        [[repeatIn(getDest(),'dest_data','td')]]
-          <para style="P24" alignment="CENTER">[[ dest_data[0] ]]</para>
+          <para style="P8">Account code</para>
+        </td>
+        <td>
+          <para style="P8">Account name</para>
+        </td>
+        <td>
+          <para style="P8">Destination code</para>
+        </td>
+        <td>
+          <para style="P8">Destination name</para>
         </td>
       </tr>
 
       <tr>
       [[repeatIn(o.tuple_destination_summary,'line')]]
         <td>
-          <para style="P16" alignment="LEFT">[[ line.account_id and line.account_id.code ]]</para>
-        </td>
-        <td>
-          <para style="P11" alignment="LEFT">[[ line.account_id and line.account_id.name ]]</para>
-        </td>
-        <td>
-        [[repeatIn(getDest()[2:],'dest_data','td')]]
-          <para style="P28" alignment="CENTER">[[ getBoolDest(line,'dest_'+ str(dest_data[1])) ]]</para>
+          <para style="P7">[[ line.account_id and line.account_id.code or '' ]]</para>
+        </td>
+        <td>
+          <para style="P7">[[ line.account_id and line.account_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="P7">[[ line.destination_id and line.destination_id.code or '' ]]</para>
+        </td>
+        <td>
+          <para style="P7">[[ line.destination_id and line.destination_id.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py'
--- bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2018-09-28 16:00:25 +0000
+++ bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2019-05-06 14:14:05 +0000
@@ -159,6 +159,18 @@
         percentage = abs((amount / total_amount) * 100)
         return {'value': {'percentage': percentage, 'is_percentage_amount_touched': True}}
 
+    def _dest_compatible_with_cc_domain_part(self, tree):
+        """
+        Returns the domain condition to restrict the destination regarding the cost_center_id (for finance views),
+        or if this field doesn't exist in the view, to the analytic_id (Cost Center in Supply views)
+        """
+        dom_part = ""
+        if tree.xpath('/tree/field[@name="cost_center_id"]'):
+            dom_part = "('dest_compatible_with_cc_ids', '=', cost_center_id)"
+        elif tree.xpath('/tree/field[@name="analytic_id"]'):
+            dom_part = "('dest_compatible_with_cc_ids', '=', analytic_id)"
+        return dom_part
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
         Rewrite view in order:
@@ -195,9 +207,14 @@
                             or (context.get('direct_invoice_id', False) and isinstance(context.get('direct_invoice_id'), int)) \
                             or (context.get('from_move', False) and isinstance(context.get('from_move'), int)) \
                             or (context.get('from_cash_return', False) and isinstance(context.get('from_cash_return'), int)):
-                        field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'DEST')]")
+                        domain_part = self._dest_compatible_with_cc_domain_part(tree)
+                        domain = "[('type', '!=', 'view'), ('category', '=', 'DEST') %s]" % (domain_part and ', %s' % domain_part or '')
+                        field.set('domain', domain)
                     else:
-                        field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'DEST'), ('destination_ids', '=', parent.account_id)]")
+                        domain_part = self._dest_compatible_with_cc_domain_part(tree)
+                        domain = "[('type', '!=', 'view'), ('category', '=', 'DEST'), " \
+                                 "('destination_ids', '=', parent.account_id) %s]" % (domain_part and ', %s' % domain_part or '')
+                        field.set('domain', domain)
             ## FUNDING POOL
             if line_type == 'analytic.distribution.wizard.fp.lines':
                 # Change OC field
@@ -235,9 +252,14 @@
                             or (context.get('from_move', False) and isinstance(context.get('from_move'), int)) \
                             or (context.get('from_cash_return', False) and isinstance(context.get('from_cash_return'), int)):
 
-                        field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'DEST')]")
+                        domain_part = self._dest_compatible_with_cc_domain_part(tree)
+                        domain = "[('type', '!=', 'view'), ('category', '=', 'DEST') %s]" % (domain_part and ', %s' % domain_part or '')
+                        field.set('domain', domain)
                     else:
-                        field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('category', '=', 'DEST'), ('destination_ids', '=', parent.account_id)]")
+                        domain_part = self._dest_compatible_with_cc_domain_part(tree)
+                        domain = "[('type', '!=', 'view'), ('category', '=', 'DEST'), " \
+                                 "('destination_ids', '=', parent.account_id) %s]" % (domain_part and ', %s' % domain_part or '')
+                        field.set('domain', domain)
 
             ## FREE 1
             if line_type == 'analytic.distribution.wizard.f1.lines':

=== modified file 'bin/addons/analytic_override/analytic_account.py'
--- bin/addons/analytic_override/analytic_account.py	2019-03-20 10:39:41 +0000
+++ bin/addons/analytic_override/analytic_account.py	2019-05-06 14:14:05 +0000
@@ -211,6 +211,28 @@
                 account_ids += tmp_ids
         return account_ids
 
+    def _search_dest_compatible_with_cc_ids(self, cr, uid, obj, name, args, context=None):
+        """
+        Returns a domain with all destinations compatible with the selected Cost Center
+        Ex: to get the dest. compatible with the CC 2, use the dom [('dest_compatible_with_cc_ids', '=', 2)]
+        """
+        dom = []
+        if context is None:
+            context = {}
+        for arg in args:
+            if arg[0] == 'dest_compatible_with_cc_ids':
+                operator = arg[1]
+                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)
+                dom.append(('id', 'in', compatible_dest_ids))
+        return dom
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=1),
         'code': fields.char('Code', size=24),
@@ -228,11 +250,20 @@
         'filter_active': fields.function(_get_active, fnct_search=_search_filter_active, type="boolean", method=True, store=False, string="Show only active analytic accounts",),
         'intermission_restricted': fields.function(_get_fake, type="boolean", method=True, store=False, string="Domain to restrict intermission cc"),
         'balance': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Balance', digits_compute=dp.get_precision('Account'), multi='debit_credit_bal_qtty'),
+        'dest_cc_ids': fields.many2many('account.analytic.account', 'destination_cost_center_rel',
+                                        'destination_id', 'cost_center_id', string='Cost Centers',
+                                        domain="[('type', '!=', 'view'), ('category', '=', 'OC')]"),
+        'allow_all_cc': fields.boolean(string="Allow all Cost Centers"),
+        'dest_compatible_with_cc_ids': fields.function(_get_fake, method=True, store=False,
+                                                       string='Destinations compatible with the Cost Center',
+                                                       type='many2many', relation='account.analytic.account',
+                                                       fnct_search=_search_dest_compatible_with_cc_ids),
     }
 
     _defaults ={
         'date_start': lambda *a: (datetime.today() + relativedelta(months=-3)).strftime('%Y-%m-%d'),
         'for_fx_gain_loss': lambda *a: False,
+        'allow_all_cc': lambda *a: False,
     }
 
     def _check_code_unicity(self, cr, uid, ids, context=None):
@@ -304,6 +335,30 @@
         res['domain']['parent_id'] = [('category', '=', category), ('type', '=', 'view')]
         return res
 
+    def on_change_allow_all_cc(self, cr, uid, ids, allow_all_cc, dest_cc_ids, context=None):
+        """
+        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
+        """
+        res = {}
+        if allow_all_cc and dest_cc_ids and dest_cc_ids[0][2]:  # e.g. [(6, 0, [1, 2])]
+            warning = {
+                'title': _('Warning!'),
+                'message': _('Please remove the Cost Centers linked to the Destination before ticking this box.')
+            }
+            res['warning'] = warning
+            res['value'] = {'allow_all_cc': False, }
+        return res
+
+    def on_change_dest_cc_ids(self, cr, uid, ids, dest_cc_ids, context=None):
+        """
+        If at least a CC is selected, unticks the box "Allow all Cost Centers"
+        """
+        res = {}
+        if dest_cc_ids and dest_cc_ids[0][2]:  # e.g. [(6, 0, [1, 2])]
+            res['value'] = {'allow_all_cc': False, }
+        return res
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if not context:
             context = {}
@@ -377,6 +432,8 @@
         if 'category' in vals:
             if vals['category'] != 'DEST':
                 vals['destination_ids'] = [(6, 0, [])]
+                vals['dest_cc_ids'] = [(6, 0, [])]
+                vals['allow_all_cc'] = False  # default value
             if vals['category'] != 'FUNDING':
                 vals['tuple_destination_account_ids'] = [(6, 0, [])]
                 vals['cost_center_ids'] = [(6, 0, [])]
@@ -408,6 +465,7 @@
         default['child_ids'] = [] # do not copy the child_ids
         default['tuple_destination_summary'] = []
         default['line_ids'] = []
+        default['dest_cc_ids'] = []
         return super(analytic_account, self).copy(cr, uid, a_id, default, context=context)
 
     def _check_name_unicity(self, cr, uid, ids, context=None):
@@ -568,9 +626,41 @@
         self.write(cr, uid, ids, {'cost_center_ids':[(6, 0, [])]}, context=context)
         return True
 
+    def button_dest_cc_clear(self, cr, uid, ids, context=None):
+        """
+        Removes all Cost Centers selected in the Destination view
+        """
+        self.write(cr, uid, ids, {'dest_cc_ids': [(6, 0, [])]}, context=context)
+        return True
+
     def button_dest_clear(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'tuple_destination_account_ids':[(6, 0, [])]}, context=context)
         return True
 
+    def get_destinations_by_accounts(self, cr, uid, ids, context=None):
+        """
+        Returns a view with the Destinations by accounts (for the FP selected if any, otherwise for all the FP)
+        """
+        if context is None:
+            context = {}
+        ir_model_obj = self.pool.get('ir.model.data')
+        active_ids = context.get('active_ids', [])
+        if active_ids:
+            analytic_acc_category = self.browse(cr, uid, active_ids[0], fields_to_fetch=['category'], context=context).category or ''
+            if analytic_acc_category == 'FUNDING':
+                context.update({'search_default_funding_pool_id': active_ids[0]})
+        search_view_id = ir_model_obj.get_object_reference(cr, uid, 'analytic_distribution', 'view_account_destination_summary_search')
+        search_view_id = search_view_id and search_view_id[1] or False
+        return {
+            'name': _('Destinations by accounts'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.destination.summary',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'search_view_id': [search_view_id],
+            'context': context,
+            'target': 'current',
+        }
+
 analytic_account()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2019-01-03 09:17:52 +0000
+++ bin/addons/msf_doc_import/account.py	2019-05-06 14:14:05 +0000
@@ -194,6 +194,7 @@
             self.pool.get('msf.doc.import.accounting.lines').unlink(cr, uid, old_lines_ids)
 
             # Check wizard data
+            ad_obj = self.pool.get('analytic.distribution')
             period_obj = self.pool.get('account.period')
             period_ctx = context.copy()
             period_ctx['extend_december'] = True
@@ -485,6 +486,10 @@
                             errors.append(_('Line %s. The destination %s is not compatible with the account %s.') %
                                           (current_line_num, line[cols['Destination']], line[cols['G/L Account']]))
                             continue
+                        if not ad_obj.check_dest_cc_compatibility(cr, uid, r_destination, r_cc, context=context):
+                            errors.append(_('Line %s. The Cost Center %s is not compatible with the Destination %s.') %
+                                          (current_line_num, line[cols['Cost Centre']], line[cols['Destination']]))
+                            continue
                         # if the Fund. Pool used is NOT "PF" check the compatibility with the (account, dest) and the CC
                         if r_fp != msf_fp_id:
                             fp_fields = ['tuple_destination_account_ids', 'cost_center_ids']

=== modified file 'bin/addons/msf_doc_import/msf_import_export.py'
--- bin/addons/msf_doc_import/msf_import_export.py	2018-11-16 10:06:13 +0000
+++ bin/addons/msf_doc_import/msf_import_export.py	2019-05-06 14:14:05 +0000
@@ -633,6 +633,7 @@
         model = MODEL_DICT[import_brw.model_list_selection]['model']
         impobj = self.pool.get(model)
         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')
 
         import_data_obj = self.pool.get('import_data')
@@ -930,11 +931,20 @@
                     if len(ids_to_update) > 1:
                         raise Exception('%d records found for rule=%s, model=%s' % (len(ids_to_update), data.get('name'), data.get('model_id')))
 
-                # Analytic Accounts
-                if import_brw.model_list_selection == 'analytic_accounts':
+                # Funding Pools
+                if import_brw.model_list_selection == 'funding_pools':
                     context['from_import_menu'] = True
+                    data['category'] = 'FUNDING'
+                    # Parent Analytic Account
+                    if data.get('parent_id'):
+                        parent_id = acc_analytic_obj.browse(cr, uid, data['parent_id'],
+                                                            fields_to_fetch=['type', 'category'], context=context)
+                        parent_type = parent_id.type or ''
+                        parent_category = parent_id.category or ''
+                        if parent_type != 'view' or parent_category != 'FUNDING':
+                            raise Exception(_('The Parent Analytic Account must be a View type Funding Pool.'))
                     # Cost Centers
-                    if data.get('cost_center_ids') and data.get('category', '') == 'FUNDING':
+                    if data.get('cost_center_ids'):
                         cc_list = []
                         for cost_center in data.get('cost_center_ids').split(','):
                             cc = cost_center.strip()
@@ -949,7 +959,7 @@
                     else:
                         data['cost_center_ids'] = [(6, 0, [])]
                     # Account/Destination
-                    if data.get('tuple_destination_account_ids') and data.get('category', '') == 'FUNDING':
+                    if data.get('tuple_destination_account_ids'):
                         dest_acc_list = []
                         for destination_account in data.get('tuple_destination_account_ids').split(','):
                             dest_acc_ids = []
@@ -969,6 +979,115 @@
                     else:
                         data['tuple_destination_account_ids'] = [(6, 0, [])]
 
+                # Destinations
+                if import_brw.model_list_selection == 'destinations':
+                    context['from_import_menu'] = True
+                    data['category'] = 'DEST'
+                    # Parent Analytic Account
+                    if data.get('parent_id'):
+                        parent_id = acc_analytic_obj.browse(cr, uid, data['parent_id'], fields_to_fetch=['type', 'category'], context=context)
+                        parent_type = parent_id.type or ''
+                        parent_category = parent_id.category or ''
+                        if parent_type != 'view' or parent_category != 'DEST':
+                            raise Exception(_('The Parent Analytic Account must be a View type Destination.'))
+                    # Type
+                    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'):
+                        if data.get('allow_all_cc'):
+                            raise Exception(_("Please either list the Cost Centers to allow, or allow all Cost Centers."))
+                        dest_cc_list = []
+                        for cost_center in data.get('dest_cc_ids').split(','):
+                            cc = cost_center.strip()
+                            cc_dom = [('category', '=', 'OC'), ('type', '=', 'normal'),
+                                      '|', ('code', '=', cc), ('name', '=', cc)]
+                            cc_ids = impobj.search(cr, uid, cc_dom, order='id', limit=1, context=context)
+                            if cc_ids:
+                                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, [])]
+                    # Accounts
+                    if data.get('destination_ids'):  # "destinations_ids" corresponds to G/L accounts...
+                        acc_list = []
+                        for account in data.get('destination_ids').split(','):
+                            acc = account.strip()
+                            acc_dom = [('type', '!=', 'view'), ('is_analytic_addicted', '=', True), ('code', '=', acc)]
+                            acc_ids = acc_obj.search(cr, uid, acc_dom, order='id', limit=1, context=context)
+                            if acc_ids:
+                                acc_list.append(acc_ids[0])
+                            else:
+                                raise Exception(_("Account code \"%s\" doesn't exist or isn't allowed.") % acc)
+                        data['destination_ids'] = [(6, 0, acc_list)]
+                    else:
+                        data['destination_ids'] = [(6, 0, [])]
+                    # if the code matches with an existing destination: update it
+                    if data.get('code'):
+                        ids_to_update = impobj.search(cr, uid, [('category', '=', 'DEST'), ('code', '=', data['code'])],
+                                                      limit=1, context=context)
+                        if ids_to_update:
+                            # 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:
+                                data['destination_ids'] = [(6, 0, [])]
+                            elif data['destination_ids'][0][2]:
+                                # accounts already linked to the destination:
+                                # - if they don't appear in the new list: will be automatically de-activated
+                                # - if they appear in the list: must be re-activated if they are currently disabled
+                                link_ids = acc_dest_obj.search(cr, uid,
+                                                               [('account_id', 'in', data['destination_ids'][0][2]),
+                                                                ('destination_id', '=', ids_to_update[0]),
+                                                                ('disabled', '=', True)], context=context)
+                                if link_ids:
+                                    acc_dest_obj.write(cr, uid, link_ids, {'disabled': False}, context=context)
+
+                # Cost Centers
+                if import_brw.model_list_selection == 'cost_centers':
+                    context['from_import_menu'] = True
+                    data['category'] = 'OC'
+                    # Parent Analytic Account
+                    if data.get('parent_id'):
+                        parent_id = acc_analytic_obj.browse(cr, uid, data['parent_id'],
+                                                            fields_to_fetch=['type', 'category'], context=context)
+                        parent_type = parent_id.type or ''
+                        parent_category = parent_id.category or ''
+                        if parent_type != 'view' or parent_category != 'OC':
+                            raise Exception(_('The Parent Analytic Account must be a View type Cost Center.'))
+
+                # Free 1
+                if import_brw.model_list_selection == 'free1':
+                    context['from_import_menu'] = True
+                    data['category'] = 'FREE1'
+                    # Parent Analytic Account
+                    if data.get('parent_id'):
+                        parent_id = acc_analytic_obj.browse(cr, uid, data['parent_id'],
+                                                            fields_to_fetch=['type', 'category'], context=context)
+                        parent_type = parent_id.type or ''
+                        parent_category = parent_id.category or ''
+                        if parent_type != 'view' or parent_category != 'FREE1':
+                            raise Exception(_('The Parent Analytic Account must be a View type Free 1 account.'))
+
+                # Free 2
+                if import_brw.model_list_selection == 'free2':
+                    context['from_import_menu'] = True
+                    data['category'] = 'FREE2'
+                    # Parent Analytic Account
+                    if data.get('parent_id'):
+                        parent_id = acc_analytic_obj.browse(cr, uid, data['parent_id'],
+                                                            fields_to_fetch=['type', 'category'], context=context)
+                        parent_type = parent_id.type or ''
+                        parent_category = parent_id.category or ''
+                        if parent_type != 'view' or parent_category != 'FREE2':
+                            raise Exception(_('The Parent Analytic Account must be a View type Free 2 account.'))
+
                 if import_brw.model_list_selection == 'record_rules':
                     if not data.get('groups'):
                         data['groups'] = [(6, 0, [])]

=== modified file 'bin/addons/msf_doc_import/msf_import_export_conf.py'
--- bin/addons/msf_doc_import/msf_import_export_conf.py	2018-10-03 14:41:22 +0000
+++ bin/addons/msf_doc_import/msf_import_export_conf.py	2019-05-06 14:14:05 +0000
@@ -95,8 +95,28 @@
         'domain_type': 'finance',
         'model': 'account.journal'
     },
-    'analytic_accounts': {
-        'name': 'Analytic Accounts',
+    'funding_pools': {
+        'name': 'Funding Pools',
+        'domain_type': 'finance',
+        'model': 'account.analytic.account'
+    },
+    'destinations': {
+        'name': 'Destinations',
+        'domain_type': 'finance',
+        'model': 'account.analytic.account'
+    },
+    'cost_centers': {
+        'name': 'Cost Centers',
+        'domain_type': 'finance',
+        'model': 'account.analytic.account'
+    },
+    'free1': {
+        'name': 'Free 1',
+        'domain_type': 'finance',
+        'model': 'account.analytic.account'
+    },
+    'free2': {
+        'name': 'Free 2',
         'domain_type': 'finance',
         'model': 'account.analytic.account'
     },
@@ -466,11 +486,10 @@
             'analytic_journal_id.name',
         ],
     },
-    'analytic_accounts': {
+    'funding_pools': {
         'header_list': [
             'name',
             'code',
-            'category',
             'parent_id.code',
             'type',
             'date_start',
@@ -482,7 +501,74 @@
         'required_field_list': [
             'name',
             'code',
-            'category',
+            'parent_id.code',
+            'date_start',
+        ],
+    },
+    'cost_centers': {
+        'header_list': [
+            'name',
+            'code',
+            'parent_id.code',
+            'type',
+            'date_start',
+            'date',  # "inactive from"
+        ],
+        'required_field_list': [
+            'name',
+            'code',
+            'parent_id.code',
+            'date_start',
+        ],
+    },
+    'destinations': {
+        'header_list': [
+            'name',
+            'code',
+            'parent_id.code',
+            'type',
+            'date_start',
+            'date',  # "inactive from"
+            'dest_cc_ids',
+            'destination_ids',
+            'allow_all_cc',
+        ],
+        'required_field_list': [
+            'name',
+            'code',
+            'parent_id.code',
+            'type',
+            'date_start',
+        ],
+    },
+    'free1': {
+        'header_list': [
+            'name',
+            'code',
+            'parent_id.code',
+            'type',
+            'date_start',
+            'date',  # "inactive from"
+        ],
+        'required_field_list': [
+            'name',
+            'code',
+            'parent_id.code',
+            'date_start',
+        ],
+    },
+    'free2': {
+        'header_list': [
+            'name',
+            'code',
+            'parent_id.code',
+            'type',
+            'date_start',
+            'date',  # "inactive from"
+        ],
+        'required_field_list': [
+            'name',
+            'code',
             'parent_id.code',
             'date_start',
         ],

=== modified file 'bin/addons/msf_homere_interface/hr.py'
--- bin/addons/msf_homere_interface/hr.py	2019-02-06 09:47:00 +0000
+++ bin/addons/msf_homere_interface/hr.py	2019-05-06 14:14:05 +0000
@@ -208,6 +208,22 @@
         (_check_unicity, "Another employee has the same Identification No.", ['identification_id']),
     ]
 
+    def _check_employe_dest_cc_compatibility(self, cr, uid, employee_id, context=None):
+        """
+        Raises an error in case the employee Destination and Cost Center are not compatible
+        """
+        if context is None:
+            context = {}
+        ad_obj = self.pool.get('analytic.distribution')
+        employee_fields = ['destination_id', 'cost_center_id', 'name_resource']
+        employee = self.browse(cr, uid, employee_id, fields_to_fetch=employee_fields, context=context)
+        emp_dest = employee.destination_id
+        emp_cc = employee.cost_center_id
+        if emp_dest and emp_cc:
+            if not ad_obj.check_dest_cc_compatibility(cr, uid, emp_dest.id, emp_cc.id, context=context):
+                raise osv.except_osv(_('Error'), _('Employee %s: the Cost Center %s is not compatible with the Destination %s.') %
+                                     (employee.name_resource, emp_cc.code or '', emp_dest.code or ''))
+
     def create(self, cr, uid, vals, context=None):
         """
         Block creation for local staff if no 'from' in context
@@ -228,7 +244,9 @@
             # Raise an error if employee is created manually
             if (not context.get('from', False) or context.get('from') not in ['yaml', 'import']) and not context.get('sync_update_execution', False) and not allow_edition:
                 raise osv.except_osv(_('Error'), _('You are not allowed to create a local staff! Please use Import to create local staff.'))
-        return super(hr_employee, self).create(cr, uid, vals, context)
+        employee_id = super(hr_employee, self).create(cr, uid, vals, context)
+        self._check_employe_dest_cc_compatibility(cr, uid, employee_id, context=context)
+        return employee_id
 
     def write(self, cr, uid, ids, vals, context=None):
         """
@@ -277,6 +295,7 @@
             employee_id = super(hr_employee, self).write(cr, uid, emp.id, new_vals, context)
             if employee_id:
                 res.append(employee_id)
+            self._check_employe_dest_cc_compatibility(cr, uid, emp.id, context=context)
         return res
 
     def unlink(self, cr, uid, ids, context=None):
@@ -322,6 +341,11 @@
             fields = form.xpath('/' + view_type + '//field[@name="cost_center_id"]')
             for field in fields:
                 field.set('domain', "[('type', '!=', 'view'), ('state', '=', 'open'), ('id', 'child_of', [%s])]" % oc_id)
+            # Change DEST field
+            dest_fields = form.xpath('/' + view_type + '//field[@name="destination_id"]')
+            for dest_field in dest_fields:
+                dest_field.set('domain', "[('category', '=', 'DEST'), ('type', '!=', 'view'), "
+                                         "('dest_compatible_with_cc_ids', '=', cost_center_id)]")
             # Change FP field
             try:
                 fp_id = data_obj.get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]

=== modified file 'bin/addons/msf_homere_interface/hr_payroll.py'
--- bin/addons/msf_homere_interface/hr_payroll.py	2018-10-30 15:33:33 +0000
+++ bin/addons/msf_homere_interface/hr_payroll.py	2019-05-06 14:14:05 +0000
@@ -42,6 +42,7 @@
             ids = [ids]
         # Prepare some values
         res = {}
+        ad_obj = self.pool.get('analytic.distribution')
         # 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',
@@ -57,6 +58,7 @@
         # E/ DEST in list of available DEST in ACCOUNT
         # F/ Check posting date with cost center and destination if exists
         # G/ Check document date with funding pool
+        # H/ Check Cost Center / Destination compatibility
         ## CASES where FP is filled in (or not) and/or DEST is filled in (or not).
         ## CC is mandatory, so always available:
         # 1/ no FP, no DEST => Distro = valid
@@ -124,6 +126,11 @@
                 if line.destination_id.id not in [x.id for x in account.destination_ids]:
                     res[line.id] = 'invalid'
                     continue
+            # H check
+            if line.destination_id and line.cost_center_id and \
+                    not ad_obj.check_dest_cc_compatibility(cr, uid, line.destination_id.id, line.cost_center_id.id, context=context):
+                res[line.id] = 'invalid'
+                continue
         return res
 
     def _get_third_parties(self, cr, uid, ids, field_name=None, arg=None, context=None):

=== modified file 'bin/addons/msf_homere_interface/hr_payroll_wizard.xml'
--- bin/addons/msf_homere_interface/hr_payroll_wizard.xml	2019-01-21 09:53:32 +0000
+++ bin/addons/msf_homere_interface/hr_payroll_wizard.xml	2019-05-06 14:14:05 +0000
@@ -13,8 +13,11 @@
             <field name="arch" type="xml">
                 <form string="Analytic Reallocation">
                     <group  colspan="6" col="6">
-                        <field name="destination_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
-                        <field name="cost_center_id" on_change="onchange_cost_center(cost_center_id, funding_pool_id)" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
+                        <field name="cost_center_id" on_change="onchange_cost_center(cost_center_id, funding_pool_id)"
+                               context="{'search_default_active': 1, 'hide_inactive': 1}"/>
+                        <field name="destination_id" context="{'search_default_active': 1, 'hide_inactive': 1}"
+                               domain="[('category', '=', 'DEST'), ('type', '!=', 'view'),
+                                        ('dest_compatible_with_cc_ids', '=', cost_center_id)]"/>
                         <field name="funding_pool_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
                     </group>
                     <newline/>

=== modified file 'bin/addons/msf_homere_interface/hr_view.xml'
--- bin/addons/msf_homere_interface/hr_view.xml	2018-08-21 19:39:57 +0000
+++ bin/addons/msf_homere_interface/hr_view.xml	2019-05-06 14:14:05 +0000
@@ -27,8 +27,8 @@
                     <field name="homere_codeterrain" invisible="1"/>
                 </group>
                 <group colspan="4" col="8">
-                  <field name="destination_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
                     <field name="cost_center_id" on_change="onchange_cc(cost_center_id, funding_pool_id)" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
+                    <field name="destination_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
                     <field name="funding_pool_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
                     <newline />
                     <field name="free1_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2019-03-28 13:22:15 +0000
+++ bin/addons/msf_profile/data/patches.xml	2019-05-06 14:14:05 +0000
@@ -411,5 +411,10 @@
             <field name="method">us_5667_remove_contract_workflow</field>
         </record>
 
+        <!-- UF13.0 -->
+        <record id="us_5771_allow_all_cc_in_default_dest" model="patch.scripts">
+            <field name="method">us_5771_allow_all_cc_in_default_dest</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-04-08 09:30:07 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-05-06 14:14:05 +0000
@@ -5227,8 +5227,9 @@
 msgid "Close period (Mission)"
 msgstr "Clôturer la Période (Mission)"
 
-#. module: msf_budget
+#. modules: msf_budget, analytic_distribution
 #: report:addons/msf_budget/report/report_local_expenses_xls.mako:116
+#: report:funding.pool:0
 msgid "Account name"
 msgstr "Nom du compte"
 
@@ -16477,6 +16478,7 @@
 #: view:threshold.value:0
 #: view:international.transport.cost.report:0
 #: view:local.transport.cost.report:0
+#: view:account.destination.summary:0
 msgid "Group By..."
 msgstr "Grouper Par..."
 
@@ -16779,7 +16781,7 @@
 #. module: analytic_distribution
 #: view:account.analytic.account:0
 msgid "Remove all"
-msgstr "Remove all"
+msgstr "Tout supprimer"
 
 #. module: vertical_integration
 #: code:addons/vertical_integration/report/hq_report_oca.py:176
@@ -31372,9 +31374,10 @@
 msgid "Type of file"
 msgstr "Type de fichier"
 
-#. module: msf_budget
+#. modules: msf_budget, analytic_distribution
 #: report:addons/msf_budget/report/report_local_expenses_xls.mako:115
 #: field:msf.budget.line,account_code:0
+#: report:funding.pool:0
 msgid "Account code"
 msgstr "Code du compte"
 
@@ -38475,6 +38478,7 @@
 #: field:hr.payroll.msf,funding_pool_id:0
 #: field:account.invoice.line,funding_pool_id:0
 #: report:addons/account/report/free_allocation_report.mako:208
+#: view:account.destination.summary:0
 #, python-format
 msgid "Funding Pool"
 msgstr "Funding Pool"
@@ -47675,10 +47679,11 @@
 msgid "America/Sitka"
 msgstr "America/Sitka"
 
-#. module: account
+#. modules: account, analytic_distribution
 #: view:account.analytic.line:0
+#: view:account.destination.summary:0
 msgid "G/L account"
-msgstr "G/L account"
+msgstr "Compte Grand Livre"
 
 #. modules: account, register_accounting
 #: help:account.invoice,state:0
@@ -67403,6 +67408,7 @@
 #: view:msf.instance:0
 #: 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
 msgid "Cost Centers"
 msgstr "Centres de Coût"
 
@@ -86607,10 +86613,12 @@
 msgid "Total weight:"
 msgstr "Total weight:"
 
-#. module: analytic_distribution
+#. modules: analytic_distribution, analytic_override
 #: view:account.analytic.account:0
 #: view:account.destination.summary:0
 #: model:ir.model,name:analytic_distribution.model_account_destination_summary
+#: model:ir.actions.server,name:analytic_distribution.action_analytic_acc_dest_summary
+#: code:addons/analytic_override/analytic_account.py:652
 msgid "Destinations by accounts"
 msgstr "Destinations par Compte"
 
@@ -91150,8 +91158,8 @@
 
 #. module: analytic_distribution
 #: report:funding.pool:0
-msgid "Accounts:"
-msgstr "Comptes:"
+msgid "Account/Destination:"
+msgstr "Compte / Destination :"
 
 #. module: msf_outgoing
 #: help:return.pack.shipment.processor,address_id:0
@@ -96457,6 +96465,8 @@
 #: view:sync.client.message_to_send:0
 #: report:addons/account/report/free_allocation_report.mako:202
 #: report:addons/stock_override/report/report_stock_move_xls.mako:143
+#: field:account.destination.summary,destination_id:0
+#: view:account.destination.summary:0
 #, python-format
 msgid "Destination"
 msgstr "Destination"
@@ -102110,6 +102120,12 @@
 msgstr "%s: DEST (%s) incompatible avec le compte (%s)"
 
 #. module: account_hq_entries
+#: code:addons/account_hq_entries/hq_entries.py:142
+#, python-format
+msgid "%s: CC (%s) not compatible with DEST (%s)"
+msgstr "%s : CC (%s) non compatible avec la DEST (%s)"
+
+#. module: account_hq_entries
 #: code:addons/account_hq_entries/hq_entries.py:103
 #, python-format
 msgid "%s: No CC"
@@ -105388,3 +105404,113 @@
 #, python-format
 msgid "Product %s, BN: %s not enough stock to process quantity %s %s (stock level: %s)"
 msgstr "Produit %s, Lot: %s, pas assez de stock pour traiter la qantité %s %s (quantité en stock: %s)"
+
+#. module: analytic_distribution
+#: code:addons/analytic_distribution/analytic_distribution.py:123
+#, python-format
+msgid "Cost Center not compatible with destination"
+msgstr "Centre de Coût non compatible avec la destination"
+
+#. module: analytic_distribution
+#: code:addons/analytic_distribution/analytic_line.py:528
+#, python-format
+msgid "CC/DEST"
+msgstr "CC / DEST"
+
+#. module: analytic_distribution
+#: report:funding.pool:0
+msgid "Destination code"
+msgstr "Code de la destination"
+
+#. module: analytic_distribution
+#: report:funding.pool:0
+msgid "Destination name"
+msgstr "Nom de la destination"
+
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_account.py:227
+#, python-format
+msgid "Filter not implemented on Destinations."
+msgstr "Filtre non mis en oeuvre sur les Destinations."
+
+#. module: analytic_override
+#: field:account.analytic.account,allow_all_cc:0
+msgid "Allow all Cost Centers"
+msgstr "Autoriser tous les Centres de Coût"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:999
+#, python-format
+msgid "Please either list the Cost Centers to allow, or allow all Cost Centers."
+msgstr "Veuillez soit lister les Centres de Coût à autoriser, soit autoriser tous les Centres de Coût."
+
+#. module: analytic_override
+#: field:account.analytic.account,dest_compatible_with_cc_ids:0
+msgid "Destinations compatible with the Cost Center"
+msgstr "Destinations compatibles avec le Centre de Coût"
+
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_account.py:347
+#, python-format
+msgid "Please remove the Cost Centers linked to the Destination before ticking this box."
+msgstr "Veuillez supprimer les Centres de Coût liés à la Destination avant de cocher cette case."
+
+#. module: account_corrections
+#: code:addons/account_corrections/wizard/analytic_distribution_wizard.py:246
+#, python-format
+msgid "The Cost Center %s is not compatible with the Destination %s."
+msgstr "Le Centre de Coût %s n'est pas compatible avec la Destination %s."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:490
+#, python-format
+msgid "Line %s. The Cost Center %s is not compatible with the Destination %s."
+msgstr "Ligne %s. Le Centre de Coût %s n'est pas compatible avec la Destination %s."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:945
+#, python-format
+msgid "The Parent Analytic Account must be a View type Funding Pool."
+msgstr "Le Compte Analytique Parent doit être un Funding Pool de type Vue."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:992
+#, python-format
+msgid "The Parent Analytic Account must be a View type Destination."
+msgstr "Le Compte Analytique Parent doit être une Destination de type Vue."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:1063
+#, python-format
+msgid "The Parent Analytic Account must be a View type Cost Center."
+msgstr "Le Compte Analytique Parent doit être un Centre de Coût de type Vue."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:1076
+#, python-format
+msgid "The Parent Analytic Account must be a View type Free 1 account."
+msgstr "Le Compte Analytique Parent doit être un compte \"Option 1\" de type Vue."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:1089
+#, python-format
+msgid "The Parent Analytic Account must be a View type Free 2 account."
+msgstr "Le Compte Analytique Parent doit être un compte \"Option 2\" de type Vue."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:995
+#, python-format
+msgid "The Type must be either \"Normal\" or \"View\"."
+msgstr "Le Type doit être soit \"Normal\" soit \"Vue\"."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:1023
+#, python-format
+msgid "Account code \"%s\" doesn't exist or isn't allowed."
+msgstr "Le code comptable \"%s\" n'existe pas ou n'est pas autorisé."
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/hr.py:224
+#, python-format
+msgid "Employee %s: the Cost Center %s is not compatible with the Destination %s."
+msgstr "Employé %s : le Centre de Coût %s n'est pas compatible avec la Destination %s."

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2019-03-28 13:22:15 +0000
+++ bin/addons/msf_profile/msf_profile.py	2019-05-06 14:14:05 +0000
@@ -69,6 +69,24 @@
                     err_msg,
                 )
 
+    # UF13.0
+    def us_5771_allow_all_cc_in_default_dest(self, cr, uid, *a, **b):
+        """
+        Set the default created destinations (OPS/EXP/SUP/NAT) as "Allow all Cost Centers"
+        """
+        update_dests = """
+            UPDATE account_analytic_account
+            SET allow_all_cc = 't'
+            WHERE category = 'DEST' 
+            AND id IN (SELECT res_id FROM ir_model_data WHERE module='analytic_distribution' AND name IN (
+                'analytic_account_destination_operation',
+                'analytic_account_destination_expatriates',
+                'analytic_account_destination_support',
+                'analytic_account_destination_national_staff'));
+        """
+        cr.execute(update_dests)
+        return True
+
     # UF12.1
     def us_5199_fix_cancel_partial_move_sol_id(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	2019-02-28 15:19:06 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2019-05-06 14:14:05 +0000
@@ -31,6 +31,7 @@
 msf_sync_data_server.periods_state,TRUE,TRUE,TRUE,TRUE,bidirectional,Up,[],"['state', 'period_id/id', 'instance_id/id']",HQ + MISSION,account.period.state,,Periods states,Valid,,129
 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.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,TRUE,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