[ADD]added changes into helpdesk modules and remove to comment code in master branch

addons/helpdesk_basic/controller/main.py

@@ -120,7 +120,6 @@ class Rating(http.Controller):
             3: _("not satisfied"),
             1: _("highly dissatisfied")
         }
-        # rating.write({'rating': rate, 'consumed': True})
         lang = rating.partner_id.lang or get_lang(request.env).code
         return request.env['ir.ui.view'].with_context(lang=lang)._render_template('helpdesk_basic.rating_external_page_submit', {
             'token': token,

addons/helpdesk_basic/report/helpdesk_report.py

@@ -25,25 +25,24 @@ class HelpdeskReport(models.Model):
     priority = fields.Selection([('low', 'Low'), ('medium', 'Medium'),
                                  ('high', 'High')])
 
-    # @api.model_cr
     def init(self):
         tools.drop_view_if_exists(self._cr, 'helpdesk_report')
         self._cr.execute("""
-                   CREATE VIEW helpdesk_report as (
-                   SELECT
-                       t.id as id,
-                       h.ticket_seq as ticket_seq,
-                       t.name as name,
-                       h.partner_id as partner_id,
-                       h.user_id as user_id,
-                       h.issue_type_id as issue_type_id,
-                       h.team_id as team_id,
-                       h.start_date as start_date,
-                       h.end_date as end_date,
-                       h.stage_id as stage_id,
-                       h.help_description as description,
-                       h.priority as priority
-                   FROM helpdesk_team t
-                   INNER JOIN helpdesk_ticket h
-                   ON (h.team_id = t.id and h.active = True))
-                """)
+                CREATE VIEW helpdesk_report as (
+                SELECT
+                    t.id as id,
+                    h.ticket_seq as ticket_seq,
+                    t.name as name,
+                    h.partner_id as partner_id,
+                    h.user_id as user_id,
+                    h.issue_type_id as issue_type_id,
+                    h.team_id as team_id,
+                    h.start_date as start_date,
+                    h.end_date as end_date,
+                    h.stage_id as stage_id,
+                    h.help_description as description,
+                    h.priority as priority
+                FROM helpdesk_team t
+                INNER JOIN helpdesk_ticket h
+                ON (h.team_id = t.id and h.active = True))
+            """)

addons/helpdesk_basic/report/helpdesk_report_view.xml

@@ -23,66 +23,11 @@
         </field>
     </record>
 
-    <!-- <record id="report_helpdesk_view_search" model="ir.ui.view">
-        <field name="name">report.helpdesk.search</field>
-        <field name="model">helpdesk.report</field>
-        <field name="arch" type="xml">
-            <search string="Helpdesk Analysis">
-                <filter string="My Issues" name="my_issues"
-                        domain="[('assigned_to_id', '=', uid)]"/>
-                <separator/>
-                <field name="start_date"/>
-                <field name="end_date"/>
-                <filter string="This Year" name="thisyear"
-                        domain="['|', ('start_date', '=', False), '&amp;',
-                        ('start_date','&lt;=', time.strftime('%%Y-12-31')),
-                        ('start_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Journal invoices with period in current year"/>
-                <separator/>
-                <filter string="Draft" domain="[('stage_id','=','draft')]"
-                        help="Draft Issues" name="draft"/>
-                <filter string="New" domain="[('stage_id','=','new')]"
-                        help="New" name="new"/>
-                <filter string="In Progress" name="in_progress"
-                        domain="[('stage_id','=', 'in_progress')]"/>
-                <filter string="Done" name="done"
-                        domain="[('stage_id','=', 'done')]"/>
-                <filter string="Cancel" name="cancel"
-                        domain="[('stage_id','=', 'cancel')]"/>
-                <separator/>
-                <filter string="This Month" name="this_month"
-                        domain="[('start_date', '&gt;=', context_today().strftime('%%Y-%%m-01'))]"/>
-                <filter string="Last Month" name="last_month"
-                        domain="['&amp;',
-                        ('start_date', '&gt;=', (context_today() - relativedelta(months=1)).strftime('%%Y-%%m-01')),
-                         ('start_date', '&lt;', context_today().strftime('%%Y-%%m-01'))]"/>
-                <separator/>
-                <field name="partner_id" operator="child_of"/>
-                <field name="assigned_to_id"/>
-                <group expand="1" string="Group By">
-                    <filter string="Helpdesk Team" name="team_id"
-                            context="{'group_by':'team_id'}"/>
-                    <filter string="Partner" name="partner_id"
-                            context="{'group_by':'partner_id','residual_visible':True}"/>
-                    <filter string="Assiged To" name='assigned_to_id'
-                            context="{'group_by':'assigned_to_id'}"/>
-                    <filter string="Status" context="{'group_by':'stage_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Start Date"
-                            context="{'group_by':'start_date'}"/>
-                    <filter string="End Date"
-                            context="{'group_by':'end_date'}"/>
-                </group>
-            </search>
-        </field>
-    </record> -->
-
     <record id="action_helpdesk_report" model="ir.actions.act_window">
         <field name="name">Helpdesk Analysis</field>
         <field name="res_model">helpdesk.report</field>
         <field name="view_mode">graph,pivot</field>
         <field name="view_id" ref="view_helpdesk_report_graph"/>
-        <!-- <field name="search_view_id" ref="report_helpdesk_view_search"/> -->
         <field name="context">{'search_default_team_id': 1,
             'search_default_current_year': 1}
         </field>

addons/helpdesk_basic/views/helpdesk_team_view.xml

@@ -127,7 +127,6 @@
                 <div class="oe_chatter">
                     <field name="message_follower_ids"
                            widget="mail_followers"/>
-                    <!-- <field name="activity_ids" widget="mail_activity"/> -->
                     <field name="message_ids" widget="mail_thread"
                            options="{'post_refresh': 'recipients'}"/>
                 </div>

addons/helpdesk_basic/views/helpdesk_ticket_view.xml

@@ -94,7 +94,6 @@
                 <field name="user_id" string="Created By"/>
                 <field name="issue_type_id" string="Issue Type"/>
                 <field name="partner_id" string="Related Partner"/>
-                <!-- <field name="assigned_to_id" string="Assigned To"/> -->
                 <field name="stage_id" string="Status"/>
                 <filter string="Archived" name="archieved" domain="[('active','=',False)]"/>
                 <group expand="0" string="Group By...">
@@ -151,7 +150,6 @@
                 <field name="id"/>
                 <field name="issue_name"/>
                 <field name="team_id"/>
-                <!-- <field name="assigned_to_id"/> -->
                 <field name="user_id"/>
                 <field name="partner_id"/>
                 <field name="color"/>

addons/website_helpdesk/static/description/index.html

@@ -32,7 +32,7 @@
         </div>
         <div class="col-md-6">
             <p class="text-justify" style="font-size: 15px;">
-                Website helpdesk form to create an issue ticket.
+                Click on the Helpdesk Menu.Website helpdesk form to create an issue ticket.
             </p>
         </div>
         <div class="col-md-6">