chore: allow to override serial batch selector

This commit is contained in:
Rohit Waghchaure
2024-03-27 11:52:06 +05:30
parent 079cc8bd21
commit 0d9d42ae61
8 changed files with 119 additions and 139 deletions

View File

@@ -342,7 +342,6 @@ erpnext.buying = {
add_serial_batch_bundle(doc, cdt, cdn) { add_serial_batch_bundle(doc, cdt, cdn) {
let item = locals[cdt][cdn]; let item = locals[cdt][cdn];
let me = this; let me = this;
let path = "assets/erpnext/js/utils/serial_no_batch_selector.js";
frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]) frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
.then((r) => { .then((r) => {
@@ -352,7 +351,6 @@ erpnext.buying = {
item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward"; item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward";
item.is_rejected = false; item.is_rejected = false;
frappe.require(path, function() {
new erpnext.SerialBatchPackageSelector( new erpnext.SerialBatchPackageSelector(
me.frm, item, (r) => { me.frm, item, (r) => {
if (r) { if (r) {
@@ -375,7 +373,6 @@ erpnext.buying = {
} }
} }
); );
});
} }
}); });
} }
@@ -383,7 +380,6 @@ erpnext.buying = {
add_serial_batch_for_rejected_qty(doc, cdt, cdn) { add_serial_batch_for_rejected_qty(doc, cdt, cdn) {
let item = locals[cdt][cdn]; let item = locals[cdt][cdn];
let me = this; let me = this;
let path = "assets/erpnext/js/utils/serial_no_batch_selector.js";
frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]) frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
.then((r) => { .then((r) => {
@@ -393,7 +389,6 @@ erpnext.buying = {
item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward"; item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward";
item.is_rejected = true; item.is_rejected = true;
frappe.require(path, function() {
new erpnext.SerialBatchPackageSelector( new erpnext.SerialBatchPackageSelector(
me.frm, item, (r) => { me.frm, item, (r) => {
if (r) { if (r) {
@@ -416,7 +411,6 @@ erpnext.buying = {
} }
} }
); );
});
} }
}); });
} }

View File

@@ -2508,7 +2508,6 @@ erpnext.show_serial_batch_selector = function (frm, item_row, callback, on_close
} }
} }
frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
if (["Sales Invoice", "Delivery Note"].includes(frm.doc.doctype)) { if (["Sales Invoice", "Delivery Note"].includes(frm.doc.doctype)) {
item_row.type_of_transaction = frm.doc.is_return ? "Inward" : "Outward"; item_row.type_of_transaction = frm.doc.is_return ? "Inward" : "Outward";
} else { } else {
@@ -2529,7 +2528,6 @@ erpnext.show_serial_batch_selector = function (frm, item_row, callback, on_close
frappe.model.set_value(item_row.doctype, item_row.name, update_values); frappe.model.set_value(item_row.doctype, item_row.name, update_values);
} }
}); });
});
} }
erpnext.apply_putaway_rule = (frm, purpose=null) => { erpnext.apply_putaway_rule = (frm, purpose=null) => {

View File

@@ -4,6 +4,7 @@ import "./queries";
import "./sms_manager"; import "./sms_manager";
import "./utils/party"; import "./utils/party";
import "./controllers/stock_controller"; import "./controllers/stock_controller";
import "./utils/serial_no_batch_selector";
import "./payment/payments"; import "./payment/payments";
import "./templates/visual_plant_floor_template.html"; import "./templates/visual_plant_floor_template.html";
import "./plant_floor_visual/visual_plant"; import "./plant_floor_visual/visual_plant";

View File

@@ -430,7 +430,6 @@ $.extend(erpnext.utils, {
item_row.has_batch_no = r.message.has_batch_no; item_row.has_batch_no = r.message.has_batch_no;
item_row.has_serial_no = r.message.has_serial_no; item_row.has_serial_no = r.message.has_serial_no;
frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function () {
new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => { new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => {
if (r) { if (r) {
let update_values = { let update_values = {
@@ -450,7 +449,6 @@ $.extend(erpnext.utils, {
} }
}); });
}); });
});
}, },
get_fiscal_year: function (date, with_dates = false, boolean = false) { get_fiscal_year: function (date, with_dates = false, boolean = false) {

View File

@@ -350,7 +350,6 @@ erpnext.sales_common = {
pick_serial_and_batch(doc, cdt, cdn) { pick_serial_and_batch(doc, cdt, cdn) {
let item = locals[cdt][cdn]; let item = locals[cdt][cdn];
let me = this; let me = this;
let path = "assets/erpnext/js/utils/serial_no_batch_selector.js";
frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]).then((r) => { frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]).then((r) => {
if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) { if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
@@ -364,7 +363,6 @@ erpnext.sales_common = {
item.title = __("Select Serial and Batch"); item.title = __("Select Serial and Batch");
} }
frappe.require(path, function () {
new erpnext.SerialBatchPackageSelector(me.frm, item, (r) => { new erpnext.SerialBatchPackageSelector(me.frm, item, (r) => {
if (r) { if (r) {
let qty = Math.abs(r.total_qty); let qty = Math.abs(r.total_qty);
@@ -384,7 +382,6 @@ erpnext.sales_common = {
}); });
} }
}); });
});
} }
}); });
} }

View File

@@ -394,7 +394,6 @@ erpnext.PointOfSale.ItemDetails = class {
bind_auto_serial_fetch_event() { bind_auto_serial_fetch_event() {
this.$form_container.on("click", ".auto-fetch-btn", () => { this.$form_container.on("click", ".auto-fetch-btn", () => {
frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", () => {
let frm = this.events.get_frm(); let frm = this.events.get_frm();
let item_row = this.item_row; let item_row = this.item_row;
item_row.type_of_transaction = "Outward"; item_row.type_of_transaction = "Outward";
@@ -408,7 +407,6 @@ erpnext.PointOfSale.ItemDetails = class {
} }
}); });
}); });
});
} }
toggle_component(show) { toggle_component(show) {

View File

@@ -355,20 +355,16 @@ frappe.ui.form.on("Pick List Item", {
item.title = __("Select Serial and Batch"); item.title = __("Select Serial and Batch");
} }
frappe.require(path, function () {
new erpnext.SerialBatchPackageSelector(frm, item, (r) => { new erpnext.SerialBatchPackageSelector(frm, item, (r) => {
if (r) { if (r) {
let qty = Math.abs(r.total_qty); let qty = Math.abs(r.total_qty);
frappe.model.set_value(item.doctype, item.name, { frappe.model.set_value(item.doctype, item.name, {
serial_and_batch_bundle: r.name, serial_and_batch_bundle: r.name,
use_serial_batch_fields: 0, use_serial_batch_fields: 0,
qty: qty: qty / flt(item.conversion_factor || 1, precision("conversion_factor", item)),
qty /
flt(item.conversion_factor || 1, precision("conversion_factor", item)),
}); });
} }
}); });
});
} }
}); });
}, },

View File

@@ -1319,7 +1319,6 @@ erpnext.stock.select_batch_and_serial_no = (frm, item) => {
item.has_batch_no = r.message.has_batch_no; item.has_batch_no = r.message.has_batch_no;
item.type_of_transaction = item.s_warehouse ? "Outward" : "Inward"; item.type_of_transaction = item.s_warehouse ? "Outward" : "Inward";
frappe.require(path, function () {
new erpnext.SerialBatchPackageSelector(frm, item, (r) => { new erpnext.SerialBatchPackageSelector(frm, item, (r) => {
if (r) { if (r) {
frappe.model.set_value(item.doctype, item.name, { frappe.model.set_value(item.doctype, item.name, {
@@ -1331,7 +1330,6 @@ erpnext.stock.select_batch_and_serial_no = (frm, item) => {
}); });
} }
}); });
});
} }
}); });
}; };