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

Merge pull request #2949 from sbktechnology/develop

Browse Source 
update get_batch_no query to sort batch with expiry date
This commit is contained in:
Nabin Hait 2015-03-18 14:29:13 +05:30
commit 87ee502dfd
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/queries.py
View File

@ -233,7 +233,9 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
from erpnext.controllers.queries import get_match_cond
if filters.has_key('warehouse'):
return frappe.db.sql("""select batch_no from `tabStock Ledger Entry` sle
return frappe.db.sql("""select batch_no, round(sum(actual_qty),2), stock_uom, expiry_date from `tabStock Ledger Entry` sle
INNER JOIN `tabBatch`
on sle.batch_no = `tabBatch`.batch_id
where item_code = '%(item_code)s'
and warehouse = '%(warehouse)s'
and batch_no like '%(txt)s'
@ -243,7 +245,7 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
and docstatus != 2)
%(mcond)s
group by batch_no having sum(actual_qty) > 0
order by batch_no desc
order by expiry_date,batch_no desc
limit %(start)s, %(page_len)s """ % {'item_code': filters['item_code'],
'warehouse': filters['warehouse'], 'posting_date': filters['posting_date'],
'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype),

2
erpnext/selling/sales_common.js
View File

@ -282,6 +282,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
batch_no: function(doc, cdt, cdn) {
var me = this;
var item = frappe.get_doc(cdt, cdn);
if(item.item_code) {
return this.frm.call({
method: "erpnext.stock.get_item_details.get_batch_qty",
child: item,
@ -292,6 +293,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
},
"fieldname": "actual_batch_qty"
});
}
},
set_dynamic_labels: function() {