Timestamp	User	Action	Details
{{ log.timestamp }}	{{ log.user }}	{{ log.action }}	{{ log.details }}
No logs found

Block Sr no	Block Name + + ⬆️ + ⬇️ + +	District Name + + ⬆️ + ⬇️ + +	Update	Delete
{{ block[0] }}	{{ block[1] }}	{{ block[3] }}	+ + + +	+ + + +

District ID	District Name	State Name	Edit	Delete
{{ district[0] }}	{{ district[1] }}	{{ district[2] }}	+ + Edit + +	+ + Delete + +

District ID	+ District Name + + ⬆️ + ⬇️ +	+ State Name + + ⬆️ + ⬇️ +	Edit District	Delete District
{{ district[0] }}	{{ district[1] }}	{{ district[2] }}	+ + + +	+ + + +

ID	+ Hold Type + + ⬆️ + ⬇️ + +	Update	Delete
{{ htd['hold_type_id'] }}	{{ htd['hold_type'] }}	+ + + +	+ + + +

Payment ID	PMC No	Invoice No	Payment Amount	TDS Amount	Total Amount	UTR	Update	Delete
{{ payment[0] }}	{{ payment[1] }}	{{ payment[2] }}	{{ payment[3] }}	{{ payment[4] }}	{{ payment[5] }}	{{ payment[6] }}		+ + + +

ID	Purchase Date	Supplier Name	Purchase Order No	Item Name	Quantity	Unit	Rate	Amount	GST Amount	TDS	Final Amount	Edit	Delete
{{ purchase['purchase_id'] }}	{{ purchase['purchase_date'] }}	{{ purchase['supplier_name'] }}	{{ purchase['purchase_order_no'] }}	{{ purchase['item_name'] }}	{{ purchase['quantity'] }}	{{ purchase['unit'] }}	{{ purchase['rate'] }}	{{ purchase['amount'] }}	{{ purchase['GST_Amount'] }}	{{ purchase['TDS'] }}	{{ purchase['final_amount'] }}	Edit	+ + + +

State ID	+ State Name + + ⬆️ + ⬇️ + +	Update State	Delete State
{{ state[0] }}	{{ state[1]}}	+ + + +	+ + + +

