From 10f53f04d75caa84999cf582ab9a66671e86e1f4 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 9 Apr 2020 12:15:11 +0530 Subject: [PATCH 1/3] chore: pinned python requirements dependencies from pip freeze of version-11 production environment --- requirements.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 28ba9f676ff..15cf42fcae0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,11 @@ frappe -unidecode -pygithub -googlemaps -python-stdnum -braintree -gocardless_pro -woocommerce -pandas -plaid-python \ No newline at end of file +Unidecode==1.1.1 +PyGithub==1.45 +googlemaps==4.2.0 +python-stdnum==1.13 +braintree==3.59.0;python_version<"3.6" +braintree==4.0.0;python_version>="3.6" +gocardless-pro==1.16.0 +WooCommerce==2.1.1 +pandas==0.24.2 +plaid-python==3.7.0 From d839c46f10117680c6ab30b0ae31bf4ba1738393 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Fri, 29 May 2020 10:16:59 +0530 Subject: [PATCH 2/3] fix: make transaction date of the oldest transaction as the last integration date (#22015) * fix: make transaction date of the oldest transaction as the last integration date * fix: only save end date when transactions are returned --- .../doctype/plaid_settings/plaid_settings.py | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py index 8d31e24cd6c..ff6f68204cd 100644 --- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py +++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py @@ -114,10 +114,11 @@ def add_account_subtype(account_subtype): @frappe.whitelist() def sync_transactions(bank, bank_account): - - last_sync_date = frappe.db.get_value("Bank Account", bank_account, "last_integration_date") - if last_sync_date: - start_date = formatdate(last_sync_date, "YYYY-MM-dd") + '''Sync transactions based on the last integration date as the start date, after sync is completed + add the transaction date of the oldest transaction as the last integration date''' + last_transaction_date = frappe.db.get_value("Bank Account", bank_account, "last_integration_date") + if last_transaction_date: + start_date = formatdate(last_transaction_date, "YYYY-MM-dd") else: start_date = formatdate(add_months(today(), -12), "YYYY-MM-dd") end_date = formatdate(today(), "YYYY-MM-dd") @@ -125,13 +126,17 @@ def sync_transactions(bank, bank_account): try: transactions = get_transactions(bank=bank, bank_account=bank_account, start_date=start_date, end_date=end_date) result = [] - if transactions: - for transaction in transactions: - result.append(new_bank_transaction(transaction)) + for transaction in reversed(transactions): + result += new_bank_transaction(transaction) - frappe.db.set_value("Bank Account", bank_account, "last_integration_date", getdate(end_date)) + if result: + last_transaction_date = frappe.db.get_value('Bank Transaction', result.pop(), 'date') + + frappe.logger().info("Plaid added {} new Bank Transactions from '{}' between {} and {}".format( + len(result), bank_account, start_date, end_date)) + + frappe.db.set_value("Bank Account", bank_account, "last_integration_date", last_transaction_date) - return result except Exception: frappe.log_error(frappe.get_traceback(), _("Plaid transactions sync error")) From 652181600d288db9b53f8a52006903f1f64600fe Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Mon, 1 Jun 2020 15:59:40 +0550 Subject: [PATCH 3/3] bumped to version 11.1.77 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 81791091858..c5b9551039f 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '11.1.76' +__version__ = '11.1.77' def get_default_company(user=None): '''Get default company for user'''