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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2019-01-03 09:17:52 +0000
+++ bin/addons/msf_doc_import/account.py	2019-05-13 07:25:22 +0000
@@ -71,33 +71,34 @@
             # Browse result
             b_entries = self.pool.get('msf.doc.import.accounting.lines').browse(cr, uid, entries)
             # Update wizard
-            self.write(cr, uid, [w.id], {'message': _('Grouping by currencies…'), 'progression': 10.0})
-            # Search all currencies (to create moves)
-            available_currencies = {}
+            self.write(cr, uid, [w.id], {'message': _('Grouping by currency and date…'), 'progression': 10.0})
+            # Group entries by currency, period and doc date (to create moves)
+            curr_date_group = {}
             for entry in b_entries:
-                if (entry.currency_id.id, entry.period_id.id) not in available_currencies:
-                    available_currencies[(entry.currency_id.id, entry.period_id.id)] = []
-                available_currencies[(entry.currency_id.id, entry.period_id.id)].append(entry)
+                # note: having different periods is possible only for December dates (ex: Period 13 and 14)
+                if (entry.currency_id.id, entry.period_id.id, entry.document_date) not in curr_date_group:
+                    curr_date_group[(entry.currency_id.id, entry.period_id.id, entry.document_date)] = []
+                curr_date_group[(entry.currency_id.id, entry.period_id.id, entry.document_date)].append(entry)
             # Update wizard
-            self.write(cr, uid, ids, {'message': _('Writing a move for each currency…'), 'progression': 20.0})
+            self.write(cr, uid, ids, {'message': _('Writing of the Journal Entries…'), 'progression': 20.0})
             num = 1
-            nb_currencies = float(len(available_currencies))
+            nb_entries = float(len(curr_date_group))
             remaining_percent = 80.0
-            step = float(remaining_percent / nb_currencies)
-            for c_id, p_id in available_currencies:
+            step = float(remaining_percent / nb_entries)
+            for currency_id, period_id, document_date in curr_date_group:
                 # Create a move
                 move_vals = {
-                    'currency_id': c_id,
-                    'manual_currency_id': c_id,
+                    'currency_id': currency_id,
+                    'manual_currency_id': currency_id,
                     'journal_id': journal_id,
-                    'document_date': w.date,
+                    'document_date': document_date,
                     'date': w.date,
-                    'period_id': p_id,
+                    'period_id': period_id,
                     'status': 'manu',
                     'imported': True,
                 }
                 move_id = self.pool.get('account.move').create(cr, uid, move_vals, context)
-                for l_num, l in enumerate(available_currencies[(c_id, p_id)]):
+                for l_num, l in enumerate(curr_date_group[(currency_id, period_id, document_date)]):
                     # Update wizard
                     progression = 20.0 + ((float(l_num) / float(len(b_entries))) * step) + (float(num - 1) * step)
                     self.write(cr, uid, [w.id], {'progression': progression})
