diff --git a/app/Controllers/Department.php b/app/Controllers/Department.php
index 0c2daa07..79d4d956 100755
--- a/app/Controllers/Department.php
+++ b/app/Controllers/Department.php
@@ -251,9 +251,18 @@ class Department extends BaseController
 
         $data = $this->request->getPost();
         $departmentName = str_replace(" ","",$data['departmentName']);
-        $depCode =$data['depCode'];
+
+        $depCode = $data['depCode'];
+
+        $headDepCode =$data['headDepCode'];
+
         $departmentName = $data['departmentName'];
-        $result = $this->department_model->checkDepartmentName($depCode,$departmentName);
+
+        $departmentName = str_replace(" ","",$departmentName);
+
+        $result = $this->department_model->checkDepartmentName($departmentName , $headDepCode , $depCode);
+
+
         return $this->response->setJSON($result);
 
     }
diff --git a/app/Models/Department_model.php b/app/Models/Department_model.php
index c5d87d7d..50730b21 100755
--- a/app/Models/Department_model.php
+++ b/app/Models/Department_model.php
@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 namespace App\Models;
 
 use CodeIgniter\Model;
@@ -10,38 +11,38 @@ class Department_model extends Model
      * @param string $searchText : This is optional search text
      * @return number $count : This is row count
      */
