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

[jftempo]

=== modified file 'bin/addons/msf_homere_interface/wizard/hr_payroll_import.py'
--- bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2018-12-07 13:34:24 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_payroll_import.py	2019-03-28 11:11:55 +0000
@@ -503,6 +503,7 @@
         xyargv = self._get_homere_password(cr, uid, pass_type='payroll')
 
         filename = ""
+        error_msg = ""
         wiz_state = False
         # Browse all given wizard
         for wiz in self.browse(cr, uid, ids):
@@ -525,10 +526,11 @@
             if zipobj.namelist():
                 namelist = zipobj.namelist()
                 # Search CSV
-                csvfile = None
+                csvfiles = []
+                currency_list = []
                 for name in namelist:
                     if name.split(file_ext_separator) and name.split(file_ext_separator)[-1] == file_ext:
-                        csvfile = name
+                        csvfiles.append(name)
                 if not 'envoi.ini' in namelist:
                     raise osv.except_osv(_('Warning'), _('No envoi.ini file found in given ZIP file!'))
                 # Read information from 'envoi.ini' file
@@ -542,8 +544,8 @@
                     raise osv.except_osv(_('Error'), _('Could not read envoi.ini file in given ZIP file.'))
                 if not field:
                     raise osv.except_osv(_('Warning'), _('Field not found in envoi.ini file.'))
-                # Read CSV file
-                if csvfile:
+                # Read CSV files
+                for csvfile in csvfiles:
                     try:
                         reader = csv.reader(zipobj.open(csvfile, 'r', xyargv), delimiter=';', quotechar='"', doublequote=False, escapechar='\\')
                         reader.next()
@@ -553,8 +555,10 @@
                     res = True
                     res_amount = 0.0
                     amount = 0.0
-                    error_msg = ""
+                    num_line = 1  # the header line is not taken into account
+                    file_error_msg = ""  # store the error/warning messages for the current file
                     for line in reader:
+                        num_line += 1
                         processed += 1
                         update, amount, nb_created, vals, ccy, msg = self.update_payroll_entries(
                             cr, uid, data=line, field=field,
@@ -563,13 +567,22 @@
                         res_amount += round(amount, 2)
                         if not update:
                             res = False
-                        if created == 0:
+                        if num_line == 2:  # the first line containing data
                             header_vals = vals
-                            header_vals['currency_code'] = ccy
+                            header_vals['currency_code'] = ccy  # note that the curr. is different from one file to another
+                            if ccy in currency_list:
+                                raise osv.except_osv(_('Error'), _('Several files contain lines with the currency %s. '
+                                                                   'Please use one file per currency.') % ccy)
+                            currency_list.append(ccy)
                         created += nb_created
 
                         if msg:
-                            error_msg += "Line " + str(processed) + ": " + msg + " \n"
+                            file_error_msg += _("Line %s: %s\n") % (str(num_line), msg)
+
+                    # complete the list of error messages with the ones from this file if any
+                    if file_error_msg:
+                        # add a line break between files
+                        error_msg += _("%sFile %s:\n%s") % (error_msg and "\n" or "", csvfile, file_error_msg)
 
                     # Check balance
                     res_amount_rounded = round(res_amount, 2)
@@ -585,7 +598,8 @@
                         pr_ids = self.pool.get('hr.payroll.msf').search(
                             cr, uid, [
                                 ('state', '=', 'draft'),
-                                ('name', '=', 'Payroll rounding')
+                                ('name', '=', 'Payroll rounding'),
+                                ('currency_id', '=', header_vals['currency_id']),
                             ])
                         if not pr_ids:
                             # no SAGA BALANCE rounding line in file
@@ -611,7 +625,7 @@
                             # - add both
                             new_amount = round(pr.amount, 2) + (-1 * res_amount_rounded)
                             self.pool.get('hr.payroll.msf').write(cr, uid, pr_ids[0], {'amount': round(new_amount, 2),})
-                else:
+                if not csvfiles:
                     raise osv.except_osv(_('Error'), _('Right CSV is not present in this zip file. Please use "File > File sending > Monthly" in Homère.'))
             fileobj.close()
 
 
=== modified file 'bin/addons/msf_homere_interface/wizard/hr_payroll_validation.py'
--- bin/addons/msf_homere_interface/wizard/hr_payroll_validation.py	2017-10-24 08:45:55 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_payroll_validation.py	2019-03-28 11:11:55 +0000
@@ -159,8 +159,12 @@
             self.check(cr, uid, context=context)  # check expense lines
             account_partner_not_compat_log = []
             self._update_message(cr, uid, ids, _('Checking account/partner compatibility...'), context, use_new_cursor)
+            currency_list = []
             for line in self.pool.get('hr.payroll.msf').read(cr, uid, line_ids,
-                                                             ['name', 'ref', 'partner_id', 'account_id', 'amount', 'employee_id', ]):
+                                                             ['name', 'ref', 'partner_id', 'account_id', 'amount', 'employee_id', 'currency_id']):
+                # store all the currencies used
+                if line['currency_id'] and line['currency_id'][0] not in currency_list:
+                    currency_list.append(line['currency_id'][0])
                 account_id = line.get('account_id', False) and line.get('account_id')[0] or False
                 if not account_id:
                     raise osv.except_osv(_('Error'), _('No account found!'))
