schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-06-30 01:04:54 +05:30
committed by GitHub
parent f31b008502
commit 2b37287b19
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,12 +4,7 @@
import unittest import unittest
import frappe import frappe
<<<<<<< HEAD
from frappe.utils import flt, nowdate, nowtime, today
=======
from frappe.tests import IntegrationTestCase
from frappe.utils import add_months, flt, get_first_day, nowdate, nowtime, today from frappe.utils import add_months, flt, get_first_day, nowdate, nowtime, today
>>>>>>> cfe04a2aaf (test: asset status validation)
from erpnext.assets.doctype.asset.asset import ( from erpnext.assets.doctype.asset.asset import (
get_asset_account, get_asset_account,