diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php
index 7857c282..ca47e99b 100755
--- a/app/Controllers/Inwardgateregister.php
+++ b/app/Controllers/Inwardgateregister.php
@@ -49,10 +49,12 @@ class Inwardgateregister extends BaseController
 
   function viewIGR()
   {
+    // echo $this->roleText;
+    // echo $this->role;die;
 
     $this->global['pageTitle'] = 'View Inward Gate Register';
     $data['IGR'] = $this->inwardgateregister_model->ViewigrListing();
-    $data['DEPCode'] = $this->session->get('DEPCode');
+    $data['userRole'] = $this->session->get('role');
     $this->loadViews("viewinwardgateregister", $this->global, $data, NULL);
     // $this->global['pageTitle'] = 'Inward Gate Register Details';
     // $data['IGR'] = $this->inwardgateregister_model->igrListing();
@@ -667,10 +669,10 @@ function viewIGRDetails()
 
   function UpdateIGR()
   {
-
     $IGRNo = $this->request->getPost('igr');
     $PONo = $this->request->getPost('po');
 
+    $DeliveryChellanOrInvoiceNo = $this->request->getPost('invno');
     $DeliveryChellan = $this->request->getPost('invdate');
     $DeliveryChellanDate = !$DeliveryChellan || $DeliveryChellan === null ? NULL : get_date_time_format($DeliveryChellan);
 
@@ -694,7 +696,7 @@ function viewIGRDetails()
     $path = ROOTPATH.'public/uploads/Igrfiles/'; 
     if(!is_dir($path)) { mkdir($path, 0777, true); }
 
-    $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'VehicleType'=>$VehicleType,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby);
+    $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'VehicleType'=>$VehicleType,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo);
 
     $MasterFile = $this->request->getfile('MasterFile');
 
diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php
index f85eb9e8..dcc04e85 100644
--- a/app/Views/viewinwardgateregister.php
+++ b/app/Views/viewinwardgateregister.php
@@ -127,7 +127,6 @@ var data = suggestion.DriverMobileNumber;
     }
 </style>
 <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/Autocomplete/jquery.autocomplete.js"></script>
-
   <div class="content-wrapper">
     <section class="content"><br/>  
 			<div class="box"> 
@@ -587,6 +586,7 @@ var data = suggestion.DriverMobileNumber;
 		var buttonContainer = $(".buttonContainer");
 		var modal = $(this); // Reference to the modal itself
 		var invoiceDateInput = modal.find('#Invoice_Date');
+		var invoiceNoInput = modal.find('#Invoice_No');
 		var MaterialRcvdDateInput = modal.find('#MaterialRcvdDate');
 		var VehicleNoInput = modal.find('#Vehicle_No');
 		var VehicleTypeInput = modal.find('#Vehicle_Type');
@@ -595,10 +595,8 @@ var data = suggestion.DriverMobileNumber;
 		var MasterFileInput = modal.find('#MasterFile');
 		modal.find('#MasterFileLabel').hide();
 
