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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2018-05-16 09:47:27 +0000
+++ bin/addons/msf_doc_import/account.py	2018-07-09 08:35:57 +0000
@@ -267,7 +267,7 @@
                     r_document_date = False
                     current_line_num = num + base_num
                     # Fetch all XML row values
-                    line = self.pool.get('import.cell.data').get_line_values(cr, uid, ids, r)
+                    line = self.pool.get('import.cell.data').get_line_values(cr, uid, ids, r, context=context)
 
                     # ignore empty lines
                     if not self._check_has_data(line):
@@ -283,11 +283,41 @@
                         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')
-                    # Bypass this line if NO debit AND NO credit
+                    # 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
                     try:
-                        if not line[cols['Booking Debit']] and not line[cols['Booking Credit']]:
+                        book_debit = line[cols['Booking Debit']]
+                        book_credit = line[cols['Booking Credit']]
+                        if book_debit and book_credit:
+                            errors.append(_('Line %s. Only one value (Booking Debit or Booking Credit) should be filled in.') % (current_line_num,))
+                            continue
+                        if not book_debit and not book_credit:
+                            # /!\ display different messages depending if values are zero or empty
+                            debit_is_zero = book_debit is 0 or book_debit is 0.0
+                            credit_is_zero = book_credit is 0 or book_credit is 0.0
+                            if debit_is_zero and credit_is_zero:
+                                errors.append(_('Line %s. Booking Debit and Booking Credit at 0, please change.') % (current_line_num,))
+                                continue
+                            elif not debit_is_zero and not credit_is_zero:
+                                # empty cells
+                                errors.append(_('Line %s. Please fill in either a Booking Debit or a Booking Credit value.') % (current_line_num,))
+                                continue
+                            else:
+                                amount_zero_str = debit_is_zero and _('Booking Debit') or _('Booking Credit')
+                                amount_empty_str = debit_is_zero and _('Booking Credit') or _('Booking Debit')
+                                errors.append(_('Line %s. %s at 0, %s empty, please change.') % (current_line_num,
+                                                                                                 amount_zero_str, amount_empty_str))
+                                continue
+                        if (book_debit and not isinstance(book_debit, (int, long, float))) or \
+                                (book_credit and not isinstance(book_credit, (int, long, float))):
+                            errors.append(_('Line %s. The Booking Debit or Credit amount is invalid and should be a number.') % (current_line_num,))
+                            continue
+                        if (book_debit and book_debit < 0) or (book_credit and book_credit < 0):
+                            errors.append(_('Line %s. Negative numbers are forbidden for the Booking Debit and Credit amounts.') % (current_line_num,))
                             continue
                     except IndexError:
+                        errors.append(_('Line %s. The Booking Debit and Credit amounts are missing.') % (current_line_num,))
                         continue
                     processed += 1
                     # Check that currency is active
@@ -312,12 +342,12 @@
                     if not 'name' in money[line[cols['Booking Currency']]]:
                         money[line[cols['Booking Currency']]]['name'] = line[cols['Booking Currency']]
                     # Increment global debit/credit
-                    if line[cols['Booking Debit']]:
-                        money[line[cols['Booking Currency']]]['debit'] += line[cols['Booking Debit']]
-                        r_debit = line[cols['Booking Debit']]
-                    if line[cols['Booking Credit']]:
-                        money[line[cols['Booking Currency']]]['credit'] += line[cols['Booking Credit']]
-                        r_credit = line[cols['Booking Credit']]
+                    if book_debit:
+                        money[line[cols['Booking Currency']]]['debit'] += book_debit
+                        r_debit = book_debit
+                    if book_credit:
+                        money[line[cols['Booking Currency']]]['credit'] += book_credit
+                        r_credit = book_credit
 
                     # Check which journal it is to be posted to: should be of type OD, MIG or INT
                     if not line[cols['Journal Code']]:
@@ -336,7 +366,7 @@
                                 errors.append(_('Line %s. Import of entries only allowed on the following journal(s): %s') % (current_line_num, journal_list))
                                 continue
                         aj_id = aj_ids[0]
-                        if num == 0:
+                        if file_journal_id == 0:  # take the journal from the first line where there was no "continue"
                             file_journal_id = aj_id
                         else:
                             if file_journal_id != aj_id:
@@ -573,9 +603,11 @@
                     created += 1
                 # Check if all is ok for the file
                 ## The lines should be balanced for each currency
-                for c in money:
-                    if abs(money[c]['debit'] - money[c]['credit']) >= 10**-2:
-                        raise osv.except_osv(_('Error'), _('Currency %s is not balanced: %s') % (money[c]['name'], (money[c]['debit'] - money[c]['credit']),))
+                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**-2:
+                            raise osv.except_osv(_('Error'), _('Currency %s is not balanced: %s') % (money[c]['name'], (money[c]['debit'] - money[c]['credit']),))
             # 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_doc_import/import_tools.py'
