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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2023-10-24 08:48:53 +05:30
parent 7b9daeff66
commit d576fc7490
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/utils.py
View File

@@ -624,12 +624,7 @@ def update_reference_in_payment_entry(
"outstanding_amount": d.outstanding_amount, "outstanding_amount": d.outstanding_amount,
"allocated_amount": d.allocated_amount, "allocated_amount": d.allocated_amount,
"exchange_rate": d.exchange_rate if d.exchange_gain_loss else payment_entry.get_exchange_rate(), "exchange_rate": d.exchange_rate if d.exchange_gain_loss else payment_entry.get_exchange_rate(),
<<<<<<< HEAD
"exchange_gain_loss": d.exchange_gain_loss, # only populated from invoice in case of advance allocation
=======
"exchange_gain_loss": d.exchange_gain_loss, "exchange_gain_loss": d.exchange_gain_loss,
"account": d.account,
>>>>>>> 23df4205f8 (fix: overallocation on Payment with PO/SO)
} }
if d.voucher_detail_no: if d.voucher_detail_no: