From e34ef60e3e81532231853591929a23039345e563 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 30 Nov 2017 15:59:40 +0530 Subject: [PATCH] [fix] Asset test cases and added make_sales_invoice (#11800) * [fix] Asset test cases and added make_sales_invoice * vehicle trip test cases --- erpnext/assets/doctype/asset/asset.js | 17 +++++++++++++- erpnext/assets/doctype/asset/test_asset.py | 3 ++- erpnext/hr/doctype/vehicle/test_vehicle.py | 1 + .../doctype/vehicle_log/test_vehicle_log.py | 1 + .../delivery_trip/test_delivery_trip.py | 23 +++++++++++++++---- 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index e7459259c8..2b9eac14b5 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -41,7 +41,7 @@ frappe.ui.form.on('Asset', { }); frm.add_custom_button("Sell Asset", function() { - erpnext.asset.make_sales_invoice(frm); + frm.trigger("make_sales_invoice"); }); } else if (frm.doc.status=='Scrapped') { @@ -168,6 +168,21 @@ frappe.ui.form.on('Asset', { }) }, + make_sales_invoice: function(frm) { + frappe.call({ + args: { + "asset": frm.doc.name, + "item_code": frm.doc.item_code, + "company": frm.doc.company + }, + method: "erpnext.accounts.doctype.asset.asset.make_sales_invoice", + callback: function(r) { + var doclist = frappe.model.sync(r.message); + frappe.set_route("Form", doclist[0].doctype, doclist[0].name); + } + }) + }, + create_asset_maintenance: function(frm) { frappe.call({ args: { diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index 65219075b2..7f9e99e2d2 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -234,8 +234,9 @@ class TestAsset(unittest.TestCase): expected_gle = ( ("_Test Accumulated Depreciations - _TC", 30000.0, 0.0), + ("_Test Depreciations - _TC", 70000.0, 0.0), ("_Test Fixed Asset - _TC", 0.0, 100000.0), - ("_Test Gain/Loss on Asset Disposal - _TC", 45000.0, 0.0), + ("_Test Gain/Loss on Asset Disposal - _TC", 0.0, 25000.0), ("Debtors - _TC", 25000.0, 0.0) ) diff --git a/erpnext/hr/doctype/vehicle/test_vehicle.py b/erpnext/hr/doctype/vehicle/test_vehicle.py index 643197780b..ff3429d0e7 100644 --- a/erpnext/hr/doctype/vehicle/test_vehicle.py +++ b/erpnext/hr/doctype/vehicle/test_vehicle.py @@ -19,6 +19,7 @@ class TestVehicle(unittest.TestCase): "acquisition_date":frappe.utils.nowdate(), "location": "Mumbai", "chassis_no": "1234ABCD", + "uom": "Litre", "vehicle_value":frappe.utils.flt(500000) }) vehicle.insert() diff --git a/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py b/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py index 71c1d91a8d..35400b0ca8 100644 --- a/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py +++ b/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py @@ -20,6 +20,7 @@ class TestVehicleLog(unittest.TestCase): "acquisition_date":frappe.utils.nowdate(), "location": "Mumbai", "chassis_no": "1234ABCD", + "uom": "Litre", "vehicle_value":frappe.utils.flt(500000) }) try: diff --git a/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py index 6ac86960d4..ec5a3e7444 100644 --- a/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py +++ b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py @@ -8,26 +8,30 @@ import erpnext import unittest from frappe.utils import nowdate, add_days from erpnext.tests.utils import create_test_contact_and_address -from erpnext.stock.doctype.delivery_trip.delivery_trip import notify_customers +from erpnext.stock.doctype.delivery_trip.delivery_trip import notify_customers, get_contact_and_address class TestDeliveryTrip(unittest.TestCase): def setUp(self): create_driver() create_vehicle() + create_delivery_notfication() create_test_contact_and_address() def test_delivery_trip(self): + contact = get_contact_and_address("_Test Customer") + if not frappe.db.exists("Delivery Trip", "TOUR-00000"): delivery_trip = frappe.new_doc("Delivery Trip") delivery_trip.company = erpnext.get_default_company() delivery_trip.date = add_days(nowdate(), 5) - delivery_trip.driver = "Newton Scmander" + delivery_trip.driver = "DRIVER-00001" delivery_trip.vehicle = "JB 007" delivery_trip.append("delivery_stops", { "customer": "_Test Customer", - "address": "_Test Address for Customer", - "contact": '_Test Contact for _Test Customer - _Test Customer' + "address": contact.shipping_address.parent, + "contact": contact.contact_person.parent }) + delivery_trip.delivery_notification = 'Delivery Notification' delivery_trip.insert() sender_email = frappe.db.get_value("User", frappe.session.user, "email") notify_customers(docname=delivery_trip.name, date=delivery_trip.date, driver=delivery_trip.driver, @@ -36,7 +40,6 @@ class TestDeliveryTrip(unittest.TestCase): self.assertEquals(delivery_trip.get("delivery_stops")[0].notified_by_email, 1) - def create_driver(): if not frappe.db.exists("Driver", "Newton Scmander"): driver = frappe.new_doc("Driver") @@ -45,6 +48,15 @@ def create_driver(): driver.license_number = "B809" driver.insert() +def create_delivery_notfication(): + if not frappe.db.exists("Standard Reply", "Delivery Notification"): + frappe.get_doc({ + 'doctype': 'Standard Reply', + 'name': 'Delivery Notification', + 'response': 'Test Delivery Trip', + 'subject': 'Test Subject', + 'owner': frappe.session.user + }).insert() def create_vehicle(): if not frappe.db.exists("Vehicle", "JB 007"): @@ -57,6 +69,7 @@ def create_vehicle(): "acquisition_date": frappe.utils.nowdate(), "location": "Mumbai", "chassis_no": "1234ABCD", + "uom": "Litre", "vehicle_value": frappe.utils.flt(500000) }) vehicle.insert()