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

[jftempo]

=== 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:24 +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)

=== 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:24 +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:24 +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