# HG changeset patch # User Etienne Ferriere <etienne.ferriere@xcg-consulting.fr> # Date 1682015553 -7200 # Thu Apr 20 20:32:33 2023 +0200 # Branch 16.0 # Node ID 8a61de5af78034341024e8b1f2b777602b246c9c # Parent 74aba83aca980aa6ad9d80f119e1bafdc2e99b88 # EXP-Topic TG-536-16.0 The name of a Redner template is no more modified by a Libreoffice template upload. diff --git a/NEWS.rst b/NEWS.rst --- a/NEWS.rst +++ b/NEWS.rst @@ -7,6 +7,11 @@ Use pypdf (3+) if present, otherwise defaults to PyPDF2. +(port from 11.0.2.10.0) + +* The name of a Redner template is no more modified by a Libreoffice template + upload. + 16.0.1.0.3 ---------- diff --git a/i18n/fr.po b/i18n/fr.po --- a/i18n/fr.po +++ b/i18n/fr.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-03 16:15+0000\n" -"PO-Revision-Date: 2023-02-03 17: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" -"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 #. odoo-python @@ -237,6 +237,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 --- a/models/redner_template.py +++ b/models/redner_template.py @@ -95,6 +95,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 --- a/views/redner_template.xml +++ b/views/redner_template.xml @@ -81,9 +81,10 @@ <group> <field name="template_data" - filename="name" + filename="template_name" nolabel="1" /> + <field name="template_name" invisible="1" /> </group> </page> <page string="Settings">