nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-01 12:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-12-02 12:20:48 +05:30
committed by GitHub
parent f38fb68d62
commit 199e25ec06
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,12 +4,8 @@
import unittest import unittest
import frappe import frappe
<<<<<<< HEAD
=======
from frappe import qb from frappe import qb
from frappe.query_builder.functions import Sum from frappe.query_builder.functions import Sum
from frappe.tests import IntegrationTestCase
>>>>>>> bcf6deec9a (test: add unit test to validate capitalized asset repair gl entries being booked against the asset)
from frappe.utils import add_days, 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 (