From 8b4c6a5404aa89bb6ccc0c563bbb5958563f6f43 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 12 Sep 2024 11:11:41 +0530
Subject: [PATCH 1/2] amended service purchase order, edit service purchase
 order bug fix  - vadivel J

---
 app/Views/editServiceAmendPO.php | 312 ++++++++++++++++++-------------
 app/Views/servicepo.php          |   2 +-
 2 files changed, 188 insertions(+), 126 deletions(-)

diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index 2d2d79ff..47cc49c9 100755
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -644,9 +644,9 @@ foreach ($PaymentTerms as $TER) {
 	});
 </script>
 <style>
-	.modal {
+	/* .modal {
 		padding-right: 25% ! important;
-	}
+	} */
 
 	.num {
 		text-align: right;
@@ -703,8 +703,8 @@ foreach ($PaymentTerms as $TER) {
 							echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
 
 							<div class="form-row">
-								<div class="form-group col-md-12">
-									<div class="form-group col-md-3">
+								
+								<div class="form-group col-md-3">
 										<label>Requistion No</label>
 										<?php
 										$options = array("0" => 'Selected Requisition Numbers');
@@ -753,10 +753,12 @@ foreach ($PaymentTerms as $TER) {
 										</div>
 									</div>
 								</div>
+								</div>
+							</div>
+							</div>
 							</div>
 							<div class="form-row">
-								<div class="form-group col-md-12">
-									<div class="form-group col-md-3">
+							<div class="form-group col-md-3">
 										<label>Work Status<span class="text-danger">*</span></label>
 										<?php
 										if (!empty($WorkStatus)) {
@@ -773,7 +775,7 @@ foreach ($PaymentTerms as $TER) {
 												}
 											endforeach;
 										}
-										echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus"', 'required="true"', 'class="form-control select2');
+										echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus" required="true" class="form-control select2');
 										?>
 									</div>
 									<div class="form-group col-md-3">
@@ -815,54 +817,53 @@ foreach ($PaymentTerms as $TER) {
 											?><input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress; ?>">
 										</div>
 									</div>
-								</div>
+								
 							</div>
+
 							<div class="form-row">
-								<div class="form-group col-md-12">
-									<div class="form-group col-md-3">
-										<label>Purchase Order Date</label>
-										<div class="form-group">
-											<?php
-											$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Mode Of Shipment</label>
-										<div class="form-group">
-											<?php
-											$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $ModeOfShipment), 'id' => 'addmodeofshipment',  'class' => 'form-control');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Contact Reference</label>
-										<div class="form-group">
-
-											<?php
-											$data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $SupplierReference), 'id' => 'amendsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Supplier's Offer No</label>
-										<div class="form-group">
-
-											<?php
-											$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $SuppliersOfferNo), 'id' => 'amendsupplierofferno',  'class' => 'form-control');
-											echo form_input($data);
-											?>
-										</div>
-
+								<div class="form-group col-md-3">
+									<label>Purchase Order Date</label>
+									<div class="form-group">
+										<?php
+										$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+										echo form_input($data);
+										?>
 									</div>
 								</div>
+								<div class="form-group col-md-3">
+									<label>Mode Of Shipment</label>
+									<div class="form-group">
+										<?php
+										$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $ModeOfShipment), 'id' => 'addmodeofshipment',  'class' => 'form-control');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Contact Reference</label>
+									<div class="form-group">
+
+										<?php
+										$data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $SupplierReference), 'id' => 'amendsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Supplier's Offer No</label>
+									<div class="form-group">
+
+										<?php
+										$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $SuppliersOfferNo), 'id' => 'amendsupplierofferno',  'class' => 'form-control');
+										echo form_input($data);
+										?>
+									</div>
+
+								</div>
 							</div>
+
 							<div class="form-row">
-								<div class="form-group col-md-12">
-									<div class="form-group col-md-3">
+							<div class="form-group col-md-3">
 										<label>Our Reference(S)</label>
 										<div class="form-group">
 
@@ -892,7 +893,7 @@ foreach ($PaymentTerms as $TER) {
 												endforeach;
 											}
 
-											echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
+											echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions" required="true" class="form-control select2');
 
 
 											?>
