[FIX] fixed some problems after initial migration

temp commit updated translation temp commit
OCA · Nov 20, 2023 · 91ca528 · 91ca528
1 parent f458e27
commit 91ca528
Show file tree

Hide file tree

Showing 11 changed files with 217 additions and 289 deletions.
diff --git a/project_scrum/README.rst b/project_scrum/README.rst
@@ -7,7 +7,7 @@ Project Scrum
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:9c08a77621d6e7b23138302d1b5eae72e51481427e58a546176c05a477fcb369
+   !! source digest: sha256:2a262f1415feb1877070cf53f39eeb94cff07afb335111e6bcc248b6db91fe56
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/project_scrum/__manifest__.py b/project_scrum/__manifest__.py
@@ -11,7 +11,7 @@
         "base_setup",
         "project",
         "project_task_code",
-        "project_stage_state",
+        "project_task_stage_state",
         "mail",
         "hr_timesheet",
     ],

diff --git a/project_scrum/i18n/de.po b/project_scrum/i18n/de.po
diff --git a/project_scrum/i18n/project_scrum.pot b/project_scrum/i18n/project_scrum.pot
@@ -4,30 +4,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-11-20 09:35+0000\n"
+"PO-Revision-Date: 2023-11-20 09:35+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: project_scrum
-#: model:mail.template,body_html:project_scrum.email_template_id
-msgid ""
-"  <div style=\"font-family:\n"
-"        'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 16px; color:\n"
-"        rgb(34, 34, 34); background-color: rgb(255, 255, 255); \"> <p>Name: ${object.user_id_meeting}</p>\n"
-"        <p>Date: ${object.datetime_meeting}</p> <br/> <p style=\"color:blue\"><font-size=\"14\">What\n"
-"        did you do since the last meeting?</font></p> ${object.question_yesterday}\n"
-"        <br/><br/> <p style=\"color:blue\"><font-size=\"14\">What do you plan to do till\n"
-"        the next meeting?</font></p> ${object.question_today} <br/><br/> <p style=\"color:blue\"><font-size=\"14\">Are\n"
-"        there anything blocking you?</font></p> ${object.question_blocks} <br/><br/>\n"
-"        </div> \n"
-"        "
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.model.fields,field_description:project_scrum.field_project_project__meeting_count
 msgid "# Meetings"
@@ -49,8 +36,19 @@ msgid "# User Stories"
 msgstr ""
 
 #. module: project_scrum
-#: model:mail.template,subject:project_scrum.email_template_id
-msgid "${object.datetime_meeting or ''}"
+#: model:mail.template,body_html:project_scrum.email_template_id
+msgid ""
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 16px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
+"                    <p>Name: <t t-out=\"object.user_id_meeting\"/></p>\n"
+"                    <p>Date: <t t-out=\"object.datetime_meeting\"/></p> <br/>\n"
+"                    <p style=\"color:blue; font-size:14\"> What did you do since the last meeting?</p>\n"
+"                        <t t-out=\"object.question_yesterday\"/> <br/><br/>\n"
+"                    <p style=\"color:blue; font-size:14\">What do you plan to do till the next meeting?</p>\n"
+"                        <t t-out=\"object.question_today\"/> <br/><br/>\n"
+"                    <p style=\"color:blue; font-size:14\">Are there anything blocking you?</p>\n"
+"                        <t t-out=\"object.question_blocks\"/> <br/><br/>\n"
+"                </div>\n"
+"            "
 msgstr ""
 
 #. module: project_scrum
@@ -288,13 +286,11 @@ msgid "Description Yesterday"
 msgstr ""
 
 #. module: project_scrum
-#: model:ir.model.fields,field_description:project_scrum.field_project_project__display_name
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_actors__display_name
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_meeting__display_name
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_sprint__display_name
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_test__display_name
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_us__display_name
-#: model:ir.model.fields,field_description:project_scrum.field_project_task__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -330,6 +326,11 @@ msgid ""
 "                                                Story"
 msgstr ""
 
+#. module: project_scrum
+#: model:mail.template,name:project_scrum.email_template_id
+msgid "Email Template for Meeting"
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_sprint__date_stop
 msgid "Ending Date"
@@ -361,14 +362,6 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
-#. module: project_scrum
-#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_meeting__message_channel_ids
-#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_sprint__message_channel_ids
-#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_test__message_channel_ids
-#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_us__message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_meeting__message_partner_ids
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_sprint__message_partner_ids
@@ -398,6 +391,14 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_meeting__has_message
+#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_sprint__has_message
+#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_test__has_message
+#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_us__has_message
+msgid "Has Message"
+msgstr ""
+
 #. module: project_scrum
 #: model_terms:ir.actions.act_window,help:project_scrum.act_project_tasks
 msgid "Here, you can create new tasks"
@@ -409,13 +410,11 @@ msgid "How many hours you expect this project needs before it's finished"
 msgstr ""
 
 #. module: project_scrum
