nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-13 20:05:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: set status to Draft for auto-created assets from Purchase Receipt

Browse Source 
(cherry picked from commit 20c2cb40d1)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
#	erpnext/patches.txt
This commit is contained in:
khushi8112
2025-10-23 17:41:51 +05:30
committed by Mergify
parent 977464e6a7
commit d8eddbfd03
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/assets/doctype/asset/asset.py
View File

@@ -131,6 +131,13 @@ class Asset(AccountsController):
self.set_missing_values() self.set_missing_values()
self.validate_gross_and_purchase_amount() self.validate_gross_and_purchase_amount()
self.validate_finance_books() self.validate_finance_books()
<<<<<<< HEAD
=======
def before_save(self):
self.total_asset_cost = self.net_purchase_amount + self.additional_asset_cost
self.status = self.get_status()
>>>>>>> 20c2cb40d1 (fix: set status to Draft for auto-created assets from Purchase Receipt)
if not self.split_from: if not self.split_from:
self.prepare_depreciation_data() self.prepare_depreciation_data()

1
erpnext/controllers/buying_controller.py
View File

@@ -878,6 +878,7 @@ class BuyingController(SubcontractingController):
"asset_category": item_data.get("asset_category"), "asset_category": item_data.get("asset_category"),
"location": row.asset_location, "location": row.asset_location,
"company": self.company, "company": self.company,
"status": "Draft",
"supplier": self.supplier, "supplier": self.supplier,
"purchase_date": self.posting_date, "purchase_date": self.posting_date,
"calculate_depreciation": 0, "calculate_depreciation": 0,

10
erpnext/patches.txt
View File

@@ -422,3 +422,13 @@ execute:frappe.db.set_single_value("Accounts Settings", "fetch_valuation_rate_fo
erpnext.patches.v15_0.add_company_payment_gateway_account erpnext.patches.v15_0.add_company_payment_gateway_account
erpnext.patches.v15_0.update_uae_zero_rated_fetch erpnext.patches.v15_0.update_uae_zero_rated_fetch
erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter
<<<<<<< HEAD
=======
erpnext.patches.v16_0.make_workstation_operating_components #1
erpnext.patches.v16_0.set_reporting_currency
erpnext.patches.v16_0.set_posting_datetime_for_sabb_and_drop_indexes
erpnext.patches.v16_0.update_serial_no_reference_name
erpnext.patches.v16_0.rename_subcontracted_quantity
erpnext.patches.v16_0.add_new_stock_entry_types
erpnext.patches.v15_0.set_asset_status_if_not_already_set
>>>>>>> 20c2cb40d1 (fix: set status to Draft for auto-created assets from Purchase Receipt)

13
erpnext/patches/v15_0/set_asset_status_if_not_already_set.py Normal file
View File

@@ -0,0 +1,13 @@
import frappe
from frappe.query_builder import DocType
def execute():
Asset = DocType("Asset")
query = (
frappe.qb.update(Asset)
.set(Asset.status, "Draft")
.where((Asset.docstatus == 0) & ((Asset.status.isnull()) | (Asset.status == "")))
)
query.run()