diff --git a/NEWS.rst b/NEWS.rst index 585462a3c3e813689a33492e1c069b6d2e138d32_TkVXUy5yc3Q=..c89988d067367765e30cf01296b6cb4d88a66e1b_TkVXUy5yc3Q= 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -2,6 +2,14 @@ Changelog ========= +15.0.1.1.0 +---------- + +(port from 11.0.2.10.0) + +* The name of a Redner template is no more modified by a Libreoffice template + upload. + 15.0.1.0.1 ---------- diff --git a/__manifest__.py b/__manifest__.py index 585462a3c3e813689a33492e1c069b6d2e138d32_X19tYW5pZmVzdF9fLnB5..c89988d067367765e30cf01296b6cb4d88a66e1b_X19tYW5pZmVzdF9fLnB5 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -21,7 +21,7 @@ { "name": "Redner", "license": "AGPL-3", - "version": "15.0.1.0.1", + "version": "15.0.1.1.0", "category": "Reporting", "author": "XCG Consulting", "website": "https://orbeet.io/", diff --git a/i18n/fr.po b/i18n/fr.po index 585462a3c3e813689a33492e1c069b6d2e138d32_aTE4bi9mci5wbw==..c89988d067367765e30cf01296b6cb4d88a66e1b_aTE4bi9mci5wbw== 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -6,11 +6,11 @@ msgstr "" "Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-01 13:13+0000\n" -"PO-Revision-Date: 2023-02-01 14:15+0100\n" +"POT-Creation-Date: 2023-04-20 18:55+0000\n" +"PO-Revision-Date: 2023-04-20 20:56+0200\n" "Last-Translator: Houzéfa Abbasbhay <houzefa.abba@xcg-consulting.fr>\n" "Language-Team: XCG Consulting\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -11,11 +11,11 @@ "Last-Translator: Houzéfa Abbasbhay <houzefa.abba@xcg-consulting.fr>\n" "Language-Team: XCG Consulting\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 2.0.6\n" +"Plural-Forms: \n" +"X-Generator: Poedit 3.0.1\n" #. module: redner #: code:addons/redner/models/redner_template.py:0 @@ -231,6 +231,11 @@ msgstr "Modèle LibreOffice" #. module: redner +#: model:ir.model.fields,field_description:redner.field_redner_template__template_name +msgid "Libreoffice Template Name" +msgstr "Nom du modèle LibreOffice" + +#. module: redner #: model:ir.model.fields,field_description:redner.field_redner_template__locale_id msgid "Locale" msgstr "Localisation" diff --git a/models/redner_template.py b/models/redner_template.py index 585462a3c3e813689a33492e1c069b6d2e138d32_bW9kZWxzL3JlZG5lcl90ZW1wbGF0ZS5weQ==..c89988d067367765e30cf01296b6cb4d88a66e1b_bW9kZWxzL3JlZG5lcl90ZW1wbGF0ZS5weQ== 100644 --- a/models/redner_template.py +++ b/models/redner_template.py @@ -92,6 +92,8 @@ template_data = fields.Binary("Libreoffice Template") + template_name = fields.Char(string="Libreoffice Template Name") + @property def redner(self): """Try to avoid Redner instance to be over created""" diff --git a/views/redner_template.xml b/views/redner_template.xml index 585462a3c3e813689a33492e1c069b6d2e138d32_dmlld3MvcmVkbmVyX3RlbXBsYXRlLnhtbA==..c89988d067367765e30cf01296b6cb4d88a66e1b_dmlld3MvcmVkbmVyX3RlbXBsYXRlLnhtbA== 100644 --- a/views/redner_template.xml +++ b/views/redner_template.xml @@ -77,6 +77,6 @@ <group> <field name="template_data" - filename="name" + filename="template_name" nolabel="1" /> @@ -81,5 +81,6 @@ nolabel="1" /> + <field name="template_name" invisible="1" /> </group> </page> <page string="Settings">