schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: provision to disable item attribute (backport #44358) (#44370)

Browse Source 
* 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:
mergify[bot]
2024-11-27 10:31:30 +05:30
committed by GitHub
parent 7e61aca512
commit ef882de509
5 changed files with 95 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
erpnext/stock/doctype/item/item.js
View File

@@ -663,39 +663,41 @@ $.extend(erpnext.item, {
}
frm.doc.attributes.forEach(function (d) {
let p = new Promise((resolve) => {
if (!d.numeric_values) {
frappe
.call({
method: "frappe.client.get_list",
args: {
doctype: "Item Attribute Value",
filters: [["parent", "=", d.attribute]],
fields: ["attribute_value"],
limit_page_length: 0,
parent: "Item Attribute",
order_by: "idx",
},
})
.then((r) => {
if (r.message) {
attr_val_fields[d.attribute] = r.message.map(function (d) {
return d.attribute_value;
});
resolve();
}
});
} else {
let values = [];
for (var i = d.from_range; i <= d.to_range; i = flt(i + d.increment, 6)) {
values.push(i);
if (!d.disabled) {
let p = new Promise((resolve) => {
if (!d.numeric_values) {
frappe
.call({
method: "frappe.client.get_list",
args: {
doctype: "Item Attribute Value",
filters: [["parent", "=", d.attribute]],
fields: ["attribute_value"],
limit_page_length: 0,
parent: "Item Attribute",
order_by: "idx",
},
})
.then((r) => {
if (r.message) {
attr_val_fields[d.attribute] = r.message.map(function (d) {
return d.attribute_value;
});
resolve();
}
});
} else {
let values = [];
for (var i = d.from_range; i <= d.to_range; i = flt(i + d.increment, 6)) {
values.push(i);
}
attr_val_fields[d.attribute] = values;
resolve();
}
attr_val_fields[d.attribute] = values;
resolve();
}
});
});
promises.push(p);
promises.push(p);
}
}, this);
Promise.all(promises).then(() => {
@@ -710,26 +712,29 @@ $.extend(erpnext.item, {
for (var i = 0; i < frm.doc.attributes.length; i++) {
var fieldtype, desc;
var row = frm.doc.attributes[i];
if (row.numeric_values) {
fieldtype = "Float";
desc =
"Min Value: " +
row.from_range +
" , Max Value: " +
row.to_range +
", in Increments of: " +
row.increment;
} else {
fieldtype = "Data";
desc = "";
if (!row.disabled) {
if (row.numeric_values) {
fieldtype = "Float";
desc =
"Min Value: " +
row.from_range +
" , Max Value: " +
row.to_range +
", in Increments of: " +
row.increment;
} else {
fieldtype = "Data";
desc = "";
}
fields = fields.concat({
label: row.attribute,
fieldname: row.attribute,
fieldtype: fieldtype,
reqd: 0,
description: desc,
});
}
fields = fields.concat({
label: row.attribute,
fieldname: row.attribute,
fieldtype: fieldtype,
reqd: 0,
description: desc,
});
}
if (frm.doc.image) {

17
erpnext/stock/doctype/item_attribute/item_attribute.json
View File

@@ -10,6 +10,8 @@
"field_order": [
"attribute_name",
"numeric_values",
"column_break_vbik",
"disabled",
"section_break_4",
"from_range",
"increment",
@@ -70,15 +72,26 @@
"fieldtype": "Table",
"label": "Item Attribute Values",
"options": "Item Attribute Value"
},
{
"fieldname": "column_break_vbik",
"fieldtype": "Column Break"
},
{
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
"label": "Disabled"
}
],
"icon": "fa fa-edit",
"index_web_pages_for_search": 1,
"links": [],
"modified": "2020-10-02 12:03:02.359202",
"modified": "2024-11-26 20:05:29.421714",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Attribute",
"naming_rule": "By fieldname",
"owner": "Administrator",
"permissions": [
{
@@ -94,4 +107,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
}

14
erpnext/stock/doctype/item_attribute/item_attribute.py
View File

@@ -30,6 +30,7 @@ class ItemAttribute(Document):
from erpnext.stock.doctype.item_attribute_value.item_attribute_value import ItemAttributeValue
attribute_name: DF.Data
disabled: DF.Check
from_range: DF.Float
increment: DF.Float
item_attribute_values: DF.Table[ItemAttributeValue]
@@ -47,6 +48,19 @@ class ItemAttribute(Document):
def on_update(self):
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):
"""Validate that if there are existing items with attributes, they are valid"""

12
erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
View File

@@ -11,6 +11,7 @@
"column_break_2",
"attribute_value",
"numeric_values",
"disabled",
"section_break_4",
"from_range",
"increment",
@@ -74,11 +75,18 @@
"fieldname": "to_range",
"fieldtype": "Float",
"label": "To Range"
},
{
"default": "0",
"fetch_from": "attribute.disabled",
"fieldname": "disabled",
"fieldtype": "Check",
"label": "Disabled"
}
],
"istable": 1,
"links": [],
"modified": "2023-07-14 17:15:19.112119",
"modified": "2024-11-26 20:10:49.873339",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Variant Attribute",
@@ -87,4 +95,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}
}

1
erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.py
View File

@@ -16,6 +16,7 @@ class ItemVariantAttribute(Document):
attribute: DF.Link
attribute_value: DF.Data | None
disabled: DF.Check
from_range: DF.Float
increment: DF.Float
numeric_values: DF.Check