From c0c6cc58ed7da80558ec48e6d2579904a9ff42d5 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 5 Feb 2026 20:45:46 +0530 Subject: [PATCH 1/3] fix: do not show update stock flag unneccessarily (cherry picked from commit 5fb5b7b30e8bdb5a57f5104ba87d74c17edd968f) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json --- .../accounts/doctype/purchase_invoice/purchase_invoice.json | 5 +++++ erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 02371e778cf..ade73ac6530 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -606,6 +606,7 @@ }, { "default": "0", + "depends_on": "eval:doc.items.every((item) => !item.pr_detail)", "fieldname": "update_stock", "fieldtype": "Check", "label": "Update Stock", @@ -1668,7 +1669,11 @@ "idx": 204, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-02-03 14:23:47.937128", +======= + "modified": "2026-02-05 20:45:16.964500", +>>>>>>> 5fb5b7b30e (fix: do not show update stock flag unneccessarily) "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 93e4dd1598f..ec549710654 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -704,6 +704,7 @@ }, { "default": "0", + "depends_on": "eval:doc.items.every((item) => !item.dn_detail)", "fieldname": "update_stock", "fieldtype": "Check", "hide_days": 1, @@ -2306,7 +2307,11 @@ "link_fieldname": "consolidated_invoice" } ], +<<<<<<< HEAD "modified": "2026-02-03 14:09:44.347133", +======= + "modified": "2026-02-05 20:43:44.732805", +>>>>>>> 5fb5b7b30e (fix: do not show update stock flag unneccessarily) "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", From f56c6f93a168178f04602ba88becac73032fdab6 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 6 Feb 2026 12:00:23 +0530 Subject: [PATCH 2/3] chore: resolve conflicts --- .../accounts/doctype/purchase_invoice/purchase_invoice.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index ade73ac6530..21cda420f5a 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -1669,11 +1669,7 @@ "idx": 204, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-02-03 14:23:47.937128", -======= "modified": "2026-02-05 20:45:16.964500", ->>>>>>> 5fb5b7b30e (fix: do not show update stock flag unneccessarily) "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", From 4847a76cb87d49cd64e0d7b6b50aff2c105ca5e7 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 6 Feb 2026 12:00:47 +0530 Subject: [PATCH 3/3] chore: resolve conflicts --- erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index ec549710654..4d0e0c73458 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -2307,11 +2307,7 @@ "link_fieldname": "consolidated_invoice" } ], -<<<<<<< HEAD - "modified": "2026-02-03 14:09:44.347133", -======= "modified": "2026-02-05 20:43:44.732805", ->>>>>>> 5fb5b7b30e (fix: do not show update stock flag unneccessarily) "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice",