schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #40752 from rohitwaghchaure/provision-to-override-batch-dialog

Browse Source 
chore: allow to override serial batch selector using custom app
This commit is contained in:
rohitwaghchaure
2024-03-29 09:10:36 +05:30
committed by GitHub
parent 10bf6529ef 0d9d42ae61
commit ce2b9de9be
8 changed files with 119 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
erpnext/public/js/controllers/buying.js
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,30 +351,28 @@ 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) { let qty = Math.abs(r.total_qty);
let qty = Math.abs(r.total_qty); if (doc.is_return) {
if (doc.is_return) { qty = qty * -1;
qty = qty * -1;
}
let update_values = {
"serial_and_batch_bundle": r.name,
"use_serial_batch_fields": 0,
"qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
}
if (r.warehouse) {
update_values["warehouse"] = r.warehouse;
}
frappe.model.set_value(item.doctype, item.name, update_values);
} }
let update_values = {
"serial_and_batch_bundle": r.name,
"use_serial_batch_fields": 0,
"qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
}
if (r.warehouse) {
update_values["warehouse"] = r.warehouse;
}
frappe.model.set_value(item.doctype, item.name, update_values);
} }
); }
}); );
} }
}); });
} }
@@ -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,30 +389,28 @@ 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) { let qty = Math.abs(r.total_qty);
let qty = Math.abs(r.total_qty); if (doc.is_return) {
if (doc.is_return) { qty = qty * -1;
qty = qty * -1;
}
let update_values = {
"serial_and_batch_bundle": r.name,
"use_serial_batch_fields": 0,
"rejected_qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
}
if (r.warehouse) {
update_values["rejected_warehouse"] = r.warehouse;
}
frappe.model.set_value(item.doctype, item.name, update_values);
} }
let update_values = {
"serial_and_batch_bundle": r.name,
"use_serial_batch_fields": 0,
"rejected_qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
}
if (r.warehouse) {
update_values["rejected_warehouse"] = r.warehouse;
}
frappe.model.set_value(item.doctype, item.name, update_values);
} }
); }
}); );
} }
}); });
} }

36
erpnext/public/js/controllers/transaction.js
View File

@@ -2509,27 +2509,25 @@ 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 { item_row.type_of_transaction = frm.doc.is_return ? "Outward" : "Inward";
item_row.type_of_transaction = frm.doc.is_return ? "Outward" : "Inward"; }
}
new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => { new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => {
if (r) { if (r) {
let update_values = { let update_values = {
"serial_and_batch_bundle": r.name, "serial_and_batch_bundle": r.name,
"qty": Math.abs(r.total_qty) "qty": Math.abs(r.total_qty)
}
if (r.warehouse) {
update_values[warehouse_field] = r.warehouse;
}
frappe.model.set_value(item_row.doctype, item_row.name, update_values);
} }
});
if (r.warehouse) {
update_values[warehouse_field] = r.warehouse;
}
frappe.model.set_value(item_row.doctype, item_row.name, update_values);
}
}); });
} }

1
erpnext/public/js/erpnext.bundle.js
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";

32
erpnext/public/js/utils.js
View File

@@ -430,25 +430,23 @@ $.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 = { serial_and_batch_bundle: r.name,
serial_and_batch_bundle: r.name, qty: Math.abs(r.total_qty),
qty: Math.abs(r.total_qty), };
};
if (!warehouse_field) { if (!warehouse_field) {
warehouse_field = "warehouse"; warehouse_field = "warehouse";
}
if (r.warehouse) {
update_values[warehouse_field] = r.warehouse;
}
frappe.model.set_value(item_row.doctype, item_row.name, update_values);
} }
});
if (r.warehouse) {
update_values[warehouse_field] = r.warehouse;
}
frappe.model.set_value(item_row.doctype, item_row.name, update_values);
}
}); });
}); });
}, },

37
erpnext/public/js/utils/sales_common.js
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,26 +363,24 @@ 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); if (doc.is_return) {
if (doc.is_return) { qty = qty * -1;
qty = qty * -1;
}
frappe.model.set_value(item.doctype, item.name, {
serial_and_batch_bundle: r.name,
use_serial_batch_fields: 0,
qty:
qty /
flt(
item.conversion_factor || 1,
precision("conversion_factor", item)
),
});
} }
});
frappe.model.set_value(item.doctype, item.name, {
serial_and_batch_bundle: r.name,
use_serial_batch_fields: 0,
qty:
qty /
flt(
item.conversion_factor || 1,
precision("conversion_factor", item)
),
});
}
}); });
} }
}); });

22
erpnext/selling/page/point_of_sale/pos_item_details.js
View File

@@ -394,19 +394,17 @@ 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";
new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => { new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => {
if (r) { if (r) {
frappe.model.set_value(item_row.doctype, item_row.name, { frappe.model.set_value(item_row.doctype, item_row.name, {
serial_and_batch_bundle: r.name, serial_and_batch_bundle: r.name,
qty: Math.abs(r.total_qty), qty: Math.abs(r.total_qty),
}); });
} }
});
}); });
}); });
} }

22
erpnext/stock/doctype/pick_list/pick_list.js
View File

@@ -355,19 +355,15 @@ 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 / flt(item.conversion_factor || 1, precision("conversion_factor", item)),
qty: });
qty / }
flt(item.conversion_factor || 1, precision("conversion_factor", item)),
});
}
});
}); });
} }
}); });

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

@@ -1335,18 +1335,16 @@ 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, { serial_and_batch_bundle: r.name,
serial_and_batch_bundle: r.name, use_serial_batch_fields: 0,
use_serial_batch_fields: 0, qty:
qty: Math.abs(r.total_qty) /
Math.abs(r.total_qty) / flt(item.conversion_factor || 1, precision("conversion_factor", item)),
flt(item.conversion_factor || 1, precision("conversion_factor", item)), });
}); }
}
});
}); });
} }
}); });