-#: model:ir.model.fields,field_description:project_scrum.field_project_project__id
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_actors__id
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_meeting__id
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_sprint__id
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_test__id
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_us__id
-#: model:ir.model.fields,field_description:project_scrum.field_project_task__id
 msgid "ID"
 msgstr ""
 
@@ -449,13 +448,9 @@ msgstr ""
 
 #. module: project_scrum
 #: model:ir.model.fields,help:project_scrum.field_project_scrum_meeting__message_has_error
-#: model:ir.model.fields,help:project_scrum.field_project_scrum_meeting__message_has_sms_error
 #: model:ir.model.fields,help:project_scrum.field_project_scrum_sprint__message_has_error
-#: model:ir.model.fields,help:project_scrum.field_project_scrum_sprint__message_has_sms_error
 #: model:ir.model.fields,help:project_scrum.field_project_scrum_test__message_has_error
-#: model:ir.model.fields,help:project_scrum.field_project_scrum_test__message_has_sms_error
 #: model:ir.model.fields,help:project_scrum.field_project_scrum_us__message_has_error
-#: model:ir.model.fields,help:project_scrum.field_project_scrum_us__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -496,13 +491,11 @@ msgid "Kano"
 msgstr ""
 
 #. module: project_scrum
-#: model:ir.model.fields,field_description:project_scrum.field_project_project____last_update
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_actors____last_update
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_meeting____last_update
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_sprint____last_update
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_test____last_update
 #: model:ir.model.fields,field_description:project_scrum.field_project_scrum_us____last_update
-#: model:ir.model.fields,field_description:project_scrum.field_project_task____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -726,6 +719,11 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
+#. module: project_scrum
+#: model:project.project,name:project_scrum.project_project_1
+msgid "Project Scrum"
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_meeting
 msgid "Project Scrum Daily Meetings"
@@ -746,6 +744,11 @@ msgstr ""
 msgid "Project Scrum User Stories"
 msgstr ""
 
+#. module: project_scrum
+#: model:project.project,name:project_scrum.project_project_2
+msgid "Project Testing Scrum"
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_scrum_project
 #: model_terms:ir.ui.view,arch_db:project_scrum.view_ps_sprint_gantt
@@ -777,14 +780,6 @@ msgstr ""
 msgid "Risk"
 msgstr ""
 
-#. module: project_scrum
-#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_meeting__message_has_sms_error
-#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_sprint__message_has_sms_error
-#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_test__message_has_sms_error
-#: model:ir.model.fields,field_description:project_scrum.field_project_scrum_us__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_scrum_all
 #: model:ir.ui.menu,name:project_scrum.menu_scrum_in_config
@@ -807,7 +802,6 @@ msgstr ""
 #. module: project_scrum
 #: model_terms:ir.ui.view,arch_db:project_scrum.view_ps_meeting_calendar
 #: model_terms:ir.ui.view,arch_db:project_scrum.view_ps_meeting_form
-#: model_terms:ir.ui.view,arch_db:project_scrum.view_ps_meeting_tree
 msgid "Scrum Meeting"
 msgstr ""
 
@@ -835,7 +829,6 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:project_scrum.view_ps_sprint_calendar
 #: model_terms:ir.ui.view,arch_db:project_scrum.view_ps_sprint_form
 #: model_terms:ir.ui.view,arch_db:project_scrum.view_ps_sprint_graph
-#: model_terms:ir.ui.view,arch_db:project_scrum.view_ps_sprint_tree
 msgid "Scrum Sprint"
 msgstr ""
 
@@ -1082,6 +1075,11 @@ msgstr ""
 msgid "Use Scrum"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.model.fields,field_description:project_scrum.field_project_task__user_id
+msgid "User"
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_ps_us_all
 #: model:ir.actions.act_window,name:project_scrum.action_ps_us_current
@@ -1165,3 +1163,8 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:project_scrum.view_ps_sprint_form
 msgid "[TC] Tasks"
 msgstr ""
+
+#. module: project_scrum
+#: model:mail.template,subject:project_scrum.email_template_id
+msgid "{{object.datetime_meeting or ''}}"
+msgstr ""
diff --git a/project_scrum/models/project_task.py b/project_scrum/models/project_task.py
@@ -84,6 +84,7 @@ def _get_kano_field(self):
     risk = fields.Selection("_get_risk_field")
     kano = fields.Selection("_get_kano_field")
     color = fields.Integer(related="project_id.color")
+    user_id = fields.Many2one("res.users", string="User")
 
     @api.depends("sprint_id")
     def _compute_current_sprint(self):

diff --git a/project_scrum/static/description/index.html b/project_scrum/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Project Scrum</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:9c08a77621d6e7b23138302d1b5eae72e51481427e58a546176c05a477fcb369
+!! source digest: sha256:2a262f1415feb1877070cf53f39eeb94cff07afb335111e6bcc248b6db91fe56
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/project-agile/tree/15.0/project_scrum"><img alt="OCA/project-agile" src="https://img.shields.io/badge/github-OCA%2Fproject--agile-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/project-agile-15-0/project-agile-15-0-project_scrum"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/project-agile&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Organize your tasks with the Scrum and Sprint methodology.</p>

