Merge pull request 'pankaj-dev' (#20) from pankaj-dev into main

Reviewed-on: #20

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','credit','Credit note Details']):
+                    elif any(keyword in Invoice_Details.lower() for keyword in ['credit note','logging report']):
                         # 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,8 +330,7 @@ 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):

services/ReportService.py

@@ -44,7 +44,6 @@ 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:
@@ -53,12 +52,11 @@ 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.pmc_no, self.contractor_id])
+            self.gst_release_raw = GeneralUse.execute_sp(cursor, 'GetGSTRelease', [self.contractor_id])
 
 
             self.prepare_maps()

templates/index.html

@@ -34,7 +34,7 @@
         <a href="/logout">Logout</a>
     </div>
     <div class="sidebar">
-        <img src="http://lceplpmprod.btltech.xyz/assets/images/lcpl.png" alt="logo-image" class="logo">
+        <img src="https://lceplpmprod.btltech.xyz/assets/images/lcpl.png" alt="logo-image" class="logo">
 
         <ul class="nav-menu">
             <li class="nav-item">
@@ -136,7 +136,7 @@
             <div class="card">
                 <h2>Work Order</h2>
                 <!-- <a class="btn" href="/add_work_order">Go ➜</a> -->
-                <a class="btn">Go ➜</a>
+                 <a class="btn">Go ➜</a>
             </div>
             <!-- <div class="card">
             <h2>Purchase Order</h2>

templates/pmc_report.html

@@ -122,7 +122,7 @@
                 <td>{{ invoice.Work_Type }}</td>
                 <td>{{ invoice.Invoice_Details }}</td>
                 <td>{{ invoice.Invoice_Date }}</td>
-                <td>{{ invoice.invoice_no }}</td>
+                <td>{{ invoice.Invoice_No }}</td>
                 <td>{{ invoice.Basic_Amount }}</td>
                 <td>{{ invoice.Debit_Amount }}</td>
                 <td>{{ invoice.After_Debit_Amount }}</td>
@@ -224,8 +224,8 @@
             {% if gst_rel %}
             {% for gst in gst_rel %}
             <tr>
-                <td>{{ gst.PMC_No }}</td>
+                <td>{{ gst.pmc_no }}</td>
-                <td>{{ gst.invoice_no }}</td>
+                <td>{{ gst.Invoice_No }}</td>
                 <td>{{ gst.Basic_Amount }}</td>
                 <td>{{ gst.Final_Amount }}</td>
                 <td>{{ gst.Total_Amount }}</td>

templates/subcontractor_report.html

@@ -69,14 +69,14 @@
         </div>
 
 
-        <!-- {% if hold_types %}
+        <!--        {% if hold_types %}-->
-        <h3>Hold Types</h3>
+        <!--        <h3>Hold Types</h3>-->
-        <ul>
+        <!--        <ul>-->
-            {% for hold in hold_types %}
+        <!--            {% for hold in hold_types %}-->
-            <li>{{ hold.hold_type }}</li>
+        <!--            <li>{{ hold.hold_type }}</li>-->
-            {% endfor %}
+        <!--            {% endfor %}-->
-        </ul>
+        <!--        </ul>-->
-        {% endif %} -->
+        <!--        {% endif %}-->
 
 
         <h3>Invoice Details</h3>
@@ -118,7 +118,7 @@
                     <td>{{ invoice.Work_Type }}</td>
                     <td>{{ invoice.Invoice_Details }}</td>
                     <td>{{ invoice.Invoice_Date }}</td>
-                    <td>{{ invoice.invoice_no }}</td>
+                    <td>{{ invoice.Invoice_No }}</td>
                     <td>{{ invoice.Basic_Amount }}</td>
                     <td>{{ invoice.Debit_Amount }}</td>
                     <td>{{ invoice.After_Debit_Amount }}</td>
@@ -139,7 +139,6 @@
                         0.00
                         {% endif %}
                     </td>
-                    <td>hold.</td>
                     {% endfor %}
 
                     <td>{{ invoice.GST_SD_Amount }}</td>
@@ -259,7 +258,6 @@
 
             </thead>
         </table>
-
         <h3>GST Release Note Details</h3>
         <table>
             <thead>