CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-26 16:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-07-29 15:42:00 +05:30
committed by GitHub
parent 59ac7aeb23
commit 6cdc7811b8
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,11 +4,7 @@
import unittest import unittest
import frappe import frappe
<<<<<<< HEAD from frappe.utils import add_days, flt, nowdate
from frappe.utils import flt, nowdate
=======
from frappe.utils import add_days, add_months, flt, get_first_day, nowdate, nowtime, today
>>>>>>> 5a82b723c2 (fix: post gl entry on completion date of asset repair)
from erpnext.assets.doctype.asset.asset import ( from erpnext.assets.doctype.asset.asset import (
get_asset_account, get_asset_account,