From f7d94dfa6bdc4f7bad065cc16d9f0a5845ef067e Mon Sep 17 00:00:00 2001
From: AjmalCybro <ajmal@cybrosys.in>
Date: Thu, 7 Dec 2023 10:01:11 +0530
Subject: [PATCH] Dec 7 : [FIX] Bug Fixed 'odoo_website_helpdesk'

---
 odoo_website_helpdesk/__manifest__.py         | 13 ++++----
 .../controller/helpdesk_website.py            |  1 -
 .../data/ticket_stage_data.xml                | 31 +++++++------------
 odoo_website_helpdesk/doc/RELEASE_NOTES.md    |  6 +++-
 odoo_website_helpdesk/models/res_config.py    | 13 ++++----
 5 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/odoo_website_helpdesk/__manifest__.py b/odoo_website_helpdesk/__manifest__.py
index 429d4951e..bd8653a85 100644
--- a/odoo_website_helpdesk/__manifest__.py
+++ b/odoo_website_helpdesk/__manifest__.py
@@ -30,10 +30,16 @@
     'company': 'Cybrosys Techno Solutions',
     'maintainer': 'Cybrosys Techno Solutions',
     'category': 'Website',
-    'depends': ['base', 'website', 'project', 'sale_project', 'hr_timesheet','mail','contacts'],
+    'depends': ['base', 'website', 'project', 'sale_project', 'hr_timesheet',
+                'mail', 'contacts'],
     'data': [
         'security/security_groups.xml',
         'security/ir.model.access.csv',
+        'data/ticket_sequence.xml',
+        'data/ticket_stage_data.xml',
+        'data/ticket_type.xml',
+        'data/ticket_auto_close.xml',
+        'data/rating_template.xml',
         'views/team.xml',
         'views/portal_search.xml',
         'views/res_config_settings.xml',
@@ -46,11 +52,6 @@
         'views/rating_form.xml',
         'views/merge_tickets_views.xml',
         'templates/helpdesk_replay_template.xml',
-        'data/ticket_sequence.xml',
-        'data/ticket_stage_data.xml',
-        'data/ticket_type.xml',
-        'data/ticket_auto_close.xml',
-        'data/rating_template.xml',
         'report/helpdesk_ticket_report_template.xml',
     ],
     'assets': {
diff --git a/odoo_website_helpdesk/controller/helpdesk_website.py b/odoo_website_helpdesk/controller/helpdesk_website.py
index c04cee34d..cc37a211b 100644
--- a/odoo_website_helpdesk/controller/helpdesk_website.py
+++ b/odoo_website_helpdesk/controller/helpdesk_website.py
@@ -25,7 +25,6 @@ class HelpDeskDashboard(http.Controller):
         new_id_ls = []
         for data in new_id:
             new_id_ls.append(data.id)
-
         in_progress = request.env["help.ticket"].search_count([('stage_id', '=', stage_inprogress)])
         in_progress_id = request.env["help.ticket"].search([('stage_id', '=', stage_inprogress)])
         in_progress_ls = []
diff --git a/odoo_website_helpdesk/data/ticket_stage_data.xml b/odoo_website_helpdesk/data/ticket_stage_data.xml
index ffc9024d8..2f0674c84 100644
--- a/odoo_website_helpdesk/data/ticket_stage_data.xml
+++ b/odoo_website_helpdesk/data/ticket_stage_data.xml
@@ -5,34 +5,27 @@
         <field name="sequence">10</field>
         <field name="name">Inbox</field>
     </record>
-
     <record id="stage_draft" model="ticket.stage">
         <field name="sequence">15</field>
         <field name="name">Draft</field>
     </record>
-
-    <record id="ticket_stage_03" model="ticket.stage">
+    <record id="stage_done" model="ticket.stage">
+        <field name="sequence">25</field>
+        <field name="name">Done</field>
+    </record>
+    <record id="stage_in_progress" model="ticket.stage">
         <field name="sequence">20</field>
         <field name="starting_stage" eval="True"/>
         <field name="name">In Progress</field>
     </record>
-
-    <record id="ticket_stage_04" model="ticket.stage">
-        <field name="sequence">25</field>
-        <field name="name">Done</field>
-        <field name="folded" eval="True"/>
-    </record>
-
-    <record id="ticket_stage_05" model="ticket.stage">
+    <record id="stage_closed" model="ticket.stage">
         <field name="sequence">30</field>
-        <field name="name">Canceled</field>
-        <field name="cancel_stage" eval="True"/>
-        <field name="folded" eval="True"/>
-    </record>
-    <record id="ticket_stage_06" model="ticket.stage">
-        <field name="sequence">29</field>
+        <field name="closing_stage">True</field>
         <field name="name">Closed</field>
-        <field name="closing_stage" eval="True"/>
-        <field name="folded" eval="True"/>
+    </record>
+    <record id="stage_canceled" model="ticket.stage">
+        <field name="sequence">35</field>
+        <field name="cancel_stage">True</field>
+        <field name="name">Canceled</field>
     </record>
 </odoo>
diff --git a/odoo_website_helpdesk/doc/RELEASE_NOTES.md b/odoo_website_helpdesk/doc/RELEASE_NOTES.md
index 6ccbdf3c6..052a9daaa 100644
--- a/odoo_website_helpdesk/doc/RELEASE_NOTES.md
+++ b/odoo_website_helpdesk/doc/RELEASE_NOTES.md
@@ -3,7 +3,11 @@
 #### 01.09.2023
 #### Version 16.0.1.0.0
 #### ADD
-- Initial commit for Website Helpdesk Support Ticket
 
+- Initial commit for Website Helpdesk Support Ticket
 
+#### 28.11.2023
+#### Version 16.0.1.0.1
+#### FIX
 
+- Updated the End date when changed the stage to Closed
diff --git a/odoo_website_helpdesk/models/res_config.py b/odoo_website_helpdesk/models/res_config.py
index d3dbbba8a..be0335825 100644
--- a/odoo_website_helpdesk/models/res_config.py
+++ b/odoo_website_helpdesk/models/res_config.py
@@ -75,12 +75,13 @@ class Helpdesk(models.TransientModel):
     @api.onchange('closed_stage')
     def closed_stage_a(self):
         """Closing stage function"""
-        stage = self.closed_stage.id
-        in_stage = self.env['ticket.stage'].search([('id', '=', stage)])
-        not_in_stage = self.env['ticket.stage'].search([('id', '!=', stage)])
-        in_stage.closing_stage = True
-        for each in not_in_stage:
-            each.closing_stage = False
+        if self.closed_stage:
+            stage = self.closed_stage.id
+            in_stage = self.env['ticket.stage'].search([('id', '=', stage)])
+            not_in_stage = self.env['ticket.stage'].search([('id', '!=', stage)])
+            in_stage.closing_stage = True
+            for each in not_in_stage:
+                each.closing_stage = False
 
     @api.constrains('show_category')
     def show_category_subcategory(self):