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

[jftempo]

=== modified file 'bin/addons/account_period_closing_level/account_period.py'
--- bin/addons/account_period_closing_level/account_period.py	2018-11-12 10:16:05 +0000
+++ bin/addons/account_period_closing_level/account_period.py	2019-09-05 13:46:48 +0000
@@ -73,11 +73,16 @@
         sub_line_obj = self.pool.get('account.subscription.line')
         curr_obj = self.pool.get('res.currency')
         curr_rate_obj = self.pool.get('res.currency.rate')
+        user_obj = self.pool.get('res.users')
+        journal_obj = self.pool.get('account.journal')
+        move_line_obj = self.pool.get('account.move.line')
 
         # previous state of the period
         ap_dict = self.read(cr, uid, ids, ['state'])[0]
         previous_state = ap_dict['state']
 
+        company = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id'], context=context).company_id
+        level = company.instance_id and company.instance_id.level or ''
 
         # Ticket utp913 set state_sync_flag for conditional sync of state
         # 'none' : no update to the state field via a sync (data is still sent but not updated in target instance)
@@ -85,8 +90,6 @@
         # note that 'draft' = 'Open' and 'created' = 'Draft' ... see ACCOUNT_PERIOD_STATE_SELECTION in init
 
         if context.get('sync_update_execution') is None:
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            level = user.company_id.instance_id.level
 
             if level == 'section': # section = HQ
                 if previous_state == 'created' and context['state'] == 'draft':
@@ -183,7 +186,7 @@
                               "All next periods must be at a lower state."))
             # / Check state consistency
 
-            if period.state == 'draft':
+            if period.state == 'draft':  # Open
                 # check if there are draft payroll entries in the period. Ticket uftp-89
                 if context['state'] == 'field-closed':
                     hr_payroll_msf_obj = self.pool.get('hr.payroll.msf')
@@ -193,6 +196,16 @@
                     # UFTP-351: Check that no Journal Entries are Unposted for this period
                     self.check_unposted_entries(cr, uid, period.id, context=context)
 
+                    # check that the reval has been processed in coordo IF a revaluation account has been set in the Company form
+                    if level == 'coordo' and not period.special and company.revaluation_default_account:
+                        reval_journal_ids = journal_obj.search(cr, uid, [('type', '=', 'revaluation'), ('is_current_instance', '=', True)], context=context)
+                        if not reval_journal_ids:
+                            raise osv.except_osv(_('Warning'), _('Impossible to check the revaluation entries of the period: '
+                                                                 'Revaluation Journal not found.'))
+                        move_line_dom = [('journal_id', 'in', reval_journal_ids), ('period_id', '=', period.id)]
+                        if not move_line_obj.search_exist(cr, uid, move_line_dom, context=context):
+                            raise osv.except_osv(_('Warning'), _('You should run the month-end revaluation before closing the period.'))
+
                 # first verify that all existent registers for this period are closed
                 reg_ids = reg_obj.search(cr, uid, [('period_id', '=', period.id)], context=context)
                 journal_ok = []
@@ -242,7 +255,7 @@
                 WHERE period_id = %s"""
                 cr.execute(sql, (period.id,))
                 res = [x[0] for x in cr.fetchall()]
-                comp_curr_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
+                comp_curr_id = company.currency_id.id
                 # for each currency do a verification about fx rate
                 for period_id in res:
                     # search for company currency_id if ID is None
@@ -278,7 +291,6 @@
                 self.check_unposted_entries(cr, uid, period.id, context=context)
 
         # check if unposted move lines are linked to this period
-        move_line_obj = self.pool.get('account.move.line')
         move_lines = move_line_obj.search(cr, uid, [('period_id', 'in', ids)])
         for move_line in move_line_obj.browse(cr, uid, move_lines):
             if move_line.state != 'valid':

=== 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-05 13:46:48 +0000
@@ -107372,3 +107372,15 @@
 #: report:purchase.order.merged:0
 msgid "Functional total cost :"
 msgstr "Total Coût Fonctionnel :"
+
+#. module: account_period_closing_level
+#: code:addons/account_period_closing_level/account_period.py:203
+#, python-format
+msgid "Impossible to check the revaluation entries of the period: Revaluation Journal not found."
+msgstr "Impossible de vérifier les écritures de réévaluation de la période : Journal de Réévaluation non trouvé."
+
+#. module: account_period_closing_level
+#: code:addons/account_period_closing_level/account_period.py:207
+#, python-format
+msgid "You should run the month-end revaluation before closing the period."
+msgstr "Veuillez lancer la réévaluation de fin de mois avant de fermer la période."