nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-03-10 16:52:02 +05:30
parent d6a3b179ec
commit b8582db124
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/accounts/utils.py
View File

@@ -625,17 +625,9 @@ def update_reference_in_journal_entry(d, journal_entry, do_not_save=False):
jv_detail = journal_entry.get("accounts", {"name": d["voucher_detail_no"]})[0] jv_detail = journal_entry.get("accounts", {"name": d["voucher_detail_no"]})[0]
# Update Advance Paid in SO/PO since they might be getting unlinked # Update Advance Paid in SO/PO since they might be getting unlinked
<<<<<<< HEAD
if jv_detail.get("reference_type") in ("Sales Order", "Purchase Order"):
frappe.get_doc(jv_detail.reference_type, jv_detail.reference_name).set_total_advance_paid()
=======
update_advance_paid = [] update_advance_paid = []
advance_payment_doctypes = frappe.get_hooks( if jv_detail.get("reference_type") in ["Sales Order", "Purchase Order"]:
"advance_payment_receivable_doctypes"
) + frappe.get_hooks("advance_payment_payable_doctypes")
if jv_detail.get("reference_type") in advance_payment_doctypes:
update_advance_paid.append((jv_detail.reference_type, jv_detail.reference_name)) update_advance_paid.append((jv_detail.reference_type, jv_detail.reference_name))
>>>>>>> d9a0494fc3 (fix: advance paid amount and ledger entries against SO/PO)
if flt(d["unadjusted_amount"]) - flt(d["allocated_amount"]) != 0: if flt(d["unadjusted_amount"]) - flt(d["allocated_amount"]) != 0:
# adjust the unreconciled balance # adjust the unreconciled balance
@@ -709,18 +701,8 @@ def update_reference_in_payment_entry(
existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0] existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0]
# Update Advance Paid in SO/PO since they are getting unlinked # Update Advance Paid in SO/PO since they are getting unlinked
<<<<<<< HEAD if existing_row.get("reference_doctype") in ["Sales Order", "Purchase Order"]:
if existing_row.get("reference_doctype") in ("Sales Order", "Purchase Order"):
frappe.get_doc(
existing_row.reference_doctype, existing_row.reference_name
).set_total_advance_paid()
=======
advance_payment_doctypes = frappe.get_hooks(
"advance_payment_receivable_doctypes"
) + frappe.get_hooks("advance_payment_payable_doctypes")
if existing_row.get("reference_doctype") in advance_payment_doctypes:
update_advance_paid.append((existing_row.reference_doctype, existing_row.reference_name)) update_advance_paid.append((existing_row.reference_doctype, existing_row.reference_name))
>>>>>>> d9a0494fc3 (fix: advance paid amount and ledger entries against SO/PO)
if d.allocated_amount <= existing_row.allocated_amount: if d.allocated_amount <= existing_row.allocated_amount:
existing_row.allocated_amount -= d.allocated_amount existing_row.allocated_amount -= d.allocated_amount