From 2b795b647c075a35fad1cf247ba46b853787ca61 Mon Sep 17 00:00:00 2001 From: Raimon Esteve Date: Thu, 9 Dec 2021 14:08:17 +0100 Subject: [PATCH] Add default description type #047208 --- activity.py | 6 +++++- locale/ca.po | 4 ++++ locale/es.po | 4 ++++ setup.py | 2 +- view/activity_type_form.xml | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/activity.py b/activity.py index 9a17877..6fbcb19 100644 --- a/activity.py +++ b/activity.py @@ -60,6 +60,7 @@ class ActivityType(sequence_ordered(), DeactivableMixin, ModelSQL, ModelView): name = fields.Char('Name', required=True, translate=True) color = fields.Char('Color', help='HTML color (hexadecimal)') default_duration = fields.TimeDelta('Default Duration') + default_description = fields.Text("Default Description") class ActivityReference(ModelSQL, ModelView): @@ -283,10 +284,13 @@ class Activity(Workflow, ModelSQL, ModelView): return resource.party.id return None - @fields.depends('activity_type', 'duration') + @fields.depends('activity_type', '_parent_activity_type.default_description', + 'duration', 'description') def on_change_activity_type(self): if not self.activity_type: return + if not self.description and self.activity_type.default_description: + self.description = self.activity_type.default_description if not self.duration is None: return self.duration = self.activity_type.default_duration diff --git a/locale/ca.po b/locale/ca.po index db06816..06de242 100644 --- a/locale/ca.po +++ b/locale/ca.po @@ -110,6 +110,10 @@ msgctxt "field:activity.type,color:" msgid "Color" msgstr "Color" +msgctxt "field:activity.type,default_description:" +msgid "Default description" +msgstr "Descripció per defecte" + msgctxt "field:activity.type,default_duration:" msgid "Default Duration" msgstr "Duració per defecte" diff --git a/locale/es.po b/locale/es.po index 17316e2..b063c44 100644 --- a/locale/es.po +++ b/locale/es.po @@ -110,6 +110,10 @@ msgctxt "field:activity.type,color:" msgid "Color" msgstr "Color" +msgctxt "field:activity.type,default_description:" +msgid "Default description" +msgstr "Descripción por defecto" + msgctxt "field:activity.type,default_duration:" msgid "Default Duration" msgstr "Duración por defecto" diff --git a/setup.py b/setup.py index e0568e2..6b28766 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ requires += [get_require_version('trytond_company')] tests_require = [ get_require_version('proteus'), - + ] series = '%s.%s' % (major_version, minor_version) diff --git a/view/activity_type_form.xml b/view/activity_type_form.xml index c717c88..448720c 100644 --- a/view/activity_type_form.xml +++ b/view/activity_type_form.xml @@ -12,4 +12,7 @@ contains the full copyright notices and license terms. -->