nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-09 08:02:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: Sider issues"

Browse Source 
This reverts commit d3fbefcdf7.
This commit is contained in:
Deepesh Garg
2021-01-15 10:11:27 +05:30
parent 21479fc5ea
commit 540c119a27
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/batch/batch.js
View File

@@ -19,8 +19,8 @@ frappe.ui.form.on('Batch', {
'item_code': frm.doc.item, 'item_code': frm.doc.item,
'selling': 1 'selling': 1
} }
}; }
}); })
}, },
refresh: (frm) => { refresh: (frm) => {
if(!frm.is_new()) { if(!frm.is_new()) {

2
erpnext/stock/get_item_details.py
View File

@@ -706,7 +706,7 @@ def get_item_price(args, item_code, ignore_party=False):
order by valid_from desc, uom desc """.format(conditions=conditions), args) order by valid_from desc, uom desc """.format(conditions=conditions), args)
def is_valid_item_price(item_price, posting_date): def is_valid_item_price(item_price, posting_date):
if item_price.valid_upto and getdate(posting_date) <= getdate(item_price.valid_upto): if item_price.valid_upto and getdate(posting_date) <= getdate(valid_upto):
return True return True
if getdate(posting_date) >= getdate(item_price.valid_from): if getdate(posting_date) >= getdate(item_price.valid_from):