schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
rohitwaghchaure
2022-09-09 22:44:10 +05:30
committed by GitHub
parent 7ce6729100
commit a408722983
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/stock_ledger.py
View File

@@ -646,8 +646,6 @@ class update_entries_after(object):
voucher_detail_no=sle.voucher_detail_no, voucher_detail_no=sle.voucher_detail_no,
sle=sle, sle=sle,
) )
<<<<<<< HEAD
=======
elif ( elif (
sle.voucher_type in ["Purchase Receipt", "Purchase Invoice"] sle.voucher_type in ["Purchase Receipt", "Purchase Invoice"]
@@ -670,7 +668,6 @@ class update_entries_after(object):
refernce_name, refernce_name,
"incoming_rate", "incoming_rate",
) )
>>>>>>> a03b4ce213 (fix: reposting not working for internal transferred purchase receipt)
else: else:
if sle.voucher_type in ("Purchase Receipt", "Purchase Invoice"): if sle.voucher_type in ("Purchase Receipt", "Purchase Invoice"):
rate_field = "valuation_rate" rate_field = "valuation_rate"