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

[jftempo]

=== modified file 'bin/addons/account_mcdb/account_view.xml'
--- bin/addons/account_mcdb/account_view.xml	2018-04-20 14:30:11 +0000
+++ bin/addons/account_mcdb/account_view.xml	2018-07-09 08:36:14 +0000
@@ -284,6 +284,8 @@
                     <field name="reconcile_date" invisible="1"/>
                     <field name="unreconcile_date" invisible="1"/>
                     <field name="unreconcile_txt" invisible="1"/>
+                    <field name="revaluation_reference" invisible="1"/>
+                    <field name="revaluation_date" invisible="1"/>
                     <field name="state"/>
                 </tree>
             </field>

=== modified file 'bin/addons/account_override/account_move_line.py'
--- bin/addons/account_override/account_move_line.py	2018-03-28 09:49:33 +0000
+++ bin/addons/account_override/account_move_line.py	2018-07-09 08:36:14 +0000
@@ -340,6 +340,9 @@
         'imported': fields.related('move_id', 'imported', string='Imported', type='boolean', required=False, readonly=True),
         'is_si_refund': fields.boolean('Is a SI refund line', help="In case of a refund Cancel or Modify all the lines linked "
                                                                    "to the original SI and to the SR created are marked as 'is_si_refund'"),
