nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 07:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2023-11-01 14:11:36 +05:30
committed by GitHub
parent ffdc11bbf6
commit 357697702b
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
View File

@@ -238,11 +238,6 @@ def new_bank_transaction(transaction):
deposit = abs(amount) deposit = abs(amount)
withdrawal = 0.0 withdrawal = 0.0
<<<<<<< HEAD
status = "Pending" if transaction["pending"] == "True" else "Settled"
=======
>>>>>>> 46ea868559 (fix(plaid): Do not sync pending transactions)
tags = [] tags = []
try: try:
tags += transaction["category"] tags += transaction["category"]