nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-16 13:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fetch from parent optional in inventory dimension

Browse Source 
(cherry picked from commit 8aac6a6b18)

# Conflicts:
#	erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
This commit is contained in:
Rohit Waghchaure
2025-07-07 16:24:42 +05:30
committed by Mergify
parent 711e06b537
commit bb901cab88
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/inventory_dimension/inventory_dimension.js
View File

@@ -75,7 +75,9 @@ frappe.ui.form.on("Inventory Dimension", {
set_parent_fields(frm) { set_parent_fields(frm) {
if (frm.doc.apply_to_all_doctypes) { if (frm.doc.apply_to_all_doctypes) {
frm.set_df_property("fetch_from_parent", "options", frm.doc.reference_document); let options = ["\n", frm.doc.reference_document];
frm.set_df_property("fetch_from_parent", "options", options);
} else if (frm.doc.document_type && frm.doc.istable) { } else if (frm.doc.document_type && frm.doc.istable) {
frappe.call({ frappe.call({
method: "erpnext.stock.doctype.inventory_dimension.inventory_dimension.get_parent_fields", method: "erpnext.stock.doctype.inventory_dimension.inventory_dimension.get_parent_fields",
@@ -85,7 +87,7 @@ frappe.ui.form.on("Inventory Dimension", {
}, },
callback: (r) => { callback: (r) => {
if (r.message && r.message.length) { if (r.message && r.message.length) {
frm.set_df_property("fetch_from_parent", "options", [""].concat(r.message)); frm.set_df_property("fetch_from_parent", "options", ["\n"].concat(r.message));
} else { } else {
frm.set_df_property("fetch_from_parent", "hidden", 1); frm.set_df_property("fetch_from_parent", "hidden", 1);
} }

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

@@ -143,7 +143,6 @@
"fieldtype": "Column Break" "fieldtype": "Column Break"
}, },
{ {
"depends_on": "eval:!doc.apply_to_all_doctypes",
"description": "Set fieldname from which you want to fetch the data from the parent form.", "description": "Set fieldname from which you want to fetch the data from the parent form.",
"fieldname": "fetch_from_parent", "fieldname": "fetch_from_parent",
"fieldtype": "Select", "fieldtype": "Select",
@@ -189,7 +188,11 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-10-05 12:52:18.705431", "modified": "2023-10-05 12:52:18.705431",
=======
"modified": "2025-07-07 15:51:29.329064",
>>>>>>> 8aac6a6b18 (fix: fetch from parent optional in inventory dimension)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Inventory Dimension", "name": "Inventory Dimension",
@@ -233,7 +236,12 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 8aac6a6b18 (fix: fetch from parent optional in inventory dimension)
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }

5
erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
View File

@@ -40,16 +40,11 @@ class InventoryDimension(Document):
self.reset_value() self.reset_value()
self.set_source_and_target_fieldname() self.set_source_and_target_fieldname()
self.set_type_of_transaction() self.set_type_of_transaction()
self.set_fetch_value_from()
def set_type_of_transaction(self): def set_type_of_transaction(self):
if self.apply_to_all_doctypes: if self.apply_to_all_doctypes:
self.type_of_transaction = "Both" self.type_of_transaction = "Both"
def set_fetch_value_from(self):
if self.apply_to_all_doctypes:
self.fetch_from_parent = self.reference_document
def do_not_update_document(self): def do_not_update_document(self):
if self.is_new() or not self.has_stock_ledger(): if self.is_new() or not self.has_stock_ledger():
return return

2
erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
View File

@@ -154,6 +154,8 @@ class TestInventoryDimension(FrappeTestCase):
reference_document="Rack", dimension_name="Rack", apply_to_all_doctypes=1 reference_document="Rack", dimension_name="Rack", apply_to_all_doctypes=1
) )
inv_dimension.db_set("fetch_from_parent", "Rack")
self.assertEqual(inv_dimension.type_of_transaction, "Both") self.assertEqual(inv_dimension.type_of_transaction, "Both")
self.assertEqual(inv_dimension.fetch_from_parent, "Rack") self.assertEqual(inv_dimension.fetch_from_parent, "Rack")