From 80b0dc6b01d48423863afe2640f8e7abdf9d8347 Mon Sep 17 00:00:00 2001 From: Ajmalcybrosys Date: Sat, 31 Aug 2019 14:11:12 +0530 Subject: [PATCH] [FIX] Bug Fixed 'project_report_pdf' --- project_report_pdf/__manifest__.py | 2 +- project_report_pdf/doc/RELEASE_NOTES.md | 5 ++++ .../report/project_report_pdf.py | 23 +++++++++++++------ .../report/project_report_xls.py | 22 ++++++++---------- .../views/project_report_button.xml | 5 ++-- 5 files changed, 35 insertions(+), 22 deletions(-) diff --git a/project_report_pdf/__manifest__.py b/project_report_pdf/__manifest__.py index dfcc206e2..7d464e5a5 100644 --- a/project_report_pdf/__manifest__.py +++ b/project_report_pdf/__manifest__.py @@ -21,7 +21,7 @@ ################################################################################### { 'name': 'Project Report XLS & PDF', - 'version': '12.0.2.0.0', + 'version': '12.0.1.1.0', "category": "Project", 'author': 'Cybrosys Techno Solutions', 'website': "https://www.cybrosys.com", diff --git a/project_report_pdf/doc/RELEASE_NOTES.md b/project_report_pdf/doc/RELEASE_NOTES.md index 6a9c8ecca..647705ba3 100644 --- a/project_report_pdf/doc/RELEASE_NOTES.md +++ b/project_report_pdf/doc/RELEASE_NOTES.md @@ -4,3 +4,8 @@ #### Version 12.0.1.0.0 ##### ADD - Initial commit for project_report_pdf + +#### 31.08.2019 +#### Version 12.0.1.1.0 +##### FIX +- Bug Fixed diff --git a/project_report_pdf/report/project_report_pdf.py b/project_report_pdf/report/project_report_pdf.py index c458dec16..3165090e5 100644 --- a/project_report_pdf/report/project_report_pdf.py +++ b/project_report_pdf/report/project_report_pdf.py @@ -60,13 +60,22 @@ class ProjectReportParser(models.AbstractModel): 'user_id': i.user_id.name, 'stage_id': i.stage_id.name, }) - return { - 'vals': vals, - 'name': current_task[0].project_id.name, - 'manager': current_task[0].project_id.user_id.name, - 'date_start': current_task[0].project_id.date_start, - 'date_end': current_task[0].project_id.date, - } + if current_task: + return { + 'vals': vals, + 'name': current_task[0].project_id.name, + 'manager': current_task[0].project_id.user_id.name, + 'date_start': current_task[0].project_id.date_start, + 'date_end': current_task[0].project_id.date, + } + else: + return { + 'vals': vals, + 'name': current_task.project_id.name, + 'manager': current_task.project_id.user_id.name, + 'date_start': current_task.project_id.date_start, + 'date_end': current_task.project_id.date, + } diff --git a/project_report_pdf/report/project_report_xls.py b/project_report_pdf/report/project_report_xls.py index 94d8e9f1b..ff6d945ad 100644 --- a/project_report_pdf/report/project_report_xls.py +++ b/project_report_pdf/report/project_report_xls.py @@ -28,12 +28,8 @@ class ProjectReportXls(models.AbstractModel): _inherit = 'report.report_xlsx.abstract' def generate_xlsx_report(self, workbook, data, lines): - print('kskskjajaajaj') name = data['record'] - print(lines) - print(data['context']['uid']) user_obj = self.env['res.users'].search([('id', '=', data['context']['uid'])]) - print(user_obj.company_id) wizard_record = request.env['wizard.project.report'].search([])[-1] task_obj = request.env['project.task'] users_selected = [] @@ -65,8 +61,12 @@ class ProjectReportXls(models.AbstractModel): 'user_id': i.user_id.name if i.user_id.name else '', 'stage_id': i.stage_id.name, }) - print(vals, 'vals') - + if current_task: + project_name = current_task[0].project_id.name + user = current_task[0].project_id.name + else: + project_name = current_task.project_id.name + user = current_task.project_id.name sheet = workbook.add_worksheet("Project Report") format1 = workbook.add_format({'font_size': 22, 'bg_color': '#D3D3D3'}) format4 = workbook.add_format({'font_size': 22}) @@ -84,14 +84,14 @@ class ProjectReportXls(models.AbstractModel): sheet.merge_range('A5:B5', user_obj.company_id.country_id.name, format5) sheet.merge_range('C1:H5', "", format5) sheet.merge_range(5, 0, 6, 1, "Project :", format1) - sheet.merge_range(5, 2, 6, 7, current_task[0].project_id.name, format1) + sheet.merge_range(5, 2, 6, 7, project_name, format1) sheet.merge_range('A8:B8', "Project Manager :", format5) - sheet.merge_range('C8:D8', current_task[0].project_id.user_id.name, format5) + sheet.merge_range('C8:D8', user, format5) date_start = '' date_end = '' - if current_task[0].project_id.date_start: + if current_task: date_start = str(current_task[0].project_id.date_start) - if current_task[0].project_id.date: + if current_task: date_end = str(current_task[0].project_id.date) sheet.merge_range('A9:B9', "Start Date :", format5) sheet.merge_range('C9:D9', date_start, format5) @@ -100,10 +100,8 @@ class ProjectReportXls(models.AbstractModel): sheet.merge_range(0, 2, 4, 5, "", format5) sheet.merge_range(1, 6, 4, 7, "", format5) sheet.merge_range(7, 4, 9, 7, "", format5) - sheet.merge_range(10, 4, 11, 7, "", format5) sheet.merge_range('A11:H12', 'Open Tasks', format4) - sheet.merge_range('A13:D13', "Tasks", format2) sheet.merge_range('E13:F13', "Assigned", format2) sheet.merge_range('G13:H13', "Stage", format2) diff --git a/project_report_pdf/views/project_report_button.xml b/project_report_pdf/views/project_report_button.xml index fb5651ddc..e2feafe5a 100644 --- a/project_report_pdf/views/project_report_button.xml +++ b/project_report_pdf/views/project_report_button.xml @@ -6,10 +6,11 @@ project.project - +