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

upteded pmc report code

Browse Source
This commit is contained in:
akashbhome
2026-03-28 13:39:19 +05:30
parent 1a825ba46c
commit f238b49a84
13 changed files with 5195 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
model/Report.py
View File

@@ -200,7 +200,8 @@ class ReportHelper:
else ""
)
key = (pmc_no, invoice_no)
# key = (pmc_no, invoice_no)
key = (pmc_no)
# Yellow separator
if previous_pmc_no and pmc_no != previous_pmc_no:
@@ -218,6 +219,7 @@ class ReportHelper:
inv.get("Work_Type", ""),
inv.get("Invoice_Details", ""),
inv.get("Invoice_Date", ""),
# inv.get("invoice_no",""),
invoice_no,
inv.get("Basic_Amount", ""),
inv.get("Debit_Amount", ""),
@@ -348,9 +350,12 @@ class ReportHelper:
credit_note_raw = ReportHelper.execute_sp(cursor, 'GetCreditNotesByContractor', [contractor_id])
credit_note_map = {}
for cn in credit_note_raw:
# key = (
# str(cn['PMC_No']).strip(),
# str(cn['Invoice_No']).replace(" ", "") if cn['Invoice_No'] else ""
# )
key = (
str(cn['PMC_No']).strip(),
str(cn['Invoice_No']).replace(" ", "") if cn['Invoice_No'] else ""
str(cn['PMC_No']).strip()
)
credit_note_map.setdefault(key, []).append(cn)
@@ -358,9 +363,12 @@ class ReportHelper:
gst_release_raw = ReportHelper.execute_sp(cursor, 'GstReleasesByContractorId', [contractor_id])
gst_release_map = {}
for gr in gst_release_raw:
# key = (
# str(gr['PMC_No']).strip(),
# str(gr['Invoice_No']).replace(" ", "") if gr['Invoice_No'] else ""
# )
key = (
str(gr['PMC_No']).strip(),
str(gr['Invoice_No']).replace(" ", "") if gr['Invoice_No'] else ""
str(gr['PMC_No']).strip()
)
gst_release_map.setdefault(key, []).append(gr)