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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-08-03 16:21:45 +05:30
committed by GitHub
parent af7dc363e1
commit 67b95c4abf
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -1648,13 +1648,9 @@ class StockEntry(StockController):
) )
) )
<<<<<<< HEAD
self.set_gl_entries_for_landed_cost_voucher(gl_entries, warehouse_account) self.set_gl_entries_for_landed_cost_voucher(gl_entries, warehouse_account)
return process_gl_map(gl_entries)
=======
return process_gl_map(gl_entries, from_repost=frappe.flags.through_repost_item_valuation) return process_gl_map(gl_entries, from_repost=frappe.flags.through_repost_item_valuation)
>>>>>>> a96fa55704 (perf: process_gl_map causing performance issues in the reposting)
def set_gl_entries_for_landed_cost_voucher(self, gl_entries, warehouse_account): def set_gl_entries_for_landed_cost_voucher(self, gl_entries, warehouse_account):
landed_cost_entries = self.get_item_account_wise_lcv_entries() landed_cost_entries = self.get_item_account_wise_lcv_entries()