From 96c937bf6ab699f955287f8a14516ecd23a23e53 Mon Sep 17 00:00:00 2001 From: Aayush Dalal Date: Mon, 9 Jun 2025 22:58:46 +0530 Subject: [PATCH 1/2] fix: throw permission error (#47976) Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com> (cherry picked from commit 8b6a8d0c4fbb52884f07dcdf86855eb2067a921d) # Conflicts: # erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py # erpnext/stock/utils.py --- .../bank_statement_import.py | 44 +++++++++++++++++++ erpnext/stock/utils.py | 5 +++ 2 files changed, 49 insertions(+) diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py index 78a27c3b96d..bdba2af2700 100644 --- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py +++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py @@ -216,6 +216,50 @@ def write_xlsx(data, sheet_name, wb=None, column_widths=None, file_path=None): @frappe.whitelist() +<<<<<<< HEAD +======= +def get_import_status(docname): + import_status = {} + + data_import = frappe.get_doc("Bank Statement Import", docname) + import_status["status"] = data_import.status + + logs = frappe.get_all( + "Data Import Log", + fields=["count(*) as count", "success"], + filters={"data_import": docname}, + group_by="success", + ) + + total_payload_count = 0 + + for log in logs: + total_payload_count += log.get("count", 0) + if log.get("success"): + import_status["success"] = log.get("count") + else: + import_status["failed"] = log.get("count") + + import_status["total_records"] = total_payload_count + + return import_status + + +@frappe.whitelist() +def get_import_logs(docname: str): + frappe.has_permission("Bank Statement Import", throw=True) + + return frappe.get_all( + "Data Import Log", + fields=["success", "docname", "messages", "exception", "row_indexes"], + filters={"data_import": docname}, + limit_page_length=5000, + order_by="log_index", + ) + + +@frappe.whitelist() +>>>>>>> 8b6a8d0c4f (fix: throw permission error (#47976)) def upload_bank_statement(**args): args = frappe._dict(args) bsi = frappe.new_doc("Bank Statement Import") diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py index 636d620fad3..7c3c38c0c13 100644 --- a/erpnext/stock/utils.py +++ b/erpnext/stock/utils.py @@ -109,6 +109,11 @@ def get_stock_balance( from erpnext.stock.stock_ledger import get_previous_sle +<<<<<<< HEAD +======= + frappe.has_permission("Item", "read", throw=True) + +>>>>>>> 8b6a8d0c4f (fix: throw permission error (#47976)) if posting_date is None: posting_date = nowdate() if posting_time is None: From 1d42c4a3052246ff37eefbc1a5be2e37a1f3d7af Mon Sep 17 00:00:00 2001 From: Sagar Vora <16315650+sagarvora@users.noreply.github.com> Date: Tue, 10 Jun 2025 13:08:39 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- .../bank_statement_import.py | 44 ------------------- erpnext/stock/utils.py | 3 -- 2 files changed, 47 deletions(-) diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py index bdba2af2700..78a27c3b96d 100644 --- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py +++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py @@ -216,50 +216,6 @@ def write_xlsx(data, sheet_name, wb=None, column_widths=None, file_path=None): @frappe.whitelist() -<<<<<<< HEAD -======= -def get_import_status(docname): - import_status = {} - - data_import = frappe.get_doc("Bank Statement Import", docname) - import_status["status"] = data_import.status - - logs = frappe.get_all( - "Data Import Log", - fields=["count(*) as count", "success"], - filters={"data_import": docname}, - group_by="success", - ) - - total_payload_count = 0 - - for log in logs: - total_payload_count += log.get("count", 0) - if log.get("success"): - import_status["success"] = log.get("count") - else: - import_status["failed"] = log.get("count") - - import_status["total_records"] = total_payload_count - - return import_status - - -@frappe.whitelist() -def get_import_logs(docname: str): - frappe.has_permission("Bank Statement Import", throw=True) - - return frappe.get_all( - "Data Import Log", - fields=["success", "docname", "messages", "exception", "row_indexes"], - filters={"data_import": docname}, - limit_page_length=5000, - order_by="log_index", - ) - - -@frappe.whitelist() ->>>>>>> 8b6a8d0c4f (fix: throw permission error (#47976)) def upload_bank_statement(**args): args = frappe._dict(args) bsi = frappe.new_doc("Bank Statement Import") diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py index 7c3c38c0c13..0067c321049 100644 --- a/erpnext/stock/utils.py +++ b/erpnext/stock/utils.py @@ -109,11 +109,8 @@ def get_stock_balance( from erpnext.stock.stock_ledger import get_previous_sle -<<<<<<< HEAD -======= frappe.has_permission("Item", "read", throw=True) ->>>>>>> 8b6a8d0c4f (fix: throw permission error (#47976)) if posting_date is None: posting_date = nowdate() if posting_time is None: