diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index c92e8115..2ec88ef2 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -41,6 +41,7 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'editUser', 'User::editUser');
 $routes->post('user/Deleteuserdepartment', 'User::Deleteuserdepartment');
 $routes->get('user/deleteUser', 'User::deleteUser');
 $routes->get('user/reActivateUser', 'User::reActivateUser');
+$routes->get('isEmailExists', 'User::isEmailExists');
 
 // Supplier Routes
 $routes->match(["GET","POST"],'supplierlisting', 'Supplier::index'); // list supplier
diff --git a/app/Controllers/Monthlypay.php b/app/Controllers/Monthlypay.php
index e29aba2e..469b535f 100755
--- a/app/Controllers/Monthlypay.php
+++ b/app/Controllers/Monthlypay.php
@@ -970,7 +970,7 @@ class Monthlypay extends BaseController
         $this->global['pageTitle'] = 'Employee Leave Application Form';        
         $data['leave_info'] = $this->monthlypay_model->getheringleaveApplicationForm();
         $data['employee_info'] = $this->monthlypay_model->getheringemployeeinformation();
-        $data['status_info'] = ["Draft","Approved"];
+        $data['status_info'] = ["Draft","Approved","Cancel"];
         $this->loadviews('employeeLeaveApplicationForm', $this->global, $data, NULL);
     }
 
diff --git a/app/Controllers/User.php b/app/Controllers/User.php
index 66466711..2f55a36d 100755
--- a/app/Controllers/User.php
+++ b/app/Controllers/User.php
@@ -1020,15 +1020,11 @@ class User extends BaseController
 
         // Validation passed
         $EmpID = $this->request->getPost('EmpList');
-        $roleId = !empty($this->request->getPost('role')) ? $this->request->getPost('role') : '2' ;
+        $roleId = $this->request->getPost('role');
         $password = (string)$this->request->getPost('password');
         $Createddt = date('Y-m-d H:i:s');
         $email = $this->request->getPost('MailID');
-        $SelectedDepartment = (string)$this->request->getPost('txtSelectedDepartment');
-        $comma_separated = explode(':', $SelectedDepartment);
-        if (count($comma_separated) == 1 && in_array('DEP27', $comma_separated)) {
-            $roleId = '6';
-        }
+        
         $userInfo = [
             'email' => $email,
             'EmpID' => $EmpID,
@@ -1040,16 +1036,7 @@ class User extends BaseController
 
         $result = $this->user_model->addNewUser($userInfo);
 
-        if ($SelectedDepartment != '') {
-            foreach ($comma_separated as $DeptCode) {
-                $userdept = [
-                    'EmpID' => $EmpID,
-                    'Departmentcode' => $DeptCode
-                ];
-                $access = $this->user_model->addAccess($userdept);
-            }
-        }
-
+        
         if ($result > 0) {
             // return redirect()->to('userListing')->with('success', 'New user created successfully!');
             $this->session->setFlashdata('success', 'New user created successfully!');
@@ -1072,6 +1059,27 @@ class User extends BaseController
         };
     }
 
+    function isEmailExists(){
+        
+        
+        $MailID = $this->request->getPost('MailID');
+        $empID = $this->request->getPost('EmpID'); 
+
+
+        if (!$MailID) {
+            return $this->response->setJSON(['success' => false, 'message' => 'Mail ID not provided']);
+        }
+
+        $isEmailExists = $this->user_model->isEmailExists($MailID,$empID);
+
+        if ($isEmailExists) {
+            return $this->response->setJSON(['success' => true, 'message' => 'Email Already Exsiting']);
+        } else {
+            return $this->response->setJSON(['success' => false, 'message' => '']);
+        }
+    
+    }
+
 
     function Deleteuserdepartment()
     {
diff --git a/app/Models/User_model.php b/app/Models/User_model.php
index ebafde7c..b0656cdf 100755
--- a/app/Models/User_model.php
+++ b/app/Models/User_model.php
@@ -340,4 +340,20 @@ GROUP BY financial_year ";
 
         return $query->getResult();
     }
+    
+
+    public function isEmailExists($email, $excludeEmpID = null)
+    {
+        $builder = $this->db->table('tbl_users');
+        $builder->select('email');
+        $builder->where('email', $email);
+
+        if (!empty($excludeEmpID)) {
+            $builder->where('EmpID !=', $excludeEmpID); 
+        }
+
+        $query = $builder->get();
+        return $query->getNumRows() > 0;
+    }
+
 }
\ No newline at end of file
diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index df60b841..7471ca43 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -1256,7 +1256,7 @@ if (!empty($getlogpodtl)) {
 											<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
 										<?php } ?>
 										<?php if(!$isChecked){ ?>
-										<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
+										<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success auditor-restricted-btn" id="abcd">Select Line Item</button> </a>
 										<?php } ?>
 									<?php } ?>
 								</div>
@@ -1395,7 +1395,7 @@ if (!empty($getlogpodtl)) {
 
 														if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
 															<td> <a data-target='#EDITSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="ri-pencil-fill" title="Click here to view/Edit the . <?php echo $record->ReqNo; ?> .Requisition details"></i></a>
-																<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
+																<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link auditor-restricted-btn" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
 															<?php
 														} else { ?>
 															<td> <a data-target='#VIEWSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWSERVICE"><i class="fa fa-eye" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
@@ -1659,7 +1659,7 @@ if (!empty($getlogpodtl)) {
 												<label for="deletePreviousPurchaseOrderFile"><a title="Previous Upload PO File"
 													href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previous Upload - </span><small><?= $PrePOFile; ?></small></a></label>
 												&nbsp;&nbsp;&nbsp;&nbsp;
-												<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
+												<button class="btn btn-danger btn-sm auditor-restricted-btn" id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
 												
 											</div>
 											<?php } ?>
@@ -1701,21 +1701,21 @@ if (!empty($getlogpodtl)) {
 
 											<div class="col-md-7 text-right">
 													<?php if ($PONOStatus == PO_DRAFT) {  ?>
-                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                            <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                            <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                                                     <?php } else if ($PONOStatus == PO_CREATED) {  ?>
-                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                            <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                                                     <?php } else if ($PONOStatus == SPECIAL_PO) {  ?>
-                                                            <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
-                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
 													<?php } else if($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-															<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+															<a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                                                     <?php } else { ?>
                                                             <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
                                                     <?php } ?>
@@ -1968,7 +1968,7 @@ if (!empty($getlogpodtl)) {
 				</div>
 				<div class="modal-footer">
 					<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
-					<a class="btn btn-success font AddService" ID="AddService"><span class="bold">Add Service</span></a>
+					<a class="btn btn-success font AddService auditor-restricted-btn" ID="AddService"><span class="bold">Add Service</span></a>
 				</div>
 			</form>
 
@@ -2262,7 +2262,7 @@ if (!empty($getlogpodtl)) {
 				<div class="modal-footer">
 					<div class="form-row">
 						<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
-						<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
+						<a class="btn btn-success font auditor-restricted-btn EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
 					</div>
 				</div>
 
diff --git a/app/Views/POlist.php b/app/Views/POlist.php
index 7f5f87b3..c6be2a09 100755
--- a/app/Views/POlist.php
+++ b/app/Views/POlist.php
@@ -193,13 +193,13 @@
                                                     ?>
 
                                                         <td>
-                                                            <?php if(session()->get('roleText') == 'System Administrator'){ ?>
-                                                            <a data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details"
+                                                            
+                                                            <a data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details" class="auditor-restricted-btn"
                                                                 href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType. '&CapitalRange=' . $record->CapitalRange; ?>">
                                                                 <i class="fa fa-pencil-alt" data-toggle="tooltip"> </i>
                                                                 &nbsp;&nbsp;&nbsp;
                                                             </a>
-                                                            <?php } ?>
+                                                            
                                                         </td>
                                                     <?php
                                                     } else if ($statusCode == PO_AMENDED ) { ?>
diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php
index ea3bdd4a..afde5728 100644
--- a/app/Views/accountsDashboard.php
+++ b/app/Views/accountsDashboard.php
@@ -436,7 +436,7 @@
 										<th style="width: 50px;">Tax (%)</th>
 										<th style="width: 50px;">Taxable Amt</th>
 										<th style="width: 50px;">Total Amt</th>
-										<th style="width: 150px;">Remarks</th>
+										<th style="width: 150px;">Remarks <span class="text-danger">*</span></th>
 										<th style="width: 50px;"></th>
 									</tr>
 								</thead>
@@ -812,8 +812,8 @@
 									'<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</td>' +
 									'<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
 									'<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' +
-									'<td style="width: 50px;" id="amount' + i + '">' + amount + '</td>' +
-									'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>' +
+									'<td style="width: 50px;" id="amount' + i + '">' + Number(amount).toFixed(2) + '</td>' +
+									'<td style="width: 50px;" id="grand_total_amount' + i + '">' + Number(grand_total_amount).toFixed(2) + '</td>';
 									'<td style="width: 150px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;"> </td>' +
 									'<td style="width: 50px;"><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' +
 									'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
@@ -852,8 +852,8 @@
 										'<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</td>' +
 										'<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
 										'<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' +
-										'<td style="width: 50px;" id="amount' + i + '">' + amount + '</td>' +
-										'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>' +
+										'<td style="width: 50px;" id="amount' + i + '">' + Number(amount).toFixed(2) + '</td>' +
+										'<td style="width: 50px;" id="grand_total_amount' + i + '">' + Number(grand_total_amount).toFixed(2) + '</td>';
 										'<td style="width: 150px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;"> </td>' +
 										'<td style="width: 50px;"><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' +
 										'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
@@ -887,8 +887,8 @@
 										'<td style="width: 100px;" align="right" data-name="sel" >' + item.QuantityAsPerInvoice + '</td>' +
 										'<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
 										'<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' +
-										'<td style="width: 50px;" id="amount' + i + '">' + amount + '</td>' +
-										'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>' +
+										'<td style="width: 50px;" id="amount' + i + '">' + Number(amount).toFixed(2) + '</td>' +
+										'<td style="width: 50px;" id="grand_total_amount' + i + '">' + Number(grand_total_amount).toFixed(2) + '</td>';
 										'<td style="width: 150px;">' + item.Remarks + '</td>' +
 										'<td style="width: 50px;"><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' +
 										'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
diff --git a/app/Views/addUser.php b/app/Views/addUser.php
index d23d6733..e2c3a463 100755
--- a/app/Views/addUser.php
+++ b/app/Views/addUser.php
@@ -18,8 +18,8 @@
                         <div class="card-body">
                             <div class="row">
                                 <div class="col-12">
-                                    <div class="p-2">
-                                        <form role="form" id="addUser" action="<?php echo base_url() ?>addNewUser" method="post">
+                                    <form role="form" id="addUser" action="<?php echo base_url() ?>addNewUser" method="post">
+                                        <div class="p-2">
                                             <div class="box-body">
                                                 <!-- Supplier Information -->
                                                 <div class="col-md-12" style="margin-bottom: 27px;">
@@ -63,7 +63,7 @@
                                                             <input type="text" class="form-control required digits" readonly id="ContactNo" name="ContactNo" minlength="10" maxlength="10">
                                                         </div>
                                                         <div class="col-md-3">
-                                                            <label for="Role">Role</label>
+                                                            <label for="Role">Role<span class="badge">*</span></label>
                                                             <select class="form-control required" id="role" name="role" required>
                                                                 <option value="0">Select Role</option>
                                                                 <?php
@@ -90,7 +90,7 @@
                                                 <input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white;    margin-right: 15px;width: 80px;" value="Reset" />
                                                 <input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success">
                                             </div>
-                                    </div>
+                                        </div>
                                     </form>
                                 </div>
                             </div>
@@ -181,58 +181,67 @@
                 $("#ContactNo").val('');
             }
         });
+
+        $('#MailID').change(function() {
+            var mailID = $(this).val();
+            var empID = ''// $('#EmpList').val();
+            if (mailID) {
+                $('#loader').show();
+                $.ajax({
+                    url: "<?php echo base_url() ?>isEmailExists",
+                    type: 'POST',
+                    data: { EmpID:empID,MailID:mailID },
+                    success: function(data) {
+                        if (data.success) {
+                            $('#loader').hide();
+                            alert(data.message); 
+                            $("#MailID").val('');
+                        } else {
+                            $('#loader').hide(); 
+                        }
+                    },
+                    error: function() {
+                        $('#loader').hide();
+                        alert('An Error Occur in this email address');
+                        $("#MailID").val('');
+                    }
+                });
+            }else{
+                alert("Invalid email address"); 
+            }
+        });
     });
 
