From 055b272703839daecd5a079e90fd5d5558d64882 Mon Sep 17 00:00:00 2001 From: pjpatil12 Date: Sat, 4 Apr 2026 14:00:25 +0530 Subject: [PATCH] change of gst rels detail proce calling add --- controllers/excel_upload_controller.py | 5 +++-- services/ReportService.py | 4 +++- templates/index.html | 4 ++-- templates/pmc_report.html | 6 +++--- templates/subcontractor_report.html | 20 +++++++++++--------- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/controllers/excel_upload_controller.py b/controllers/excel_upload_controller.py index e1d7a46..eac443d 100644 --- a/controllers/excel_upload_controller.py +++ b/controllers/excel_upload_controller.py @@ -307,7 +307,7 @@ def save_data(): else: print("Hold columns data is not a valid list of dictionaries.") #---------------------------------------------Credit Note--------------------------------------------------------------------------- - elif any(keyword in Invoice_Details.lower() for keyword in ['credit note','logging report']): + elif any(keyword in Invoice_Details.lower() for keyword in ['credit note','logging report','credit','Credit note Details']): # print("Credit note found:", PMC_No, Invoice_No, Basic_Amount, Debit_Amount, Final_Amount, # After_Debit_Amount, GST_Amount, Amount, Final_Amount, Payment_Amount, Total_Amount, UTR, Invoice_No) cursor.callproc( @@ -330,7 +330,8 @@ def save_data(): 'excess hold amount', 'Multi to Single layer bill', 'hold amount', - 'logging report' + 'logging report', + 'hold' ] # Step 3: Matching condition if any(kw in normalized_details for kw in keywords): diff --git a/services/ReportService.py b/services/ReportService.py index 5c0ce37..de371e3 100644 --- a/services/ReportService.py +++ b/services/ReportService.py @@ -44,6 +44,7 @@ class ReportService: self.contInfo = GeneralUse.execute_sp(cursor, 'GetContractorInfo', [self.contractor_id], True) self.hold_types = GeneralUse.execute_sp(cursor, 'HoldTypesByContractorId', [self.contractor_id]) self.invoices = GeneralUse.execute_sp(cursor, 'GetInvoicesByContractorOrPMCNo', [self.contractor_id, None]) + self.gst_release_raw = GeneralUse.execute_sp(cursor, 'GetGSTRelease', [self.contractor_id]) # ---------- PMC ---------- elif self.pmc_no: @@ -52,11 +53,12 @@ class ReportService: self.hold_types = GeneralUse.execute_sp(cursor, 'GetHoldTypesByContractor', [self.contractor_id]) self.invoices = GeneralUse.execute_sp(cursor, 'GetInvoicesByContractorOrPMCNo', [None, self.pmc_no]) + self.gst_release_raw = GeneralUse.execute_sp(cursor, 'GetGSTReleaseDetailsByPMC', [self.pmc_no]) # ---------- COMMON ---------- self.hold_amounts = GeneralUse.execute_sp(cursor, 'GetHoldAmountsByContractor', [self.contractor_id]) self.credit_note_raw = GeneralUse.execute_sp(cursor, 'GetCreditNotesByContractor', [self.contractor_id]) - self.gst_release_raw = GeneralUse.execute_sp(cursor, 'GetGSTRelease', [self.contractor_id]) + # self.gst_release_raw = GeneralUse.execute_sp(cursor, 'GetGSTRelease', [self.pmc_no, self.contractor_id]) self.prepare_maps() diff --git a/templates/index.html b/templates/index.html index bc8094b..5d17ab9 100644 --- a/templates/index.html +++ b/templates/index.html @@ -34,7 +34,7 @@ Logout
- +