From 9c04d4d070e170976a30d845310446c45cf9f448 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Wed, 7 Aug 2019 18:25:39 +0200 Subject: [PATCH 1/3] date to datetime conversion when autotyping --- report_xlsx_helper/report/report_xlsx_abstract.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/report_xlsx_helper/report/report_xlsx_abstract.py b/report_xlsx_helper/report/report_xlsx_abstract.py index 5b472cb4..0f55612a 100644 --- a/report_xlsx_helper/report/report_xlsx_abstract.py +++ b/report_xlsx_helper/report/report_xlsx_abstract.py @@ -1,7 +1,7 @@ # Copyright 2009-2018 Noviat. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from datetime import datetime +from datetime import datetime, date import re from types import CodeType from xlsxwriter.utility import xl_rowcol_to_cell @@ -503,6 +503,10 @@ class ReportXlsxAbstract(models.AbstractModel): cell_type = 'number' elif isinstance(cell_value, datetime): cell_type = 'datetime' + elif isinstance(cell_value, date): + cell_value = datetime.combine( + cell_value, datetime.min.time()) + cell_type = 'datetime' else: if not cell_value: cell_type = 'blank' From f5bf4d506f33c4637bcf8efcd6dcdaad91772012 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Thu, 8 Aug 2019 20:25:51 +0200 Subject: [PATCH 2/3] greenify --- report_xlsx_helper/report/report_xlsx_abstract.py | 2 +- report_xlsx_helper_demo/report/partner_export_xlsx.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/report_xlsx_helper/report/report_xlsx_abstract.py b/report_xlsx_helper/report/report_xlsx_abstract.py index 0f55612a..8c007ff7 100644 --- a/report_xlsx_helper/report/report_xlsx_abstract.py +++ b/report_xlsx_helper/report/report_xlsx_abstract.py @@ -505,7 +505,7 @@ class ReportXlsxAbstract(models.AbstractModel): cell_type = 'datetime' elif isinstance(cell_value, date): cell_value = datetime.combine( - cell_value, datetime.min.time()) + cell_value, datetime.min.time()) cell_type = 'datetime' else: if not cell_value: diff --git a/report_xlsx_helper_demo/report/partner_export_xlsx.py b/report_xlsx_helper_demo/report/partner_export_xlsx.py index 3ea0c813..c9cd55ab 100644 --- a/report_xlsx_helper_demo/report/partner_export_xlsx.py +++ b/report_xlsx_helper_demo/report/partner_export_xlsx.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2009-2018 Noviat. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). From 73da6592f8c31c56520c89b6c9a360d0b98653c1 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Sat, 10 Aug 2019 17:03:15 +0200 Subject: [PATCH 3/3] increase test coverage --- .../report/test_partner_report_xlsx.py | 12 ++++++++++-- report_xlsx_helper/tests/test_report_xlsx_helper.py | 7 ++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/report_xlsx_helper/report/test_partner_report_xlsx.py b/report_xlsx_helper/report/test_partner_report_xlsx.py index d7a26362..97fa4dab 100644 --- a/report_xlsx_helper/report/test_partner_report_xlsx.py +++ b/report_xlsx_helper/report/test_partner_report_xlsx.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2009-2018 Noviat. +# Copyright 2009-2019 Noviat. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import models @@ -53,6 +52,15 @@ class TestPartnerXlsx(models.AbstractModel): }, 'width': 14, }, + 'date': { + 'header': { + 'value': 'Date', + }, + 'data': { + 'value': self._render("partner.date"), + }, + 'width': 13, + }, } ws_params = { diff --git a/report_xlsx_helper/tests/test_report_xlsx_helper.py b/report_xlsx_helper/tests/test_report_xlsx_helper.py index 059c1243..f2b02ef4 100644 --- a/report_xlsx_helper/tests/test_report_xlsx_helper.py +++ b/report_xlsx_helper/tests/test_report_xlsx_helper.py @@ -1,6 +1,8 @@ -# Copyright 2009-2018 Noviat. +# Copyright 2009-2019 Noviat. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from datetime import date + from odoo.tests.common import TransactionCase @@ -8,8 +10,11 @@ class TestReportXlsxHelper(TransactionCase): def setUp(self): super(TestReportXlsxHelper, self).setUp() + today = date.today() p1 = self.env.ref('base.res_partner_1') p2 = self.env.ref('base.res_partner_2') + p1.date = today + p2.date = today self.partners = p1 + p2 ctx = { 'report_name': 'report_xlsx_helper.test_partner_xlsx',