Merge lp:~mukunde/unifield-server/US-9724 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/analytic_override/analytic_line.py'
--- bin/addons/analytic_override/analytic_line.py	2022-01-05 15:03:32 +0000
+++ bin/addons/analytic_override/analytic_line.py	2022-09-26 07:25:14 +0000
@@ -170,7 +170,8 @@
             # FIXME: refactoring of next code
             if document_date < account.date_start or (account.date != False and document_date >= account.date):
                 if 'from' not in context or context.get('from') != 'mass_reallocation':
-                    raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (account.name or '',))
+                    entry_name = self.get_entry_name(cr, uid, vals, context=context)
+                    raise osv.except_osv(_('Error'), _("The analytic account '%s' %s is not active.") % (account.name or '', entry_name))
         if 'date' in vals and vals['date'] is not False:
             date = vals['date']
             dest = False
@@ -179,17 +180,31 @@
                 cc = account_obj.browse(cr, uid, vals['cost_center_id'], context=context)
                 if date < cc.date_start or (cc.date != False and date >= cc.date):
                     if 'from' not in context or context.get('from') != 'mass_reallocation':
-                        raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (cc.name or '',))
+                        # US-9724
+                        entry_name = self.get_entry_name(cr, uid, vals, context=context)
+                        raise osv.except_osv(_('Error'),_("The analytic account '%s' %s is inactive.") % (cc.name or '', entry_name))
             if vals.get('destination_id', False):
                 dest = account_obj.browse(cr, uid, vals['destination_id'], context=context)
                 if date < dest.date_start or (dest.date != False and date >= dest.date):
                     if 'from' not in context or context.get('from') != 'mass_reallocation':
-                        raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (dest.name or '',))
+                        entry_name = self.get_entry_name(cr, uid, vals, context=context)
+                        raise osv.except_osv(_('Error'), _("The analytic account '%s' %s is not active.") % (dest.name or '', entry_name))
             if context.get('from') != 'mass_reallocation' and dest and cc and \
                     dest_cc_link_obj.is_inactive_dcl(cr, uid, dest.id, cc.id, date, context=context):
-                raise osv.except_osv(_('Error'), _("The combination \"%s - %s\" is not active.") % (dest.code or '', cc.code or ''))
+                entry_name = self.get_entry_name(cr, uid, vals, context=context)
+                raise osv.except_osv(_('Error'), _("The combination \"%s - %s\"  %s is not active.") % (dest.code or '', cc.code or '', entry_name))
         return True
 
+    def get_entry_name(self, cr, uid, vals, context):
+        """
+        Return the sequence entry name
+        """
+        acc_move_obj = self.pool.get('account.move.line')
+        if vals.get('move_id'):
+            name = acc_move_obj.browse(cr, uid, vals['move_id'], fields_to_fetch=['move_id'], context=context).move_id.name
+            return _(' selected in this entry %s ') % (name or '')
+        return ''
+
     def _check_document_date(self, cr, uid, ids):
         """
         Check that document's date is done BEFORE posting date

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-08-23 13:15:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-09-26 07:25:14 +0000
@@ -114991,6 +114991,7 @@
 #: field:sync.version.instance.monitor,platform:0
 msgid "Platform"
 msgstr "Plate-forme"
+<<<<<<< TREE
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/check_line.py:345
@@ -115817,3 +115818,35 @@
 msgid "Force Date and time of next execution"
 msgstr "Date et heure forcée de la prochiane exécution plannifiée"
 
+=======
+
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_line.py:205
+#, python-format
+msgid " selected in this entry %s "
+msgstr "selectionné dans cette entrée %s "
+
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_line.py:185
+#, python-format
+msgid "The analytic account '%s' %s is inactive."
+msgstr "Le compte analytique '%s' %s n'est pas actif."
+
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_line.py:174
+#: code:addons/analytic_override/analytic_line.py:191
+#, python-format
+msgid "The analytic account '%s' %s is not active."
+msgstr "Le compte analytique '%s' %s n'est pas actif."
+
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_line.py:195
+#, python-format
+msgid "The combination \"%s - %s\"  %s is not active."
+msgstr "La combinaison \"%s - %s\"  %s n'est pas active."
+
+#. module: analytic_override
+#: model:ir.model,name:analytic_override.model_multiple_cc_selection_wizard
+msgid "multiple.cc.selection.wizard"
+msgstr ""
+>>>>>>> MERGE-SOURCE