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

fix: make completion mandatory and fix test case

Browse Source
This commit is contained in:
khushi8112
2025-07-18 17:10:58 +05:30
parent da8f7b29c1
commit 766c5bbe2b
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py
View File

@@ -659,7 +659,7 @@ class TestAssetDepreciationSchedule(IntegrationTestCase):
self.assertEqual(schedules, expected_depreciation_before_repair) self.assertEqual(schedules, expected_depreciation_before_repair)
def test_daily_prorata_based_depreciation_schedule_after_cancelling_asset_repair_for(self): def test_daily_prorata_based_depreciation_schedule_after_cancelling_asset_repair(self):
asset = create_asset( asset = create_asset(
item_code="Macbook Pro", item_code="Macbook Pro",
gross_purchase_amount=500, gross_purchase_amount=500,

3
erpnext/assets/doctype/asset_repair/asset_repair.json
View File

@@ -68,6 +68,7 @@
"fieldname": "completion_date", "fieldname": "completion_date",
"fieldtype": "Datetime", "fieldtype": "Datetime",
"label": "Completion Date", "label": "Completion Date",
"mandatory_depends_on": "eval:doc.repair_status==\"Completed\"",
"no_copy": 1 "no_copy": 1
}, },
{ {
@@ -260,7 +261,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2025-06-29 22:30:00.589597", "modified": "2025-07-18 15:59:53.981224",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Repair", "name": "Asset Repair",

2
erpnext/assets/doctype/asset_repair/asset_repair.py
View File

@@ -75,7 +75,7 @@ class AssetRepair(AccountsController):
) )
def validate_dates(self): def validate_dates(self):
if self.completion_date and (self.failure_date > self.completion_date): if self.completion_date and (getdate(self.failure_date) > getdate(self.completion_date)):
frappe.throw( frappe.throw(
_("Completion Date can not be before Failure Date. Please adjust the dates accordingly.") _("Completion Date can not be before Failure Date. Please adjust the dates accordingly.")
) )

3
erpnext/assets/doctype/asset_repair/test_asset_repair.py
View File

@@ -4,7 +4,7 @@ import unittest
import frappe import frappe
from frappe.tests import IntegrationTestCase from frappe.tests import IntegrationTestCase
from frappe.utils import add_months, flt, get_first_day, nowdate, nowtime, today from frappe.utils import add_days, add_months, flt, get_first_day, nowdate, nowtime, today
from erpnext.assets.doctype.asset.asset import ( from erpnext.assets.doctype.asset.asset import (
get_asset_account, get_asset_account,
@@ -388,6 +388,7 @@ def create_asset_repair(**args):
if args.submit: if args.submit:
asset_repair.repair_status = "Completed" asset_repair.repair_status = "Completed"
asset_repair.completion_date = add_days(args.failure_date, 1)
asset_repair.cost_center = frappe.db.get_value("Company", asset.company, "cost_center") asset_repair.cost_center = frappe.db.get_value("Company", asset.company, "cost_center")
if args.stock_consumption: if args.stock_consumption: