From b2fcf7733256811891f7250953227611771fd76f Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@le-filament.com>
Date: Fri, 20 Mar 2020 19:14:15 +0100
Subject: [PATCH] =?UTF-8?q?[cgscop=20#151]=20orthographe=20:=20renommage?=
=?UTF-8?q?=20d=C3=A9c=C3=A8s=20et=201=C3=A8re=20signature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
i18n/fr.po | 12 ++++++------
models/res_partner.py | 2 +-
models/scop_period.py | 2 +-
views/res_partner.xml | 2 +-
wizard/scop_deces_wizard.py | 4 ++--
wizard/scop_deces_wizard.xml | 6 +++---
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/i18n/fr.po b/i18n/fr.po
index 75e9447..05855d3 100644
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -742,7 +742,7 @@ msgstr ""
#. module: cgscop_partner
#: model:ir.model.fields,field_description:cgscop_partner.field_res_partner__date_1st_sign
#: model:ir.model.fields,field_description:cgscop_partner.field_res_users__date_1st_sign
-msgid "Date 1er signature coop"
+msgid "Date 1ère signature coop"
msgstr ""
#. module: cgscop_partner
@@ -970,22 +970,22 @@ msgstr ""
#. module: cgscop_partner
#: model:ir.model,name:cgscop_partner.model_scop_deces_wizard
#: model_terms:ir.ui.view,arch_db:cgscop_partner.scop_deces_wizard_view_form
-msgid "Décés"
+msgid "Décès"
msgstr ""
#. module: cgscop_partner
#: model_terms:ir.ui.view,arch_db:cgscop_partner.scop_deces_wizard_view_form
-msgid "Décés / Mise en sommeil"
+msgid "Décès / Mise en sommeil"
msgstr ""
#. module: cgscop_partner
#: model:ir.actions.act_window,name:cgscop_partner.scop_deces_wizard_create_action
-msgid "Décés période"
+msgid "Décès période"
msgstr ""
#. module: cgscop_partner
#: model_terms:ir.ui.view,arch_db:cgscop_partner.view_partner_cooperative_form
-msgid "Décés/Mise en sommeil"
+msgid "Décès/Mise en sommeil"
msgstr ""
#. module: cgscop_partner
@@ -1687,7 +1687,7 @@ msgstr ""
#. module: cgscop_partner
#: model:ir.model.fields,field_description:cgscop_partner.field_scop_deces_wizard__dissolution_reason_id
#: model:ir.model.fields,field_description:cgscop_partner.field_scop_period__dissolution_reason_id
-msgid "Motif Décés"
+msgid "Motif Décès"
msgstr ""
#. module: cgscop_partner
diff --git a/models/res_partner.py b/models/res_partner.py
index 51b83c1..3380750 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -147,7 +147,7 @@ class ScopPartner(models.Model):
domain=[('child_ids', '=', False)],
on_delete='restrict', track_visibility='onchange')
date_1st_sign = fields.Date(
- 'Date 1er signature coop',
+ 'Date 1ère signature coop',
track_visibility='onchange')
registration_date = fields.Date(
string="Date d'immatriculation RCS",
diff --git a/models/scop_period.py b/models/scop_period.py
index 41bb327..bd54435 100644
--- a/models/scop_period.py
+++ b/models/scop_period.py
@@ -61,7 +61,7 @@ class ScopPeriod(models.Model):
cae = fields.Boolean("CAE")
dissolution_reason_id = fields.Many2one(
'res.partner.dissolution.reason',
- string="Motif Décés",
+ string="Motif Décès",
on_delete='restrict',
track_visibility='onchange')
diff --git a/views/res_partner.xml b/views/res_partner.xml
index aed1d5f..e3e28e0 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -239,7 +239,7 @@
<header attrs="{'invisible': [('is_cooperative', '=', False)]}">
<button string="Nouvelle période" type="action" name="%(cgscop_partner.scop_period_wizard_create_action)d" class="oe_highlight" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}" groups="cgscop_partner.group_add_period"/>
<button string="Nouvelle période d'adhésion" type="action" name="%(cgscop_partner.scop_membership_period_wizard_create_action)d" class="oe_highlight" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}" groups="cgscop_partner.group_add_period"/>
- <button string="Décés/Mise en sommeil" type="action" name="%(cgscop_partner.scop_deces_wizard_create_action)d" attrs="{'invisible': ['|', ('dissolution_reason_id', '!=', False), '|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}" groups="cgscop_partner.group_add_period"/>
+ <button string="Décès/Mise en sommeil" type="action" name="%(cgscop_partner.scop_deces_wizard_create_action)d" attrs="{'invisible': ['|', ('dissolution_reason_id', '!=', False), '|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}" groups="cgscop_partner.group_add_period"/>
<button string="Radiation" type="action" name="%(cgscop_partner.scop_membership_out_wizard_create_action)d" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}" groups="cgscop_partner.group_add_period"/>
<button string="Envoyer Dossier CG" type="object" name="scop_send_to_cg" class="btn-primary" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '4_adhesion')]}"/>
<button string="Dossier créé CG" type="object" name="scop_valid_cg" class="btn-primary" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '5_cg')]}" groups="cgscop_partner.group_add_period"/>
diff --git a/wizard/scop_deces_wizard.py b/wizard/scop_deces_wizard.py
index 9208433..4ea5abb 100644
--- a/wizard/scop_deces_wizard.py
+++ b/wizard/scop_deces_wizard.py
@@ -7,7 +7,7 @@ from odoo.exceptions import ValidationError
class ScopDecesWizard(models.TransientModel):
_name = 'scop.deces.wizard'
- _description = "Décés"
+ _description = "Décès"
# Default functions
@api.model
@@ -30,7 +30,7 @@ class ScopDecesWizard(models.TransientModel):
'Fin de validité', required=True, default=fields.Date.today())
dissolution_reason_id = fields.Many2one(
'res.partner.dissolution.reason',
- string="Motif Décés",
+ string="Motif Décès",
on_delete='restrict',
required=True)
comments = fields.Text('Commentaires')
diff --git a/wizard/scop_deces_wizard.xml b/wizard/scop_deces_wizard.xml
index 5988ca1..b199266 100644
--- a/wizard/scop_deces_wizard.xml
+++ b/wizard/scop_deces_wizard.xml
@@ -5,8 +5,8 @@
<field name="name">scop.deces.wizard.form</field>
<field name="model">scop.deces.wizard</field>
<field name="arch" type="xml">
- <form string="Décés">
- <group name="period" string="Décés / Mise en sommeil">
+ <form string="Décès">
+ <group name="period" string="Décès / Mise en sommeil">
<field name="end"/>
<field name="dissolution_reason_id" options="{'no_open': True, 'no_create': True}"/>
<field name="comments"/>
@@ -20,7 +20,7 @@
</record>
<record id="scop_deces_wizard_create_action" model="ir.actions.act_window">
- <field name="name">Décés période</field>
+ <field name="name">Décès période</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">scop.deces.wizard</field>
<field name="view_mode">form</field>
--
GitLab