Merge branch 'main' of https://gitea.lcepl.org/pjpatil12/Payment_Reconciliation into pankaj-dev

2026-03-24 16:29:32 +05:30
parent 47ba78d72c 1946a98d59
commit 6c74b5d3bf
39 changed files with 796 additions and 479 deletions
--- a/controllers/pycache/auth_controller.cpython-314.pyc
+++ b/controllers/pycache/auth_controller.cpython-314.pyc
--- a/controllers/pycache/block_controller.cpython-314.pyc
+++ b/controllers/pycache/block_controller.cpython-314.pyc
--- a/controllers/pycache/district_controller.cpython-314.pyc
+++ b/controllers/pycache/district_controller.cpython-314.pyc
--- a/controllers/pycache/excel_upload_controller.cpython-314.pyc
+++ b/controllers/pycache/excel_upload_controller.cpython-314.pyc
--- a/controllers/pycache/gst_release_controller.cpython-314.pyc
+++ b/controllers/pycache/gst_release_controller.cpython-314.pyc
--- a/controllers/pycache/hold_types_controller.cpython-314.pyc
+++ b/controllers/pycache/hold_types_controller.cpython-314.pyc
--- a/controllers/pycache/invoice_controller.cpython-314.pyc
+++ b/controllers/pycache/invoice_controller.cpython-314.pyc
--- a/controllers/pycache/log_controller.cpython-314.pyc
+++ b/controllers/pycache/log_controller.cpython-314.pyc
--- a/controllers/pycache/payment_controller.cpython-314.pyc
+++ b/controllers/pycache/payment_controller.cpython-314.pyc
--- a/controllers/pycache/pmc_report_controller.cpython-314.pyc
+++ b/controllers/pycache/pmc_report_controller.cpython-314.pyc
--- a/controllers/pycache/report_controller.cpython-314.pyc
+++ b/controllers/pycache/report_controller.cpython-314.pyc
--- a/controllers/pycache/state_controller.cpython-314.pyc
+++ b/controllers/pycache/state_controller.cpython-314.pyc
--- a/controllers/pycache/subcontractor_controller.cpython-314.pyc
+++ b/controllers/pycache/subcontractor_controller.cpython-314.pyc
--- a/controllers/pycache/village_controller.cpython-314.pyc
+++ b/controllers/pycache/village_controller.cpython-314.pyc
--- a/controllers/gst_release_controller.py
+++ b/controllers/gst_release_controller.py
@@ -1,8 +1,8 @@
-from flask import Blueprint, render_template, request, redirect, url_for
+# routes/gst_release_routes.py
+from flask import Blueprint, render_template, request, redirect, url_for, flash
 from flask_login import login_required
 from model.gst_release import GSTRelease
 from model.Log import LogHelper
-from flask import flash, current_app

 gst_release_bp = Blueprint('gst_release_bp', __name__)
 gst_service = GSTRelease()
@@ -13,7 +13,7 @@ gst_service = GSTRelease()
 def add_gst_release():
    if request.method == 'POST':
        gst_service.AddGSTRelease(request)
-        LogHelper.log_action("Add GST Release", f"User added GST release")
+        LogHelper.log_action("Add GST Release", "User added GST release")
        flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
        return redirect(url_for('gst_release_bp.add_gst_release'))

@@ -30,7 +30,7 @@ def edit_gst_release(gst_release_id):

    if request.method == 'POST':
        gst_service.EditGSTRelease(request, gst_release_id)
-        LogHelper.log_action("Edit GST Release", f"User edited GST release")
+        LogHelper.log_action("Edit GST Release", "User edited GST release")
        flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
        return redirect(url_for('gst_release_bp.add_gst_release'))

@@ -40,7 +40,7 @@ def edit_gst_release(gst_release_id):
@gst_release_bp.route('/delete_gst_release/<int:gst_release_id>', methods=['GET', 'POST'])
@login_required
 def delete_gst_release(gst_release_id):
-    gst_service.DeleteGSTRelease(gst_release_id)  # remove request
-    LogHelper.log_action("Delete GST Release", f"User deleted GST release")
+    gst_service.DeleteGSTRelease(gst_release_id)
+    LogHelper.log_action("Delete GST Release", "User deleted GST release")
    flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
    return redirect(url_for('gst_release_bp.add_gst_release'))