-		var depCode = "<?php echo $DEPCode; ?>";
-
-		// depCode != "DEP27"
-        if(depCode == "DEP27"){
+		var userRole = "<?php echo (int)$userRole; ?>";
+        if(userRole != 1){
 			if (igrstatus == "ST074") {
 				buttonContainer.find("#draftIGR, #generateIGR").css("display", "inline-block");
 				$(".a_tag_for_mrir").css("display", "block");			
@@ -607,6 +605,7 @@ var data = suggestion.DriverMobileNumber;
 				DriverMobileNumberInput.prop('readonly', false);
 				MaterialRcvdDateInput.prop('readonly', false);
 				invoiceDateInput.prop('readonly', false);
+				invoiceNoInput.prop('readonly', false);
 			} else {
 				buttonContainer.find("#draftIGR, #generateIGR").css("display", "none");
 				$(".a_tag_for_mrir").css("display", "none");		
@@ -615,6 +614,7 @@ var data = suggestion.DriverMobileNumber;
 				DriverMobileNumberInput.prop('readonly', true);
 				MaterialRcvdDateInput.prop('readonly', true);
 				invoiceDateInput.prop('readonly', true);
+				invoiceNoInput.prop('readonly', true);
 			}
 		}else{
 			$(".a_tag_for_mrir").css("display", "none");		
@@ -721,7 +721,8 @@ console.log(parsedData);
 						$("#ser").val(item.ServiceDescription);
 
 						i = i + 1;
-						if (igrstatus === "ST074") {
+						// userrole is system admin also know as admin (if)
+						if (userRole == 1) {
 							$("#pendingQuantityHeader").css("display", "table-cell");
 
 							trIGRHTML += '<tr>' +
@@ -753,31 +754,68 @@ console.log(parsedData);
 								$('#QuantityAsPerInvoice' + i).attr('readonly', 'true');
 							}
 
-						} else {
-							$("#pendingQuantityHeader").css("display", "none");
-							trIGRHTML += '<tr>' +
-								'<td style="width: 50px;" align="right">' + i + '</td>' +
-								'<td style="width: 100px;" name="MaterialName" id="MaterialCode" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
-								'<td style="width: 200px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
-								'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
-								'<td style="width: 100px;" align="right" name="Quantity">' + item.Quantity + '</td>' +
-								'<td style="width: 100px;" align="right" data-name="sel" >' + item.QuantityAsPerInvoice + '</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 + '">' +
-								'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
-								'<input type="hidden" id="txtQuantityAsPerInvoice' + i + '" name="txtQuantityAsPerInvoice' + i + '" value="' + item.QuantityAsPerInvoice + '">' +
-								'<input type="hidden" id="txtOrderedQuantity' + i + '" name="txtOrderedQuantity' + i + '" value="' + item.Quantity + '">' +
-								'<input type="hidden" id="txtGrossWeight' + i + '" name="txtGrossWeight' + i + '" value="' + item.GrossWeight + '">' +
-								'<input type="hidden" id="txtGrossWeightDate' + i + '" name="txtGrossWeightDate' + i + '" value="' + item.GrossWeightDate + '">' +
-								'<input type="hidden" id="txtTareWeight' + i + '" name="txtTareWeight' + i + '" value="' + item.TareWeight + '">' +
-								'<input type="hidden" id="txtTareWeightDate' + i + '" name="txtTareWeightDate' + i + '" value="' + item.TareWeightDate + '">' +
-								'<input type="hidden" id="txtNetWeight' + i + '" name="txtNetWeight' + i + '"value="' + item.NetWeight + '">' +
-								'<input type="hidden" id="txtRemarks' + i + '" name="txtRemarks' + i + '"value="' + item.Remarks + '">' +
-								'<input type="hidden" id="txtIGRLineItem' + i + '" name="txtIGRLineItem' + i + '"value="' + item.IGRItemNo + '">' +
-								'<input type="file"   id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '">' +
-								'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">' +
-							'</tr>';
+						} 
+						 // userrole is security based on status we show and here (else if)
+						else if (userRole !== 1)  {
+							if(igrstatus === "ST074"){
+								$("#pendingQuantityHeader").css("display", "table-cell");
+
+									trIGRHTML += '<tr>' +
+										'<td style="width: 50px;" align="right">' + i + '</td>' +
+										'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
+										'<td style="width: 200px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
+										'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
+										'<td style="width: 100px;" align="right" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
+										'<td style="width: 100px;" align="right" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ','+isOpenOrder+')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '"  value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>' +
+										'<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</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 + '">' +
+										'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
+										'<input type="hidden" id="txtQuantityAsPerInvoice' + i + '" name="txtQuantityAsPerInvoice' + i + '" value="' + item.QuantityAsPerInvoice + '">' +
+										'<input type="hidden" id="txtOrderedQuantity' + i + '" name="txtOrderedQuantity' + i + '" value="' + item.Quantity + '">' +
+										'<input type="hidden" id="txtGrossWeight' + i + '" name="txtGrossWeight' + i + '" value="' + item.GrossWeight + '">' +
+										'<input type="hidden" id="txtGrossWeightDate' + i + '" name="txtGrossWeightDate' + i + '" value="' + item.GrossWeightDate + '">' +
+										'<input type="hidden" id="txtTareWeight' + i + '" name="txtTareWeight' + i + '" value="' + item.TareWeight + '">' +
+										'<input type="hidden" id="txtTareWeightDate' + i + '" name="txtTareWeightDate' + i + '" value="' + item.TareWeightDate + '">' +
+										'<input type="hidden" id="txtNetWeight' + i + '" name="txtNetWeight' + i + '"value="' + item.NetWeight + '">' +
+										'<input type="hidden" id="txtRemarks' + i + '" name="txtRemarks' + i + '"value="' + item.Remarks + '">' +
+										'<input type="hidden" id="txtIGRLineItem' + i + '" name="txtIGRLineItem' + i + '"value="' + item.IGRItemNo + '">' +
+										'<input type="file"   id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '" style="display:none;">' +
+										'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">' +
+									'</tr>';
+
+									if ((item.Quantity - item.QuantityAsPerInvoice) == 0.00) {
+										$('#QuantityAsPerInvoice' + i).attr('readonly', 'true');
+									}
+
+                            }else{
+										$("#pendingQuantityHeader").css("display", "none");
+										trIGRHTML += '<tr>' +
+										'<td style="width: 50px;" align="right">' + i + '</td>' +
+										'<td style="width: 100px;" name="MaterialName" id="MaterialCode" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
+										'<td style="width: 200px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
+										'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
+										'<td style="width: 100px;" align="right" name="Quantity">' + item.Quantity + '</td>' +
+										'<td style="width: 100px;" align="right" data-name="sel" >' + item.QuantityAsPerInvoice + '</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 + '">' +
+										'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
+										'<input type="hidden" id="txtQuantityAsPerInvoice' + i + '" name="txtQuantityAsPerInvoice' + i + '" value="' + item.QuantityAsPerInvoice + '">' +
+										'<input type="hidden" id="txtOrderedQuantity' + i + '" name="txtOrderedQuantity' + i + '" value="' + item.Quantity + '">' +
+										'<input type="hidden" id="txtGrossWeight' + i + '" name="txtGrossWeight' + i + '" value="' + item.GrossWeight + '">' +
+										'<input type="hidden" id="txtGrossWeightDate' + i + '" name="txtGrossWeightDate' + i + '" value="' + item.GrossWeightDate + '">' +
+										'<input type="hidden" id="txtTareWeight' + i + '" name="txtTareWeight' + i + '" value="' + item.TareWeight + '">' +
+										'<input type="hidden" id="txtTareWeightDate' + i + '" name="txtTareWeightDate' + i + '" value="' + item.TareWeightDate + '">' +
+										'<input type="hidden" id="txtNetWeight' + i + '" name="txtNetWeight' + i + '"value="' + item.NetWeight + '">' +
+										'<input type="hidden" id="txtRemarks' + i + '" name="txtRemarks' + i + '"value="' + item.Remarks + '">' +
+										'<input type="hidden" id="txtIGRLineItem' + i + '" name="txtIGRLineItem' + i + '"value="' + item.IGRItemNo + '">' +
+										'<input type="file"   id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '">' +
+										'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">' +
+									'</tr>';
+
+							} 
 						}
 					}
 				});
