Merge branch 'refs/heads/develop' into feature/auxiliary_files_upload

# Conflicts:
#	sf_dlm_management/views/product_template_management_view.xml

sf_manufacturing/views/mrp_workorder_view.xml

@@ -586,6 +586,12 @@
                    position="after">
                 <field name="duration" string="实际时长"/>
             </xpath>
+            <xpath expr="//page[@name='time_tracking']" position="attributes">
+                <attribute name="groups">
+                    mrp.group_mrp_manager,sf_base.group_sf_mrp_manager,sf_base.group_sf_equipment_user,sf_base.group_sf_order_user
+                </attribute>
+            </xpath>
+
         </field>
     </record>