-  // function departmentListingCount($searchText = '')
-  //   {
-  //       ->select('BaseT.DepartmentID, BaseT.SupplierName, BaseT.Address,  BaseT.ContactNumber,  BaseT.AlternateContactNumber,BaseT.EmailAddress,BaseT.Exiseregistration,BaseT.TIN,BaseT.PAN,BaseT.GSTNO,BaseT.GSTRange,BaseT.CollectrateAddress,BaseT.UANumber,BaseT.PaymentTerms,BaseT.PaymentDays,BaseT.PayableAT');
-  //       $builder = $this->db->table('t_departmentdetails as BaseT');
-  //       //->join('tbl_users as users', 'users.userId = BaseT.userId','left');
-  //       //->join('T_SupplierDetails as ID', 'ID.DepartmentID = BaseT.DepartmentID','left');
-  //       if(!empty($searchText)) {
-  //           $likeCriteria = "(BaseT.DepartmentID  LIKE '%".$searchText."%'
-  //                           OR  BaseT.SupplierName  LIKE '%".$searchText."%'
-  //                           OR  BaseT.Address  LIKE '%".$searchText."%'
-  //                           OR  BaseT.ContactNumber  LIKE '%".$searchText."%'
-  //                           OR  BaseT.AlternateContactNumber  LIKE '%".$searchText."%'
-  //                           OR  BaseT.EmailAddress  LIKE '%".$searchText."%'
-  //                           OR  BaseT.Exiseregistration  LIKE '%".$searchText."%'
-  //                           OR  BaseT.TIN  LIKE '%".$searchText."%'
-  //                           OR  BaseT.PAN  LIKE '%".$searchText."%'
-  //                           OR  BaseT.GSTNO  LIKE '%".$searchText."%'
-  //                           OR  BaseT.GSTRange  LIKE '%".$searchText."%'
-  //                           OR  BaseT.CollectrateAddress  LIKE '%".$searchText."%'
-  //                           OR  BaseT.UANumber  LIKE '%".$searchText."%'
-  //                           OR  BaseT.PaymentTerms  LIKE '%".$searchText."%'
-  //                           OR  BaseT.PaymentDays  LIKE '%".$searchText."%'
-  //                           OR  BaseT.PayableAT  LIKE '%".$searchText."%')";
-  //           $this->db->where($likeCriteria);
-  //       }
-  //       //$this->db->where('BaseT.isDeleted', 0);
-  //       //$this->db->where('BaseT.userId !=', 1);
-  //       $query =$builder->get();
-        
-  //       return count($query-getResult());
-  //   }
-	/**
+    // function departmentListingCount($searchText = '')
+    //   {
+    //       ->select('BaseT.DepartmentID, BaseT.SupplierName, BaseT.Address,  BaseT.ContactNumber,  BaseT.AlternateContactNumber,BaseT.EmailAddress,BaseT.Exiseregistration,BaseT.TIN,BaseT.PAN,BaseT.GSTNO,BaseT.GSTRange,BaseT.CollectrateAddress,BaseT.UANumber,BaseT.PaymentTerms,BaseT.PaymentDays,BaseT.PayableAT');
+    //       $builder = $this->db->table('t_departmentdetails as BaseT');
+    //       //->join('tbl_users as users', 'users.userId = BaseT.userId','left');
+    //       //->join('T_SupplierDetails as ID', 'ID.DepartmentID = BaseT.DepartmentID','left');
+    //       if(!empty($searchText)) {
+    //           $likeCriteria = "(BaseT.DepartmentID  LIKE '%".$searchText."%'
+    //                           OR  BaseT.SupplierName  LIKE '%".$searchText."%'
+    //                           OR  BaseT.Address  LIKE '%".$searchText."%'
+    //                           OR  BaseT.ContactNumber  LIKE '%".$searchText."%'
+    //                           OR  BaseT.AlternateContactNumber  LIKE '%".$searchText."%'
+    //                           OR  BaseT.EmailAddress  LIKE '%".$searchText."%'
+    //                           OR  BaseT.Exiseregistration  LIKE '%".$searchText."%'
+    //                           OR  BaseT.TIN  LIKE '%".$searchText."%'
+    //                           OR  BaseT.PAN  LIKE '%".$searchText."%'
+    //                           OR  BaseT.GSTNO  LIKE '%".$searchText."%'
+    //                           OR  BaseT.GSTRange  LIKE '%".$searchText."%'
+    //                           OR  BaseT.CollectrateAddress  LIKE '%".$searchText."%'
+    //                           OR  BaseT.UANumber  LIKE '%".$searchText."%'
+    //                           OR  BaseT.PaymentTerms  LIKE '%".$searchText."%'
+    //                           OR  BaseT.PaymentDays  LIKE '%".$searchText."%'
+    //                           OR  BaseT.PayableAT  LIKE '%".$searchText."%')";
+    //           $this->db->where($likeCriteria);
+    //       }
+    //       //$this->db->where('BaseT.isDeleted', 0);
+    //       //$this->db->where('BaseT.userId !=', 1);
+    //       $query =$builder->get();
+
+    //       return count($query-getResult());
+    //   }
+    /**
      * This function is used to get the user listing count
      * @param string $searchText : This is optional search text
      * @param number $page : This is pagination offset
@@ -51,13 +52,13 @@ class Department_model extends Model
     function departmentListing()
     {
         $builder = $this->db->table('t_departmentdetails as BaseT')
-        ->select('BaseT.CreatedDt,BaseT.DepartmentName, BaseT.DEPCode, BaseT.HeadDept,  BaseT.IsActive')
-        ->orderBy("BaseT.DEPCode", "desc");
-        $query =$builder->get();
-        $result = $query->getResult();        
+            ->select('BaseT.CreatedDt,BaseT.DepartmentName, BaseT.DEPCode, BaseT.HeadDept,  BaseT.IsActive')
+            ->orderBy("BaseT.DEPCode", "desc");
+        $query = $builder->get();
+        $result = $query->getResult();
         return $result;
     }
-    
+
     // function ($searchText = '')
     // {
     //    if(!empty($searchText)) {
@@ -71,99 +72,141 @@ class Department_model extends Model
     //     //$this->db->where('BaseT.userId !=', 1);
     //    // $this->db->limit($page, $segment);
     //     $query =$builder->get();
-        
+
     //     $result = $query->getResult();        
     //     return $result;
     // }
-	/**
-     * This function used to get user information by id
-     * @param number $userId : This is user id
-     * @return array $result : This is user information
-     */
-   
-function savedepartment($department)
-    {
-       
-        $builder = $this->db->table('t_departmentdetails');
-		$builder->insert($department);
- 
-		 $SID = $this->db->affectedRows();
-
-        return $SID;
-       
-    }
-	
-function getdepcode()
-{
-    //$limit = 12;
-    $builder = $this->db->table('t_departmentdetails')
-	->distinct()
-    ->select('DEPCode, DepartmentName')
-    ->where('IsActive =', 1);
-    //$this->db->limit($limit);
-	$query =$builder->get();
-        
-        return $query->getResult();
-}
-    
     /**
      * This function used to get user information by id
      * @param number $userId : This is user id
      * @return array $result : This is user information
      */
-	 function getDeptInfo($DEPCode='')
+
+    function savedepartment($department)
     {
+
+        $builder = $this->db->table('t_departmentdetails');
+        $builder->insert($department);
+
+        $SID = $this->db->affectedRows();
+
+        return $SID;
+    }
+
+    function getdepcode()
+    {
+        //$limit = 12;
         $builder = $this->db->table('t_departmentdetails')
-        ->select('*')
-        ->where('DEPCode', $DEPCode);
-        $query =$builder->get();
-       
+            ->distinct()
+            ->select('DEPCode, DepartmentName')
+            ->where('IsActive =', 1);
+        //$this->db->limit($limit);
+        $query = $builder->get();
+
         return $query->getResult();
     }
