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: resolve conflict

Browse Source
This commit is contained in:
Khushi Rawat
2025-11-28 17:26:33 +05:30
committed by GitHub
parent c12a560c63
commit bd795f5546
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1206,13 +1206,8 @@ def get_values_from_purchase_doc(purchase_doc_name, item_code, doctype):
return { return {
"company": purchase_doc.company, "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"), "purchase_date": purchase_doc.get("posting_date"),
"net_purchase_amount": flt(first_item.base_net_amount), "gross_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, "asset_quantity": first_item.qty,
"cost_center": first_item.cost_center or purchase_doc.get("cost_center"), "cost_center": first_item.cost_center or purchase_doc.get("cost_center"),
"asset_location": first_item.get("asset_location"), "asset_location": first_item.get("asset_location"),