diff --git a/agreement_legal/data/agreement_stage.xml b/agreement_legal/data/agreement_stage.xml index cef2b25e6..66e399efb 100644 --- a/agreement_legal/data/agreement_stage.xml +++ b/agreement_legal/data/agreement_stage.xml @@ -4,46 +4,55 @@ New 10 + agreement Draft 20 + agreement Reviewed 30 + agreement Negotiation 40 + agreement Out for Customer Signature 50 + agreement Waiting Internal Signature 60 + agreement Active 70 + agreement Expired 80 + agreement Cancelled 100 True + agreement diff --git a/agreement_legal/i18n/agreement_legal.pot b/agreement_legal/i18n/agreement_legal.pot index f94f02903..fee1fa92f 100644 --- a/agreement_legal/i18n/agreement_legal.pot +++ b/agreement_legal/i18n/agreement_legal.pot @@ -77,6 +77,7 @@ msgid "Advanced Features" msgstr "" #. module: agreement_legal +#: selection:agreement.stage,stage_type:0 #: model:ir.model,name:agreement_legal.model_agreement #: model:ir.model.fields,field_description:agreement_legal.field_agreement_appendix__agreement_id #: model:ir.model.fields,field_description:agreement_legal.field_agreement_clause__agreement_id @@ -930,8 +931,8 @@ msgstr "" #. module: agreement_legal #: code:addons/agreement_legal/models/agreement.py:84 -#: code:addons/agreement_legal/models/agreement.py:364 -#: code:addons/agreement_legal/models/agreement.py:367 +#: code:addons/agreement_legal/models/agreement.py:365 +#: code:addons/agreement_legal/models/agreement.py:368 #, python-format msgid "New" msgstr "" @@ -1338,6 +1339,11 @@ msgstr "" msgid "Sequence" msgstr "" +#. module: agreement_legal +#: selection:agreement.stage,stage_type:0 +msgid "Service Profile" +msgstr "" + #. module: agreement_legal #: model:ir.actions.act_window,name:agreement_legal.action_agreement_config #: model:ir.ui.menu,name:agreement_legal.agreement_settings @@ -1539,7 +1545,7 @@ msgstr "" #. module: agreement_legal #: model:ir.model.fields,help:agreement_legal.field_agreement_stage__fold -msgid "This stage is folded in the kanban view by deafault." +msgid "This stage is folded in the kanban view by default." msgstr "" #. module: agreement_legal @@ -1558,6 +1564,11 @@ msgstr "" msgid "Title:" msgstr "" +#. module: agreement_legal +#: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__stage_type +msgid "Type" +msgstr "" + #. module: agreement_legal #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view msgid "Type Name" diff --git a/agreement_legal/i18n/fr.po b/agreement_legal/i18n/fr.po index 24924ded4..338a40a1f 100644 --- a/agreement_legal/i18n/fr.po +++ b/agreement_legal/i18n/fr.po @@ -81,6 +81,7 @@ msgid "Advanced Features" msgstr "Fonctionnalités avancées" #. module: agreement_legal +#: selection:agreement.stage,stage_type:0 #: model:ir.model,name:agreement_legal.model_agreement #: model:ir.model.fields,field_description:agreement_legal.field_agreement_appendix__agreement_id #: model:ir.model.fields,field_description:agreement_legal.field_agreement_clause__agreement_id @@ -966,8 +967,8 @@ msgstr "Nom :" #. module: agreement_legal #: code:addons/agreement_legal/models/agreement.py:84 -#: code:addons/agreement_legal/models/agreement.py:364 -#: code:addons/agreement_legal/models/agreement.py:367 +#: code:addons/agreement_legal/models/agreement.py:365 +#: code:addons/agreement_legal/models/agreement.py:368 #, python-format msgid "New" msgstr "Nouveau" @@ -1392,6 +1393,11 @@ msgstr "Acheter et vendre dans des unités de mesure différentes" msgid "Sequence" msgstr "Séquence" +#. module: agreement_legal +#: selection:agreement.stage,stage_type:0 +msgid "Service Profile" +msgstr "Profil de service" + #. module: agreement_legal #: model:ir.actions.act_window,name:agreement_legal.action_agreement_config #: model:ir.ui.menu,name:agreement_legal.agreement_settings @@ -1625,7 +1631,9 @@ msgstr "" #. module: agreement_legal #: model:ir.model.fields,help:agreement_legal.field_agreement_stage__fold -msgid "This stage is folded in the kanban view by deafault." +#, fuzzy +#| msgid "This stage is folded in the kanban view by deafault." +msgid "This stage is folded in the kanban view by default." msgstr "Cette étape est repliée dans la vue kanban par défaut." #. module: agreement_legal @@ -1644,6 +1652,13 @@ msgstr "Titre" msgid "Title:" msgstr "Titre :" +#. module: agreement_legal +#: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__stage_type +#, fuzzy +#| msgid "Types" +msgid "Type" +msgstr "Types" + #. module: agreement_legal #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view msgid "Type Name" @@ -1959,9 +1974,6 @@ msgstr "| Créé le :" #~ msgid "Service Order Lines" #~ msgstr "Lignes de commande de service" -#~ msgid "Service Profile" -#~ msgstr "Profil de service" - #~ msgid "Service Profiles" #~ msgstr "Profils de service" diff --git a/agreement_legal/i18n/pt_PT.po b/agreement_legal/i18n/pt_PT.po index 537f62d04..0baed96d7 100644 --- a/agreement_legal/i18n/pt_PT.po +++ b/agreement_legal/i18n/pt_PT.po @@ -80,6 +80,7 @@ msgid "Advanced Features" msgstr "Propriedades avançadas" #. module: agreement_legal +#: selection:agreement.stage,stage_type:0 #: model:ir.model,name:agreement_legal.model_agreement #: model:ir.model.fields,field_description:agreement_legal.field_agreement_appendix__agreement_id #: model:ir.model.fields,field_description:agreement_legal.field_agreement_clause__agreement_id @@ -945,8 +946,8 @@ msgstr "" #. module: agreement_legal #: code:addons/agreement_legal/models/agreement.py:84 -#: code:addons/agreement_legal/models/agreement.py:364 -#: code:addons/agreement_legal/models/agreement.py:367 +#: code:addons/agreement_legal/models/agreement.py:365 +#: code:addons/agreement_legal/models/agreement.py:368 #, python-format msgid "New" msgstr "" @@ -1356,6 +1357,11 @@ msgstr "" msgid "Sequence" msgstr "" +#. module: agreement_legal +#: selection:agreement.stage,stage_type:0 +msgid "Service Profile" +msgstr "" + #. module: agreement_legal #: model:ir.actions.act_window,name:agreement_legal.action_agreement_config #: model:ir.ui.menu,name:agreement_legal.agreement_settings @@ -1570,7 +1576,7 @@ msgstr "" #. module: agreement_legal #: model:ir.model.fields,help:agreement_legal.field_agreement_stage__fold -msgid "This stage is folded in the kanban view by deafault." +msgid "This stage is folded in the kanban view by default." msgstr "" #. module: agreement_legal @@ -1589,6 +1595,11 @@ msgstr "" msgid "Title:" msgstr "" +#. module: agreement_legal +#: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__stage_type +msgid "Type" +msgstr "" + #. module: agreement_legal #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view msgid "Type Name" diff --git a/agreement_legal/models/agreement.py b/agreement_legal/models/agreement.py index 21bb7c554..29bcbccd7 100644 --- a/agreement_legal/models/agreement.py +++ b/agreement_legal/models/agreement.py @@ -309,7 +309,8 @@ class Agreement(models.Model): # Used for Kanban grouped_by view @api.model def _read_group_stage_ids(self, stages, domain, order): - stage_ids = self.env["agreement.stage"].search([]) + stage_ids = self.env["agreement.stage"].search( + [('stage_type', '=', 'agreement')]) return stage_ids stage_id = fields.Many2one( diff --git a/agreement_legal/models/agreement_stage.py b/agreement_legal/models/agreement_stage.py index 05cbb459e..2c42106f2 100644 --- a/agreement_legal/models/agreement_stage.py +++ b/agreement_legal/models/agreement_stage.py @@ -24,5 +24,8 @@ class AgreementStage(models.Model): fold = fields.Boolean( string="Is Folded", required=False, - help="This stage is folded in the kanban view by deafault.", + help="This stage is folded in the kanban view by default.", ) + stage_type = fields.Selection( + [('agreement', 'Agreement')], + string='Type', required=True) diff --git a/agreement_legal/views/agreement.xml b/agreement_legal/views/agreement.xml index 727749952..f339d1aa9 100644 --- a/agreement_legal/views/agreement.xml +++ b/agreement_legal/views/agreement.xml @@ -36,7 +36,7 @@
diff --git a/agreement_legal/views/agreement_stages.xml b/agreement_legal/views/agreement_stages.xml index fdb413800..30168d2ef 100644 --- a/agreement_legal/views/agreement_stages.xml +++ b/agreement_legal/views/agreement_stages.xml @@ -9,6 +9,7 @@ + @@ -26,6 +27,7 @@
+