@@ -841,6 +879,7 @@ console.log(parsedData);
 			formData.append('igr', igrno);
 			formData.append('po', pono);
 			formData.append('mrc', $("#MaterialRcvdDate").val());
+			formData.append('invno', $("#Invoice_No").val());
 			formData.append('invdate', $("#Invoice_Date").val());
 			formData.append('vehicle_no', $('#Vehicle_No').val());
 			formData.append('vehicle_type', $('#Vehicle_Type').val());
@@ -900,6 +939,7 @@ console.log(parsedData);
 			formData.append('igr', igrno);
 			formData.append('po', pono);
 			formData.append('mrc', $("#MaterialRcvdDate").val());
+			formData.append('invno', $("#Invoice_No").val());
 			formData.append('invdate', $("#Invoice_Date").val());
 			formData.append('vehicle_no', $('#Vehicle_No').val());
 			formData.append('vehicle_type', $('#Vehicle_Type').val());
@@ -1056,7 +1096,6 @@ function constructSentence(record) {
 		formData.append('param1', param1);
 		formData.append('param2', param2);
 
-
 		$('.content').loader('show');
 		$.ajax({
 			data: formData,
@@ -1159,7 +1198,6 @@ $("#Fileshow").on("shown.bs.modal", function(e) {
 				$("#tblefile").append(trFileHTML);
 
 			}
-
 		});
 	}
 });