update to use currencies info from wise camt statement #36
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,15 +24,83 @@ def parse_amount(self, ns, node): | |
| sign_node = node.xpath("../../ns:CdtDbtInd", namespaces={"ns": ns}) | ||
| if sign_node and sign_node[0].text == "DBIT": | ||
| sign = -1 | ||
| # Priority 1: Main amount (usually in account currency) | ||
| amount_node = node.xpath("ns:Amt", namespaces={"ns": ns}) | ||
| # Priority 2: Detail amount if main is missing | ||
| if not amount_node: | ||
| amount_node = node.xpath("./ns:AmtDtls/ns:TxAmt/ns:Amt", | ||
| namespaces={"ns": ns}) | ||
| if amount_node: | ||
| amount = sign * float(amount_node[0].text) | ||
| return amount | ||
|
|
||
| def parse_entry(self, ns, node): | ||
| """Parse an Ntry node and yield transactions""" | ||
| transaction = { | ||
| "payment_ref": "/", | ||
| "amount": 0, | ||
| "narration": {}, | ||
| "transaction_type": {}, | ||
| } | ||
| self.add_value_from_node(ns, node, "./ns:BookgDt/ns:Dt | ./ns:BookgDt/ns:DtTm", | ||
| transaction, "date") | ||
| self.add_value_from_node(ns, node, | ||
| ["./ns:Amt/@Ccy", "./ns:AmtDtls/ns:TxAmt/ns:Amt/@Ccy"], | ||
| transaction, "currency") | ||
|
|
||
| # ALWAYS parse the main amount first (for the bank account currency) | ||
| amount = self.parse_amount(ns, node) | ||
| if amount != 0.0: | ||
| transaction["amount"] = amount | ||
|
|
||
| self.add_value_from_node(ns, node, | ||
| ["./ns:NtryDtls/ns:RmtInf/ns:Strd/ns:CdtrRefInf/ns:Ref", | ||
| "./ns:NtryDtls/ns:Btch/ns:PmtInfId", | ||
| "./ns:NtryDtls/ns:TxDtls/ns:Refs/ns:AcctSvcrRef", | ||
| "./ns:AcctSvcrRef"], transaction, "ref") | ||
| self.add_value_from_node(ns, node, ["./ns:AddtlNtryInf"], transaction, | ||
| "payment_ref") | ||
| self.add_value_from_node(ns, node, "./ns:AddtlNtryInf", | ||
| transaction["narration"], "%s (AddtlNtryInf)" % _( | ||
| "Additional Entry Information")) | ||
| self.add_value_from_node(ns, node, "./ns:RvslInd", transaction["narration"], | ||
| "%s (RvslInd)" % _("Reversal Indicator")) | ||
| self.add_value_from_node(ns, node, "./ns:BkTxCd/ns:Domn/ns:Cd", | ||
| transaction["transaction_type"], "Code") | ||
| self.add_value_from_node(ns, node, "./ns:BkTxCd/ns:Domn/ns:Fmly/ns:Cd", | ||
| transaction["transaction_type"], "FmlyCd") | ||
| self.add_value_from_node(ns, node, "./ns:BkTxCd/ns:Domn/ns:Fmly/ns:SubFmlyCd", | ||
| transaction["transaction_type"], "SubFmlyCd") | ||
|
|
||
| transaction["transaction_type"] = "-".join( | ||
| transaction["transaction_type"].values()) or "" | ||
| details_nodes = node.xpath("./ns:NtryDtls/ns:TxDtls", namespaces={"ns": ns}) | ||
| chrg_inc = node.xpath("./ns:Chrgs/ns:Rcrd/ns:ChrgInclInd", | ||
| namespaces={"ns": ns}) | ||
| if chrg_inc and chrg_inc[0].text == "true": | ||
| details_nodes += node.xpath("./ns:Chrgs/ns:Rcrd", namespaces={"ns": ns}) | ||
|
|
||
| if len(details_nodes) == 0: | ||
| # Check for foreign currency even if no TxDtls | ||
| self.parse_amount_details_currency(ns, node, transaction) | ||
| transaction.pop("currency", None) | ||
| self.generate_narration(transaction) | ||
| yield transaction | ||
| return | ||
|
|
||
| transaction_base = transaction | ||
| for det_node in details_nodes: | ||
| transaction = transaction_base.copy() | ||
| transaction["narration"] = transaction_base["narration"].copy() | ||
| self.parse_transaction_details(ns, det_node, transaction) | ||
| # Try to discover foreign currency from the details node or parent entry node | ||
| self.parse_amount_details_currency(ns, det_node, transaction) | ||
| if "foreign_currency_id" not in transaction: | ||
| self.parse_amount_details_currency(ns, node, transaction) | ||
|
|
||
| transaction.pop("currency", None) | ||
| self.generate_narration(transaction) | ||
| yield transaction | ||
| def add_value_from_node(self, ns, node, xpath_str, obj, attr_name, join_str=None): | ||
|
There was a problem hiding this comment. According to PEP 8, method definitions inside a class should be separated by a single blank line. Please add a blank line before def add_value_from_node(self, ns, node, xpath_str, obj, attr_name, join_str=None):References
|
||
| """Add value to object from first or all nodes found with xpath. | ||
|
|
||
|
|
@@ -258,28 +326,38 @@ def parse_transaction_details(self, ns, node, transaction): | |
| ) | ||
|
|
||
| def parse_amount_details_currency(self, ns, node, transaction): | ||
| add_currency = False | ||
| ntry_dtls_currency = None | ||
| currency_amount = 0.0 | ||
| # 1. Handle cases with Target Currency and Exchange Rate (e.g., card fees) | ||
| trgt_ccy = node.xpath(".//ns:CcyXchg/ns:TrgtCcy", namespaces={"ns": ns}) | ||
| if trgt_ccy and transaction.get("currency") != trgt_ccy[0].text: | ||
| rate = node.xpath(".//ns:CcyXchg/ns:XchgRate", namespaces={"ns": ns}) | ||
| amt_main = node.xpath("ns:Amt", namespaces={"ns": ns}) | ||
| if rate and amt_main: | ||
| ntry_dtls_currency = trgt_ccy[0].text | ||
| currency_amount = float(amt_main[0].text) * float(rate[0].text) | ||
| add_currency = True | ||
| # 2. Fallback: Search for any explicit currency attribute different from the main one | ||
| if not add_currency: | ||
| ccy_nodes = node.xpath(".//ns:AmtDtls//@Ccy", namespaces={"ns": ns}) | ||
| for ccy in ccy_nodes: | ||
| if ccy != transaction.get("currency"): | ||
| val_node = node.xpath(f".//ns:AmtDtls//*[@Ccy='{ccy}']", | ||
| namespaces={"ns": ns}) | ||
| if val_node: | ||
| ntry_dtls_currency = ccy | ||
| currency_amount = float(val_node[0].text) | ||
| add_currency = True | ||
| break | ||
|
Comment on lines
+343
to
+352
There was a problem hiding this comment. This loop is inefficient because it performs a new XPath search ( ccy_nodes = node.xpath(".//ns:AmtDtls//*[@Ccy]", namespaces={"ns": ns})
for ccy_node in ccy_nodes:
ccy = ccy_node.get("Ccy")
if ccy != transaction.get("currency"):
ntry_dtls_currency = ccy
currency_amount = float(ccy_node.text)
add_currency = True
break |
||
| # 3. Update Odoo transaction dictionary if a foreign currency was found | ||
| if add_currency and ntry_dtls_currency: | ||
| other_currency = self.env["res.currency"].search( | ||
| [("name", "=", ntry_dtls_currency)], limit=1) | ||
| if other_currency: | ||
| sign = 1 if transaction.get("amount", 0) >= 0 else -1 | ||
| transaction["amount_currency"] = currency_amount * sign | ||
| transaction["foreign_currency_id"] = other_currency.id | ||
| return add_currency | ||
|
|
||
| def generate_narration(self, transaction): | ||
|
|
@@ -301,111 +379,6 @@ def generate_narration(self, transaction): | |
| ["%s: %s" % (key, val) for key, val in transaction["narration"].items()] | ||
| ) | ||
|
|
||
| def get_balance_amounts(self, ns, node): | ||
| """Return opening and closing balance. | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.