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

chore: resolve merge conflict in accounts/utils.py and its tests

Browse Source
This commit is contained in:
ruthra kumar
2023-08-14 10:50:31 +05:30
parent 7469018d3e
commit f92453ae45
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/accounts/utils.py
View File

@@ -636,25 +636,6 @@ def update_reference_in_payment_entry(
new_row.docstatus = 1
new_row.update(reference_details)
<<<<<<< HEAD
payment_entry.flags.ignore_validate_update_after_submit = True
payment_entry.setup_party_account_field()
payment_entry.set_missing_values()
payment_entry.set_amounts()
if d.difference_amount and d.difference_account:
account_details = {
"account": d.difference_account,
"cost_center": payment_entry.cost_center
or frappe.get_cached_value("Company", payment_entry.company, "cost_center"),
}
if d.difference_amount:
account_details["amount"] = d.difference_amount
payment_entry.set_gain_or_loss(account_details=account_details)
=======
>>>>>>> 1bcb728c85 (refactor: remove call for setting deductions in payment entry)
payment_entry.flags.ignore_validate_update_after_submit = True
payment_entry.setup_party_account_field()
payment_entry.set_missing_values()