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