-    $('#addPop').click(function() {
-        if ($('#distriList option:selected').val() != null) {
-            if ($('#distriList option:selected').val() == 0) {} else {
-                var tempSelect = $('#distriList option:selected').val();
-                var tempText = $('#distriList option:selected').text();
-                var o = new Option(tempText, tempSelect);
-                var hidval = tempSelect;
-                var Selectedval = ''
-                if (orgVal != '') {
-                    Selectedval = orgVal + ':' + hidval;
-                } else {
-                    Selectedval = hidval
-                }
-                $(o).html(tempText);
-                $("#selectDistriList").append(o);
-                $('#distriList option:selected').remove();
-                $("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
-                $("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
-                tempSelect = '';
-                tempText = '';
-                Selectedval = '';
-            }
-        } else {
-            alert("Before add please select any position.");
-        }
-    });
 </script>
 
 <script>
     function Validate() {
-        var isValid = true;
-
+        var isValid;
         var fname = document.getElementById('FirstName').value;
+        var role = document.getElementById('role').value;
+        var email = document.getElementById('MailID').value;
+        var emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+        var password = document.getElementById('password').value;
+        var cpassword = document.getElementById('cpassword').value;
+
         if (!fname) {
             alert('First Name is required');
             isValid = false;
-        }
-
-        var email = document.getElementById('MailID').value;
-        var emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-        if (!emailPattern.test(email)) {
+        }else if (!emailPattern.test(email)) {
             alert('Invalid email address');
             isValid = false;
-        }
-
-        var password = document.getElementById('password').value;
-        var cpassword = document.getElementById('cpassword').value;
-        if (password !== cpassword) {
+        }else if (role === "0") {
+            alert('Role is required');
+            isValid = false;
+        }else if(!password){
+            alert('Missing Passwords');
+            isValid = false;
+        }else if (password !== cpassword) {
             alert('Passwords do not match');
             isValid = false;
+        }else{
+            isValid = true;
+            $('#loader').show();
         }
 
         return isValid;
diff --git a/app/Views/assetListing.php b/app/Views/assetListing.php
index 58770a69..fe17cfe4 100755
--- a/app/Views/assetListing.php
+++ b/app/Views/assetListing.php
@@ -54,7 +54,7 @@
                                 </li>
                             </ol>
                         </div>
-                        <a href="<?php echo base_url(); ?>addasset" class="btn btn-success">Add New
+                        <a href="<?php echo base_url(); ?>addasset" class="btn btn-success auditor-restricted-btn">Add New
                             Asset</a>
                     </div>
                 </div>
@@ -171,6 +171,7 @@
                                                         <a onclick="confirmDeleteAsset(event)"
                                                             href="<?php echo base_url() . 'assetdetails/deleteAsset/?AssetID=' . $record->AssetCode ?>"
                                                             data-toggle="tooltip"
+                                                            class="auditor-restricted-btn"
                                                             title="<?php echo $record->AssetCode; ?>  -  Click here to Delete Asset Details">
                                                             <i class="fa fa-trash"></i>
                                                         </a>
diff --git a/app/Views/attendance.php b/app/Views/attendance.php
index f476585e..d26ae34d 100755
--- a/app/Views/attendance.php
+++ b/app/Views/attendance.php
@@ -268,7 +268,7 @@ $currentday = date('d');
 
                                         <i class="fe-maximize noti-icon" onclick="toggleDivFullscreen()" style="margin-right: 15px;margin-top: 5px;font-size: 28px; cursor:pointer;" title="Full screen view"></i>
 
-                                        <i class="fas fa-save"  id="c" style="margin-right: 15px;margin-top: 5px;font-size:28px; cursor:pointer;" title="Save"></i>
+                                        <i class="fas fa-save auditor-restricted-btn"  id="c" style="margin-right: 15px;margin-top: 5px;font-size:28px; cursor:pointer;" title="Save"></i>
 
                                     </div>
 
diff --git a/app/Views/costListing.php b/app/Views/costListing.php
index 66baab6f..ad3e3e6d 100755
--- a/app/Views/costListing.php
+++ b/app/Views/costListing.php
@@ -53,7 +53,7 @@
                                 </li>
                             </ol>
                         </div>
-                        <a data-toggle="modal" href="#ccwizard" data-id="0" data-name="" class="btn btn-success">Add Cost
+                        <a data-toggle="modal" href="#ccwizard" data-id="0" data-name="" class="btn btn-success auditor-restricted-btn">Add Cost
                             Details </a>
                     </div>
                 </div>
@@ -137,7 +137,7 @@
                                                         <a data-toggle="modal" href="#ccwizard" data-id="<?php echo $record->id; ?>"
                                                             data-name="<?php echo $record->CostCenterName; ?>"><i
                                                                 class="fas fa-edit"></i>&nbsp;&nbsp;</a>
-                                                        <a onclick="confirmDelete(event)" style="cursor:pointer;"
+                                                        <a onclick="confirmDelete(event)" style="cursor:pointer;" class="auditor-restricted-btn"
                                                             href="<?php echo base_url() . 'deleteCostCenter?CostCenterCode=' . $record->code; ?>"><i
                                                                 class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>
                                                     <?php } ?>
@@ -187,7 +187,7 @@
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal"
                     value="Cancel">Cancel</button>
-                <button type="button" class="btn btn-info waves-effect waves-light tempClick"
+                <button type="button" class="btn btn-info waves-effect waves-light auditor-restricted-btn tempClick"
                     id="tempClick">Submit</button>
             </div>
         </div>
diff --git a/app/Views/departmentListing.php b/app/Views/departmentListing.php
index 2b36b420..f3f63c6f 100755
--- a/app/Views/departmentListing.php
+++ b/app/Views/departmentListing.php
@@ -60,7 +60,7 @@
                 </li>
               </ol>
             </div>
-            <a class="btn btn-success" href="<?php echo base_url(); ?>adddepartment">Add New department</a>
+            <a class="btn btn-success auditor-restricted-btn" href="<?php echo base_url(); ?>adddepartment">Add New department</a>
 
 
 
@@ -159,6 +159,7 @@
 
                             <a 
                               onclick="confirmReActivateDepartment(event)"
+                              class="auditor-restricted-btn"
                               href="<?php echo base_url() . 'reActivateDepartment/?SID=' . $record->DEPCode ?>"
                               data-toggle="tooltip"
                               title="<?php echo $record->DEPCode ?>  - Click here to Re activate Department Details"><i
@@ -179,6 +180,7 @@
                               onclick="confirmDeleteDepartment(event)" 
                               href="<?php echo base_url() . 'deleteDepartment/?SID=' . $record->DEPCode ?>"
                               data-toggle="tooltip"
+                              class="auditor-restricted-btn"
                               title="<?php echo $record->DEPCode ?>  - Click here to Delete Department Details"><i
                                 class="fas fa-trash"></i>
                               </a>
diff --git a/app/Views/driverAttendance.php b/app/Views/driverAttendance.php
index 7837df3c..88a55301 100755
--- a/app/Views/driverAttendance.php
+++ b/app/Views/driverAttendance.php
@@ -76,7 +76,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                 
 
                                                     <?php if($payslip_id == 0){ ?>
-                                                        <button type="button"  style="margin-top:0px;" class="btn btn-success" data-target="#attendanceModal" data-id="0" data-toggle="modal">
+                                                        <button type="button"  style="margin-top:0px;" class="btn btn-success auditor-restricted-btn" data-target="#attendanceModal" data-id="0" data-toggle="modal">
                                                             Add Trip details
                                                         </button>
                                                     <?php }else { ?>
@@ -130,7 +130,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                                 <i class="fas fa-edit"></i>&nbsp;&nbsp;&nbsp;
                                                             </a>
                                                             
-                                                            <a onclick="confirmDelete(event)" style="cursor:pointer;" href="<?php echo base_url() . 'deleteDriverAttendance?driverAttendanceId=' . esc($record['driver_attendance_id']).'&drv_id='.esc($record['driver_id']).'&month_year='.esc($datefordropdown); ?>">
+                                                            <a onclick="confirmDelete(event)" class="auditor-restricted-btn" style="cursor:pointer;" href="<?php echo base_url() . 'deleteDriverAttendance?driverAttendanceId=' . esc($record['driver_attendance_id']).'&drv_id='.esc($record['driver_id']).'&month_year='.esc($datefordropdown); ?>">
                                                             
                                                                 <i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;
                                                             </a>    
@@ -165,7 +165,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                     <th></th>
                                                     <th></th>
                                                     <th>Diesel</th>
-                                                    <th><input type="text" class="editable" data-column="diesel_amount" <?php echo ($payslip_id != 0) ? 'readonly' : ''; ?> ></th>
+                                                    <th><input type="text" class="editable auditor-restricted-field" data-column="diesel_amount" <?php echo ($payslip_id != 0) ? 'readonly' : ''; ?> ></th>
                                                     <th></th>
                                                     <th></th>
                                                 </tr>
@@ -179,7 +179,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                     <th></th>
                                                     <th></th>
                                                     <th>Shed Amount</th>
-                                                    <th><input type="text" class="editable" data-column="shed_amount" <?php echo ($payslip_id != 0) ? 'readonly' : ''; ?> ></th>
+                                                    <th><input type="text" class="editable auditor-restricted-field" data-column="shed_amount" <?php echo ($payslip_id != 0) ? 'readonly' : ''; ?> ></th>
                                                     <th></th>
                                                     <th></th>
                                                 </tr>
@@ -234,32 +234,19 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                     <!--first row -->
                     <input type="hidden" class="form-control" id="driver_attendance_id" name="driver_attendance_id">
                     <input type="hidden" class="form-control" id="driver_id" name="driver_id">
+                    <input type="hidden" class="form-control" id="driver_name" name="driver_name" readonly>
                     <?php $calendarStartDate = DateTime::createFromFormat('M-Y', $datefordropdown)->modify('first day of this month')->format('Y-m-d');?>
                     <?php $calendarEndDate = DateTime::createFromFormat('M-Y', $datefordropdown)->modify('last day of this month')->format('Y-m-d');?>
                     <?php $calendarCurrDate = DateTime::createFromFormat('M-Y', $datefordropdown)->modify('today')->format('Y-m-d');?>
                     <div class="row">
-                        <div class="col-md-4">
-                            <label class="form" for="date">Date</label>
-                            <input type="date" class="form-control" id="date" name="date" value="<?= $calendarCurrDate?>" min="<?= $calendarStartDate?>"  max="<?= $calendarEndDate?>" required>
-                        </div>
-                        <div class="col-md-4">
-                            <label class="form" for="driver_name">Driver Name</label>
-                            <input type="text" class="form-control" id="driver_name" name="driver_name" readonly>
-                            
-                        </div>
                         <div class="col-md-4">
                             <label class="form" for="category_type">Category</label>
                             <select class="form-control" id="category_type" name="category_type" onchange="resetthefields();">
                                 <option value="">Select</option>
-                                <option value="IGR">IGR</option>
                                 <option value="INVOICE">INVOICE</option>
+                                <option value="IGR">IGR</option>
                             </select>
                         </div>    
-                    </div>
-
-
-                    <!-- second row -->
-                    <div class="row mt-2">
                         <div class="col-md-4">
                             <label class="form" for="invoice_number">Invoice Number</label>
                             <input type="text" class="form-control" id="invoice_number" name="invoice_number" onchange="customerandquantity();">
@@ -271,11 +258,20 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                             </select> -->
                         </div>
                         <div class="col-md-4">
+                            <label class="form" for="date">Date</label>
+                            <input type="date" class="form-control" id="date" name="date" value="<?= $calendarCurrDate?>" min="<?= $calendarStartDate?>"  max="<?= $calendarEndDate?>" required>
+                        </div>
+                    </div>
+
+
+                    <!-- second row -->
+                    <div class="row mt-2">
+                        <div class="col-md-6">
                             <label class="form" for="customer">Customer</label>
                             <input type="text" class="form-control" id="customer" name="customer" readonly>
                         </div>
                         
-                        <div class="col-md-4">
+                        <div class="col-md-6">
                             <label class="form" for="quantity">Quantity</label>
                             <input type="text" class="form-control" id="quantity" name="quantity" readonly>
                         </div>
@@ -323,7 +319,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal"
                     value="Cancel">Cancel</button>
-                <button type="button" class="btn btn-info waves-effect waves-light tempClick"
+                <button type="button" class="btn btn-info waves-effect waves-light auditor-restricted-btn tempClick"
                     id="tempClick">Submit</button>
             </div>
         </div><!-- /.modal-content -->
@@ -385,16 +381,17 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
         
 
         $("#attendanceModal").on("shown.bs.modal", function (e) {
-            
+            var dname = "<?php echo $page_driver_name;?>";
             var id = $(e.relatedTarget).data('id');
-            let fields = ['invoice_number', 'vehicle_number', 'load_type', 'salary_amount', 'food_amount','customer','quantity','total_amount'];
+            let fields = ['invoice_number', 'vehicle_number', 'load_type', 'salary_amount', 'food_amount','customer','quantity','total_amount','category_type'];
             
             fields.forEach(function(field) {
                 $("#" + field).val("");
+                
             });
 
             if (id == 0) {
-                $('#attendanceTitle').html("Add Driver Trip");
+                $('#attendanceTitle').html("Add "+dname+" Trip Details");
                 $("#driver_attendance_id").val(0);
             } else {
                 $("#driver_attendance_id").val(id);
@@ -408,6 +405,9 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                     if(field == 'driver_id'){
                         $("#driver_id").val(arr && arr['driver_id']);
                     }
+                    if(field == 'category_type'){
+                        $("#category_type").val(arr && arr['type']);
+                    }
                     var salary = arr['salary_amount'] ? parseFloat(arr['salary_amount']) : 0;
                     var food = arr['food_amount'] ? parseFloat(arr['food_amount']) : 0;
 
@@ -421,7 +421,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                         $('#total_amount').val(ttl.toFixed(2)); 
                     
                 });
-                $('#attendanceTitle').html("Edit Driver Trip");
+                $('#attendanceTitle').html("Edit "+dname+" Trip Details");
             }
         });
         $('#tempClick').click(function () {
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index 92e28978..a353d3cf 100755
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -1759,9 +1759,9 @@ if (!empty($POItem) && $CapitalRange == '1') {
 											</div>
 
 											<div class="col-md-7 text-right">
-                                                <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                <a class="btn btn-success"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                                <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                <a class="btn btn-success auditor-restricted-btn"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
 								            </div>
 								        </div>
 
@@ -2446,8 +2446,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                               
                                             </div>
                                             <div class="modal-footer">
-                                                <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
-                                                <a class="btn btn-success font EditCapital" ID="UpdateCapital"> &nbsp;&nbsp;<span
+                                                <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
+                                                <a class="btn btn-success font auditor-restricted-btn EditCapital" ID="UpdateCapital"> &nbsp;&nbsp;<span
                                                         class="bold">Update Capital</span></a>
                                             </div>
                                         </form>
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index df550de9..cb24438d 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -926,7 +926,7 @@ $(document).ready(function () {
                 <!-- </div> -->
                 <div class="form-group col-md-12" align=" right">
                   <?php if ($POStatus == PO_DRAFT || $POStatus == PO_CREATED) { ?>
-                    <a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success"
+                    <a data-toggle="modal" class="auditor-restricted-btn"><button type="submit" onclick="myFunction();" class="btn btn-success"
                         id="abcd">Select Line Item</button> </a>
                   <?php } ?>
                 </div>
@@ -1271,7 +1271,7 @@ $(document).ready(function () {
                                     data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITCAPITAL"><i
                                       class="ri-pencil-fill" data-toggle="tooltip"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#'
                                     onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>"
-                                    data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
+                                    data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill auditor-restricted-btn"></span></a>
                                 <?php
                               } else { ?>
                                 <td>
@@ -1610,7 +1610,7 @@ $(document).ready(function () {
                       <label for="deletePreviousPurchaseOrderFile"><a title="Previous Upload PO File"
                           href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previous Upload - </span><small><?= $PrePOFile; ?></small></a></label>
                       &nbsp;&nbsp;&nbsp;&nbsp;
-                      <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
+                      <button class="btn btn-danger btn-sm auditor-restricted-btn" id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
 
 
                     </div>
@@ -1660,17 +1660,17 @@ $(document).ready(function () {
 
                   <div class="col-md-7 text-right">
                     <?php if ($PONOStatus == PO_DRAFT) {  ?>
-                      <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                      <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                      <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                      <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                      <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                      <a class="btn btn-success auditor-restricted-btn Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                      <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                      <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                     <?php } else if ($PONOStatus == PO_CREATED) {  ?>
-                      <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                      <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                      <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                      <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                      <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                      <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                     <?php } else if ($PONOStatus == SPECIAL_PO) {  ?>
                       <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
-                      <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                      <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
                     <?php } else { ?>
                       <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
                     <?php } ?>
@@ -2450,7 +2450,7 @@ $(document).ready(function () {
         </div>
         <div class="modal-footer">
           <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:20px;">Cancel</a>
-          <a class="btn btn-success font AddCapital" ID="AddCapital"> &nbsp;&nbsp;<span class="bold">Add
+          <a class="btn btn-success font AddCapital auditor-restricted-btn" ID="AddCapital"> &nbsp;&nbsp;<span class="bold">Add
               Capital</span></a>
         </div>
       </form>
@@ -3098,7 +3098,7 @@ $(document).ready(function () {
         </div><!-- /.body -->
         <div class="modal-footer">
           <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
-          <a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update
+          <a class="btn btn-success font auditor-restricted-btn EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update
               Capital</span></a>
         </div><!-- /.footer -->
       </form>
diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php
index bac2778f..843f654d 100755
--- a/app/Views/editEmployeenew.php
+++ b/app/Views/editEmployeenew.php
@@ -1307,7 +1307,7 @@ if (!empty($EmpDetails)) {
                                             </li>
                                             <li class="next list-inline-item float-right">
                                                 <button type="submit"
-                                                    class="btn btn-primary submit float-right">Submit</button>
+                                                    class="btn btn-primary submit float-right auditor-restricted-btn">Submit</button>
                                             </li>
                                         </ul>
                                     </div>
diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php
index 4e38583b..8259b06e 100755
--- a/app/Views/editImportAmendPO.php
+++ b/app/Views/editImportAmendPO.php
@@ -1258,7 +1258,7 @@ if (!empty($RequistionDetails)) {
                                             </div>
                                             <div class="modal-footer">
                                                 <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:15px">Cancel</a>
-                                                <a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                                                <a class="btn btn-success font auditor-restricted-btn EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
                                                 <!--<a class="btn btn-success font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
                                             </div>
                                         </form>
@@ -1610,7 +1610,7 @@ if (!empty($RequistionDetails)) {
                                                         <span>Previous Upload - </span>
                                                         <small><?= $PrePOFile; ?></small></a></label>
                                                 &nbsp;&nbsp;&nbsp;&nbsp;
-                                                <!-- <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i> </button> -->
+                                                <!-- <button class="btn btn-danger btn-sm auditor-restricted-btn" id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i> </button> -->
 											</div>
 											<?php } ?>
 											<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
@@ -1665,9 +1665,9 @@ if (!empty($RequistionDetails)) {
 											</div>
 
 											<div class="col-md-7 text-right">
-                                                    <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                    <a class="btn btn-success"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                                    <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                    <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                    <a class="btn btn-success auditor-restricted-btn"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                    <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                                                     <br />
 											</div>
 										</div>
diff --git a/app/Views/editOld.php b/app/Views/editOld.php
index d005134a..6a78ddff 100755
--- a/app/Views/editOld.php
+++ b/app/Views/editOld.php
@@ -92,8 +92,8 @@ if (!empty($EmpList)) {
                                 </div>
                                 <div class="form-group text-right mt-3">
                                     <input type="hidden" name="txtEmpid" id="txtEmpid" value="<?php echo $EmpId ?>">
-                                    <input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white;margin-right: 15px;" value="Reset">
-                                    <input type="submit" class="btn btn-success" value="Submit">
+                                    <input type="reset" id="reset" class="btn btn-reset auditor-restricted-btn" style="background-color: red;color: white;margin-right: 15px;" value="Reset">
+                                    <input type="submit" class="btn btn-success auditor-restricted-btn" value="Submit">
                                 </div>
                             </form>
 
@@ -133,7 +133,7 @@ if (!empty($EmpList)) {
             </div>
 
             <!-- Change Password Form -->
-            <div class="row">
+            <div class="row auditor-restricted-btn">
                 <div class="col-12">
                     <div class="card">
                         <div class="card-body">
@@ -285,4 +285,32 @@ if (!empty($EmpList)) {
             alert("Before remove please select any position.");
         }
     });
+    $('#MailID').change(function() {
+            var mailID = $(this).val();
+            var empID = ''// $('#EmpList').val();
+            if (mailID) {
+                $('#loader').show();
+                $.ajax({
+                    url: "<?php echo base_url() ?>isEmailExists",
+                    type: 'POST',
+                    data: { EmpID:empID,MailID:mailID },
+                    success: function(data) {
+                        if (data.success) {
+                            $('#loader').hide();
+                            alert(data.message); 
+                            $("#MailID").val('');
+                        } else {
+                            $('#loader').hide(); 
+                        }
+                    },
+                    error: function() {
+                        $('#loader').hide();
+                        alert('An Error Occur in this email address');
+                        $("#MailID").val('');
+                    }
+                });
+            }else{
+                alert("Invalid email address"); 
+            }
+        });
 </script>>
\ No newline at end of file
diff --git a/app/Views/editOldasset.php b/app/Views/editOldasset.php
index 35c903af..76d7c852 100755
--- a/app/Views/editOldasset.php
+++ b/app/Views/editOldasset.php
@@ -272,7 +272,7 @@ if (!empty($assetList)) {
 								<div class="form-row mt-4 text-right">
 									<div class="col-md-12">
 										<a href="<?php echo base_url() ?>assetListing" class="btn btn-secondary">Cancel</a>
-										<button type="button" id="editAssetBtnId" class="btn btn-success">Submit</button>
+										<button type="button" id="editAssetBtnId" class="btn btn-success auditor-restricted-btn">Submit</button>
 									</div>
 								</div>
 							</form>
diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php
index e142d4b3..48b5e391 100755
--- a/app/Views/editRawmaterial.php
+++ b/app/Views/editRawmaterial.php
@@ -364,7 +364,7 @@ if ($total <= $reorder) {
                                     <button type="button" class="btn btn-secondary" onclick="window.location.href='<?= base_url() ?>rawmaterialListing?materialListPage=<?= $materialListPage ?>'">
                                         <span class="bold">Cancel</span>
                                     </button>
-                                    <input type="button" id="editRawMaterialBtnId" class="btn btn-success" value="Submit" />
+                                    <input type="button" id="editRawMaterialBtnId" class="btn btn-success auditor-restricted-btn" value="Submit" />
 
                                     <input type="hidden" id="materialListPage" name="materialListPage" value="<?php echo $materialListPage; ?>" />
                                 </div>
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index 91c73689..d230eafd 100755
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -1681,7 +1681,7 @@ if (!empty($INRSYMBOL)) {
 															<span>Previous Upload - </span>
 															<small><?= $PrePOFile; ?></small></a></label>
 													&nbsp;&nbsp;&nbsp;&nbsp;
-													<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
+													<button class="btn btn-danger btn-sm auditor-restricted-btn" id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
 
 														
 													</div>
@@ -1735,9 +1735,9 @@ if (!empty($INRSYMBOL)) {
 											</div>
 
 											<div class="col-md-7 text-right">
-                                                <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                <a class="btn btn-success"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                                <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                <a class="btn btn-success auditor-restricted-btn"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
 								            </div>
 								        </div>
 
@@ -2165,7 +2165,7 @@ if (!empty($INRSYMBOL)) {
 				</div>
 				<div class="modal-footer">
 					<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
-					<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit
+					<a class="btn btn-success EditRevenue auditor-restricted-btn" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit
 							Revenue</span></a>
 				</div>
 			</form>
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 8888791f..aedc3008 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -2359,7 +2359,7 @@ if (!empty($getlogpodtl)) {
 										<?php } ?>
 										<?php if(!$isChecked){ ?>
 										<a data-toggle="modal"><button type="submit" onclick="myFunction();"
-												class="btn btn-success" id="abcd">Select Line Item</button> </a>
+												class="btn btn-success auditor-restricted-btn" id="abcd">Select Line Item</button> </a>
 										<?php } ?>
 									<?php } ?>
 								</div>
@@ -2575,7 +2575,7 @@ if (!empty($getlogpodtl)) {
 																	data-userid="<?php echo $index; ?>" data-toggle="modal"
 																	href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a>
 
-																<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link"
+																<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link auditor-restricted-btn"
 																	data-id="<?php echo $index; ?>"
 																	data-userid="<?php echo $index; ?>" id="Del"><span
 																		class="ri-delete-bin-7-fill"></span></a>
@@ -2947,7 +2947,7 @@ if (!empty($getlogpodtl)) {
 													<span>Previous Upload - </span>
 													<small><?= $PrePOFile; ?></small></a></label>
 											&nbsp;&nbsp;&nbsp;&nbsp;
-											<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
+											<button class="btn btn-danger btn-sm auditor-restricted-btn" id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
 
 											</div>
 											<?php } ?>
@@ -3002,21 +3002,21 @@ if (!empty($getlogpodtl)) {
 
 											<div class="col-md-7 text-right">
 													<?php if ($PONOStatus == PO_DRAFT) {  ?>
-                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                            <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                            <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                                                     <?php } else if ($PONOStatus == PO_CREATED) {  ?>
-                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                            <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                                                     <?php } else if ($PONOStatus == SPECIAL_PO) {  ?>
                                                             <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
-                                                            <a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
 													<?php } else if($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-															<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+															<a class="btn btn-danger Save auditor-restricted-btn" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success Submit auditor-restricted-btn" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit auditor-restricted-btn" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                                                     <?php } else { ?>
                                                             <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
                                                     <?php } ?>
@@ -3381,7 +3381,7 @@ if (!empty($getlogpodtl)) {
 				<div class="modal-footer">
 					<a class="btn btn-secondary waves-effect" data-dismiss="modal"
 						value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
-					<a class="btn btn-info waves-effect waves-light font AddRevenue" ID="AddRevenue">&nbsp;&nbsp;<span
+					<a class="btn btn-info waves-effect waves-light font AddRevenue auditor-restricted-btn" ID="AddRevenue">&nbsp;&nbsp;<span
 							class="bold">Add Revenue</span></a>
 				</div>
 			</form>
@@ -3749,7 +3749,7 @@ if (!empty($getlogpodtl)) {
 				<div class="modal-footer">
 					<a class="btn btn-secondary waves-effect" data-dismiss="modal"
 						value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
-					<a class="btn btn-info waves-effect waves-light EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span
+					<a class="btn btn-info waves-effect waves-light EditRevenue auditor-restricted-btn" ID="EditRevenue">&nbsp;&nbsp;<span
 							class="bold">Edit Revenue</span></a>
 				</div>
 			</form>
@@ -4579,7 +4579,7 @@ if (!empty($getlogpodtl)) {
 							<i class="ri-pencil-fill"></i>
 						</a>
 						
-						<a href='#' onclick="DeleteRow('${temp}')" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
+						<a href='#' onclick="DeleteRow('${temp}')" class="link auditor-restricted-btn" data-id="${temp}" data-userid="${temp}" id="Del">
 							<span class="ri-delete-bin-7-fill"></span>
 						</a>
 						</td>
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index 2c7c4e5e..b3f41f9a 100755
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -1404,7 +1404,7 @@ foreach ($PaymentTerms as $TER) {
 													<span>Previous Upload - </span>
 													<small><?= $PrePOFile; ?></small></a></label>
 											&nbsp;&nbsp;&nbsp;&nbsp;
-											<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
+											<button class="btn btn-danger btn-sm auditor-restricted-btn" id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
 												
 											</div>
 											<?php }} ?>
@@ -1451,9 +1451,9 @@ foreach ($PaymentTerms as $TER) {
 											</div>
 
 											<div class="col-md-7 text-right">
-                                                <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                <a class="btn btn-success"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                                <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                <a class="btn btn-success auditor-restricted-btn"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
 								            </div>
 								        </div>
 
@@ -1783,7 +1783,7 @@ foreach ($PaymentTerms as $TER) {
 									<div class="modal-footer" align="right">
 										<div class="form-group col-md-12">
 											<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
-											<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
+											<a class="btn btn-success font EditService auditor-restricted-btn" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
 										</div>
 									</div>
 								</div>
diff --git a/app/Views/editSupplier.php b/app/Views/editSupplier.php
index 1b8366f8..5e90c047 100755
--- a/app/Views/editSupplier.php
+++ b/app/Views/editSupplier.php
@@ -498,7 +498,7 @@ if (!empty($supplier)) {
                             <button type="button" class="btn btn-secondary" onclick="history.back()">
                               <span class="bold">Cancel</span>
                             </button>
-                            <button type="button" id="updateSupplierBtnId" class="btn btn-info pull-right">Submit</button>
+                            <button type="button" id="updateSupplierBtnId" class="btn btn-info pull-right auditor-restricted-btn">Submit</button>
                           </div>
                         </div>
                     </div>
diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php
index 27bf6f70..1013c078 100755
--- a/app/Views/editconfig.php
+++ b/app/Views/editconfig.php
@@ -99,7 +99,7 @@ if (!empty($master)) {
                                 </div>
                                 <div class="col-md-3 mt-3">
                                     <a data-toggle="modal" href="#AddConfiguration" style="margin-right: 10px;"
-                                            class="btn btn-success"><i class="fa fa-plus"></i>&nbsp;&nbsp;
+                                            class="btn btn-success auditor-restricted-btn"><i class="fa fa-plus"></i>&nbsp;&nbsp;
                                         Configuration Value</a>
                                 </div>
                             <?php echo form_close(); ?>
@@ -211,6 +211,7 @@ if (!empty($master)) {
                                                                 &nbsp;&nbsp; &nbsp;&nbsp;
                                                     <!-- delete section -->
                                                                 <a onclick="confirmDeleteConfig(event)" 
+                                                                class="auditor-restricted-btn"
                                                                     data-key="<?php echo $con->Key; ?>" 
                                                                     data-code="<?php echo $con->Config_ID; ?>" 
                                                                     href="<?php echo base_url() . 'activeInactiveConfigValue
@@ -244,7 +245,7 @@ if (!empty($master)) {
                                     <a href="<?php echo base_url() ?>configlisting?page=<?=$page?>" class="btn btn-secondary" >
                                         Cancel
                                     </a>
-                                    <input type="button" id="updateConfigBtnId" class="btn btn-success" value="Update" />
+                                    <input type="button" id="updateConfigBtnId" class="btn btn-success auditor-restricted-btn" value="Update" />
                                 </div>
                             </div>
                         </div>
@@ -361,7 +362,7 @@ if (!empty($master)) {
                                 data-dismiss="modal">Cancel</a>
                             <button 
                                     type="button"
-                                    class=" btn btn-success font " id="tempClickUpdate"><i
+                                    class=" btn btn-success font auditor-restricted-btn" id="tempClickUpdate"><i
                                     class="fas fa-edit"></i>&nbsp;&nbsp;Update
                             </button>
                         </div>
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index 4f881dbe..a2e23b74 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -836,7 +836,7 @@ if (!empty($getlogpodtl)) {
                                 </div>
                                 <div class="col-md-4">
                                     <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED) { ?>
-                                        <a data-toggle="modal" data-target="#importpomodel" class="btn btn-success" data-dismiss="modal" onclick="myFunction();">Add Line Item </a>
+                                        <a data-toggle="modal" data-target="#importpomodel" class="btn btn-success auditor-restricted-btn" data-dismiss="modal" onclick="myFunction();">Add Line Item </a>
                                     <?php } ?>
                                 </div>
 
@@ -1037,7 +1037,7 @@ if (!empty($getlogpodtl)) {
 
                                                             if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED) { ?>
                                                                 <td> <a data-target='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="ri-pencil-fill" data-toggle="tooltip"></i>&nbsp;&nbsp;&nbsp;</a> 
-                                                                     <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
+                                                                     <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link auditor-restricted-btn" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
                                                                 </td>
                                                                 <?php
                                                             } else { ?>
@@ -1336,7 +1336,7 @@ if (!empty($getlogpodtl)) {
 													<span>Previous Upload - </span>
 													<small><?= $PrePOFile; ?></small></a></label>
                                                     &nbsp;&nbsp;&nbsp;&nbsp;
-                                                    <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
+                                                    <button class="btn btn-danger btn-sm auditor-restricted-btn" id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
 											</div>
 											<?php } ?>
 											<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
@@ -1389,17 +1389,17 @@ if (!empty($getlogpodtl)) {
 
 											<div class="col-md-7 text-right">
                                                     <?php if ($PONOStatus == PO_DRAFT) {  ?>
-                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                            <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                            <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                                                     <?php } else if ($PONOStatus == PO_CREATED) {  ?>
-                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                            <a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
                                                     <?php } else if ($PONOStatus == SPECIAL_PO) {  ?>
                                                             <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
-                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
                                                     <?php } else { ?>
                                                             <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
                                                     <?php } ?>
@@ -2568,7 +2568,7 @@ if (!empty($getlogpodtl)) {
                     </div>
                     <div class="modal-footer">
                         <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
-                        <a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                        <a class="btn btn-success font EditImport auditor-restricted-btn" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
                     </div>
                 </form>
             </div>
diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php
index 627eb3f9..64dcc3d3 100755
--- a/app/Views/editrequisitionform.php
+++ b/app/Views/editrequisitionform.php
@@ -208,7 +208,7 @@ td {
 							<div class="form-row">
 								<div class="form-group col-md-12">
 									<?php if (count($MaterialCode) != 0) { ?>
-										<a data-toggle="modal" data-target="#add-req-modal" class="btn btn-primary waves-effect float-right">Add Line Item</a>
+										<a data-toggle="modal" data-target="#add-req-modal" class="btn btn-primary waves-effect float-right auditor-restricted-btn">Add Line Item</a>
 									<?php } ?>
 								</div>
 							</div>
@@ -251,7 +251,7 @@ td {
 														<td align="center"><?php echo $record->StatusName; ?></td>
 														<input type="hidden" name="<?php echo 'materialdesc' . $index ?>" id="<?php echo 'materialdesc' . $index ?>" value="<?php echo isset($record->MaterialDescription) ?  $record->MaterialDescription : ''; ?>" />
 														<td>
-															<a data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-target='#edit-req-modal' data-toggle="modal" href="#edit-req-modal"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->MaterialCode; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $record->MaterialCode; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
+															<a data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-target='#edit-req-modal' data-toggle="modal" href="#edit-req-modal"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->MaterialCode; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a onclick="DeleteRow(<?php echo $index; ?>)" class="link auditor-restricted-btn" data-id="<?php echo $record->MaterialCode; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
 														</td>
 														<td class="hidden-column"><?php echo $record->CategoryName; ?></td>
 													</tr>
@@ -296,14 +296,14 @@ td {
 							</div>
 							<div class="form-row float-right">
 								<?php if ($Status == REQ_DRAFT) { ?>
-									<input type="reset" value="Reset" class="btn btn-secondary waves-effect" onclick="window.location.reload();">&nbsp;&nbsp;
-									<button type="button" class="btn btn-primary waves-effect Save" " id="Save">Save As Draft</button>&nbsp;&nbsp;
-									<button type="button" class="btn btn-primary waves-effect submit"  id="submit1">Submit</button>&nbsp;&nbsp;
-									<button type="button" class="btn btn-soft-primary waves-effect waves-light submit" id="submit2">Approve</button>&nbsp;&nbsp;
+									<input type="reset" value="Reset" class="btn btn-secondary waves-effect auditor-restricted-btn" onclick="window.location.reload();">&nbsp;&nbsp;
+									<button type="button" class="btn btn-primary waves-effect auditor-restricted-btn Save" " id="Save">Save As Draft</button>&nbsp;&nbsp;
+									<button type="button" class="btn btn-primary waves-effect auditor-restricted-btn submit"  id="submit1">Submit</button>&nbsp;&nbsp;
+									<button type="button" class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn submit" id="submit2">Approve</button>&nbsp;&nbsp;
 								<?php } else if ($Status == REQ_PENDING_APPROVAL) { ?>
-									<input type="reset" value="Reset" class="btn btn-secondary waves-effect" onclick="window.location.reload();">&nbsp;&nbsp;
-									<button type="button" class="btn btn-primary waves-effect submit" id="submit1">Submit</button>&nbsp;&nbsp;
-									<button type="button" class="btn btn-soft-primary waves-effect waves-light submit"  id="submit2">Approve</button>&nbsp;&nbsp;
+									<input type="reset" value="Reset" class="btn btn-secondary auditor-restricted-btn waves-effect" onclick="window.location.reload();">&nbsp;&nbsp;
+									<button type="button" class="btn btn-primary waves-effect auditor-restricted-btn submit" id="submit1">Submit</button>&nbsp;&nbsp;
+									<button type="button" class="btn btn-soft-primary waves-effect auditor-restricted-btn waves-light submit"  id="submit2">Approve</button>&nbsp;&nbsp;
 								<?php } ?>
 							</div>
 							<?php echo form_close(); ?>
@@ -487,7 +487,7 @@ td {
 						<button type="button" class="btn btn-secondary waves-effect"
 							data-dismiss="modal" value="Cancel">Cancel</button>
 						<button type="button"
-							class="btn btn-info waves-effect waves-light EditClick">Edit</button>
+							class="btn btn-info waves-effect waves-light auditor-restricted-btn EditClick">Edit</button>
 					</div>
 				</div>
 			</div>
diff --git a/app/Views/employeeLeaveApplicationForm.php b/app/Views/employeeLeaveApplicationForm.php
index 65974ac5..b7bcc8d6 100755
--- a/app/Views/employeeLeaveApplicationForm.php
+++ b/app/Views/employeeLeaveApplicationForm.php
@@ -82,7 +82,7 @@
                                                     <th>From Date</th>
                                                     <th>To Date</th>
                                                     <th>Number Of Days</th>
-                                                    <th>Status</th>
+                                                    <th class="security-restricted labstaff-restricted stock-restricted">Status</th>
                                                     <th>Action</th>
                                                 </tr>
                                             </thead>
@@ -105,7 +105,7 @@
                                                     <td><?= esc($stdate) ?></td> 
                                                     <td><?= esc($eddate) ?></td> 
                                                     <td><?= esc($d['no_of_days']) ?></td> 
-													<td><?php if($d['status'] !== "Approved"){ ?>
+													<td class="security-restricted labstaff-restricted stock-restricted"><?php if($d['status'] !== "Approved"){ ?>
                                                         <select 
                                                             class="form-control"
                                                             name="drpStatus" 
@@ -113,8 +113,9 @@
                                                             onchange="callLeaveStatus('<?php echo $d['leave_application_id'] ?>', this.value, this)" 
                                                             style="width: 193px;">
                                                             <!-- <option value="">Select</option> -->
-                                                            <option value="Draft">Draft</option>
-                                                            <option value="Approved">Approve</option>
+                                                            <option value="Draft" <?php echo ($d['status'] == 'Draft') ? 'selected' : ''; ?> >Draft</option>
+                                                            <option value="Approved" <?php echo ($d['status'] == 'Approved') ? 'selected' : ''; ?> >Approve</option>
+                                                            <option value="Cancel" <?php echo ($d['status'] == 'Cancel') ? 'selected' : ''; ?> >Cancel</option>
                                                         </select>
 														<?php }else{  
                                                             echo  esc($d['status']);
@@ -228,7 +229,7 @@
                             <input type="text" class="form-control" id="no_of_days" name="no_of_days" readonly>
                         </div>    
                     </div><!--/. r o w 5 -->
-                    <div class="row mt-2">
+                    <div class="row mt-2 security-restricted labstaff-restricted stock-restricted">
                         <div class="col-md-2" style="text-align: end; align-content: center;">
                             <label class="form" for="status_val">Status</label>
                         </div>
@@ -241,6 +242,7 @@
                             </select>
                         </div>
                     </div><!--/. r o w 6 -->
+
                     <div class="row mt-2">
                         <div class="col-md-2" style="text-align: end; align-content: center;">
                             <label class="form" for="reason">Reason</label>
@@ -256,8 +258,10 @@
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal"
                     value="Cancel">Cancel</button>
+                <span class="auditor-restricted labstaff-restricted security-restricted">
                 <button type="button" class="btn btn-info waves-effect waves-light tempClick"
                     id="tempClick">Submit</button>
+                </span>
             </div>
         </div><!-- /. m o d a l-c o n t e n t -->
     </div><!-- /.m o d a l-d i a l o g -->
@@ -349,10 +353,10 @@
                 alert('Please Enter the Reason');
                 return;
             }
-            if ($('#status_val').val() === '') {
-                alert('Please Select Status');
-                return;
-            }
+            // if ($('#status_val').val() === '') {
+            //     alert('Please Select Status');
+            //     return;
+            // }
             // validateDateRange(function(isValid) {
             //     if (!isValid) {
             //         alert("The selected date range overlaps with an existing approved leave.");
@@ -366,7 +370,7 @@
                     end_date:$('#end_date').val(),
                     no_of_days:$('#no_of_days').val(),
                     reason:$('#reason').val(),
-                    status:$('#status_val').val(),
+                    status:$('#status_val').val() ? $('#status_val').val() : 'Draft',
                 };
             
                 $('#loader').show();
diff --git a/app/Views/employeeListing.php b/app/Views/employeeListing.php
index 9dcc2b9c..bdf32fc3 100755
--- a/app/Views/employeeListing.php
+++ b/app/Views/employeeListing.php
@@ -101,7 +101,7 @@
                             
                             <div>
                                 <a class="btn btn-success" href="<?php echo base_url(); ?>exportemployee">Export Excel</a>                                                                   
-                                <a class="btn btn-success" href="<?php echo base_url(); ?>addemployee">Add New Employee</a>                                                                             
+                                <a class="btn btn-success auditor-restricted-btn" href="<?php echo base_url(); ?>addemployee">Add New Employee</a>                                                                             
                             </div>          
                         </div>
                     </div>
diff --git a/app/Views/includes/new_footer.php b/app/Views/includes/new_footer.php
index 0d2c6d92..25454a4a 100755
--- a/app/Views/includes/new_footer.php
+++ b/app/Views/includes/new_footer.php
@@ -155,6 +155,39 @@
     
 </script>
 
+
+    <script>
+$(function () {
+    <?php if(session()->get('roleText') == 'Auditor'){ ?>
+        $(".auditor-restricted").hide(); 
+        $(".auditor-restricted-btn").hide(); 
+        $(".auditor-restricted-field").attr("readonly", true); 
+        $(".auditor-restricted-dropdown").prop("disabled", true);
+    <?php } ?>
+    
+    <?php if(session()->get('roleText') == 'Lab Staff'){ ?>
+        $(".labstaff-restricted").hide(); 
+        $(".labstaff-restricted-btn").hide(); 
+        $(".labstaff-restricted-field").attr("readonly", true); 
+        $(".labstaff-restricted-dropdown").prop("disabled", true);
+    <?php } ?>
+    
+    <?php if(session()->get('roleText') == 'Security'){ ?>
+        $(".security-restricted").hide(); 
+        $(".security-restricted-btn").hide(); 
+        $(".security-restricted-field").attr("readonly", true); 
+        $(".security-restricted-dropdown").prop("disabled", true);
+    <?php } ?>
+
+    <?php if(session()->get('roleText') == 'Stock Handler'){ ?>
+        $(".stock-restricted").hide(); 
+        $(".stock-restricted-btn").hide(); 
+        $(".stock-restricted-field").attr("readonly", true); 
+        $(".stock-restricted-dropdown").prop("disabled", true);
+    <?php } ?>
+
+});
+</script>
 <script>
   $('document').ready(function(){
     $('#deletePreviousPurchaseOrderFile').click(function(){
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index e67192ba..0ba5b097 100755
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -524,7 +524,7 @@
                     <li class="dropdown notification-list topbar-dropdown">
                         <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
                             <?php if(session()->get('ProfilePic') != null){ ?>
-                                <img src="<?php echo base_url(); ?>public/uploads/images/<?php echo session()->get('ProfilePic'); ?>" alt="user-image" class="rounded-circle">
+                                 <img src="<?php echo base_url(); ?>public/uploads/images/<?php echo session()->get('ProfilePic'); ?>" alt="user-image" class="rounded-circle"> 
                             <?php }else{ ?>
                                 <img src="<?php echo base_url(); ?>public/new_assets/images/avatar.png" alt="user-image" class="rounded-circle">
                             <?php } ?>
@@ -619,24 +619,41 @@
                         <ul class="navbar-nav">
 
                             <!-- Dashboard module -->
-
-
+                            <?php if(session()->get('roleText') == 'Auditor'){?>
+                                <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
+                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <i class="ri-dashboard-line mr-1 mr-1"></i> Dashboard <div class="arrow-down"></div>
+                                </a>
+                                <div class="dropdown-menu" aria-labelledby="topnav-hr">
+                                    <a href="<?php echo base_url(); ?>accountsDashboard"  class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>Accounts Dashboard</a>
+                                    <a href="<?php echo base_url(); ?>sales_dashboard" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>Sales Dashboard</a>
+                                </div>
+                            </li>
+                            <?php }else{?>
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>sales_dashboard" role="button"
                                     aria-expanded="false">
                                     <i class="ri-dashboard-line mr-1"></i>Dashboard</a>
                             </li>
+                            <?php }?>
+
+                            <!-- <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>sales_dashboard" role="button"
+                                    aria-expanded="false">
+                                    <i class="ri-dashboard-line mr-1"></i>Dashboard</a>
+                            </li> -->
 
                             <?php if(session()->get('roleText') == 'Auditor'){?>
                                  <!-- Accounts Dashboard -->
-                                <li class="nav-item dropdown">
+                                 <!-- <li class="nav-item dropdown">
                                         <a class="nav-link dropdown-toggle arrow-none" 
                                             href="<?php echo base_url(); ?>accountsDashboard" 
                                             role="button" aria-expanded="false">
                                             <i class="fas fa-cubes mr-1"></i> Accounts Dashboard
                                         </a>
-                                </li>
-                            <?php } ?>
+                                </li> -->
+                            <?php } ?> 
 
 
 
@@ -679,7 +696,7 @@
                                 </a>
                                 <div class="dropdown-menu" aria-labelledby="topnav-purchase">
 
-                                    <?php if(session()->get('roleText') == 'System Administrator'){ ?>
+                                    
                                     <div class="dropdown">
                                         <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-requisition"
                                             role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -687,10 +704,12 @@
                                         </a>
                                         <div class="dropdown-menu" aria-labelledby="topnav-requisition">
                                             <a href="<?php echo base_url(); ?>Requisition" class="dropdown-item">Raise Requisition </a>
+                                            <?php if(session()->get('roleText') == 'System Administrator'){ ?>
                                             <a href="<?php echo base_url(); ?>CreatePO" class="dropdown-item">Purchase Order From Requisition</a>
+                                            <?php } ?>
                                         </div>
                                     </div>
-                                    <?php } ?>
+                                    
 
                                     <div class="dropdown">
                                         <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-po"
@@ -702,6 +721,8 @@
                                             <a href="<?php echo base_url(); ?>PORelease" class="dropdown-item">Approve Purchase Order</a>
                                             <?php if(session()->get('roleText') == 'System Administrator'){ ?>
                                             <a href="<?php echo base_url(); ?>EmergencyPO" class="dropdown-item">Emergency Purchase Order </a>
+                                            <?php } ?>
+                                            <?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor'){ ?>
                                             <a href="<?php echo base_url(); ?>Report_pending_purchase" class="dropdown-item">Pending Purchase Order </a>
                                             <a href="<?php echo base_url(); ?>amendmentpurchaseorder" class="dropdown-item">Amendment Purchase Order</a>
                                             <?php } ?>
@@ -775,7 +796,7 @@
                         <!-- HR module -->
                            
 
-                        <?php if(session()->get('roleText') == 'System Administrator'){ ?>
+                        <?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Stock Handler' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Lab Staff'){ ?>
                             
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
@@ -783,6 +804,7 @@
                                     <i class="ri-contacts-book-line mr-1"></i> HR <div class="arrow-down"></div>
                                 </a>
                                 <div class="dropdown-menu" aria-labelledby="topnav-hr">
+                                <?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor'){ ?>
                                     <a href="<?php echo base_url(); ?>employeeListing" class="dropdown-item"><i class="ri-shield-user-line align-middle mr-1"></i> Employee Details</a>
                                     <a href="<?php echo base_url(); ?>DriverListing" class="dropdown-item"><i class="ri-file-settings-line align-middle mr-1"></i> Driver Load Details</a>
                                     <a href="<?php echo base_url(); ?>attendance" class="dropdown-item"><i class=" ri-time-line align-middle mr-1"></i> Attendance</a>
@@ -800,7 +822,6 @@
                                             <a href="<?php echo base_url(); ?>overTimeDetails" class="dropdown-item">OverTime Details</a>
                                         </div>
                                     </div>
-
                                     <div class="dropdown">
                                         <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-leave"
                                             role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -808,10 +829,11 @@
                                         </a>
                                         <div class="dropdown-menu" aria-labelledby="topnav-leave">
                                             <a href="<?php echo base_url(); ?>publicholidays" class="dropdown-item">Public Holidays</a>
-                                            <a href="<?php echo base_url(); ?>leaveApplicationForm" class="dropdown-item">Leave Application Form</a>
                                             <a href="<?php echo base_url(); ?>leavereports" class="dropdown-item"> Reports</a>
                                         </div>
                                     </div>
+                                    <?php } ?>
+                                    <a href="<?php echo base_url(); ?>leaveApplicationForm" class="dropdown-item"><i class="ri-user-shared-2-fill align-middle mr-1"></i> Leave Application Form</a>
 
 
                                 </div>
@@ -839,7 +861,7 @@
 
                             <!-- material module -->
 
-                            <?php if(session()->get('roleText') == 'System Administrator'){ ?>
+                            <?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor'){ ?>
 
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>rawmaterialListing" role="button" aria-expanded="false">
@@ -852,7 +874,7 @@
 
                              <!-- master detail module -->
 
-                             <?php if(session()->get('roleText') == 'System Administrator'){ ?>
+                             <?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor'){ ?>
 
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-others" role="button"
@@ -883,7 +905,7 @@
 
                          <!-- Stock module  -->
 
-                        <?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Stock Handler' || session()->get('roleText') == 'Lab Staff'){?>
+                        <?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Stock Handler' || session()->get('roleText') == 'Lab Staff'){?>
                            
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle  arrow-none" href="#" id="topnav-stock" role="button"
@@ -891,7 +913,6 @@
                                     <i class="ri-shopping-bag-line"></i> Stock <div class="arrow-down"></div>
                                 </a>
                                 <div class="dropdown-menu" aria-labelledby="topnav-stock">
-
                                     <div class="dropdown" >
                                       <a href="<?php echo base_url(); ?>incomingSilicaSandDetails?remark=noRemark" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>Incoming Silica Sand Details</a>
                                         <div class="dropdown-menu" aria-labelledby="topnav-stock">
diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php
index ea89ce2c..e4ce954d 100755
--- a/app/Views/inwardgateregister.php
+++ b/app/Views/inwardgateregister.php
@@ -167,7 +167,7 @@
 													<th>Received Quantity</th>
 													<th>Balance Quantity</th>
 													<th>Invoice Quantity<span class="text-danger">*</span></th>
-													<th>Remarks</th>
+													<th>Remarks<span class="text-danger">*</span></th>
 													<th> </th>
 												</tr>
 											</thead>
@@ -645,6 +645,11 @@
 		var RecQty = parseFloat($('#txtReceivedQuantity' + Rowid).val() == '' ? '0.00' : $('#txtReceivedQuantity' + Rowid).val());
 		var OrderedQty = parseFloat($("#Quantity_1" + Rowid).text());
 		var r = $("#Remark" + Rowid).val();
+		if (r == '') {
+			alert("Please Enter the Remark")
+			$("#Remark" + Rowid).focus();
+			return false;
+		}
 		var isOpenOrder = parseInt($("#hiddenIsOpenOrder").val(), 2);
 		var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? 0 : 1;
 		if (formatted_IsOpenOrder == 0) {
@@ -897,7 +902,7 @@
 					isOpenOrder = parseInt(obj.IsOpenOrder ? obj.IsOpenOrder : "0", 2);
 					var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open";
 					$('.help-block').text(formatted_IsOpenOrder);
-					var button_text_for_IGRDraftLink = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "Save as Draft IGR" : "Save as Open IGR";
+					var button_text_for_IGRDraftLink = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "Save as Draft IGR" : "Save as Draft IGR";
 					$('#IGRDraftLink').text(button_text_for_IGRDraftLink);
 					//$("#Add").val(obj.Address);
 					$("#del").val(obj.DeliveryDate);
diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php
index 24f83734..73838c06 100755
--- a/app/Views/monthlypayinputs.php
+++ b/app/Views/monthlypayinputs.php
@@ -214,7 +214,7 @@
 
                                 <i class="fe-maximize noti-icon" onclick="toggleDivFullscreen()" style="margin-right: 15px;margin-top: 5px;font-size: 28px;cursor:pointer;" title="Full screen view"></i>
 
-                                <i class="fas fa-save"  onclick="getAllData();" style="margin-right: 15px;margin-top: 5px;font-size:28px;cursor:pointer;" title="Save"></i>
+                                <i class="fas fa-save auditor-restricted-btn"  onclick="getAllData();" style="margin-right: 15px;margin-top: 5px;font-size:28px;cursor:pointer;" title="Save"></i>
    
                              </div>
                          </div>
@@ -589,7 +589,6 @@
                                                      </td>
 
                                                      <td style="max-width:80px;text-align:right;">
-                                                     <!-- $record->driver_salary_amount -->
                                                      <?php echo number_format($sum_of_amount, 2, '.', ''); $totalworkedSalary[] = $sum_of_amount; ?>
                                                      </td>
 
@@ -819,6 +818,22 @@ $(document).ready(function () {
             
             let ws = XLSX.utils.table_to_sheet(table); // Convert modified table to sheet
             let wb = XLSX.utils.book_new(); // Create a new workbook
+            var range = XLSX.utils.decode_range(ws['!ref']);
+
+            // Auto-size columns
+            let colWidths = [];
+            for (let R = range.s.r; R <= range.e.r; ++R) {
+                for (let C = range.s.c; C <= range.e.c; ++C) {
+                    let cell_ref = XLSX.utils.encode_cell({ c: C, r: R });
+                    let cell = ws[cell_ref];
+                    if (cell) {
+                        let val = cell.v ? cell.v.toString() : '';
+                        colWidths[C] = Math.max(colWidths[C] || 10, val.length);
+                    }
+                }
+            }
+            
+            ws['!cols'] = colWidths.map(w => ({ wch: w + 2 }));
             XLSX.utils.book_append_sheet(wb, ws, 'Sheet1'); // Append sheet to workbook
             XLSX.writeFile(wb, filename || 'export.xlsx'); // Save the file
         }
diff --git a/app/Views/publicholidays.php b/app/Views/publicholidays.php
index 50fae240..2f10983c 100755
--- a/app/Views/publicholidays.php
+++ b/app/Views/publicholidays.php
@@ -39,7 +39,7 @@
                   <input type="text" name="hdate" id="hdate" class="form-control">
                 </div>
                 <div class="col-md-3">
-                  <input type="button" id="Add" value="Add" class="btn btn-success" class="form-control" style="margin-top: 25px;margin-bottom: 0px;">
+                  <input type="button" id="Add" value="Add" class="btn btn-success auditor-restricted-btn" class="form-control" style="margin-top: 25px;margin-bottom: 0px;">
                 </div>
               </div>
               <div class="card-body">
@@ -70,7 +70,7 @@
                                                                                 echo "NO DATA";
                                                                               } ?></td>
                           <td contenteditable='false' style="text-align:left;"><?php echo $date; ?></td>
-                          <td style="text-align:center;"><a href='#' onclick="DeleteRow(<?php echo $index; ?>)" id="Del"><span class="fas fa-trash"></span></a></td>
+                          <td style="text-align:center;"><a href='#' onclick="DeleteRow(<?php echo $index; ?>)" id="Del" class="auditor-restricted-btn"><span class="fas fa-trash"></span></a></td>
                         </tr>
                     <?php
                       }
@@ -80,7 +80,7 @@
                 </table>
                 <p>&nbsp;</p>
                 <div class="row">
-                  <div class="col-md-12 text-right" id="savebutton">
+                  <div class="col-md-12 text-right auditor-restricted-btn" id="savebutton">
                     <input type="button" id="submit" value="Save" class="btn btn-success">
                   </div>
                 </div>
diff --git a/app/Views/rawmaterialListing.php b/app/Views/rawmaterialListing.php
index 883e87cb..d7375955 100755
--- a/app/Views/rawmaterialListing.php
+++ b/app/Views/rawmaterialListing.php
@@ -56,7 +56,7 @@
          
         </div>
         <div class="col-2 text-right pr-3">
-              <a class="btn btn-success"  
+              <a class="btn btn-success auditor-restricted-btn"  
                  href="<?php echo base_url(); ?>addRawmaterial">
                   Add New Material
                 </a>
@@ -217,7 +217,7 @@
                                 class="fa fa-edit" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;
                             </a>
 
-                            <a style="cursor:pointer;" data-toggle="tooltip"
+                            <a class="auditor-restricted-btn" style="cursor:pointer;" data-toggle="tooltip"
                               title="<?= $record->MaterialCode ?> - Click here to delete material details"
                               onclick="deleteMaterial('<?php echo $record->MaterialCode; ?>')"><i class="fa fa-trash"
                                 style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;
diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php
index aa7686a2..d0b5beec 100755
--- a/app/Views/requisitionlisting.php
+++ b/app/Views/requisitionlisting.php
@@ -111,10 +111,10 @@ if (!empty($Status)) {
                             </div>
                             
                             <?php if ($DraftCount == 0) { ?>
-                                <a class="btn btn-success" href="<?php echo base_url(); ?>RequisitionForm">Raise New Requisition</a>
+                                <a class="btn btn-success auditor-restricted-btn" href="<?php echo base_url(); ?>RequisitionForm">Raise New Requisition</a>
                             <?php } ?>
                             <?php if ($DraftCount > 0) { ?>
-                                <p><span class="highlight">The Requisition No <b><?php echo $ReqNo; ?></b> is in Draft
+                                <p><span class="highlight auditor-restricted-btn">The Requisition No <b><?php echo $ReqNo; ?></b> is in Draft
                                         status.</span> Please act on the requisition.<span class="highlight">Then only you can raise
                                         New Requisition. </span></p>
                             <?php } ?>
@@ -176,7 +176,7 @@ if (!empty($Status)) {
                                                             href="<?php echo base_url() . 'EditRequisitionForm?ReqNo=' . $record->ReqNo . '&ReqType=' . $record->ReqType; ?>"><i
                                                                 class="fas fa-pencil-alt" data-toggle="tooltip"
                                                                 title="<?php echo $record->ReqNo; ?>  -  Click here to view Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>
-                                                         <a data-toggle="tooltip" href="#" onclick="DeleteRow('<?php echo $record->ReqNo; ?>' )"><i
+                                                         <a data-toggle="tooltip" href="#" class="auditor-restricted-btn" onclick="DeleteRow('<?php echo $record->ReqNo; ?>' )"><i
                                                                 class="fas fa-trash" data-toggle="tooltip"
                                                                 title="<?php echo $record->ReqNo; ?>  -  Click here to Delete Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>
                                                     </td>
diff --git a/app/Views/stock/CoatingMachineDetail.php b/app/Views/stock/CoatingMachineDetail.php
index bd4d1c46..ae106fe5 100644
--- a/app/Views/stock/CoatingMachineDetail.php
+++ b/app/Views/stock/CoatingMachineDetail.php
@@ -402,7 +402,7 @@
                                             </i>
 
 
-                                            <i class="fa fa-plus-circle btn-lg mt-2"
+                                            <i class="fa fa-plus-circle btn-lg mt-2 auditor-restricted-btn"
                                                 title="Add Entry"
                                                 data-target="#coatingMachineDetailModal"
                                                 data-toggle="modal"
@@ -640,7 +640,7 @@
                                             </div>
                                             <div class="modal-footer">
                                                 <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-                                                <button type="submit" class="btn btn-primary submit-btn">Save </button>
+                                                <button type="submit" class="btn btn-primary submit-btn auditor-restricted-btn">Save </button>
                                             </div>
                                         </form>
                                     </div>
@@ -844,7 +844,7 @@
                                                 <div class="form-row" id="editBatchCardRowId">
 
                                                     <!-- batch card file upload -->
-                                                    <div class="form-group col-md-4">
+                                                    <div class="form-group auditor-restricted col-md-4">
 
                                                         <label for="editBatchCardId">Upload Batch Card</label>
                                                         <br>
@@ -861,7 +861,7 @@
                                             </div>
                                             <div class="modal-footer">
                                                 <button type="button" class="btn btn-secondary" data-dismiss="modal" id="cancelBtn">Cancel</button>
-                                                <button type="submit" class="btn btn-primary submit-btn">Save </button>
+                                                <button type="submit" class="btn btn-primary submit-btn auditor-restricted-btn">Save </button>
                                             </div>
                                         </form>
                                     </div>
@@ -1367,10 +1367,10 @@
                                     <label for="">Change Batch Card</label>
                                     <input type="file" class="editBatchFile additionalBatchFile" name="batchCard[]" >
                                     <p>( Previously Uploaded File ${element.client_given_name} )</p>
-                                    <button type="button" class="btn btn-danger btn-sm mt-2 removeBatch" data-id="${element.batchCardId}">Remove</button>
+                                    <button type="button" class="btn btn-danger btn-sm mt-2 removeBatch auditor-restricted-btn" data-id="${element.batchCardId}" style="display: none;">Remove</button>
                                 </div>`;
 
-                $('#editBatchCardRowId').append(string)
+                $('#editBatchCardRowId').append(string);
             });
 
 
@@ -1958,7 +1958,7 @@ $(document).ready(function() {
             });
 
             // Initialize Select2 when the modal is shown inside full screen
-            $('#filterModalId,').on('shown.bs.modal', function () {
+            $('#filterModalId').on('shown.bs.modal', function () {
                 $('.select2').select2({
                     dropdownParent: $(this) // This ensures Select2 works in the modal
                 });
diff --git a/app/Views/stock/bagStockDetails.php b/app/Views/stock/bagStockDetails.php
index 1144a2fc..84815e86 100644
--- a/app/Views/stock/bagStockDetails.php
+++ b/app/Views/stock/bagStockDetails.php
@@ -405,7 +405,7 @@ foreach ($period as $day) {
                                             </i>
 
 
-                                            <i class="fas fa-save btn-lg mt-2"
+                                            <i class="fas fa-save btn-lg mt-2 auditor-restricted-btn"
                                                 title="Save"
                                                 style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
                                                 id="saveId">
diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php
index b7adb8a8..868f18aa 100644
--- a/app/Views/stock/dieselStockDetails.php
+++ b/app/Views/stock/dieselStockDetails.php
@@ -398,7 +398,7 @@ foreach ($period as $day) {
                                             </i>
 
 
-                                            <i class="fas fa-save btn-lg mt-2"
+                                            <i class="fas fa-save btn-lg mt-2 auditor-restricted-btn"
                                                 title="Save"
                                                 style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
                                                 id="saveId">
diff --git a/app/Views/stock/drierMachineDetails.php b/app/Views/stock/drierMachineDetails.php
index 9119fd81..1e958eec 100644
--- a/app/Views/stock/drierMachineDetails.php
+++ b/app/Views/stock/drierMachineDetails.php
@@ -364,7 +364,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                             </i>
 
 
-                                            <i class="fa fa-plus-circle btn-lg mt-2"
+                                            <i class="fa fa-plus-circle btn-lg mt-2 auditor-restricted-btn"
                                                 title="Add Entry"
                                                 data-target="#additionalEntriesModalId"
                                                 data-toggle="modal"
@@ -778,7 +778,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         </div>
 
                                                     </div>
-                                                    <button type="submit" class="btn btn-primary float-right submit-btn">Update</button>
+                                                    <button type="submit" class="btn btn-primary float-right submit-btn auditor-restricted-btn">Update</button>
 
 
                                                     <!-- hidden fields -->
diff --git a/app/Views/stock/dustAndRoughStockDetails.php b/app/Views/stock/dustAndRoughStockDetails.php
index 6eacc327..4ddb20f5 100644
--- a/app/Views/stock/dustAndRoughStockDetails.php
+++ b/app/Views/stock/dustAndRoughStockDetails.php
@@ -400,7 +400,7 @@
                                                 </i>
 
 
-                                                <i class="fa fa-save btn-lg mt-2"
+                                                <i class="fa fa-save btn-lg mt-2 auditor-restricted-btn"
                                                     title="Save"
                                                     style="font-size: x-large; cursor:pointer;  color:rgb(31, 132, 3)"
                                                     id="saveId">
diff --git a/app/Views/stock/gasStockDetails.php b/app/Views/stock/gasStockDetails.php
index 5a758333..337a91b8 100644
--- a/app/Views/stock/gasStockDetails.php
+++ b/app/Views/stock/gasStockDetails.php
@@ -378,7 +378,7 @@
                                             </i>
 
 
-                                            <i class="fa fa-save btn-lg mt-2"
+                                            <i class="fa fa-save btn-lg mt-2 auditor-restricted-btn"
                                                 title="Save"
                                                 style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
                                                 id="saveId">
diff --git a/app/Views/stock/incomingSilicaSandDetails.php b/app/Views/stock/incomingSilicaSandDetails.php
index 943a8e09..b2b64690 100644
--- a/app/Views/stock/incomingSilicaSandDetails.php
+++ b/app/Views/stock/incomingSilicaSandDetails.php
@@ -355,7 +355,7 @@
                                             </i>
 
 
-                                            <i class="fas fa-save btn-lg mt-2"
+                                            <i class="fas fa-save btn-lg mt-2 auditor-restricted-btn"
                                                 title="Save"
                                                 style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
                                                 id="saveId">
diff --git a/app/Views/stock/powerConsumptionDetails.php b/app/Views/stock/powerConsumptionDetails.php
index a9252d8e..342599b1 100644
--- a/app/Views/stock/powerConsumptionDetails.php
+++ b/app/Views/stock/powerConsumptionDetails.php
@@ -404,7 +404,7 @@ foreach ($period as $day) {
                                             </i>
 
 
-                                            <i class="fas fa-save btn-lg mt-2"
+                                            <i class="fas fa-save auditor-restricted-btn btn-lg mt-2"
                                                 title="Save"
                                                 style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
                                                 id="saveId">
diff --git a/app/Views/stock/resinStockDetails.php b/app/Views/stock/resinStockDetails.php
index a571c4f4..8056653e 100644
--- a/app/Views/stock/resinStockDetails.php
+++ b/app/Views/stock/resinStockDetails.php
@@ -405,7 +405,7 @@ foreach ($period as $day) {
                                             </i>
 
 
-                                            <i class="fas fa-save btn-lg mt-2"
+                                            <i class="fas fa-save btn-lg mt-2 auditor-restricted-btn"
                                                 title="Save"
                                                 style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
                                                 id="saveId">
diff --git a/app/Views/stock/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php
index 2b2a01aa..50e0d485 100644
--- a/app/Views/stock/trpProductionStockDetails.php
+++ b/app/Views/stock/trpProductionStockDetails.php
@@ -459,7 +459,7 @@ $timeOtions[] = "12:00 AM";
                                             </i>
 
 
-                                            <i class="fa fa-save btn-lg mt-2"
+                                            <i class="fa fa-save btn-lg mt-2 auditor-restricted-btn"
                                                 title="Save"
                                                 style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
                                                 id="saveId">
@@ -1578,7 +1578,7 @@ $timeOtions[] = "12:00 AM";
                                                     id="trpAbstractDetailsExport">
                                                 </i>
 
-                                                <i class="fas fa-save btn-lg "
+                                                <i class="fas fa-save btn-lg auditor-restricted-btn"
                                                     title="Save"
                                                     style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
                                                     id="abstractSaveId">
diff --git a/app/Views/stock/trpSandUseStockDetails.php b/app/Views/stock/trpSandUseStockDetails.php
index 2bdb34dd..66d41a47 100644
--- a/app/Views/stock/trpSandUseStockDetails.php
+++ b/app/Views/stock/trpSandUseStockDetails.php
@@ -391,7 +391,7 @@
                                                         </i>
 
 
-                                                        <i class="fa fa-save btn-lg mt-2"
+                                                        <i class="fa fa-save btn-lg mt-2 auditor-restricted-btn"
                                                             title="Save"
                                                             style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
                                                             id="saveId">
diff --git a/app/Views/supplierListing.php b/app/Views/supplierListing.php
index 9fd8c7ee..3cdaa8cb 100755
--- a/app/Views/supplierListing.php
+++ b/app/Views/supplierListing.php
@@ -164,6 +164,7 @@
 
                                                             <a style="cursor:pointer;" data-toggle="tooltip"
                                                                 title="<?= $record->SupplierID ?> - Click here to delete Supplier details"
+                                                                class="auditor-restricted-btn"
                                                                 onclick="deletesupplier('<?php echo $record->SupplierID; ?>')"><i
                                                                     class="fa fa-trash"
                                                                     style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;
diff --git a/app/Views/userListing.php b/app/Views/userListing.php
index f0c28c68..4dcfb81f 100755
--- a/app/Views/userListing.php
+++ b/app/Views/userListing.php
@@ -54,7 +54,7 @@
                                         </li>
                                     </ol>
                         </div>
-                              <a class="btn btn-success " href="<?php echo base_url(); ?>addNew">Add New User</a>
+                              <a class="btn btn-success auditor-restricted-btn" href="<?php echo base_url(); ?>addNew">Add New User</a>
                     </div>  
                         
                      
@@ -152,6 +152,7 @@
                                                     <?php if ($record->isDeleted == 1) { ?>
 
                                                     <a onclick="confirmReActivateUser(event)"
+                                                        class="auditor-restricted-btn"
                                                         href="<?php echo base_url() . 'user/reActivateUser?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
                                                         <i class="fas fa-key"></i>
                                                     </a>
@@ -159,14 +160,14 @@
 
                                                     <?php } else { ?>
 
-                                                    <a 
-                                                      href="<?php echo base_url() . 'user/editOld?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
+                                                    <a href="<?php echo base_url() . 'user/editOld?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
                                                       <i class="fas fa-edit"></i>
                                                     </a> 
                                                     
                                                     &nbsp;&nbsp;
 
-                                                    <a onclick="confirmDeleteUser(event)"
+                                                    <a class="auditor-restricted-btn"
+                                                      onclick="confirmDeleteUser(event)"
                                                       href="<?php echo base_url() . 'user/deleteUser?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
                                                       <i class="fas fa-trash"></i>
                                                     </a>
diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php
index 9c90c0c9..2387b09e 100755
--- a/app/Views/viewinwardgateregister.php
+++ b/app/Views/viewinwardgateregister.php
@@ -282,9 +282,13 @@
 											
 											<td align="right"><?php echo (int)$record->NetWeight ?></td>
 											<td align="right"><?php echo (int)$record->taxable_value ?></td>
-											<td align="right"><?php echo (int)$record->gst_amount ?></td>
-											<td align="right"><?php echo ((int)$record->taxable_value + (int)$record->gst_amount) ?></td>
-
+											<td align="right"><?php echo number_format((float)$record->gst_amount, 2, '.', ''); ?></td>
+											<td align="right">
+												<?php 
+													$total_amt = (float)$record->taxable_value + (float)$record->gst_amount;
+													echo number_format($total_amt, 2, '.', ''); 
+												?>
+											</td>
 											<td><?php echo $record->VehicleNo ?></td>
 											<td><?php echo $record->DriverName ?></td>
 											<td><?php echo $record->TransporterName ?></td>
@@ -506,7 +510,7 @@
 										<th style="width: 50px;">Tax (%)</th>
 										<th style="width: 50px;">Taxable Amt</th>
 										<th style="width: 50px;">Total Amt</th>
-										<th style="width: 150px;">Remarks</th>
+										<th style="width: 150px;">Remarks <span class="text-danger">*</span></th>
 										<th style="width: 25px;">Net Weight</th>
 										<th style="width: 25px; display:none" id="gasShortageHeader">Add Gas Shortage</th>
 										<th style="width: 25px; display:none" id="gasShortageListHeader">Gas Shortage list</th>
@@ -562,7 +566,7 @@
 			<div class="modal-footer">
 				<div class="buttonContainer">
 					<a class="btn btn-secondary" data-dismiss="modal" value="Close">Close</a>
-					<a class="btn btn-primary" id="generateIGR" value="generateIGR">Generate IGR</a>
+					<a class="btn btn-primary auditor-restricted" id="generateIGR" value="generateIGR">Generate IGR</a>
 					<a class="btn btn-primary" id="draftIGR" value="draftIGR">Save as Draft IGR</a>
 				</div>
 			</div>
@@ -1261,9 +1265,9 @@
 									'<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</td>' +
 									'<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
 									'<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' +
-									'<td style="width: 50px;" id="amount' + i + '">' + amount + '</td>' +
-									'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>' +
-									'<td style="width: 100px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;" value="'+item.Remarks+'"> </td>' +
+									'<td style="width: 50px;" id="amount' + i + '">' + Number(amount).toFixed(2) + '</td>' +
+									'<td style="width: 50px;" id="grand_total_amount' + i + '">' + Number(grand_total_amount).toFixed(2) + '</td>' +
+									'<td style="width: 100px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form auditor-restricted-fieldgr" onchange="SetRemarks(' + i + ')" style="width: 75px;" value="' + item.Remarks + '"></td>'+
 									'<td style="width: 25px;"><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' +
 									'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
 									'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
@@ -1320,16 +1324,16 @@
 										trIGRHTML +=  '<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</td>' +
 										'<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
 										'<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' +
-										'<td style="width: 50px;" id="amount' + i + '">' + amount + '</td>' +
-										'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>';
-										if (userRole == 5) {
-    										trIGRHTML += '<td style="width: 100px;"> ' + item.Remarks + ' </td>';
-										} else {
-											trIGRHTML += '<td style="width: 100px;">' +
-												'<input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" ' +
-												'onchange="SetRemarks(' + i + ')" style="width: 75px;" value="' + item.Remarks + '">' +
-											'</td>';
-										}
+										'<td style="width: 50px;" id="amount' + i + '">' + Number(amount).toFixed(2) + '</td>' +
+										'<td style="width: 50px;" id="grand_total_amount' + i + '">' + Number(grand_total_amount).toFixed(2) + '</td>' ;
+											if (userRole == 5) {
+												trIGRHTML += '<td style="width: 100px;">' + item.Remarks + '</td>';
+											} else {
+												trIGRHTML += '<td style="width: 100px;">' +
+																'<input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form auditor-restricted-field" ' +
+																'onchange="SetRemarks(' + i + ')" style="width: 75px;" value="' + item.Remarks + '">' +
+															'</td>';
+											}
 										trIGRHTML += '<td style="width: 25px;">' + '<a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" ' + 'data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus="' + igrstatus + '">' + '<i class="fa fa-solid fa-truck" style="text-align: center;"></i></a>' + '</td>' +
 										'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
 										'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
@@ -1380,13 +1384,13 @@
 										}
 										trIGRHTML += '<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
 										'<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' +
-										'<td style="width: 50px;" id="amount' + i + '">' + amount + '</td>' +
-										'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>';
+										'<td style="width: 50px;" id="amount' + i + '">' + Number(amount).toFixed(2) + '</td>' +
+										'<td style="width: 50px;" id="grand_total_amount' + i + '">' + Number(grand_total_amount).toFixed(2) + '</td>';
 										if (userRole == 5) {
 											trIGRHTML += '<td style="width: 100px;"> ' + item.Remarks + ' </td>';
 										} else {
 											trIGRHTML += '<td style="width: 100px;">' +
-												'<input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" ' +
+												'<input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form auditor-restricted-field" ' +
 												'onchange="SetRemarks(' + i + ')" style="width: 75px;" value="' + item.Remarks + '">' +
 											'</td>';
 										}
@@ -1720,15 +1724,16 @@
 		// let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
 		let sentence = " ";
 		if (parseInt(record.is_add) === 1) {
-			// sentence += record.IGR_No + " was Created by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
+			sentence += record.IGR_No + " was Created by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time+" </br></br>";
 			
 			if (record.field === "IGRStatus") {
 				str1 = record.new_data;
 				str2 = str1.replace(/\bIGR\b/i, '').trim();
+				str2 = str2 == "CREATED" ? "GENERATED" : str2;
 				sentence += record.IGR_No + " was <b> ` " + str2 + " ` </b>  by " + record.FullName + 
 							" on " + record.indian_date + " at " + record.indian_time;
 			} else {
-				sentence += record.IGR_No + " was <b> ` CREATED ` </b> by " + record.FullName + 
+				sentence += record.IGR_No + " was <b> ` GENERATED ` </b> by " + record.FullName + 
 							" on " + record.indian_date + " at " + record.indian_time;
 			}
 		} else if (parseInt(record.is_edit) === 1) {
@@ -1739,7 +1744,9 @@
 				let displayNewData = record.new_data === null || record.new_data === "" ? " " : record.new_data;
 				if (record.field === "IGRStatus") {
 					displayOldData = displayOldData.replace(/\bIGR\b/i, '').trim();
+					displayOldData = displayOldData == "CREATED" ? "GENERATED" : displayOldData;
 					displayNewData = displayNewData.replace(/\bIGR\b/i, '').trim();
+					displayNewData = displayNewData == "CREATED" ? "GENERATED" : displayNewData;
 			    }
 				if(displayNewData || displayOldData ){
 					sentence += ((record.IGRItem_No) ? record.MaterialName+" ( "+ record.MaterialCode + " ) -  " : "")+fieldName+" <b> ` "+ displayOldData + " `  </b> was Updated into <b> ` " + displayNewData + " ` </b> by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;	
@@ -2871,4 +2878,3 @@ $("#gasShortageCalculator, #editGasShortageCalculator").submit(function (event)
 
 
 </script>
-