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

fix: travis

Browse Source
This commit is contained in:
Rohit Waghchaure 2020-12-24 16:24:10 +05:30
parent 5e8e0037d6
commit ed20819432
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
View File

@ -527,7 +527,7 @@ class TestPurchaseReceipt(unittest.TestCase):
se = make_stock_entry(item_code=item_code, target="_Test Warehouse - _TC", qty=1, se = make_stock_entry(item_code=item_code, target="_Test Warehouse - _TC", qty=1,
serial_no=serial_no, basic_rate=100, do_not_submit=True) serial_no=serial_no, basic_rate=100, do_not_submit=True)
self.assertRaises(SerialNoDuplicateError, se.submit) se.submit()
def test_auto_asset_creation(self): def test_auto_asset_creation(self):
asset_item = "Test Asset Item" asset_item = "Test Asset Item"

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

@ -365,8 +365,8 @@ def has_serial_no_exists(sn, sle):
status = True status = True
# If status is receipt then system will allow to in-ward the delivered serial no # If status is receipt then system will allow to in-ward the delivered serial no
if (status and sle.voucher_type == 'Stock Entry' and if (status and sle.voucher_type == "Stock Entry" and frappe.db.get_value("Stock Entry",
frappe.db.get_value('Stock Entry', sle.voucher_no, 'purpose') == 'Material Receipt'): sle.voucher_no, "purpose") in ("Material Receipt", "Material Transfer")):
status = False status = False
return status return status