@@ -934,12 +935,10 @@ foreach ($PaymentTerms as $TER) {
 											?>
 										</div>
 									</div>
-
-								</div>
 							</div>
+
 							<div class="form-row">
-								<div class="form-group col-md-12">
-									<div class="form-group col-md-3">
+							        <div class="form-group col-md-3">
 										<label>Insurance Options<span class="text-danger">*</span></label>
 										<div class="form-group">
 
@@ -964,7 +963,7 @@ foreach ($PaymentTerms as $TER) {
 												endforeach;
 											}
 
-											echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus"', 'required="true"', 'class="form-control select2');
+											echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2');
 
 
 											?>
@@ -981,7 +980,7 @@ foreach ($PaymentTerms as $TER) {
 									</div>
 									<div class="form-group col-md-3">
 										<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
-										<select id='BudgetType' name='BudgetType' required="true">
+										<select class="form-control" id='BudgetType' name='BudgetType' required="true">
 											<?php if ($BudgetType == 'CAPITAL') {
 												$opt1 = 'CAPITAL';
 												$opt2 = 'REVENUE';
@@ -993,10 +992,24 @@ foreach ($PaymentTerms as $TER) {
 											<option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
 										</select>
 									</div>
-								</div>
 							</div>
 
-							<div align="right">
+							<div class="form-row">
+						
+							</div>
+
+							<div class="form-row">
+						
+							</div>
+
+							<div class="form-row">
+						
+							</div>
+
+						
+						
+
+							<div >
 								<!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a> -->
 
 								<!-- Model for servicepo -->
@@ -1005,15 +1018,20 @@ foreach ($PaymentTerms as $TER) {
 									<div class="modal-dialog modal-full-width">
 										<!-- Modal content-->
 										<form>
-											<div class="modal-content" style="width:900px;">
+											<div class="modal-content" >
 												<div class="modal-header">
 													<center>
-														<h4>Edit Service Purchase Order Item </h4>
+														<h4 class="modal-title w-100">Edit Service Purchase Order Item  </h4>
 													</center>
+													<button type="button" class="close" data-dismiss="modal"
+                                                     aria-hidden="true"> × </button>
 												</div>
-												<div align="left">
+												<div >
 
-													<div class="form-group col-md-12">
+												<br>
+
+												<div class="form-row px-3 ">
+											
 														<div class="form-group col-md-3">
 															<label>Req No<span class="text-danger">*</span></label>
 															<div>
@@ -1054,8 +1072,10 @@ foreach ($PaymentTerms as $TER) {
 																?>
 															</div>
 														</div>
-													</div>
-													<div class="form-group col-md-12">
+													
+												</div>
+													
+													<div class="form-row px-3">
 														<div class="form-group col-md-3">
 															<label>Item Code<span class="text-danger">*</span></label>*</span></label>
 															<div>
@@ -1118,7 +1138,7 @@ foreach ($PaymentTerms as $TER) {
 
 
 													</div>
-													<div class="form-group col-md-12">
+													<div class="form-row px-3">
 
 														<div class="form-group col-md-3">
 															<label>Quantity<span class="text-danger">*</span></label>*</span></label>
@@ -1155,8 +1175,8 @@ foreach ($PaymentTerms as $TER) {
 
 													</div>
 
-													<div class="form-group col-md-12">
-														<div class="form-group col-md-6" align="right">
+													<div class="form-row px-3">
+														<div class="form-group col-md-6" >
 
 															CGST In %
 														</div>
@@ -1183,8 +1203,8 @@ foreach ($PaymentTerms as $TER) {
 														</div>
 
 													</div>
-													<div class="form-group col-md-12">
-														<div class="form-group col-md-6" align="right">
+													<div class="form-row px-3">
+														<div class="form-group col-md-6" >
 
 															SGST In %
 														</div>
@@ -1212,8 +1232,8 @@ foreach ($PaymentTerms as $TER) {
 
 													</div>
 
-													<div class="form-group col-md-12">
-														<div class="form-group col-md-6" align="right">
+													<div class="form-row px-3">
+														<div class="form-group col-md-6" >
 
 															IGST In %
 														</div>
@@ -1240,9 +1260,12 @@ foreach ($PaymentTerms as $TER) {
 														</div>
 
 													</div>
-													<div class="form-group col-md-12">
-														<div class="col-md-5  col-md-offset-4" align="right">
+													<div class="form-row px-3">
+														<div class="form-group col-md-3" >
 															<label>Other Allowances <?php echo $INRSYM ?></label>
+														</div>
+														<div class="form-group col-md-3">
+															
 														</div>
 														<div class="form-group col-md-3">
 															<div class="form-group">
@@ -1253,9 +1276,13 @@ foreach ($PaymentTerms as $TER) {
 															</div>
 														</div>
 													</div>
-													<div class="form-group col-md-12">
-														<div class="col-md-5  col-md-offset-4" align="right">
+													<div class="form-row px-3">
+														
+														<div class="form-group col-md-3 " >
 															<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
+														</div>
+														<div class="form-group col-md-3">
+
 														</div>
 														<div class="form-group col-md-3">
 															<div class="form-group">
@@ -1266,14 +1293,27 @@ foreach ($PaymentTerms as $TER) {
 															</div>
 														</div>
 													</div>
-													<div class="form-group col-md-12" style="padding: 0px 30px 10px 30px;">
-														<label>Service Description </label> <?php $data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-																							echo form_textarea($data);
-																							?> <input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction" value="<?php echo $ServiceMaterialDescription; ?>">
+													<div class="form-row pl-3" >
+														<div class="form-group col-md-2">
+														<label>Service Description </label>
+														
+														</div>
+														<div class="form-group col-md-3">																							
+															<?php $data = array('name' => 'EdittxtSpcialInstruction', 
+															'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription), 
+															'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control ', 'rows' => '3', 'cols' => '40');
+															echo form_textarea($data);
+															?>
+															<input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction" 
+															value="<?php echo $ServiceMaterialDescription; ?>" >
+															
+													    </div>
 													</div>
+													
+													
 													<br />
 
-													<div class="modal-footer">
+													<div class="modal-footer" align="right">
 														<div class="form-group col-md-12">
 															<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
 															<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
@@ -1291,7 +1331,7 @@ foreach ($PaymentTerms as $TER) {
 								<thead>
 									<tr>
 										<th>SNo</th>
-										<th>Requisition No</th>
+										<th>Requisition  No</th>
 										<th>Item Code</th>
 										<th>Item Name</th>
 										<th>Quantity</th>
@@ -1329,18 +1369,18 @@ foreach ($PaymentTerms as $TER) {
 									?>
 											<tr id="<?php echo $index; ?>">
 												<td align="left"><?php echo $index; ?></td>
-												<td><?php echo $record->ReqNo ?></td>
+												<td><?php echo $record->ReqNo ?> </td>
 												<td><?php echo $record->MaterialCode ?></td>
 												<td><?php echo $record->MaterialName ?></td>
-												<td align="right"><?php echo $record->Quantity ?></td>
+												<td ><?php echo $record->Quantity ?></td>
 												<td><?php echo $record->UOM ?></td>
-												<td align="right"><?php echo $record->Rate ?></td>
-												<td align="right"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
-												<td align="right"><?php echo $record->Taxamount ?></td>
-												<td align="right"><?php echo $record->TotalValue ?></td>
-												<td align="right"><?php echo $record->Quantity ?></td>
-												<td align="right"><?php echo $record->ReceivedQuantity ?></td>
-												<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
+												<td><?php echo $record->Rate ?></td>
+												<td ><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
+												<td ><?php echo $record->Taxamount ?></td>
+												<td ><?php echo $record->TotalValue ?></td>
+												<td ><?php echo $record->Quantity ?></td>
+												<td ><?php echo $record->ReceivedQuantity ?></td>
+												<td ><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
 
 
 												<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
@@ -1416,7 +1456,11 @@ foreach ($PaymentTerms as $TER) {
 												//if($PONOStatus == PO_DRAFT) 
 												//{
 												?>
-												<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" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></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>-->
+												<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" data-toggle="tooltip"
+												  title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> 
+												  Requisition details"></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>-->
 														<?php
 														//} else {
 														?>
@@ -1445,9 +1489,7 @@ foreach ($PaymentTerms as $TER) {
 
 
 							<div class="form-row">
-								<div class="form-group col-md-12" style="padding:0px;">
-
-									<div class="form-group col-md-2">
+							<div class="form-group col-md-2">
 										<label>Basic Amount <?php echo $INRSYM ?> </label>
 										<?php
 										$data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount', number_format($TotalBasicAmount, 2, '.', '')), 'id' => 'txtTotBasicAmount',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1495,53 +1537,69 @@ foreach ($PaymentTerms as $TER) {
 										?>
 
 									</div>
+							</div>
+                              <br>
 
-								</div>
+							<div class="form-row">
+								
 								<!--start new fields 1 sep-->
 								<div class="form-group col-md-12">
-									<label>Description Of Service<span class="text-danger">*</span></label>*</label>
-									<div class="form-group">
+									<label>Description Of Service  </label><span class="text-danger">*</span>
+		
 										<?php
 										$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', $DescriptionOfPo), 'id' => 'amenddescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
 										echo form_textarea($data);
 										?>
-									</div>
-								</div><!--end new fields 1 sep-->
-
-								<div class="form-group col-md-12" style="padding:0px;">
-									<div class="form-group col-md-12">
-										<label>Scope Of Work</label> <?php
-																		$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', $ServiceDescription), 'id' => 'ScopeofWork',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-																		echo form_textarea($data);
-																		?>
-									</div>
-
+									
 								</div>
-								<div class="form-group col-md-12">
-									<div class="form-row"><br />
-										<div align="right" style="padding-right:10px">
-											<div>
-												<input type="file" name="POFile" id="POFile">
-												<?php if ($PrePOFile) { ?>
-													<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
-												<?php } ?>
-												<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
-											</div>
+								
+							<!--end new fields 1 sep-->
+
+							</div>  
+													
+  
+							<br>
+							<div class="form-row">  
+							<div class="form-group col-md-12">  
+										<label>Scope Of Work</label> 
+										<textarea name="ScopeofWork" id="ScopeofWork" class="form-control" rows="8" cols="40">
+											<?php echo set_value('ScopeofWork', $ServiceDescription); ?>
+										</textarea>
+
+									</div> 
+							</div> 
+							<br>
+                            <label>Purchase Order File</label>
+							<div class="form-row">
+								
+								<div class="col-md-9">
+									
+								<input  type="file" name="POFile" id="POFile">
+																<?php if ($PrePOFile) { ?>
+																	<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
+																<?php } ?>
+								</div>
+							<div class="col-md-3">
+										
+											<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+										 
 											<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 											<input type="hidden" name="txtStatus" id="txtStatus" />
 											<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-											<input type="button" class="btn btn-success" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
+											<input type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
 
 											<!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
-											<a class="btn btn-success Save" ID="Submit" onclick="Save()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+											<a class="btn btn-success Save " ID="Submit" onclick="Save()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
 
+							</div>
+							</div>
 
-										</div><br />
-									</div>
-								</div>
-								<br />
-							</div><br />
+							<br>
+							<div class="row">
+                            <div class="form-group col-md-9">
 
+							</div>
+							<div class="form-group col-md-3">
 							<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
 							$Reqon = $Reqon->format('d-m-Y'); ?>
 							<label>Request On :</label><?php echo $Reqon; ?><br />
@@ -1566,6 +1624,10 @@ foreach ($PaymentTerms as $TER) {
 													?>
 
 
+							</div>
+							
+							</div>
+
 
 
 						</div> <!-- end card body-->
diff --git a/app/Views/servicepo.php b/app/Views/servicepo.php
index 2393a32c..d7007a1a 100755
--- a/app/Views/servicepo.php
+++ b/app/Views/servicepo.php
@@ -15,7 +15,7 @@
 
 		<div class="box">
 			<center><b>
-					<h2>Service Purchase Order.</h2>
+					<h2>Service Purchase Order .</h2>
 				</b></center>
 			<div class="container-fluid">
 				<div class="row">

From 638c23db1668cfba894c3f06a57aa2d8dd92b8ff Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 12 Sep 2024 12:13:25 +0530
Subject: [PATCH 2/2] employee module label namee bug fix  - vadivel J

---
 app/Views/addEmployeenew.php     |  2 +-
 app/Views/editEmployeenew.php    |  2 +-
 app/Views/editServiceAmendPO.php | 20 ++++++++++++--------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php
index e6d47b59..f8f47c6c 100755
--- a/app/Views/addEmployeenew.php
+++ b/app/Views/addEmployeenew.php
@@ -397,7 +397,7 @@
                                     <a href="#first" data-toggle="tab" class="nav-link active">
                                         <!-- <a data-toggle="tab" class="nav-link active"> -->
                                         <span class="number">1</span>
-                                        <span class="d-none d-sm-inline">Personal & Address</span>
+                                        <span class="d-none d-sm-inline">Personal Information</span>
                                     </a>
                                 </li>
                                 <li class="nav-item" data-target-form="#profileForm">
diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php
index 26e0c15e..b0031ffe 100755
--- a/app/Views/editEmployeenew.php
+++ b/app/Views/editEmployeenew.php
@@ -164,7 +164,7 @@ if (!empty($EmpDetails)) {
                                     <a href="#first" data-toggle="tab" class="nav-link active">
                                         <!-- <a data-toggle="tab" class="nav-link active"> -->
                                         <span class="number">1</span>
-                                        <span class="d-none d-sm-inline">Personal & Address</span>
+                                        <span class="d-none d-sm-inline">Personal Information</span>
                                     </a>
                                 </li>
                                 <li class="nav-item" data-target-form="#profileForm">
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index 47cc49c9..faf6c2b0 100755
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -738,7 +738,7 @@ foreach ($PaymentTerms as $TER) {
 											endforeach;
 										}
 
-										echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2');
+										echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2');
 
 										?>
 
@@ -775,7 +775,7 @@ foreach ($PaymentTerms as $TER) {
 												}
 											endforeach;
 										}
-										echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus" required="true" class="form-control select2');
+										echo form_dropdown(data: 'workstatus', options: $optionsWork, selected: set_value(field: 'workstatus'), extra: 'id="workstatus" required="true" class="form-control select2" ');
 										?>
 									</div>
 									<div class="form-group col-md-3">
@@ -893,7 +893,7 @@ foreach ($PaymentTerms as $TER) {
 												endforeach;
 											}
 
-											echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions" required="true" class="form-control select2');
+											echo form_dropdown(data: 'PoTypeOptions', options: $optionsPO, selected: set_value(field: 'PoTypeOptions'), extra: 'id="PoTypeOptions" required="true" class="form-control select2"');
 
 
 											?>
@@ -923,7 +923,7 @@ foreach ($PaymentTerms as $TER) {
 											endforeach;
 										}
 
-										echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2');
+										echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms" required="true" class="form-control select2');
 										?>
 									</div>
 									<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
@@ -1077,13 +1077,13 @@ foreach ($PaymentTerms as $TER) {
 													
 													<div class="form-row px-3">
 														<div class="form-group col-md-3">
-															<label>Item Code<span class="text-danger">*</span></label>*</span></label>
+															<label>Item Code<span class="text-danger">*</span></label>
 															<div>
 																<?php
 																$options = array("0" => 'Item Code');
 																//print_r(  $options);
 
-																echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
+																echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
 
 																?>
 															</div>
@@ -1141,7 +1141,9 @@ foreach ($PaymentTerms as $TER) {
 													<div class="form-row px-3">
 
 														<div class="form-group col-md-3">
-															<label>Quantity<span class="text-danger">*</span></label>*</span></label>
+															<label>Quantity
+																<span class="text-danger">*</span>
+															</label>
 															<div class="form-group">
 																<?php
 																$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
@@ -1150,7 +1152,9 @@ foreach ($PaymentTerms as $TER) {
 															</div>
 														</div>
 														<div class="form-group col-md-3">
-															<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>*</span></label>
+															<label><?php echo "Rate ($INRSYM)"; ?>
+															<span class="text-danger">*</span>
+														</label>
 															<div class="form-group">
 																<?php
 																$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');