14 amt dtl camt54

account_statement_import_camt/models/parser.py

@@ -33,6 +33,7 @@ def parse_amount(self, ns, node):
             amount = sign * float(amount_node[0].text)
         return amount
 
+
     def add_value_from_node(self, ns, node, xpath_str, obj, attr_name, join_str=None):
         """Add value to object from first or all nodes found with xpath.
 
@@ -188,20 +189,8 @@ def parse_transaction_details(self, ns, node, transaction):
             transaction,
             "ref",
         )
-        amount = self.parse_amount(ns, node)
-        if amount != 0.0:
-            if transaction["amount"] != 0 and transaction["amount"] != amount:
-                # Probably currencies in this transaction
-                ntry_dtls_currency = node.xpath("ns:Amt/@Ccy", namespaces={"ns": ns})[0]
-                ntry_currency = node.xpath("../../ns:Amt/@Ccy", namespaces={"ns": ns})[0]
-                if ntry_currency and ntry_dtls_currency and  ntry_currency != ntry_dtls_currency:
-                    other_currency = self.env["res.currency"].search(
-                        [("name", "=", ntry_dtls_currency)], limit=1
-                    )
-                    transaction["amount_currency"] = amount
-                    transaction["foreign_currency_id"] = other_currency.id
-            else:
-                transaction["amount"] = amount
+        self.parse_amount_details(ns, node,transaction)
+
         # remote party values
         ultmtdbtr = node.xpath("./ns:RltdPties/ns:UltmtDbtr", namespaces={"ns": ns})
         if ultmtdbtr:
@@ -266,6 +255,22 @@ def parse_transaction_details(self, ns, node, transaction):
                     "account_number",
                 )
 
+    def parse_amount_details(self,ns,node,transaction):
+        amount = self.parse_amount(ns,node)
+        if amount != 0.0:
+            if transaction["amount"] != 0 and transaction["amount"] != amount:
+                # Probably currencies in this transaction
+                ntry_dtls_currency = node.xpath("ns:Amt/@Ccy", namespaces={"ns": ns})[0]
+                ntry_currency = node.xpath("../../ns:Amt/@Ccy", namespaces={"ns": ns})[0]
+                if ntry_currency and ntry_dtls_currency and ntry_currency != ntry_dtls_currency:
+                    other_currency = self.env["res.currency"].search(
+                        [("name", "=", ntry_dtls_currency)], limit=1
+                    )
+                    transaction["amount_currency"] = amount
+                    transaction["foreign_currency_id"] = other_currency.id
+            else:
+                transaction["amount"] = amount
+
     def generate_narration(self, transaction):
         # this block ensure compatibility with v13
         transaction["narration"] = {

account_statement_import_camt54/models/parser.py

@@ -108,6 +108,16 @@ def parse_transaction_details(self, ns, node, transaction):
         )
         return True
 
+    def parse_amount_details(self,ns,node,transaction):
+        re_camt_version = re.compile(
+            r"(^urn:iso:std:iso:20022:tech:xsd:camt.054."
+            r"|^ISO:camt.054.)"
+        )
+        if re_camt_version.search(ns):
+            #camt54 use amounts only from txdtls
+            transaction['amount'] = self.parse_amount(ns,node)
+        super().parse_amount_details(ns,node,transaction)
+
     def parse_statement(self, ns, node):
         """In case of a camt54 file, the QR-IBAN to be used as the account_number
         is found in another place than the IBAN."""