CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflict

Browse Source
This commit is contained in:
Nabin Hait
2024-05-14 19:34:29 +05:30
committed by GitHub
parent 8cca74d5ef
commit 3a72f4bd30
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/asset.py
View File

@@ -696,11 +696,7 @@ class Asset(AccountsController):
purchase_document = self.get_purchase_document() purchase_document = self.get_purchase_document()
fixed_asset_account, cwip_account = self.get_fixed_asset_account(), self.get_cwip_account() fixed_asset_account, cwip_account = self.get_fixed_asset_account(), self.get_cwip_account()
<<<<<<< HEAD
if purchase_document and self.purchase_receipt_amount and self.available_for_use_date <= nowdate():
=======
if purchase_document and self.purchase_amount and getdate(self.available_for_use_date) <= getdate(): if purchase_document and self.purchase_amount and getdate(self.available_for_use_date) <= getdate():
>>>>>>> 31841b4ab2 (refactor: renamed purchase receipt amount field to purchase amount)
gl_entries.append( gl_entries.append(
self.get_gl_dict( self.get_gl_dict(
{ {