+        'revaluation_date': fields.datetime(string='Revaluation date'),
+        'revaluation_reference': fields.char(string='Revaluation reference', size=64,
+                                             help="Entry sequence of the related Revaluation Entry"),
     }
 
     _defaults = {
@@ -634,6 +637,7 @@
         - the unreconciliation date
         - the old reconciliation ref (unreconcile_txt)
         - the tag 'is_si_refund'
+        - the fields related to revaluation
         """
         if context is None:
             context = {}
@@ -645,6 +649,8 @@
             'unreconcile_date': None,
             'unreconcile_txt': '',
             'is_si_refund': False,
+            'revaluation_date': None,
+            'revaluation_reference': '',
         })
         return super(account_move_line, self).copy(cr, uid, aml_id, default, context=context)
 

=== modified file 'bin/addons/msf_currency_revaluation/account.py'
--- bin/addons/msf_currency_revaluation/account.py	2017-07-25 08:03:34 +0000
+++ bin/addons/msf_currency_revaluation/account.py	2018-07-09 08:36:14 +0000
@@ -63,16 +63,16 @@
     _defaults = {'currency_revaluation': False}
 
     _sql_mapping = {
-        'balance': "COALESCE(SUM(l.debit),0) - COALESCE(SUM(l.credit), 0) as balance",
-            'debit': "COALESCE(SUM(l.debit), 0) as debit",
-            'credit': "COALESCE(SUM(l.credit), 0) as credit",
-            # US-1251: booking balance mapping: use directly booking balance vs JI amount_currency as we have discrepedencies
-            'foreign_balance': "COALESCE(SUM(l.debit_currency),0) - COALESCE(SUM(l.credit_currency), 0) as foreign_balance"
-            #'foreign_balance': "COALESCE(SUM(l.amount_currency), 0) as foreign_balance"
+        'balance': "COALESCE(l.debit, 0) - COALESCE(l.credit, 0) as balance",
+        'debit': "COALESCE(l.debit, 0) as debit",
+        'credit': "COALESCE(l.credit, 0) as credit",
+        # US-1251: booking balance mapping: use directly booking balance vs JI amount_currency as we have discrepancies
+        'foreign_balance': "COALESCE(l.debit_currency, 0) - COALESCE(l.credit_currency, 0) as foreign_balance"
     }
 
     def _revaluation_query(self, cr, uid, ids, revaluation_date, context=None):
-        query = ("SELECT l.account_id as id, l.currency_id, l.reconcile_id, " +
+        query = ("SELECT l.account_id as id, l.currency_id, l.reconcile_id, "
+                 " l.id AS aml_id, " +
                  ', '.join(self._sql_mapping.values()) +
                  " FROM account_move_line l"
                  " inner join account_period p on p.id = l.period_id"
@@ -80,8 +80,7 @@
                  " l.date <= %(revaluation_date)s AND"
                  " l.currency_id IS NOT NULL AND"
                  " l.state <> 'draft' AND"
-                 " p.number != 0"  # US-1251 exclude IB entries period 0 for monthly and yearly
-                 " GROUP BY l.account_id, l.currency_id, l.reconcile_id")
+                 " p.number != 0;")  # US-1251 exclude IB entries period 0 for monthly and yearly
         params = {'revaluation_date': revaluation_date,
                   'account_ids': tuple(ids)}
         return query, params
@@ -92,6 +91,8 @@
         if context is None:
             context = {}
         accounts = {}
+        entries_included = {}
+        reconciliations = {}
         aml_obj = self.pool.get('account.move.line')
 
         # Compute for each account the balance/debit/credit from the move lines
@@ -115,12 +116,23 @@
             if len(period_ids) == 1 or not l['reconcile_id']:
                 line_to_keep = True
             elif l['reconcile_id']:
-                # get the JIs with the same reconcile_id
-                aml_list = aml_obj.search(cr, uid, [('reconcile_id', '=', l['reconcile_id'])], order='NO_ORDER', context=context)
-                # check that at least one of them has a posting date later than the FY
-                if aml_obj.search_exist(cr, uid, [('id', 'in', aml_list), ('date', '>', revaluation_date)], context=context):
-                    line_to_keep = True
+                if l['reconcile_id'] in reconciliations:
+                    line_to_keep = reconciliations[l['reconcile_id']]
+                else:
+                    # get the JIs with the same reconcile_id
+                    aml_list = aml_obj.search(cr, uid, [('reconcile_id', '=', l['reconcile_id'])], order='NO_ORDER', context=context)
+                    # check that at least one of them has a posting date later than the FY
+                    if aml_obj.search_exist(cr, uid, [('id', 'in', aml_list), ('date', '>', revaluation_date)], context=context):
+                        line_to_keep = True
+                    # store the result for this rec. to avoid re-doing the same computation several times
+                    reconciliations.update({l['reconcile_id']: line_to_keep})
             if line_to_keep:
+                # store by account and currency all the entries included in the reval
+                if l['id'] not in entries_included:  # l['id'] is the id of the account
+                    entries_included[l['id']] = {}
+                if l['currency_id'] not in entries_included[l['id']]:
+                    entries_included[l['id']][l['currency_id']] = []
+                entries_included[l['id']][l['currency_id']].append(l['aml_id'])
                 # generate a tree
                 # - account_id
                 # -- currency_id
@@ -139,7 +151,7 @@
                 accounts[l['id']][l['currency_id']]['debit'] += l['debit']
                 accounts[l['id']][l['currency_id']]['balance'] += l['balance']
 
-        return accounts
+        return accounts, entries_included
 
 account_account()
 

=== modified file 'bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py'
--- bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py	2017-08-18 13:15:14 +0000
+++ bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py	2018-07-09 08:36:14 +0000
@@ -55,8 +55,6 @@
             domain="[('fiscalyear_id', '=', fiscalyear_id), ('state', '!=', 'created')]"),
         'result_period_internal_id': fields.many2one(
             'account.period', string=_(u"Entry period"), invisible=True),
-        'result_period_yearly_editable': fields.boolean(
-            'Yearly revaluation applied ?', invisible=True),
         'posting_date': fields.date(
             _('Entry date'), readonly=True,
             help=_("Revaluation entry date (document and posting date)")),
@@ -91,7 +89,6 @@
         'label': "%(currency)s %(account)s %(rate)s",
         'revaluation_method': lambda *args: 'liquidity_month',
         'fiscalyear_id': _get_default_fiscalyear_id,
-        'result_period_yearly_editable': True,
     }
 
     def _get_last_yearly_reval_period_id(self, cr, uid, fy_id, context=None):
@@ -279,7 +276,6 @@
             return res
 
         value = {
-            'result_period_yearly_editable': True,
             'msg': False,
         }
         warning = {}
@@ -331,24 +327,15 @@
                 last_reval_period = self._get_last_yearly_reval_period_id(
                     cr, uid, fiscalyear_id)
                 if last_reval_period:
-                    # US-816: liquidity or BS can be processed in any order
-                    # but the 2nd should always use the same period
                     period_number = last_reval_period.number
-                    value['result_period_id'] = last_reval_period.id
-                    value['result_period_yearly_editable'] = False
-                    value['msg'] = _('One of the year-end revaluations has' \
-                                     ' already been processed. The next one will be' \
-                                     ' processed on the same period: %s.') % (
-                        last_reval_period.name, )
+                    value['msg'] = _('One of the year-end revaluations has already been processed in the period "%s". '
+                                     'The next one will be processed in the selected period.') % (last_reval_period.name,)
 
                 # check period opened
                 check_period_res = self._check_period_opened(cr, uid,
                                                              fiscalyear.id, period_number)
-                if check_period_res[1]:
-                    value['result_period_id'] = check_period_res[1]
-                else:
-                    value['result_period_id'] = False
                 if not check_period_res[0] and check_period_res[2]:
+                    # non-blocking warning
                     warning = {
                         'title': _('Warning!'),
                         'message': check_period_res[2]
@@ -358,8 +345,8 @@
                     ('number', '>', 12),
                     ('number', '<', 16),
                 ]
-                value['result_period_id'] = check_period_res[0] and \
-                    check_period_res[1] or False
+                # pre-select the period if it is opened
+                value['result_period_id'] = check_period_res[0] and check_period_res[1] or False
         else:
             if period_id:
                 period = period_obj.browse(cr, uid, period_id)
@@ -629,6 +616,7 @@
         period_state_obj =  self.pool.get('account.period.state')
         account_obj = self.pool.get('account.account')
         currency_obj = self.pool.get('res.currency')
+        move_obj = self.pool.get('account.move')
 
         company = user_obj.browse(cr, uid, uid).company_id
 
@@ -820,8 +808,8 @@
                     msg = _(u"End year revaluation already performed")
                 raise osv.except_osv(_(u"Error"), msg)
 
-        # Get balance sums
-        account_sums = account_obj.compute_revaluations(
+        # Get balance sums and entries included in the reval
+        account_sums, entries_included = account_obj.compute_revaluations(
             cr, uid, account_ids, period_ids, form.fiscalyear_id.id,
             revaluation_date, form.revaluation_method, context=context)
         for account_id, account_tree in account_sums.iteritems():
@@ -845,6 +833,7 @@
                     context=context)
                 account_sums[account_id][currency_id].update(diff_balances)
         # Create entries only after all computation have been done
+        current_dt = datetime.datetime.now()
         for account_id, account_tree in account_sums.iteritems():
             for currency_id, sums in account_tree.iteritems():
                 # (US-1682) The adj_balance is rounded, otherwise the booking amount of the first reval entry would be
@@ -862,13 +851,23 @@
                     account_id, currency_id, False, adj_balance,
                     label, rate, form, sums, context=context)
                 if move_id:
+                    move_name = move_obj.read(cr, uid, move_id, ['name'], context=context)['name']
+                    to_tag_ids = account_id in entries_included and currency_id in entries_included[account_id] and \
+                        entries_included[account_id][currency_id] or []
+                    to_tag_ids.extend(new_ids)
                     created_ids.extend(new_ids)
                     # Create a second journal entry that will offset the first one
                     # if the revaluation method is 'Other B/S'
                     if form.revaluation_method in ['liquidity_year', 'other_bs']:
                         move_id, rev_line_ids = self._reverse_other_bs_move_lines(
                             cr, uid, form, move_id, new_ids, context=context)
+                        to_tag_ids.extend(rev_line_ids)
                         created_ids.extend(rev_line_ids)
+                    # tag the entries revaluated, and the reval entry and reversal reval entry (only the leg on the revaluated account)
+                    cr.execute('UPDATE account_move_line '
+                               'SET revaluation_date = %s, revaluation_reference = %s '
+                               'WHERE id IN %s '
+                               'AND account_id = %s;', (current_dt, move_name, tuple(to_tag_ids), account_id,))
 
         if created_ids:
             # Set all booking amount to 0 for revaluation lines

=== modified file 'bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation_view.xml'
--- bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation_view.xml	2016-06-08 09:53:49 +0000
+++ bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation_view.xml	2018-07-09 08:36:14 +0000
@@ -25,10 +25,9 @@
                                 'required': [('revaluation_method', 'in', ['liquidity_year', 'other_bs'])]}"/>
                     <newline/>
                     <separator string="" colspan="6"/>
-                    <field name="result_period_yearly_editable" />
                     <field name="result_period_internal_id" />
                     <field name="result_period_id"
-                        attrs="{'readonly': ['|', ('revaluation_method', '=', 'liquidity_month'), ('result_period_yearly_editable', '=', False)]}"
+                        attrs="{'readonly': [('revaluation_method', '=', 'liquidity_month')]}"
                         on_change="on_change_result_period_id(result_period_id)"/>
                     <newline/>
                     <field name="posting_date"/>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-06-15 12:30:42 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-07-09 08:36:14 +0000
@@ -46521,10 +46521,10 @@
 msgstr "La Séquence Principale doit être différente de la séquence en cours !"
 
 #. module: msf_currency_revaluation
-#: code:addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py:339
+#: code:addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py:330
 #, python-format
-msgid "One of the year-end revaluations has already been processed. The next one will be processed on the same period: %s."
-msgstr "One of the year-end revaluations has already been processed. The next one will be processed on the same period: %s."
+msgid "One of the year-end revaluations has already been processed in the period \"%s\". The next one will be processed in the selected period."
+msgstr "L'une des réévaluations annuelles a déjà été effectuée dans la période \"%s\". La prochaine sera effectuée dans la période sélectionnée."
 
 #. module: msf_tools
 #: code:addons/msf_tools/automated_export.py:260
@@ -76217,11 +76217,6 @@
 msgid "State of Move Line"
 msgstr "Statut de la Ligne de Transaction"
 
-#. module: msf_currency_revaluation
-#: field:wizard.currency.revaluation,result_period_yearly_editable:0
-msgid "Yearly revaluation applied ?"
-msgstr "Yearly revaluation applied ?"
-
 #. modules: account, msf_instance, account_override, msf_audittrail, sync_so, account_period_closing_level
 #: model:ir.model,name:account.model_account_period
 #: model:ir.model,name:account_override.model_account_period
@@ -101265,3 +101260,17 @@
 msgid "Not Invoice"
 msgstr "Pas de Facture"
 
+#. module: account_override
+#: field:account.move.line,revaluation_date:0
+msgid "Revaluation date"
+msgstr "Date de la réévaluation"
+
+#. module: account_override
+#: field:account.move.line,revaluation_reference:0
+msgid "Revaluation reference"
+msgstr "Référence de la réévaluation"
+
+#. module: account_override
+#: help:account.move.line,revaluation_reference:0
+msgid "Entry sequence of the related Revaluation Entry"
+msgstr "Séquence de l'Entrée de Réévaluation associée"