From a9a9f08ff988d10dea845011c5f12073b6c25fa4 Mon Sep 17 00:00:00 2001
From: pranaysaidurga <pranaysai.durga@ftprotech.com>
Date: Fri, 19 Jun 2026 14:05:09 +0530
Subject: [PATCH] recritment bug fixes

---
 .../cwf_timesheet/models/timesheet.py         |   1 -
 .../models/it_tax_statement_wiz.py            |   8 +-
 .../views/it_tax_menu_and_wizard_view.xml     |   2 +-
 .../wizards/letout_house_property.py          |  13 +-
 .../models/hr_attendance_report.py            |   1 -
 .../models/hr_applicant.py                    |   3 +-
 .../models/hr_candidate.py                    |   3 +-
 .../models/hr_job_recruitment.py              |   1 +
 .../views/hr_applicant_views.xml              |  10 +-
 .../wizard/hr_recruitment_auto_doc_wizard.py  |  40 +++-
 .../models/hr_applicant.py                    | 198 ++++++++-------
 .../hr_employee_education_employer_family.py  |  24 +-
 .../models/hr_recruitment.py                  |   2 +
 .../static/src/js/recruitment_match_panel.js  | 109 +++++++--
 .../src/scss/recruitment_match_panel.scss     |  39 +++
 .../views/hr_applicant_views.xml              |  25 +-
 .../hr_employee_education_employer_family.xml |   2 +-
 .../views/hr_recruitment.xml                  |  28 ++-
 .../post_onboarding_attachment_wizard.py      |   1 -
 .../controllers/hrms_emp_dashboard.py         |   7 -
 .../offer_letters/__manifest__.py             |   1 +
 .../offer_letters/models/__init__.py          |   1 +
 .../offer_letters/models/hr_applicant.py      |   2 +
 .../offer_letters/models/offer_letter.py      |  12 +-
 .../offer_letters/models/stages.py            |   6 +
 .../views/hr_applicant_offer_views.xml        |   2 +-
 .../offer_letters/views/stages.xml            |  14 ++
 .../wizards/offer_release_request_wizard.py   |   6 +-
 .../project_dashboard_controller.py           |   4 -
 .../static/src/search_tabs/search_tabs.scss   |   4 +
 .../models/application_candidate_changes.py   |  11 +-
 .../static/src/css/candidate_card.css         |  21 ++
 .../views/hr_applicant_form.xml               |   3 +-
 .../views/hr_candidate_form.xml               | 226 ++++++++++++++++++
 .../controllers/main.py                       |   1 -
 .../models/website.py                         |   2 -
 36 files changed, 651 insertions(+), 182 deletions(-)
 create mode 100644 addons_extensions/offer_letters/models/stages.py
 create mode 100644 addons_extensions/offer_letters/views/stages.xml

diff --git a/addons_extensions/cwf_timesheet/models/timesheet.py b/addons_extensions/cwf_timesheet/models/timesheet.py
index 4d257ab38..8245e95d0 100644
--- a/addons_extensions/cwf_timesheet/models/timesheet.py
+++ b/addons_extensions/cwf_timesheet/models/timesheet.py
@@ -115,7 +115,6 @@ class CwfTimesheet(models.Model):
         external_group_id = self.env.ref("hr_employee_extended.group_external_user")
         users = self.env["res.users"].search([("groups_id", "=", external_group_id.id)])
         employees = self.env['hr.employee'].search([('user_id', 'in', users.ids),'|',('doj','=',False),('doj','>=', self.week_start_date)])
-        print(employees)
         # Loop through each day of the week and create timesheet lines for each employee
         while current_date <= end_date:
             for employee in employees:
diff --git a/addons_extensions/employee_it_declaration/models/it_tax_statement_wiz.py b/addons_extensions/employee_it_declaration/models/it_tax_statement_wiz.py
index 6ebe1fd82..3f19c27df 100644
--- a/addons_extensions/employee_it_declaration/models/it_tax_statement_wiz.py
+++ b/addons_extensions/employee_it_declaration/models/it_tax_statement_wiz.py
@@ -756,9 +756,9 @@ class ITTaxStatementWizard(models.TransientModel):
         if not self.employee_id or not self.contract_id or not self.period_id or not self.period_line:
             raise ValidationError(_("Select employee, period, and period line before checking comparison."))
 
-        values = self._get_tax_base_values(include_comparison=True)
+        values = self.sudo()._get_tax_base_values(include_comparison=True)
         if not values['comparison_available']:
