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

[jftempo]

=== modified file 'bin/addons/account/project/project_view.xml'
--- bin/addons/account/project/project_view.xml	2020-06-17 14:44:11 +0000
+++ bin/addons/account/project/project_view.xml	2020-07-31 12:00:59 +0000
@@ -98,6 +98,11 @@
                         </page>
                         <page string="Description">
                             <field colspan="4" name="description" nolabel="1"/>
+                            <!-- exportable fields -->
+                            <field name="top_cc_instance_ids" invisible="1"/>
+                            <field name="is_target_cc_instance_ids" invisible="1"/>
+                            <field name="po_fo_cc_instance_ids" invisible="1"/>
+                            <field name="cc_missions" invisible="1"/>
                         </page>
                     </notebook>
                 </form>

=== modified file 'bin/addons/analytic_override/analytic_account.py'
--- bin/addons/analytic_override/analytic_account.py	2020-01-30 14:58:12 +0000
+++ bin/addons/analytic_override/analytic_account.py	2020-07-31 12:00:59 +0000
@@ -290,6 +290,52 @@
                 dom.append(('id', 'in', compatible_dest_ids))
         return dom
 
+    def _get_cc_instance_ids(self, cr, uid, ids, fields, arg, context=None):
+        """
+        Computes the values for fields.function fields, retrieving:
+        - the instances using the analytic account...
+          ...as Top Cost Center => top_cc_instance_ids
+          ...as Target Cost Center => is_target_cc_instance_ids
+          ...as Cost centre picked for PO/FO reference => po_fo_cc_instance_ids
+          (Note that those fields should theoretically always be linked to one single instance,
+           but they are set as one2many in order to be consistent with the type of fields used in the related object.)
+        - the Missions where the Cost Center is added to => cc_missions
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = {}
+        acc_target_cc_obj = self.pool.get('account.target.costcenter')
+        for analytic_acc_id in ids:
+            top_instance_ids = []
+            target_instance_ids = []
+            po_fo_instance_ids = []
+            missions = set()
+            missions_str = ""
+            target_cc_ids = acc_target_cc_obj.search(cr, uid, [('cost_center_id', '=', analytic_acc_id)], context=context)
+            if target_cc_ids:
+                field_list = ['instance_id', 'is_target', 'is_po_fo_cost_center', 'is_top_cost_center']
+                for target_cc in acc_target_cc_obj.browse(cr, uid, target_cc_ids, fields_to_fetch=field_list, context=context):
+                    instance = target_cc.instance_id
+                    if instance.mission:
+                        missions.add(instance.mission)
+                    if target_cc.is_top_cost_center:
+                        top_instance_ids.append(instance.id)
+                    if target_cc.is_target:
+                        target_instance_ids.append(instance.id)
+                    if target_cc.is_po_fo_cost_center:
+                        po_fo_instance_ids.append(instance.id)
+            if missions:
+                missions_str = ", ".join(missions)
+            res[analytic_acc_id] = {
+                'top_cc_instance_ids': top_instance_ids,
+                'is_target_cc_instance_ids': target_instance_ids,
+                'po_fo_cc_instance_ids': po_fo_instance_ids,
+                'cc_missions': missions_str,
+            }
+        return res
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=1),
         'code': fields.char('Code', size=24),
@@ -318,6 +364,18 @@
                                                        fnct_search=_search_dest_compatible_with_cc_ids),
         'dest_without_cc': fields.function(_get_dest_without_cc, type='boolean', method=True, store=False,
                                            string="Destination allowing no Cost Center",),
+        'top_cc_instance_ids': fields.function(_get_cc_instance_ids, method=True, store=False, readonly=True,
+                                               string="Instances having the CC as Top CC",
+                                               type="one2many", relation="msf.instance", multi="cc_instances"),
+        'is_target_cc_instance_ids': fields.function(_get_cc_instance_ids, method=True, store=False, readonly=True,
+                                                     string="Instances having the CC as Target CC",
+                                                     type="one2many", relation="msf.instance", multi="cc_instances"),
+        'po_fo_cc_instance_ids': fields.function(_get_cc_instance_ids, method=True, store=False, readonly=True,
+                                                 string="Instances having the CC as CC picked for PO/FO ref",
+                                                 type="one2many", relation="msf.instance", multi="cc_instances"),
+        'cc_missions': fields.function(_get_cc_instance_ids, method=True, store=False, readonly=True,
+                                       string="Missions where the CC is added to",
+                                       type='char', multi="cc_instances"),
     }
 
     _defaults ={

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-07-28 15:47:53 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-07-31 12:00:59 +0000
@@ -110356,9 +110356,32 @@
 #: view:product.product:0
 msgid "Merge product"
 msgstr "Fusion produit"
+<<<<<<< TREE
 
 #. module: stock
 #: code:addons/stock/stock.py:1813
 #, python-format
 msgid "is dispatched."
 msgstr "est expédié."
+=======
+
+#. module: analytic_override
+#: field:account.analytic.account,top_cc_instance_ids:0
+msgid "Instances having the CC as Top CC"
+msgstr "Instances ayant le CC comme CC Principal"
+
+#. module: analytic_override
+#: field:account.analytic.account,is_target_cc_instance_ids:0
+msgid "Instances having the CC as Target CC"
+msgstr "Instances ayant le CC comme CC Cible"
+
+#. module: analytic_override
+#: field:account.analytic.account,po_fo_cc_instance_ids:0
+msgid "Instances having the CC as CC picked for PO/FO ref"
+msgstr "Instances ayant le CC comme CC sélectionné pour PO/FO"
+
+#. module: analytic_override
+#: field:account.analytic.account,cc_missions:0
+msgid "Missions where the CC is added to"
+msgstr "Missions dans lesquelles le CC est ajouté"
+>>>>>>> MERGE-SOURCE