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: resolve conflict in payment_reconciliation.py

Browse Source 
backport will merge the better remarks PR
https://github.com/frappe/erpnext/pull/36573 wil exchange gain/loss
booking refactor
This commit is contained in:
ruthra kumar
2023-08-14 10:53:42 +05:30
parent 946aadb0c0
commit b3f4c14a26
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
View File

@@ -640,11 +640,8 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
"reference_type": inv.against_voucher_type, "reference_type": inv.against_voucher_type,
"reference_name": inv.against_voucher, "reference_name": inv.against_voucher,
"cost_center": erpnext.get_default_cost_center(company), "cost_center": erpnext.get_default_cost_center(company),
<<<<<<< HEAD
"user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} against {inv.against_voucher}", "user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} against {inv.against_voucher}",
=======
"exchange_rate": inv.exchange_rate, "exchange_rate": inv.exchange_rate,
>>>>>>> c87332d5da (refactor: cr/dr note will be on single exchange rate)
}, },
{ {
"account": inv.account, "account": inv.account,
@@ -658,24 +655,18 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
"reference_type": inv.voucher_type, "reference_type": inv.voucher_type,
"reference_name": inv.voucher_no, "reference_name": inv.voucher_no,
"cost_center": erpnext.get_default_cost_center(company), "cost_center": erpnext.get_default_cost_center(company),
<<<<<<< HEAD
"user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} from {inv.voucher_no}", "user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} from {inv.voucher_no}",
=======
"exchange_rate": inv.exchange_rate, "exchange_rate": inv.exchange_rate,
>>>>>>> c87332d5da (refactor: cr/dr note will be on single exchange rate)
}, },
], ],
} }
) )
jv.flags.ignore_mandatory = True jv.flags.ignore_mandatory = True
<<<<<<< HEAD
jv.remark = None
jv.flags.skip_remarks_creation = True jv.flags.skip_remarks_creation = True
jv.is_system_generated = True
=======
jv.flags.ignore_exchange_rate = True jv.flags.ignore_exchange_rate = True
>>>>>>> c87332d5da (refactor: cr/dr note will be on single exchange rate) jv.is_system_generated = True
jv.remark = None
jv.submit() jv.submit()
if inv.difference_amount != 0: if inv.difference_amount != 0: