fix(plaid): Do not sync pending transactions

(cherry picked from commit 46ea868559)

# Conflicts:
#	erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
This commit is contained in:
Deepesh Garg
2023-10-25 22:58:24 +05:30
committed by Mergify
parent fd21dcd3b5
commit ffdc11bbf6
2 changed files with 7 additions and 4 deletions

View File

@@ -89,7 +89,6 @@ class BankTransaction(StatusUpdater):
- 0 > a: Error: already over-allocated
- clear means: set the latest transaction date as clearance date
"""
gl_bank_account = frappe.db.get_value("Bank Account", self.bank_account, "account")
remaining_amount = self.unallocated_amount
for payment_entry in self.payment_entries:
if payment_entry.allocated_amount == 0.0:

View File

@@ -7,7 +7,7 @@ import frappe
from frappe import _
from frappe.desk.doctype.tag.tag import add_tag
from frappe.model.document import Document
from frappe.utils import add_months, formatdate, getdate, today
from frappe.utils import add_months, formatdate, getdate, sbool, today
from plaid.errors import ItemError
from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
@@ -238,8 +238,11 @@ def new_bank_transaction(transaction):
deposit = abs(amount)
withdrawal = 0.0
<<<<<<< HEAD
status = "Pending" if transaction["pending"] == "True" else "Settled"
=======
>>>>>>> 46ea868559 (fix(plaid): Do not sync pending transactions)
tags = []
try:
tags += transaction["category"]
@@ -247,13 +250,14 @@ def new_bank_transaction(transaction):
except KeyError:
pass
if not frappe.db.exists("Bank Transaction", dict(transaction_id=transaction["transaction_id"])):
if not frappe.db.exists(
"Bank Transaction", dict(transaction_id=transaction["transaction_id"])
) and not sbool(transaction["pending"]):
try:
new_transaction = frappe.get_doc(
{
"doctype": "Bank Transaction",
"date": getdate(transaction["date"]),
"status": status,
"bank_account": bank_account,
"deposit": deposit,
"withdrawal": withdrawal,