From 3febe0215e97ef88cd67d4df5819d939b804d09e Mon Sep 17 00:00:00 2001 From: Shreya Date: Mon, 4 Dec 2017 16:04:42 +0530 Subject: [PATCH 1/2] test asset fix --- erpnext/assets/doctype/asset/test_asset.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index 7f9e99e2d2..107ffec038 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -292,6 +292,7 @@ def create_asset(): "item_code": "Macbook Pro", "company": "_Test Company", "purchase_date": "2015-01-01", + "calculate_depreciation": 1, "next_depreciation_date": "2020-12-31", "gross_purchase_amount": 100000, "expected_value_after_useful_life": 10000, From eba3f39bbe1dd866697d00ea91959e42f2bfa69a Mon Sep 17 00:00:00 2001 From: Shreya Date: Mon, 4 Dec 2017 16:04:56 +0530 Subject: [PATCH 2/2] test delivery trip fix --- erpnext/stock/doctype/delivery_trip/test_delivery_trip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py index ec5a3e7444..4fe00c474f 100644 --- a/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py +++ b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py @@ -38,7 +38,7 @@ class TestDeliveryTrip(unittest.TestCase): vehicle=delivery_trip.vehicle, 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(): if not frappe.db.exists("Driver", "Newton Scmander"):