Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20398 from rohitwaghchaure/fixed_serial_no_button_not_working_develop

Browse Source 
fix: add serial no button not working
This commit is contained in:
rohitwaghchaure 2020-01-24 13:49:41 +05:30 committed by GitHub
commit 573de02f60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/public/js/utils/serial_no_batch_selector.js
View File

@ -316,7 +316,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
frappe.call({ frappe.call({
method: 'erpnext.stock.doctype.batch.batch.get_batch_qty', method: 'erpnext.stock.doctype.batch.batch.get_batch_qty',
args: { args: {
batch_no: this.doc.batch_no, batch_no: me.item.batch_no,
warehouse: me.warehouse_details.name, warehouse: me.warehouse_details.name,
item_code: me.item_code item_code: me.item_code
}, },
@ -389,10 +389,13 @@ erpnext.SerialNoBatchSelector = Class.extend({
let serial_no_filters = { let serial_no_filters = {
item_code: me.item_code, item_code: me.item_code,
batch_no: this.doc.batch_no || null,
delivery_document_no: "" delivery_document_no: ""
} }
if (this.has_batch) {
serial_no_filters["batch_no"] = this.item.batch_no;
}
if (me.warehouse_details.name) { if (me.warehouse_details.name) {
serial_no_filters['warehouse'] = me.warehouse_details.name; serial_no_filters['warehouse'] = me.warehouse_details.name;
} }