diff --git a/project_scrum/tests/test_project_scrum.py b/project_scrum/tests/test_project_scrum.py
@@ -14,7 +14,7 @@ class TestProjectScrum(TransactionCase):
 
     @classmethod
     def setUpClass(cls):
-        super().setUpClass(cls)
+        super().setUpClass()
         cls.project_project_obj = cls.env["project.project"]
         cls.project_scrum_actors_obj = cls.env["project.scrum.actors"]
         cls.project_scrum_meeting_obj = cls.env["project.scrum.meeting"]

diff --git a/project_scrum/views/mail_template.xml b/project_scrum/views/mail_template.xml
@@ -1,37 +1,31 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-    <record id="email_template_id" model="mail.template">
-        <field name="name">Email
-            Template for Meeting
-        </field>
-        <field name="email_from">{{object.user_id_meeting
-        or ''}}
-        </field>
-        <field name="subject">{{object.datetime_meeting or ''}}</field>
-        <field name="model_id" ref="project_scrum.model_project_scrum_meeting" />
-        <field name="auto_delete" eval="True" />
-        <field name="email_to">{{object.user_id_meeting
-        or ''}}
-        </field>
-        <field name="body_html">
-            <div
+        <record id="email_template_id" model="mail.template">
+            <field name="name">Email Template for Meeting</field>
+            <field name="email_from">{{object.user_id_meeting or ''}}</field>
+            <field name="subject">{{object.datetime_meeting or ''}}</field>
+            <field name="model_id" ref="project_scrum.model_project_scrum_meeting" />
+            <field name="auto_delete" eval="True" />
+            <field name="email_to">{{object.user_id_meeting or ''}}</field>
+            <field name="body_html" type="html">
+                <div
                 style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 16px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); "
             >
-                <p>Name: <t t-out="object.user_id_meeting" /></p>
-                <p>Date: <t t-out="object.datetime_meeting" /></p> <br />
-                <p
+                    <p>Name: <t t-out="object.user_id_meeting" /></p>
+                    <p>Date: <t t-out="object.datetime_meeting" /></p> <br />
+                    <p
                     style="color:blue; font-size:14"
                 > What did you do since the last meeting?</p>
-                    <t t-out="object.question_yesterday" /> <br /><br />
-                <p
+                        <t t-out="object.question_yesterday" /> <br /><br />
+                    <p
                     style="color:blue; font-size:14"
                 >What do you plan to do till the next meeting?</p>
-                    <t t-out="object.question_today" /> <br /><br />
-                <p style="color:blue; font-size:14">Are there anything blocking you?</p>
-                    <t t-out="object.question_blocks" /> <br /><br />
-            </div>
-        </field>
-    </record>
-
+                        <t t-out="object.question_today" /> <br /><br />
+                    <p
+                    style="color:blue; font-size:14"
+                >Are there anything blocking you?</p>
+                        <t t-out="object.question_blocks" /> <br /><br />
+                </div>
+            </field>
+        </record>
 </odoo>
diff --git a/project_scrum/views/project_project.xml b/project_scrum/views/project_project.xml
@@ -22,7 +22,7 @@
         <field name="model">project.project</field>
         <field name="inherit_id" ref="project.edit_project" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@name='options_active']" position="inside">
+            <xpath expr="//field[@name='tag_ids']" position="after">
                 <div>
                     <field name="use_scrum" class="oe_inline" />
                     <label for="use_scrum" string="Use Scrum" />
@@ -70,7 +70,7 @@
         <field name="priority">99</field>
         <field name="inherit_id" ref="project.edit_project" />
         <field name="arch" type="xml">
-            <button name="attachment_tree_view" position="before">
+            <button name="%(project.project_share_wizard_action)d" position="before">
                 <button
                     class="oe_inline oe_stat_button"
                     type="action"

diff --git a/project_scrum/views/project_scrum_us.xml b/project_scrum/views/project_scrum_us.xml
@@ -171,7 +171,7 @@
                                 <tree>
                                     <field name="sequence" widget="handle" />
                                     <field name="name" />
-                                    <field name="user_id" />
+<!--                                    <field name="user_id" />-->
                                     <field name="date_deadline" />
                                     <field name="stage_id" />
                                 </tree>

diff --git a/project_scrum/views/project_task.xml b/project_scrum/views/project_task.xml
@@ -8,10 +8,10 @@
         <field name="mode">primary</field>
         <field name="priority">99</field>
         <field name="arch" type="xml">
-            <field name="project_id" position="after">
+            <field name="parent_id" position="after">
                 <field name="sprint_id" />
             </field>
-            <filter name="project" position="after">
+            <filter name="unassigned" position="after">
                 <filter
                     string="Sprint"
                     name="group_by_sprint"