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

refactor: replace against_voucher with against_voucher_no

Browse Source
This commit is contained in:
ruthra kumar
2024-05-23 12:08:51 +05:30
parent 014b542cf3
commit c4e2abb973
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
View File

@@ -5,6 +5,7 @@
import frappe import frappe
from frappe import _, qb from frappe import _, qb
from frappe.query_builder import Criterion from frappe.query_builder import Criterion
from frappe.query_builder.functions import Abs
from frappe.utils import flt, getdate from frappe.utils import flt, getdate
from erpnext.accounts.report.accounts_receivable.accounts_receivable import ReceivablePayableReport from erpnext.accounts.report.accounts_receivable.accounts_receivable import ReceivablePayableReport
@@ -22,12 +23,12 @@ def execute(filters=None):
data = [] data = []
for d in entries: for d in entries:
invoice = invoice_details.get(d.against_voucher) or frappe._dict() invoice = invoice_details.get(d.against_voucher_no) or frappe._dict()
payment_amount = d.amount payment_amount = d.amount
d.update({"range1": 0, "range2": 0, "range3": 0, "range4": 0, "outstanding": payment_amount}) d.update({"range1": 0, "range2": 0, "range3": 0, "range4": 0, "outstanding": payment_amount})
if d.against_voucher: if d.against_voucher_no:
ReceivablePayableReport(filters).get_ageing_data(invoice.posting_date, d) ReceivablePayableReport(filters).get_ageing_data(invoice.posting_date, d)
row = [ row = [
@@ -36,7 +37,7 @@ def execute(filters=None):
d.party_type, d.party_type,
d.party, d.party,
d.posting_date, d.posting_date,
d.against_voucher, d.against_voucher_no,
invoice.posting_date, invoice.posting_date,
invoice.due_date, invoice.due_date,
d.amount, d.amount,
@@ -162,7 +163,7 @@ def get_entries(filters):
ple.party_type, ple.party_type,
ple.party, ple.party,
ple.posting_date, ple.posting_date,
ple.amount, Abs(ple.amount).as_("amount"),
ple.remarks, ple.remarks,
ple.against_voucher_no, ple.against_voucher_no,
) )