diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index e5db50d9..3c5b1981 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -1027,14 +1027,9 @@ if (!empty($getlogpodtl)) {
 								<!--start new fields 1 sep-->
 								<div class="form-group col-md-12">
 									<label>Description Of Service <span class="text-danger">*</label>
-
-									<?php
-									$DescriptionOfPo = html_entity_decode($DescriptionOfPo);  
-									$DescriptionOfPo = strip_tags($DescriptionOfPo); 
-									$data = array('name' => 'editdescofpo', 'value' => set_value('editdescofpo', $DescriptionOfPo), 'id' => 'editdescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-									echo form_textarea($data);
-									?>
-
+									<textarea id="editdescofpo" name="editdescofpo" class="form-control" rows="3" cols="40">
+                                            <?php echo $DescriptionOfPo ? html_entity_decode($DescriptionOfPo) : ""; ?>
+                                    </textarea>
 								</div><!--end new fields 1 sep-->
 							</div>
 
@@ -1622,7 +1617,7 @@ if (!empty($getlogpodtl)) {
 								$options = array("0" => 'Item Code');
 								//print_r(  $options);
 
-								echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly = "true"');
+								echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly = "true" style="pointer-events: none;"');
 
 								?>
 							</div>
@@ -2354,6 +2349,7 @@ if (!empty($getlogpodtl)) {
 			var Frequency = $("#EditFrequency").val();
 			var FrequencyValue = $("#EditFrequencyNo").val();
 			var ServiceDescription = $('#EdittxtSpcialInstruction').val();
+
 			var OtherAmt = $('#EditOtherAllowances').val();
 			var TotalOrderValue = $("#EditTotalOrderValue").val();
 
@@ -2778,6 +2774,17 @@ if (!empty($getlogpodtl)) {
 		}
 
 	}
+	function EditExceedQuantityCheck() {
+		// RequistQuantity
+		var EnterQuantity = $("#EditQuantity").val() == '' ? "0.00" : parseFloat($("#EditQuantity").val());
+		var ReqQuantity = parseFloat(RequistQuantity);
+		if (EnterQuantity > ReqQuantity) {
+			alert('Your exceeding the Quantity from the Requisition Quantity:' + RequistQuantity + '.Please adjust the Quantity to proceed further.');
+
+			$('#EditQuantity').focus();
+			return false;
+		}
+	}
 	//
 </script>
 
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 29a85df6..883ec42f 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -5349,7 +5349,7 @@ if (!empty($INRSYMBOL)) {
                                                                 $options = array("0" => 'Item Code');
                                                                 //print_r(  $options);
                                                                 
-                                                                echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"','readonly="true"');
+                                                                echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control" readonly="true" style="pointer-events: none;"');
 
                                                                 ?>
                                                             </div>
@@ -5628,7 +5628,7 @@ if (!empty($INRSYMBOL)) {
                                     $options = array("0" => 'Item Code');
 
 
-                                    echo form_dropdown('EditRevenueMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditRevenueMaterialCode"', 'class="form-control"' ,'readonly="true"');
+                                    echo form_dropdown('EditRevenueMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditRevenueMaterialCode"', 'class="form-control"' ,'readonly="true" style="pointer-events: none;"');
 
                                     ?>
                                 </div>
diff --git a/app/Views/attendance.php b/app/Views/attendance.php
index 5e2f8af0..599d171d 100755
--- a/app/Views/attendance.php
+++ b/app/Views/attendance.php
@@ -399,6 +399,11 @@ $currentday = date('d');
                                         
                                             <?php $index = 0;
                                             $row = 0;
+
+                                            usort($finalarray, function($a, $b) {
+                                                return strcmp($a->EmpID, $b->EmpID);
+                                            });
+
                                             foreach ($finalarray as $a) {
                                                 $row++;
                                                 $index++; ?>
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index 622290e1..3cdc9cc2 100755
--- a/app/Views/capitalpurchaseorder.php
+++ b/app/Views/capitalpurchaseorder.php
@@ -1757,7 +1757,7 @@ if (!empty($INRSYMBOL)) {
                                 <div>
                                     <?php
                                     $options = array("0" => 'Item Code');
-                                    echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2" readonly="true"');
+                                    echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2" readonly="true" style="pointer-events: none;"');
                                     ?>
                                 </div>
                             </div><!-- form-col-3 -->
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index f17c609e..6f242420 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -2536,7 +2536,7 @@ $(document).ready(function () {
               <div>
                 <?php
                 $options = array("0" => 'Item Code');
-                echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control select2" readonly = "true"');
+                echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control select2" readonly = "true" style="pointer-events: none;"');
                 ?>
               </div>
             </div>
diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php
index 84651f45..3d344b98 100755
--- a/app/Views/editImportAmendPO.php
+++ b/app/Views/editImportAmendPO.php
@@ -1606,7 +1606,7 @@ if (!empty($RequistionDetails)) {
                                     // echo form_textarea($data);
                                     ?> -->
                                     <textarea id="txtSpcialInstruction" name="txtSpcialInstruction" class="form-control" rows="10" cols="40">
-                                        <?php echo html_entity_decode($ServiceDescription); ?>
+                                        <?php echo $ServiceDescription ? html_entity_decode($ServiceDescription) : ""; ?>
                                     </textarea>
                                 </div>
                             </div>
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index ecc94973..3dbed7f0 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -1854,7 +1854,7 @@ if (!empty($getlogpodtl)) {
 								$options = array("0" => 'Item Code');
 
 
-								echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly = "true"');
+								echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly = "true" style="pointer-events: none;"');
 								?>
 							</div>
 						</div>
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index 987155cc..fe6995b6 100755
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -1382,7 +1382,7 @@ foreach ($PaymentTerms as $TER) {
 									<label>Scope Of Work</label>
 									<textarea name="ScopeofWork" id="ScopeofWork" class="form-control" rows="8" cols="40">
 											<?php 
-											$ServiceDescription = html_entity_decode($ServiceDescription);  
+											$ServiceDescription = $ServiceDescription ? html_entity_decode($ServiceDescription) : '';  
 											// $ServiceDescription = strip_tags($ServiceDescription); 
 											echo set_value('ScopeofWork', $ServiceDescription); ?>
 										</textarea>
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index 332ac3b8..7f351d02 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -1325,7 +1325,7 @@ if (!empty($getlogpodtl)) {
                                         // echo form_textarea($data);
                                         ?> -->
                                         <textarea id="txtSpcialInstruction" name="txtSpcialInstruction" class="form-control" rows="10" cols="40">
-                                            <?php echo html_entity_decode($ServiceDescription); ?>
+                                            <?php echo $ServiceDescription ? html_entity_decode($ServiceDescription) : ''; ?>
                                         </textarea>
 
                                     </div>
@@ -2119,7 +2119,7 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                    echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control " readonly = "true"');
+                                    echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control " readonly = "true" style="pointer-events: none;"');
 
                                     ?>
                                 </div>
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index 750bb5ef..1fe833b8 100755
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -1690,7 +1690,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
 
 
-                                    echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"' ,'readonly="true"');
+                                    echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly="true" style="pointer-events: none;"');
 
                                     ?>
                                 </div>
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index 3bcd0d4a..9eb3136c 100755
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -2923,7 +2923,7 @@ if (!empty($INRSYMBOL)) {
 								$options = array("0" => 'Item Code');
 
 
-								echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"','readonly="true"');
+								echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly="true" style="pointer-events: none;"');
 
 								?>
 							</div>
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php
index 162347b3..a4c56442 100755
--- a/app/Views/servicePurchaseorder.php
+++ b/app/Views/servicePurchaseorder.php
@@ -676,7 +676,7 @@ if (!empty($INRSYMBOL)) {
 		});
 		clearTotalItemValues();
 
-		$('#Edit').click(function() {
+		$('.EditService').click(function(){
 			console.log("1111111111111111111");
 
 			// tinyMCE.triggerSave();
@@ -716,7 +716,8 @@ if (!empty($INRSYMBOL)) {
 
 				var Frequency = $("#EditFrequency").val();
 				var FrequencyValue = $("#EditFrequencyNo").val();
-				var ServiceDescription = $('#EdittxtSpcialInstruction').val();
+				// var ServiceDescription = $('#EdittxtSpcialInstruction').val();
+				var ServiceDescription = tinymce.get('EdittxtSpcialInstruction').getContent();
 				var OtherAmt = $('#EditOtherAllowances').val();
 				var TotalOrderValue = $("#EditTotalOrderValue ").val();
 
@@ -760,6 +761,7 @@ if (!empty($INRSYMBOL)) {
 				$('#TotalOrderValue' + userid).val(TotalOrderValue);
 
 				populateValueMainFormForEditServiceTax();
+				$('#EDITSERVICELINEITEM').modal('hide');
 
 			}
 
@@ -1574,7 +1576,7 @@ if (!empty($INRSYMBOL)) {
 										$options = array("0" => 'Item Code');
 										//print_r(  $options);
 
-										echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"','readonly="true"');
+										echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly="true" style="pointer-events: none;"');
 
 										?>
 									</div>
@@ -1789,7 +1791,6 @@ if (!empty($INRSYMBOL)) {
 			</div>
 		</div>
 	</div><!-- /.modal -->
-
 </div>
 
 
@@ -1865,7 +1866,7 @@ if (!empty($INRSYMBOL)) {
 					$('#EditotherDescription').show();
 				}
 
-
+console.log($('#ItemDescription' + userid).val());
 				tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
 				//$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
 
@@ -1900,7 +1901,6 @@ if (!empty($INRSYMBOL)) {
 
 							});
 							
-					//	tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
 						$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());