Merge lp:~julie-w/unifield-server/US-7247 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:40 +0000
@@ -92,7 +92,7 @@
                 move_vals = {
                     'currency_id': currency_id,
                     'manual_currency_id': currency_id,
-                    'journal_id': journal_id,
+                    'journal_id': journal_id,  # the instance_id will be the instance of this journal i.e. the current one
                     'document_date': document_date,
                     'date': w.date,
                     'period_id': period_id,
@@ -130,7 +130,7 @@
                         'period_id': period_id,
                         'document_date': l.document_date,
                         'date': l.date,
-                        'journal_id': journal_id,
+                        'journal_id': journal_id,  # the instance_id will be the instance of this journal i.e. the current one
                         'debit_currency': l.debit,
                         'credit_currency': l.credit,
                         'currency_id': currency_id,
@@ -187,7 +187,7 @@
         created = 0
         processed = 0
         errors = []
-        current_instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id.id or False
+        current_instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id or False
 
         current_line_num = None
         try:
@@ -232,7 +232,9 @@
                 self.write(cr, uid, [wiz.id], {'message': _('Reading headers…'), 'progression': 5.00})
                 # Use the first row to find which column to use
                 cols = {}
-                col_names = ['Journal Code', 'Description', 'Reference', 'Document Date', 'Posting Date', 'Period', 'G/L Account', 'Partner', 'Employee', 'Journal', 'Destination', 'Cost Centre', 'Funding Pool', 'Booking Debit', 'Booking Credit', 'Booking Currency']
+                col_names = ['Proprietary Instance', 'Journal Code', 'Description', 'Reference', 'Document Date', 'Posting Date', 'Period',
+                             'G/L Account', 'Partner', 'Employee', 'Journal', 'Destination', 'Cost Centre', 'Funding Pool', 'Booking Debit',
+                             'Booking Credit', 'Booking Currency']
                 for num, r in enumerate(rows):
                     header = [x and x.data for x in r.iter_cells()]
                     for el in col_names:
@@ -281,6 +283,10 @@
 
                     self._format_special_char(line)
 
+                    file_prop_inst = line[cols['Proprietary Instance']] or ''
+                    if current_instance and current_instance.code != file_prop_inst.strip():
+                        errors.append(_('Line %s. The Proprietary Instance must be the current instance %s.') % (current_line_num, current_instance.code))
+                        continue
                     # Check document date
                     if not line[cols['Document Date']]:
                         errors.append(_('Line %s. No document date specified!') % (current_line_num,))
@@ -364,7 +370,7 @@
                         continue
                     else:
                         # check for a valid journal code
-                        aj_ids = aj_obj.search(cr, uid, [('code', '=', line[cols['Journal Code']]), ('instance_id', '=', current_instance)])
+                        aj_ids = aj_obj.search(cr, uid, [('code', '=', line[cols['Journal Code']]), ('instance_id', '=', current_instance.id)])
                         if not aj_ids:
                             errors.append(_('Line %s. Journal Code not found: %s.') % (current_line_num, line[cols['Journal Code']]))
                             continue
@@ -413,7 +419,7 @@
                         else:
                             r_employee = tp_ids[0]
                     if line[cols['Journal']]:
-                        tp_ids = self.pool.get('account.journal').search(cr, uid, ['|', ('name', '=', line[cols['Journal']]), ('code', '=', line[cols['Journal']]), ('instance_id', '=', current_instance)])
+                        tp_ids = self.pool.get('account.journal').search(cr, uid, ['|', ('name', '=', line[cols['Journal']]), ('code', '=', line[cols['Journal']]), ('instance_id', '=', current_instance.id)])
                         if not tp_ids:
                             tp_label = _('Journal')
                             tp_content = line[cols['Journal']]

=== 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:40 +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:287
+#, python-format
+msgid "Line %s. The Proprietary Instance must be the current instance %s."
+msgstr "Ligne %s. L'Instance Propriétaire doit être l'instance actuelle %s."