Merge branch 'master' of https://github.com/libracore/erpnextswiss

Author: lasalesi

erpnextswiss/erpnextswiss/page/bank_wizard/bank_wizard.py

@@ -302,19 +302,19 @@ def read_camt_transactions(transaction_entries, account, settings):
                     if credit_debit == "DBIT":
                         # use RltdPties:Cdtr
                         if six.PY2:
-                            party_soup = BeautifulSoup(unicode(transaction_soup.txdtls.rltdpties.cdtr)) 
+                            party_soup = BeautifulSoup(unicode(transaction_soup.txdtls.rltdpties.cdtr), 'lxml') 
                         else:
-                            party_soup = BeautifulSoup(str(transaction_soup.txdtls.rltdpties.cdtr)) 
+                            party_soup = BeautifulSoup(str(transaction_soup.txdtls.rltdpties.cdtr), 'lxml') 
                         try:
                             party_iban = transaction_soup.cdtracct.id.iban.get_text()
                         except:
                             party_iban = ""
                     else:
                         # CRDT: use RltdPties:Dbtr
                         if six.PY2:
-                            party_soup = BeautifulSoup(unicode(transaction_soup.txdtls.rltdpties.dbtr))
+                            party_soup = BeautifulSoup(unicode(transaction_soup.txdtls.rltdpties.dbtr), 'lxml')
                         else:
-                            party_soup = BeautifulSoup(str(transaction_soup.txdtls.rltdpties.dbtr))
+                            party_soup = BeautifulSoup(str(transaction_soup.txdtls.rltdpties.dbtr), 'lxml')
                         try:
                             party_iban = transaction_soup.dbtracct.id.iban.get_text()
                         except:

erpnextswiss/public/js/purchase_invoice.js

@@ -133,8 +133,8 @@ function check_scan_input(frm, default_settings, code_scan) {
             frappe.msgprint(invalid_esr_code_line);
         } else {
             var amount = parseFloat(lines[18]);
-            var reference = lines[28];
-            var participant = lines[3];
+            var reference = lines[28].replace("\r","").replace("\n","");
+            var participant = lines[3].replace("\r","").replace("\n","");
             get_data_based_on_esr(frm, participant, reference, amount, default_settings);
         }
     }