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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Ameya Shenoy 2018-11-06 11:02:04 +00:00
commit 1a41929c6b
No known key found for this signature in database
GPG Key ID: AC016A555657D0A3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.67' __version__ = '10.1.68'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

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

@ -81,9 +81,9 @@ class SerialNo(StockController):
self.purchase_date = purchase_sle.posting_date self.purchase_date = purchase_sle.posting_date
self.purchase_time = purchase_sle.posting_time self.purchase_time = purchase_sle.posting_time
self.purchase_rate = purchase_sle.incoming_rate self.purchase_rate = purchase_sle.incoming_rate
if purchase_sle.voucher_type == "Purchase Receipt": if purchase_sle.voucher_type in ("Purchase Receipt", "Purchase Invoice"):
self.supplier, self.supplier_name = \ self.supplier, self.supplier_name = \
frappe.db.get_value("Purchase Receipt", purchase_sle.voucher_no, frappe.db.get_value(purchase_sle.voucher_type, purchase_sle.voucher_no,
["supplier", "supplier_name"]) ["supplier", "supplier_name"])
# If sales return entry # If sales return entry
@ -253,8 +253,8 @@ def has_duplicate_serial_no(sn, sle):
status = False status = False
if sn.purchase_document_no: if sn.purchase_document_no:
if sle.voucher_type in ['Purchase Receipt', 'Stock Entry'] and \ if sle.voucher_type in ['Purchase Receipt', 'Stock Entry', "Purchase Invoice"] and \
sn.delivery_document_type not in ['Purchase Receipt', 'Stock Entry']: sn.delivery_document_type not in ['Purchase Receipt', 'Stock Entry', "Purchase Invoice"]:
status = True status = True
if status and sle.voucher_type == 'Stock Entry' and \ if status and sle.voucher_type == 'Stock Entry' and \