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

merge the pmc no report and contractor report procedure

Browse Source
This commit is contained in:
akashbhome
2026-03-31 10:54:43 +05:30
parent f3ca245c3d
commit e44d8321bc
9 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
model/PmcReport.py
View File

@@ -140,7 +140,7 @@ class PmcReport:
}
invoices = ReportHelper.execute_sp(
cursor, 'GetInvoicesAndGstReleaseByPmcNo', [pmc_no]
cursor, 'GetInvoicesByContractorOrPMCNo', [None,pmc_no]
)
credit_notes = ReportHelper.execute_sp(

11
model/Report.py
View File

@@ -322,9 +322,12 @@ class ReportHelper:
@staticmethod
def create_contractor_report(contractor_id):
DOWNLOAD_FOLDER = os.path.join("static", "download")
os.makedirs(DOWNLOAD_FOLDER, exist_ok=True)
output_file = os.path.join(DOWNLOAD_FOLDER, f"Contractor_Report_{contractor_id}.xlsx")
# DOWNLOAD_FOLDER = os.path.join("static", "download")
# os.makedirs(DOWNLOAD_FOLDER, exist_ok=True)
fileName=f"Contractor_Report_{contractor_id}.xlsx"
# output_file = os.path.join(DOWNLOAD_FOLDER, )
output_file = FolderAndFile.get_download_path(filename=fileName)
# Fetch Data
contInfo = ReportHelper.get_contractor_info(contractor_id)
@@ -335,7 +338,7 @@ class ReportHelper:
cursor = connection.cursor(dictionary=True, buffered=True)
hold_types = ReportHelper.execute_sp(cursor, 'HoldTypesByContractorId', [contractor_id])
invoices = ReportHelper.execute_sp(cursor, 'FetchInvoicesByContractor', [contractor_id])
invoices = ReportHelper.execute_sp(cursor, 'GetInvoicesByContractorOrPMCNo', [contractor_id,None])
hold_amounts = ReportHelper.execute_sp(cursor, 'HoldAmountsByContractorId', [contractor_id])
hold_data = {}
for h in hold_amounts: