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

fix: serial and batch bundle values in the standard print format

Browse Source
This commit is contained in:
Rohit Waghchaure
2023-06-26 16:00:53 +05:30
parent c51e6dba8d
commit 9cf645e07f
4 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
erpnext/stock/serial_batch_bundle.py
View File

@@ -312,7 +312,35 @@ def get_serial_nos_from_bundle(serial_and_batch_bundle, serial_nos=None):
def get_serial_or_batch_nos(bundle):
return frappe.get_all("Serial and Batch Entry", fields=["*"], filters={"parent": bundle})
# For print format
bundle_data = frappe.get_cached_value(
"Serial and Batch Bundle", bundle, ["has_serial_no", "has_batch_no"], as_dict=True
)
fields = []
if bundle_data.has_serial_no:
fields.append("serial_no")
if bundle_data.has_batch_no:
fields.extend(["batch_no", "qty"])
data = frappe.get_all("Serial and Batch Entry", fields=fields, filters={"parent": bundle})
if bundle_data.has_serial_no and not bundle_data.has_batch_no:
return ", ".join([d.serial_no for d in data])
elif bundle_data.has_batch_no:
html = "<table class= 'table table-borderless' style='margin-top: 0px;margin-bottom: 0px;'>"
for d in data:
if d.serial_no:
html += f"<tr><td>{d.batch_no}</th><th>{d.serial_no}</th ><th>{abs(d.qty)}</th></tr>"
else:
html += f"<tr><td>{d.batch_no}</td><td>{abs(d.qty)}</td></tr>"
html += "</table>"
return html
class SerialNoValuation(DeprecatedSerialNoValuation):