# HG changeset patch # User Etienne Ferriere <etienne.ferriere@xcg-consulting.fr> # Date 1682015553 -7200 # Thu Apr 20 20:32:33 2023 +0200 # Branch 13.0 # Node ID 28eb23ba0503ab261801c323df51dd4221340c76 # Parent c39e55586f690871b7e4d96cda28fa238fbe0972 # EXP-Topic TG-536-13.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 @@ -2,6 +2,14 @@ Changelog ========= +13.0.3.5.0 +----------- + +(port from 11.0.2.10.0) + +* The name of a Redner template is no more modified by a Libreoffice template + upload. + 13.0.3.4.0 ---------- diff --git a/__manifest__.py b/__manifest__.py --- a/__manifest__.py +++ b/__manifest__.py @@ -21,7 +21,7 @@ { "name": "Redner", "license": "AGPL-3", - "version": "13.0.3.4.0", + "version": "13.0.3.5.0", "category": "Reporting", "author": "XCG Consulting", "website": "https://odoo.consulting/", 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 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-26 11:18+0000\n" -"PO-Revision-Date: 2023-01-26 12:29+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 #: code:addons/redner/models/redner_template.py:0 @@ -138,7 +138,6 @@ #. module: redner #: model:ir.model.fields.selection,name:redner.selection__redner_template__language__text/html|mustache -#| msgid "mustache" msgid "HTML + mustache" msgstr "HTML + mustache" @@ -232,13 +231,17 @@ 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" #. module: redner #: model:ir.model.fields.selection,name:redner.selection__redner_template__language__text/mjml|mustache -#| msgid "mustache" msgid "MJML + mustache" msgstr "MJML + mustache" diff --git a/models/redner_template.py b/models/redner_template.py --- a/models/redner_template.py +++ b/models/redner_template.py @@ -91,6 +91,8 @@ template_data = fields.Binary("Libreoffice Template") + template_name = fields.Char(string="Libreoffice Template Name") + _redner = None @property diff --git a/views/redner_template.xml b/views/redner_template.xml --- a/views/redner_template.xml +++ b/views/redner_template.xml @@ -77,9 +77,10 @@ <group> <field name="template_data" - filename="name" + filename="template_name" nolabel="1" /> + <field name="template_name" invisible="1" /> </group> </page> <page string="Settings">