audrius/reporting-engine
1
0
Fork 1
mirror of https://github.com/OCA/reporting-engine.git synced 2025-02-16 16:30:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

[MIG] report_xlsx_helper_demo: Migration to 14.0

Browse Source
This commit is contained in:
Luc De Meyer
2020-11-25 12:56:20 -08:00
parent 0c37ba0c24
commit 5f746468d4
12 changed files with 103 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
report_xlsx_helper/report/report_xlsx_abstract.py
View File

@@ -264,7 +264,6 @@ class ReportXlsxAbstract(models.AbstractModel):
)
# formats for worksheet table column headers
<<<<<<< HEAD
FORMATS["format_theader_grey_left"] = workbook.add_format(theader_grey)
FORMATS["format_theader_grey_center"] = workbook.add_format(
dict(theader_grey, align="center")
@@ -328,8 +327,6 @@ class ReportXlsxAbstract(models.AbstractModel):
dict(theader_grey, num_format=int_format_conditional, align="right")
)
=======
>>>>>>> [IMP] format xlsx to global files
FORMATS["format_theader_yellow_left"] = workbook.add_format(theader_yellow)
FORMATS["format_theader_yellow_center"] = workbook.add_format(
dict(theader_yellow, align="center")

1
report_xlsx_helper/report/report_xlsx_format.py
View File

@@ -162,4 +162,3 @@ FORMATS = {
"format_tcell_date_center_bold": False,
"format_tcell_date_right_bold": False,
}