Merge branch 'develop' into version-16

This commit is contained in:
Rohit Waghchaure
2026-01-12 15:07:27 +05:30
5 changed files with 27 additions and 16 deletions

View File

@@ -237,6 +237,8 @@ frappe.ui.form.on("Asset", {
} else if (frm.doc.is_existing_asset || frm.doc.is_composite_asset) {
frm.toggle_reqd("purchase_receipt", 0);
frm.toggle_reqd("purchase_invoice", 0);
frm.set_value("purchase_receipt", "");
frm.set_value("purchase_invoice", "");
} else if (frm.doc.purchase_receipt) {
// if purchase receipt link is set then set PI disabled
frm.toggle_reqd("purchase_invoice", 0);
@@ -480,7 +482,6 @@ frappe.ui.form.on("Asset", {
} else {
frm.set_df_property("net_purchase_amount", "read_only", 0);
}
frm.trigger("toggle_reference_doc");
},

View File

@@ -9,8 +9,8 @@
"idx": 5,
"label": "Banking",
"link_to": "Banking",
"link_type": "Workspace",
"modified": "2026-01-02 13:03:29.270503",
"link_type": "Workspace Sidebar",
"modified": "2026-01-12 12:29:48.687545",
"modified_by": "Administrator",
"name": "Banking",
"owner": "Administrator",

View File

@@ -0,0 +1,20 @@
{
"app": "erpnext",
"creation": "2026-01-12 12:31:53.444807",
"docstatus": 0,
"doctype": "Desktop Icon",
"hidden": 0,
"icon_type": "Link",
"idx": 8,
"label": "Share Management",
"link_to": "Share Management",
"link_type": "Workspace Sidebar",
"modified": "2026-01-12 12:31:53.444807",
"modified_by": "Administrator",
"name": "Share Management",
"owner": "Administrator",
"parent_icon": "Accounts",
"restrict_removal": 0,
"roles": [],
"standard": 1
}

View File

@@ -124,17 +124,6 @@
"show_arrow": 0,
"type": "Link"
},
{
"child": 1,
"collapsible": 1,
"indent": 0,
"keep_closed": 0,
"label": "Tree of Procedures",
"link_to": "Quality Procedure",
"link_type": "DocType",
"show_arrow": 0,
"type": "Link"
},
{
"child": 1,
"collapsible": 1,
@@ -158,7 +147,7 @@
"type": "Link"
}
],
"modified": "2026-01-10 00:06:13.140271",
"modified": "2026-01-12 12:59:09.607272",
"modified_by": "Administrator",
"module": "Quality Management",
"name": "Quality",

View File

@@ -192,11 +192,12 @@
"label": "Settings",
"link_to": "Buying Settings",
"link_type": "DocType",
"navigate_to_tab": "subcontract",
"show_arrow": 0,
"type": "Link"
}
],
"modified": "2026-01-10 00:06:12.744529",
"modified": "2026-01-12 13:12:47.927785",
"modified_by": "Administrator",
"module": "Buying",
"name": "Subcontracting",