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

chore: resolve conflict

Browse Source
This commit is contained in:
Mihir Kandoi
2026-08-07 16:07:36 +05:30
parent 29349711e4
commit 693cade177
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/selling/doctype/product_bundle/product_bundle.js
View File

@@ -9,28 +9,10 @@ frappe.ui.form.on("Product Bundle", {
query: "erpnext.selling.doctype.product_bundle.product_bundle.get_new_item_code",
};
});
<<<<<<< HEAD
=======
frm.set_query("item_code", "items", () => {
return {
query: "erpnext.controllers.queries.item_query",
};
});
// A submitted bundle is immutable. To change it, create a new version
// (a fresh draft copied from this one) and submit that instead.
if (frm.doc.docstatus === 1) {
frm.add_custom_button(
__("New Version"),
() => {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.product_bundle.product_bundle.make_new_version",
frm: frm,
});
},
__("Actions")
);
}
>>>>>>> b3867f1428 (fix: optimize product bundle item search)
},
});