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

fix: resolve stock entry backport conflicts

Browse Source
This commit is contained in:
Sudharsanan11
2026-08-26 13:08:35 +05:30
parent 22377fa86d
commit e126c4597b
1 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@@ -181,24 +181,6 @@ frappe.ui.form.on("Stock Entry", {
if (!check_should_not_attach_bom_items(frm.doc.bom_no)) {
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
}
<<<<<<< HEAD
=======
if (frm.doc.purpose == "Receive from Customer") {
frm.set_query("against_fg", "items", function () {
return {
query: "erpnext.controllers.subcontracting_inward_controller.get_fg_reference_names",
filters: {
parent: frm.doc.subcontracting_inward_order,
},
};
});
}
if (frm.doc.job_card && frm.doc.purpose === "Manufacture") {
frm.set_df_property("fg_completed_qty", "read_only", 1);
frm.set_df_property("get_items", "hidden", 1);
}
if (frm.doc.pick_list) {
frm.set_df_property("get_items", "hidden", 1);
@@ -206,7 +188,6 @@ frappe.ui.form.on("Stock Entry", {
frm.set_df_property("fg_completed_qty", "read_only", 1);
}
}
>>>>>>> 01e0844 (fix(stock): keep pick list links when refetching stock entry items)
},
setup_quality_inspection: function (frm) {
@@ -1389,13 +1370,9 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle
}
fg_completed_qty() {
<<<<<<< HEAD
this.get_items();
=======
if (!this.frm.doc.job_card && !this.frm.doc.pick_list) {
if (!this.frm.doc.pick_list) {
this.get_items();
}
>>>>>>> 01e0844 (fix(stock): keep pick list links when refetching stock entry items)
}
get_items() {