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

[jftempo]

=== modified file 'bin/addons/msf_instance/add_instance.py'
--- bin/addons/msf_instance/add_instance.py	2019-06-11 08:10:46 +0000
+++ bin/addons/msf_instance/add_instance.py	2019-09-11 07:42:30 +0000
@@ -112,6 +112,12 @@
         ('name_company_uniq', 'unique (name, company_id, instance_id)', 'The name of the journal must be unique per company and instance !'),
     ]
 
+    def _raise_no_analytic_journal_error(self, cr, uid, journal_name, instance_id, context=None):
+        inst_obj = self.pool.get('msf.instance')
+        inst_code = inst_obj.read(cr, uid, instance_id, context=context)['code']
+        raise osv.except_osv(_('Error'),
+                             _('No Analytic Journal %s found for the Proprietary Instance %s.') % (journal_name, inst_code))
+
     # SP-72: in order to always get an analytic journal with the same instance,
     # the create and write check and replace with the "good" journal if necessary.
     def create(self, cr, uid, vals, context=None):
@@ -119,7 +125,7 @@
         user_obj = self.pool.get('res.users')
         if 'instance_id' not in vals:  # ensure that the instance_id always exists, in particular for the Track Changes
             vals['instance_id'] = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id'], context=context).company_id.instance_id.id
-        if vals.get('type') and vals.get('type') not in ['situation', 'stock'] and vals.get('analytic_journal_id'):
+        if vals.get('analytic_journal_id'):
             analytic_journal = analytic_obj.browse(cr, uid, vals['analytic_journal_id'], context=context)
 
             if analytic_journal and \
@@ -131,13 +137,15 @@
                                                                 ('instance_id', '=', vals['instance_id'])], context=context)
                 if len(new_journal_ids) > 0:
                     vals['analytic_journal_id'] = new_journal_ids[0]
+                else:
+                    self._raise_no_analytic_journal_error(cr, uid, analytic_journal.name, vals['instance_id'], context=context)
         return super(account_journal, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
         analytic_obj = self.pool.get('account.analytic.journal')
-        if vals.get('type') and vals.get('type') not in ['situation', 'stock'] and vals.get('analytic_journal_id'):
+        if vals.get('analytic_journal_id'):
             analytic_journal = analytic_obj.browse(cr, uid, vals['analytic_journal_id'], context=context)
 
             instance_id = False
@@ -155,6 +163,8 @@
                                                                 ('instance_id','=',instance_id)], context=context)
                 if len(new_journal_ids) > 0:
                     vals['analytic_journal_id'] = new_journal_ids[0]
+                else:
+                    self._raise_no_analytic_journal_error(cr, uid, analytic_journal.name, instance_id, context=context)
         return super(account_journal, self).write(cr, uid, ids, vals, context=context)
 
 account_journal()

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-08-22 10:11:24 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-09-11 07:42:30 +0000
@@ -107372,3 +107372,9 @@
 #: report:purchase.order.merged:0
 msgid "Functional total cost :"
 msgstr "Total Coût Fonctionnel :"
+
+#. module: msf_instance
+#: code:addons/msf_instance/add_instance.py:119
+#, python-format
+msgid "No Analytic Journal %s found for the Proprietary Instance %s."
+msgstr "Aucun Journal Analytique %s trouvé pour l'Instance Propriétaire %s."