-            self._reset_regime_comparison()
+            self.sudo()._reset_regime_comparison()
             raise ValidationError(_("Tax comparison is available only when both old and new regime slabs are configured."))
 
         self.write({
@@ -938,7 +938,7 @@ class ITTaxStatementWizard(models.TransientModel):
         return {'data': data}
 
     def action_generate_report(self):
-        report_data = self._prepare_income_tax_data(include_comparison=False)
+        report_data = self.sudo()._prepare_income_tax_data(include_comparison=False)
 
         return self.env.ref('employee_it_declaration.income_tax_statement_action_report').report_action(
             self,
@@ -946,7 +946,7 @@ class ITTaxStatementWizard(models.TransientModel):
         )
 
     def action_generate_comparison_report(self):
-        report_data = self._prepare_income_tax_data(include_comparison=True)
+        report_data = self.sudo()._prepare_income_tax_data(include_comparison=True)
         if not report_data['data']['comparison']['available']:
             raise ValidationError(_("Tax comparison is available only when both old and new regime slabs are configured."))
 
diff --git a/addons_extensions/employee_it_declaration/views/it_tax_menu_and_wizard_view.xml b/addons_extensions/employee_it_declaration/views/it_tax_menu_and_wizard_view.xml
index 59bfaa342..203375040 100644
--- a/addons_extensions/employee_it_declaration/views/it_tax_menu_and_wizard_view.xml
+++ b/addons_extensions/employee_it_declaration/views/it_tax_menu_and_wizard_view.xml
@@ -43,7 +43,7 @@
                     <field name="currency_id" invisible="1"/>
                     <field name="is_general_tax_statement" invisible="1"/>
                     <group>
-                        <field name="is_hr_manager" invisible="0" force_save="1"/>
+                        <field name="is_hr_manager" invisible="1" force_save="1"/>
                         <field name="employee_id" readonly="not is_hr_manager" options="{'no_edit': True, 'no_create': True}"/>
                         <field name="contract_id" readonly="1" force_save="1" invisible="0"/>
                     </group>
diff --git a/addons_extensions/employee_it_declaration/wizards/letout_house_property.py b/addons_extensions/employee_it_declaration/wizards/letout_house_property.py
index 72510de3e..45d116d9f 100644
--- a/addons_extensions/employee_it_declaration/wizards/letout_house_property.py
+++ b/addons_extensions/employee_it_declaration/wizards/letout_house_property.py
@@ -1,10 +1,10 @@
 from odoo import models, fields, api
 import math
 
-class LetoutHouseProperty(models.Model):
-    _name = 'letout.house.property'
-    _inherit = ['it.declaration.submitted.lock.mixin']
-    _description = 'Letout House Property Details'
+class LetoutHouseProperty(models.Model):
+    _name = 'letout.house.property'
+    _inherit = ['it.declaration.submitted.lock.mixin']
+    _description = 'Letout House Property Details'
 
     it_declaration_id = fields.Many2one('emp.it.declaration', string="IT Declaration")
     other_il_id = fields.Many2one('other.il.costing.type', string="Other Income/Loss Costing Type")
@@ -36,9 +36,6 @@ class LetoutHouseProperty(models.Model):
             deduction = net_annual_value * 0.30
             income_loss = net_annual_value - deduction - record.interest_paid_to
 
-            print(net_annual_value)
-            print(deduction)
-            print(income_loss)
             record.net_annual_value = net_annual_value
             record.deduction_for_repairs = round(deduction)
-            record.income_loss = round(income_loss)
+            record.income_loss = round(income_loss)
diff --git a/addons_extensions/hr_attendance_extended/models/hr_attendance_report.py b/addons_extensions/hr_attendance_extended/models/hr_attendance_report.py
index d745b1592..7a1e4687b 100644
--- a/addons_extensions/hr_attendance_extended/models/hr_attendance_report.py
+++ b/addons_extensions/hr_attendance_extended/models/hr_attendance_report.py
@@ -209,7 +209,6 @@ ORDER BY
 
         except Exception as e:
             error_msg = f"Error executing attendance report query: {str(e)}"
-            print(error_msg)
             raise UserError(
                 _("An error occurred while generating the attendance report. Please check the logs for details."))
 
diff --git a/addons_extensions/hr_recruitment_auto_doc/models/hr_applicant.py b/addons_extensions/hr_recruitment_auto_doc/models/hr_applicant.py
index 61d7e106b..2c09d56b2 100644
--- a/addons_extensions/hr_recruitment_auto_doc/models/hr_applicant.py
+++ b/addons_extensions/hr_recruitment_auto_doc/models/hr_applicant.py
@@ -8,7 +8,8 @@ class HrApplicant(models.Model):
         action = self.env.ref("hr_recruitment_auto_doc.action_hr_recruitment_auto_doc_wizard_applicant").read()[0]
         context = dict(self.env.context)
         context['single_parser'] = True
-        action["context"]['current_id'] = self.id
+        context['applicant_id'] = self.id
+        context['target_model'] = 'applicant'
         if len(self) == 1 and self.hr_job_recruitment:
             context["default_job_recruitment_id"] = self.hr_job_recruitment.id
         action["context"] = context
diff --git a/addons_extensions/hr_recruitment_auto_doc/models/hr_candidate.py b/addons_extensions/hr_recruitment_auto_doc/models/hr_candidate.py
index 677e3e177..3526071c2 100644
--- a/addons_extensions/hr_recruitment_auto_doc/models/hr_candidate.py
+++ b/addons_extensions/hr_recruitment_auto_doc/models/hr_candidate.py
@@ -8,6 +8,7 @@ class HrCandidate(models.Model):
         action = self.env.ref("hr_recruitment_auto_doc.action_hr_recruitment_auto_doc_wizard_candidate").read()[0]
         action["context"] = dict(self.env.context)
         action["context"]['single_parser'] = True
-        action["context"]['current_id'] = self.id
+        action["context"]['target_model'] = 'candidate'
+        action["context"]['candidate_id'] = self.id
         action["name"] = _("Parse Resumes")
         return action
diff --git a/addons_extensions/hr_recruitment_auto_doc/models/hr_job_recruitment.py b/addons_extensions/hr_recruitment_auto_doc/models/hr_job_recruitment.py
index 9eae68c54..96a0aa4da 100644
--- a/addons_extensions/hr_recruitment_auto_doc/models/hr_job_recruitment.py
+++ b/addons_extensions/hr_recruitment_auto_doc/models/hr_job_recruitment.py
@@ -7,6 +7,7 @@ class HrJobRecruitment(models.Model):
     def action_open_auto_doc_wizard(self):
         action = self.env.ref("hr_recruitment_auto_doc.action_hr_recruitment_auto_doc_wizard_job_recruitment").read()[0]
         context = dict(self.env.context)
+        context['target_model'] = 'job_recruitment'
         if len(self) == 1:
             context["default_job_recruitment_id"] = self.id
         action["context"] = context
diff --git a/addons_extensions/hr_recruitment_auto_doc/views/hr_applicant_views.xml b/addons_extensions/hr_recruitment_auto_doc/views/hr_applicant_views.xml
index 76674e62a..0e4b76753 100644
--- a/addons_extensions/hr_recruitment_auto_doc/views/hr_applicant_views.xml
+++ b/addons_extensions/hr_recruitment_auto_doc/views/hr_applicant_views.xml
@@ -39,11 +39,11 @@
         <field name="inherit_id" ref="hr_recruitment_extended.hr_applicant_view_form_inherit"/>
         <field name="arch" type="xml">
             <xpath expr="//header" position="inside">
-                <button name="action_open_auto_doc_wizard"
-                        string="Parse Resume"
-                        type="object"
-                        class="btn-secondary"
-                        groups="hr_recruitment.group_hr_recruitment_user"/>
+<!--                <button name="action_open_auto_doc_wizard"-->
+<!--                        string="Parse Resume"-->
+<!--                        type="object"-->
+<!--                        class="btn-secondary"-->
+<!--                        groups="hr_recruitment.group_hr_recruitment_user"/>-->
             </xpath>
         </field>
     </record>
diff --git a/addons_extensions/hr_recruitment_auto_doc/wizard/hr_recruitment_auto_doc_wizard.py b/addons_extensions/hr_recruitment_auto_doc/wizard/hr_recruitment_auto_doc_wizard.py
index 70dec4289..3979d0c06 100644
--- a/addons_extensions/hr_recruitment_auto_doc/wizard/hr_recruitment_auto_doc_wizard.py
+++ b/addons_extensions/hr_recruitment_auto_doc/wizard/hr_recruitment_auto_doc_wizard.py
@@ -95,10 +95,21 @@ class HrRecruitmentAutoDocWizard(models.TransientModel):
                 res["job_recruitment_id"] = default_job_recruitment_id
             elif len(active_ids) == 1:
                 res["job_recruitment_id"] = active_ids[0]
+        if self.env.context.get("target_model"):
+            res["target_model"] = self.env.context.get("target_model")
+            if res["target_model"] == "candidate" and self.env.context.get("candidate_id"):
+                candidate = self.env["hr.candidate"].browse(int(self.env.context.get("candidate_id")))
+
+                if candidate and candidate.resume:
+                    res.update({
+                        "resume_file": candidate.resume,
+                        "resume_filename": candidate.resume_name,
+                    })
         return res
 
     def action_parse_documents(self):
         self.ensure_one()
+        self.line_ids.unlink()
         self._sync_upload_lines()
         if not self.line_ids:
             raise UserError(_("Please add at least one document to parse."))
@@ -220,7 +231,8 @@ class HrRecruitmentAutoDocWizard(models.TransientModel):
             "updated_count": updated,
             "skipped_count": skipped,
             "result_html": self._build_summary_html(summary_rows),
-            "parsed_document": True
+            "parsed_document": True,
+            "create_updated_records": False,
         })
 
         return {
@@ -516,15 +528,24 @@ class HrRecruitmentAutoDocWizard(models.TransientModel):
 
     def _find_or_create_candidate(self, line, parsed_data, parsed_payload):
         candidate = self._find_existing_candidate(parsed_data)
+        existing_candidate = True
         candidate_vals = self._prepare_candidate_vals(line, parsed_data, parsed_payload)
-
+        if self.env.context.get('candidate_id') and not candidate:
+            existing_candidate = False
+            candidate = self.env['hr.candidate'].sudo().browse(int(self.env.context.get('candidate_id')))
         if candidate:
             if self.update_existing_candidates:
-                candidate.write(self._prepare_sparse_update_vals(candidate, candidate_vals))
+                candidate.write(self._prepare_sparse_update_vals(candidate, candidate_vals, False))
                 self._sync_candidate_skills(candidate, parsed_data.get("skills") or [])
                 if self.target_model == "candidate":
                     self._sync_candidate_resume_histories(candidate, parsed_data)
-            message = _("Matched existing candidate: %s") % candidate.display_name
+            if existing_candidate:
+                message = _("Matched existing candidate: %s") % candidate.display_name
+                if self.env.context.get('candidate_id'):
+                    self.env['hr.candidate'].sudo().browse(int(self.env.context.get('candidate_id'))).unlink()
+            else:
+                candidate.write(self._prepare_sparse_update_vals(candidate, candidate_vals, True))
+                message = _("Details Updated Successfully: %s") % candidate.display_name
             return candidate, "updated", message
 
         self._ensure_resume_creation_allowed(parsed_data, line.file_name)
@@ -586,7 +607,7 @@ class HrRecruitmentAutoDocWizard(models.TransientModel):
 
         candidate = False
         if email_value:
-            candidate = search_model.search(['|',('email_from','=', email_value),("email_normalized", "=", email_value)], limit=1)
+            candidate = search_model.search([('id','!=',self.env.context.get('candidate_id')),'|',('email_from','=', email_value),("email_normalized", "=", email_value)], limit=1)
         if not candidate and phone_values:
             candidate = search_model.search([
                 "|","|",('partner_phone',"in",phone_values),
@@ -973,7 +994,7 @@ class HrRecruitmentAutoDocWizard(models.TransientModel):
         if not skills:
             raise ValidationError(_("No reliable skills were found in the resume. Record creation was skipped."))
 
-    def _prepare_sparse_update_vals(self, candidate, values):
+    def _prepare_sparse_update_vals(self, candidate, values, current_update:False):
         update_vals = {}
         field_map = {
             "partner_name": not candidate.partner_name,
@@ -988,8 +1009,13 @@ class HrRecruitmentAutoDocWizard(models.TransientModel):
             "resume_type": not getattr(candidate, "resume_type", False),
         }
         for field_name, can_update in field_map.items():
-            if can_update and values.get(field_name):
+            if can_update and values.get(field_name) and not current_update:
                 update_vals[field_name] = values[field_name]
+            elif values.get(field_name) and current_update:
+                if field_name == 'partner_name':
+                    update_vals[field_name] = values.get('partner_name')
+                else:
+                    update_vals[field_name] = values[field_name]
         return update_vals
 
     def _sync_candidate_resume_histories(self, candidate, parsed_data):
diff --git a/addons_extensions/hr_recruitment_extended/models/hr_applicant.py b/addons_extensions/hr_recruitment_extended/models/hr_applicant.py
index ba2bb0b8c..4010d4888 100644
--- a/addons_extensions/hr_recruitment_extended/models/hr_applicant.py
+++ b/addons_extensions/hr_recruitment_extended/models/hr_applicant.py
@@ -9,6 +9,18 @@ from odoo.tools.mimetypes import guess_mimetype, fix_filename_extension
 class HRApplicant(models.Model):
     _inherit = 'hr.applicant'
     _track_duration_field = 'recruitment_stage_id'
+    _rec_names_search = ['candidate_id', 'candidate_id.candidate_sequence', 'candidate_id.partner_phone','partner_name','job_id.name','hr_job_recruitment.recruitment_sequence']
+    _sql_constraints = [
+        ('name_applicant_job_id', 'unique(candidate_id, hr_job_recruitment)',
+         "Avoid creating Multiple applications for the same job")]
+
+    @api.constrains('candidate_id','hr_job_recruitment')
+    def _check_name_applicant_job_id(self):
+        for rec in self:
+            if rec.candidate_id and rec.hr_job_recruitment:
+                candidate_history = self.sudo().search([('id','!=',rec.id),('candidate_id','=',rec.candidate_id.id),('hr_job_recruitment','=',rec.hr_job_recruitment.id)])
+                if candidate_history:
+                    raise ValidationError(_("Avoid creating Multiple applications for the same Job Position."))
 
     hide_chatter_suggestion = fields.Boolean(string="Hide Chatter Suggestions", default=False, tracking=True)
     primary_skill_match_percentage = fields.Float(
@@ -31,24 +43,24 @@ class HRApplicant(models.Model):
     )
 
     candidate_image = fields.Image(related='candidate_id.candidate_image', readonly=False, compute_sudo=True)
-    submitted_to_client = fields.Boolean(string="Submitted to Client", default=False, tracking=True)
-    client_submission_date = fields.Datetime(string="Submission Date", tracking=True)
-    submitted_stage = fields.Many2one('hr.recruitment.stage', string="Submitted Stage", tracking=True)
+    submitted_to_client = fields.Boolean(string="Submitted to Client", default=False, tracking=True)
+    client_submission_date = fields.Datetime(string="Submission Date", tracking=True)
+    submitted_stage = fields.Many2one('hr.recruitment.stage', string="Submitted Stage", tracking=True)
     refused_stage = fields.Many2one('hr.recruitment.stage', string="Reject Stage")
     refused_comments = fields.Text(string='Reject Comments')
     is_on_hold = fields.Boolean(string="Is On Hold", default=False)
-    hold_state = fields.Selection(
-        [('hold', 'On Hold')],
-        string="Hold Status",
-        compute='_compute_hold_state',
-    )
-    stage_comment_ids = fields.One2many(
-        'hr.applicant.stage.comment',
-        'applicant_id',
-        string='Stage Comments',
-    )
-    stage_comment_count = fields.Integer(compute='_compute_stage_comment_count')
-    stage_comment_tooltips = fields.Json(compute='_compute_stage_comment_tooltips')
+    hold_state = fields.Selection(
+        [('hold', 'On Hold')],
+        string="Hold Status",
+        compute='_compute_hold_state',
+    )
+    stage_comment_ids = fields.One2many(
+        'hr.applicant.stage.comment',
+        'applicant_id',
+        string='Stage Comments',
+    )
+    stage_comment_count = fields.Integer(compute='_compute_stage_comment_count')
+    stage_comment_tooltips = fields.Json(compute='_compute_stage_comment_tooltips')
 
     @api.depends('is_on_hold')
     def _compute_hold_state(self):
@@ -63,63 +75,63 @@ class HRApplicant(models.Model):
                 rec.is_on_hold = True
         return {'type': 'ir.actions.client', 'tag': 'reload'}
 
-    def action_toggle_chatter_visibility(self):
-        for record in self:
-            record.hide_chatter_suggestion = not record.hide_chatter_suggestion
-        return {'type': 'ir.actions.client', 'tag': 'reload'}
-
-    @api.depends('stage_comment_ids')
-    def _compute_stage_comment_count(self):
-        for applicant in self:
-            applicant.stage_comment_count = len(applicant.stage_comment_ids)
-
-    @api.depends('stage_comment_ids.comment', 'stage_comment_ids.stage_id', 'stage_comment_ids.user_id', 'stage_comment_ids.comment_date')
-    def _compute_stage_comment_tooltips(self):
-        for applicant in self:
-            grouped_comments = {}
-            for comment in applicant.stage_comment_ids.sorted(lambda item: item.comment_date or fields.Datetime.now()):
-                if not comment.stage_id:
-                    continue
-                line = '%s: %s' % (comment.user_id.name, comment.comment)
-                grouped_comments.setdefault(comment.stage_id.id, []).append(line)
-            applicant.stage_comment_tooltips = {
-                stage_id: '\n'.join(comments[-4:])
-                for stage_id, comments in grouped_comments.items()
-            }
-
-    def action_open_stage_comment_wizard(self):
-        self.ensure_one()
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('Stage Comments'),
-            'res_model': 'applicant.stage.comment.wizard',
-            'view_mode': 'form',
-            'view_id': self.env.ref('hr_recruitment_extended.view_applicant_stage_comment_wizard_form').id,
-            'target': 'new',
-            'context': {
-                'active_id': self.id,
-                'default_applicant_id': self.id,
-                'default_stage_id': self.recruitment_stage_id.id,
-            },
-        }
-
-    @api.onchange('submitted_to_client')
-    def _onchange_submitted_to_client(self):
-        for applicant in self:
-            if applicant.submitted_to_client:
-                applicant.client_submission_date = applicant.client_submission_date or fields.Datetime.now()
-                applicant.submitted_stage = applicant.submitted_stage or applicant.recruitment_stage_id
-            else:
-                applicant.client_submission_date = False
-                applicant.submitted_stage = False
-
-    @api.model_create_multi
-    def create(self, vals_list):
-        for vals in vals_list:
-            if vals.get('submitted_to_client'):
-                vals.setdefault('client_submission_date', fields.Datetime.now())
-                vals.setdefault('submitted_stage', vals.get('recruitment_stage_id'))
-        return super().create(vals_list)
+    def action_toggle_chatter_visibility(self):
+        for record in self:
+            record.hide_chatter_suggestion = not record.hide_chatter_suggestion
+        return {'type': 'ir.actions.client', 'tag': 'reload'}
+
+    @api.depends('stage_comment_ids')
+    def _compute_stage_comment_count(self):
+        for applicant in self:
+            applicant.stage_comment_count = len(applicant.stage_comment_ids)
+
+    @api.depends('stage_comment_ids.comment', 'stage_comment_ids.stage_id', 'stage_comment_ids.user_id', 'stage_comment_ids.comment_date')
+    def _compute_stage_comment_tooltips(self):
+        for applicant in self:
+            grouped_comments = {}
+            for comment in applicant.stage_comment_ids.sorted(lambda item: item.comment_date or fields.Datetime.now()):
+                if not comment.stage_id:
+                    continue
+                line = '%s: %s' % (comment.user_id.name, comment.comment)
+                grouped_comments.setdefault(comment.stage_id.id, []).append(line)
+            applicant.stage_comment_tooltips = {
+                stage_id: '\n'.join(comments[-4:])
+                for stage_id, comments in grouped_comments.items()
+            }
+
+    def action_open_stage_comment_wizard(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Stage Comments'),
+            'res_model': 'applicant.stage.comment.wizard',
+            'view_mode': 'form',
+            'view_id': self.env.ref('hr_recruitment_extended.view_applicant_stage_comment_wizard_form').id,
+            'target': 'new',
+            'context': {
+                'active_id': self.id,
+                'default_applicant_id': self.id,
+                'default_stage_id': self.recruitment_stage_id.id,
+            },
+        }
+
+    @api.onchange('submitted_to_client')
+    def _onchange_submitted_to_client(self):
+        for applicant in self:
+            if applicant.submitted_to_client:
+                applicant.client_submission_date = applicant.client_submission_date or fields.Datetime.now()
+                applicant.submitted_stage = applicant.submitted_stage or applicant.recruitment_stage_id
+            else:
+                applicant.client_submission_date = False
+                applicant.submitted_stage = False
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            if vals.get('submitted_to_client'):
+                vals.setdefault('client_submission_date', fields.Datetime.now())
+                vals.setdefault('submitted_stage', vals.get('recruitment_stage_id'))
+        return super().create(vals_list)
 
     @api.depends('hr_job_recruitment.skill_ids', 'hr_job_recruitment.secondary_skill_ids', 'candidate_id.skill_ids')
     def _compute_skill_match_percentages(self):
@@ -153,27 +165,27 @@ class HRApplicant(models.Model):
         stage_ids = stages.sudo()._search(search_domain, order=stages._order)
         return stages.browse(stage_ids)
 
-    def write(self, vals):
-        if vals.get('submitted_to_client') and 'submitted_stage' not in vals and len(self) > 1:
-            for applicant in self:
-                applicant_vals = dict(vals)
-                applicant_vals.setdefault('client_submission_date', fields.Datetime.now())
-                applicant_vals['submitted_stage'] = vals.get('recruitment_stage_id') or applicant.recruitment_stage_id.id or False
-                applicant.write(applicant_vals)
-            return True
-        if vals.get('submitted_to_client'):
-            vals.setdefault('client_submission_date', fields.Datetime.now())
-            if 'submitted_stage' not in vals:
-                submitted_stage = vals.get('recruitment_stage_id') or self[:1].recruitment_stage_id.id
-                if submitted_stage:
-                    vals['submitted_stage'] = submitted_stage
-        elif vals.get('submitted_to_client') is False:
-            vals.setdefault('client_submission_date', False)
-            vals.setdefault('submitted_stage', False)
-        if 'recruitment_stage_id' in vals:
-            blocked_records = self.filtered(
-                lambda applicant: applicant.is_on_hold and applicant.recruitment_stage_id.id != vals.get('recruitment_stage_id')
-            )
+    def write(self, vals):
+        if vals.get('submitted_to_client') and 'submitted_stage' not in vals and len(self) > 1:
+            for applicant in self:
+                applicant_vals = dict(vals)
+                applicant_vals.setdefault('client_submission_date', fields.Datetime.now())
+                applicant_vals['submitted_stage'] = vals.get('recruitment_stage_id') or applicant.recruitment_stage_id.id or False
+                applicant.write(applicant_vals)
+            return True
+        if vals.get('submitted_to_client'):
+            vals.setdefault('client_submission_date', fields.Datetime.now())
+            if 'submitted_stage' not in vals:
+                submitted_stage = vals.get('recruitment_stage_id') or self[:1].recruitment_stage_id.id
+                if submitted_stage:
+                    vals['submitted_stage'] = submitted_stage
+        elif vals.get('submitted_to_client') is False:
+            vals.setdefault('client_submission_date', False)
+            vals.setdefault('submitted_stage', False)
+        if 'recruitment_stage_id' in vals:
+            blocked_records = self.filtered(
+                lambda applicant: applicant.is_on_hold and applicant.recruitment_stage_id.id != vals.get('recruitment_stage_id')
+            )
             if blocked_records:
                 raise ValidationError(_("You cannot change the stage of an applicant while it is on hold. Please unhold it first."))
         if 'stage_id' in vals:
diff --git a/addons_extensions/hr_recruitment_extended/models/hr_employee_education_employer_family.py b/addons_extensions/hr_recruitment_extended/models/hr_employee_education_employer_family.py
index 2397a119e..160cc9c2b 100644
--- a/addons_extensions/hr_recruitment_extended/models/hr_employee_education_employer_family.py
+++ b/addons_extensions/hr_recruitment_extended/models/hr_employee_education_employer_family.py
@@ -2,14 +2,23 @@ from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 
 
+class HRCandidate(models.Model):
+    _inherit = 'hr.candidate'
+
+    education_history = fields.Many2many('education.history', string='Education Details')
+
+    employer_history = fields.Many2many('employer.history', string='Education Details')
+
+    family_details = fields.Many2many('family.details', string='Family Details')
+
 class HRApplicant(models.Model):
     _inherit = 'hr.applicant'
 
-    education_history = fields.One2many('education.history', 'applicant_id', string='Education Details')
+    education_history = fields.Many2many('education.history', related='candidate_id.education_history', readonly=False, string='Education Details')
 
-    employer_history = fields.One2many('employer.history', 'applicant_id', string='Education Details')
+    employer_history = fields.Many2many('employer.history', related='candidate_id.employer_history', readonly=False, string='Education Details')
 
-    family_details = fields.One2many('family.details', 'applicant_id', string='Family Details')
+    family_details = fields.Many2many('family.details', related='candidate_id.family_details', readonly=False, string='Family Details')
 
 
     family_education_employer_details_status = fields.Selection([('pending', 'Pending'),
@@ -27,15 +36,6 @@ class HRApplicant(models.Model):
                 raise ValidationError(_("No Data to Validate"))
 
 
-class HRCandidate(models.Model):
-    _inherit = 'hr.candidate'
-
-    education_history = fields.One2many('education.history', 'candidate_id', string='Education Details')
-
-    employer_history = fields.One2many('employer.history', 'candidate_id', string='Education Details')
-
-    family_details = fields.One2many('family.details', 'candidate_id', string='Family Details')
-
 
 class FamilyDetails(models.Model):
     _inherit = "family.details"
diff --git a/addons_extensions/hr_recruitment_extended/models/hr_recruitment.py b/addons_extensions/hr_recruitment_extended/models/hr_recruitment.py
index b610af552..9b9f38701 100644
--- a/addons_extensions/hr_recruitment_extended/models/hr_recruitment.py
+++ b/addons_extensions/hr_recruitment_extended/models/hr_recruitment.py
@@ -10,6 +10,8 @@ class HrCandidate(models.Model):
     _sql_constraints = [
         ('unique_candidate_sequence', 'UNIQUE(candidate_sequence)', 'Candidate sequence must be unique!'),
     ]
+    _rec_names_search = ['partner_name', 'candidate_sequence', 'partner_phone']
+
     #personal Details
     candidate_sequence = fields.Char(string='Candidate Sequence', readonly=False, default='/', copy=False)
     hide_chatter_suggestion = fields.Boolean(string="Hide Chatter Suggestions", default=False, tracking=True)
diff --git a/addons_extensions/hr_recruitment_extended/static/src/js/recruitment_match_panel.js b/addons_extensions/hr_recruitment_extended/static/src/js/recruitment_match_panel.js
index d5bc89689..e28dd0a52 100644
--- a/addons_extensions/hr_recruitment_extended/static/src/js/recruitment_match_panel.js
+++ b/addons_extensions/hr_recruitment_extended/static/src/js/recruitment_match_panel.js
@@ -27,6 +27,12 @@ patch(RecruitmentFormController.prototype, {
         this._matchPanelSearchTerm = "";
         this._matchPanelActiveTab = "candidates";
         this._matchPanelAddingCandidateId = null;
+        this._primarySkillsExpanded = false;
+        this._secondarySkillsExpanded = false;
+        this._matchPanelScrollPosition = {
+            candidates: 0,
+            applicants: 0,
+        };
 
         onMounted(() => this._syncRecruitmentMatchPanel());
         onPatched(() => this._syncRecruitmentMatchPanel());
@@ -161,7 +167,7 @@ patch(RecruitmentFormController.prototype, {
 
     _renderSkillTags(skillNames, className) {
         if (!skillNames.length) {
-            return `<span class="o_hr_match_chip ${className}">${escapeHtml(_t("None"))}</span>`;
+            return `<span class="o_hr_match_chip ${className}">${escapeHtml(_t("No Skills Added"))}</span>`;
         }
         return skillNames
             .map((skillName) => `<span class="o_hr_match_chip ${className}">${escapeHtml(skillName)}</span>`)
@@ -288,6 +294,7 @@ patch(RecruitmentFormController.prototype, {
                         ? _t("Applicants added to this recruitment will appear here with the same match insights.")
                         : _t("Try refreshing after updating the recruitment skills or candidate pool.")
             );
+        const previousScroll = this._matchPanelScrollPosition[this._matchPanelActiveTab] || 0;
 
         panel.innerHTML = `
             <div class="o_hr_match_panel_backdropless">
@@ -295,7 +302,7 @@ patch(RecruitmentFormController.prototype, {
                     <div>
                         <p>${escapeHtml(_t("Candidate Pool"))}</p>
                         <h3>${escapeHtml(payload.job_recruitment_name || _t("Recruitment Matches"))}</h3>
-                        <span>${escapeHtml(`${payload.candidate_count || 0} ${_t("pool candidates")} • ${payload.applicant_count || 0} ${_t("applicants")}`)}</span>
+                        <span>${escapeHtml(`${payload.candidate_count || 0} ${_t(" pool candidates ")} • ${payload.applicant_count || 0} ${_t(" applicants")}`)}</span>
                     </div>
                     <div class="o_hr_match_panel_actions">
                         <button type="button" class="btn btn-light o_hr_match_refresh">${escapeHtml(_t("Refresh"))}</button>
@@ -322,28 +329,88 @@ patch(RecruitmentFormController.prototype, {
                     </label>
                 </section>
                 <section class="o_hr_match_panel_skill_summary">
-                    <div>
-                        <label>${escapeHtml(_t("Primary Skills"))}</label>
-                        <div class="o_hr_match_chip_row">
-                            ${this._renderSkillTags(payload.primary_skill_names || [], "o_hr_match_chip_primary")}
-                        </div>
-                    </div>
-                    <div>
-                        <label>${escapeHtml(_t("Secondary Skills"))}</label>
-                        <div class="o_hr_match_chip_row">
-                            ${this._renderSkillTags(payload.secondary_skill_names || [], "o_hr_match_chip_secondary")}
-                        </div>
-                    </div>
-                </section>
+                    
+                        ${
+                            payload.primary_skill_names?.length
+                            ? `
+                            <div class="o_hr_match_skill_header"
+                                 data-toggle="primary">
+                                <span>
+                                    ${this._primarySkillsExpanded ? "▼" : "▶"}
+                                    ${escapeHtml(_t("Primary Skills"))}
+                                </span>
+                            
+                                <span class="o_hr_match_skill_count">
+                                    (${payload.primary_skill_names.length})
+                                </span>
+                            </div>
+                            
+                            ${
+                                this._primarySkillsExpanded
+                                    ? `
+                                    <div class="o_hr_match_chip_row">
+                                        ${this._renderSkillTags(payload.primary_skill_names, "o_hr_match_chip_primary")}
+                                    </div>
+                                    `
+                                    : ""
+                            }
+                            `
+                            : ""
+                        }
+                    
+                        ${
+                            payload.secondary_skill_names?.length
+                            ? `
+                            <div class="o_hr_match_skill_header"
+                                 data-toggle="secondary">
+                                <span>
+                                    ${this._secondarySkillsExpanded ? "▼" : "▶"}
+                                    ${escapeHtml(_t("Secondary Skills"))}
+                                </span>
+                            
+                                <span class="o_hr_match_skill_count">
+                                    (${payload.secondary_skill_names.length})
+                                </span>
+                            </div>
+                            
+                            ${
+                                this._secondarySkillsExpanded
+                                    ? `
+                                    <div class="o_hr_match_chip_row">
+                                        ${this._renderSkillTags(payload.secondary_skill_names, "o_hr_match_chip_secondary")}
+                                    </div>
+                                    `
+                                    : ""
+                            }
+                            `
+                            : ""
+                        }
+                    
+                    </section>  
                 <section class="o_hr_match_panel_body ${this._matchPanelLoading ? "o_hr_match_panel_body_loading" : ""}">
                     ${this._matchPanelLoading ? `<div class="o_hr_match_loading">${escapeHtml(_t("Refreshing matches..."))}</div>` : activeCards}
                 </section>
             </div>
         `;
         panel.classList.add("o_hr_match_panel_open");
+        panel.querySelector('[data-toggle="primary"]')?.addEventListener("click", () => {
+            this._primarySkillsExpanded = !this._primarySkillsExpanded;
+            this._renderRecruitmentMatchPanel();
+        });
 
+        panel.querySelector('[data-toggle="secondary"]')?.addEventListener("click", () => {
+            this._secondarySkillsExpanded = !this._secondarySkillsExpanded;
+            this._renderRecruitmentMatchPanel();
+        });
         panel.querySelector(".o_hr_match_close")?.addEventListener("click", () => this._closeRecruitmentMatchPanel());
-        panel.querySelector(".o_hr_match_refresh")?.addEventListener("click", () => this._loadRecruitmentMatchPanelData());
+        panel.querySelector(".o_hr_match_refresh")?.addEventListener("click", () => {
+                this._matchPanelScrollPosition = {
+                    candidates: 0,
+                    applicants: 0,
+                };
+                this._loadRecruitmentMatchPanelData()
+            }
+        );
         panel.querySelectorAll(".o_hr_match_tab").forEach((tabButton) => {
             tabButton.addEventListener("click", () => {
                 this._matchPanelActiveTab = tabButton.dataset.tab || "candidates";
@@ -401,7 +468,17 @@ patch(RecruitmentFormController.prototype, {
                 }
             });
         }
+        const body = panel.querySelector(".o_hr_match_panel_body");
 
+        if (body) {
+            // Restore previous scroll for this tab
+            body.scrollTop = previousScroll;
+
+            // Continuously save scroll position
+            body.addEventListener("scroll", () => {
+                this._matchPanelScrollPosition[this._matchPanelActiveTab] = body.scrollTop;
+            });
+        }
         const button = this._getRecruitmentMatchPanelButton();
         if (button) {
             button.classList.add("o_hr_match_fab_hidden");
diff --git a/addons_extensions/hr_recruitment_extended/static/src/scss/recruitment_match_panel.scss b/addons_extensions/hr_recruitment_extended/static/src/scss/recruitment_match_panel.scss
index 208544dec..e9732c4ca 100644
--- a/addons_extensions/hr_recruitment_extended/static/src/scss/recruitment_match_panel.scss
+++ b/addons_extensions/hr_recruitment_extended/static/src/scss/recruitment_match_panel.scss
@@ -100,6 +100,7 @@
     margin-top: 6px;
     font-size: 22px;
     font-weight: 700;
+    color: white;
 }
 
 .o_hr_match_panel_header span {
@@ -416,6 +417,44 @@
     display: grid;
     gap: 14px;
 }
+.o_hr_match_collapsible {
+    margin-bottom: 12px;
+}
+
+.o_hr_match_collapsible_header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    cursor: pointer;
+    padding: 8px 12px;
+    border-radius: 8px;
+    background: #f5f5f5;
+    font-weight: 600;
+}
+
+.o_hr_match_collapsible_header:hover {
+    background: #ececec;
+}
+.o_hr_match_skill_header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    cursor: pointer;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: .08em;
+    margin-bottom: 10px;
+    color: #334155;
+}
+
+.o_hr_match_skill_header:hover {
+    color: var(--o-brand-primary);
+}
+
+.o_hr_match_skill_count {
+    color: #64748b;
+    font-weight: 600;
+}
 
 @media (min-width: 768px) {
     .o_hr_match_skill_split {
diff --git a/addons_extensions/hr_recruitment_extended/views/hr_applicant_views.xml b/addons_extensions/hr_recruitment_extended/views/hr_applicant_views.xml
index 4412341cd..3528775de 100644
--- a/addons_extensions/hr_recruitment_extended/views/hr_applicant_views.xml
+++ b/addons_extensions/hr_recruitment_extended/views/hr_applicant_views.xml
@@ -7,6 +7,7 @@
         <field name="arch" type="xml">
             <xpath expr="//list" position="attributes">
                 <attribute name="decoration-muted">hold_state == 'hold'</attribute>
+                <attribute name="default_order">id desc</attribute>
             </xpath>
             <xpath expr="//field[@name='message_needaction']" position="after">
                 <field name="is_on_hold" column_invisible="1"/>
@@ -16,7 +17,7 @@
             </xpath>
             <xpath expr="//field[@name='stage_id']" position="after">
                 <field name="recruitment_stage_id"/>
-                <field name="hold_state" widget="badge" decoration-muted="hold_state == 'hold'" optional="show" nolabel="1"/>
+                <field name="hold_state" string="Hold State" widget="badge" decoration-muted="hold_state == 'hold'" optional="show"/>
                 <field name="submitted_to_client" optional="show"/>
                 <field name="client_submission_date" optional="show"/>
                 <field name="submitted_stage" optional="hide"/>
@@ -289,6 +290,26 @@
             <xpath expr="//field[@name='kanban_state']" position="attributes">
                 <attribute name="invisible">is_on_hold</attribute>
             </xpath>
+            <xpath expr="//t[@t-name='card']/field[@name='categ_ids']" position="replace"/>
+            <xpath expr="//t[@t-name='card']/field[@name='applicant_properties']" position="replace"/>
+            <xpath expr="//t[@t-name='card']/field[@name='job_id']" position="replace">
+
+                <div class="d-flex justify-content-between align-items-start">
+                        <div class="flex-grow-1">
+                            <field name="job_id" invisible="context.get('search_default_job_id', False)" on_change="1"/>
+                            <field name="categ_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
+                            <field name="applicant_properties" widget="properties"/>
+                            <!-- <field name="partner_name" class="fw-bold fs-5"/>-->
+                        </div>
+                    <t t-if="record.candidate_image.raw_value">
+                                                <field name="candidate_image"
+                               widget="image"
+                               class="rounded-circle ms-2"
+                               options="{'size': [48, 48]}"/>
+
+                    </t>
+                    </div>
+            </xpath>
         </field>
     </record>
     <record id="hr_kanban_view_applicant_inherit" model="ir.ui.view">
@@ -297,7 +318,7 @@
         <field name="arch" type="xml">
             <kanban highlight_color="color" default_group_by="recruitment_stage_id"
                     class="o_kanban_applicant o_search_matching_applicant"
-                    quick_create_view="hr_recruitment.quick_create_applicant_form" sample="1">
+                    quick_create_view="hr_recruitment.quick_create_applicant_form" sample="1" default_order="id desc">
                 <field name="recruitment_stage_id" options='{"group_by_tooltip": {"requirements": "Requirements"}}'/>
                 <field name="legend_normal"/>
                 <field name="legend_blocked"/>
diff --git a/addons_extensions/hr_recruitment_extended/views/hr_employee_education_employer_family.xml b/addons_extensions/hr_recruitment_extended/views/hr_employee_education_employer_family.xml
index ebda49b45..4cfe126ae 100644
--- a/addons_extensions/hr_recruitment_extended/views/hr_employee_education_employer_family.xml
+++ b/addons_extensions/hr_recruitment_extended/views/hr_employee_education_employer_family.xml
@@ -29,7 +29,7 @@
                                     name="action_validate_personal_details"
                                     type="object"
                                     class="btn btn-danger"
-                                    invisible="not employee_id">
+                                    invisible="employee_id">
                                 <div>
                                      Click here to save, Validate and Update into Employee Data
                                 <field name="personal_details_status"
diff --git a/addons_extensions/hr_recruitment_extended/views/hr_recruitment.xml b/addons_extensions/hr_recruitment_extended/views/hr_recruitment.xml
index 61a1128f6..6e3620a02 100644
--- a/addons_extensions/hr_recruitment_extended/views/hr_recruitment.xml
+++ b/addons_extensions/hr_recruitment_extended/views/hr_recruitment.xml
@@ -276,6 +276,16 @@
                 </xpath>
             </field>
         </record>
+        <record id="hr_candidate_view_tree_inherit" model="ir.ui.view">
+            <field name="name">hr.candidate.view.tree.inherit</field>
+            <field name="model">hr.candidate</field>
+            <field name="inherit_id" ref="hr_recruitment.hr_candidate_view_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//list" position="attributes">
+                    <attribute name="default_order">id desc</attribute>
+                </xpath>
+            </field>
+        </record>
         <record id="hr_candidate_view_kanban_inherit" model="ir.ui.view">
             <field name="name">hr.candidate.view.kanban.inherit</field>
             <field name="model">hr.candidate</field>
@@ -284,14 +294,30 @@
                 <!-- Ensure applicant_ids is included in the kanban field list -->
                 <xpath expr="//kanban" position="inside">
                     <field name="applicant_ids" context="{'active_test': False}"/>
+                    <field name="candidate_image"/>
                 </xpath>
 
                 <xpath expr="//kanban" position="attributes">
                     <attribute name="context">{'active_test': False, 'kanban': True}</attribute>
+                    <attribute name="default_order">id desc</attribute>
                 </xpath>
 
                 <xpath expr="//field[@name='partner_name']" position="before">
-                    <field t-if="record.candidate_sequence.raw_value" name="candidate_sequence" class="fw-bold fs-4"/>
+                    <div class="d-flex justify-content-between align-items-start">
+                        <div class="flex-grow-1">
+                            <field t-if="record.candidate_sequence.raw_value"
+                                   name="candidate_sequence"
+                                   class="fw-bold fs-4"/>
+                            <!-- <field name="partner_name" class="fw-bold fs-5"/>-->
+                        </div>
+                                            <t t-if="record.candidate_image.raw_value">
+                                                <field name="candidate_image"
+                               widget="image"
+                               class="rounded-circle ms-2"
+                               options="{'size': [48, 48]}"/>
+
+                    </t>
+                    </div>
                 </xpath>
 
                 <xpath expr="//t[@t-name='card']" position="inside">
diff --git a/addons_extensions/hr_recruitment_extended/wizards/post_onboarding_attachment_wizard.py b/addons_extensions/hr_recruitment_extended/wizards/post_onboarding_attachment_wizard.py
index b7aefcee0..145505d9e 100644
--- a/addons_extensions/hr_recruitment_extended/wizards/post_onboarding_attachment_wizard.py
+++ b/addons_extensions/hr_recruitment_extended/wizards/post_onboarding_attachment_wizard.py
@@ -98,7 +98,6 @@ class PostOnboardingAttachmentWizard(models.TransientModel):
                 lambda a: a.attachment_type == 'previous_employer').mapped('name')
             other_docs = rec.req_attachment_ids.filtered(lambda a: a.attachment_type == 'others').mapped('name')
 
-            print(request_upload_url)
             email_context = {
                 'applicant_request_form_id': rec.request_form_id.id,
                 'applicant_request_form_token': request_token,
diff --git a/addons_extensions/hrms_emp_dashboard/controllers/hrms_emp_dashboard.py b/addons_extensions/hrms_emp_dashboard/controllers/hrms_emp_dashboard.py
index 6c6ee5e0f..150aa9f59 100644
--- a/addons_extensions/hrms_emp_dashboard/controllers/hrms_emp_dashboard.py
+++ b/addons_extensions/hrms_emp_dashboard/controllers/hrms_emp_dashboard.py
@@ -37,7 +37,6 @@ class HrmsEmployeeDashboard(http.Controller):
         calendar_attendances = self._get_attendances(employee, calendar_start, calendar_end)
         calendar_leaves = self._get_leaves(employee, calendar_start, calendar_end)
         calendar_public_holidays = self._get_public_holidays(employee, calendar_start, calendar_end)
-        print(self._expense_data(employee, range_start, range_end))
         return {
             "success": True,
             "employee": self._employee_card(employee),
@@ -325,12 +324,6 @@ class HrmsEmployeeDashboard(http.Controller):
             ("date", "<=", date_to),
         ])
         for expense in emp_expenses:
-            print(
-                "Expense: %s | Date: %s | Amount: %s",
-                expense.name,
-                expense.date,
-                expense.total_amount
-            )
             totals[expense.date.strftime("%Y-%m")] += expense.total_amount or 0.0
             state_totals[expense.state or "draft"] += expense.total_amount or 0.0
 
diff --git a/addons_extensions/offer_letters/__manifest__.py b/addons_extensions/offer_letters/__manifest__.py
index b7a27c728..3104f490b 100644
--- a/addons_extensions/offer_letters/__manifest__.py
+++ b/addons_extensions/offer_letters/__manifest__.py
@@ -12,6 +12,7 @@
     'data': [
         'security/ir.model.access.csv',
         'data/mail_template.xml',
+        'views/stages.xml',
         'views/offer_letter_views.xml',
         'views/hr_applicant_offer_views.xml',
         'views/offer_response_templates.xml',
diff --git a/addons_extensions/offer_letters/models/__init__.py b/addons_extensions/offer_letters/models/__init__.py
index 3afed8da1..2e82655fc 100644
--- a/addons_extensions/offer_letters/models/__init__.py
+++ b/addons_extensions/offer_letters/models/__init__.py
@@ -1,3 +1,4 @@
+from . import stages
 from . import offer_letter
 from . import hr_applicant
 from . import hr_candidate
\ No newline at end of file
diff --git a/addons_extensions/offer_letters/models/hr_applicant.py b/addons_extensions/offer_letters/models/hr_applicant.py
index b47e5e51c..5f768a093 100644
--- a/addons_extensions/offer_letters/models/hr_applicant.py
+++ b/addons_extensions/offer_letters/models/hr_applicant.py
@@ -26,6 +26,8 @@ class HRApplicant(models.Model):
         store=False,
     )
 
+    request_offer_release = fields.Boolean(related='recruitment_stage_id.request_offer_release')
+
     @api.depends('offer_letter_ids', 'offer_letter_ids.create_date', 'offer_letter_ids.state')
     def _compute_current_offer_letter(self):
         for applicant in self:
diff --git a/addons_extensions/offer_letters/models/offer_letter.py b/addons_extensions/offer_letters/models/offer_letter.py
index d8b18eea7..25287fccb 100644
--- a/addons_extensions/offer_letters/models/offer_letter.py
+++ b/addons_extensions/offer_letters/models/offer_letter.py
@@ -174,12 +174,12 @@ class OfferLetter(models.Model):
         first_day = today.replace(day=1)
         last_day = today.replace(day=calendar.monthrange(today.year, today.month)[1])
 
-        payslip = self.env['hr.payslip'].new({
+        payslip = self.env['hr.payslip'].sudo().new({
             'date_from': first_day,
             'date_to': last_day,
         })
 
-        contract = self.env['hr.contract'].new({
+        contract = self.env['hr.contract'].sudo().new({
             'date_start': first_day,
             'date_end': last_day,
             'l10n_in_medical_insurance':self.mi,
@@ -205,7 +205,7 @@ class OfferLetter(models.Model):
             'inputs': {},
         }
         blacklisted_ids = set(self.env.context.get('prevent_payslip_computation_line_ids', []))
-        for rule in sorted(self.pay_struct_id.rule_ids, key=lambda r: r.sequence):
+        for rule in sorted(self.sudo().pay_struct_id.rule_ids, key=lambda r: r.sequence):
             if rule.id in blacklisted_ids or not rule._satisfy_condition(localdict):
                 continue
             qty = 1.0
@@ -223,15 +223,15 @@ class OfferLetter(models.Model):
             except Exception as e:
                 raise UserError(_("Error in rule %s: %s") % (rule.name, str(e)))
 
-            total = payslip._get_payslip_line_total(amount, qty, rate, rule)
+            total = payslip.sudo()._get_payslip_line_total(amount, qty, rate, rule)
             rule_code = rule.code
             previous_amount = localdict.get(rule.code, 0.0)
             category_code = rule.category_id.code
-            tot_rule = payslip._get_payslip_line_total(amount, qty, rate, rule)
+            tot_rule = payslip.sudo()._get_payslip_line_total(amount, qty, rate, rule)
 
             # Make sure _sum_salary_rule_category method exists
             if hasattr(rule.category_id, '_sum_salary_rule_category'):
-                localdict = rule.category_id._sum_salary_rule_category(localdict, tot_rule - previous_amount)
+                localdict = rule.category_id.sudo()._sum_salary_rule_category(localdict, tot_rule - previous_amount)
 
             localdict[rule_code] = total
             rules_dict[rule_code] = rule
diff --git a/addons_extensions/offer_letters/models/stages.py b/addons_extensions/offer_letters/models/stages.py
new file mode 100644
index 000000000..8699343c0
--- /dev/null
+++ b/addons_extensions/offer_letters/models/stages.py
@@ -0,0 +1,6 @@
+from odoo import models, fields, api, _
+
+class RecruitmentStage(models.Model):
+    _inherit = 'hr.recruitment.stage'
+
+    request_offer_release = fields.Boolean(string="Request Offer Release")
\ No newline at end of file
diff --git a/addons_extensions/offer_letters/views/hr_applicant_offer_views.xml b/addons_extensions/offer_letters/views/hr_applicant_offer_views.xml
index 34cb2153c..ff04f7765 100644
--- a/addons_extensions/offer_letters/views/hr_applicant_offer_views.xml
+++ b/addons_extensions/offer_letters/views/hr_applicant_offer_views.xml
@@ -26,7 +26,7 @@
             <xpath expr="//button[@name='action_share_applicant']" position="before">
                 <button name="action_request_offer_release" string="Request Offer Release" type="object" class="btn-primary"
                         groups="hr_recruitment.group_hr_recruitment_user"
-                        invisible="not id"/>
+                        invisible="not id or not request_offer_release"/>
             </xpath>
             <xpath expr="//notebook/page[@name='request_forms']" position="after">
                 <page string="Offer Letters" name="offer_letters">
diff --git a/addons_extensions/offer_letters/views/stages.xml b/addons_extensions/offer_letters/views/stages.xml
new file mode 100644
index 000000000..b9915559d
--- /dev/null
+++ b/addons_extensions/offer_letters/views/stages.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record model="ir.ui.view" id="hr_recruitment_stage_offer_request_form_extended">
+      <field name="name">hr.recruitment.stage.form.offer.request.extended</field>
+      <field name="model">hr.recruitment.stage</field>
+      <field name="inherit_id" ref="hr_recruitment.hr_recruitment_stage_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//field[@name='fold']" position="after">
+            <field name="request_offer_release"/>
+        </xpath>
+      </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/addons_extensions/offer_letters/wizards/offer_release_request_wizard.py b/addons_extensions/offer_letters/wizards/offer_release_request_wizard.py
index 960bf1ed5..461836a76 100644
--- a/addons_extensions/offer_letters/wizards/offer_release_request_wizard.py
+++ b/addons_extensions/offer_letters/wizards/offer_release_request_wizard.py
@@ -70,7 +70,7 @@ class OfferReleaseRequestWizard(models.TransientModel):
 
     def _get_default_pay_structure(self, applicant):
         company = applicant.company_id or self.env.company
-        return self.env['hr.payroll.structure'].search([
+        return self.env['hr.payroll.structure'].sudo().search([
         ], limit=1)
 
     def _get_default_manager(self, applicant):
@@ -104,7 +104,7 @@ class OfferReleaseRequestWizard(models.TransientModel):
             f"<p><a href=\"{offer_url}\">Review Offer Letter Request</a></p>"
         )
 
-        mail = self.env['mail.mail'].create({
+        mail = self.env['mail.mail'].sudo().create({
             'email_from': self.email_from,
             'email_to': self.email_to,
             'email_cc': self.email_cc,
@@ -114,5 +114,5 @@ class OfferReleaseRequestWizard(models.TransientModel):
             'model': 'offer.letter',
             'res_id': offer_letter.id,
         })
-        mail.send()
+        mail.sudo().send()
         return {'type': 'ir.actions.act_window_close'}
diff --git a/addons_extensions/project_dashboards_management/controllers/project_dashboard_controller.py b/addons_extensions/project_dashboards_management/controllers/project_dashboard_controller.py
index c40efffd5..a9465b408 100644
--- a/addons_extensions/project_dashboards_management/controllers/project_dashboard_controller.py
+++ b/addons_extensions/project_dashboards_management/controllers/project_dashboard_controller.py
@@ -20,19 +20,15 @@ class ProjectDashboardController(http.Controller):
 
             # 1. Get project data
             project_data = self._get_project_data(project)
-            print(project_data)
 
             # 2. Get tasks data
             tasks_data = self._get_tasks_data(project)
-            print(tasks_data)
 
             # 3. Get employee performance
             employee_performance = self._get_employee_performance(project)
-            print(employee_performance)
 
             # 4. Get budget data
             budget_data = self._get_budget_data(project)
-            print(budget_data)
 
             return {
                 'success': True,
diff --git a/addons_extensions/search_view_extension/static/src/search_tabs/search_tabs.scss b/addons_extensions/search_view_extension/static/src/search_tabs/search_tabs.scss
index 6e4f70c97..0807c9a0c 100644
--- a/addons_extensions/search_view_extension/static/src/search_tabs/search_tabs.scss
+++ b/addons_extensions/search_view_extension/static/src/search_tabs/search_tabs.scss
@@ -7,4 +7,8 @@
         color: var(--body-color, #374151);
         padding: 0.35rem 0.75rem;
     }
+
+    .nav-link.active {
+        color: #fff !important;
+    }
 }
diff --git a/addons_extensions/web_portal_form_custom/models/application_candidate_changes.py b/addons_extensions/web_portal_form_custom/models/application_candidate_changes.py
index 7765427cf..cb1d6edac 100644
--- a/addons_extensions/web_portal_form_custom/models/application_candidate_changes.py
+++ b/addons_extensions/web_portal_form_custom/models/application_candidate_changes.py
@@ -36,6 +36,12 @@ class ApplicantCandidate(models.Model):
         string="Resume Type"
     )
 
+
+    certificate_ids = fields.Many2many(
+        'applicant.certificate',
+        string='Certificates'
+    )
+
     def action_open_resume_candidate(self):
         self.ensure_one()
 
@@ -152,9 +158,10 @@ class CandidateApplicant(models.Model):
         string="Online Tests"
     )
 
-    certificate_ids = fields.One2many(
+    certificate_ids = fields.Many2many(
         'applicant.certificate',
-        'applicant_id',
+        related='candidate_id.certificate_ids',
+        readonly=False,
         string='Certificates'
     )
 
diff --git a/addons_extensions/web_portal_form_custom/static/src/css/candidate_card.css b/addons_extensions/web_portal_form_custom/static/src/css/candidate_card.css
index 92ad5230e..cddc626f3 100644
--- a/addons_extensions/web_portal_form_custom/static/src/css/candidate_card.css
+++ b/addons_extensions/web_portal_form_custom/static/src/css/candidate_card.css
@@ -51,4 +51,25 @@
 
 .job-name {
     font-size: 0.9rem;
+}
+
+/* Make the email field occupy the available width */
+.o_field_widget[name="email_from"] {
+    width: 100% !important;
+    max-width: none !important;
+    flex: 1 1 auto !important;
+}
+
+/* Input inside the email field */
+.o_field_widget[name="email_from"] input {
+    width: 100% !important;
+    max-width: none !important;
+    min-width: 350px !important;   /* adjust as needed */
+}
+
+/* If rendered as a link instead of input */
+.o_field_widget[name="email_from"] a {
+    white-space: nowrap !important;
+    overflow: visible !important;
+    text-overflow: clip !important;
 }
\ No newline at end of file
diff --git a/addons_extensions/web_portal_form_custom/views/hr_applicant_form.xml b/addons_extensions/web_portal_form_custom/views/hr_applicant_form.xml
index 0e1632d1f..c1febe092 100644
--- a/addons_extensions/web_portal_form_custom/views/hr_applicant_form.xml
+++ b/addons_extensions/web_portal_form_custom/views/hr_applicant_form.xml
@@ -105,6 +105,7 @@
 
                                         <div class="candidate-name">
                                             <field name="candidate_id"
+                                                   options="{'no_quick_create': True}"
                                                    nolabel="1"
                                                    can_create="True"
                                                    can_write="True"/>
@@ -268,7 +269,7 @@
                                     <!-- EXPERIENCE TAB -->
                                     <page string="Past Experience">
 
-                                        <field name="employer_history" nolabel="1">
+                                        <field name="employer_history" nolabel="1" force_save="1">
 
                                             <kanban create="1" class="o_kanban_mobile">
 
diff --git a/addons_extensions/web_portal_form_custom/views/hr_candidate_form.xml b/addons_extensions/web_portal_form_custom/views/hr_candidate_form.xml
index d1a604d10..7a8930a14 100644
--- a/addons_extensions/web_portal_form_custom/views/hr_candidate_form.xml
+++ b/addons_extensions/web_portal_form_custom/views/hr_candidate_form.xml
@@ -84,6 +84,232 @@
                                        options="{'color_field':'color','no_create':True}"/>
                             </group>
                         </group>
+                                                        <notebook>
+
+                                    <!-- EXPERIENCE TAB -->
+                                    <page string="Past Experience">
+
+                                        <field name="employer_history" nolabel="1" force_save="1">
+
+                                            <kanban create="1" class="o_kanban_mobile">
+
+                                                <templates>
+
+                                                    <t t-name="card">
+
+                                                        <div class="oe_kanban_global_click shadow-sm rounded-4 p-3 mb-3 bg-white border"
+                                                             style="border-left:4px solid #4F46E5 !important;">
+
+                                                            <div class="d-flex justify-content-between">
+
+                                                                <div class="fw-bold fs-4 text-dark">
+                                                                    <field name="designation"/>
+                                                                </div>
+
+                                                            </div>
+
+                                                            <div class="mt-2">
+                                                                <i class="fa fa-building me-1 text-primary"/>
+                                                                <strong>Company:</strong>
+                                                                <field name="company_name"/>
+                                                            </div>
+
+                                                            <div class="mt-2 text-muted">
+                                                                <i class="fa fa-calendar me-1 text-dark"/>
+                                                                <field name="date_of_joining"/>
+                                                                -
+
+                                                                <field name="last_working_day"/>
+                                                            </div>
+                                                            <div class="mt-2 text-muted">
+                                                                <i class="fa fa-money me-1 text-success"/>
+                                                                <span class="fw-bold text-dark me-1">
+                                                                    CTC :
+                                                                </span>
+                                                                <field name="ctc"/>
+                                                            </div>
+                                                            <div class="mt-3 p-3 rounded-3 border bg-light"
+                                                                 style="border-left:4px solid #875A7B !important;">
+                                                                <div class="fw-bold mb-2 text-primary fs-6">
+                                                                    <i class="fa fa-file-text-o me-1"/>
+                                                                    Summary
+                                                                </div>
+                                                                <div style="font-size:13px; line-height:1.7;"
+                                                                     class="text-dark">
+                                                                    <field name="summary"/>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </t>
+                                                </templates>
+                                            </kanban>
+
+                                            <!-- FORM -->
+                                            <form string="Employer Details">
+
+                                                <sheet>
+
+                                                    <group>
+
+                                                        <group>
+                                                            <field name="company_name"/>
+                                                            <field name="designation"/>
+                                                        </group>
+                                                        <group>
+                                                            <field name="date_of_joining"/>
+                                                            <field name="last_working_day"/>
+                                                            <field name="ctc"/>
+                                                        </group>
+                                                        <group>
+                                                            <field name="summary"
+                                                                   widget="html"/>
+                                                        </group>
+
+                                                    </group>
+
+                                                </sheet>
+
+                                            </form>
+
+                                        </field>
+
+                                    </page>
+
+                                    <!-- EDUCATION TAB -->
+                                    <page string="Education">
+
+                                        <field name="education_history" nolabel="1">
+
+                                            <kanban create="1" class="o_kanban_mobile">
+
+                                                <templates>
+
+                                                    <t t-name="card">
+
+                                                        <div class="oe_kanban_global_click shadow-sm rounded-4 p-3 mb-3 bg-white border"
+                                                             style="border-left:4px solid #4F46E5 !important;">
+
+                                                            <div class="fw-bold fs-5 text-dark">
+                                                                <field name="name"/>
+                                                            </div>
+
+                                                            <div class="mt-2">
+                                                                <i class="fa fa-university me-1 text-primary"/>
+                                                                <strong>University:</strong>
+                                                                <field name="university"/>
+                                                            </div>
+
+                                                            <div class="mt-2">
+                                                                <strong>Education:</strong>
+                                                                <span class="badge rounded-pill text-bg-light border px-3 py-2">
+                                                                    <field name="education_type"/>
+                                                                </span>
+                                                            </div>
+
+                                                            <div class="mt-2 text-muted">
+                                                                <i class="fa fa-calendar me-1 text-dark"/>
+
+
+                                                                <field name="start_year"/>
+                                                                -
+
+                                                                <field name="end_year"/>
+
+                                                            </div>
+
+                                                            <div class="mt-3 p-2 rounded-3 bg-light">
+
+                                                                <span class="fw-bold text-dark">
+                                                                    Grade:
+                                                                </span>
+                                                                <field name="marks_or_grade"/>
+                                                            </div>
+
+                                                        </div>
+                                                    </t>
+                                                </templates>
+                                            </kanban>
+                                            <form>
+                                                <sheet>
+                                                    <group>
+                                                        <group>
+                                                            <field name="education_type"/>
+                                                            <field name="name"/>
+                                                            <field name="university"/>
+                                                        </group>
+                                                        <group>
+                                                            <field name="start_year"/>
+                                                            <field name="end_year"/>
+                                                            <field name="marks_or_grade"/>
+                                                        </group>
+                                                    </group>
+                                                </sheet>
+                                            </form>
+                                        </field>
+                                    </page>
+                                    <page string="Certificates">
+
+                                        <field name="certificate_ids" nolabel="1">
+
+                                            <kanban create="1" class="o_kanban_mobile">
+
+                                                <templates>
+
+                                                    <t t-name="card">
+
+                                                        <div class="oe_kanban_global_click shadow-sm rounded-4 p-3 mb-3 bg-white border"
+                                                             style="border-left:4px solid #F97316 !important;">
+
+                                                            <div class="fw-bold fs-5 text-dark">
+
+                                                                <i class="fa fa-certificate text-warning me-2"/>
+
+                                                                <field name="name"/>
+
+                                                            </div>
+
+                                                            <div class="mt-3">
+
+                                                                <field name="certificate_file"
+                                                                       filename="certificate_filename"
+                                                                       widget="binary"/>
+
+                                                            </div>
+
+                                                        </div>
+
+                                                    </t>
+
+                                                </templates>
+
+                                            </kanban>
+
+                                            <!-- FORM -->
+                                            <form string="Certificate">
+
+                                                <sheet>
+
+                                                    <group>
+
+                                                        <field name="name"/>
+
+                                                        <field name="certificate_file"
+                                                               filename="certificate_filename"/>
+
+                                                        <field name="certificate_filename"
+                                                               invisible="1"/>
+
+                                                    </group>
+
+                                                </sheet>
+
+                                            </form>
+
+                                        </field>
+
+                                    </page>
+                                </notebook>
+
                     </page>
                     <page string="Resume" name="resume_page">
                         <group>
diff --git a/addons_extensions/website_hr_recruitment_extended/controllers/main.py b/addons_extensions/website_hr_recruitment_extended/controllers/main.py
index 118002c53..1f34f5ef4 100644
--- a/addons_extensions/website_hr_recruitment_extended/controllers/main.py
+++ b/addons_extensions/website_hr_recruitment_extended/controllers/main.py
@@ -956,7 +956,6 @@ class WebsiteJobHrRecruitment(WebsiteHrRecruitment):
                         ))
 
                     error_message = 'An application already exists for %s Duplicates might be rejected. %s '%(value,recruiter_contact)
-                    print(error_message)
                     return {
                         'message': _(error_message)
                     }
diff --git a/addons_extensions/website_hr_recruitment_extended/models/website.py b/addons_extensions/website_hr_recruitment_extended/models/website.py
index 62b15cb31..56c8926a5 100644
--- a/addons_extensions/website_hr_recruitment_extended/models/website.py
+++ b/addons_extensions/website_hr_recruitment_extended/models/website.py
@@ -16,6 +16,4 @@ class Website(models.Model):
         result = super()._search_get_details(search_type, order, options)
         if search_type in ['job_requests', 'all']:
             result.append(self.env['hr.job.recruitment']._search_get_detail(self, order, options))
-            print(result)
-            print("hello result")
         return result