mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-12 17:23:38 +00:00
fix: do not show update stock flag unneccessarily
(cherry picked from commit 5fb5b7b30e)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user