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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait
2017-09-12 16:16:57 +05:30
parent de9eebe51c 50312b54a0
commit f8f29677fd
12 changed files with 93 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/doctype/serial_no/serial_no.py
View File

@@ -240,7 +240,8 @@ def has_duplicate_serial_no(sn, sle):
status = False
if sn.purchase_document_no:
if sle.voucher_type in ['Purchase Receipt', 'Stock Entry']:
if sle.voucher_type in ['Purchase Receipt', 'Stock Entry'] and \
sn.delivery_document_type not in ['Purchase Receipt', 'Stock Entry']:
status = True
if status and sle.voucher_type == 'Stock Entry' and \