From c12a560c63d2b5fc395aaf9ff67cf62e3c775214 Mon Sep 17 00:00:00 2001 From: Navin S R Date: Thu, 27 Nov 2025 14:06:43 +0530 Subject: [PATCH 1/2] fix: use posting_date instead of bill_date from purchase invoice (cherry picked from commit 145d40dec856b1ddbdf0a3ac4cd6698aa3631ac9) # Conflicts: # erpnext/assets/doctype/asset/asset.py --- erpnext/assets/doctype/asset/asset.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 6ef5a8643aa..615c50d05e3 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -1206,8 +1206,13 @@ def get_values_from_purchase_doc(purchase_doc_name, item_code, doctype): return { "company": purchase_doc.company, +<<<<<<< HEAD "purchase_date": purchase_doc.get("bill_date") or purchase_doc.get("posting_date"), "gross_purchase_amount": flt(first_item.base_net_amount), +======= + "purchase_date": purchase_doc.get("posting_date"), + "net_purchase_amount": flt(first_item.base_net_amount), +>>>>>>> 145d40dec8 (fix: use posting_date instead of bill_date from purchase invoice) "asset_quantity": first_item.qty, "cost_center": first_item.cost_center or purchase_doc.get("cost_center"), "asset_location": first_item.get("asset_location"), From bd795f5546765263712b04cd3b06255cb7d1c7ec Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Fri, 28 Nov 2025 17:26:33 +0530 Subject: [PATCH 2/2] fix: resolve conflict --- erpnext/assets/doctype/asset/asset.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 615c50d05e3..33c6604f01f 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -1206,13 +1206,8 @@ def get_values_from_purchase_doc(purchase_doc_name, item_code, doctype): return { "company": purchase_doc.company, -<<<<<<< HEAD - "purchase_date": purchase_doc.get("bill_date") or purchase_doc.get("posting_date"), - "gross_purchase_amount": flt(first_item.base_net_amount), -======= "purchase_date": purchase_doc.get("posting_date"), - "net_purchase_amount": flt(first_item.base_net_amount), ->>>>>>> 145d40dec8 (fix: use posting_date instead of bill_date from purchase invoice) + "gross_purchase_amount": flt(first_item.base_net_amount), "asset_quantity": first_item.qty, "cost_center": first_item.cost_center or purchase_doc.get("cost_center"), "asset_location": first_item.get("asset_location"),