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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-04-14 18:02:24 +05:30
committed by GitHub
parent 253a067592
commit 3f3fb323cf
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/stock_ledger.py
View File

@@ -864,16 +864,12 @@ class update_entries_after:
stock_entry.calculate_rate_and_amount(reset_outgoing_rate=False, raise_error_if_no_rate=False) stock_entry.calculate_rate_and_amount(reset_outgoing_rate=False, raise_error_if_no_rate=False)
stock_entry.db_update() stock_entry.db_update()
for d in stock_entry.items: for d in stock_entry.items:
<<<<<<< HEAD
if d.name == voucher_detail_no or (not d.s_warehouse and d.t_warehouse):
=======
# Update only the row that matches the voucher_detail_no or the row containing the FG/Scrap Item. # Update only the row that matches the voucher_detail_no or the row containing the FG/Scrap Item.
if ( if (
d.name == voucher_detail_no d.name == voucher_detail_no
or (not d.s_warehouse and d.t_warehouse) or (not d.s_warehouse and d.t_warehouse)
or stock_entry.purpose in ["Manufacture", "Repack"] or stock_entry.purpose in ["Manufacture", "Repack"]
): ):
>>>>>>> 544ceb93cd (fix: stock entry repack amount calculation)
d.db_update() d.db_update()
def update_rate_on_delivery_and_sales_return(self, sle, outgoing_rate): def update_rate_on_delivery_and_sales_return(self, sle, outgoing_rate):