@@ -206,7 +210,12 @@
                 'date': period_obj.get_date_in_period(cr, uid, move_date, period_id) or False,
                 'ref': 'Salaries' + ' ' + field,
             }
-            move_id = self.pool.get('account.move').create(cr, uid, move_vals, context=context)
+            # create one JE per currency (note that the JE currency_id depends on the currency of its lines)
+            am_by_curr = {}
+            for curr in currency_list:
+                move_vals_copy = move_vals.copy()  # avoids using the same Sequence for the different moves
+                move_id = self.pool.get('account.move').create(cr, uid, move_vals_copy, context=context)
+                am_by_curr[curr] = move_id
 
             # Create lines into this move
             current_line_position = 0
@@ -275,8 +284,9 @@
 
                 # UTP-1042: Specific partner's accounts are not needed.
                 # create move line values
+                line_curr = line.get('currency_id')[0]  # mandatory field
                 line_vals = {
-                    'move_id': move_id,
+                    'move_id': am_by_curr.get(line_curr),
                     'name': line.get('name', ''),
                     'date': line.get('date', ''),
                     'document_date': line.get('date', ''),
@@ -289,14 +299,19 @@
                     'credit_currency': credit,
                     'journal_id': journal_id,
                     'period_id': line.get('period_id', False) and line.get('period_id')[0] or period_id,
-                    'currency_id': line.get('currency_id', False) and line.get('currency_id')[0] or False,
+                    'currency_id': line_curr,
                     'analytic_distribution_id': distrib_id or False,
                 }
                 # create move line
                 self.pool.get('account.move.line').create(cr, uid, line_vals, check=False)
-            self._update_message(cr, uid, ids, _('Posting of the Journal Entry. This may take a while...'), context, use_new_cursor)
+            if len(am_by_curr) > 1:
+                msg = _('Posting of the Journal Entries. This may take a while...')
+            else:
+                msg = _('Posting of the Journal Entry. This may take a while...')
+            self._update_message(cr, uid, ids, msg, context, use_new_cursor)
             context['do_not_create_analytic_line'] = True
-            self.pool.get('account.move').post(cr, uid, [move_id], context=context)
+            for am_curr in am_by_curr:
+                self.pool.get('account.move').post(cr, uid, am_by_curr[am_curr], context=context)
             # Update payroll lines status
             self._update_percent(cr, uid, ids, 90, context, use_new_cursor)  # 90% of the total process time
             self._update_message(cr, uid, ids, _('Updating the status of the Journal Items...'), context, use_new_cursor)
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-03-04 11:05:48 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-03-28 11:11:55 +0000
@@ -47622,6 +47622,12 @@
 msgid "Posting of the Journal Entry. This may take a while..."
 msgstr "Comptabilisation de l'Ecriture Comptable. Cela peut prendre un certain temps..."
 
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_validation.py:307
+#, python-format
+msgid "Posting of the Journal Entries. This may take a while..."
+msgstr "Comptabilisation des Ecritures Comptables. Cela peut prendre un certain temps..."
+
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid "Manual or automatic creation of payment entries according to the statements"
@@ -105335,3 +105341,25 @@
 msgstr "\n"
 "                                        Attention: Les lignes suivantes ont des qté ou des montants sur plus de 15 chiffres. Veuillez vérifier la qté et le prix unitaire pour éviter des pertes d'information:\n"
 "                                    "
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:580
+#, python-format
+msgid "Line %s: %s\n"
+""
+msgstr "Ligne %s : %s\n"
+""
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:585
+#, python-format
+msgid "%sFile %s:\n"
+"%s"
+msgstr "%sFichier %s :\n"
+"%s"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:574
+#, python-format
+msgid "Several files contain lines with the currency %s. Please use one file per currency."
+msgstr "Plusieurs fichiers contiennent des lignes avec la devise %s. Veuillez utiliser un fichier par devise."
 
=== modified file 'bin/addons/sync_client/orm.py'
--- bin/addons/sync_client/orm.py	2019-03-04 11:05:48 +0000
+++ bin/addons/sync_client/orm.py	2019-03-28 11:11:55 +0000
@@ -132,6 +132,7 @@
     FROM ir_model_data
     WHERE module = 'sd' AND
           model = %s AND
+          COALESCE(touched, '') != '[]' AND
           """+add_sql+"""
           ("""+field+""" < last_modification OR """+field+""" IS NULL)""",
                        sql_params) # not_a_user_entry