From 20033eef9b53b96abefcaaeb5d967cc56d8aae1b Mon Sep 17 00:00:00 2001 From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com> Date: Wed, 6 Nov 2024 12:02:29 +0530 Subject: [PATCH 1/5] fix: removed single quotes from deferred revenue (#43985) (cherry picked from commit 834d18840c0644140fe2d3af2883c44bd687550c) --- erpnext/accounts/deferred_revenue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/deferred_revenue.py b/erpnext/accounts/deferred_revenue.py index cd34bf7f850..a88764cf1b2 100644 --- a/erpnext/accounts/deferred_revenue.py +++ b/erpnext/accounts/deferred_revenue.py @@ -58,7 +58,7 @@ def build_conditions(process_type, account, company): ) if account: - conditions += f"AND {deferred_account}='{frappe.db.escape(account)}'" + conditions += f"AND {deferred_account}={frappe.db.escape(account)}" elif company: conditions += f"AND p.company = {frappe.db.escape(company)}" From c3e61aebd27ad1afb3939b4ee6aa7b143a781432 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 6 Nov 2024 13:21:19 +0530 Subject: [PATCH 2/5] fix: error when saving POS merge log (#43989) (cherry picked from commit c62596b323f81bcd2235e103765153e92802b43b) --- .../doctype/pos_invoice_merge_log/pos_invoice_merge_log.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py index aecdac0b3a1..c1d2f16e43c 100644 --- a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py +++ b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py @@ -438,7 +438,9 @@ def split_invoices(invoices): if not item.serial_no and not item.serial_and_batch_bundle: continue - return_against_is_added = any(d for d in _invoices if d.pos_invoice == pos_invoice.return_against) + return_against_is_added = any( + d for d in _invoices if d[0].pos_invoice == pos_invoice.return_against + ) if return_against_is_added: break From 633997b1b0c2c2bfa96ac7697093f18d3d5d56ae Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 6 Nov 2024 14:04:30 +0530 Subject: [PATCH 3/5] fix: ensure list has items (cherry picked from commit e13e688987755ed1456cf8d41666e50a906d439b) --- .../doctype/pos_invoice_merge_log/pos_invoice_merge_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py index c1d2f16e43c..5bb43b3fa72 100644 --- a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py +++ b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py @@ -439,7 +439,7 @@ def split_invoices(invoices): continue return_against_is_added = any( - d for d in _invoices if d[0].pos_invoice == pos_invoice.return_against + d for d in _invoices if d and d[0].pos_invoice == pos_invoice.return_against ) if return_against_is_added: break From 318830c57d0568bfea951aab7f43a7eafffca2a8 Mon Sep 17 00:00:00 2001 From: Abdeali Chharchhoda Date: Wed, 6 Nov 2024 19:16:01 +0530 Subject: [PATCH 4/5] fix: Update `dimension_filter_map` query --- .../accounting_dimension_filter.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py index 1954b4b0efe..7c843cf552e 100644 --- a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py +++ b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py @@ -74,12 +74,12 @@ def get_dimension_filter_map(): a.applicable_on_account, d.dimension_value, p.accounting_dimension, p.allow_or_restrict, a.is_mandatory FROM - `tabApplicable On Account` a, `tabAllowed Dimension` d, + `tabApplicable On Account` a, `tabAccounting Dimension Filter` p + LEFT JOIN `tabAllowed Dimension` d ON d.parent = p.name WHERE p.name = a.parent AND p.disabled = 0 - AND p.name = d.parent """, as_dict=1, ) @@ -97,7 +97,6 @@ def get_dimension_filter_map(): f.allow_or_restrict, f.is_mandatory, ) - frappe.flags.dimension_filter_map = dimension_filter_map return frappe.flags.dimension_filter_map From 47a8fc28dfc670c5257d80e4f2ff10304adc7334 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:49:27 +0530 Subject: [PATCH 5/5] fix: task showing limit in customer portal (backport #44003) (#44005) fix: task showing limit in customer portal (#44003) (cherry picked from commit 44832c3b5cd38223072842cf0937aa5615f93114) Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com> --- erpnext/templates/pages/projects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/templates/pages/projects.py b/erpnext/templates/pages/projects.py index e3e26fc82a6..787c7c0069b 100644 --- a/erpnext/templates/pages/projects.py +++ b/erpnext/templates/pages/projects.py @@ -51,7 +51,7 @@ def get_tasks(project, start=0, search=None, item_status=None): "parent_task", ], limit_start=start, - limit_page_length=10, + limit_page_length=100, ) task_nest = [] for task in tasks: