Merge branch 'himanee-helpdesk' into 'master'

[MODIFIED]sequence change

See merge request flectra-hq/flectra!348

addons/helpdesk_basic/models/res_config_setting.py

@@ -1,4 +1,4 @@
-# Part of flectra. See LICENSE file for full copyright and licensing details.
+# Part of flectra See LICENSE file for full copyright and licensing details.
 
 from flectra import api, fields, models
 
@@ -27,4 +27,4 @@ class ResConfigSettings(models.TransientModel):
         super(ResConfigSettings, self).set_values()
         set_param = self.env['ir.config_parameter'].sudo().set_param
         set_param('helpdesk_basic.use_project', self.use_project)
-        set_param('helpdesk_basic.use_website_form', self.use_website_form)
+        set_param('helpdesk_basic.use_website_form', self.use_website_form)

addons/helpdesk_basic/security/helpdesk_security_view.xml

@@ -18,6 +18,10 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
+    <record model="res.users" id="base.user_admin">
+        <field eval="[(4,ref('helpdesk_basic.helpdesk_group_manager'))]" name="groups_id"/>
+    </record>
+
     <record id="helpdesk_portal_user_rule" model="ir.rule">
         <field name="name">Portal See Own Issues</field>
         <field ref="model_helpdesk_ticket" name="model_id"/>

addons/helpdesk_basic/views/helpdesk_ticket_view.xml

@@ -250,7 +250,7 @@
     </record>
 
     <menuitem name="Helpdesk" id="menu_main_helpdesk" 
-        web_icon="helpdesk_basic,static/description/icon.png" sequence="1"/>
+        web_icon="helpdesk_basic,static/description/icon.png" sequence="60"/>
     <menuitem name="Helpdesk" id="menu_helpdesk" 
         parent="helpdesk_basic.menu_main_helpdesk" sequence="2"/>
     <menuitem name="Tickets" id="sub_menu_helpdesk"

addons/website_helpdesk/views/views.xml

@@ -180,7 +180,7 @@
                         </div>
                         <div>
                             <h4 style="padding-top: 5px;">
-                                <t t-if="display_rating and not rating">
+                                <t t-if="display_rating and not rating and ticket.team_id.is_rating == true">
                                     <button
                                             type="button"
                                             class="btn btn-info"