Merge PR #1112 into 16.0

Signed-off-by hparfr
OCA · Aug 25, 2023 · 5defc75 · 5defc75
2 parents 7a3e97c + 4d2d461
commit 5defc75
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/fieldservice/readme/CONTRIBUTORS.rst b/fieldservice/readme/CONTRIBUTORS.rst
@@ -14,3 +14,4 @@
 * `Tecnativa <https://www.tecnativa.com>`_:
 
   * Víctor Martínez
+* Nils Coenen <[email protected]>
diff --git a/fieldservice/views/fsm_order.xml b/fieldservice/views/fsm_order.xml
@@ -41,18 +41,19 @@
                     </div>
                     <group>
                         <group>
-                            <field
-                                name="type"
-                                options="{'no_create': True, 'no_open': True}"
-                            />
                             <field
                                 name="template_id"
                                 groups="fieldservice.group_fsm_template"
                             />
+                            <field
+                                name="type"
+                                options="{'no_create': True, 'no_open': True}"
+                            />
                             <field name="priority" widget="priority" />
                             <field
                                 name="tag_ids"
                                 widget="many2many_tags"
+                                groups="fieldservice.group_fsm_tag"
                                 options="{'color_field': 'color', 'no_create_edit': True}"
                             />
                         </group>
@@ -110,6 +111,7 @@
                                         name="category_ids"
                                         widget="many2many_tags"
                                         options="{'color_field': 'color'}"
+                                        groups="fieldservice.group_fsm_category"
                                     />
                                     <field name="request_early" />
                                     <field name="request_late" />
@@ -130,13 +132,15 @@
                                 >
                                     <tree>
                                         <field name="name" />
+                                        <field name="phone" />
+                                        <field name="email" />
                                         <field
                                             name="category_ids"
                                             widget="many2many_tags"
                                             options="{'color_field': 'color'}"
+                                            groups="fieldservice.group_fsm_category"
                                         />
-                                        <field name="phone" />
-                                        <field name="email" />
+                                        <field name="calendar_id" />
                                     </tree>
                                 </field>
                             </group>
@@ -296,6 +300,7 @@
                                     <field
                                         name="tag_ids"
                                         widget="many2many_tags"
+                                        groups="fieldservice.group_fsm_tag"
                                         options="{'color_field': 'color'}"
                                     />
                                 </div>

diff --git a/fieldservice/views/fsm_person.xml b/fieldservice/views/fsm_person.xml
@@ -12,6 +12,7 @@
                     name="category_ids"
                     widget="many2many_tags"
                     options="{'color_field': 'color'}"
+                    groups="fieldservice.group_fsm_category"
                 />
                 <field name="calendar_id" />
             </tree>
@@ -23,7 +24,7 @@
         <field name="arch" type="xml">
             <search string="Search FSM Workers">
                 <field name="name" />
-                <field name="category_ids" />
+                <field name="category_ids" groups="fieldservice.group_fsm_category" />
                 <field name="territory_ids" groups="fieldservice.group_fsm_territory" />
                 <field name="location_ids" />
             </search>
@@ -100,6 +101,7 @@
                                 name="category_ids"
                                 widget="many2many_tags"
                                 options="{'color_field': 'color'}"
+                                groups="fieldservice.group_fsm_category"
                             />
                             <label for="street" string="Address" />
                             <div class="o_address_format">

diff --git a/fieldservice/views/fsm_template.xml b/fieldservice/views/fsm_template.xml
@@ -7,6 +7,14 @@
             <tree>
                 <field name="name" />
                 <field name="duration" />
+                <field name="type_id" />
+                <field
+                    name="category_ids"
+                    widget="many2many_tags"
+                    options="{'color_field': 'color'}"
+                    groups="fieldservice.group_fsm_category"
+                />
+                <field name="team_id" groups="fieldservice.group_fsm_team" />
                 <field name="company_id" groups="base.group_multi_company" />
             </tree>
         </field>