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

Merge pull request #12674 from tundebabzy/issue-12673-1

Browse Source 
Batch List Shows Wrong Expired Status For Batches #12673
This commit is contained in:
tundebabzy 2018-01-27 07:50:12 +01:00 committed by GitHub
commit 186bea6e95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/batch/batch_list.js
View File

@ -1,7 +1,7 @@
frappe.listview_settings['Batch'] = { frappe.listview_settings['Batch'] = {
add_fields: ["item", "expiry_date"], add_fields: ["item", "expiry_date"],
get_indicator: function(doc) { get_indicator: function(doc) {
if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date) <= 0) { if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date, frappe.datetime.nowdate()) <= 0) {
return [__("Expired"), "red", "expiry_date,>=,Today"] return [__("Expired"), "red", "expiry_date,>=,Today"]
} else if(doc.expiry_date) { } else if(doc.expiry_date) {
return [__("Not Expired"), "green", "expiry_date,<,Today"] return [__("Not Expired"), "green", "expiry_date,<,Today"]