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

fix: Fiter passing fix in get batch query (#18131)

Browse Source
This commit is contained in:
Deepesh Garg 2019-07-02 10:10:55 +05:30 committed by Nabin Hait
parent f949c5ddf7
commit 78a86af7fd
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/controllers/queries.py
View File

@ -296,7 +296,6 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
order by batch.expiry_date, sle.batch_no desc order by batch.expiry_date, sle.batch_no desc
limit %(start)s, %(page_len)s""".format(cond, match_conditions=get_match_cond(doctype)), args) limit %(start)s, %(page_len)s""".format(cond, match_conditions=get_match_cond(doctype)), args)
if batch_nos:
return batch_nos return batch_nos
else: else:
return frappe.db.sql("""select name, concat('MFG-', manufacturing_date), concat('EXP-',expiry_date) from `tabBatch` batch return frappe.db.sql("""select name, concat('MFG-', manufacturing_date), concat('EXP-',expiry_date) from `tabBatch` batch

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

@ -271,14 +271,6 @@ erpnext.SerialNoBatchSelector = Class.extend({
get_batch_fields: function() { get_batch_fields: function() {
var me = this; var me = this;
let filters = {
item_code: me.item_code
}
if (me.warehouse || me.warehouse_details.name) {
filters['warehouse'] = me.warehouse || me.warehouse_details.name;
}
return [ return [
{fieldtype:'Section Break', label: __('Batches')}, {fieldtype:'Section Break', label: __('Batches')},
{fieldname: 'batches', fieldtype: 'Table', label: __('Batch Entries'), {fieldname: 'batches', fieldtype: 'Table', label: __('Batch Entries'),
@ -292,7 +284,10 @@ erpnext.SerialNoBatchSelector = Class.extend({
'in_list_view': 1, 'in_list_view': 1,
get_query: function () { get_query: function () {
return { return {
filters: filters, filters: {
item_code: me.item_code,
warehouse: me.warehouse || me.warehouse_details.name
},
query: 'erpnext.controllers.queries.get_batch_no' query: 'erpnext.controllers.queries.get_batch_no'
}; };
}, },