mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-16 13:25:10 +00:00
fix: incorrect GL entries
(cherry picked from commit 4c273fcc99)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
This commit is contained in:
committed by
Mergify
parent
77ea06dc7d
commit
493c8ce04e
@@ -781,8 +781,12 @@ 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):
|
if flt(item.base_net_amount):
|
||||||
account_currency = get_account_currency(item.expense_account)
|
account_currency = get_account_currency(item.expense_account)
|
||||||
|
=======
|
||||||
|
if flt(item.base_net_amount) or (self.get("update_stock") and item.valuation_rate):
|
||||||
|
>>>>>>> 4c273fcc99 (fix: incorrect GL entries)
|
||||||
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")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user