akashbhome/payment_reconciliation_software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

payment reconcillation report issue solve

Browse Source
This commit is contained in:
akashbhome
2026-03-28 17:37:53 +05:30
parent b0fc5f09ee
commit c4c8d704ef
1 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
model/PmcReport.py
View File

@@ -17,8 +17,6 @@ class PmcReport:
try: try:
# cursor.callproc("GetContractorInfoByPmcNo", (pmc_no,))
# pmc_info = next(cursor.stored_results()).fetchone()
pmc_info = ReportHelper.execute_sp(cursor, 'GetContractorInfoByPmcNo', [pmc_no], True) pmc_info = ReportHelper.execute_sp(cursor, 'GetContractorInfoByPmcNo', [pmc_no], True)
if not pmc_info: if not pmc_info:
@@ -166,10 +164,6 @@ class PmcReport:
for h in hold_amounts: for h in hold_amounts:
hold_data.setdefault(h['Invoice_Id'], {})[h['hold_type_id']] = h['hold_amount'] hold_data.setdefault(h['Invoice_Id'], {})[h['hold_type_id']] = h['hold_amount']
# hold_release_map = {}
# for hr in hold_releases:
# hold_release_map.setdefault(hr['Invoice_Id'], []).append(hr)
credit_note_map = {} credit_note_map = {}
for cn in credit_notes: for cn in credit_notes:
pmc = cn.get("PMC_No") pmc = cn.get("PMC_No")
@@ -210,9 +204,7 @@ class PmcReport:
hold_headers = [ht['hold_type'] for ht in hold_types] hold_headers = [ht['hold_type'] for ht in hold_types]
payment_headers = ["Final Amount", "Payment Amount", "TDS Payment", "Total Paid", "UTR"] payment_headers = ["Final Amount", "Payment Amount", "TDS Payment", "Total Paid", "UTR"]
# gst_headers = ["GST Release Amount", "GST Release UTR"]
# headers = base_headers + hold_headers + payment_headers + gst_headers
headers = base_headers + hold_headers + payment_headers headers = base_headers + hold_headers + payment_headers
sheet.append(headers) sheet.append(headers)
for cell in sheet[sheet.max_row]: for cell in sheet[sheet.max_row]:
@@ -259,26 +251,7 @@ class PmcReport:
print("11111::",row) print("11111::",row)
sheet.append(row) sheet.append(row)
# ================= CREDIT NOTE ROWS =================
# for notes in credit_note_map.items():
# for cn in notes:
# cn_row = [
# pmc_no,
# "", "", "Credit Note",
# "", cn.get("Invoice_No", ""),
# cn.get("Basic_Amount", ""),
# "", "", "", "", "", "", "", "", "", ""
# ]
# cn_row += [""] * len(hold_headers)
# cn_row += [
# cn.get("Final_Amount", ""),
# "",
# "",
# cn.get("Total_Amount", ""),
# cn.get("UTR", "")
# ]
# print("22222::",cn_row)
# sheet.append(cn_row)
for pmc, cn_list in credit_note_map.items(): for pmc, cn_list in credit_note_map.items():
for cn in cn_list: for cn in cn_list:
cn_row = [ cn_row = [