--- bin/addons/msf_doc_import/import_tools.py	2017-04-19 13:07:44 +0000
+++ bin/addons/msf_doc_import/import_tools.py	2018-07-09 08:35:57 +0000
@@ -28,14 +28,18 @@
     '''
     _name = 'import.cell.data'
 
-    def get_cell_data(self, cr, uid, ids, row, cell_nb):
+    def get_cell_data(self, cr, uid, ids, row, cell_nb, context=None):
+        if context is None:
+            context = {}
         cell_data = False
         try:
             line_content = row.cells
         except ValueError:
             line_content = row.cells
-        if line_content and len(line_content)-1>=cell_nb and row.cells[cell_nb] and row.cells[cell_nb].data:
-            cell_data = row.cells[cell_nb].data
+        if line_content and len(line_content) - 1 >= cell_nb and row.cells[cell_nb]:
+            if row.cells[cell_nb].data or context.get('from_je_import', False):
+                # at JE import store the exact value: 0.00 and False are handled differently
+                cell_data = row.cells[cell_nb].data
         return cell_data
 
     def get_purchase_id(self, cr, uid, ids, row, cell_nb, line_num, error_list, context=None):
@@ -130,10 +134,12 @@
                                         return False
         return False
 
-    def get_line_values(self, cr, uid, ids, row):
+    def get_line_values(self, cr, uid, ids, row, context=None):
+        if context is None:
+            context = {}
         list_of_values = []
         for cell_nb in range(len(row)):
-            cell_data = self.get_cell_data(cr, uid, ids, row, cell_nb)
+            cell_data = self.get_cell_data(cr, uid, ids, row, cell_nb, context=context)
             # cells filled with whitespace should behave the same as cells that are empty
             if isinstance(cell_data, basestring) and cell_data.isspace():
                 cell_data = ''

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-06-15 12:30:42 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-07-09 08:35:57 +0000
@@ -23962,10 +23962,11 @@
 msgid "Line %s. Only a single Journal Code can be specified per file"
 msgstr "Line %s. Only a single Journal Code can be specified per file"
 
-#. modules: account, account_mcdb, register_accounting
+#. modules: account, account_mcdb, register_accounting, msf_doc_import
 #: report:combined.journals.report.pdf:0
 #: report:addons/account_mcdb/report/combined_journals_report.mako:247
 #: report:addons/register_accounting/report/open_advances_xls.mako:154
+#: code:addons/msf_doc_import/account.py:308
 msgid "Booking Credit"
 msgstr "Crédit Devise d'enreg."
 
@@ -26375,10 +26376,11 @@
 msgid "Number to Ship"
 msgstr "Nombre à Expédier"
 
-#. modules: account, account_mcdb, register_accounting
+#. modules: account, account_mcdb, register_accounting, msf_doc_import
 #: report:combined.journals.report.pdf:0
 #: report:addons/account_mcdb/report/combined_journals_report.mako:244
 #: report:addons/register_accounting/report/open_advances_xls.mako:153
+#: code:addons/msf_doc_import/account.py:307
 msgid "Booking Debit"
 msgstr "Débit Devise d'enreg."
 
@@ -41334,10 +41336,10 @@
 msgstr "Retry from time"
 
 #. module: msf_doc_import
-#: code:addons/msf_doc_import/account.py:578
+#: code:addons/msf_doc_import/account.py:588
 #, python-format
 msgid "Currency %s is not balanced: %s"
-msgstr "Currency %s is not balanced: %s"
+msgstr "La devise %s n'est pas équilibrée : %s"
 
 #. module: msf_partner
 #: code:addons/msf_partner/partner.py:754
@@ -101265,3 +101267,44 @@
 msgid "Not Invoice"
 msgstr "Pas de Facture"
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:290
+#, python-format
+msgid "Line %s. Only one value (Booking Debit or Booking Credit) should be filled in."
+msgstr "Ligne %s. Seule une valeur (Débit ou Crédit en devise d'enregistrement) doit être renseignée."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:293
+#, python-format
+msgid "Line %s. The Booking Debit or Credit amount is invalid and should be a number."
+msgstr "Ligne %s. Le montant Débit ou Crédit en devise d'enregistrement est invalide et devrait être un nombre."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:296
+#, python-format
+msgid "Line %s. Negative numbers are forbidden for the Booking Debit and Credit amounts."
+msgstr "Ligne %s. Les nombres négatifs sont interdits pour les montants Débit et Crédit en devise d'enregistrement."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:299
+#, python-format
+msgid "Line %s. The Booking Debit and Credit amounts are missing."
+msgstr "Ligne %s. Il manque les montants Débit et Crédit en devise d'enregistrement."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:309
+#, python-format
+msgid "Line %s. %s at 0, %s empty, please change."
+msgstr "Ligne %s. %s à 0, %s vide, veuillez modifier."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:300
+#, python-format
+msgid "Line %s. Booking Debit and Booking Credit at 0, please change."
+msgstr "Ligne %s. Les montants Débit et Crédit en devise d'enregistrement sont à zéro, veuillez modifier."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:304
+#, python-format
+msgid "Line %s. Please fill in either a Booking Debit or a Booking Credit value."
+msgstr "Ligne %s. Veuillez renseigner une valeur en devise d'enregistrement, soit en débit soit en crédit."