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

fix: serial and batch bundle for POS Invoice (backport #41491) (#42396)

Browse Source 
* fix: serial and batch bundle for POS Invoice (#41491)

(cherry picked from commit e5dfc5e545)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2024-07-21 00:00:14 +05:30
committed by GitHub
parent 8da28dcfb2
commit 555be2be11
9 changed files with 149 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/selling/page/point_of_sale/pos_controller.js
View File

@@ -583,6 +583,7 @@ erpnext.PointOfSale.Controller = class {
new_item["serial_no"] = serial_no;
}
new_item["use_serial_batch_fields"] = 1;
if (field === "serial_no") new_item["qty"] = value.split(`\n`).length || 0;
item_row = this.frm.add_child("items", new_item);

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

@@ -101,7 +101,8 @@ erpnext.PointOfSale.ItemDetails = class {
const serialized = item_row.has_serial_no;
const batched = item_row.has_batch_no;
const no_bundle_selected = !item_row.serial_and_batch_bundle;
const no_bundle_selected =
!item_row.serial_and_batch_bundle && !item_row.serial_no && !item_row.batch_no;
if ((serialized && no_bundle_selected) || (batched && no_bundle_selected)) {
frappe.show_alert({
@@ -403,6 +404,7 @@ erpnext.PointOfSale.ItemDetails = class {
frappe.model.set_value(item_row.doctype, item_row.name, {
serial_and_batch_bundle: r.name,
qty: Math.abs(r.total_qty),
use_serial_batch_fields: 0,
});
}
});