Contractor ID	Contractor Name + + ⬆️ + ⬇️ + + +	Address	Mobile No	PAN No	Email	Gender	GST Registration Type	GST No + + ⬆️ + ⬇️ + +	Update Contractor	Delete Contractor
{{ subc[0] }}	{{ subc[1] }}	{{ subc[2] }}	{{ subc[3] }}	{{ subc[4] }}	{{ subc[5] }}	{{ subc[6] }}	{{ subc[7] }}	{{ subc[8] }}	+ + + +	+{# #} +{# #} +{# #} +

Village Sr No	+ Village Name + + ⬆️ + ⬇️ +	Block Name + + ⬆️ + ⬇️ +	Update	Delete
{{ village[0] }}	{{ village[1] }}	{{ village[2] }}	+ + + +	+ + + +

ID	+ Vender Name +{# #} +{# ⬆️#} +{# ⬇️#} +{# #} +	Work Order Type	Work Order Amount	BOQ Amount	Work Done Percentage	Update	Delete
{{ htd.work_order_id }}	{{ htd['vendor_name'] }}	{{ htd['work_order_type'] }}	{{ htd['work_order_amount'] }}	{{ htd['boq_amount'] }}	{{ htd['work_done_percentage'] }}	{{ htd['work_order_number'] }}	{{ htd['gst_amount'] }}	{{ htd['tds_amount'] }}	{{ htd[''] }}	Edit	+ + + +

ID	Date	Purchase ID	Supplier	Item	Qty	Unit	Rate	Amount	Remarks	Actions
{{ grn[0] }}	{{ grn[1] }}	{{ grn[2] }}	{{ grn[3] }}	{{ grn[4] }}	{{ grn[5] }}	{{ grn[6] }}	{{ grn[7] }}	{{ grn[8] }}	{{ grn[9] }}	+ Edit + + + + +

Profile

+ Go ➜ +

+ +

States

+ Go ➜ +

+ +

District

+ Go ➜ +

+ +

Blocks

+ Go ➜ +

+ +

Village

+ Go ➜ +

+ +

Sub-Contractor

+ Go ➜ +

+ +

Invoice

+ Go ➜ +

+ +

Payment

+ Go ➜ +

+ +

GST Release

+ Go ➜ +

+ +

Hold Types

+ Go ➜ +

Work Order

+ + Go ➜ +

+ + + +

+ + + + \ No newline at end of file diff --git a/templates/login.html b/templates/login.html new file mode 100644 index 0000000..e638b55 --- /dev/null +++ b/templates/login.html @@ -0,0 +1,90 @@ + + + + + LCEPL Payment Reconciliation + + + +

Laxmi Civil Engineering Services

LOGIN

+ + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} + {% for category, message in messages %} +

+ {% endfor %} + {% endif %} +{% endwith %} + + + + +

+ + diff --git a/templates/pmc_report.html b/templates/pmc_report.html new file mode 100644 index 0000000..c218c5f --- /dev/null +++ b/templates/pmc_report.html @@ -0,0 +1,340 @@ + + +{% extends 'base.html' %} +{% block content %} + + + + PMC Report + + + + + +

PMC Report

+ +

Contractor Details

+ Subcontractor Name: + +

+ Address : +

{{ info.Address }}

+ PAN No : + +

+ Mobile Number : + +

+ Email : + +

+ GST Registration Type : + + +

+ GST No: + +

PMC Report for PMC No: {{ info.PMC_No}}

+ State : + +

+ District : + +

+ Block : + +

+ PMC No: + +

+ Village Name : + +

+ + +

Invoice Details

+ + + + + + + + + + + + + + + + + + + + + {% set hold_types = invoices | map(attribute='hold_type') | reject('none') | unique | list %} + {% for hold in hold_types %} + + {% endfor %} + + + + + + + {% if invoices %} + {% for invoice in invoices %} + + + + + + + + + + + + + + + + + + + {% for hold in hold_types %} + + {% endfor %} + + + + + + {% endfor %} + + + + + + + + + + + + {% set hold_types = invoices | map(attribute='hold_type') | unique | list %} + {% for hold in hold_types %} + + {% endfor %} + + + + + {% else %} + + + + {% endif %} + +

PMC No	Village Name	Work Type	Invoice Details	Invoice Date	Invoice No	Basic Amount	Debit	After Debit Amt	GST (18%)	Amount	TDS (1%)	SD (5%)	On Commission	Hydro Testing	{{ hold }}	GST SD (18%)	Final Amount
{{ invoice.PMC_No }}	{{ invoice.Village_Name.capitalize() }}	{{ invoice.Work_Type }}	{{ invoice.Invoice_Details }}	{{ invoice.Invoice_Date }}	{{ invoice.Invoice_No }}	{{ invoice.Basic_Amount }}	{{ invoice.Debit_Amount }}	{{ invoice.After_Debit_Amount }}	{{ invoice.GST_Amount }}	{{ invoice.Amount }}	{{ invoice.TDS_Amount }}	{{ invoice.SD_Amount }}	{{ invoice.On_Commission }}	{{ invoice.Hydro_Testing }}	+ {% if invoice.hold_type == hold %} + {{ invoice.hold_amount }} + {% else %} + 0 + {% endif %} +	{{ invoice.GST_SD_Amount }}	{{ invoice.Final_Amount }}
Total						{{total["sum_invo_basic_amt"]}}	{{total["sum_invo_debit_amt"]}}	{{total["sum_invo_after_debit_amt"]}}	{{total["sum_invo_gst_amt"]}}	{{total["sum_invo_amt"]}}	{{total["sum_invo_tds_amt"]}}	{{total["sum_invo_ds_amt"]}}	{{total["sum_invo_on_commission"]}}	{{total["sum_invo_hydro_test"]}}	{{total["sum_invo_hold_amt"]}}	{{total["sum_invo_gst_sd_amt"]}}	{{total["sum_invo_final_amt"]}}
No invoices found.

Hold Release

+ + + + + + + + + + + + + {%if hold_release%} + {%for hold in hold_release%} + + + + + + + + + {%endfor%} + {%else%} + + + + {%endif%} + +

PMC No	Invoice No	Invoice Details	Basic Amount	Total Amount	UTR
{{ hold['PMC_No'] }}	{{ hold['Invoice_No'] }}	{{ hold['Invoice_Details'] }}	{{ hold['Basic_Amount'] }}	{{ hold['Total_Amount'] }}	{{ hold['UTR'] }}
No data present

+ +
+

GST Release Note Details

+ + + + + + + + + + + {% if gst_rel %} + {% for gst in gst_rel %} + + + + + + + {% endfor %} + + + + + + + {% else %} + + + + {% endif %} + +

PMC No	Invoice No	Basic Amount	Final Amount
{{ gst.pmc_no }}	{{ gst.invoice_no }}	{{ gst.basic_amount }}	{{ gst.final_amount }}
Total		{{total["sum_gst_basic_amt"]}}	{{total["sum_gst_final_amt"]}}
No GST release found.

+ + +

Credit Details

+ + + + + + + + + + + + + + + + + + + {% if credit_note %} + {% for credit in credit_note %} + + + + + + + + + + + + + + + + {% endfor %} + + {% else %} + + + + {% endif %} + + + +

PMC No	Invoice Details	Basic Amount	Debit	After Debit Amt	GST Amount	Amount	Final Amount	Payment Amount	Total Amount	UTR
{{ credit["PMC_No"] }}	{{ credit["Invoice_Details"] }}	{{ credit["Basic_Amount"] }}	{{ credit["Debit_Amount"] }}	{{ credit["After_Debit_Amount"] }}	{{ credit["GST_Amount"] }}	{{ credit["Amount"] }}	{{ credit["Final_Amount"] }}	{{ credit["Payment_Amount"] }}	{{ credit["Total_Amount"] }}	{{ credit["UTR"] }}
No Credit note found.

+ +
+

Payment Details

+ + + + + + + + + + + + + {% if payments %} + {% for pay in payments %} + + + + + + + + + {% endfor %} + + + + + + + + {% else %} + + + + + {% endif %} + + +

PMC No	Invoice No	Amount	TDS Amount @ 1% on BASIC AMOUNT	Total Amount Paid	UTR
{{ pay.pmc_no }}	{{ pay.invoice_no }}	{{ pay.Payment_Amount }}	{{ pay.TDS_Payment_Amount }}	{{ pay.Total_amount }}	{{ pay.utr}}
Total		{{total["sum_pay_payment_amt"]}}	{{total["sum_pay_tds_payment_amt"]}}	{{total["sum_pay_total_amt"]}}
No payment found.

+ + + + + +{% endblock %} \ No newline at end of file diff --git a/templates/purchase_order.html b/templates/purchase_order.html new file mode 100644 index 0000000..33b3c30 --- /dev/null +++ b/templates/purchase_order.html @@ -0,0 +1,10 @@ + + + + + Purchase Order + + + + + \ No newline at end of file diff --git a/templates/purchase_order_report.html b/templates/purchase_order_report.html new file mode 100644 index 0000000..aacea0c --- /dev/null +++ b/templates/purchase_order_report.html @@ -0,0 +1,205 @@ + + + + Purchase Order Report + + + + + +

Purchase Order Report

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/report.html b/templates/report.html new file mode 100644 index 0000000..de53ef8 --- /dev/null +++ b/templates/report.html @@ -0,0 +1,108 @@ +{% extends 'base.html' %} +{% block content %} + + + + Contractor Search + + + + + +

Search Contractor Report

+ + +

Contractor List

+ + + + + + + + + + + + + + +

Contractor Name + +	PMC No	State + +	District + +	Block + +	Village + +

+ + +{% endblock %} \ No newline at end of file diff --git a/templates/show_excel_file.html b/templates/show_excel_file.html new file mode 100644 index 0000000..19b8903 --- /dev/null +++ b/templates/show_excel_file.html @@ -0,0 +1,85 @@ + + + + Excel Data + + + + + + + + +

Excel Data

+ +

File Information:

Subcontractor: {{ file_info['Subcontractor'] }}
State: {{ file_info['State'] }}
District: {{ file_info['District'] }}
Block: {{ file_info['Block'] }}

+ +{% if errors %} +

Validation Errors:

{{ error }}

+{% endif %} + +

Data Table:

+ + + + + {% for var in variables %} + + {% endfor %} + + + + {% for row in data %} + + + {% for var in variables %} + + {% endfor %} + + {% endfor %} + +

Row No	{{ var }}
{{ row['Row Number'] }}

+ + + + + + + + + + + + + + + + + + + + +

+ +Back to Dashboard + + + + + \ No newline at end of file diff --git a/templates/subcontractor_report.html b/templates/subcontractor_report.html new file mode 100644 index 0000000..e1f5001 --- /dev/null +++ b/templates/subcontractor_report.html @@ -0,0 +1,372 @@ + + + +{% extends 'base.html' %} +{% block content %} + + + + Contractor Report + + + + +

Contractor Report

+ +

Contractor Details

+ Subcontractor Name: + +

+ Address : +

{{ contInfo.Address }}

+ PAN No : + +

+ Mobile Number : + +

+ Email : + +

+ GST Registration Type : + + +

+ GST No: + +

+ State : + +

+ District : + +

+ Block : + +

+ +

Total

+ + + + + + + + + + + + + {% if hold_types %} + + {% for hold in hold_types %} + + + {% endfor %} + + {% endif %} + + + + +

{{current_date}}
Advance / Suplus	{{total["sum_invo_final_amt"]+total["sum_gst_final_amt"]-total["sum_pay_total_amt"]}}
{{ hold.hold_type }}	{{total["sum_invo_hold_amt"]}}
Amount With TDS	{{total["sum_invo_tds_amt"]}}

+ + + + + + + + + + + +

Invoice Details

+ + + + + + + + + + + + + + + + + + + + + {% set hold_types = invoices | map(attribute='hold_type') | unique | list %} + {% for hold in hold_types %} + + {% endfor %} + + + + + + + {% if invoices %} + {% for invoice in invoices %} + + + + + + + + + + + + + + + + + + + {% set hold_types = invoices | map(attribute='hold_type') | unique | list %} + {% for hold in hold_types %} + + {% endfor %} + + + + + + {% endfor %} + + + + + + + + + + + + + + {% set hold_types = invoices | map(attribute='hold_type') | unique | list %} + {% for hold in hold_types %} + + {% endfor %} + + + + + + {% else %} + + + + {% endif %} + +

PMC No	Village Name	Work Type	Invoice Details	Invoice Date	Invoice No	Basic Amount	Debit	After Debit Amt	GST (18%)	Amount	TDS (1%)	SD (5%)	On Commission	Hydro Testing	{{ hold }}	GST SD (18%)	Final Amount
{{ invoice.PMC_No }}	{{ invoice.Village_Name.capitalize() }}	{{ invoice.Work_Type }}	{{ invoice.Invoice_Details }}	{{ invoice.Invoice_Date }}	{{ invoice.Invoice_No }}	{{ invoice.Basic_Amount }}	{{ invoice.Debit_Amount }}	{{ invoice.After_Debit_Amount }}	{{ invoice.GST_Amount }}	{{ invoice.Amount }}	{{ invoice.TDS_Amount }}	{{ invoice.SD_Amount }}	{{ invoice.On_Commission }}	{{ invoice.Hydro_Testing }}	+ {% if invoice.hold_type == hold %} + {{ invoice.hold_amount }} + {% else %} + 0.00 + {% endif %} +	{{ invoice.GST_SD_Amount }}	{{ invoice.Final_Amount }}
Total						{{total["sum_invo_basic_amt"]}}	{{total["sum_invo_debit_amt"]}}	{{total["sum_invo_after_debit_amt"]}}	{{total["sum_invo_gst_amt"]}}	{{total["sum_invo_amt"]}}	{{total["sum_invo_tds_amt"]}}	{{total["sum_invo_ds_amt"]}}	{{total["sum_invo_on_commission"]}}	{{total["sum_invo_hydro_test"]}}	{{total["sum_invo_hold_amt"]}}	{{total["sum_invo_gst_sd_amt"]}}	{{total["sum_invo_final_amt"]}}
No invoices found.

+ +

Hold Release

+ + + + + + + + + + + + + {% if hold_release %} + {% for hold in hold_release %} + + + + + + + + + {% endfor %} + {% else %} + + + + {% endif %} + +

PMC No	Invoice No	Invoice Details	Basic Amount	Total Amount	UTR
{{ hold['PMC_No'] }}	{{ hold['Invoice_No'] }}	{{ hold['Invoice_Details'] }}	{{ hold['Basic_Amount'] }}	{{ hold['Total_Amount'] }}	{{ hold['UTR'] }}
No data present

+
+ + + +

Credit Details

+ + + + + + + + + + + + + + + + + + + {% if credit_note %} + {% for credit in credit_note %} + + + + + + + + + + + + + + + + {% endfor %} + + {% else %} + + + + {% endif %} + + + +

PMC No	Invoice Details	Basic Amount	Debit	After Debit Amt	GST Amount	Amount	Final Amount	Payment Amount	Total Amount	UTR
{{ credit["PMC_No"] }}	{{ credit["Invoice_Details"] }}	{{ credit["Basic_Amount"] }}	{{ credit["Debit_Amount"] }}	{{ credit["After_Debit_Amount"] }}	{{ credit["GST_Amount"] }}	{{ credit["Amount"] }}	{{ credit["Final_Amount"] }}	{{ credit["Payment_Amount"] }}	{{ credit["Total_Amount"] }}	{{ credit["UTR"] }}
No Credit note found.

GST Release Note Details

+ + + + + + + + + + + + + {% if gst_rel %} + {% for gst in gst_rel %} + + + + + + + {% endfor %} + + + + + + + {% else %} + + + + {% endif %} + +

PMC No	Invoice No	Basic Amount	Final Amount
{{ gst.pmc_no }}	{{ gst.invoice_no }}	{{ gst.basic_amount }}	{{ gst.final_amount }}
Total		{{total["sum_gst_basic_amt"]}}	{{total["sum_gst_final_amt"]}}
No GST release found.

+ + +
+

Payment Details

+ + + + + + + + + + + + + {% if payments %} + {% for pay in payments %} + + + + + + + + + {% endfor %} + + + + + + + + + {% else %} + + + + + {% endif %} + + +

PMC No	Invoice No	Amount	TDS Amount @ 1% on BASIC AMOUNT	Total Amount Paid	UTR
{{ pay.pmc_no }}	{{ pay.invoice_no }}	{{ pay.Payment_Amount }}	{{ pay.TDS_Payment_Amount }}	{{ pay.Total_amount }}	{{ pay.utr}}
Total		{{total["sum_pay_payment_amt"]}}	{{total["sum_pay_tds_payment_amt"]}}	{{total["sum_pay_total_amt"]}}
No payment found.

+ + + Download Report +

+ +{% endblock %} \ No newline at end of file diff --git a/templates/unreleased_gst.html b/templates/unreleased_gst.html new file mode 100644 index 0000000..266a457 --- /dev/null +++ b/templates/unreleased_gst.html @@ -0,0 +1,35 @@ +{% extends "base.html" %} +{% block content %} +

🚫 GST Release Not Filled

+ + + + + + + + + + + + + + {% for row in data %} + + + + + + + + + {% endfor %} + +

PMC No	Invoice No	Invoice Details	GST_SD_Amount
{{ row.PMC_No }}	{{ row.Invoice_No }}	{{ row.Invoice_Details }}	{{ row.GST_SD_Amount }}

+ + {% if data|length == 0 %} +

✅ All invoices have GST releases.

+ {% endif %} +

+{% endblock %} diff --git a/templates/uploadExcelFile.html b/templates/uploadExcelFile.html new file mode 100644 index 0000000..47c3a5b --- /dev/null +++ b/templates/uploadExcelFile.html @@ -0,0 +1,24 @@ +{% extends 'base.html' %} +{% block content %} + + + + Upload Excel File + + + + + +

Upload Excel File

+ +

+ + + +{% endblock %} diff --git a/templates/work_order_report.html b/templates/work_order_report.html new file mode 100644 index 0000000..80935e9 --- /dev/null +++ b/templates/work_order_report.html @@ -0,0 +1,209 @@ +{% extends 'base.html' %} +{% block content %} + + Work Order Report + + + + + +

Work Order Report

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +{% endblock %} diff --git a/unusedCode/unused.py b/unusedCode/unused.py new file mode 100644 index 0000000..e7c9245 --- /dev/null +++ b/unusedCode/unused.py @@ -0,0 +1,482 @@ + +logging.basicConfig(level=logging.DEBUG) + + +@app.route('/add_purchase_order', methods=['GET', 'POST']) +def add_purchase_order(): + connection = config.get_db_connection() + cursor = connection.cursor(dictionary=True) + + if request.method == 'POST': + # Fetch form fields + purchase_date = request.form.get('purchase_date') + supplier_name = request.form.get('supplier_name') + purchase_order_no = request.form.get('purchase_order_no') + item_name = request.form.get('item_name') + quantity = request.form.get('quantity') + unit = request.form.get('unit') + rate = request.form.get('rate') + amount = request.form.get('amount') + GST_Amount = request.form.get('GST_Amount') + TDS = request.form.get('TDS') + final_amount = request.form.get('final_amount') + LogHelper.log_action("Add purchase order", f"User {current_user.id} Added puirchase Order'{ purchase_order_no}'") + # Insert into database + insert_query = """ + INSERT INTO purchase_order ( + purchase_date, supplier_name, purchase_order_no, item_name, quantity, unit, rate, amount, + GST_Amount, TDS, final_amount + ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) + """ + cursor.execute(insert_query, ( + purchase_date, supplier_name, purchase_order_no, item_name, quantity, unit, rate, amount, + GST_Amount, TDS, final_amount + )) + connection.commit() + + # ✅ Always fetch updated data + cursor.execute("SELECT * FROM purchase_order") + purchases = cursor.fetchall() + + cursor.close() + connection.close() + + return render_template('add_purchase_order.html', purchases=purchases) + + +# Show all purchases +@app.route('/purchase_orders') +def show_purchase_orders(): + connection = config.get_db_connection() + cursor = connection.cursor(dictionary=True) + cursor.execute("SELECT * FROM purchase_order") + purchases = cursor.fetchall() + cursor.close() + connection.close() + return render_template('add_purchase_order.html', purchases=purchases) + + +# Delete purchase order +@app.route('/delete_purchase/', methods=['POST']) +def delete_purchase(id): + connection = config.get_db_connection() + cursor = connection.cursor() + cursor.execute("DELETE FROM purchase_order WHERE purchase_id = %s", (id,)) + connection.commit() + cursor.close() + connection.close() + LogHelper.log_action("Delete purchase order", f"User {current_user.id} Deleted puirchase Order'{ id}'") + return render_template(('add_purchase_order.html')) + + +# Edit purchase order (form + update logic) +@app.route('/update_purchase/', methods=['GET', 'POST']) +def update_purchase(id): + connection = config.get_db_connection() + cursor = connection.cursor(dictionary=True) + + if request.method == 'POST': + # ✅ Form submitted - update all fields + data = request.form + cursor.execute(""" + UPDATE purchase_order + SET purchase_date = %s, + supplier_name = %s, + purchase_order_no = %s, + item_name = %s, + quantity = %s, + unit = %s, + rate = %s, + amount = %s, + GST_Amount = %s, + TDS = %s, + final_amount = %s + WHERE purchase_id = %s + """, ( + data['purchase_date'], data['supplier_name'], data['purchase_order_no'], data['item_name'], + data['quantity'], + data['unit'], data['rate'], data['amount'], data['GST_Amount'], data['TDS'], data['final_amount'], + id + )) + connection.commit() + cursor.close() + connection.close() + LogHelper.log_action("Delete purchase order", f"User {current_user.id} Deleted puirchase Order'{ id}'") + return redirect(url_for('show_purchase_orders')) + + # Show edit form + cursor.execute("SELECT * FROM purchase_order WHERE purchase_id = %s", (id,)) + purchase = cursor.fetchone() + cursor.close() + connection.close() + return render_template('edit_purchase.html', purchase=purchase) + + +# SHOW all GRNs + ADD form +@app.route('/grn', methods=['GET']) +def grn_page(): + connection = config.get_db_connection() + cursor = connection.cursor(dictionary=True) + + # Fetch purchase orders for dropdown + cursor.execute("SELECT purchase_id, supplier_name FROM purchase_order") + purchase_orders = cursor.fetchall() + + # Fetch all GRNs to display + cursor.execute("SELECT * FROM goods_receive_note") + grns = cursor.fetchall() + print(grns) + cursor.close() + connection.close() + + # Render the template with both datasets + return render_template('grn_form.html', purchase_orders=purchase_orders, grns=grns) + + +# ADD new GRN +@app.route('/add_grn', methods=['POST', 'GET']) +def add_grn(): + data = request.form + connection = config.get_db_connection() + cursor = connection.cursor() + query = """ + INSERT INTO goods_receive_note + (grn_date, purchase_id, supplier_name, item_description, received_quantity, unit, rate, amount, remarks) + VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s) \ + """ + cursor.execute(query, ( + data.get('grn_date'), + data.get('purchase_id'), + data.get('supplier_name'), + data.get('item_description'), + data.get('received_quantity'), + data.get('unit'), + data.get('rate'), + data.get('amount'), + data.get('remarks') + )) + connection.commit() + + cursor.execute("SELECT * FROM goods_receive_note") + grns = cursor.fetchall() + print(grns) + query = "select * from purchase_order" + cursor.execute(query) + purchase_orders = cursor.fetchall() + cursor.close() + connection.close() + return render_template('grn_form.html', purchase_orders=purchase_orders, grns=grns) + + +# UPDATE GRN +@app.route('/update_grn/', methods=['GET', 'POST']) +def update_grn(grn_id): + connection = config.get_db_connection() + cursor = connection.cursor(dictionary=True) + + if request.method == 'POST': + data = request.form + query = """ + UPDATE goods_receive_note + SET grn_date=%s, purchase_id=%s, supplier_name=%s, item_description=%s, + received_quantity=%s, unit=%s, rate=%s, amount=%s, remarks=%s + WHERE grn_id=%s + """ + cursor.execute(query, ( + data['grn_date'], data['purchase_id'], data['supplier_name'], + data['item_description'], data['received_quantity'], data['unit'], + data['rate'], data['amount'], data['remarks'], grn_id + )) + connection.commit() + cursor.close() + connection.close() + return redirect(url_for('grns')) + + cursor.execute("SELECT * FROM goods_receive_note WHERE grn_id = %s", (grn_id,)) + grn = cursor.fetchone() + cursor.close() + connection.close() + return render_template("edit_grn.html", grn=grn) + + +# DELETE GRN +@app.route('/delete_grn/', methods=['POST']) +def delete_grn(grn_id): + connection = config.get_db_connection() + cursor = connection.cursor() + cursor.execute("DELETE FROM goods_receive_note WHERE grn_id = %s", (grn_id,)) + connection.commit() + cursor.close() + connection.close() + return render_template("grn_form.html") + + +@app.route('/work_order_report', methods=['GET']) +def work_order_report(): + return render_template('work_order_report.html') + + + + +# ✅ Vendor Name Search (for Select2) +@app.route('/get_vendor_names') +def get_vendor_names(): + query = request.args.get('q', '') + connection = config.get_db_connection() + cursor = connection.cursor() + cursor.execute("SELECT DISTINCT vendor_name FROM work_order WHERE vendor_name LIKE %s", (f"%{query}%",)) + vendors = [row[0] for row in cursor.fetchall()] + cursor.close() + connection.close() + return jsonify(vendors) + + +# ✅ Work Order Number Search (with or without vendor) +@app.route('/get_work_order_numbers') +def get_work_order_numbers(): + vendor = request.args.get('vendor_name', '') + query = request.args.get('q', '') + connection = config.get_db_connection() + cursor = connection.cursor() + + if vendor: + cursor.execute( + "SELECT DISTINCT work_order_number FROM work_order WHERE vendor_name = %s AND work_order_number LIKE %s", + (vendor, f"%{query}%")) + else: + cursor.execute("SELECT DISTINCT work_order_number FROM work_order WHERE work_order_number LIKE %s", + (f"%{query}%",)) + + orders = [row[0] for row in cursor.fetchall()] + cursor.close() + connection.close() + return jsonify(orders) + + +# ✅ Get Work Order Data (Filtered) +@app.route('/get_work_order_data') +def get_work_order_data(): + vendor = request.args.get('vendor_name') + order_number = request.args.get('work_order_number') + + query = "SELECT * FROM work_order WHERE 1=1" + params = [] + + if vendor: + query += " AND vendor_name = %s" + params.append(vendor) + if order_number: + query += " AND work_order_number = %s" + params.append(order_number) + + connection = config.get_db_connection() + cursor = connection.cursor(dictionary=True) + cursor.execute(query, tuple(params)) + data = cursor.fetchall() + cursor.close() + connection.close() + return jsonify(data) + + + + +@app.route('/download_work_order_report') +def download_work_order_report(): + vendor_name = request.args.get('vendor_name') + work_order_number = request.args.get('work_order_number') + + if work_order_number == "null": + work_order_number = None + + query = "SELECT * FROM work_order WHERE 1=1" + params = [] + + if vendor_name: + query += " AND vendor_name = %s" + params.append(vendor_name) + if work_order_number: + query += " AND work_order_number = %s" + params.append(work_order_number) + + conn = config.get_db_connection() + cursor = conn.cursor(dictionary=True) + cursor.execute(query, tuple(params)) + data = cursor.fetchall() + cursor.close() + conn.close() + + if not data: + return "No data found for the selected filters", 404 + + # Convert to DataFrame + df = pd.DataFrame(data) + + output_path = 'static/downloads/work_order_report.xlsx' + os.makedirs(os.path.dirname(output_path), exist_ok=True) + df.to_excel(output_path, index=False, startrow=2) # Leave space for heading + + # Load workbook for styling + wb = load_workbook(output_path) + ws = wb.active + + # Add a merged title + title = "Work Order Report" + ws.merge_cells(start_row=1, start_column=1, end_row=1, end_column=len(df.columns)) + title_cell = ws.cell(row=1, column=1) + title_cell.value = title + title_cell.font = Font(size=14, bold=True, color="1F4E78") + title_cell.alignment = Alignment(horizontal="center", vertical="center") + + # Style header row (row 3 because data starts from row 3) + header_font = Font(bold=True) + for col_num, column_name in enumerate(df.columns, 1): + cell = ws.cell(row=3, column=col_num) + cell.font = header_font + cell.alignment = Alignment(horizontal="center", vertical="center") + # Optional: adjust column width + max_length = max(len(str(column_name)), 12) + ws.column_dimensions[get_column_letter(col_num)].width = max_length + 2 + + wb.save(output_path) + return send_file(output_path, as_attachment=True) + + +@app.route('/purchase_order_report', methods=['GET']) +def purchase_order_report(): + return render_template('purchase_order_report.html') + + +@app.route('/get_supplier_names') +def get_supplier_names(): + query = request.args.get('q', '') # Get the search term from Select2 + connection = config.get_db_connection() + cursor = connection.cursor() + + # Fetch distinct supplier names that match the search query + cursor.execute( + "SELECT supplier_name FROM purchase_order WHERE supplier_name LIKE %s", + (f"%{query}%",) + ) + suppliers = [row[0] for row in cursor.fetchall()] + + cursor.close() + connection.close() + return jsonify(suppliers) + + +@app.route('/get_purchase_order_numbers') +def get_purchase_order_numbers(): + supplier = request.args.get('supplier_name', '') + query = request.args.get('q', '') + + connection = config.get_db_connection() + cursor = connection.cursor() + + if supplier: + cursor.execute(""" + SELECT purchase_order_no + FROM purchase_order + WHERE supplier_name = %s AND purchase_order_no LIKE %s + """, (supplier, f"%{query}%")) + else: + cursor.execute(""" + SELECT purchase_order_no + FROM purchase_order + WHERE purchase_order_no LIKE %s + """, (f"%{query}%",)) + + orders = [row[0] for row in cursor.fetchall()] + cursor.close() + connection.close() + return jsonify(orders) + + +@app.route('/get_purchase_order_data') +def get_purchase_order_data(): + supplier = request.args.get('supplier_name') + order_no = request.args.get('purchase_order_no') + + query = "SELECT * FROM purchase_order WHERE 1=1" + params = [] + + if supplier: + query += " AND supplier_name = %s" + params.append(supplier) + if order_no: + query += " AND purchase_order_no = %s" + params.append(order_no) + + connection = config.get_db_connection() + cursor = connection.cursor(dictionary=True) + cursor.execute(query, tuple(params)) + data = cursor.fetchall() + cursor.close() + connection.close() + return jsonify(data) + + +@app.route('/download_purchase_order_report') +def download_purchase_order_report(): + supplier_name = request.args.get('supplier_name') + purchase_order_no = request.args.get('purchase_order_no') + + if purchase_order_no == "null": + purchase_order_no = None + LogHelper.log_action("Download purchase order", f"User {current_user.id} Download puirchase Order'{ purchase_order_no}'") + query = "SELECT * FROM purchase_order WHERE 1=1" + params = [] + + if supplier_name: + query += " AND supplier_name = %s" + params.append(supplier_name) + if purchase_order_no: + query += " AND purchase_order_no = %s" + params.append(purchase_order_no) + + conn = config.get_db_connection() + cursor = conn.cursor(dictionary=True) + cursor.execute(query, tuple(params)) + data = cursor.fetchall() + cursor.close() + conn.close() + + if not data: + return "No data found for the selected filters", 404 + + # Convert to DataFrame + df = pd.DataFrame(data) + + output_path = 'static/downloads/purchase_order_report.xlsx' + os.makedirs(os.path.dirname(output_path), exist_ok=True) + + df.to_excel(output_path, index=False, startrow=2) # Reserve space for heading + + # Load workbook for styling + wb = load_workbook(output_path) + ws = wb.active + + # Add a merged title + title = "Purchase Order Report" + ws.merge_cells(start_row=1, start_column=1, end_row=1, end_column=len(df.columns)) + title_cell = ws.cell(row=1, column=1) + title_cell.value = title + title_cell.font = Font(size=14, bold=True, color="1F4E78") + title_cell.alignment = Alignment(horizontal="center", vertical="center") + + # Style header row (row 3 because data starts from row 3) + header_font = Font(bold=True) + for col_num, column_name in enumerate(df.columns, 1): + cell = ws.cell(row=3, column=col_num) + cell.font = header_font + cell.alignment = Alignment(horizontal="center", vertical="center") + max_length = max(len(str(column_name)), 12) + ws.column_dimensions[get_column_letter(col_num)].width = max_length + 2 + + wb.save(output_path) + return send_file(output_path, as_attachment=True) + + +if __name__ == '__main__': + app.run(host='0.0.0.0', port=5000, debug=True) + + diff --git a/unusedCode/workOrder.py b/unusedCode/workOrder.py new file mode 100644 index 0000000..2623bb9 --- /dev/null +++ b/unusedCode/workOrder.py @@ -0,0 +1,128 @@ +# -- end hold types controlller -------------------- + +# Route to display the HTML form +@app.route('/add_work_order', methods=['GET']) +def add_work_order(): + # Add database connection + connection = config.get_db_connection() + cursor = connection.cursor(dictionary=True) + + cursor.execute("SELECT Contractor_id, Contractor_Name FROM subcontractors") # Adjust table/column names as needed + subcontractor = cursor.fetchall() + + cursor.close() + connection.close() + + return render_template('add_work_order.html', subcontractor=subcontractor) # This is your HTML form page + + +# Route to handle form submission (from action="/submit_work_order") +@app.route('/submit_work_order', methods=['POST', 'GET']) +def submit_work_order(): + vendor_name = request.form['vendor_name'] + work_order_type = request.form['work_order_type'] + work_order_amount = request.form['work_order_amount'] + boq_amount = request.form['boq_amount'] + work_done_percentage = request.form['work_done_percentage'] + work_order_number = request.form['work_order_number'] + gst_amount = request.form['gst_amount'] + tds_amount = request.form['tds_amount'] + security_deposite = request.form['security_deposite'] + sd_against_gst = request.form['sd_against_gst'] + final_total = request.form['final_total'] + tds_of_gst = request.form['tds_of_gst'] + LogHelper.log_action("Submit Work Order", f"User {current_user.id} Submit Work Order'{ work_order_type}'") + # print("Good Morning How are U") + connection = config.get_db_connection() + cursor = connection.cursor(dictionary=True) + # print("Good morning and how are you") + insert_query = """ + INSERT INTO work_order + (vendor_name, work_order_type, work_order_amount, boq_amount, work_done_percentage,work_order_number,gst_amount,tds_amount + ,security_deposit,sd_against_gst,final_total,tds_of_gst) + VALUES (%s, %s, %s, %s, %s,%s,%s,%s,%s,%s,%s,%s) + """ + cursor.execute(insert_query, + (vendor_name, work_order_type, work_order_amount, boq_amount, work_done_percentage, work_order_number + , gst_amount, tds_amount, security_deposite, sd_against_gst, final_total, tds_of_gst)) + connection.commit() + + # ✅ Fetch all data after insert + select_query = "SELECT * FROM work_order" + cursor.execute(select_query) + wo = cursor.fetchall() + # print("The Work order data is ",wo) + print("The data from work order ", wo) # should now print the data properly + cursor.execute("SELECT Contractor_id, Contractor_Name FROM subcontractors") # Adjust table/column names as needed + subcontractor = cursor.fetchall() + cursor.close() + connection.close() + + return render_template('add_work_order.html', work_order_type=work_order_type, wo=wo, subcontractor=subcontractor) + + +@app.route('/delete_work_order/', methods=['POST']) +def delete_work_order(id): + connection = config.get_db_connection() + cursor = connection.cursor() + cursor.execute("DELETE FROM work_order WHERE work_order_id = %s", (id,)) + connection.commit() + cursor.close() + connection.close() + LogHelper.log_action("delete Work Order", f"User {current_user.id} delete Work Order'{ id}'") + return jsonify({'success': True}) + + +@app.route('/update_work_order/', methods=['GET', 'POST']) +def update_work_order(id): + connection = config.get_db_connection() + cursor = connection.cursor(dictionary=True) + + if request.method == 'POST': + work_order_type = request.form['work_order_type'] + work_order_amount = request.form['work_order_amount'] + boq_amount = request.form['boq_amount'] + work_done_percentage = request.form['work_done_percentage'] + work_order_number = request.form['work_order_number'] + gst_amount = request.form['gst_amount'] + tds_amount = request.form['tds_amount'] + security_deposite = request.form['security_deposite'] + sd_against_gst = request.form['sd_against_gst'] + final_amount = request.form['final_amount'] + tds_of_gst = request.form['tds_of_gst'] + update_query = """ + UPDATE work_order + SET work_order_type = %s, + work_order_amount = %s, + boq_amount = %s, + work_done_percentage = %s, + work_order_number= %s, + gst_amount = %s, + tds_amount= %s, + security_deposite= %s, + sd_against_gst=%s, + final_amount= %s, + tds_of_gst=%s + WHERE work_order_id = %s + """ + cursor.execute(update_query, ( + work_order_type, work_order_amount, boq_amount, work_done_percentage, work_order_number, gst_amount, + tds_amount, security_deposite, sd_against_gst, final_amount, tds_of_gst, id)) + connection.commit() + cursor.close() + connection.close() + + # If GET request: fetch the existing record + cursor.execute("SELECT * FROM work_order WHERE work_order_id = %s", (id,)) + work_order = cursor.fetchone() + cursor.close() + connection.close() + return render_template('update_work_order.html', work_order=work_order) + + +# Optional: Route to show a success message +@app.route('/success') +def success(): + return "Work Order Submitted Successfully!" + +

Activity Logs

Create a New Block

Display Blocks

Add District

Districts

Add District

Display Districts

Add Hold Types

Hold Type List

Add Invoice

Invoice List

Add Payment

Payment History

Add Purchase Entry

Purchase List

Add State

Display States

Add Sub-Contractor

Display SubContractor

Add a New Village

Display Villages

Create Work Order

Hold Type List

Admin Profile

Edit Block

Edit District

Edit GRN

Edit GST Release

Edit Hold Type

Edit Invoice

Edit Payment

Edit Purchase Order

Edit State

Edit Sub-Contractor

Edit Village

Add GRN

All GRNs