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

[jftempo]

=== modified file 'bin/addons/account_hq_entries/hq_entries.py'
--- bin/addons/account_hq_entries/hq_entries.py	2019-01-09 10:36:58 +0000
+++ bin/addons/account_hq_entries/hq_entries.py	2019-03-27 16:03:16 +0000
@@ -496,9 +496,31 @@
         # If destination given, search if given
         return res
 
+    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
+        """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if context is None:
+            context = {}
+        if context.get('sync_update_execution'):
+            for hq_entry in self.browse(cr, uid, ids, fields_to_fetch=['cost_center_id', 'date', 'name'], context=context):
+                if not hq_entry.cost_center_id:
+                    raise osv.except_osv(_('Warning'), _('The Cost Center of the HQ entry "%s" doesn\'t exist in the system.') % hq_entry.name)
+                elif hq_entry.date:  # posting date
+                    hq_date = hq_entry.date
+                    cc_date_start = hq_entry.cost_center_id.date_start
+                    cc_date_end = hq_entry.cost_center_id.date or False
+                    if (hq_date < cc_date_start) or (cc_date_end and hq_date >= cc_date_end):
+                        raise osv.except_osv(_('Warning'), _('The Cost Center %s used in the HQ entry "%s" is inactive.') %
+                                             (hq_entry.cost_center_id.code or '', hq_entry.name))
+        return True
+
     def create(self, cr, uid, vals, context=None):
         new_id = super(hq_entries, self).create(cr, uid, vals, context)
         self._check_active_account(cr, uid, [new_id], context=context)
+        self._check_cc(cr, uid, [new_id], context=context)
         return new_id
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -531,6 +553,7 @@
         self.check_ad_change_allowed(cr, uid, ids, vals, context=context)
         res = super(hq_entries, self).write(cr, uid, ids, vals, context)
         self._check_active_account(cr, uid, ids, context=context)
+        self._check_cc(cr, uid, ids, context=context)
         return res
 
     def unlink(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_import.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_import.py	2019-02-06 09:25:31 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_import.py	2019-03-27 16:03:16 +0000
@@ -178,6 +178,9 @@
                 raise osv.except_osv(_('Error'), _('Cost Center "%s" doesn\'t exist!') % (cost_center,))
             cc_id = cc_id[0]
             if cc_id:
+                # check that the CC or its parent is targeted to an instance
+                if not hq_obj.get_target_id(cr, uid, cc_id, context=context):
+                    raise osv.except_osv(_('Error'), _('The Cost Center "%s" (or its parent) must be "targeted" to a Proprietary Instance.') % (cost_center,))
                 aa_check_ids.append(cc_id)
 
         vals.update({'destination_id_first_value': destination_id, 'destination_id': destination_id, 'cost_center_id': cc_id, 'analytic_id': fp_id, 'cost_center_id_first_value': cc_id, 'analytic_id_first_value': fp_id, 'free_1_id': free1_id, 'free_2_id': free2_id,})

=== modified file 'bin/addons/analytic_distribution/analytic_distribution.py'
--- bin/addons/analytic_distribution/analytic_distribution.py	2017-02-10 08:51:30 +0000
+++ bin/addons/analytic_distribution/analytic_distribution.py	2019-03-27 16:03:16 +0000
@@ -93,9 +93,6 @@
         if analytic_id == fp_id:
             is_private_fund = True
         # DISTRIBUTION VERIFICATION
-        # Check account user_type
-        if account.user_type_code != 'expense':
-            return res, _('Not an expense account')
         # 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')

=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
--- bin/addons/msf_profile/i18n/es_MF.po	2018-03-16 11:02:37 +0000
+++ bin/addons/msf_profile/i18n/es_MF.po	2019-03-27 16:03:16 +0000
@@ -44707,12 +44707,6 @@
 msgid "Text Error"
 msgstr "Error de texto"
 
-#. module: analytic_distribution
-#: code:addons/analytic_distribution/analytic_distribution.py:448
-#, python-format
-msgid "Not an expense account"
-msgstr "Not an expense account"
-
 #. module: service_purchasing
 #: code:addons/service_purchasing/service_purchasing.py:244
 #, python-format

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-03-04 11:05:48 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-03-27 16:03:16 +0000
@@ -20463,12 +20463,6 @@
 msgid "Selected Version is for a different product."
 msgstr "Version Sélectionnée est pour un produit différent."
 
-#. module: analytic_distribution
-#: code:addons/analytic_distribution/analytic_distribution.py:98
-#, python-format
-msgid "Not an expense account"
-msgstr "Not an expense account"
-
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
@@ -105320,6 +105314,24 @@
 msgid "File line %s: Column \"Item\" must be an integer"
 msgstr "Fichier ligne %s: La Colonne \"Article\" doit être un entier"
 
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/hq_entries_import.py:183
+#, python-format
+msgid "The Cost Center \"%s\" (or its parent) must be \"targeted\" to a Proprietary Instance."
+msgstr "Le Centre de Coût \"%s\" (ou son parent) doit avoir une Instance Propriétaire \"cible\"."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/hq_entries.py:510
+#, python-format
+msgid "The Cost Center of the HQ entry \"%s\" doesn't exist in the system."
+msgstr "Le Centre de Coût de l'entrée Siège \"%s\" n'existe pas dans le système."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/hq_entries.py:516
+#, python-format
+msgid "The Cost Center %s used in the HQ entry \"%s\" is inactive."
+msgstr "Le Centre de Coût %s utilisé dans l'entrée Siège \"%s\" est inactif."
+
 #. module: purchase
 #: code:addons/purchase/purchase_order_line.py:24
 #, python-format

=== modified file 'bin/addons/sync_so/specific_xml_id.py'
--- bin/addons/sync_so/specific_xml_id.py	2018-10-25 12:38:09 +0000
+++ bin/addons/sync_so/specific_xml_id.py	2019-03-27 16:03:16 +0000
@@ -146,23 +146,53 @@
 
     _inherit = 'hq.entries'
 
+    def get_target_id(self, cr, uid, cost_center_id, context=None):
+        """
+        Returns the id of the target CC linked to the cost_center_id, or to its parent if there isn't any.
+        """
+        if context is None:
+            context = {}
+        target_ids = []
+        if cost_center_id:
+            analytic_cc_obj = self.pool.get('account.analytic.account')
+            target_cc_obj = self.pool.get('account.target.costcenter')
+            target_ids = target_cc_obj.search(cr, uid,
+                                              [('cost_center_id', '=', cost_center_id), ('is_target', '=', True)],
+                                              context=context)
+            if not target_ids:
+                cc = analytic_cc_obj.browse(cr, uid, cost_center_id, fields_to_fetch=['parent_id'], context=context)
+                if cc and cc.parent_id:
+                    target_ids = target_cc_obj.search(cr, uid,
+                                                      [('cost_center_id', '=', cc.parent_id.id), ('is_target', '=', True)],
+                                                      context=context)
+        return target_ids and target_ids[0] or False
+
     def get_destination_name(self, cr, uid, ids, dest_field, context=None):
+        """
+        Gets the instances to which the HQ entries should sync.
+        For each HQ entry:
+        1) Search for the instance:
+           - to which the CC used in the entry is targeted to
+           - if there isn't any, to which the PARENT CC is targeted to
+        2) The entry will sync to the coordo of the corresponding mission
+        """
+        if context is None:
+            context = {}
+        target_cc_obj = self.pool.get('account.target.costcenter')
         if dest_field == 'cost_center_id':
             res = dict.fromkeys(ids, False)
             for line_data in self.browse(cr, uid, ids, context=context):
                 if line_data.cost_center_id:
-                    cost_center_name = line_data.cost_center_id and \
-                        line_data.cost_center_id.code and \
-                        line_data.cost_center_id.code[:3] or ""
-                    cost_center_ids = self.pool.get('account.analytic.account').search(cr, uid, [('category', '=', 'OC'),
-                                                                                                 ('code', '=', cost_center_name)], context=context)
-                    if len(cost_center_ids) > 0:
-                        target_ids = self.pool.get('account.target.costcenter').search(cr, uid, [('cost_center_id', '=', cost_center_ids[0]),
-                                                                                                 ('is_target', '=', True)])
-                        if len(target_ids) > 0:
-                            target = self.pool.get('account.target.costcenter').browse(cr, uid, target_ids[0], context=context)
-                            if target.instance_id and target.instance_id.instance:
-                                res[line_data.id] = target.instance_id.instance
+                    targeted_instance = False
+                    target_id = self.get_target_id(cr, uid, line_data.cost_center_id.id, context=context)
+                    if target_id:
+                        target = target_cc_obj.browse(cr, uid, target_id, fields_to_fetch=['instance_id'], context=context)
+                        if target.instance_id.level == 'coordo':
+                            targeted_instance = target.instance_id
+                        elif target.instance_id.level == 'project':
+                            targeted_instance = target.instance_id.parent_id or False
+                    if targeted_instance:
+                        res[line_data.id] = targeted_instance.instance
             return res
         return super(hq_entries, self).get_destination_name(cr, uid, ids, dest_field, context=context)