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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-07-28 16:35:39 +05:30
committed by GitHub
parent 493c8ce04e
commit a944eaf054
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -781,12 +781,8 @@ class PurchaseInvoice(BuyingController):
self.get_provisional_accounts() self.get_provisional_accounts()
for item in self.get("items"): for item in self.get("items"):
<<<<<<< HEAD
if flt(item.base_net_amount):
account_currency = get_account_currency(item.expense_account)
=======
if flt(item.base_net_amount) or (self.get("update_stock") and item.valuation_rate): if flt(item.base_net_amount) or (self.get("update_stock") and item.valuation_rate):
>>>>>>> 4c273fcc99 (fix: incorrect GL entries) account_currency = get_account_currency(item.expense_account)
if item.item_code: if item.item_code:
frappe.get_cached_value("Item", item.item_code, "asset_category") frappe.get_cached_value("Item", item.item_code, "asset_category")