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

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-01-24 16:01:17 +05:30
parent e70f0f6d8d
commit 2c431f394e
2 changed files with 0 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/utils.py
View File

@@ -482,17 +482,12 @@ def reconcile_against_document(
entry.update({"referenced_row": referenced_row})
doc.make_exchange_gain_loss_journal([entry], dimensions_dict)
else:
<<<<<<< HEAD
update_reference_in_payment_entry(
entry, doc, do_not_save=True, skip_ref_details_update_for_pe=skip_ref_details_update_for_pe
=======
referenced_row = update_reference_in_payment_entry(
entry,
doc,
do_not_save=True,
skip_ref_details_update_for_pe=skip_ref_details_update_for_pe,
dimensions_dict=dimensions_dict,
>>>>>>> c44eb432a5 (refactor: pass dimension values to Gain/Loss journal)
)
doc.save(ignore_permissions=True)
@@ -653,11 +648,8 @@ def update_reference_in_payment_entry(
if d.difference_amount is not None
else payment_entry.get_exchange_rate(),
"exchange_gain_loss": d.difference_amount,
<<<<<<< HEAD
=======
"account": d.account,
"dimensions": d.dimensions,
>>>>>>> 5dc22e1811 (refactor: pass dimension details to query)
}
if d.voucher_detail_no: