diff --git a/pandoc-3.1.9-windows-x86_64.msi b/pandoc-3.1.9-windows-x86_64.msi deleted file mode 100644 index 1848c36b5..000000000 Binary files a/pandoc-3.1.9-windows-x86_64.msi and /dev/null differ diff --git a/report_xlsx/README.rst b/report_xlsx/README.rst index 14a5e7217..b390f057e 100644 --- a/report_xlsx/README.rst +++ b/report_xlsx/README.rst @@ -115,15 +115,16 @@ Contributors ------------ - Adrien Peiffer -- S??bastien Alix -- St??phane Bidoul +- Sébastien Alix +- Stéphane Bidoul - Enric Tobella - Graeme Gellatly - Cristian Salamea - Rod Schouteden - Eugene Molotov - Christopher Ormaza -- Houz??fa Abbasbhay +- Houzéfa Abbasbhay +- Le Dinh Tien Maintainers ----------- diff --git a/report_xlsx/__manifest__.py b/report_xlsx/__manifest__.py index 14596be38..4a1fd91c3 100644 --- a/report_xlsx/__manifest__.py +++ b/report_xlsx/__manifest__.py @@ -6,7 +6,7 @@ "author": "ACSONE SA/NV," "Creu Blanca," "Odoo Community Association (OCA)", "website": "https://github.com/OCA/reporting-engine", "category": "Reporting", - "version": "16.0.2.0.0", + "version": "17.0.2.0.0", "development_status": "Mature", "license": "AGPL-3", "external_dependencies": {"python": ["xlsxwriter", "xlrd"]}, diff --git a/report_xlsx/controllers/main.py b/report_xlsx/controllers/main.py index 61aa5033b..4b11c003a 100644 --- a/report_xlsx/controllers/main.py +++ b/report_xlsx/controllers/main.py @@ -83,7 +83,7 @@ class ReportController(ReportController): report = request.env["ir.actions.report"]._get_report_from_name( reportname ) - filename = "%s.%s" % (report.name, "xlsx") + filename = f"{report.name}.xlsx" if docids: ids = [int(x) for x in docids.split(",")] @@ -92,7 +92,7 @@ class ReportController(ReportController): report_name = safe_eval( report.print_report_name, {"object": obj, "time": time} ) - filename = "%s.%s" % (report_name, "xlsx") + filename = f"{report_name}.xlsx" if not response.headers.get("Content-Disposition"): response.headers.add( "Content-Disposition", content_disposition(filename) diff --git a/report_xlsx/demo/report.xml b/report_xlsx/demo/report.xml index be17fa3e2..e26940471 100644 --- a/report_xlsx/demo/report.xml +++ b/report_xlsx/demo/report.xml @@ -1,7 +1,7 @@ diff --git a/report_xlsx/i18n/ca.po b/report_xlsx/i18n/ca.po index 176db78d5..f1c20a966 100644 --- a/report_xlsx/i18n/ca.po +++ b/report_xlsx/i18n/ca.po @@ -34,7 +34,7 @@ msgstr "Imprimeix a XLSX" #. module: report_xlsx #: model:ir.model,name:report_xlsx.model_ir_actions_report msgid "Report Action" -msgstr "Informe d'acci??" +msgstr "Informe d'acció" #. module: report_xlsx #: model:ir.model.fields,field_description:report_xlsx.field_ir_actions_report__report_type @@ -49,10 +49,10 @@ msgid "" "browser PDF means the report will be rendered using Wkhtmltopdf and " "downloaded by the user." msgstr "" -"El tipus d'informe que es render??, cadascun amb el seu propi m??tode de " -"representaci??. HTML significa que l'informe s'obrir?? directament al vostre " -"navegador, PDF significa que l'informe es representar?? amb Wkhtmltopdf i " -"l'usuari el baixar??." +"El tipus d'informe que es renderà, cadascun amb el seu propi mètode de " +"representació. HTML significa que l'informe s'obrirà directament al vostre " +"navegador, PDF significa que l'informe es representarà amb Wkhtmltopdf i " +"l'usuari el baixarà." #. module: report_xlsx #: model:ir.model.fields.selection,name:report_xlsx.selection__ir_actions_report__report_type__xlsx diff --git a/report_xlsx/i18n/de.po b/report_xlsx/i18n/de.po index 140d55808..0e9a8c60c 100644 --- a/report_xlsx/i18n/de.po +++ b/report_xlsx/i18n/de.po @@ -73,7 +73,7 @@ msgstr "XLSX" #~ "browser settings to allow popup windows for this page." #~ msgstr "" #~ "Ein Popup-Fenster wurde abgewiesen. Sie werden vermutlich Ihre Browser-" -#~ "Einstellungen ??ndern m??ssen, damit die Anzeige dieser Seite m??glich wird." +#~ "Einstellungen ändern müssen, damit die Anzeige dieser Seite möglich wird." #~ msgid "Display Name" #~ msgstr "Name anzeigen" @@ -82,7 +82,7 @@ msgstr "XLSX" #~ msgstr "ID" #~ msgid "Last Modified on" -#~ msgstr "Zuletzt ge??ndert am" +#~ msgstr "Zuletzt geändert am" #, python-format #~ msgid "Warning" diff --git a/report_xlsx/i18n/es.po b/report_xlsx/i18n/es.po index a3b89f4bd..1f28ba30c 100644 --- a/report_xlsx/i18n/es.po +++ b/report_xlsx/i18n/es.po @@ -37,7 +37,7 @@ msgstr "Imprimir en XLSX" #. module: report_xlsx #: model:ir.model,name:report_xlsx.model_ir_actions_report msgid "Report Action" -msgstr "Informar Acci??n" +msgstr "Informar Acción" #. module: report_xlsx #: model:ir.model.fields,field_description:report_xlsx.field_ir_actions_report__report_type @@ -52,10 +52,10 @@ msgid "" "browser PDF means the report will be rendered using Wkhtmltopdf and " "downloaded by the user." msgstr "" -"El tipo de informe que se representar??, cada uno con su propio m??todo de " -"representaci??n. HTML significa que el informe se abrir?? directamente en el " -"PDF de su navegador significa que el informe se representar?? usando " -"Wkhtmltopdf y el usuario lo descargar??." +"El tipo de informe que se representará, cada uno con su propio método de " +"representación. HTML significa que el informe se abrirá directamente en el " +"PDF de su navegador significa que el informe se representará usando " +"Wkhtmltopdf y el usuario lo descargará." #. module: report_xlsx #: model:ir.model.fields.selection,name:report_xlsx.selection__ir_actions_report__report_type__xlsx @@ -73,7 +73,7 @@ msgstr "XLSX" #~ msgstr "" #~ "Una ventana emergente con su informe fue bloqueada. Puede que necesite " #~ "cambiar las preferencias de su navegador para que permita ventanas " -#~ "emergentes en esta p??gina." +#~ "emergentes en esta página." #~ msgid "Display Name" #~ msgstr "Nombre mostrado" @@ -82,7 +82,7 @@ msgstr "XLSX" #~ msgstr "ID" #~ msgid "Last Modified on" -#~ msgstr "??ltima modificaci??n el" +#~ msgstr "Última modificación el" #, python-format #~ msgid "Warning" diff --git a/report_xlsx/i18n/fr.po b/report_xlsx/i18n/fr.po index b0f890e31..148ebbd40 100644 --- a/report_xlsx/i18n/fr.po +++ b/report_xlsx/i18n/fr.po @@ -59,7 +59,7 @@ msgstr "" #, python-format #~ msgid "%s model was not found" -#~ msgstr "model '%s' n'a pas ??t?? trouv??" +#~ msgstr "model '%s' n'a pas été trouvé" #~ msgid "Display Name" #~ msgstr "Nom" @@ -68,7 +68,7 @@ msgstr "" #~ msgstr "ID" #~ msgid "Last Modified on" -#~ msgstr "Derni??re modification le" +#~ msgstr "Dernière modification le" #~ msgid "report.report_xlsx.partner_xlsx" #~ msgstr "report.report_xlsx.partner_xlsx" diff --git a/report_xlsx/i18n/hr.po b/report_xlsx/i18n/hr.po index 6d3e62a08..e573e87f4 100644 --- a/report_xlsx/i18n/hr.po +++ b/report_xlsx/i18n/hr.po @@ -61,15 +61,15 @@ msgstr "" #, python-format #~ msgid "%s model was not found" -#~ msgstr "%s model nije prona??en" +#~ msgstr "%s model nije pronađen" #, python-format #~ msgid "" #~ "A popup window with your report was blocked. You may need to change your " #~ "browser settings to allow popup windows for this page." #~ msgstr "" -#~ "Sko??ni prozor sa va??im izvje??tajem je blokiran. Mo??da trebate promijeniti " -#~ "postavke pretra??iva??a da dozvolite sko??ne prozore za ovu stranicu." +#~ "Skočni prozor sa vašim izvještajem je blokiran. Možda trebate promijeniti " +#~ "postavke pretraživača da dozvolite skočne prozore za ovu stranicu." #~ msgid "Display Name" #~ msgstr "Naziv za prikaz" diff --git a/report_xlsx/i18n/pt.po b/report_xlsx/i18n/pt.po index 557b47bbd..ea7399ea6 100644 --- a/report_xlsx/i18n/pt.po +++ b/report_xlsx/i18n/pt.po @@ -19,12 +19,12 @@ msgstr "" #. module: report_xlsx #: model:ir.model,name:report_xlsx.model_report_report_xlsx_abstract msgid "Abstract XLSX Report" -msgstr "Relat??rio XLSX Abstrato" +msgstr "Relatório XLSX Abstrato" #. module: report_xlsx #: model:ir.model,name:report_xlsx.model_report_report_xlsx_partner_xlsx msgid "Partner XLSX Report" -msgstr "Relat??rio de Parceiro XLSX" +msgstr "Relatório de Parceiro XLSX" #. module: report_xlsx #: model:ir.actions.report,name:report_xlsx.partner_xlsx @@ -34,12 +34,12 @@ msgstr "Imprimir para XLSX" #. module: report_xlsx #: model:ir.model,name:report_xlsx.model_ir_actions_report msgid "Report Action" -msgstr "A????o do Relat??rio" +msgstr "Ação do Relatório" #. module: report_xlsx #: model:ir.model.fields,field_description:report_xlsx.field_ir_actions_report__report_type msgid "Report Type" -msgstr "Tipo de Relat??rio" +msgstr "Tipo de Relatório" #. module: report_xlsx #: model:ir.model.fields,help:report_xlsx.field_ir_actions_report__report_type @@ -49,9 +49,9 @@ msgid "" "browser PDF means the report will be rendered using Wkhtmltopdf and " "downloaded by the user." msgstr "" -"O tipo de relat??rio que ser?? produzido, tendo cada qual o seu m??todo de " -"produ????o. HTML significa que o relat??rio ser?? aberto diretamente no seu " -"browser. PDF indica que o relat??rio ser?? produzido com o Wkhtmltopdf e " +"O tipo de relatório que será produzido, tendo cada qual o seu método de " +"produção. HTML significa que o relatório será aberto diretamente no seu " +"browser. PDF indica que o relatório será produzido com o Wkhtmltopdf e " "descarregado pelo utilizador." #. module: report_xlsx @@ -61,16 +61,16 @@ msgstr "XLSX" #, python-format #~ msgid "%s model was not found" -#~ msgstr "O modelo %s n??o foi encontrado" +#~ msgstr "O modelo %s não foi encontrado" #, python-format #~ msgid "" #~ "A popup window with your report was blocked. You may need to change your " #~ "browser settings to allow popup windows for this page." #~ msgstr "" -#~ "Uma janela popup com o seu relat??rio foi bloqueada. Pode necessitar de " -#~ "mudar as configura????es do browser para permitir janelas popup nesta " -#~ "p??gina." +#~ "Uma janela popup com o seu relatório foi bloqueada. Pode necessitar de " +#~ "mudar as configurações do browser para permitir janelas popup nesta " +#~ "página." #~ msgid "Display Name" #~ msgstr "Nome a Exibir" @@ -79,7 +79,7 @@ msgstr "XLSX" #~ msgstr "ID" #~ msgid "Last Modified on" -#~ msgstr "??ltima Modifica????o em" +#~ msgstr "Última Modificação em" #, python-format #~ msgid "Warning" diff --git a/report_xlsx/i18n/sv.po b/report_xlsx/i18n/sv.po index 176accddb..9d7cbf4da 100644 --- a/report_xlsx/i18n/sv.po +++ b/report_xlsx/i18n/sv.po @@ -34,7 +34,7 @@ msgstr "Skriv ut till XLSX" #. module: report_xlsx #: model:ir.model,name:report_xlsx.model_ir_actions_report msgid "Report Action" -msgstr "Rapport??tg??rd" +msgstr "Rapportåtgärd" #. module: report_xlsx #: model:ir.model.fields,field_description:report_xlsx.field_ir_actions_report__report_type @@ -50,8 +50,8 @@ msgid "" "downloaded by the user." msgstr "" "Den typ av rapport som ska renderas, var och en har sin egen " -"renderingsmetod. HTML inneb??r att rapporten ??ppnas direkt i webbl??saren, PDF " -"betyder att rapporten renderas med Wkhtmltopdf och laddas ner av anv??ndaren." +"renderingsmetod. HTML innebär att rapporten öppnas direkt i webbläsaren, PDF " +"betyder att rapporten renderas med Wkhtmltopdf och laddas ner av användaren." #. module: report_xlsx #: model:ir.model.fields.selection,name:report_xlsx.selection__ir_actions_report__report_type__xlsx @@ -67,8 +67,8 @@ msgstr "XLSX" #~ "A popup window with your report was blocked. You may need to change your " #~ "browser settings to allow popup windows for this page." #~ msgstr "" -#~ "Ett popup-f??nster med din rapport blockerades. Du kan beh??va ??ndra " -#~ "inst??llningarna i din webbl??sare f??r att till??ta popup-f??nster p?? den h??r " +#~ "Ett popup-fönster med din rapport blockerades. Du kan behöva ändra " +#~ "inställningarna i din webbläsare för att tillåta popup-fönster på den här " #~ "sidan." #~ msgid "Display Name" @@ -78,7 +78,7 @@ msgstr "XLSX" #~ msgstr "ID" #~ msgid "Last Modified on" -#~ msgstr "Senast ??ndrad den" +#~ msgstr "Senast ändrad den" #, python-format #~ msgid "Warning" diff --git a/report_xlsx/models/ir_report.py b/report_xlsx/models/ir_report.py index 9d07d9559..13484f054 100644 --- a/report_xlsx/models/ir_report.py +++ b/report_xlsx/models/ir_report.py @@ -26,7 +26,7 @@ class ReportAction(models.Model): .sudo(False) .create_xlsx_report(docids, data) # noqa ) - if ret and isinstance(ret, (tuple, list)): # data, "xlsx" + if ret and isinstance(ret, (tuple | list)): # data, "xlsx" report_sudo.save_xlsx_report_attachment(docids, ret[0]) return ret diff --git a/report_xlsx/readme/CONTRIBUTORS.md b/report_xlsx/readme/CONTRIBUTORS.md index c376af976..db39b2e52 100644 --- a/report_xlsx/readme/CONTRIBUTORS.md +++ b/report_xlsx/readme/CONTRIBUTORS.md @@ -1,10 +1,11 @@ -- Adrien Peiffer \<\> -- S??bastien Alix \<\> -- St??phane Bidoul \<\> -- Enric Tobella \<\> -- Graeme Gellatly \<\> -- Cristian Salamea \<\> -- Rod Schouteden \<\> -- Eugene Molotov \<\> -- Christopher Ormaza \<\> -- Houz??fa Abbasbhay \<\> +- Adrien Peiffer \<\> +- Sébastien Alix \<\> +- Stéphane Bidoul \<\> +- Enric Tobella \<\> +- Graeme Gellatly \<\> +- Cristian Salamea \<\> +- Rod Schouteden \<\> +- Eugene Molotov \<\> +- Christopher Ormaza \<\> +- Houzéfa Abbasbhay \<\> +- Le Dinh Tien \<\> diff --git a/report_xlsx/readme/DESCRIPTION.md b/report_xlsx/readme/DESCRIPTION.md index 8f549d390..894b12463 100644 --- a/report_xlsx/readme/DESCRIPTION.md +++ b/report_xlsx/readme/DESCRIPTION.md @@ -1 +1 @@ -This module provides a basic report class to generate xlsx report. +This module provides a basic report class to generate xlsx report. diff --git a/report_xlsx/readme/INSTALL.md b/report_xlsx/readme/INSTALL.md index 9c6cf6e9e..013e31797 100644 --- a/report_xlsx/readme/INSTALL.md +++ b/report_xlsx/readme/INSTALL.md @@ -1,7 +1,7 @@ -Make sure you have `xlsxwriter` Python module installed: - - $ pip3 install xlsxwriter - -For testing it is also necessary `xlrd` Python module installed: - - $ pip3 install xlrd +Make sure you have `xlsxwriter` Python module installed: + + $ pip3 install xlsxwriter + +For testing it is also necessary `xlrd` Python module installed: + + $ pip3 install xlrd diff --git a/report_xlsx/readme/USAGE.md b/report_xlsx/readme/USAGE.md index fab76e9e6..e7dbcd3c3 100644 --- a/report_xlsx/readme/USAGE.md +++ b/report_xlsx/readme/USAGE.md @@ -1,33 +1,33 @@ -An example of XLSX report for partners on a module called -\`module_name\`: - -A python class : - - from odoo import models - - class PartnerXlsx(models.AbstractModel): - _name = 'report.module_name.report_name' - _inherit = 'report.report_xlsx.abstract' - - def generate_xlsx_report(self, workbook, data, partners): - for obj in partners: - report_name = obj.name - # One sheet by partner - sheet = workbook.add_worksheet(report_name[:31]) - bold = workbook.add_format({'bold': True}) - sheet.write(0, 0, obj.name, bold) - -To manipulate the `workbook` and `sheet` objects, refer to the -[documentation](http://xlsxwriter.readthedocs.org/) of `xlsxwriter`. - -A report XML record : - - +An example of XLSX report for partners on a module called +\`module_name\`: + +A python class : + + from odoo import models + + class PartnerXlsx(models.AbstractModel): + _name = 'report.module_name.report_name' + _inherit = 'report.report_xlsx.abstract' + + def generate_xlsx_report(self, workbook, data, partners): + for obj in partners: + report_name = obj.name + # One sheet by partner + sheet = workbook.add_worksheet(report_name[:31]) + bold = workbook.add_format({'bold': True}) + sheet.write(0, 0, obj.name, bold) + +To manipulate the `workbook` and `sheet` objects, refer to the +[documentation](http://xlsxwriter.readthedocs.org/) of `xlsxwriter`. + +A report XML record : + + diff --git a/report_xlsx/static/description/index.html b/report_xlsx/static/description/index.html index 05cf84080..da5ef5068 100644 --- a/report_xlsx/static/description/index.html +++ b/report_xlsx/static/description/index.html @@ -453,15 +453,16 @@ If you spotted it first, help us to smash it by providing a detailed and welcome

Contributors

diff --git a/report_xlsx/tests/test_report.py b/report_xlsx/tests/test_report.py index ef0457eae..d91383ac1 100644 --- a/report_xlsx/tests/test_report.py +++ b/report_xlsx/tests/test_report.py @@ -71,5 +71,5 @@ class TestReport(common.TransactionCase): ) eur = self.env.ref("base.EUR") self.assertEqual( - self.xlsx_report._report_xlsx_currency_format(eur), "#,##0.00 ???" + self.xlsx_report._report_xlsx_currency_format(eur), "#,##0.00 €" ) diff --git a/requirements.txt b/requirements.txt index 0bed16b5e..c208f5bc3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -# generated from manifests external_dependencies -xlrd -xlsxwriter +# generated from manifests external_dependencies +xlrd +xlsxwriter