nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-15 07:28:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve backport conflicts in item doctype

Browse Source
This commit is contained in:
Shllokkk
2026-07-28 19:33:33 +05:30
parent ee12f8d2d4
commit 0ce50407f9
2 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
erpnext/stock/doctype/item/item.json
View File

@@ -1086,32 +1086,6 @@
"fieldname": "item_prices_column", "fieldname": "item_prices_column",
"fieldtype": "Column Break", "fieldtype": "Column Break",
"label": "Item Prices" "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", "icon": "fa fa-tag",
@@ -1119,11 +1093,7 @@
"image_field": "image", "image_field": "image",
"links": [], "links": [],
"make_attachments_public": 1, "make_attachments_public": 1,
<<<<<<< HEAD
"modified": "2026-07-05 23:24:45.734144", "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", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",

4
erpnext/stock/doctype/item/item.py
View File

@@ -132,10 +132,6 @@ class Item(Document):
purchase_uom: DF.Link | None purchase_uom: DF.Link | None
quality_inspection_template: DF.Link | None quality_inspection_template: DF.Link | None
reorder_levels: DF.Table[ItemReorder] reorder_levels: DF.Table[ItemReorder]
<<<<<<< HEAD
=======
restrict_to_companies: DF.Check
>>>>>>> fa75aa08ab (fix(item): correct description on deferred revenue/expense)
retain_sample: DF.Check retain_sample: DF.Check
safety_stock: DF.Float safety_stock: DF.Float
sales_tax_withholding_category: DF.Link | None sales_tax_withholding_category: DF.Link | None