nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-16 18:24:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(postgres): satisfy strict GROUP BY in unreconcile payment

Browse Source 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Mihir Kandoi
2026-06-17 14:05:51 +05:30
parent 6dc2e43dd6
commit 0afc6dd363
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py
View File

@@ -7,7 +7,7 @@ import frappe
from frappe import _, qb from frappe import _, qb
from frappe.model.document import Document from frappe.model.document import Document
from frappe.query_builder import Criterion from frappe.query_builder import Criterion
from frappe.query_builder.functions import Abs, Sum from frappe.query_builder.functions import Abs, Max, Sum
from frappe.utils.data import comma_and from frappe.utils.data import comma_and
from erpnext.accounts.utils import ( from erpnext.accounts.utils import (
@@ -72,7 +72,7 @@ class UnreconcilePayment(Document):
alloc.party, alloc.party,
) )
frappe.db.set_value("Unreconcile Payment Entries", alloc.name, "unlinked", True) frappe.db.set_value("Unreconcile Payment Entries", alloc.name, "unlinked", 1)
@frappe.whitelist() @frappe.whitelist()
@@ -120,18 +120,20 @@ def get_linked_payments_for_doc(
res = ( res = (
qb.from_(ple) qb.from_(ple)
.select( .select(
ple.account, Max(ple.account).as_("account"),
ple.party_type, Max(ple.party_type).as_("party_type"),
ple.party, Max(ple.party).as_("party"),
ple.company, Max(ple.company).as_("company"),
ple.voucher_type.as_("reference_doctype"), Max(ple.voucher_type).as_("reference_doctype"),
ple.voucher_no.as_("reference_name"), ple.voucher_no.as_("reference_name"),
Abs(Sum(ple.amount_in_account_currency)).as_("allocated_amount"), Abs(Sum(ple.amount_in_account_currency)).as_("allocated_amount"),
ple.account_currency, Max(ple.account_currency).as_("account_currency"),
) )
.where(Criterion.all(criteria)) .where(Criterion.all(criteria))
.groupby(ple.voucher_no, ple.against_voucher_no) .groupby(ple.voucher_no, ple.against_voucher_no)
.having(qb.Field("allocated_amount") > 0) .having(Abs(Sum(ple.amount_in_account_currency)) > 0)
# deterministic order across backends (postgres GROUP BY does not imply ordering)
.orderby(ple.voucher_no)
.run(as_dict=True) .run(as_dict=True)
) )
return res return res
@@ -146,17 +148,19 @@ def get_linked_payments_for_doc(
query = ( query = (
qb.from_(ple) qb.from_(ple)
.select( .select(
ple.company, Max(ple.company).as_("company"),
ple.account, Max(ple.account).as_("account"),
ple.party_type, Max(ple.party_type).as_("party_type"),
ple.party, Max(ple.party).as_("party"),
ple.against_voucher_type.as_("reference_doctype"), Max(ple.against_voucher_type).as_("reference_doctype"),
ple.against_voucher_no.as_("reference_name"), ple.against_voucher_no.as_("reference_name"),
Abs(Sum(ple.amount_in_account_currency)).as_("allocated_amount"), Abs(Sum(ple.amount_in_account_currency)).as_("allocated_amount"),
ple.account_currency, Max(ple.account_currency).as_("account_currency"),
) )
.where(Criterion.all(criteria)) .where(Criterion.all(criteria))
.groupby(ple.against_voucher_no) .groupby(ple.against_voucher_no)
# deterministic order across backends (postgres GROUP BY does not imply ordering)
.orderby(ple.against_voucher_no)
) )
res = query.run(as_dict=True) res = query.run(as_dict=True)
@@ -180,15 +184,18 @@ def get_linked_advances(company, docname):
return ( return (
qb.from_(adv) qb.from_(adv)
.select( .select(
adv.company, # non-grouped columns are constant per against_voucher_no -> Max() is unchanged and postgres-valid
adv.against_voucher_type.as_("reference_doctype"), Max(adv.company).as_("company"),
Max(adv.against_voucher_type).as_("reference_doctype"),
adv.against_voucher_no.as_("reference_name"), adv.against_voucher_no.as_("reference_name"),
Abs(Sum(adv.amount)).as_("allocated_amount"), Abs(Sum(adv.amount)).as_("allocated_amount"),
adv.currency, Max(adv.currency).as_("currency"),
) )
.where(Criterion.all(criteria)) .where(Criterion.all(criteria))
.having(qb.Field("allocated_amount") > 0) .having(Abs(Sum(adv.amount)) > 0)
.groupby(adv.against_voucher_no) .groupby(adv.against_voucher_no)
# deterministic order across backends (postgres GROUP BY does not imply ordering)
.orderby(adv.against_voucher_no)
.run(as_dict=True) .run(as_dict=True)
) )