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

Merge pull request #41719 from blaggacao/fix/lp-during-refdoc-save

Browse Source 
fix: lp during ref_doc save event
This commit is contained in:
David Arnold
2024-09-05 16:50:45 +02:00
committed by GitHub
parent 2ae1704d11 340e35f209
commit 873571272d
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/loyalty_program/loyalty_program.py
View File

@@ -183,6 +183,8 @@ def validate_loyalty_points(ref_doc, points_to_redeem):
if not ref_doc.loyalty_amount and ref_doc.loyalty_amount != loyalty_amount: if not ref_doc.loyalty_amount and ref_doc.loyalty_amount != loyalty_amount:
ref_doc.loyalty_amount = loyalty_amount ref_doc.loyalty_amount = loyalty_amount
if not ref_doc.loyalty_points and ref_doc.loyalty_points != points_to_redeem:
ref_doc.loyalty_points = points_to_redeem
if ref_doc.doctype == "Sales Invoice": if ref_doc.doctype == "Sales Invoice":
ref_doc.loyalty_program = loyalty_program ref_doc.loyalty_program = loyalty_program

29
erpnext/accounts/doctype/payment_request/payment_request.py
View File

@@ -432,7 +432,9 @@ def make_payment_request(**args):
"""Make payment request""" """Make payment request"""
args = frappe._dict(args) args = frappe._dict(args)
if args.dt not in [ ref_doc = args.ref_doc or frappe.get_doc(args.dt, args.dn)
if ref_doc.doctype not in [
"Sales Order", "Sales Order",
"Purchase Order", "Purchase Order",
"Sales Invoice", "Sales Invoice",
@@ -440,22 +442,23 @@ def make_payment_request(**args):
"POS Invoice", "POS Invoice",
"Fees", "Fees",
]: ]:
frappe.throw(_("Payment Requests cannot be created against: {0}").format(frappe.bold(args.dt))) frappe.throw(
_("Payment Requests cannot be created against: {0}").format(frappe.bold(ref_doc.doctype))
)
ref_doc = frappe.get_doc(args.dt, args.dn)
gateway_account = get_gateway_details(args) or frappe._dict() gateway_account = get_gateway_details(args) or frappe._dict()
grand_total = get_amount(ref_doc, gateway_account.get("payment_account")) grand_total = get_amount(ref_doc, gateway_account.get("payment_account"))
if not grand_total: if not grand_total:
frappe.throw(_("Payment Entry is already created")) frappe.throw(_("Payment Entry is already created"))
if args.loyalty_points and args.dt == "Sales Order":
if args.loyalty_points and ref_doc.doctype == "Sales Order":
from erpnext.accounts.doctype.loyalty_program.loyalty_program import validate_loyalty_points from erpnext.accounts.doctype.loyalty_program.loyalty_program import validate_loyalty_points
loyalty_amount = validate_loyalty_points(ref_doc, int(args.loyalty_points)) loyalty_amount: Document = validate_loyalty_points(
frappe.db.set_value( ref_doc, int(args.loyalty_points)
"Sales Order", args.dn, "loyalty_points", int(args.loyalty_points), update_modified=False ) # sets fields on ref_doc
) loyalty_amount.db_update()
frappe.db.set_value("Sales Order", args.dn, "loyalty_amount", loyalty_amount, update_modified=False)
grand_total = grand_total - loyalty_amount grand_total = grand_total - loyalty_amount
bank_account = ( bank_account = (
@@ -464,10 +467,10 @@ def make_payment_request(**args):
draft_payment_request = frappe.db.get_value( draft_payment_request = frappe.db.get_value(
"Payment Request", "Payment Request",
{"reference_doctype": args.dt, "reference_name": args.dn, "docstatus": 0}, {"reference_doctype": ref_doc.doctype, "reference_name": ref_doc.name, "docstatus": 0},
) )
existing_payment_request_amount = get_existing_payment_request_amount(args.dt, args.dn) existing_payment_request_amount = get_existing_payment_request_amount(ref_doc.doctype, ref_doc.name)
if existing_payment_request_amount: if existing_payment_request_amount:
grand_total -= existing_payment_request_amount grand_total -= existing_payment_request_amount
@@ -498,8 +501,8 @@ def make_payment_request(**args):
"email_to": args.recipient_id or ref_doc.owner, "email_to": args.recipient_id or ref_doc.owner,
"subject": _("Payment Request for {0}").format(args.dn), "subject": _("Payment Request for {0}").format(args.dn),
"message": gateway_account.get("message") or get_dummy_message(ref_doc), "message": gateway_account.get("message") or get_dummy_message(ref_doc),
"reference_doctype": args.dt, "reference_doctype": ref_doc.doctype,
"reference_name": args.dn, "reference_name": ref_doc.name,
"company": ref_doc.get("company"), "company": ref_doc.get("company"),
"party_type": args.get("party_type") or "Customer", "party_type": args.get("party_type") or "Customer",
"party": args.get("party") or ref_doc.get("customer"), "party": args.get("party") or ref_doc.get("customer"),