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/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 7e13766f..177bcd5c 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 29cbd873..b7109bf5 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 c8a2789b..24e1633f 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 62317672..a0d59999 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 8707adf8..94a80327 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 a13a4a7c..1158d28f 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 6dcf00ac..c191d751 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">
@@ -1576,7 +1576,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 6cf79f5d..0f6ae02a 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/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php
index ca208bfd..edea47f4 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 number_format((int)$record->gst_amount, 2, '.', ''); ?></td>
-											<td align="right"><?php $total_amt = ((int)$record->taxable_value + (int)$record->gst_amount);
-																	echo number_format((float)$total_amt, 2, '.', ''); ?></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>
@@ -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 auditor-restricted-btn" 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>
@@ -1262,8 +1266,8 @@
 									'<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 + '">' + 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: 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 + '">' +
@@ -1321,15 +1325,15 @@
 										'<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 + '">' + 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>';
-										}
+										'<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 + '">' +
@@ -2871,4 +2875,3 @@ $("#gasShortageCalculator, #editGasShortageCalculator").submit(function (event)
 
 
 </script>
-