diff --git a/i18n/fr.po b/i18n/fr.po index 75e9447f202cfaf7cd8620b901c8d5149324dd2b..05855d3c73eab8f3481dd5073d98a8aa42596e14 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 51b83c1fb258de81bf6934af6f02650c8589d5a3..33807507d8391cafb7af5c73834cdb4bfaf14eea 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 41bb3274d7050411c1926fc864badb8052f40a3d..bd54435718b39df7fd83bffeb2746b8852c6a2ec 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 aed1d5f1cb27d29d27a54512e3b91be1833794a7..e3e28e08cc5d3255760ba9b5559f0b5d386ed50d 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 92084339ce7a7dd6ccc46f243818c3eb2f6bdca6..4ea5abb83e13fb18b09b45fdb415d26b08d0acbf 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 5988ca1f0a5a764414df95efb0ed03a09bc0d71e..b19926695e55252e978550ffbd29aeea50a08451 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>