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

[jftempo]

=== modified file 'bin/addons/account/wizard/account_invoice_refund.py'
--- bin/addons/account/wizard/account_invoice_refund.py	2021-11-10 16:14:10 +0000
+++ bin/addons/account/wizard/account_invoice_refund.py	2021-12-07 10:10:12 +0000
@@ -131,6 +131,7 @@
         inv_tax_obj = self.pool.get('account.invoice.tax')
         inv_line_obj = self.pool.get('account.invoice.line')
         res_users_obj = self.pool.get('res.users')
+        aal_obj = self.pool.get('account.analytic.line')
         if context is None:
             context = {}
 
@@ -267,6 +268,15 @@
                     # get the list of move lines excluding invoice header
                     ml_list = [ml.id for ml in movelines if not ml.is_counterpart]
                     account_m_line_obj.set_as_corrected(cr, uid, ml_list, manual=False, context=None)
+                    # blocks the refund Cancel or Modify in case the AD of one of the related AJI has been updated
+                    # Note that the case where REV/COR have been generated is handled in "set_as_corrected", which is also used out of refunds.
+                    for ml_id in ml_list:
+                        if aal_obj.search_exist(cr, uid, [('move_id', '=', ml_id), ('ad_updated', '=', True)], context=context):
+                            move_name = account_m_line_obj.browse(cr, uid, ml_id, fields_to_fetch=['move_id'], context=context).move_id.name
+                            raise osv.except_osv(_('Error'), _('The Analytic Distribution linked to the entry %s has '
+                                                               'been updated since the invoice validation.\n'
+                                                               'Refunds of type "Modify" and "Cancel" are not allowed.')
+                                                 % move_name)
                     # all JI lines of the SI and SR (including header) should be not corrigible, no matter if they
                     # are marked as corrected, reversed...
                     ji_ids = []

=== modified file 'bin/addons/account_corrections/wizard/analytic_distribution_wizard.py'
--- bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2021-05-04 13:43:39 +0000
+++ bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2021-12-07 10:10:12 +0000
@@ -620,6 +620,18 @@
         if to_reverse or to_override or to_create:
             self.pool.get('account.move.line').corrected_upstream_marker(cr, uid, [ml.id], context=context)
 
+        # In case of no REV/COR, set the analytic lines as ad_updated. This shows that the Corr. Wizard has been used,
+        # whatever the changes made (even if no change has been made, or e.g. only a Free1/2 line has been deleted)
+        if not has_generated_cor:
+            # get all the analytic lines related to the JI, INCLUDING the free1/2 lines
+            all_analytic_lines_ids = ana_line_obj.search(cr, uid, [
+                ('move_id', '=', ml.id),
+                ('is_reversal', '=', False),  # no need to include the REV lines...
+                ('is_reallocated', '=', False),  # ...or the lines set as reallocated from a previous corr.
+            ], order='NO_ORDER', context=context)
+            if all_analytic_lines_ids:
+                ana_line_obj.write(cr, uid, all_analytic_lines_ids, {'ad_updated': True}, context=context)
+
         if context and 'ji_correction_account_or_tp_changed' in context:
             if (any_reverse or to_reverse) and \
                     not context['ji_correction_account_or_tp_changed']:

=== modified file 'bin/addons/analytic_distribution/analytic_line.py'
--- bin/addons/analytic_distribution/analytic_line.py	2021-09-10 14:17:11 +0000
+++ bin/addons/analytic_distribution/analytic_line.py	2021-12-07 10:10:12 +0000
@@ -324,6 +324,7 @@
                         fieldname: account_id,
                         'date': aline.date,
                         'source_date': curr_date,
+                        'ad_updated': True,
                     }
                     self.write(cr, uid, [aline.id], vals, context=context)
                 # else reverse line before recreating them with right values
@@ -395,7 +396,7 @@
                         cr.execute('update account_analytic_line set entry_sequence = %s where id = %s', (entry_seq, rev_cor_id))
             else:
                 # Update account
-                self.write(cr, uid, [aline.id], {'account_id': account_id}, context=context)
+                self.write(cr, uid, [aline.id], {'account_id': account_id, 'ad_updated': True}, context=context)
             # Set line as corrected upstream if we are in COORDO/HQ instance
             if aline.move_id:
                 self.pool.get('account.move.line').corrected_upstream_marker(cr, uid, [aline.move_id.id], context=context)

=== modified file 'bin/addons/analytic_override/analytic_line.py'
--- bin/addons/analytic_override/analytic_line.py	2021-09-10 14:17:11 +0000
+++ bin/addons/analytic_override/analytic_line.py	2021-12-07 10:10:12 +0000
@@ -121,6 +121,7 @@
         'source_date': fields.date('Source date', help="Date used for FX rate re-evaluation"),
         'is_reversal': fields.boolean('Reversal?'),
         'is_reallocated': fields.boolean('Reallocated?'),
+        'ad_updated': fields.boolean('Analytic Distribution Updated'),
         'date': fields.date('Posting Date', required=True, select=True, readonly=True),
         'document_date': fields.date('Document Date', readonly=True, required=True),
         'functional_currency_id': fields.related('company_id', 'currency_id', string="Func. Currency", type="many2one", relation="res.currency", readonly=True, write_relate=False),

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2021-11-18 11:18:31 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2021-12-07 10:10:12 +0000
@@ -113251,3 +113251,16 @@
 #, python-format
 msgid "You must select an old version of the Kit to be able to import from it"
 msgstr "Vous devez sélectionner une ancienne version de ce Kit pour pouvoir importer depuis ce Kit"