@@ -107,7 +108,7 @@
                         distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {}, context)
                         common_vals = {
                             'distribution_id': distrib_id,
-                            'currency_id': c_id,
+                            'currency_id': currency_id,
                             'percentage': 100.0,
                             'date': l.date,
                             'source_date': l.date,
@@ -123,13 +124,13 @@
                         'name': l.description,
                         'reference': l.ref,
                         'account_id': l.account_id.id,
-                        'period_id': p_id,
+                        'period_id': period_id,
                         'document_date': l.document_date,
                         'date': l.date,
                         'journal_id': journal_id,
                         'debit_currency': l.debit,
                         'credit_currency': l.credit,
-                        'currency_id': c_id,
+                        'currency_id': currency_id,
                         'analytic_distribution_id': distrib_id,
                         'partner_id': l.partner_id and l.partner_id.id or False,
                         'employee_id': l.employee_id and l.employee_id.id or False,
@@ -246,6 +247,7 @@
                         raise osv.except_osv(_('Error'), _("'%s' column not found in file.") % (el or '',))
                 # All lines
                 money = {}
+                doc_date_periods = set()
                 # Update wizard
                 self.write(cr, uid, [wiz.id], {'message': _('Reading lines…'), 'progression': 6.00})
                 # Check file's content
@@ -284,6 +286,9 @@
                         errors.append(_('Line %s, the column \'Document Date\' have to be of type DateTime. Check the spreadsheet format (or export a document to have an example).') % (current_line_num,))
                         continue
                     r_document_date = line[cols['Document Date']].strftime('%Y-%m-%d')
+                    doc_date_period_ids = period_obj.get_period_from_date(cr, uid, r_document_date, context=context)
+                    if doc_date_period_ids:
+                        doc_date_periods.add(doc_date_period_ids[0])
                     # Check on booking amounts: ensure that one (and only one) value exists and that its amount isn't negative
                     book_debit = 0
                     book_credit = 0
@@ -325,29 +330,32 @@
                     if not line[cols['Booking Currency']]:
                         errors.append(_('Line %s. No currency specified!') % (current_line_num,))
                         continue
-                    curr_ids = self.pool.get('res.currency').search(cr, uid, [('name', '=', line[cols['Booking Currency']])])
+                    booking_curr = line[cols['Booking Currency']]
+                    curr_ids = self.pool.get('res.currency').search(cr, uid, [('name', '=', booking_curr)])
                     if not curr_ids:
-                        errors.append(_('Line %s. Currency not found: %s') % (current_line_num, line[cols['Booking Currency']],))
+                        errors.append(_('Line %s. Currency not found: %s') % (current_line_num, booking_curr,))
                         continue
                     for c in self.pool.get('res.currency').browse(cr, uid, curr_ids):
                         if not c.active:
-                            errors.append(_('Line %s. Currency is not active: %s') % (current_line_num, line[cols['Booking Currency']],))
+                            errors.append(_('Line %s. Currency is not active: %s') % (current_line_num, booking_curr,))
                             continue
                     r_currency = curr_ids[0]
-                    if not line[cols['Booking Currency']] in money:
-                        money[line[cols['Booking Currency']]] = {}
-                    if not 'debit' in money[line[cols['Booking Currency']]]:
-                        money[line[cols['Booking Currency']]]['debit'] = 0
-                    if not 'credit' in money[line[cols['Booking Currency']]]:
-                        money[line[cols['Booking Currency']]]['credit'] = 0
-                    if not 'name' in money[line[cols['Booking Currency']]]:
-                        money[line[cols['Booking Currency']]]['name'] = line[cols['Booking Currency']]
+                    if not line[cols['Period']]:
+                        errors.append(_('Line %s. Period is missing.') % (current_line_num))
+                        continue
+                    period_name = line[cols['Period']]
+                    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)]:
+                        money[(booking_curr, period_name, r_document_date)]['debit'] = 0
+                    if not 'credit' in money[(booking_curr, period_name, r_document_date)]:
+                        money[(booking_curr, period_name, r_document_date)]['credit'] = 0
                     # Increment global debit/credit
                     if book_debit:
-                        money[line[cols['Booking Currency']]]['debit'] += book_debit
+                        money[(booking_curr, period_name, r_document_date)]['debit'] += book_debit
                         r_debit = book_debit
                     if book_credit:
-                        money[line[cols['Booking Currency']]]['credit'] += book_credit
+                        money[(booking_curr, period_name, r_document_date)]['credit'] += book_credit
                         r_credit = book_credit
 
                     # Check which journal it is to be posted to: should be of type OD, MIG or INT
@@ -504,12 +512,12 @@
                                 continue
 
                     # US-937: use period of import file
