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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2019-12-12 15:19:07 +0000
+++ bin/addons/msf_doc_import/account.py	2020-03-10 17:00:58 +0000
@@ -344,6 +344,11 @@
                         errors.append(_('Line %s. Period is missing.') % (current_line_num))
                         continue
                     period_name = line[cols['Period']]
+                    if not isinstance(period_name, basestring):
+                        period_name = '%s' % period_name
+                    if not period_obj.search_exist(cr, uid, [('name', '=', period_name)], context=context):
+                        errors.append(_("Line %s. The period %s doesn't exist.") % (current_line_num, period_name,))
+                        continue
                     if not (booking_curr, period_name, r_document_date) in money:
                         money[(booking_curr, period_name, r_document_date)] = {}
                     if not 'debit' in money[(booking_curr, period_name, r_document_date)]:

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-02-25 13:42:01 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-03-10 17:00:58 +0000
@@ -108985,3 +108985,9 @@
 #: field:replenishment.segment.line,list_fmc:0
 msgid "more FMC"
 msgstr "plus de PCM"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:350
+#, python-format
+msgid "Line %s. The period %s doesn't exist."
+msgstr "Ligne %s. La période %s n'existe pas."