From 84a851ea057b0e7f027dbe52cb1c46b86a9ba647 Mon Sep 17 00:00:00 2001 From: Yves Goldberg Date: Tue, 2 Apr 2019 18:42:13 +0200 Subject: [PATCH] [UPD] remove field reference and use field code Translated using Weblate (French) Currently translated at 100.0% (301 of 301 strings) Translation: contract-12.0/contract-12.0-agreement_legal Translate-URL: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-agreement_legal/fr/ [UPD] Update agreement_legal.pot --- agreement_legal/i18n/agreement_legal.pot | 10 ++++----- agreement_legal/i18n/fr.po | 26 ++++++++++++------------ agreement_legal/models/agreement.py | 17 ++++------------ agreement_legal/views/agreement.xml | 3 +-- 4 files changed, 23 insertions(+), 33 deletions(-) diff --git a/agreement_legal/i18n/agreement_legal.pot b/agreement_legal/i18n/agreement_legal.pot index 83d5dfd3d..cd6c8a010 100644 --- a/agreement_legal/i18n/agreement_legal.pot +++ b/agreement_legal/i18n/agreement_legal.pot @@ -581,7 +581,7 @@ msgid "ID" msgstr "" #. module: agreement_legal -#: model:ir.model.fields,help:agreement_legal.field_agreement__reference +#: model:ir.model.fields,help:agreement_legal.field_agreement__code msgid "ID used for internal contract tracking." msgstr "" @@ -825,9 +825,9 @@ msgid "Name:" msgstr "" #. module: agreement_legal -#: code:addons/agreement_legal/models/agreement.py:103 -#: code:addons/agreement_legal/models/agreement.py:398 -#: code:addons/agreement_legal/models/agreement.py:401 +#: code:addons/agreement_legal/models/agreement.py:102 +#: code:addons/agreement_legal/models/agreement.py:399 +#: code:addons/agreement_legal/models/agreement.py:402 #, python-format msgid "New" msgstr "" @@ -1022,7 +1022,7 @@ msgid "Record's Colour" msgstr "" #. module: agreement_legal -#: model:ir.model.fields,field_description:agreement_legal.field_agreement__reference +#: model:ir.model.fields,field_description:agreement_legal.field_agreement__code msgid "Reference" msgstr "" diff --git a/agreement_legal/i18n/fr.po b/agreement_legal/i18n/fr.po index 47c00033f..75a426bf2 100644 --- a/agreement_legal/i18n/fr.po +++ b/agreement_legal/i18n/fr.po @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-03-24 16:40+0000\n" -"PO-Revision-Date: 2019-03-24 18:18+0100\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2019-04-04 10:14+0000\n" +"Last-Translator: Yves Goldberg \n" "Language-Team: \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: \n" -"Language: fr\n" -"X-Generator: Poedit 1.8.6\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.5.1\n" #. module: agreement_legal #: model:ir.model.fields,field_description:agreement_legal.field_agreement__message_needaction @@ -386,7 +386,7 @@ msgstr "Valeur du contrat" #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_clause_form_view #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_section_form_view msgid "Copy and paste the placeholder expression in the content" -msgstr "Copiez et collez l'expression dans le contenu." +msgstr "Copiez et collez l'expression dans le contenu" #. module: agreement_legal #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view @@ -757,7 +757,7 @@ msgstr "Est un abonné" #. module: agreement_legal #: model:ir.model.fields,field_description:agreement_legal.field_agreement__is_template msgid "Is a Template?" -msgstr "Est un modèle?" +msgstr "Modèle ?" #. module: agreement_legal #: model:ir.model.fields,field_description:agreement_legal.field_agreement____last_update @@ -1097,7 +1097,7 @@ msgstr "Performance" #. module: agreement_legal #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view msgid "Perhaps include invoices with total vs costs?" -msgstr "Peut-être inclure le total des factures vs coûts?" +msgstr "Peut-être inclure le total des factures vs coûts ?" #. module: agreement_legal #: model:ir.model.fields,field_description:agreement_legal.field_agreement__company_contact_phone @@ -1631,7 +1631,7 @@ msgstr "Titre" #. module: agreement_legal #: model_terms:ir.ui.view,arch_db:agreement_legal.report_agreement_document msgid "Title:" -msgstr "Titre:" +msgstr "Titre :" #. module: agreement_legal #: model:ir.model.fields,help:agreement_legal.field_agreement__total_company_mrc @@ -1701,7 +1701,7 @@ msgstr "Version" #. module: agreement_legal #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view msgid "Version:" -msgstr "Version:" +msgstr "Version :" #. module: agreement_legal #: model:ir.model.fields,field_description:agreement_legal.field_agreement__website_message_ids @@ -1749,7 +1749,7 @@ msgstr "Quand l'accord se termine." #. module: agreement_legal #: model:ir.model.fields,help:agreement_legal.field_agreement__start_date msgid "When the agreement starts." -msgstr "Quand l'accord commence" +msgstr "Quand l'accord commence." #. module: agreement_legal #: model:ir.model,name:agreement_legal.model_agreement @@ -1792,9 +1792,9 @@ msgstr "utilisateur et image" #. module: agreement_legal #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view msgid "| Created By:" -msgstr "| Créé par:" +msgstr "| Créé par :" #. module: agreement_legal #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view msgid "| Created On:" -msgstr "| Créé le:" +msgstr "| Créé le :" diff --git a/agreement_legal/models/agreement.py b/agreement_legal/models/agreement.py index 1784ea744..32147ddb8 100644 --- a/agreement_legal/models/agreement.py +++ b/agreement_legal/models/agreement.py @@ -96,18 +96,14 @@ class Agreement(models.Model): string="Dynamic Special Terms", help="Compute dynamic special terms", ) - reference = fields.Char( + code = fields.Char( string="Reference", - copy=False, required=True, default=lambda self: _("New"), track_visibility="onchange", + copy=False, help="ID used for internal contract tracking.", ) - code = fields.Char( - required=True, - default=lambda self: _("New"), - copy=False) increase_type_id = fields.Many2one( "agreement.increasetype", string="Increase Type", @@ -372,13 +368,11 @@ class Agreement(models.Model): "name": "{} - OLD VERSION".format(rec.name), "active": False, "parent_agreement_id": rec.id, - "code": "{} - OLD VERSION".format(rec.code), } # Make a current copy and mark it as old rec.copy(default=default_vals) # Increment the Version rec.version = rec.version + 1 - rec.code = rec.code + "v" + str(rec.version) # Reset revision to 0 since it's a new version vals["revision"] = 0 return super(Agreement, self).write(vals) @@ -386,7 +380,6 @@ class Agreement(models.Model): def create_new_agreement(self): default_vals = { "name": "NEW", - "code": "NEW", "active": True, "version": 1, "revision": 0, @@ -403,12 +396,10 @@ class Agreement(models.Model): @api.model def create(self, vals): - if vals.get("reference", _("New")) == _("New"): - vals["reference"] = self.env["ir.sequence"].next_by_code( + if vals.get("code", _("New")) == _("New"): + vals["code"] = self.env["ir.sequence"].next_by_code( "agreement" ) or _("New") - if vals.get("code", _("New")) == _("New"): - vals["code"] = vals["reference"] return super(Agreement, self).create(vals) # Increments the revision on each save action diff --git a/agreement_legal/views/agreement.xml b/agreement_legal/views/agreement.xml index 868308484..e9d561293 100644 --- a/agreement_legal/views/agreement.xml +++ b/agreement_legal/views/agreement.xml @@ -40,8 +40,7 @@ - - +