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

fix: SABB print for packed items (backport #44413) (#44428)

Browse Source 
fix: SABB print for packed items (#44413)

(cherry picked from commit 5266f236b7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2024-11-29 17:00:59 +05:30
committed by GitHub
parent e607795bae
commit 0e39aa349e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/print_settings.py
View File

@@ -11,7 +11,13 @@ def set_print_templates_for_item_table(doc, settings):
"items": { "items": {
"qty": "templates/print_formats/includes/item_table_qty.html", "qty": "templates/print_formats/includes/item_table_qty.html",
"serial_and_batch_bundle": "templates/print_formats/includes/serial_and_batch_bundle.html", "serial_and_batch_bundle": "templates/print_formats/includes/serial_and_batch_bundle.html",
} },
"packed_items": {
"serial_and_batch_bundle": "templates/print_formats/includes/serial_and_batch_bundle.html",
},
"supplied_items": {
"serial_and_batch_bundle": "templates/print_formats/includes/serial_and_batch_bundle.html",
},
} }
doc.flags.compact_item_fields = ["description", "qty", "rate", "amount"] doc.flags.compact_item_fields = ["description", "qty", "rate", "amount"]

2
erpnext/stock/serial_batch_bundle.py
View File

@@ -478,7 +478,7 @@ def get_serial_or_batch_nos(bundle):
html = "<table class= 'table table-borderless' style='margin-top: 0px;margin-bottom: 0px;'>" html = "<table class= 'table table-borderless' style='margin-top: 0px;margin-bottom: 0px;'>"
for d in data: for d in data:
if d.serial_no: if d.serial_no:
html += f"<tr><td>{d.batch_no}</th><th>{d.serial_no}</th ><th>{abs(d.qty)}</th></tr>" html += f"<tr><td>{d.batch_no}</td><td>{d.serial_no}</td><td>{abs(d.qty)}</td></tr>"
else: else:
html += f"<tr><td>{d.batch_no}</td><td>{abs(d.qty)}</td></tr>" html += f"<tr><td>{d.batch_no}</td><td>{abs(d.qty)}</td></tr>"