-                    if line[cols['Period']].startswith('Period 16'):
+                    if period_name.startswith('Period 16'):
                         raise osv.except_osv(_('Warning'), _("You can't import entries in Period 16."))
                     period_ids = period_obj.search(
                         cr, uid, [
                             ('id', 'in', wiz_period_ids),
-                            ('name', '=', line[cols['Period']]),
+                            ('name', '=', period_name),
                         ], limit=1, context=context)
                     if not period_ids:
                         raise osv.except_osv(_('Warning'),
@@ -603,12 +611,16 @@
                         continue
                     created += 1
                 # Check if all is ok for the file
+                if len(doc_date_periods) > 1:
+                    errors.append(_('All Document Dates should be in the same period.'))
                 ## The lines should be balanced for each currency
                 if not errors:
                     # to compare the right amounts do the check only if no line has been ignored because of an error
-                    for c in money:
-                        if abs(money[c]['debit'] - money[c]['credit']) > 10**-3:
-                            raise osv.except_osv(_('Error'), _('Currency %s is not balanced: %s') % (money[c]['name'], (money[c]['debit'] - money[c]['credit']),))
+                    for curr, per, doc_date in money:
+                        amount = money[(curr, per, doc_date)]['debit'] - money[(curr, per, doc_date)]['credit']
+                        if abs(amount) > 10**-3:
+                            raise osv.except_osv(_('Error'), _('Amount unbalanced for the Currency %s and the Document Date %s (Period: %s): %s') %
+                                                 (curr, doc_date, per, amount,))
             # Update wizard
             self.write(cr, uid, ids, {'message': _('Check complete. Reading potential errors or write needed changes.'), 'progression': 100.0})
 

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-05-10 15:26:36 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-05-13 07:25:22 +0000
@@ -23872,10 +23872,10 @@
 msgstr "Derniers taux de change"
 
 #. module: msf_doc_import
-#: code:addons/msf_doc_import/account.py:73
+#: code:addons/msf_doc_import/account.py:74
 #, python-format
-msgid "Grouping by currencies…"
-msgstr "Regroupement par monnaies…"
+msgid "Grouping by currency and date…"
+msgstr "Regroupement par devise et date…"
 
 #. module: stock_override
 #: field:stock.picking,incoming_id:0
@@ -41335,10 +41335,10 @@
 msgstr "Retry from time"
 
 #. module: msf_doc_import
-#: code:addons/msf_doc_import/account.py:588
+#: code:addons/msf_doc_import/account.py:622
 #, python-format
-msgid "Currency %s is not balanced: %s"
-msgstr "La devise %s n'est pas équilibrée : %s"
+msgid "Amount unbalanced for the Currency %s and the Document Date %s (Period: %s): %s"
+msgstr "Montant non équilibré pour la Devise %s et la Date de Document %s (Période : %s) : %s"
 
 #. module: msf_partner
 #: code:addons/msf_partner/partner.py:754
@@ -58195,10 +58195,10 @@
 msgstr "Valeurs d'origine"
 
 #. module: msf_doc_import
-#: code:addons/msf_doc_import/account.py:81
+#: code:addons/msf_doc_import/account.py:83
 #, python-format
-msgid "Writing a move for each currency…"
-msgstr "Enregistrement d'une écriture comptable pour chaque monnaie…"
+msgid "Writing of the Journal Entries…"
+msgstr "Enregistrement des Écritures Comptables…"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:677
@@ -105896,6 +105896,7 @@
 #: field:product.mass.update,empty_status:0
 msgid "Set Status as empty"
 msgstr "Mettre le Statut à vide"
+<<<<<<< TREE
 
 #. module: sourcing
 #: code:addons/sourcing/sale_order_line.py:1606
@@ -105941,3 +105942,17 @@
 #, python-format
 msgid "Please ensure that you selected the correct Source document because once the line is saved you will not be able to edit this field anymore. In case of mistake, the only option will be to Cancel the line and Create a new one with the correct Source document."
 msgstr "Veuillez vous assurer que vous avez selectionné la bonne valeur pour le champ \"Document d'origine\". Une fois enregistrée cette valeur ne sera plus modifiable. En cas d'erreur la seule solution sera d'Annuler cette ligne et d'en créer une nouvelle."
+=======
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:343
+#, python-format
+msgid "Line %s. Period is missing."
+msgstr "Ligne %s. Il manque la Période."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:615
+#, python-format
+msgid "All Document Dates should be in the same period."
+msgstr "Toutes les Dates de Document doivent être dans la même période."
+>>>>>>> MERGE-SOURCE