mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-22 11:44:11 +00:00
* feat: provision to disable item attribute (#44358)
(cherry picked from commit 123e3ef263)
# Conflicts:
# erpnext/stock/doctype/item_attribute/item_attribute.json
# erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
* chore: fix conflicts
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
@@ -663,6 +663,7 @@ $.extend(erpnext.item, {
|
|||||||
}
|
}
|
||||||
|
|
||||||
frm.doc.attributes.forEach(function (d) {
|
frm.doc.attributes.forEach(function (d) {
|
||||||
|
if (!d.disabled) {
|
||||||
let p = new Promise((resolve) => {
|
let p = new Promise((resolve) => {
|
||||||
if (!d.numeric_values) {
|
if (!d.numeric_values) {
|
||||||
frappe
|
frappe
|
||||||
@@ -696,6 +697,7 @@ $.extend(erpnext.item, {
|
|||||||
});
|
});
|
||||||
|
|
||||||
promises.push(p);
|
promises.push(p);
|
||||||
|
}
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
Promise.all(promises).then(() => {
|
Promise.all(promises).then(() => {
|
||||||
@@ -710,6 +712,8 @@ $.extend(erpnext.item, {
|
|||||||
for (var i = 0; i < frm.doc.attributes.length; i++) {
|
for (var i = 0; i < frm.doc.attributes.length; i++) {
|
||||||
var fieldtype, desc;
|
var fieldtype, desc;
|
||||||
var row = frm.doc.attributes[i];
|
var row = frm.doc.attributes[i];
|
||||||
|
|
||||||
|
if (!row.disabled) {
|
||||||
if (row.numeric_values) {
|
if (row.numeric_values) {
|
||||||
fieldtype = "Float";
|
fieldtype = "Float";
|
||||||
desc =
|
desc =
|
||||||
@@ -731,6 +735,7 @@ $.extend(erpnext.item, {
|
|||||||
description: desc,
|
description: desc,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (frm.doc.image) {
|
if (frm.doc.image) {
|
||||||
fields.push({
|
fields.push({
|
||||||
|
|||||||
@@ -10,6 +10,8 @@
|
|||||||
"field_order": [
|
"field_order": [
|
||||||
"attribute_name",
|
"attribute_name",
|
||||||
"numeric_values",
|
"numeric_values",
|
||||||
|
"column_break_vbik",
|
||||||
|
"disabled",
|
||||||
"section_break_4",
|
"section_break_4",
|
||||||
"from_range",
|
"from_range",
|
||||||
"increment",
|
"increment",
|
||||||
@@ -70,15 +72,26 @@
|
|||||||
"fieldtype": "Table",
|
"fieldtype": "Table",
|
||||||
"label": "Item Attribute Values",
|
"label": "Item Attribute Values",
|
||||||
"options": "Item Attribute Value"
|
"options": "Item Attribute Value"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_vbik",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"fieldname": "disabled",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"label": "Disabled"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "fa fa-edit",
|
"icon": "fa fa-edit",
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2020-10-02 12:03:02.359202",
|
"modified": "2024-11-26 20:05:29.421714",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Item Attribute",
|
"name": "Item Attribute",
|
||||||
|
"naming_rule": "By fieldname",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ class ItemAttribute(Document):
|
|||||||
from erpnext.stock.doctype.item_attribute_value.item_attribute_value import ItemAttributeValue
|
from erpnext.stock.doctype.item_attribute_value.item_attribute_value import ItemAttributeValue
|
||||||
|
|
||||||
attribute_name: DF.Data
|
attribute_name: DF.Data
|
||||||
|
disabled: DF.Check
|
||||||
from_range: DF.Float
|
from_range: DF.Float
|
||||||
increment: DF.Float
|
increment: DF.Float
|
||||||
item_attribute_values: DF.Table[ItemAttributeValue]
|
item_attribute_values: DF.Table[ItemAttributeValue]
|
||||||
@@ -47,6 +48,19 @@ class ItemAttribute(Document):
|
|||||||
|
|
||||||
def on_update(self):
|
def on_update(self):
|
||||||
self.validate_exising_items()
|
self.validate_exising_items()
|
||||||
|
self.set_enabled_disabled_in_items()
|
||||||
|
|
||||||
|
def set_enabled_disabled_in_items(self):
|
||||||
|
db_value = self.get_doc_before_save()
|
||||||
|
if not db_value or db_value.disabled != self.disabled:
|
||||||
|
item_variant_table = frappe.qb.DocType("Item Variant Attribute")
|
||||||
|
query = (
|
||||||
|
frappe.qb.update(item_variant_table)
|
||||||
|
.set(item_variant_table.disabled, self.disabled)
|
||||||
|
.where(item_variant_table.attribute == self.name)
|
||||||
|
)
|
||||||
|
|
||||||
|
query.run()
|
||||||
|
|
||||||
def validate_exising_items(self):
|
def validate_exising_items(self):
|
||||||
"""Validate that if there are existing items with attributes, they are valid"""
|
"""Validate that if there are existing items with attributes, they are valid"""
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
"column_break_2",
|
"column_break_2",
|
||||||
"attribute_value",
|
"attribute_value",
|
||||||
"numeric_values",
|
"numeric_values",
|
||||||
|
"disabled",
|
||||||
"section_break_4",
|
"section_break_4",
|
||||||
"from_range",
|
"from_range",
|
||||||
"increment",
|
"increment",
|
||||||
@@ -74,11 +75,18 @@
|
|||||||
"fieldname": "to_range",
|
"fieldname": "to_range",
|
||||||
"fieldtype": "Float",
|
"fieldtype": "Float",
|
||||||
"label": "To Range"
|
"label": "To Range"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"fetch_from": "attribute.disabled",
|
||||||
|
"fieldname": "disabled",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"label": "Disabled"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2023-07-14 17:15:19.112119",
|
"modified": "2024-11-26 20:10:49.873339",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Item Variant Attribute",
|
"name": "Item Variant Attribute",
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ class ItemVariantAttribute(Document):
|
|||||||
|
|
||||||
attribute: DF.Link
|
attribute: DF.Link
|
||||||
attribute_value: DF.Data | None
|
attribute_value: DF.Data | None
|
||||||
|
disabled: DF.Check
|
||||||
from_range: DF.Float
|
from_range: DF.Float
|
||||||
increment: DF.Float
|
increment: DF.Float
|
||||||
numeric_values: DF.Check
|
numeric_values: DF.Check
|
||||||
|
|||||||
Reference in New Issue
Block a user