From 7af4acab297182be5eeeaaee1fe330d4c20b991a Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 16 Mar 2026 23:08:55 +0530 Subject: [PATCH 1/4] fix: do not set valuation rate for invoice without update stock (cherry picked from commit bec9e48435b6294138002f3b5f864ce631ce500a) --- erpnext/controllers/selling_controller.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 742d8627fdf..8138a94693c 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -526,6 +526,9 @@ class SellingController(StockController): if self.doctype not in ("Delivery Note", "Sales Invoice"): return + if self.doctype == "Sales Invoice" and not self.update_stock and not self.is_internal_transfer(): + return + from erpnext.stock.serial_batch_bundle import get_batch_nos, get_serial_nos allow_at_arms_length_price = frappe.get_cached_value( From c8bb55f35bf528acb43eca7b4600edd299c94d05 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 10:42:37 +0530 Subject: [PATCH 2/4] fix: correct overlap detection in JobCard.has_overlap (backport #53473) (#53523) Co-authored-by: Sanjesh-Raju Co-authored-by: Sanjesh Co-authored-by: Tridots Tech fix: correct overlap detection in JobCard.has_overlap (#53473) --- erpnext/manufacturing/doctype/job_card/job_card.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index d283bc8dadb..0f4c9d569fa 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -383,9 +383,8 @@ class JobCard(Document): # if key number reaches/crosses to production_capacity means capacity is full and overlap error generated # this will store last to_time of sequential job cards alloted_capacity = {1: time_logs[0]["to_time"]} - # flag for sequential Job card found - sequential_job_card_found = False for i in range(1, len(time_logs)): + sequential_job_card_found = False # scanning for all Existing keys for key in alloted_capacity.keys(): # if current Job Card from time is greater than last to_time in that key means these job card are sequential From afe8e3a023cda96af8a6bdedcf8a437cd41e1875 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 05:32:00 +0000 Subject: [PATCH 3/4] fix: enable logs to track changes in doctype. (backport #53491) (#53524) * fix: enable logs to track changes in doctype. (#53491) Co-authored-by: jeraldin2003 Co-authored-by: Mihir Kandoi (cherry picked from commit e2667ab098975cca5edc65271bac02e8ee19de91) # Conflicts: # erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json * chore: resolve conflicts --------- Co-authored-by: Jeraldin P J <113301032+jeraldin2003@users.noreply.github.com> Co-authored-by: Mihir Kandoi --- .../currency_exchange_settings.json | 4 ++-- erpnext/accounts/doctype/pos_settings/pos_settings.json | 4 ++-- .../repost_accounting_ledger_settings.json | 4 ++-- .../doctype/subscription_settings/subscription_settings.json | 4 ++-- erpnext/buying/doctype/buying_settings/buying_settings.json | 4 ++-- .../appointment_booking_settings.json | 4 ++-- erpnext/crm/doctype/crm_settings/crm_settings.json | 4 ++-- .../manufacturing_settings/manufacturing_settings.json | 4 ++-- .../projects/doctype/projects_settings/projects_settings.json | 4 ++-- .../selling/doctype/selling_settings/selling_settings.json | 4 ++-- erpnext/setup/doctype/global_defaults/global_defaults.json | 4 ++-- .../stock/doctype/delivery_settings/delivery_settings.json | 4 ++-- .../doctype/item_variant_settings/item_variant_settings.json | 4 ++-- .../stock_reposting_settings/stock_reposting_settings.json | 4 ++-- erpnext/stock/doctype/stock_settings/stock_settings.json | 4 ++-- .../support/doctype/support_settings/support_settings.json | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json index ae3dbd59d69..9f0852bb686 100644 --- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json +++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json @@ -101,11 +101,11 @@ "label": "Use HTTP Protocol" } ], - "hide_toolbar": 1, + "hide_toolbar": 0, "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-01-02 18:19:02.873815", + "modified": "2026-03-16 13:28:21.075743", "modified_by": "Administrator", "module": "Accounts", "name": "Currency Exchange Settings", diff --git a/erpnext/accounts/doctype/pos_settings/pos_settings.json b/erpnext/accounts/doctype/pos_settings/pos_settings.json index 7afc19423d8..8e9adc56f14 100644 --- a/erpnext/accounts/doctype/pos_settings/pos_settings.json +++ b/erpnext/accounts/doctype/pos_settings/pos_settings.json @@ -50,10 +50,10 @@ "options": "1" } ], - "hide_toolbar": 1, + "hide_toolbar": 0, "issingle": 1, "links": [], - "modified": "2026-01-09 17:30:41.476806", + "modified": "2026-03-16 13:28:19.677217", "modified_by": "Administrator", "module": "Accounts", "name": "POS Settings", diff --git a/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json b/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json index ba8188c1440..808986bba23 100644 --- a/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json +++ b/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json @@ -15,11 +15,11 @@ } ], "grid_page_length": 50, - "hide_toolbar": 1, + "hide_toolbar": 0, "in_create": 1, "issingle": 1, "links": [], - "modified": "2026-01-02 18:19:08.888368", + "modified": "2026-03-16 13:28:21.312607", "modified_by": "Administrator", "module": "Accounts", "name": "Repost Accounting Ledger Settings", diff --git a/erpnext/accounts/doctype/subscription_settings/subscription_settings.json b/erpnext/accounts/doctype/subscription_settings/subscription_settings.json index 326fee345dc..06112d51fd1 100644 --- a/erpnext/accounts/doctype/subscription_settings/subscription_settings.json +++ b/erpnext/accounts/doctype/subscription_settings/subscription_settings.json @@ -31,10 +31,10 @@ } ], "grid_page_length": 50, - "hide_toolbar": 1, + "hide_toolbar": 0, "issingle": 1, "links": [], - "modified": "2026-01-02 18:18:34.671062", + "modified": "2026-03-16 13:28:20.485964", "modified_by": "Administrator", "module": "Accounts", "name": "Subscription Settings", diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json index fbe17f3dbbc..5a0edbdf5d1 100644 --- a/erpnext/buying/doctype/buying_settings/buying_settings.json +++ b/erpnext/buying/doctype/buying_settings/buying_settings.json @@ -282,13 +282,13 @@ } ], "grid_page_length": 50, - "hide_toolbar": 1, + "hide_toolbar": 0, "icon": "fa fa-cog", "idx": 1, "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-01-02 18:16:35.885540", + "modified": "2026-03-16 13:28:19.432589", "modified_by": "Administrator", "module": "Buying", "name": "Buying Settings", diff --git a/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json b/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json index d1f70af86f1..b79e974e301 100644 --- a/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json +++ b/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json @@ -102,10 +102,10 @@ } ], "grid_page_length": 50, - "hide_toolbar": 1, + "hide_toolbar": 0, "issingle": 1, "links": [], - "modified": "2026-01-02 18:18:46.617101", + "modified": "2026-03-16 13:28:21.198138", "modified_by": "Administrator", "module": "CRM", "name": "Appointment Booking Settings", diff --git a/erpnext/crm/doctype/crm_settings/crm_settings.json b/erpnext/crm/doctype/crm_settings/crm_settings.json index 3f231d460ab..4760d504a57 100644 --- a/erpnext/crm/doctype/crm_settings/crm_settings.json +++ b/erpnext/crm/doctype/crm_settings/crm_settings.json @@ -101,12 +101,12 @@ } ], "grid_page_length": 50, - "hide_toolbar": 1, + "hide_toolbar": 0, "icon": "fa fa-cog", "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-01-02 18:18:52.204988", + "modified": "2026-03-16 13:28:19.573964", "modified_by": "Administrator", "module": "CRM", "name": "CRM Settings", diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json index f9eb0e40b20..1a150dc864f 100644 --- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json +++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json @@ -239,12 +239,12 @@ "label": "Allow Editing of Items and Quantities in Work Order" } ], - "hide_toolbar": 1, + "hide_toolbar": 0, "icon": "icon-wrench", "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-01-02 18:18:05.759229", + "modified": "2026-03-16 13:28:20.714576", "modified_by": "Administrator", "module": "Manufacturing", "name": "Manufacturing Settings", diff --git a/erpnext/projects/doctype/projects_settings/projects_settings.json b/erpnext/projects/doctype/projects_settings/projects_settings.json index 08ec43fe391..5cf29d6e208 100644 --- a/erpnext/projects/doctype/projects_settings/projects_settings.json +++ b/erpnext/projects/doctype/projects_settings/projects_settings.json @@ -43,10 +43,10 @@ "label": "Fetch Timesheet in Sales Invoice" } ], - "hide_toolbar": 1, + "hide_toolbar": 0, "issingle": 1, "links": [], - "modified": "2026-01-02 18:18:28.414222", + "modified": "2026-03-16 13:28:20.265634", "modified_by": "Administrator", "module": "Projects", "name": "Projects Settings", diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 6304a55c7d8..b7896b58dff 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -323,13 +323,13 @@ } ], "grid_page_length": 50, - "hide_toolbar": 1, + "hide_toolbar": 0, "icon": "fa fa-cog", "idx": 1, "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-02-27 00:47:46.003305", + "modified": "2026-03-16 13:28:18.988883", "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings", diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.json b/erpnext/setup/doctype/global_defaults/global_defaults.json index 92bff6d4fbe..9178bb64768 100644 --- a/erpnext/setup/doctype/global_defaults/global_defaults.json +++ b/erpnext/setup/doctype/global_defaults/global_defaults.json @@ -91,13 +91,13 @@ } ], "grid_page_length": 50, - "hide_toolbar": 1, + "hide_toolbar": 0, "icon": "fa fa-cog", "idx": 1, "in_create": 1, "issingle": 1, "links": [], - "modified": "2026-01-12 09:45:59.819161", + "modified": "2026-03-16 13:28:20.155574", "modified_by": "Administrator", "module": "Setup", "name": "Global Defaults", diff --git a/erpnext/stock/doctype/delivery_settings/delivery_settings.json b/erpnext/stock/doctype/delivery_settings/delivery_settings.json index dbcc4fcc3ed..66320e0a214 100644 --- a/erpnext/stock/doctype/delivery_settings/delivery_settings.json +++ b/erpnext/stock/doctype/delivery_settings/delivery_settings.json @@ -50,10 +50,10 @@ } ], "grid_page_length": 50, - "hide_toolbar": 1, + "hide_toolbar": 0, "issingle": 1, "links": [], - "modified": "2026-01-02 18:18:39.931428", + "modified": "2026-03-16 13:28:20.371015", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Settings", diff --git a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json index 393a0b52e75..bea8feb554a 100644 --- a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json +++ b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json @@ -49,10 +49,10 @@ "label": "Allow Variant UOM to be different from Template UOM" } ], - "hide_toolbar": 1, + "hide_toolbar": 0, "issingle": 1, "links": [], - "modified": "2026-01-02 18:18:23.005859", + "modified": "2026-03-16 13:28:20.597912", "modified_by": "Administrator", "module": "Stock", "name": "Item Variant Settings", diff --git a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json index f72b50dc131..ccca2fc9819 100644 --- a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +++ b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json @@ -101,11 +101,11 @@ "label": "Enable Separate Reposting for GL" } ], - "hide_toolbar": 1, + "hide_toolbar": 0, "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-02-25 14:11:33.461173", + "modified": "2026-03-16 13:28:20.978007", "modified_by": "Administrator", "module": "Stock", "name": "Stock Reposting Settings", diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index ba195104564..cd9ced97baf 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -558,13 +558,13 @@ "label": "Enable Serial / Batch No for Item" } ], - "hide_toolbar": 1, + "hide_toolbar": 0, "icon": "icon-cog", "idx": 1, "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-02-25 10:56:34.105949", + "modified": "2026-03-16 13:28:19.254641", "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings", diff --git a/erpnext/support/doctype/support_settings/support_settings.json b/erpnext/support/doctype/support_settings/support_settings.json index 536ce45f4e1..eb17f97c5e7 100644 --- a/erpnext/support/doctype/support_settings/support_settings.json +++ b/erpnext/support/doctype/support_settings/support_settings.json @@ -156,7 +156,7 @@ } ], "grid_page_length": 50, - "hide_toolbar": 1, + "hide_toolbar": 0, "issingle": 1, "links": [], "modified": "2026-03-16 16:33:45.859541", From a695a111306ff3d97584522162e460912965b3eb Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 05:43:50 +0000 Subject: [PATCH 4/4] fix: add item_name to quick entry fields in Item doctype (backport #53530) (#53533) Co-authored-by: Abdus Samad <120767334+Samad-11@users.noreply.github.com> fix: add item_name to quick entry fields in Item doctype (#53530) --- erpnext/stock/doctype/item/item.json | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 444c2ec0e66..fd897f734a4 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -167,6 +167,7 @@ "set_only_once": 1 }, { + "allow_in_quick_entry": 1, "bold": 1, "fieldname": "item_name", "fieldtype": "Data",