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

[jftempo]

=== 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-03 09:51:58 +0000
@@ -211,6 +211,21 @@
                 account_ids += tmp_ids
         return account_ids
 
+    def _is_pf(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Returns True if the Analytic Account is the default Funding Pool "MSF Private Funds"
+        """
+        res = {}
+        ir_model_obj = self.pool.get('ir.model.data')
+        # get the id of PF
+        try:
+            pf_id = ir_model_obj.get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
+        except ValueError:
+            pf_id = 0
+        for analytic_acc_id in ids:
+            res[analytic_acc_id] = analytic_acc_id == pf_id and True or False
+        return res
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=1),
         'code': fields.char('Code', size=24),
@@ -228,6 +243,7 @@
         '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'),
+        'is_pf': fields.function(_is_pf, method=True, type='boolean', string='Is the default Funding Pool "PF"', store=False),
     }
 
     _defaults ={
@@ -482,7 +498,7 @@
         res = super(analytic_account, self).write(cr, uid, ids, vals, context=context)
         self.check_access_rule(cr, uid, ids, 'write', context=context)
         if context.get('from_web', False) or context.get('from_import_menu', False):
-            cat_instance = self.read(cr, uid, ids, ['category', 'instance_id'], context=context)[0]
+            cat_instance = self.read(cr, uid, ids, ['category', 'instance_id', 'is_pf'], context=context)[0]
             if cat_instance:
                 self.check_fp(cr, uid, cat_instance, context=context)
         self._check_name_unicity(cr, uid, ids, context=context)

=== modified file 'bin/addons/msf_instance/add_instance.py'
--- bin/addons/msf_instance/add_instance.py	2019-01-31 16:41:06 +0000
+++ bin/addons/msf_instance/add_instance.py	2019-05-03 09:51:58 +0000
@@ -584,7 +584,7 @@
             return True
         cat = vals.get('category', False)
         from_import = context.get('from_import_menu', False) or context.get('from_import_data', False)
-        if cat == 'FUNDING':
+        if cat == 'FUNDING' and not vals.get('is_pf', False):  # skip check for PF that doesn't require a Prop. Instance
             instance_id = vals.get('instance_id', False)
             if isinstance(instance_id, (tuple)): # UFTP-2: This is for the case of write (create: only instance_id as int is given)
                 instance_id = instance_id[0]

=== modified file 'bin/addons/msf_instance/msf_instance_view.xml'
--- bin/addons/msf_instance/msf_instance_view.xml	2018-05-22 15:08:57 +0000
+++ bin/addons/msf_instance/msf_instance_view.xml	2019-05-03 09:51:58 +0000
@@ -371,8 +371,11 @@
                 <data>
                     <field name="parent_id" position="before">
                         <field name="current_instance_type" invisible="1"/>
+                        <field name="is_pf" invisible="1"/>
                         <field name="instance_id" domain="[('level', '=', 'coordo')]"
-                               attrs="{'required': [('category', '=', 'FUNDING'), ('current_instance_type', '=', 'section')], 'invisible': [('category', '!=', 'FUNDING')], 'readonly': [('current_instance_type', '!=', 'section')]}"/>
+                               attrs="{'required': [('category', '=', 'FUNDING'), ('current_instance_type', '=', 'section'), ('is_pf', '=', False)],
+                                       'invisible': [('category', '!=', 'FUNDING')],
+                                       'readonly': ['|', ('current_instance_type', '!=', 'section'), ('is_pf', '=', True)]}"/>
                     </field>
                 </data>
             </field>

=== 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-03 09:51:58 +0000
@@ -105388,3 +105388,8 @@
 #, 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_override
+#: field:account.analytic.account,is_pf:0
+msgid "Is the default Funding Pool \"PF\""
+msgstr "Est le Funding Pool par défaut \"PF\""