From f1ed2fec6e90c2fc6663e13b3809cf4589666792 Mon Sep 17 00:00:00 2001
From: Horilla <support@horilla.com>
Date: Tue, 15 Jul 2025 11:47:42 +0530
Subject: [PATCH] [FIX] STATIC: #819

---
 leave/models.py       | 10 ++++++++++
 static/index/index.js |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/leave/models.py b/leave/models.py
index 9d38c5de4..1a34e9f60 100644
--- a/leave/models.py
+++ b/leave/models.py
@@ -291,6 +291,16 @@ class LeaveType(HorillaModel):
                 )
 
     def save(self, *args, **kwargs):
+        request = getattr(horilla_middlewares._thread_locals, "request", None)
+        selected_company = request.session.get("selected_company")
+        if (
+            not self.id
+            and not self.company_id
+            and selected_company
+            and selected_company != "all"
+        ):
+            self.company_id = Company.find(selected_company)
+
         if (
             self.carryforward_type != "no carryforward"
             and self.carryforward_max is None
diff --git a/static/index/index.js b/static/index/index.js
index ce09501b7..36a3b93a3 100644
--- a/static/index/index.js
+++ b/static/index/index.js
@@ -209,6 +209,8 @@ function toggleReimbursmentType(element) {
             .parent()
             .hide()
             .attr("required", false);
+        // #819
+        $("#objectCreateModalTarget [name=employee_id]").trigger("change");
     } else if (element.val() == "bonus_encashment") {
         $("#objectCreateModalTarget [name=attachment]").parent().hide();
         $("#objectCreateModalTarget [name=attachment]").attr("required", false);