+
+#. module: analytic_override
+#: field:account.analytic.line,ad_updated:0
+msgid "Analytic Distribution Updated"
+msgstr "Distribution Analytique Mise à Jour"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:276
+#, python-format
+msgid "The Analytic Distribution linked to the entry %s has been updated since the invoice validation.\n"
+"Refunds of type \"Modify\" and \"Cancel\" are not allowed."
+msgstr "La Distribution Analytique liée à l'écriture %s a été mise à jour depuis la validation de la facture.\n"
+"Les avoirs de type \"Modifier\" et \"Annuler\" ne sont pas autorisés."

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2021-10-21 09:30:27 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2021-12-07 10:10:12 +0000
@@ -92,8 +92,8 @@
 msf_sync_data_server.account_move_line_corrected_upstream,FALSE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['corrected_upstream', 'instance_id/id']",HQ + MISSION,account.move.line,instance_id,Account Move Line Corrected Upstream,Valid,,417
 msf_sync_data_server.account_move_unreconcile,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,"[]","['unreconcile_date', 'delete_reconcile_txt', 'move_sdref_txt', 'reconcile_sdref']",HQ + MISSION,account.move.unreconcile,,Account Move UnReconcile,Valid,,423
 msf_sync_data_server.account_move_reconcile,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,"[]","['name', 'type', 'is_multi_instance', 'multi_instance_level_creation', 'instance_id', 'nb_partial_legs', 'line_id/id', 'line_partial_ids/id', 'action_date']",HQ + MISSION,account.move.reconcile,,Account Move Reconcile,Valid,,424
-msf_sync_data_server.analytical_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,"[('account_id.category', '=', 'FUNDING')]","['from_commitment_line', 'account_id/id', 'amount', 'amount_currency','correction_date', 'code', 'cost_center_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distrib_line_id', 'distribution_id/id', 'document_date', 'general_account_id/id', 'instance_id/id', 'is_reallocated', 'is_reversal', 'journal_id/id', 'move_id/id', 'name', 'partner_txt', 'ref', 'reversal_origin/id', 'source_date', 'entry_sequence', 'real_period_id/id']",HQ + MISSION,account.analytic.line,cost_center_id,Analytical Line,Valid,,420
-msf_sync_data_server.analytical_line_free,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('account_id.category', 'in', ['FREE1', 'FREE2'])]","['account_id/id', 'amount', 'amount_currency', 'code', 'currency_id/id', 'date', 'distrib_line_id', 'correction_date','document_date', 'general_account_id/id', 'instance_id/id', 'is_reallocated', 'is_reversal', 'journal_id/id', 'move_id/id', 'name', 'partner_txt', 'ref', 'reversal_origin/id', 'source_date', 'entry_sequence', 'real_period_id/id', 'distribution_id/id']",MISSION,account.analytic.line,,Analytic Line (Free 1 and Free 2),Valid,,421
+msf_sync_data_server.analytical_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,"[('account_id.category', '=', 'FUNDING')]","['from_commitment_line', 'account_id/id', 'amount', 'amount_currency','correction_date', 'code', 'cost_center_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distrib_line_id', 'distribution_id/id', 'document_date', 'general_account_id/id', 'instance_id/id', 'is_reallocated', 'is_reversal', 'ad_updated', 'journal_id/id', 'move_id/id', 'name', 'partner_txt', 'ref', 'reversal_origin/id', 'source_date', 'entry_sequence', 'real_period_id/id']",HQ + MISSION,account.analytic.line,cost_center_id,Analytical Line,Valid,,420
+msf_sync_data_server.analytical_line_free,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('account_id.category', 'in', ['FREE1', 'FREE2'])]","['account_id/id', 'amount', 'amount_currency', 'code', 'currency_id/id', 'date', 'distrib_line_id', 'correction_date','document_date', 'general_account_id/id', 'instance_id/id', 'is_reallocated', 'is_reversal', 'ad_updated', 'journal_id/id', 'move_id/id', 'name', 'partner_txt', 'ref', 'reversal_origin/id', 'source_date', 'entry_sequence', 'real_period_id/id', 'distribution_id/id']",MISSION,account.analytic.line,,Analytic Line (Free 1 and Free 2),Valid,,421
 msf_sync_data_server.analytical_line_correction,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('account_id.category', '=', 'FUNDING'), ('imported_commitment','=',False)]","['last_corrected_id/id', 'cost_center_id/id', 'reversal_origin/id']",HQ + MISSION,account.analytic.line,cost_center_id,Analytical Line,Valid,,422
 msf_sync_data_server.decision_moment,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['name', 'order']",HQ + MISSION,msf.budget.decision.moment,,Decision Moment,Valid,,429
 msf_sync_data_server.budget,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('type','=','normal'), ('state', '!=', 'draft')]","['code', 'cost_center_id/id', 'currency_id/id', 'decision_moment_id/id', 'decision_moment_order', 'fiscalyear_id/id', 'name', 'type', 'version']",OC,msf.budget,,Budget,Valid,,430