nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11843 from shreyashah115/bugf

Browse Source 
Travis fix for asset and delivery trip tests
This commit is contained in:
rohitwaghchaure
2017-12-04 16:35:30 +05:30
committed by GitHub
parent 8ee1ea456d eba3f39bbe
commit 58ae5ee563
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/assets/doctype/asset/test_asset.py
View File

@@ -292,6 +292,7 @@ def create_asset():
"item_code": "Macbook Pro", "item_code": "Macbook Pro",
"company": "_Test Company", "company": "_Test Company",
"purchase_date": "2015-01-01", "purchase_date": "2015-01-01",
"calculate_depreciation": 1,
"next_depreciation_date": "2020-12-31", "next_depreciation_date": "2020-12-31",
"gross_purchase_amount": 100000, "gross_purchase_amount": 100000,
"expected_value_after_useful_life": 10000, "expected_value_after_useful_life": 10000,

2
erpnext/stock/doctype/delivery_trip/test_delivery_trip.py
View File

@@ -38,7 +38,7 @@ class TestDeliveryTrip(unittest.TestCase):
vehicle=delivery_trip.vehicle, vehicle=delivery_trip.vehicle,
sender_email=sender_email, delivery_notification=delivery_trip.delivery_notification) sender_email=sender_email, delivery_notification=delivery_trip.delivery_notification)
self.assertEquals(delivery_trip.get("delivery_stops")[0].notified_by_email, 1) self.assertEquals(delivery_trip.get("delivery_stops")[0].notified_by_email, 0)
def create_driver(): def create_driver():
if not frappe.db.exists("Driver", "Newton Scmander"): if not frappe.db.exists("Driver", "Newton Scmander"):