-	/* This function to get the Supplier Address on respective Supplier ID */
-	
-	function Updatedepartment($department, $DEPCode)
+
+    /**
+     * This function used to get user information by id
+     * @param number $userId : This is user id
+     * @return array $result : This is user information
+     */
+    function getDeptInfo($DEPCode = '')
+    {
+        $builder = $this->db->table('t_departmentdetails')
+            ->select('*')
+            ->where('DEPCode', $DEPCode);
+        $query = $builder->get();
+
+        return $query->getResult();
+    }
+    /* This function to get the Supplier Address on respective Supplier ID */
+
+    function Updatedepartment($department, $DEPCode)
     {
         $this->db->table('t_departmentdetails')
-        ->where('DEPCode', $DEPCode)
-			->update($department);
-		$res = $this->db->affectedRows();
-		return $res;
-
+            ->where('DEPCode', $DEPCode)
+            ->update($department);
+        $res = $this->db->affectedRows();
+        return $res;
     }
 
-    function reActivateDepartment($depCode , $updateInfo){
+    function reActivateDepartment($depCode, $updateInfo)
+    {
         $this->db->table('t_departmentdetails')
-        ->where('DEPCode', $depCode)
-			->update($updateInfo);
-		$res = $this->db->affectedRows();
-		return $res;
+            ->where('DEPCode', $depCode)
+            ->update($updateInfo);
+        $res = $this->db->affectedRows();
+        return $res;
     }
 
 
-    function deleteDepartment($depCode , $updateInfo){
+    function deleteDepartment($depCode, $updateInfo)
+    {
         $this->db->table('t_departmentdetails')
-        ->where('DEPCode', $depCode)
-			->update($updateInfo);
-		$res = $this->db->affectedRows();
-		return $res;
+            ->where('DEPCode', $depCode)
+            ->update($updateInfo);
+        $res = $this->db->affectedRows();
+        return $res;
     }
 
 
-    function checkDepartmentName($depCode ,$departmentName){
-       $builder = $this->db->table('t_departmentdetails');
+    function checkDepartmentName($departmentName, $headDepCode, $depCode)
+    {
 
-       if(!empty($depCode)){
-          $builder = $builder -> where(' DEPCode !=', $depCode);
-       }
+        $builder = $this->db->table('t_departmentdetails');
 
-      $builder =  $builder->where('REPLACE(DepartmentName , " ", "") ',$departmentName);
-      $query = $builder->get();
-      $result =$query->getResultArray();
-	  return $result;
+        //post
+        if(empty($depCode)) {
+            $builder = $builder->where(' HeadDept =', $headDepCode);
+        }
 
+        //put
+        if(!empty($depCode)){
+            
+            //allowing current department name to be changed 
+            //but not other department to get same name
+
+            $builder = $builder->where(' DEPCode !=', $depCode);
+            $builder = $builder->where(' HeadDept =', $headDepCode);
+        }
+
+        $builder =  $builder->where('REPLACE(DepartmentName , " ", "") ', $departmentName);
+
+        $query = $builder->get();
+      
+        $result = $query->getResultArray();
+     
+        return $result;
+
+        
     }
 
-    
-	}
-?>
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/app/Views/adddepartment.php b/app/Views/adddepartment.php
index 231cbad4..2004f0f3 100755
--- a/app/Views/adddepartment.php
+++ b/app/Views/adddepartment.php
@@ -113,14 +113,14 @@
 
     $("#deptBtnId").on('click',function(){
         let departmentName = $("#DepartmentName").val().trim();
-        let depCode =$("#DEPCode").val()??'';
+        let headDepCode =$("#HeadDept").val()??'';
+        let depCode =$("#DEPCode").val() ?? '';
         $('#loader').show();
         $.ajax({
             type:"POST",
-            data:{departmentName,depCode},
+            data:{departmentName,headDepCode ,depCode},
             url:"<?php echo base_url();?>checkDepartmentName",
             success:function(data){
-
                 if(data && data.length >0){
                     let isActive = data[0]. IsActive;
                     if(isActive == 1){
diff --git a/app/Views/editdepartment.php b/app/Views/editdepartment.php
index 65d87b82..da283800 100755
--- a/app/Views/editdepartment.php
+++ b/app/Views/editdepartment.php
@@ -176,10 +176,12 @@
 $("#deptBtnId").on('click',function(){
     let departmentName = $("#DepartmentName").val().trim();
     let depCode =$("#DEPCode").val();
+    let headDepCode = $("#HeadDept").val();
+
     $('#loader').show();
     $.ajax({
         type:"POST",
-        data:{departmentName,depCode},
+        data:{departmentName,headDepCode ,depCode},
         url:"<?php echo base_url();?>checkDepartmentName",
         success:function(data){