From ee12f8d2d441a2310c03ceec3098a1da6ccaf981 Mon Sep 17 00:00:00 2001 From: Shllokkk Date: Tue, 28 Jul 2026 19:00:24 +0530 Subject: [PATCH 1/3] fix(item): correct description on deferred revenue/expense (cherry picked from commit fa75aa08abff4e160f38af973d56c9ecf3fe130c) # Conflicts: # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/item/item.py --- erpnext/stock/doctype/item/item.json | 34 ++++++++++++++++++++++++++-- erpnext/stock/doctype/item/item.py | 4 ++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index c075dd43310..59ac370f2c0 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -721,7 +721,7 @@ }, { "default": "0", - "description": "Expense for this item will be recognized over a period of months. Eg: prepaid insurance or annual software license", + "description": "Income from this item will be recognized over a period of months instead of all at once. Eg: annual subscription paid upfront.", "fieldname": "enable_deferred_revenue", "fieldtype": "Check", "label": "Enable Deferred Revenue" @@ -734,7 +734,7 @@ }, { "default": "0", - "description": "Income from this item will be recognized over a period of months instead of all at once. Eg: annual subscription paid upfront.", + "description": "Expense for this item will be recognized over a period of months. Eg: prepaid insurance or annual software license", "fieldname": "enable_deferred_expense", "fieldtype": "Check", "label": "Enable Deferred Expense" @@ -1086,6 +1086,32 @@ "fieldname": "item_prices_column", "fieldtype": "Column Break", "label": "Item Prices" +<<<<<<< HEAD +======= + }, + { + "fieldname": "company_restrictions_section", + "fieldtype": "Section Break", + "label": "Company Restrictions", + "permlevel": 1 + }, + { + "default": "0", + "description": "If checked, this Item is only available for transactions in the companies listed below.", + "fieldname": "restrict_to_companies", + "fieldtype": "Check", + "label": "Restrict to Companies", + "permlevel": 1 + }, + { + "depends_on": "eval:doc.restrict_to_companies", + "fieldname": "allowed_companies", + "fieldtype": "Table MultiSelect", + "label": "Allowed Companies", + "mandatory_depends_on": "eval:doc.restrict_to_companies", + "options": "Company Restriction", + "permlevel": 1 +>>>>>>> fa75aa08ab (fix(item): correct description on deferred revenue/expense) } ], "icon": "fa fa-tag", @@ -1093,7 +1119,11 @@ "image_field": "image", "links": [], "make_attachments_public": 1, +<<<<<<< HEAD "modified": "2026-07-05 23:24:45.734144", +======= + "modified": "2026-07-28 18:58:43.328497", +>>>>>>> fa75aa08ab (fix(item): correct description on deferred revenue/expense) "modified_by": "Administrator", "module": "Stock", "name": "Item", diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index bb40f6cb810..e72eaccd3ef 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -132,6 +132,10 @@ class Item(Document): purchase_uom: DF.Link | None quality_inspection_template: DF.Link | None reorder_levels: DF.Table[ItemReorder] +<<<<<<< HEAD +======= + restrict_to_companies: DF.Check +>>>>>>> fa75aa08ab (fix(item): correct description on deferred revenue/expense) retain_sample: DF.Check safety_stock: DF.Float sales_tax_withholding_category: DF.Link | None From 0ce50407f98e9a80b9551b06f6f2339c6165b264 Mon Sep 17 00:00:00 2001 From: Shllokkk Date: Tue, 28 Jul 2026 19:33:33 +0530 Subject: [PATCH 2/3] fix: resolve backport conflicts in item doctype --- erpnext/stock/doctype/item/item.json | 30 ---------------------------- erpnext/stock/doctype/item/item.py | 4 ---- 2 files changed, 34 deletions(-) diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 59ac370f2c0..86732fb1b96 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -1086,32 +1086,6 @@ "fieldname": "item_prices_column", "fieldtype": "Column Break", "label": "Item Prices" -<<<<<<< HEAD -======= - }, - { - "fieldname": "company_restrictions_section", - "fieldtype": "Section Break", - "label": "Company Restrictions", - "permlevel": 1 - }, - { - "default": "0", - "description": "If checked, this Item is only available for transactions in the companies listed below.", - "fieldname": "restrict_to_companies", - "fieldtype": "Check", - "label": "Restrict to Companies", - "permlevel": 1 - }, - { - "depends_on": "eval:doc.restrict_to_companies", - "fieldname": "allowed_companies", - "fieldtype": "Table MultiSelect", - "label": "Allowed Companies", - "mandatory_depends_on": "eval:doc.restrict_to_companies", - "options": "Company Restriction", - "permlevel": 1 ->>>>>>> fa75aa08ab (fix(item): correct description on deferred revenue/expense) } ], "icon": "fa fa-tag", @@ -1119,11 +1093,7 @@ "image_field": "image", "links": [], "make_attachments_public": 1, -<<<<<<< HEAD "modified": "2026-07-05 23:24:45.734144", -======= - "modified": "2026-07-28 18:58:43.328497", ->>>>>>> fa75aa08ab (fix(item): correct description on deferred revenue/expense) "modified_by": "Administrator", "module": "Stock", "name": "Item", diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index e72eaccd3ef..bb40f6cb810 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -132,10 +132,6 @@ class Item(Document): purchase_uom: DF.Link | None quality_inspection_template: DF.Link | None reorder_levels: DF.Table[ItemReorder] -<<<<<<< HEAD -======= - restrict_to_companies: DF.Check ->>>>>>> fa75aa08ab (fix(item): correct description on deferred revenue/expense) retain_sample: DF.Check safety_stock: DF.Float sales_tax_withholding_category: DF.Link | None From 2471c5ccbb771867b9d6f55185862d04b608c44e Mon Sep 17 00:00:00 2001 From: Shllokkk Date: Tue, 28 Jul 2026 19:40:10 +0530 Subject: [PATCH 3/3] fix: bump item doctype modified timestamp so description change syncs on migrate --- erpnext/stock/doctype/item/item.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 86732fb1b96..6855b73165b 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -1093,7 +1093,7 @@ "image_field": "image", "links": [], "make_attachments_public": 1, - "modified": "2026-07-05 23:24:45.734144", + "modified": "2026-07-28 18:58:43.328497", "modified_by": "Administrator", "module": "Stock", "name": "Item",