mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-02 19:59:12 +00:00
refactor: remove call for setting deductions in payment entry
(cherry picked from commit 1bcb728c85)
# Conflicts:
# erpnext/accounts/utils.py
This commit is contained in:
@@ -636,6 +636,7 @@ def update_reference_in_payment_entry(
|
|||||||
new_row.docstatus = 1
|
new_row.docstatus = 1
|
||||||
new_row.update(reference_details)
|
new_row.update(reference_details)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
payment_entry.flags.ignore_validate_update_after_submit = True
|
payment_entry.flags.ignore_validate_update_after_submit = True
|
||||||
payment_entry.setup_party_account_field()
|
payment_entry.setup_party_account_field()
|
||||||
payment_entry.set_missing_values()
|
payment_entry.set_missing_values()
|
||||||
@@ -652,6 +653,8 @@ def update_reference_in_payment_entry(
|
|||||||
|
|
||||||
payment_entry.set_gain_or_loss(account_details=account_details)
|
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.flags.ignore_validate_update_after_submit = True
|
||||||
payment_entry.setup_party_account_field()
|
payment_entry.setup_party_account_field()
|
||||||
payment_entry.set_missing_values()
|
payment_entry.set_missing_values()
|
||||||
|
|||||||
Reference in New Issue
Block a user