diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php
index 977045c3..2adae210 100755
--- a/app/Controllers/Payslip.php
+++ b/app/Controllers/Payslip.php
@@ -801,10 +801,10 @@ class Payslip extends BaseController
 					$loan = $Balance_Amount;
 				}
 				
-				$empSalaryAdd = $final_salary_amount+$shed+$diesel;
+				$empSalaryAdd = $final_salary_amount;
 				$empSalarySub = $loan;
-				$salaryInCurrentday =  $empSalaryAdd -  $empSalarySub;
-				$load_driver_data[$i]->driver_final_payment = $salaryInCurrentday;
+				// $salaryInCurrentday =  $empSalaryAdd -  $empSalarySub;
+				// $load_driver_data[$i]->driver_final_payment = $salaryInCurrentday;
 				
                 $load_driver_data[$i]->payroll_id = $monthly_pay_array[$driver_id]->payroll_id;
 				$load_driver_data[$i]->Festival_Bonus = $monthly_pay_array[$driver_id]->Festival_Bonus;
@@ -871,8 +871,8 @@ class Payslip extends BaseController
 
 				$empSalaryAdd = $final_salary_amount;
 				$empSalarySub = $loan;
-				$salaryInCurrentday =  $empSalaryAdd -  $empSalarySub;
-				$load_driver_data[$i]->driver_final_payment = $salaryInCurrentday+$shed+$diesel;
+				// $salaryInCurrentday =  $empSalaryAdd -  $empSalarySub;
+				// $load_driver_data[$i]->driver_final_payment = $salaryInCurrentday+$shed+$diesel;
 				$load_driver_data[$i]->total_cal_days = $get_last_date_of_the_month;
 
 			}
@@ -1236,6 +1236,7 @@ class Payslip extends BaseController
 						'total_shed_amount'=>$Shed,
 						'monthly_salary_amount'=>($Basic+$Food),
 						'final_payment'=>$Estimate,
+						'BASIC'=>$Basic,
 						'HRA'=>$HRA,
 						'ESI'=>$ESI,
 						'PF'=>$PF,
@@ -1421,8 +1422,10 @@ class Payslip extends BaseController
 					$currentDayBasic = isset($Data['PayDetails'][0]->monthly_salary_amount) ? $Data['PayDetails'][0]->monthly_salary_amount : 0;
 					$PF_Rate = $Data['PayDetails'][0]->PF_Rate;
 					$ESI_Rate = $Data['PayDetails'][0]->ESI_Rate;
-					$Data['esi_amount'] = ($Data['PayDetails'][0]->esi_applicable == 1) ? $currentDayBasic * $ESI_Rate / 100 : 0;
-			        $Data['pf_amount'] =  ($Data['PayDetails'][0]->pf_applicable == 1) ?  $currentDayBasic * $PF_Rate / 100 : 0; 
+					// $Data['esi_amount'] = ($Data['PayDetails'][0]->esi_applicable == 1) ? $currentDayBasic * $ESI_Rate / 100 : 0;
+			        // $Data['pf_amount'] =  ($Data['PayDetails'][0]->pf_applicable == 1) ?  $currentDayBasic * $PF_Rate / 100 : 0; 
+					$Data['esi_amount'] = ($Data['PayDetails'][0]->esi_applicable == 1) ? $Data['PayDetails'][0]->ESI : 0;
+			        $Data['pf_amount'] =  ($Data['PayDetails'][0]->pf_applicable == 1) ?  $Data['PayDetails'][0]->PF : 0; 
 					$html = view("driverPayslipGeneratePrint",  $Data);
 				}else{
 				//echo "EmpID" . $EmpID;
diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php
index ee194634..dc0be372 100755
--- a/app/Controllers/Purchaseorder.php
+++ b/app/Controllers/Purchaseorder.php
@@ -3068,7 +3068,6 @@ class Purchaseorder extends BaseController
         $this->purchaseorder_model->insertlogpo($logpo);
       }
     }
-    // print_r($this->request->getPost());die;
     for ($i = 1; $i <= $RowCount; $i++) {
 
       $MaterialCode = $this->request->getPost('materialCode' . $i);
diff --git a/app/Models/Driver_model.php b/app/Models/Driver_model.php
index d0b5e716..97fecf21 100755
--- a/app/Models/Driver_model.php
+++ b/app/Models/Driver_model.php
@@ -285,7 +285,7 @@ class Driver_model extends Model
 		$builder = $this->db->table('t_driver_payroll Pay')->select('Pay.*')
             ->select('Emp.EmpID,CONCAT_WS(" ", Emp.FirstName, Emp.LastName) as driver_name,Emp.DateofBirth as Dob,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.BankAccountNo as BankAccountNumber,Emp.IFSCCode as IFSCCode,Emp.DateofJoining as DOJ,Emp.AadharNo,Emp.Designation as Designation,Dep.DepartmentName as DeptName,Emp.esi_applicable,Emp.pf_applicable')
             ->select('t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate')
-            ->select('month.Festival_Bonus,month.HRA,month.Loan_Recovered,month.total_diesel_amount,month.total_shed_amount')
+            ->select('month.Festival_Bonus,month.BASIC,month.HRA,month.Loan_Recovered,month.total_diesel_amount,month.total_shed_amount')
             // ->select('month.monthly_salary_amount,month.monthly_food_amount,month.Festival_Bonus,month.final_payment,month.HRA,month.ESI,month.PF,month.Loan_Recovered,month.total_diesel_amount,month.total_shed_amount')
 			->join('t_employee_details Emp', 'Pay.driver_id = Emp.EmpID')
             ->join('t_departmentdetails Dep', 'Emp.Departmentcode = Dep.DEPCode')
diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index df5aafb0..ae89c7d9 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -1,60 +1,61 @@
 <style>
 	.edit-container {
-        display: inline-flex;
-        align-items: center;
-        gap: 10px;
-    }
+		display: inline-flex;
+		align-items: center;
+		gap: 10px;
+	}
 
-    .edit-input-field {
-        padding: 2px;
-        font-size: 14px;
-        border: 1px solid #ccc;
-        border-radius: 4px;
-        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-        width: 150px;
-    }
+	.edit-input-field {
+		padding: 2px;
+		font-size: 14px;
+		border: 1px solid #ccc;
+		border-radius: 4px;
+		box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+		width: 150px;
+	}
 
-    .edit-input-field:focus {
-        outline: none;
-        border-color: #007bff;
-        box-shadow: 0 0 5px rgba(0, 123, 255, 0.5);
-    }
+	.edit-input-field:focus {
+		outline: none;
+		border-color: #007bff;
+		box-shadow: 0 0 5px rgba(0, 123, 255, 0.5);
+	}
 
-    .save-btn, .cancel-btn {
-        border: none;
-        background: none;
-        cursor: pointer;
-        font-size: 16px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 30px;
-        height: 30px;
-        border-radius: 50%;
-        transition: background-color 0.3s ease;
-    }
+	.save-btn,
+	.cancel-btn {
+		border: none;
+		background: none;
+		cursor: pointer;
+		font-size: 16px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 30px;
+		height: 30px;
+		border-radius: 50%;
+		transition: background-color 0.3s ease;
+	}
 
-    .save-btn {
-        color: #28a745;
-        background-color: #e8f5e9;
-    }
+	.save-btn {
+		color: #28a745;
+		background-color: #e8f5e9;
+	}
 
-    .save-btn:hover {
-        background-color: #c3e6cb;
-    }
+	.save-btn:hover {
+		background-color: #c3e6cb;
+	}
 
-    .cancel-btn {
-        color: #dc3545;
-        background-color: #f8d7da;
-    }
+	.cancel-btn {
+		color: #dc3545;
+		background-color: #f8d7da;
+	}
 
-    .cancel-btn:hover {
-        background-color: #f5c6cb;
-    }
+	.cancel-btn:hover {
+		background-color: #f5c6cb;
+	}
 </style>
 <script>
-	$(document).ready(function () {
-		$(document).on('click', '.editable-field', function (e) {
+	$(document).ready(function() {
+		$(document).on('click', '.editable-field', function(e) {
 			e.preventDefault();
 			const $link = $(this);
 			const value = $link.text().trim();
@@ -67,7 +68,7 @@
 		});
 
 		// Handle click on the tick (save) button
-		$(document).on('click', '.save-btn', function (e) {
+		$(document).on('click', '.save-btn', function(e) {
 			e.preventDefault();
 			const $btn = $(this);
 			const $editContainer = $btn.closest('.edit-container');
@@ -84,7 +85,7 @@
 		});
 
 		// Handle click on the close (cancel) button
-		$(document).on('click', '.cancel-btn', function (e) {
+		$(document).on('click', '.cancel-btn', function(e) {
 			e.preventDefault();
 			const $btn = $(this);
 			const $editContainer = $btn.closest('.edit-container');
@@ -93,7 +94,9 @@
 			// Hide the edit container and show the <a> tag
 			$editContainer.hide();
 			$link.show();
-		});});</script>
+		});
+	});
+</script>
 <?php
 $insuranceStatus = array(
 	array("name" => "NO", "value" => "0"),
@@ -148,6 +151,7 @@ if (!empty($MaxPODate)) {
 		$MaxPoDate = $date->PODate;
 	}
 }
+
 if (!empty($POMaster)) {
 
 	foreach ($POMaster as $Req) {
@@ -279,8 +283,6 @@ if (!empty($getlogpodtl)) {
 	});
 </script>
 
-
-
 <script type="text/javascript">
 	$('#otherdescription').hide();
 	var insuranceOpt = '<?php echo $InsuranceOptions; ?>';
@@ -294,7 +296,7 @@ if (!empty($getlogpodtl)) {
 
 	$(document).ready(function() {
 
-		$(document).on('click', '.editable-field', function (e) {
+		$(document).on('click', '.editable-field', function(e) {
 			e.preventDefault();
 			const $link = $(this);
 			const value = $link.text().trim();
@@ -307,7 +309,7 @@ if (!empty($getlogpodtl)) {
 		});
 
 		// Handle click on the tick (save) button
-		$(document).on('click', '.save-btn', function (e) {
+		$(document).on('click', '.save-btn', function(e) {
 			e.preventDefault();
 			const $btn = $(this);
 			const $editContainer = $btn.closest('.edit-container');
@@ -324,7 +326,7 @@ if (!empty($getlogpodtl)) {
 		});
 
 		// Handle click on the close (cancel) button
-		$(document).on('click', '.cancel-btn', function (e) {
+		$(document).on('click', '.cancel-btn', function(e) {
 			e.preventDefault();
 			const $btn = $(this);
 			const $editContainer = $btn.closest('.edit-container');
@@ -388,6 +390,7 @@ if (!empty($getlogpodtl)) {
 		}
 	});
 </script>
+
 <script>
 	var RequistQuantity = '';
 	var AvilBudAmt = '';
@@ -412,10 +415,10 @@ if (!empty($getlogpodtl)) {
 		// 	yearRange: '0:+10'
 		// });
 		/* $("#Requeston").datepicker({
-	//minDate : d,
-	maxDate : 'now',
-	dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
-}); */
+		//minDate : d,
+			maxDate : 'now',
+			dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+		}); */
 		$('#drpSupplier').change(function() {
 
 			var cd = $("#drpSupplier option:selected").text();
@@ -482,8 +485,6 @@ if (!empty($getlogpodtl)) {
 
 		});
 
-
-
 		$('#MaterialCode').change(function() {
 			var id = $('#MaterialCode').val();
 			RequistQuantity = '';
@@ -500,6 +501,7 @@ if (!empty($getlogpodtl)) {
 							$("#ItemName").val(obj.MaterialName);
 							$("#UOM").val(obj.UOM);
 							$("#Quantity").val(obj.Quantity);
+							$("#Rate").val(obj.material_rate);
 							RequistQuantity = obj.Quantity;
 
 							var materialn = obj.MaterialName;
@@ -510,6 +512,10 @@ if (!empty($getlogpodtl)) {
 								$('#OtheritemDescription').val(obj.MaterialDescription);
 							}
 
+							if (obj.material_rate != 0) {
+								Ratechange();
+							}
+
 
 						}
 					});
@@ -536,6 +542,7 @@ if (!empty($getlogpodtl)) {
 			}
 
 		});
+
 		$('#EditMaterialCode').change(function() {
 
 			var id = $('#EditMaterialCode').val();
@@ -844,6 +851,7 @@ if (!empty($getlogpodtl)) {
 		RequistQuantity = '';
 
 	}
+
 	$(document).ready(function() {
 		$("#PaymentTerms").select2();
 
@@ -859,6 +867,7 @@ if (!empty($getlogpodtl)) {
 		});
 	});
 </script>
+
 <style>
 	.num {
 		text-align: right;
@@ -908,6 +917,7 @@ if (!empty($getlogpodtl)) {
 				</div>
 			</div>
 			<!-- end page title -->
+
 			<!-- Form row -->
 			<div class="row">
 				<div class="col-12">
@@ -916,649 +926,652 @@ if (!empty($getlogpodtl)) {
 							<?php
 							$attributes = array('class' => 'form-label-left   ServicePO ', 'name'  => 'ServicePO', 'id'  => 'ServicePO', 'enctype' => 'multipart/form-data');
 							echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
-							
-								<div class="form-row">
-									<div class="form-group  col-md-3">
-										<label>Requistion No</label>
+
+							<div class="form-row">
+								<div class="form-group  col-md-3">
+									<label>Requistion No</label>
+									<?php
+									$options = array("0" => 'Selected Requisition Numbers');
+									if (!empty($ReqList)) {
+										foreach ($ReqList as $SID) :
+
+											$options[$SID->ReqNo] = $SID->ReqNo;
+										endforeach;
+									}
+									echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"');
+
+									?>
+								</div>
+								<div class="form-group  col-md-3">
+									<label>Purchase Order Type</label>
+									<div>
+
 										<?php
-										$options = array("0" => 'Selected Requisition Numbers');
-										if (!empty($ReqList)) {
-											foreach ($ReqList as $SID) :
-
-												$options[$SID->ReqNo] = $SID->ReqNo;
-											endforeach;
-										}
-										echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"');
-
+										$data = array('name' => 'POType', 'value' => set_value('POType', SERVICE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
+										echo form_input($data);
 										?>
 									</div>
-									<div class="form-group  col-md-3">
-										<label>Purchase Order Type</label>
-										<div>
-
-											<?php
-											$data = array('name' => 'POType', 'value' => set_value('POType', SERVICE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group  col-md-3">
-										<label>Select Supplier<span class="text-danger">*</span></label>
-										<?php
-										$options = array("0" => 'Select Supplier');
-										//print_r(  $options);
-
-										if (!empty($Suplist)) {
-											foreach ($Suplist as $SID) :
-												$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
-											endforeach;
-										}
-
-										echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2"');
-
-										?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId; ?>">
-
-										<input type="hidden" name="newsup" id="changeSup">
-
-									</div>
-									<div class="form-group  col-md-3">
-										<label>Supplier Address</label>
-										<div>
-											<?php
-											$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
-											echo Form_textarea($data);
-											?>
-										</div>
-									</div>
 								</div>
-								<div class="form-row">
-									<div class="form-group  col-md-3">
-										<label>Work Status<span class="text-danger">*</span></label>
+								<div class="form-group  col-md-3">
+									<label>Select Supplier<span class="text-danger">*</span></label>
+									<?php
+									$options = array("0" => 'Select Supplier');
+									//print_r(  $options);
+
+									if (!empty($Suplist)) {
+										foreach ($Suplist as $SID) :
+											$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
+										endforeach;
+									}
+
+									echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2"');
+
+									?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId; ?>">
+
+									<input type="hidden" name="newsup" id="changeSup">
+
+								</div>
+								<div class="form-group  col-md-3">
+									<label>Supplier Address</label>
+									<div>
 										<?php
-
-
-
-										if (!empty($WorkStatus)) {
-
-											foreach ($WorkStatus as $WorkSID) :
-												if ($WrkStatus == $WorkSID->StatusCode) {
-													$optionsWork[$WorkSID->StatusCode] =  $WorkSID->StatusName;
-												}
-
-
-											endforeach;
-											foreach ($WorkStatus as $SID) :
-												if ($WrkStatus != $SID->StatusCode) {
-													$optionsWork[$SID->StatusCode] =  $SID->StatusName;
-												}
-
-
-											endforeach;
-										}
-
-										echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus" required="true" class="form-control select2"');
-
-										?>
-									</div>
-									<div class="form-group  col-md-3">
-										<b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
-										<div class="centered">
-											<?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
-											<?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
-										</div>
-
-									</div>
-									<div class="form-group  col-md-3" id="Deliverydtdiv">
-										<label>Delivery Date<span class="text-danger">*</span></label>
-										<div>
-											<?php
-											$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group  col-md-3" id="Schedulediv" style="display:none;">
-										<label>Schedule By<span class="text-danger">*</span></label>
-										<?php
-										$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+										$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
 										echo Form_textarea($data);
 										?>
-
-									</div>
-									<div class="form-group  col-md-3">
-										<label>Delivery Address</label>
-										<div>
-											<?php
-											$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
-											echo Form_textarea($data);
-											?><input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress; ?>">
-
-										</div>
-									</div>
-
-								</div>
-								<div class="form-row">
-									<div class="form-group col-md-3">
-										<label>Purchase Order Date</label>
-										<div>
-											<?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);
-											?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Mode Of Shipment</label>
-										<div>
-
-											<?php
-											$data = array('name' => 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $ModeOfShipment), 'id' => 'editmodeofshipment',  'class' => 'form-control');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Contact Reference</label>
-										<div>
-
-											<?php
-											$data = array('name' => 'editsupplierreference', 'value' => set_value('editsupplierreference', $SupplierReference), 'id' => 'editsupplierreference',  '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>
-
-											<?php
-											$data = array('name' => 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $SuppliersOfferNo), 'id' => 'editsupplierofferno',  'class' => 'form-control');
-											echo form_input($data);
-											?>
-										</div>
-
 									</div>
 								</div>
-								<div class="form-row">
-									<div class="form-group col-md-3">
-										<div style="padding:0px;">
-
-											<label>Our Reference(S)</label>
-											<div>
-
-												<?php
-												$data = array('name' => 'editotherreference', 'value' => set_value('editotherreference', $OtherReferences), 'id' => 'editotherreference',  'class' => 'form-control');
-												echo form_input($data);
-												?>
-											</div>
-										</div>
-
-									</div>
-									<div class="form-group col-md-3">
+							</div>
+							<div class="form-row">
+								<div class="form-group  col-md-3">
+									<label>Work Status<span class="text-danger">*</span></label>
+									<?php
 
 
-										<label>Service Type Options<span class="text-danger">*</span></label>
-										<div>
 
-											<?php
+									if (!empty($WorkStatus)) {
 
-											//$optionsWork = array("0"=>'Select Work Status');     
-
-
-											if (!empty($PoTypeOptions)) {
-												foreach ($PoTypeOptions as $POpt) :
-
-													if ($ServiceTypeOptions == $POpt->ConfigValue) {
-														$optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
-													}
-												endforeach;
-												foreach ($PoTypeOptions as $POpt1) :
-
-													if ($ServiceTypeOptions != $POpt1->ConfigValue) {
-														$optionsPO[$POpt1->ConfigValue] =  $POpt1->ConfigValue;
-													}
-												endforeach;
+										foreach ($WorkStatus as $WorkSID) :
+											if ($WrkStatus == $WorkSID->StatusCode) {
+												$optionsWork[$WorkSID->StatusCode] =  $WorkSID->StatusName;
 											}
 
-											echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions" required="true" class="form-control select2"');
+
+										endforeach;
+										foreach ($WorkStatus as $SID) :
+											if ($WrkStatus != $SID->StatusCode) {
+												$optionsWork[$SID->StatusCode] =  $SID->StatusName;
+											}
 
 
-											?>
-										</div>
+										endforeach;
+									}
 
+									echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus" required="true" class="form-control select2"');
 
+									?>
+								</div>
+								<div class="form-group  col-md-3">
+									<b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
+									<div class="centered">
+										<?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
+										<?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
+									</div>
+
+								</div>
+								<div class="form-group  col-md-3" id="Deliverydtdiv">
+									<label>Delivery Date<span class="text-danger">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group  col-md-3" id="Schedulediv" style="display:none;">
+									<label>Schedule By<span class="text-danger">*</span></label>
+									<?php
+									$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+									echo Form_textarea($data);
+									?>
+
+								</div>
+								<div class="form-group  col-md-3">
+									<label>Delivery Address</label>
+									<div>
+										<?php
+										$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
+										echo Form_textarea($data);
+										?><input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress; ?>">
 
 									</div>
-									<div class="form-group col-md-3">
-										<label>Payment Terms<span class="text-danger">*</span></label>
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Purchase Order Date</label>
+									<div>
 										<?php
-										if (!empty($Payment)) {
-											foreach ($Payment as $pay2) :
-												if ($Terms == $pay2->PaymentID) {
-													$optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
+										$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+										echo form_input($data);
+										?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Mode Of Shipment</label>
+									<div>
+
+										<?php
+										$data = array('name' => 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $ModeOfShipment), 'id' => 'editmodeofshipment',  'class' => 'form-control');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Contact Reference</label>
+									<div>
+
+										<?php
+										$data = array('name' => 'editsupplierreference', 'value' => set_value('editsupplierreference', $SupplierReference), 'id' => 'editsupplierreference',  '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>
+
+										<?php
+										$data = array('name' => 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $SuppliersOfferNo), 'id' => 'editsupplierofferno',  'class' => 'form-control');
+										echo form_input($data);
+										?>
+									</div>
+
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<div style="padding:0px;">
+
+										<label>Our Reference(S)</label>
+										<div>
+
+											<?php
+											$data = array('name' => 'editotherreference', 'value' => set_value('editotherreference', $OtherReferences), 'id' => 'editotherreference',  'class' => 'form-control');
+											echo form_input($data);
+											?>
+										</div>
+									</div>
+
+								</div>
+								<div class="form-group col-md-3">
+
+
+									<label>Service Type Options<span class="text-danger">*</span></label>
+									<div>
+
+										<?php
+
+										//$optionsWork = array("0"=>'Select Work Status');     
+
+
+										if (!empty($PoTypeOptions)) {
+											foreach ($PoTypeOptions as $POpt) :
+
+												if ($ServiceTypeOptions == $POpt->ConfigValue) {
+													$optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
 												}
 											endforeach;
-											foreach ($Payment as $pay1) :
-												if ($Terms != $pay1->PaymentID) {
-													$optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
+											foreach ($PoTypeOptions as $POpt1) :
+
+												if ($ServiceTypeOptions != $POpt1->ConfigValue) {
+													$optionsPO[$POpt1->ConfigValue] =  $POpt1->ConfigValue;
 												}
 											endforeach;
 										}
-										echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms" required="true" class="form-control select2"');
+
+										echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions" required="true" class="form-control select2"');
+
+
 										?>
 									</div>
-									<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
-										<label>Description of Payable Terms<span class="text-danger">*</span></label>
-										<div>
-											<?php
-											$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
+
+
+
 								</div>
-								<div class="form-row">
-									<div class="form-group col-md-3">
-										<label>Insurance Options<span class="text-danger">*</span></label>
-										<div>
-
-											<?php
-
-											if (!empty($insuranceStatus)) {
-												foreach ($insuranceStatus as $INS) :
-													if ($InsuranceOptions == $INS['value']) {
-														$optionsInsurance[$INS['value']] =  $INS['name'];
-													}
-
-
-
-												endforeach;
-												foreach ($insuranceStatus as $INS1) :
-													if ($InsuranceOptions != $INS1['value']) {
-														$optionsInsurance[$INS1['value']] =  $INS1['name'];
-													}
-
-
-
-												endforeach;
+								<div class="form-group col-md-3">
+									<label>Payment Terms<span class="text-danger">*</span></label>
+									<?php
+									if (!empty($Payment)) {
+										foreach ($Payment as $pay2) :
+											if ($Terms == $pay2->PaymentID) {
+												$optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
 											}
-
-											echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2"');
-
-
-											?>
-										</div>
-
-
-
-
-									</div>
-									<div class="form-group col-md-3" id="insuranceTxtDiv" style="display:block;">
-										<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
-										<div>
-											<?php
-											$data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber', $InsuranceNumber), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
-										<select id='BudgetType' name='BudgetType' class="form-control" required='true'>
-											<?php if ($BudgetType == 'CAPITAL') {
-												$opt1 = 'CAPITAL';
-												$opt2 = 'REVENUE';
-											} else {
-												$opt1 = 'REVENUE';
-												$opt2 = 'CAPITAL';
-											} ?>
-											<option value=<?php echo $opt1; ?>><?php echo $opt1; ?></option>
-											<option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
-										</select>
+										endforeach;
+										foreach ($Payment as $pay1) :
+											if ($Terms != $pay1->PaymentID) {
+												$optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
+											}
+										endforeach;
+									}
+									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;">
+									<label>Description of Payable Terms<span class="text-danger">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+										echo form_input($data);
+										?>
 									</div>
 								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Insurance Options<span class="text-danger">*</span></label>
+									<div>
 
-								<div class="form-row">
-									<div class="form-group col-md-12 text-right">
-										<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-											<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-												<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
-											<?php } ?>
-											<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
+										<?php
+
+										if (!empty($insuranceStatus)) {
+											foreach ($insuranceStatus as $INS) :
+												if ($InsuranceOptions == $INS['value']) {
+													$optionsInsurance[$INS['value']] =  $INS['name'];
+												}
+
+
+
+											endforeach;
+											foreach ($insuranceStatus as $INS1) :
+												if ($InsuranceOptions != $INS1['value']) {
+													$optionsInsurance[$INS1['value']] =  $INS1['name'];
+												}
+
+
+
+											endforeach;
+										}
+
+										echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2"');
+
+
+										?>
+									</div>
+
+
+
+
+								</div>
+								<div class="form-group col-md-3" id="insuranceTxtDiv" style="display:block;">
+									<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber', $InsuranceNumber), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
+									<select id='BudgetType' name='BudgetType' class="form-control" required='true'>
+										<?php if ($BudgetType == 'CAPITAL') {
+											$opt1 = 'CAPITAL';
+											$opt2 = 'REVENUE';
+										} else {
+											$opt1 = 'REVENUE';
+											$opt2 = 'CAPITAL';
+										} ?>
+										<option value=<?php echo $opt1; ?>><?php echo $opt1; ?></option>
+										<option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
+									</select>
+								</div>
+							</div>
+
+							<div class="form-row">
+								<div class="form-group col-md-12 text-right">
+									<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+										<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+											<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
 										<?php } ?>
-									</div>
+										<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
+									<?php } ?>
 								</div>
-								
-							
-								<div class="form-row">
-									<div class="table-responsive" style="padding-bottom: 30px;">
+							</div>
+
+
+							<div class="form-row">
+								<div class="table-responsive" style="padding-bottom: 30px;">
 									<table id="ServiceTable" class="table table-bordered table-hover mb-0"
 										style="font-size:12px;">
-											<thead>
-												<tr>
-												
-													<th style="text-align:left !important; white-space: nowrap !important;">SNo</th>
-													<th style="text-align:center !important; white-space: nowrap !important;">Requisition No</th>
-													<th style="text-align:left !important; white-space: nowrap !important;">Item Code</th>
-													<th style="white-space: nowrap !important;">Item Description</th>
-													<th style="white-space: nowrap !important;">Line Item Specs</th>
-													<th style="text-align: left; white-space: nowrap !important;">Quantity</th>
-													<th style="white-space: nowrap !important;">UOM</th>
-													<th style="text-align: right; white-space: nowrap !important;">Rate <?php echo "($INRSYM)" ?></th>
-													<th style="text-align: right; white-space: nowrap !important;">Basic Amount <?php echo "($INRSYM)" ?></th>
-													<th style="text-align: right; white-space: nowrap !important;">Tax Amount <?php echo "($INRSYM)" ?></th>
-													<th style="text-align: right; white-space: nowrap !important;">Total Order Amount <?php echo "($INRSYM)" ?></th>
-													<th>Action</th>
-												</tr>
-											</thead>
+										<thead>
+											<tr>
 
-											<tbody id='ServiceAppend'>
-												<?php
-												if (!empty($POItem)) {
+												<th style="text-align:left !important; white-space: nowrap !important;">SNo</th>
+												<th style="text-align:center !important; white-space: nowrap !important;">Requisition No</th>
+												<th style="text-align:left !important; white-space: nowrap !important;">Item Code</th>
+												<th style="white-space: nowrap !important;">Item Description</th>
+												<th style="white-space: nowrap !important;">Line Item Specs</th>
+												<th style="text-align: left; white-space: nowrap !important;">Quantity</th>
+												<th style="white-space: nowrap !important;">UOM</th>
+												<th style="text-align: right; white-space: nowrap !important;">Rate <?php echo "($INRSYM)" ?></th>
+												<th style="text-align: right; white-space: nowrap !important;">Basic Amount <?php echo "($INRSYM)" ?></th>
+												<th style="text-align: right; white-space: nowrap !important;">Tax Amount <?php echo "($INRSYM)" ?></th>
+												<th style="text-align: right; white-space: nowrap !important;">Total Order Amount <?php echo "($INRSYM)" ?></th>
+												<th>Action</th>
+											</tr>
+										</thead>
+
+										<tbody id='ServiceAppend'>
+											<?php
+											if (!empty($POItem)) {
 
 
-													$index = 0;
+												$index = 0;
 
-													foreach ($POItem as $record) {
-														$index = $index + 1;
-														if ($record->Schedule_Type != 'Recurring') {
-															$FrequencyNo = intval(1);
-															$Frequency = 'One Time';
-														} else {
-															$FrequencyNo = $record->NumberOfService;
-															$Frequency = $record->Service_Period;
-														}
+												foreach ($POItem as $record) {
+													$index = $index + 1;
+													if ($record->Schedule_Type != 'Recurring') {
+														$FrequencyNo = intval(1);
+														$Frequency = 'One Time';
+													} else {
+														$FrequencyNo = $record->NumberOfService;
+														$Frequency = $record->Service_Period;
+													}
 
-												?>
-														<tr id="<?php echo $index; ?>">
-															<td style="text-align:left !important;"><?php echo $index; ?></td>
-															<td style="text-align:center !important;"><?php echo $record->ReqNo ?></td>
-															<td style="text-align:left !important;"><?php echo $record->MaterialCode ?></td>
-															<td style="text-align:left !important;"><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "..."); echo $shortName; ?></td>
-															<td style="text-align:left !important;"><?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?> 
-																<a href="#" 
-																class="editable-field" 
-																data-id ="<?php echo $index ?>" data-notes="<?php echo $record->LineitemAuditorNotes; ?>">
-																<?php echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; ?>
+											?>
+													<tr id="<?php echo $index; ?>">
+														<td style="text-align:left !important;"><?php echo $index; ?></td>
+														<td style="text-align:center !important;"><?php echo $record->ReqNo ?></td>
+														<td style="text-align:left !important;"><?php echo $record->MaterialCode ?></td>
+														<td style="text-align:left !important;"><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
+																								echo $shortName; ?></td>
+														<td style="text-align:left !important;"><?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
+																<a href="#"
+																	class="editable-field"
+																	data-id="<?php echo $index ?>" data-notes="<?php echo $record->LineitemAuditorNotes; ?>">
+																	<?php echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; ?>
 																</a>
 																<div class="edit-container" style="display:none;">
 																	<input type="text" class="edit-input-field" />
 																	<button class="save-btn">✔</button>
 																	<button class="cancel-btn">✖</button>
 																</div>
-																<?php }else{ echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?></td>
-															<td style="text-align:left !important;"><?php echo $record->Quantity ?></td>
-															<td><?php echo $record->UOM ?></td>
+															<?php } else {
+																									echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-";
+																								} ?>
+														</td>
+														<td style="text-align:left !important;"><?php echo $record->Quantity ?></td>
+														<td><?php echo $record->UOM ?></td>
 
-															<td style="text-align:right !important;"><?php echo $record->Rate ?></td>
+														<td style="text-align:right !important;"><?php echo $record->Rate ?></td>
 
-															<td style="text-align:right !important;"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
+														<td style="text-align:right !important;"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
 
-															<td style="text-align:right !important;"><?php echo $record->Taxamount ?></td>
-															<td style="text-align:right !important;"><?php echo $record->TotalValue ?></td>
-															<!-- <td align="right"><?php echo $record->Quantity ?></td>
+														<td style="text-align:right !important;"><?php echo $record->Taxamount ?></td>
+														<td style="text-align:right !important;"><?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> -->
 
-															<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
+														<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
 
-															<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
+														<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
 
-															<input type="hidden" name="<?php echo 'AvilBudget' . $index ?>" id="<?php echo 'AvilBudget' . $index ?>" value="<?php echo $AvlAmount; ?>" />
+														<input type="hidden" name="<?php echo 'AvilBudget' . $index ?>" id="<?php echo 'AvilBudget' . $index ?>" value="<?php echo $AvlAmount; ?>" />
 
-															<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
+														<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
 
-															<input type="hidden" name="<?php echo 'costCode' . $index ?>" id="<?php echo 'costCode' . $index ?>" value="<?php echo $record->CostCenterCode; ?>" />
+														<input type="hidden" name="<?php echo 'costCode' . $index ?>" id="<?php echo 'costCode' . $index ?>" value="<?php echo $record->CostCenterCode; ?>" />
 
-															<input type="hidden" name="<?php echo 'materialCode' . $index ?>" id="<?php echo 'materialCode' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
+														<input type="hidden" name="<?php echo 'materialCode' . $index ?>" id="<?php echo 'materialCode' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
 
-															<input type="hidden" name="<?php echo 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo $record->MaterialName; ?>" />
+														<input type="hidden" name="<?php echo 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo $record->MaterialName; ?>" />
 
-															<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
+														<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
 
-															<input type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
+														<input type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
 
-															<input type="hidden" name="<?php echo 'quantity' . $index ?>" id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'b4qty' . $index ?>" id="<?php echo 'b4qty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+														<input type="hidden" name="<?php echo 'quantity' . $index ?>" id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'b4qty' . $index ?>" id="<?php echo 'b4qty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
 
 
-															<input type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'b4rate' . $index ?>" id="<?php echo 'b4rate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+														<input type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'b4rate' . $index ?>" id="<?php echo 'b4rate' . $index ?>" value="<?php echo $record->Rate; ?>" />
 
-															<input type="hidden" name="<?php echo 'Cgst' . $index ?>" id="<?php echo 'Cgst' . $index ?>" value="<?php echo $record->CGST; ?>" />
+														<input type="hidden" name="<?php echo 'Cgst' . $index ?>" id="<?php echo 'Cgst' . $index ?>" value="<?php echo $record->CGST; ?>" />
 
-															<input type="hidden" name="<?php echo 'AfterCgst' . $index ?>" id="<?php echo 'AfterCgst' . $index ?>" value="<?php echo $record->After_CGST; ?>" />
+														<input type="hidden" name="<?php echo 'AfterCgst' . $index ?>" id="<?php echo 'AfterCgst' . $index ?>" value="<?php echo $record->After_CGST; ?>" />
 
-															<input type="hidden" name="<?php echo 'Sgst' . $index ?>" id="<?php echo 'Sgst' . $index ?>" value="<?php echo $record->SGST; ?>" />
+														<input type="hidden" name="<?php echo 'Sgst' . $index ?>" id="<?php echo 'Sgst' . $index ?>" value="<?php echo $record->SGST; ?>" />
 
-															<input type="hidden" name="<?php echo 'AfterSgst' . $index ?>" id="<?php echo 'AfterSgst' . $index ?>" value="<?php echo $record->After_SGST; ?>" />
+														<input type="hidden" name="<?php echo 'AfterSgst' . $index ?>" id="<?php echo 'AfterSgst' . $index ?>" value="<?php echo $record->After_SGST; ?>" />
 
-															<input type="hidden" name="<?php echo 'Igst' . $index ?>" id="<?php echo 'Igst' . $index ?>" value="<?php echo $record->IGST; ?>" />
+														<input type="hidden" name="<?php echo 'Igst' . $index ?>" id="<?php echo 'Igst' . $index ?>" value="<?php echo $record->IGST; ?>" />
 
-															<input type="hidden" name="<?php echo 'AfterIgst' . $index ?>" id="<?php echo 'AfterIgst' . $index ?>" value="<?php echo $record->After_IGST; ?>" />
+														<input type="hidden" name="<?php echo 'AfterIgst' . $index ?>" id="<?php echo 'AfterIgst' . $index ?>" value="<?php echo $record->After_IGST; ?>" />
 
-															<input type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
+														<input type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
 
-															<input type="hidden" name="<?php echo 'Frequency' . $index ?>" id="<?php echo 'Frequency' . $index ?>" value="<?php echo $Frequency; ?>" />
+														<input type="hidden" name="<?php echo 'Frequency' . $index ?>" id="<?php echo 'Frequency' . $index ?>" value="<?php echo $Frequency; ?>" />
 
-															<input type="hidden" name="<?php echo 'FrequencyNo' . $index ?>" id="<?php echo 'FrequencyNo' . $index ?>" value="<?php echo $FrequencyNo; ?>" />
+														<input type="hidden" name="<?php echo 'FrequencyNo' . $index ?>" id="<?php echo 'FrequencyNo' . $index ?>" value="<?php echo $FrequencyNo; ?>" />
 
-															<input type="hidden" name="<?php echo 'FrequencyValue' . $index ?>" id="<?php echo 'FrequencyValue' . $index ?>" value="<?php echo $FrequencyNo; ?>" />
+														<input type="hidden" name="<?php echo 'FrequencyValue' . $index ?>" id="<?php echo 'FrequencyValue' . $index ?>" value="<?php echo $FrequencyNo; ?>" />
 
-															<input type="hidden" name="<?php echo 'ItemDescription' . $index ?>" id="<?php echo 'ItemDescription' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
+														<input type="hidden" name="<?php echo 'ItemDescription' . $index ?>" id="<?php echo 'ItemDescription' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
 
-															<input type="hidden" name="<?php echo 'OtherAmt' . $index ?>" id="<?php echo 'OtherAmt' . $index ?>" value="<?php echo $record->otherallowance; ?>" />
+														<input type="hidden" name="<?php echo 'OtherAmt' . $index ?>" id="<?php echo 'OtherAmt' . $index ?>" value="<?php echo $record->otherallowance; ?>" />
 
-															<input type="hidden" name="<?php echo 'OtherServiceDescription' . $index ?>" id="<?php echo 'OtherServiceDescription' . $index ?>" value="<?php echo $record->MaterialDescription; ?>" />
-															<input type="hidden" name="<?php echo 'LineItemNoteForAuditor' . $index ?>"  id="<?php echo 'LineItemNoteForAuditor' . $index ?>" value="<?php echo $record->LineitemAuditorNotes; ?>" />
+														<input type="hidden" name="<?php echo 'OtherServiceDescription' . $index ?>" id="<?php echo 'OtherServiceDescription' . $index ?>" value="<?php echo $record->MaterialDescription; ?>" />
+														<input type="hidden" name="<?php echo 'LineItemNoteForAuditor' . $index ?>" id="<?php echo 'LineItemNoteForAuditor' . $index ?>" value="<?php echo $record->LineitemAuditorNotes; ?>" />
 
 
+														<?php
+
+														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>
 															<?php
-
-															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>
-																<?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>
-															<?php
-															} ?>
-														</tr>
-													<?php
-														$TotalCgst = $TotalCgst + $record->After_CGST;
-														$TotalSgst = $TotalSgst + $record->After_SGST;
-														$TotalIgst = $TotalIgst + $record->After_IGST;
-														$OtherAmt =  $OtherAmt +  $record->otherallowance;
-														$TotalSummary = $TotalSummary + $record->TotalValue;
-
-
-														$TotalBasicAmount = $TotalBasicAmount + $record->BasicValue * $FrequencyNo;
-													}
-													?>
+														} 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>
+														<?php
+														} ?>
+													</tr>
 												<?php
+													$TotalCgst = $TotalCgst + $record->After_CGST;
+													$TotalSgst = $TotalSgst + $record->After_SGST;
+													$TotalIgst = $TotalIgst + $record->After_IGST;
+													$OtherAmt =  $OtherAmt +  $record->otherallowance;
+													$TotalSummary = $TotalSummary + $record->TotalValue;
 
+
+													$TotalBasicAmount = $TotalBasicAmount + $record->BasicValue * $FrequencyNo;
 												}
 												?>
-											</tbody>
-										</table>
-									</div>
+											<?php
+
+											}
+											?>
+										</tbody>
+									</table>
 								</div>
+							</div>
 
-								<br>
+							<br>
 
-								<div class="form-row">
-									<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');
-										echo form_input($data);
-										?>
-									</div>
-									<div class="form-group col-md-2">
-										<label>CGST <?php echo "($INRSYM)" ?></label>
-										<?php
-										$data = array('name' => 'txtTotCgst', 'value' => set_value('txtTotCgst', number_format($TotalCgst, 2, '.', '')), 'id' => 'txtTotCgst',  'class' => 'form-control num', 'readonly' => 'true');
-										echo form_input($data);
-										?>
-									</div>
-									<div class="form-group col-md-2">
-										<label>SGST <?php echo "($INRSYM)" ?></label>
-										<?php
-										$data = array('name' => 'txtTotSgst', 'value' => set_value('txtTotSgst', number_format($TotalSgst, 2, '.', '')), 'id' => 'txtTotSgst',  'class' => 'form-control num', 'readonly' => 'true');
-										echo form_input($data);
-										?>
-									</div>
-									<div class="form-group col-md-2">
-										<label>IGST <?php echo "($INRSYM)" ?></label>
-										<?php
-										$data = array('name' => 'txtTotIgst', 'value' => set_value('txtTotIgst', number_format($TotalIgst, 2, '.', '')), 'id' => 'txtTotIgst',  'class' => 'form-control num', 'readonly' => 'true');
-										echo form_input($data);
-										?>
-									</div>
-									<div class="form-group col-md-2">
-										<label>Other Allowances <?php echo "($INRSYM)" ?> </label>
-										<?php
-										$data = array('name' => 'ToatalOtherAllowances', 'value' => set_value('ToatalOtherAllowances', number_format($OtherAmt, 2, '.', '')), 'id' => 'ToatalOtherAllowances',  'class' => 'form-control num', 'readonly' => 'true');
-										echo form_input($data);
-										?>
-
-									</div>
-									<div class="form-group col-md-2">
-										<label>Total Order Value <?php echo "($INRSYM)" ?> </label>
-										<?php
-										$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($TotalSummary, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control num', 'readonly' => 'true');
-										echo form_input($data);
-										?>
-									</div>
+							<div class="form-row">
+								<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');
+									echo form_input($data);
+									?>
 								</div>
-
-								<br>
-								
-
-								<div class="form-row">
-									<!--start new fields 1 sep-->
-									<div class="form-group col-md-12">
-										<label>Description Of Service <span class="text-danger">*</label>
-
-										<?php
-										$data = array('name' => 'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-										echo form_textarea($data);
-										?>
-
-									</div><!--end new fields 1 sep-->
+								<div class="form-group col-md-2">
+									<label>CGST <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtTotCgst', 'value' => set_value('txtTotCgst', number_format($TotalCgst, 2, '.', '')), 'id' => 'txtTotCgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 								</div>
-
-								<br>
-								
-
-								<div class="form-row">
-									<div class="form-group col-md-12">
-										<label>Scope Of Work</label>
-										<?php
-										$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', strip_tags($ServiceDescription)), 'id' => 'ScopeofWork',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-										echo form_textarea($data);
-										?>
-									</div>
+								<div class="form-group col-md-2">
+									<label>SGST <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtTotSgst', 'value' => set_value('txtTotSgst', number_format($TotalSgst, 2, '.', '')), 'id' => 'txtTotSgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 								</div>
+								<div class="form-group col-md-2">
+									<label>IGST <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtTotIgst', 'value' => set_value('txtTotIgst', number_format($TotalIgst, 2, '.', '')), 'id' => 'txtTotIgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+								<div class="form-group col-md-2">
+									<label>Other Allowances <?php echo "($INRSYM)" ?> </label>
+									<?php
+									$data = array('name' => 'ToatalOtherAllowances', 'value' => set_value('ToatalOtherAllowances', number_format($OtherAmt, 2, '.', '')), 'id' => 'ToatalOtherAllowances',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 
-								<br>
-								
+								</div>
+								<div class="form-group col-md-2">
+									<label>Total Order Value <?php echo "($INRSYM)" ?> </label>
+									<?php
+									$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($TotalSummary, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
 
-								<div class="form-row ">
-									<div class="form-group col-md-12" id="splpodiv">
-										<label>Special po Table List</label>
-										<table id="table2" class="table table-striped table-hover mb-0" style="font-size:12px;">
-
-											<div class="form-group col-md-12">
+							<br>
 
 
-												<div class="col-md-offset-10 col-md-8">
-													<button type="button" class="btn btn-success" id="addmorebutton">ADD FILES</button>
-												</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">*</label>
+
+									<?php
+									$data = array('name' => 'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+									echo form_textarea($data);
+									?>
+
+								</div><!--end new fields 1 sep-->
+							</div>
+
+							<br>
 
 
-												<div id="newdiv"></div>
-												<input type="hidden" name="hidecounter" id="hidecounter" value="0" />
-												<input type="hidden" name="hideconstant" id="hideconstant" value="0" />
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<label>Scope Of Work</label>
+									<?php
+									$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', strip_tags($ServiceDescription)), 'id' => 'ScopeofWork',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+									echo form_textarea($data);
+									?>
+								</div>
+							</div>
+
+							<br>
 
 
+							<div class="form-row ">
+								<div class="form-group col-md-12" id="splpodiv">
+									<label>Special po Table List</label>
+									<table id="table2" class="table table-striped table-hover mb-0" style="font-size:12px;">
+
+										<div class="form-group col-md-12">
+
+
+											<div class="col-md-offset-10 col-md-8">
+												<button type="button" class="btn btn-success" id="addmorebutton">ADD FILES</button>
 											</div>
-											<thead>
-												<tr>
-													<th>Bill No </th>
-													<!-- <th>Materials</th>        -->
-													<!-- <th>Delivery Challan No</th>   -->
-													<!-- <th>Delivery Challan Date</th>    
+
+
+											<div id="newdiv"></div>
+											<input type="hidden" name="hidecounter" id="hidecounter" value="0" />
+											<input type="hidden" name="hideconstant" id="hideconstant" value="0" />
+
+
+										</div>
+										<thead>
+											<tr>
+												<th>Bill No </th>
+												<!-- <th>Materials</th>        -->
+												<!-- <th>Delivery Challan No</th>   -->
+												<!-- <th>Delivery Challan Date</th>    
 															<th>Vehicle No</th>          
 															<th>Courier No</th>  -->
-													<!-- <th>Quantity</th> -->
-													<th>File</th>
+												<!-- <th>Quantity</th> -->
+												<th>File</th>
 
-													<th>Action</th>
-												</tr>
-											</thead>
+												<th>Action</th>
+											</tr>
+										</thead>
 
-											<tbody id="spl">
-												<?php
-												if (!empty($getdata)) {
-													foreach ($getdata as $row => $gd) {
+										<tbody id="spl">
+											<?php
+											if (!empty($getdata)) {
+												foreach ($getdata as $row => $gd) {
 
-												?>
-														<tr id="lastvalue">
-															<td><?php echo $gd->BillNo ?></td>
-															<input type="hidden" id="billnos<?= $row ?>" value="<?= $gd->BillNo ?>">
-															<input type="hidden" id="file<?= $row ?>" value="<?= $gd->FilePath ?>">
-															<td><?php echo (!empty($gd->FilePath)) ? $gd->FilePath : "No File"; ?></td>
-															<td><span onclick="openmodel(<?= $row ?>);"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to Edit the Revenue SplPO details"></i></span>
-																<?php if (!empty($gd->FilePath)) { ?>
-																	<a target="_blank" href="<?php echo  base_url() . 'public/uploads/BillFiles/' ?><?php echo $gd->FilePath ?>"><i class="fa fa-download"></i></a>
-																<?php } ?>
-															</td>
-														</tr>
-												<?php
-													}
+											?>
+													<tr id="lastvalue">
+														<td><?php echo $gd->BillNo ?></td>
+														<input type="hidden" id="billnos<?= $row ?>" value="<?= $gd->BillNo ?>">
+														<input type="hidden" id="file<?= $row ?>" value="<?= $gd->FilePath ?>">
+														<td><?php echo (!empty($gd->FilePath)) ? $gd->FilePath : "No File"; ?></td>
+														<td><span onclick="openmodel(<?= $row ?>);"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to Edit the Revenue SplPO details"></i></span>
+															<?php if (!empty($gd->FilePath)) { ?>
+																<a target="_blank" href="<?php echo  base_url() . 'public/uploads/BillFiles/' ?><?php echo $gd->FilePath ?>"><i class="fa fa-download"></i></a>
+															<?php } ?>
+														</td>
+													</tr>
+											<?php
 												}
-												?>
-											</tbody>
-										</table>
-									</div>
+											}
+											?>
+										</tbody>
+									</table>
+								</div>
 
-									<?php if (!empty($update)) { ?>
-										<div class="form-group col-md-12" id="editpodiv">
-											<div class="form-group col-md-12"><label>Editable POScreen</label>
-												<table id="edittable" class="table table-striped table-hover mb-0" style="font-size:12px;">
+								<?php if (!empty($update)) { ?>
+									<div class="form-group col-md-12" id="editpodiv">
+										<div class="form-group col-md-12"><label>Editable POScreen</label>
+											<table id="edittable" class="table table-striped table-hover mb-0" style="font-size:12px;">
 
-													<thead>
-														<tr>
-															<th>Sno</th>
-															<th>PONO</th>
-															<!--  <th>Material</th>  -->
-															<!--  <th>Date</th>   -->
-															<th>LineItemNo</th>
-															<th>Entity</th>
-															<th>OldValue</th>
-															<th>NewValue</th>
-															<th>UpdatedBy</th>
-															<th>UpdateOn</th>
+												<thead>
+													<tr>
+														<th>Sno</th>
+														<th>PONO</th>
+														<!--  <th>Material</th>  -->
+														<!--  <th>Date</th>   -->
+														<th>LineItemNo</th>
+														<th>Entity</th>
+														<th>OldValue</th>
+														<th>NewValue</th>
+														<th>UpdatedBy</th>
+														<th>UpdateOn</th>
 
-														</tr>
-													</thead>
+													</tr>
+												</thead>
 
 
-													<tbody>
-														<?php
-														if (!empty($getlogpodtl)) {
-															//print_r($getlogpodtl); die;
-															$inde = 0;
-															foreach ($getlogpodtl as $oldpo) {
-																$inde = $inde + 1;
-														?>
-																<tr id="<?php echo $inde; ?>">
+												<tbody>
+													<?php
+													if (!empty($getlogpodtl)) {
+														//print_r($getlogpodtl); die;
+														$inde = 0;
+														foreach ($getlogpodtl as $oldpo) {
+															$inde = $inde + 1;
+													?>
+															<tr id="<?php echo $inde; ?>">
 
-																	<td><?php echo $inde; ?></td>
-																	<td><?php echo $oldpo->PONO ?></td>
+																<td><?php echo $inde; ?></td>
+																<td><?php echo $oldpo->PONO ?></td>
 
-																	<!--          
+																<!--          
 																		<?php // if ($oldpo->logDate != '-') {
 																		// $logdate = date('d-m-Y', strtotime($oldpo->logDate));
 																		// } else {
@@ -1566,96 +1579,95 @@ if (!empty($getlogpodtl)) {
 																		// } 
 																		?>
 																		-->
-																	<td><?php echo $oldpo->LineItemNos; ?></td>
-																	<td><?php echo $oldpo->entity ?></td>
-																	<?php if ($oldpo->entity == 'PO DateChanged') {
-																		$oldValue = date('d-m-Y', strtotime($oldpo->oldValue));
-																	} else {
-																		$oldValue = $oldpo->oldValue;
-																	} ?>
-																	<td><?php echo $oldValue . '-' . $oldpo->SupplierName; ?></td>
+																<td><?php echo $oldpo->LineItemNos; ?></td>
+																<td><?php echo $oldpo->entity ?></td>
+																<?php if ($oldpo->entity == 'PO DateChanged') {
+																	$oldValue = date('d-m-Y', strtotime($oldpo->oldValue));
+																} else {
+																	$oldValue = $oldpo->oldValue;
+																} ?>
+																<td><?php echo $oldValue . '-' . $oldpo->SupplierName; ?></td>
 
-																	<?php if ($oldpo->entity == 'PO DateChanged') {
-																		$newValue = date('d-m-Y', strtotime($oldpo->newValue));
-																	} else {
-																		$newValue = $oldpo->newValue;
-																	} ?>
-																	<td><?php echo $newValue ?></td>
-																	<td><?php echo $oldpo->FirstName ?></td>
+																<?php if ($oldpo->entity == 'PO DateChanged') {
+																	$newValue = date('d-m-Y', strtotime($oldpo->newValue));
+																} else {
+																	$newValue = $oldpo->newValue;
+																} ?>
+																<td><?php echo $newValue ?></td>
+																<td><?php echo $oldpo->FirstName ?></td>
 
-																	<td><?php $date = new DateTime($oldpo->UpdatedOn);
-																		echo $date->format('d-m-Y'); ?></td>
+																<td><?php $date = new DateTime($oldpo->UpdatedOn);
+																	echo $date->format('d-m-Y'); ?></td>
 
 
-																</tr>
-														<?php
-															}
+															</tr>
+													<?php
 														}
-														?>
-													</tbody>
-												<?php } else {
-											} ?>
-												</table>
-											</div>
+													}
+													?>
+												</tbody>
+											  <?php } else {} ?>
+											</table>
 										</div>
+									</div>
 
 
-										<div class="form-group col-md-12 px-4" align="left">
+									<div class="form-group col-md-12 px-4" align="left">
 
-											<label>Select Purchase Order File</label>
-											<br>
-														<input type="file" name="POFile" id="POFile">
-														
-											
+										<label>Select Purchase Order File</label>
+										<br>
+										<input type="file" name="POFile" id="POFile">
 
-										</div>
 
-										<div class="form-group col-md-12 px-4" id="deletePreviousPurchaseOrderFileDiv" align="left">
+
+									</div>
+
+									<div class="form-group col-md-12 px-4" id="deletePreviousPurchaseOrderFileDiv" align="left">
 										<?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>
-															&nbsp;&nbsp;&nbsp;&nbsp;
-															<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
-														<?php } ?>
-														<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" />
-														<br>
-										</div>
+											<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>
+											&nbsp;&nbsp;&nbsp;&nbsp;
+											<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
+										<?php } ?>
+										<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" />
+										<br>
+									</div>
 
-										<div class="form-group col-md-12 px-4">
+									<div class="form-group col-md-12 px-4">
 
-										
 
-											<div align="right"><br />
-												<div>
-													
-												</div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
-												<input type="hidden" name="txtStatus" id="txtStatus" />
-												<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
-																													echo $index;
-																												} ?>">
-												<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
 
-												<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
+										<div align="right"><br />
+											<div>
 
-												<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) {  ?>
-													<a class="btn btn-secondary" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
-													<?php if ($PONOStatus == PO_DRAFT) { ?>
-														<a class="btn btn-primary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
-													<?php } ?>
-													<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-													<a class="btn btn-success Save" ID="Save" 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 Save" ID="Submit" onclick="Save(3)">&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>
-													<a class="btn btn-success Save" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+											</div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+											<input type="hidden" name="txtStatus" id="txtStatus" />
+											<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
+																												echo $index;
+																											} ?>">
+											<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+
+											<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
+
+											<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) {  ?>
+												<a class="btn btn-secondary" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
+												<?php if ($PONOStatus == PO_DRAFT) { ?>
+													<a class="btn btn-primary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
 												<?php } ?>
-
-											</div>
+												<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+												<a class="btn btn-success Save" ID="Save" 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 Save" ID="Submit" onclick="Save(3)">&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>
+												<a class="btn btn-success Save" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+											<?php } ?>
 
 										</div>
 
-										<div class="form-group col-md-12 px-4">
+									</div>
+
+									<div class="form-group col-md-12 px-4">
 										<div align="left">
 											<label>Request On : </label><?php if (isset($Reqon)) {
 																			echo $Reqon;
@@ -1685,21 +1697,21 @@ if (!empty($getlogpodtl)) {
 																		echo "Status not provided";
 																	}
 																	?>
-								
-							
-												
+
+
+
 										</div>
-										</div>
-									
 									</div>
-							
+
+							</div>
+
 						</div> <!-- end card body-->
 					</div> <!-- end card -->
 				</div><!-- end col-->
-			</div>
-		</div> <!-- container -->
-	</div> <!-- content -->
-</div>
+			</div><!-- end form row -->
+		</div> <!-- end container-fluid -->
+	</div> <!-- end content -->
+</div><!-- end content-page -->
 <!-- Model for servicepo -->
 <div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
@@ -1836,8 +1848,8 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="row">
 						<div class="form-group col-md-6" align="right">
-                          <label> CGST In % </label>
-							
+							<label> CGST In % </label>
+
 						</div>
 
 						<div class="form-group col-md-3">
@@ -1858,8 +1870,8 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="row">
 						<div class="form-group col-md-6" align="right">
-                          <label> SGST In % </label>
-							
+							<label> SGST In % </label>
+
 						</div>
 
 						<div class="form-group col-md-3">
@@ -1880,8 +1892,8 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="row">
 						<div class="form-group col-md-6" align="right">
-                          <label> IGST In %  </label>
-							
+							<label> IGST In % </label>
+
 						</div>
 
 						<div class="form-group col-md-3">
@@ -2121,8 +2133,8 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="form-row">
 						<div class="form-group col-md-6" align="right">
-                           <label> CGST In % </label>
-							
+							<label> CGST In % </label>
+
 						</div>
 
 						<div class="form-group col-md-3">
@@ -2145,8 +2157,8 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="form-row">
 						<div class="form-group col-md-6" align="right">
-                          <label>  SGST In % </label>
-							
+							<label> SGST In % </label>
+
 						</div>
 						<div class="form-group col-md-3">
 							<div>
@@ -2171,7 +2183,7 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="form-row">
 						<div class="form-group col-md-6" align="right">
-							<label> IGST In % </label> 
+							<label> IGST In % </label>
 						</div>
 						<div class="form-group col-md-3">
 							<div>
@@ -2610,16 +2622,16 @@ if (!empty($getlogpodtl)) {
 			// 	Taxvalue: TotalTaxValue,
 			// 	TotalValue: TotalOrderValue
 			// }));
-			PONOStatus = <?php echo $PONOStatus; ?> 
-			var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;  
+			PONOStatus = <?php echo $PONOStatus; ?>
+			var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;
 			var rowHtml = `
 					<tr id="${temp}">
 						<td align="left">${temp}</td>
 						<td align="left">${Reqnumber}</td>
 						<td align="left">${materialCode}</td>
 						<td align="left">${shorten}</td>`;
-							if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
-							rowHtml += `<td><a href="#" class="editable-field" 
+			if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
+				rowHtml += `<td><a href="#" class="editable-field" 
 											data-id="${temp}"
 											data-notes="-">-</a>
 											<div class="edit-container" style="display:none;">
@@ -2627,8 +2639,10 @@ if (!empty($getlogpodtl)) {
 												<button class="save-btn">✔</button>
 												<button class="cancel-btn">✖</button>
 											</div></td>`;
-						}else{ rowHtml += `<td>-</td>`; }
-						rowHtml += `<td align="right">${quantity}</td>
+			} else {
+				rowHtml += `<td>-</td>`;
+			}
+			rowHtml += `<td align="right">${quantity}</td>
 						<td align="left">${uom}</td>
 						<td align="right">${itemRate}</td>
 						<td align="right">${basicval}</td>
@@ -2994,7 +3008,7 @@ if (!empty($getlogpodtl)) {
 					url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
 					success: function(data) {
 						$('#loader').hide();
-                        (data) ? alert(response) : alert("Error");
+						(data) ? alert(response): alert("Error");
 					}
 				});
 			}
@@ -3163,27 +3177,25 @@ if (!empty($getlogpodtl)) {
 
 		var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
 
-		
+
 		if (serviceValidate()) {
-			// if (document.getElementById('ServiceTable').rows.length < 2) 
-			// {
-			// 	alert('Please Select Line item to Create PO');
-			// 	$('#Deliverydt').focus();
-			// 	return false;
-			// }
-			// else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
-			//      alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
-			//        return false;
-			// }
-			// else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
-			// 	alert('Please Enter Payable Terms');
-			// 	$('#Otherpayment').focus();
-			// 	return false;
-			// } else if ($('#editdescofpo').val().trim() == '') {
-			// 	alert('Please Enter Description Of Service');
-			// 	$('#editdescofpo').focus();
-			// 	return false;
-			// } else {
+			if (document.getElementById('ServiceTable').rows.length < 2) {
+				alert('Atleast One Line needed');
+				return false;
+			}
+				// else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
+				//      alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
+				//        return false;
+				// }
+				// else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
+				// 	alert('Please Enter Payable Terms');
+				// 	$('#Otherpayment').focus();
+				// 	return false;
+			else if ($('#editdescofpo').val().trim() == '') {
+				alert('Please Enter Description Of Service');
+				$('#editdescofpo').focus();
+				return false;
+			} else {
 				// $('#content').loader('show');
 				var formData = new FormData($('.ServicePO')[0]);
 				$('#loader').show();
@@ -3196,16 +3208,16 @@ if (!empty($getlogpodtl)) {
 					processData: false,
 					contentType: false,
 					success: function(data) {
-						 
 
 
-// var newWindow = window.open("", "_blank", "toolbar=yes,scrollbars=yes,resizable=yes,width=1024,height=768");
-// newWindow.document.write("<html><head><title>Response</title></head><body>");
-// newWindow.document.write("<pre>" + data + "</pre>"); // Using <pre> to preserve formatting
-// newWindow.document.write("</body></html>");
-// newWindow.document.close();
-// newWindow.moveTo(0, 0);
-// newWindow.resizeTo(screen.width, screen.height);
+
+						// var newWindow = window.open("", "_blank", "toolbar=yes,scrollbars=yes,resizable=yes,width=1024,height=768");
+						// newWindow.document.write("<html><head><title>Response</title></head><body>");
+						// newWindow.document.write("<pre>" + data + "</pre>"); // Using <pre> to preserve formatting
+						// newWindow.document.write("</body></html>");
+						// newWindow.document.close();
+						// newWindow.moveTo(0, 0);
+						// newWindow.resizeTo(screen.width, screen.height);
 						if (data) {
 							$('#loader').hide();
 							alert(data);
@@ -3230,498 +3242,490 @@ if (!empty($getlogpodtl)) {
 					}
 
 				});
-			// }
-
-		}
-	}
-	// this function is used to clear data changing schedule option
-	$('#Scheduleby').change(function() {
-
-		// $("#Deliverydt").datepicker({
-		// 	minDate: 'now',
-		// 	dateFormat: 'mm/dd/yy',
-		// 	changeMonth: true,
-		// 	changeYear: true,
-		// 	yearRange: '0:+10'
-		// });
-
-
-	});
-	$('#Deliverydt').change(function() {
-
-		$('#Scheduleby').val('');
-
-	});
-
-
-
-
-	function calculateCgstTax(varBasicValue, Cgst) {
-
-		var basicValue = parseFloat(varBasicValue);
-		var Cgst = parseFloat(Cgst);
-		var ServiceTaxValue = 0.0;
-
-		ServiceTaxValue = <?php echo SERVICETAX_CGST; ?>;
-
-		var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
-
-		return TAXval; //  $('#AfterServiceTax').val(TAXval); 
-
-	}
-
-	function calculateSgstTax(varBasicValue, Sgst) {
-
-		var basicValue = parseFloat(varBasicValue);
-		var Sgst = parseFloat(Sgst);
-		var ServiceTaxValue = 0.0;
-
-		ServiceTaxValue = <?php echo SERVICETAX_SGST; ?>;
-
-		var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
-
-		return TAXval; //  $('#AfterServiceTax').val(TAXval); 
-
-	}
-
-	function calculateIgstTax(varBasicValue, Igst) {
-
-		var basicValue = parseFloat(varBasicValue);
-		var Igst = parseFloat(Igst);
-		var ServiceTaxValue = 0.0;
-
-		ServiceTaxValue = <?php echo SERVICETAX_IGST; ?>;
-
-		var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
-
-		return TAXval; //  $('#AfterServiceTax').val(TAXval); 
-
-	}
-	
-	//If others is the payment terms to display mandatory field
-	$(document).ready(function () {
-	$("#PaymentTerms").change(function() {
-		var otherPayment = '<?php echo $otherPayment; ?>';
-		if ($('#PaymentTerms').val().trim() == 'PT08') {
-			$('#otheroptiondiv').show();
-			$('#Otherpayment').val(otherPayment);
-		} else {
-			$('#otheroptiondiv').hide();
-			$('#Otherpayment').val('');
-		}
-	});
-    })
-
-	$('#ReqNo').change(function() {
-
-		var id = $('#ReqNo').val();
-		$("#AvlBudAmt").val('');
-		$("#CostCenter").val('');
-		$("#MaterialCode").empty();
-		$("#deptName").val('');
-		$("#UOM").val('');
-		$("#Quantity").val('');
-		$("#ItemName").val('');
-		$("#Rate").val('');
-		$("#txtBasicValue").val('');
-		clearTaxField();
-		$("#MaterialCode").empty();
-		if (id != '0') {
-			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-
-			var AvlBudAmt = '<?php echo $AvlAmount ?>';
-
-			AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>';
-
-			//ServiceTable
-			var rows = $('#ServiceTable tbody tr').length;
-
-			if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') {
-
-				$("#MaterialCode").append($('<option></option>').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName));
-				DeletedMaterialCode = '';
-				DeletedMaterialCode = '';
 			}
 
-			for (i = 2; i <= rows; i++) {
+		}
+	}
+		// this function is used to clear data changing schedule option
+		$('#Scheduleby').change(function() {
 
-				//var j=1;
-				$.each(Material[i], function(idx, obj) {
-
-					// j=j+1;
-					var materialCode = $('#materialCode' + i);
+			// $("#Deliverydt").datepicker({
+			// 	minDate: 'now',
+			// 	dateFormat: 'mm/dd/yy',
+			// 	changeMonth: true,
+			// 	changeYear: true,
+			// 	yearRange: '0:+10'
+			// });
 
 
+		});
+		$('#Deliverydt').change(function() {
 
+			$('#Scheduleby').val('');
 
-					if (obj.materialCode == materialCode) {
-						$("#MaterialCode").val('');
-					} else {
-						$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+		});
 
-					}
+		function calculateCgstTax(varBasicValue, Cgst) {
 
+			var basicValue = parseFloat(varBasicValue);
+			var Cgst = parseFloat(Cgst);
+			var ServiceTaxValue = 0.0;
 
-				});
+			ServiceTaxValue = <?php echo SERVICETAX_CGST; ?>;
 
+			var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
 
+			return TAXval; //  $('#AfterServiceTax').val(TAXval); 
 
+		}
 
-			} // For Binding DepartmentName	           			
-			$.each(y, function(idx, obj) {
-				if (obj.ReqNo === id) {
-					$("#deptName").val(obj.DepartmentName);
-					$("#CostCenter").val(obj.CostCenterCode);
-					if (obj.Service_Period != '' && obj.Service_Period != null) {
-						$("#Frequency").val(obj.Service_Period);
-						$("#FrequencyNo").val(obj.NumberOfService);
+		function calculateSgstTax(varBasicValue, Sgst) {
 
-					} else {
-						var text = 'One Time';
-						$("#Frequency").val(text);
-						$("#FrequencyNo").val(1);
-					}
+			var basicValue = parseFloat(varBasicValue);
+			var Sgst = parseFloat(Sgst);
+			var ServiceTaxValue = 0.0;
+
+			ServiceTaxValue = <?php echo SERVICETAX_SGST; ?>;
+
+			var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
+
+			return TAXval; //  $('#AfterServiceTax').val(TAXval); 
+
+		}
+
+		function calculateIgstTax(varBasicValue, Igst) {
+
+			var basicValue = parseFloat(varBasicValue);
+			var Igst = parseFloat(Igst);
+			var ServiceTaxValue = 0.0;
+
+			ServiceTaxValue = <?php echo SERVICETAX_IGST; ?>;
+
+			var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
+
+			return TAXval; //  $('#AfterServiceTax').val(TAXval); 
+
+		}
+
+		//If others is the payment terms to display mandatory field
+		$(document).ready(function() {
+			$("#PaymentTerms").change(function() {
+				var otherPayment = '<?php echo $otherPayment; ?>';
+				if ($('#PaymentTerms').val().trim() == 'PT08') {
+					$('#otheroptiondiv').show();
+					$('#Otherpayment').val(otherPayment);
+				} else {
+					$('#otheroptiondiv').hide();
+					$('#Otherpayment').val('');
 				}
 			});
-			$("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));
-			// For Binding Material list center for the selected Requistion Number	
+		})
 
-			$("#MaterialCode").append($('<option></option>').val("0").html("Select Material Code"));
-			var isAdded = "0";
-			for (i = 0; i < Material.length; i++) {
-				$.each(Material[i], function(idx, obj) {
+		$('#ReqNo').change(function() {
 
-					if (obj.ReqNo === id) {
+			var id = $('#ReqNo').val();
+			$("#AvlBudAmt").val('');
+			$("#CostCenter").val('');
+			$("#MaterialCode").empty();
+			$("#deptName").val('');
+			$("#UOM").val('');
+			$("#Quantity").val('');
+			$("#ItemName").val('');
+			$("#Rate").val('');
+			$("#txtBasicValue").val('');
+			clearTaxField();
+			$("#MaterialCode").empty();
+			if (id != '0') {
+				var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
 
-						$.each(SelectedMaterialList.Mat, function(idx1, el) {
-							if (id == el.ReqNo) {
+				var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 
-								if (el.materialCode == obj.MaterialCode) {
-									isAdded = "1";
-									return false;
-								} else {
-									isAdded = "0";
-								}
+				var AvlBudAmt = '<?php echo $AvlAmount ?>';
 
-							}
-						});
+				AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>';
 
+				//ServiceTable
+				var rows = $('#ServiceTable tbody tr').length;
 
-						if (isAdded == "0") {
+				if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') {
 
-
-							$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-
-					}
-
-
-				});
-			}
-		} else {
-			alert('Please select the Requisition Number');
-			return false;
-		}
-		id = '';
-
-	});
-	$(document).ready(function() {
-		$("#EDITSERVICE").on("shown.bs.modal", function(e) {
-
-
-			var AvlBudAmt = '<?php echo $AvlAmount ?>';
-
-			AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>';
-
-			userid = $(e.relatedTarget).data('userid');
-
-			var tr = document.getElementById(userid);
-			var cellval = tr.cells;
-			var id = $('#Reqnumber' + userid).val();
-
-			$('#EditAvlBudAmt').val(AvlBudAmt);
-			$('#EditReqNo').val($('#Reqnumber' + userid).val());
-			$('#EditdeptName').val($('#departmentName' + userid).val());
-			$("#EditCostCenter").val($('#costCode' + userid).val());
-
-
-			$('#EditItemName').val($('#materialName' + userid).val());
-			$('#EditUOM').val($('#uom' + userid).val());
-			$('#EditPer').val($('#per' + userid).val());
-			$('#EditQuantity').val($('#quantity' + userid).val());
-			RequistQuantity = $('#quantity' + userid).val();
-			$('#EditRate').val($('#itemRate' + userid).val());
-			$('#txtEditBasicValue').val(cellval[8].innerHTML);
-			$('#EditCgst').val($('#Cgst' + userid).val());
-			$('#EditSgst').val($('#Sgst' + userid).val());
-			$('#EditIgst').val($('#Igst' + userid).val());
-			$('#EditAfterCgst').val($('#AfterCgst' + userid).val());
-			$('#EditAfterSgst').val($('#AfterSgst' + userid).val());
-			$('#EditAfterIgst').val($('#AfterIgst' + userid).val());
-
-			$('#EditOtheritemDescription').val($('#OtherServiceDescription' + userid).val());
-
-			var res = $('#OtherServiceDescription' + userid).val();
-
-
-
-			if (res == '') {
-				$('#EditotherDescription').hide();
-			} else {
-				$('#EditotherDescription').show();
-			}
-
-
-
-			if ($('#FrequencyValue' + userid).val() == 1) {
-				$('#EditFrequency').val($('#Frequency' + userid).val());
-				$("#EditFrequencyNo").val(1);
-			} else {
-				$('#EditFrequency').val($('#Frequency' + userid).val());
-				$("#EditFrequencyNo").val($('#FrequencyValue' + userid).val());
-			}
-
-			$('#EditTotalOrderValue').val(cellval[10].innerHTML);
-			$('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
-			tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
-			RequistQuantity = $('#quantity' + userid).val();
-
-          
-
-			$("#EditMaterialCode").empty();
-			$("#EditMaterialCode").append($('<option></option>')
-								.val($('#materialCode' + userid).val())
-								.html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())
-								.prop('selected', true)
-			);
-			// Make the select element read-only (disable it)
-			$("#EditMaterialCode").prop('disabled', true);
-
-
-			
-			// For Binding Material list center for the selected Requistion Number	
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-
-			var isAdded = "0";
-			for (i = 0; i < Material.length; i++) {
-				$.each(Material[i], function(idx, obj) {
-
-					if (obj.ReqNo === id) {
-
-						$.each(SelectedMaterialList.Mat, function(idx1, el) {
-							if (id == el.ReqNo) {
-
-								if (el.materialCode == obj.MaterialCode) {
-
-									isAdded = "1";
-									return false;
-								} else {
-									isAdded = "0";
-								}
-
-							}
-
-
-						});
-
-
-						if (isAdded == "0") {
-
-							$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-
-					}
-
-
-				});
-			}
-
-		});
-
-
-
-
-
-		$("#VIEWSERVICE").on("shown.bs.modal", function(e) {
-
-			userid = $(e.relatedTarget).data('userid');
-			var AvlBudAmt = '<?php echo $AvlAmount ?>';
-
-			AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>';
-			var tr = document.getElementById(userid);
-			var cellval = tr.cells;
-			var id = $('#Reqnumber' + userid).val();
-			$('#ViewPer').val($('#per' + userid).val());
-			$('#ViewReqNo').val($('#Reqnumber' + userid).val());
-			$('#ViewdeptName').val($('#departmentName' + userid).val());
-			$("#ViewCostCenter").val($('#costCode' + userid).val());
-			$('#ViewAvlBudAmt').val(AvlBudAmt);
-
-			$('#ViewItemName').val($('#materialName' + userid).val());
-			$('#ViewUOM').val($('#uom' + userid).val());
-			$('#ViewQuantity').val($('#quantity' + userid).val());
-			RequistQuantity = $('#quantity' + userid).val();
-			$('#ViewRate').val($('#itemRate' + userid).val());
-			$('#txtViewBasicValue').val(cellval[8].innerHTML);
-			$('#ViewCgst').val($('#Cgst' + userid).val());
-			$('#ViewSgst').val($('#Sgst' + userid).val());
-			$('#ViewIgst').val($('#Igst' + userid).val());
-			$('#ViewAfterCgst').val($('#AfterCgst' + userid).val());
-			$('#ViewAfterSgst').val($('#AfterSgst' + userid).val());
-			$('#ViewAfterIgst').val($('#AfterIgst' + userid).val());
-
-			$('#ViewOtheritemDescription').val($('#OtherServiceDescription' + userid).val());
-
-			var res = $('#OtherServiceDescription' + userid).val();
-
-			if (res == '') {
-				$('#ViewotherDescription').hide();
-			} else {
-				$('#ViewotherDescription').show();
-			}
-
-
-			if ($('#FrequencyValue' + userid).val() == 1) {
-				$('#ViewFrequency').val($('#Frequency' + userid).val());
-				$("#ViewFrequencyNo").val(1);
-			} else {
-				$('#ViewFrequency').val($('#Frequency' + userid).val());
-				$("#ViewFrequencyNo").val($('#FrequencyValue' + userid).val());
-			}
-
-			$('#ViewTotalOrderValue').val(cellval[10].innerHTML);
-			$('#ViewOtherAllowances').val($('#OtherAmt' + userid).val());
-
-			tinyMCE.get('ViewtxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
-			RequistQuantity = $('#quantity' + userid).val();
-
-
-
-			$("#ViewMaterialCode").empty();
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			// For Binding Material list center for the selected Requistion Number	
-
-			$("#ViewMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
-
-			var isAdded = "0";
-			for (i = 0; i < Material.length; i++) {
-				$.each(Material[i], function(idx, obj) {
-
-					if (obj.ReqNo === id) {
-
-						$.each(SelectedMaterialList.Mat, function(idx1, el) {
-							if (id == el.ReqNo) {
-
-								if (el.materialCode == obj.MaterialCode) {
-
-									isAdded = "1";
-									return false;
-								} else {
-									isAdded = "0";
-								}
-
-							}
-
-
-						});
-
-
-						if (isAdded == "0") {
-
-							//$("#ViewMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-
-					}
-
-
-				});
-			}
-
-		});
-	});
-	$("#insuranceStatus").change(function() {
-		var InsNo = '<?php echo $InsuranceNumber; ?>';
-
-		if ($("#insuranceStatus").val() == "1") {
-			$('#insuranceTxtDiv').show();
-			$('#InsuranceNumber').val('Yes');
-		} else {
-			$('#insuranceTxtDiv').hide();
-			$('#InsuranceNumber').val('');
-		}
-	});
-
-
-
-
-
-
-	function splpoupdate() {
-		// alert();
-		var formData = new FormData();
-
-		var file = $("#imag").prop('files')[0];
-		var param1 = $('#hidebillno').val();
-		var param2 = $('#hideoldfile').val();
-
-		// var param3 =$('#ChallanInvNo').val();	
-		// var param4 =$('#Date').val();	
-		// var param5 =$('#VehicleNo').val();
-		// var param6 =$('#CourierNo').val();			
-
-		//var param7 =$('#hideoldfile').val();			
-
-
-
-
-		var filename = $("#imag").val();
-		filename = filename.split('\\');
-
-		formData.append('file', file);
-		formData.append('param1', param1);
-		formData.append('param2', param2);
-		// 		formData.append('param3',param3);
-		// formData.append('param4',param4);
-		// 		formData.append('param5',param5);
-		// formData.append('param6',param6);
-
-		// $('.content').loader('show');
-		$('#loader').show();
-				$.ajax({
-			data: formData,
-			type: "POST",
-			url: "<?php echo base_url() ?>servicepurchaseorder/uploadfile",
-			cache: false,
-			contentType: false,
-			processData: false,
-			success: function(data) {
-				if (data) {
-					alert(data);
-					$('#loader').hide();
-					window.location.reload();
-					//$('#spl').find('td').eq(1).text(filename[2]);
-					$('#EditServiceSplPOModel').modal('hide');
+					$("#MaterialCode").append($('<option></option>').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName));
+					DeletedMaterialCode = '';
+					DeletedMaterialCode = '';
 				}
 
+				for (i = 2; i <= rows; i++) {
+
+					//var j=1;
+					$.each(Material[i], function(idx, obj) {
+
+						// j=j+1;
+						var materialCode = $('#materialCode' + i);
+
+
+
+
+						if (obj.materialCode == materialCode) {
+							$("#MaterialCode").val('');
+						} else {
+							$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+
+						}
+
+
+					});
+
+
+
+
+				} // For Binding DepartmentName	           			
+				$.each(y, function(idx, obj) {
+					if (obj.ReqNo === id) {
+						$("#deptName").val(obj.DepartmentName);
+						$("#CostCenter").val(obj.CostCenterCode);
+						if (obj.Service_Period != '' && obj.Service_Period != null) {
+							$("#Frequency").val(obj.Service_Period);
+							$("#FrequencyNo").val(obj.NumberOfService);
+
+						} else {
+							var text = 'One Time';
+							$("#Frequency").val(text);
+							$("#FrequencyNo").val(1);
+						}
+					}
+				});
+				$("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));
+				// For Binding Material list center for the selected Requistion Number	
+
+				$("#MaterialCode").append($('<option></option>').val("0").html("Select Material Code"));
+				var isAdded = "0";
+				for (i = 0; i < Material.length; i++) {
+					$.each(Material[i], function(idx, obj) {
+
+						if (obj.ReqNo === id) {
+
+							$.each(SelectedMaterialList.Mat, function(idx1, el) {
+								if (id == el.ReqNo) {
+
+									if (el.materialCode == obj.MaterialCode) {
+										isAdded = "1";
+										return false;
+									} else {
+										isAdded = "0";
+									}
+
+								}
+							});
+
+
+							if (isAdded == "0") {
+
+
+								$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+							}
+
+						}
+
+
+					});
+				}
+			} else {
+				alert('Please select the Requisition Number');
+				return false;
+			}
+			id = '';
+
+		});
+
+		$(document).ready(function() {
+			$("#EDITSERVICE").on("shown.bs.modal", function(e) {
+
+
+				var AvlBudAmt = '<?php echo $AvlAmount ?>';
+
+				AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>';
+
+				userid = $(e.relatedTarget).data('userid');
+
+				var tr = document.getElementById(userid);
+				var cellval = tr.cells;
+				var id = $('#Reqnumber' + userid).val();
+
+				$('#EditAvlBudAmt').val(AvlBudAmt);
+				$('#EditReqNo').val($('#Reqnumber' + userid).val());
+				$('#EditdeptName').val($('#departmentName' + userid).val());
+				$("#EditCostCenter").val($('#costCode' + userid).val());
+
+
+				$('#EditItemName').val($('#materialName' + userid).val());
+				$('#EditUOM').val($('#uom' + userid).val());
+				$('#EditPer').val($('#per' + userid).val());
+				$('#EditQuantity').val($('#quantity' + userid).val());
+				RequistQuantity = $('#quantity' + userid).val();
+				$('#EditRate').val($('#itemRate' + userid).val());
+				$('#txtEditBasicValue').val(cellval[8].innerHTML);
+				$('#EditCgst').val($('#Cgst' + userid).val());
+				$('#EditSgst').val($('#Sgst' + userid).val());
+				$('#EditIgst').val($('#Igst' + userid).val());
+				$('#EditAfterCgst').val($('#AfterCgst' + userid).val());
+				$('#EditAfterSgst').val($('#AfterSgst' + userid).val());
+				$('#EditAfterIgst').val($('#AfterIgst' + userid).val());
+
+				$('#EditOtheritemDescription').val($('#OtherServiceDescription' + userid).val());
+
+				var res = $('#OtherServiceDescription' + userid).val();
+
+
+
+				if (res == '') {
+					$('#EditotherDescription').hide();
+				} else {
+					$('#EditotherDescription').show();
+				}
+
+
+
+				if ($('#FrequencyValue' + userid).val() == 1) {
+					$('#EditFrequency').val($('#Frequency' + userid).val());
+					$("#EditFrequencyNo").val(1);
+				} else {
+					$('#EditFrequency').val($('#Frequency' + userid).val());
+					$("#EditFrequencyNo").val($('#FrequencyValue' + userid).val());
+				}
+
+				$('#EditTotalOrderValue').val(cellval[10].innerHTML);
+				$('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
+				tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
+				RequistQuantity = $('#quantity' + userid).val();
+
+
+
+				$("#EditMaterialCode").empty();
+				$("#EditMaterialCode").append($('<option></option>')
+					.val($('#materialCode' + userid).val())
+					.html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())
+					.prop('selected', true)
+				);
+				// Make the select element read-only (disable it)
+				$("#EditMaterialCode").prop('disabled', true);
+
+
+
+				// For Binding Material list center for the selected Requistion Number	
+				var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+
+				var isAdded = "0";
+				for (i = 0; i < Material.length; i++) {
+					$.each(Material[i], function(idx, obj) {
+
+						if (obj.ReqNo === id) {
+
+							$.each(SelectedMaterialList.Mat, function(idx1, el) {
+								if (id == el.ReqNo) {
+
+									if (el.materialCode == obj.MaterialCode) {
+
+										isAdded = "1";
+										return false;
+									} else {
+										isAdded = "0";
+									}
+
+								}
+
+
+							});
+
+
+							if (isAdded == "0") {
+
+								$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+							}
+
+						}
+
+
+					});
+				}
+
+			});
+
+
+
+
+
+			$("#VIEWSERVICE").on("shown.bs.modal", function(e) {
+
+				userid = $(e.relatedTarget).data('userid');
+				var AvlBudAmt = '<?php echo $AvlAmount ?>';
+
+				AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>';
+				var tr = document.getElementById(userid);
+				var cellval = tr.cells;
+				var id = $('#Reqnumber' + userid).val();
+				$('#ViewPer').val($('#per' + userid).val());
+				$('#ViewReqNo').val($('#Reqnumber' + userid).val());
+				$('#ViewdeptName').val($('#departmentName' + userid).val());
+				$("#ViewCostCenter").val($('#costCode' + userid).val());
+				$('#ViewAvlBudAmt').val(AvlBudAmt);
+
+				$('#ViewItemName').val($('#materialName' + userid).val());
+				$('#ViewUOM').val($('#uom' + userid).val());
+				$('#ViewQuantity').val($('#quantity' + userid).val());
+				RequistQuantity = $('#quantity' + userid).val();
+				$('#ViewRate').val($('#itemRate' + userid).val());
+				$('#txtViewBasicValue').val(cellval[8].innerHTML);
+				$('#ViewCgst').val($('#Cgst' + userid).val());
+				$('#ViewSgst').val($('#Sgst' + userid).val());
+				$('#ViewIgst').val($('#Igst' + userid).val());
+				$('#ViewAfterCgst').val($('#AfterCgst' + userid).val());
+				$('#ViewAfterSgst').val($('#AfterSgst' + userid).val());
+				$('#ViewAfterIgst').val($('#AfterIgst' + userid).val());
+
+				$('#ViewOtheritemDescription').val($('#OtherServiceDescription' + userid).val());
+
+				var res = $('#OtherServiceDescription' + userid).val();
+
+				if (res == '') {
+					$('#ViewotherDescription').hide();
+				} else {
+					$('#ViewotherDescription').show();
+				}
+
+
+				if ($('#FrequencyValue' + userid).val() == 1) {
+					$('#ViewFrequency').val($('#Frequency' + userid).val());
+					$("#ViewFrequencyNo").val(1);
+				} else {
+					$('#ViewFrequency').val($('#Frequency' + userid).val());
+					$("#ViewFrequencyNo").val($('#FrequencyValue' + userid).val());
+				}
+
+				$('#ViewTotalOrderValue').val(cellval[10].innerHTML);
+				$('#ViewOtherAllowances').val($('#OtherAmt' + userid).val());
+
+				tinyMCE.get('ViewtxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
+				RequistQuantity = $('#quantity' + userid).val();
+
+
+
+				$("#ViewMaterialCode").empty();
+				var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+				// For Binding Material list center for the selected Requistion Number	
+
+				$("#ViewMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+
+				var isAdded = "0";
+				for (i = 0; i < Material.length; i++) {
+					$.each(Material[i], function(idx, obj) {
+
+						if (obj.ReqNo === id) {
+
+							$.each(SelectedMaterialList.Mat, function(idx1, el) {
+								if (id == el.ReqNo) {
+
+									if (el.materialCode == obj.MaterialCode) {
+
+										isAdded = "1";
+										return false;
+									} else {
+										isAdded = "0";
+									}
+
+								}
+
+
+							});
+
+
+							if (isAdded == "0") {
+
+								//$("#ViewMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+							}
+
+						}
+
+
+					});
+				}
+
+			});
+		});
+
+		$("#insuranceStatus").change(function() {
+			var InsNo = '<?php echo $InsuranceNumber; ?>';
+
+			if ($("#insuranceStatus").val() == "1") {
+				$('#insuranceTxtDiv').show();
+				$('#InsuranceNumber').val('Yes');
+			} else {
+				$('#insuranceTxtDiv').hide();
+				$('#InsuranceNumber').val('');
 			}
 		});
 
-	}
+		function splpoupdate() {
+			// alert();
+			var formData = new FormData();
+
+			var file = $("#imag").prop('files')[0];
+			var param1 = $('#hidebillno').val();
+			var param2 = $('#hideoldfile').val();
+
+			// var param3 =$('#ChallanInvNo').val();	
+			// var param4 =$('#Date').val();	
+			// var param5 =$('#VehicleNo').val();
+			// var param6 =$('#CourierNo').val();			
+
+			//var param7 =$('#hideoldfile').val();			
 
 
 
-	function filecheck() {
-		var sizef = document.getElementById('imag').files[0].size;
-		var file = $('#imag').val();
 
-		if (file != '' && sizef < 2100000) { // alert('Your file added successfully');
-		} else {
-			alert('Sorry Your File is Large To 2MB');
-			$('#imag').val('');
+			var filename = $("#imag").val();
+			filename = filename.split('\\');
+
+			formData.append('file', file);
+			formData.append('param1', param1);
+			formData.append('param2', param2);
+			// 		formData.append('param3',param3);
+			// formData.append('param4',param4);
+			// 		formData.append('param5',param5);
+			// formData.append('param6',param6);
+
+			// $('.content').loader('show');
+			$('#loader').show();
+			$.ajax({
+				data: formData,
+				type: "POST",
+				url: "<?php echo base_url() ?>servicepurchaseorder/uploadfile",
+				cache: false,
+				contentType: false,
+				processData: false,
+				success: function(data) {
+					if (data) {
+						alert(data);
+						$('#loader').hide();
+						window.location.reload();
+						//$('#spl').find('td').eq(1).text(filename[2]);
+						$('#EditServiceSplPOModel').modal('hide');
+					}
+
+				}
+			});
+
+		}
+
+		function filecheck() {
+			var sizef = document.getElementById('imag').files[0].size;
+			var file = $('#imag').val();
+
+			if (file != '' && sizef < 2100000) { // alert('Your file added successfully');
+			} else {
+				alert('Sorry Your File is Large To 2MB');
+				$('#imag').val('');
+			}
 		}
-	}
 </script>
 
 <script>
@@ -3742,7 +3746,7 @@ if (!empty($getlogpodtl)) {
 
 		// $('.content').loader('show');
 		$('#loader').show();
-				$.ajax({
+		$.ajax({
 			data: formData,
 			type: "POST",
 			url: "<?php echo base_url() ?>servicepurchaseorder/addfileuplod",
@@ -3762,10 +3766,6 @@ if (!empty($getlogpodtl)) {
 		});
 	}
 
-
-
-
-
 	var counter = 0;
 	var counterConstant = 0;
 
@@ -3790,9 +3790,9 @@ if (!empty($getlogpodtl)) {
 				'<label><br></label>' +
 				'<input type="file" name="browseFiles" id="images' + counter + '" onchange="Copyfilename(this.name); "><br>' +
 				'<button class="btn btn-success btn-sm add add_this" id="addbtn" onclick="addRow()">ADD</button>'
-				'</div>' +
-				'</div>'+
-               
+			'</div>' +
+			'</div>' +
+
 
 			$('#newdiv').append(div);
 
@@ -3810,10 +3810,6 @@ if (!empty($getlogpodtl)) {
 
 	});
 
-	//}
-
-
-
 	function addRow() {
 		//alert();
 
@@ -3853,8 +3849,7 @@ if (!empty($getlogpodtl)) {
 			$("#maint_filename" + number).val(name);
 		}
 	}
-</script>
-<script>
+
 	$('#IsOpenOrder').change(function() {
 		if (this.checked) {
 			$('#ServiceQuantity').val(0);
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 8effcdeb..92943fb1 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -1838,8 +1838,16 @@ if (!empty($INRSYMBOL)) {
 
     function showsubmit() {
         var isChecked = $('#IsOpenOrder').is(':checked');
-        // alert("isChecked: " + isChecked);
+        console.log("Step 1 = SS");
         var PO = $('#POType').val();
+        
+        if (PO == 'SERVICE') {
+            if ($('#emergdescofpo').val().trim() == '') {
+                alert('Please Enter Description Of Service');
+                $('#emergdescofpo').focus();
+                return false;
+            }
+        }
 
         if (isChecked) {
             if (PO == 'REVENUE') {
@@ -6335,6 +6343,7 @@ if (!empty($INRSYMBOL)) {
             });
 
         }
+        $("#PaymentMethod").trigger('change');
     });
 
     $(document).ready(function () {
@@ -6406,6 +6415,18 @@ if (!empty($INRSYMBOL)) {
             }
 
         });
+
+        //If others is the payment terms to display mandatory field
+        $("#PaymentMethod").change(function () {
+
+            if ($('#PaymentMethod').val().trim() == 'PT08') {
+                $('#otheroptiondiv').show();
+            } else {
+                $('#otheroptiondiv').hide();
+                $('#Otherpayment').val('');
+            }
+        });
+
         /*get cost center name using department*/
         var CostArray = '';
         $('#DepartmentName').change(function () {
@@ -8018,17 +8039,6 @@ if (!empty($INRSYMBOL)) {
     }
 
 
-    //If others is the payment terms to display mandatory field
-    $("#PaymentMethod").change(function () {
-
-        if ($('#PaymentMethod').val().trim() == 'PT08') {
-            $('#otheroptiondiv').show();
-        } else {
-            $('#otheroptiondiv').hide();
-            $('#Otherpayment').val('');
-        }
-    });
-
     // set default null value
     function clearTotalItemValues() {
 
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index 3022c0dd..d0624eb6 100755
--- a/app/Views/capitalpurchaseorder.php
+++ b/app/Views/capitalpurchaseorder.php
@@ -123,6 +123,18 @@
         $('#editpackagingcalmodel').on('hidden.bs.modal', function() {
             $('#editpackagingcalmodel').css('z-index', ''); // Reset to default
         });
+
+        //If others is the payment terms to display mandatory field
+        $("#PaymentMethod").change(function() {
+            if ($('#PaymentMethod').val().trim() == 'PT08') {
+                $('#otheroptiondiv').show();
+                $('#Otherpayment').prop('required', true);
+            } else {
+                $('#otheroptiondiv').hide();
+                $('#Otherpayment').prop('required', false);
+                $('#Otherpayment').val('');
+            }
+        });
     });
 </script>
 <?php
@@ -703,7 +715,7 @@ if (!empty($INRSYMBOL)) {
                                     </div>
                                 </div>
                                 <div class="form-group col-md-3">
-                                    <label for="payablefrom">Payable Terms </label>
+                                    <label for="payablefrom">Payable Terms<span class="text-danger">*</span> </label>
                                     <?php
 
                                     $options1 = array("0" => 'Select Payment method');
@@ -722,7 +734,7 @@ if (!empty($INRSYMBOL)) {
                                     ?>
                                 </div>
                                 <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
-                                    <label>Description of Payable Terms</label>
+                                    <label>Description of Payable Terms<span class="text-danger">*</span></label>
                                     <div>
                                         <?php
                                         $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
@@ -2740,6 +2752,11 @@ if (!empty($INRSYMBOL)) {
                             RequistQuantity = obj.Quantity;
                             $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
                             $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/Ton)');
+                             if(obj.material_rate != 0){
+                                Ratechange();
+                                calculateFreight(3);
+                                calculateFreightlocaddper(); 
+                             }
 
 
                         }
@@ -4581,6 +4598,7 @@ if (!empty($INRSYMBOL)) {
                             window.location = "purchaseorderListing";
                             // setTimeout(function() { enableButtons(); }, 2000);
                         } else {
+                            $('#loader').hide();
                             // $('#content').loader('hide');
                             alert("Error");
                             // setTimeout(function() { enableButtons(); }, 2000);
@@ -4588,6 +4606,7 @@ if (!empty($INRSYMBOL)) {
 
                     },
                     error: function(jqXHR, textStatus, errorThrown) {
+                        $('#loader').hide();
 						console.error("AJAX Error: " + textStatus + ": " + errorThrown);
 						alert("Error: " + textStatus);
 						// setTimeout(function() { enableButtons(); }, 2000);
@@ -5398,17 +5417,6 @@ if (!empty($INRSYMBOL)) {
         return TAXval; //  $('#AfterServiceTax').val(TAXval); 
 
     }
-    //If others is the payment terms to display mandatory field
-    $("#PaymentMethod").change(function() {
-        if ($('#PaymentMethod').val().trim() == 'PT08') {
-            $('#otheroptiondiv').show();
-			$('#Otherpayment').prop('required', true);
-        } else {
-            $('#otheroptiondiv').hide();
-			$('#Otherpayment').prop('required', false);
-			$('#Otherpayment').val('');
-        }
-    });
 
     function clearTotalItemValues() {
         $('#txtTotCgst').val('');
diff --git a/app/Views/driverPayslipGeneratePrint.php b/app/Views/driverPayslipGeneratePrint.php
index 9e82bc46..916654aa 100755
--- a/app/Views/driverPayslipGeneratePrint.php
+++ b/app/Views/driverPayslipGeneratePrint.php
@@ -63,6 +63,20 @@
 <td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Loan Balance  </td>
 <td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;" ><?php echo ':&nbsp;Rs&nbsp;'.$PayDetails[0]->BalanceAdvance  ?></td>
 </tr>
+<tr>
+<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"> </td>
+<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo '&nbsp;'  ?></td>
+<td><?= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' ?></td>
+<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Diesel  </td>
+<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;" ><?php echo ':&nbsp;Rs&nbsp;'.$PayDetails[0]->diesel_amount;   ?></td>
+</tr>
+<tr>
+<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"> </td>
+<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo '&nbsp;';  ?></td>
+<td><?= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' ?></td>
+<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Shed Duty Amount  </td>
+<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;" ><?php echo ':&nbsp;Rs&nbsp;'.$PayDetails[0]->shed_amount;  ?></td>
+</tr>
 </tbody>
 </table>
 </td>
@@ -71,39 +85,27 @@
 <table style="border-collapse: collapse;border-top:#fff;"  cellpadding="0" cellspacing="0" border="1" width="100%" >
 <tr><th>Earnings</th><th>Amount <span style="font-family: DejaVu Sans; sans-serif;">&#8377;</span></th><th>Deductions</th><th>Amount <span style="font-family: DejaVu Sans; sans-serif;">&#8377;</span></th></tr>
 <tr>
-<td  width="25%;">&nbsp;Basic</td>
-<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->monthly_salary_amount;   ?>&nbsp;</td>
+<td  width="25%;">&nbsp;BASIC</td>
+<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->BASIC;   ?>&nbsp;</td>
 <td width="25%;">&nbsp;PF</td>
 <td width="30%;" style="text-align: right;" ><?php echo $pf_amount;  ?>&nbsp;</td>
 </tr>
 <tr>
-<td  width="25%;">&nbsp;Diesel</td>
-<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->diesel_amount;  ?>&nbsp;</td>
+<td  width="25%;">&nbsp;HRA</td>
+<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->HRA;  ?>&nbsp;</td>
 <td>&nbsp;ESI</td>
 <td style="text-align: right;"> <?php echo $esi_amount ?>&nbsp;</td>
 </tr>
 <tr>
-<td  width="25%;">&nbsp;Shed Duty Amount</td>
-<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->shed_amount;  ?>&nbsp;</td>
+<td width="25%;">&nbsp;Bonus</td>
+<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->Festival_Bonus;  ?>&nbsp;</td>
 <td>&nbsp;Salary Advance</td>
 <td style="text-align: right;"> <?php echo $PayDetails[0]->Advance  ?>&nbsp;</td>
 </tr>
-
-
-<tr>
-<td  width="25%;">&nbsp;Bonus</td>
-<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->Festival_Bonus;  ?>&nbsp;</td>
-
-<td width="25%;">&nbsp;</td>
-<td width="30%;" style="text-align: right;" >&nbsp;</td>
-</tr>
-
-
-
 <tr><th nowrap>&nbsp;Total Earning (Rounded)</th>
 <td style="text-align: right;"> 
 	<?php 
-	$totEarning = $PayDetails[0]->monthly_salary_amount + $PayDetails[0]->Festival_Bonus + $PayDetails[0]->diesel_amount +  $PayDetails[0]->shed_amount;
+	$totEarning = $PayDetails[0]->BASIC + $PayDetails[0]->Festival_Bonus + $PayDetails[0]->HRA ;
 		echo number_format(round($totEarning),2)
 	?>
 &nbsp;</td>
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index 9991086e..27ab239f 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -3935,6 +3935,7 @@ if (!empty($getlogpodtl)) {
       $("#CPUOM").val('');
       $("#CPQuantity").val('');
       $("#CPTotalAmount").val('');
+      $("#CPRate").val('');
       RequistQuantity = '';
       clearTaxField();
       if (id != '0') {
@@ -3946,12 +3947,16 @@ if (!empty($getlogpodtl)) {
               $("#CapitalItemName").val(obj.MaterialName);
               $("#CPUOM").val(obj.UOM);
               $("#CPQuantity").val(obj.Quantity);
+              $("#CPRate").val(obj.material_rate);
               RequistQuantity = obj.Quantity;
 
               var CPUOMDisplay = obj.UOM;
 
               $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
               $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
+              if(obj.material_rate != 0){
+                Ratechange();calculateFreight(3);calculateFreightlocaddper();
+              }
 
 
 
@@ -4779,12 +4784,12 @@ if (!empty($getlogpodtl)) {
       //   ReceivedQuantity: 0,
       //   PendingQuantity: quantity
       // }));
-      PONOStatus = <?php echo $PONOStatus; ?> 
+      var PONOStatus = "<?php echo $PONOStatus; ?>";
       var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;  
       var rowHtml = `
             <tr id="${temp}">
                 <td align="left">${temp}</td>
-                <td align="left">${Reqnumber}</td>
+                <td align="center">${Reqnumber}</td>
                 <td align="left">${materialCode}</td>
                 <td align="left">${shorten}</td>`;
                 	if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 2bcfd617..c68ab4c3 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -541,6 +541,10 @@ if (!empty($getlogpodtl)) {
 							$("#ItemName").val(obj.MaterialName);
 							$("#UOM").val(obj.UOM);
 							$("#Quantity").val(obj.Quantity);
+							$("#Rate").val(obj.material_rate);
+							if(obj.material_rate != 0){
+								change();
+							}
 							RequistQuantity = obj.Quantity;
 						}
 					});
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index 4856b6e6..9e71c093 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -1,5 +1,5 @@
 <style>
-	.edit-container {
+    .edit-container {
         display: inline-flex;
         align-items: center;
         gap: 10px;
@@ -20,7 +20,8 @@
         box-shadow: 0 0 5px rgba(0, 123, 255, 0.5);
     }
 
-    .save-btn, .cancel-btn {
+    .save-btn,
+    .cancel-btn {
         border: none;
         background: none;
         cursor: pointer;
@@ -53,47 +54,49 @@
     }
 </style>
 <script>
-	$(document).ready(function () {
-		$(document).on('click', '.editable-field', function (e) {
-			e.preventDefault();
-			const $link = $(this);
-			const value = $link.text().trim();
+    $(document).ready(function() {
+        $(document).on('click', '.editable-field', function(e) {
+            e.preventDefault();
+            const $link = $(this);
+            const value = $link.text().trim();
 
-			// Hide the <a> tag and show the edit container
-			$link.hide();
-			const $editContainer = $link.siblings('.edit-container');
-			$editContainer.find('.edit-input-field').val(value);
-			$editContainer.show();
-		});
+            // Hide the <a> tag and show the edit container
+            $link.hide();
+            const $editContainer = $link.siblings('.edit-container');
+            $editContainer.find('.edit-input-field').val(value);
+            $editContainer.show();
+        });
 
-		// Handle click on the tick (save) button
-		$(document).on('click', '.save-btn', function (e) {
-			e.preventDefault();
-			const $btn = $(this);
-			const $editContainer = $btn.closest('.edit-container');
-			const $input = $editContainer.find('.edit-input-field');
+        // Handle click on the tick (save) button
+        $(document).on('click', '.save-btn', function(e) {
+            e.preventDefault();
+            const $btn = $(this);
+            const $editContainer = $btn.closest('.edit-container');
+            const $input = $editContainer.find('.edit-input-field');
 
-			const value = $input.val().trim();
-			const $link = $editContainer.siblings('.editable-field');
-			const LineItemNoteForAuditor = $link.data('notes');
-			const id = $link.data('id');
-			var theForm = $(".CreatePO");
-			$("#LineItemNoteForAuditor" + id).val(value); // to update the hidden fields
-			$link.text(value).show(); // to update table cell 
-			$editContainer.hide();
-		});
+            const value = $input.val().trim();
+            const $link = $editContainer.siblings('.editable-field');
+            const LineItemNoteForAuditor = $link.data('notes');
+            const id = $link.data('id');
+            var theForm = $(".CreatePO");
+            $("#LineItemNoteForAuditor" + id).val(value); // to update the hidden fields
+            $link.text(value).show(); // to update table cell 
+            $editContainer.hide();
+        });
 
-		// Handle click on the close (cancel) button
-		$(document).on('click', '.cancel-btn', function (e) {
-			e.preventDefault();
-			const $btn = $(this);
-			const $editContainer = $btn.closest('.edit-container');
-			const $link = $editContainer.siblings('.editable-field');
+        // Handle click on the close (cancel) button
+        $(document).on('click', '.cancel-btn', function(e) {
+            e.preventDefault();
+            const $btn = $(this);
+            const $editContainer = $btn.closest('.edit-container');
+            const $link = $editContainer.siblings('.editable-field');
 
-			// Hide the edit container and show the <a> tag
-			$editContainer.hide();
-			$link.show();
-		});});</script>
+            // Hide the edit container and show the <a> tag
+            $editContainer.hide();
+            $link.show();
+        });
+    });
+</script>
 <?php
 $AvlAmount = 0;
 $ReqType = '';
@@ -456,9 +459,10 @@ if (!empty($getlogpodtl)) {
     <div class="content">
         <!-- Start Content-->
         <div class="container-fluid">
-            <!-- start page title -->
+            <!-- start first row -->
             <div class="row">
                 <div class="col-12">
+                    <!-- start page title -->
                     <div class="page-title-box page-title-box-alt">
                         <?php if ($parentPO == '') { ?>
                             <h4><?= "Edit Import Purchase Order    - $PONO "; ?></h4>
@@ -466,26 +470,20 @@ if (!empty($getlogpodtl)) {
                             <h4><?= "Amended Import Purchase Order - $PONO "; ?></h4>
                         <?php } ?>
                         <a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back" value="Back">Back</a>
-                    </div>
-                </div>
-            </div>
-            <!-- end page title -->
-            <!-- Form row -->
+                    </div><!-- end page title -->
+                </div><!-- end col-->
+            </div><!-- end first row -->
+            
+            <!-- second row -->
             <div class="row">
                 <div class="col-12">
                     <div class="card">
                         <div class="card-body p-4">
-
-
                             <?php
                             $attributes = array('class' => 'form-label-left ImportPO ', 'name'  => 'ImportPO', 'id'  => 'ImportPO', 'enctype' => 'multipart/form-data');
-
                             echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
 
 
-
-
-
                             <div class="form-row">
                                 <div class="form-group col-md-3">
                                     <label>Requistion No</label>
@@ -550,7 +548,6 @@ if (!empty($getlogpodtl)) {
                                 </div>
                             </div>
 
-
                             <div class="form-row">
                                 <div class="form-group col-md-3">
                                     <label>Currency Type<span class="text-danger">*</span></label>
@@ -615,7 +612,6 @@ if (!empty($getlogpodtl)) {
                                 </div>
                             </div>
 
-
                             <div class="form-row">
                                 <div class="form-group col-md-3">
                                     Check Today's Foreign Exchange value <a href="http://www.xe.com/" target="_blank"><u>(Click here)</u></a>
@@ -809,6 +805,7 @@ if (!empty($getlogpodtl)) {
                                 <div class="form-group col-md-3">
                                 </div>
                             </div>
+
                             <div class="form-row" align="right">
                                 <div class="col-md-4">
 
@@ -825,10 +822,10 @@ if (!empty($getlogpodtl)) {
                             </div>
                             <br><br><br><br>
                             <div class="box-body" style="margin-top: -3%;">
-                            <div class="form-row">
-								<div class="table-responsive" style="padding-bottom: 30px;">
-									<table id="ImportTax" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;">
-                                
+                                <div class="form-row">
+                                    <div class="table-responsive" style="padding-bottom: 30px;">
+                                        <table id="ImportTax" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;">
+
                                             <thead>
                                                 <tr>
                                                     <th style="white-space: nowrap !important; text-align:left !important">SNo</th>
@@ -841,10 +838,10 @@ if (!empty($getlogpodtl)) {
                                                     <th style="white-space: nowrap !important; text-align:right !important">Rate<?php echo "($INR)" ?></th>
                                                     <th style="white-space: nowrap !important; text-align:right !important">Basic Amount<?php echo "($INR)" ?></th>
                                                     <!-- <th>Received Qty</th>
-                                                        <th>Rejected Qty</th>
-                                                        <th>Pending Qty</th> -->
-                                                    <!-- <th>Tax Amount</th>
-                                                        <th>Total Order Amount</th> -->
+                                                         <th>Rejected Qty</th>
+                                                         <th>Pending Qty</th> 
+                                                         <th>Tax Amount</th>
+                                                         <th>Total Order Amount</th> -->
                                                     <th>Action</th>
                                                 </tr>
                                             </thead>
@@ -863,40 +860,37 @@ if (!empty($getlogpodtl)) {
                                                             <td align="center"><?php echo $record->ReqNo ?></td>
                                                             <td align="left"><?php echo $record->MaterialCode ?></td>
                                                             <td align="left"><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
-                                                                                                    echo $shortName; ?></td>
+                                                                                echo $shortName; ?></td>
                                                             <td align="left">
-                                                                        <?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
-                                                                        <a href="#" 
-                                                                        class="editable-field" 
-                                                                        data-id ="<?php echo $index ?>" data-notes="<?php echo $record->LineitemAuditorNotes; ?>">
+                                                                <?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
+                                                                    <a href="#"
+                                                                        class="editable-field"
+                                                                        data-id="<?php echo $index ?>" data-notes="<?php echo $record->LineitemAuditorNotes; ?>">
                                                                         <?php echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; ?>
-                                                                        </a>
-                                                                        <div class="edit-container" style="display:none;">
-                                                                            <input type="text" class="edit-input-field" />
-                                                                            <button class="save-btn">✔</button>
-                                                                            <button class="cancel-btn">✖</button>
-                                                                        </div>
-                                                                        <?php }else{ echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?>
-                                                                    </td>
+                                                                    </a>
+                                                                    <div class="edit-container" style="display:none;">
+                                                                        <input type="text" class="edit-input-field" />
+                                                                        <button class="save-btn">✔</button>
+                                                                        <button class="cancel-btn">✖</button>
+                                                                    </div>
+                                                                <?php } else {
+                                                                    echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-";
+                                                                } ?>
+                                                            </td>
                                                             <td align="right"><?php echo $record->Quantity ?></td>
                                                             <td align="left"><?php echo $record->UOM ?></td>
                                                             <td align="right"><?php echo $record->Rate ?></td>
                                                             <td align="right"><?php echo $record->BasicValue ?></td>
-                                                            <!-- <td><?php echo $record->ReceivedQuantity ?></td> -->
-                                                            <!-- <td><?php echo $record->QuantityRejected ?></td> -->
-                                                            <!-- <td><?php echo $record->PendingQty ?></td>  -->
-                                                            <!-- <td><?php echo $record->Taxamount ?></td>
-                        
-                        
-                                                                <td><?php echo $record->TotalOrderValue ?></td> -->
+                                                            <!-- <td><?php echo $record->ReceivedQuantity ?></td> 
+                                                                 <td><?php echo $record->QuantityRejected ?></td> 
+                                                                 <td><?php echo $record->PendingQty ?></td>  
+                                                                 <td><?php echo $record->Taxamount ?></td>
+                                                                 <td><?php echo $record->TotalOrderValue ?></td> -->
 
                                                             <input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
                                                             <input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
 
-                                                            <!--<input type="hidden" name="<?php //echo 'AvlBudAmt'.$index 
-                                                                                            ?>" id="<?php //echo 'AvlBudAmt'.$index 
-                                                                                                    ?>" value="<?php //echo $record->AvlBudAmt ; 
-                                                                                                                ?>" />   -->
+                                                            <!--<input type="hidden" name="<?php //echo 'AvlBudAmt'.$index ?>" id="<?php //echo 'AvlBudAmt'.$index ?>" value="<?php //echo $record->AvlBudAmt ; ?>" />   -->
                                                             <input type="hidden" name="<?php echo 'AvlBudAmt' . $index ?>" id="<?php echo 'AvlBudAmt' . $index ?>" value="<?php echo "$AvlAmount"; ?>" />
 
                                                             <input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
@@ -936,8 +930,8 @@ if (!empty($getlogpodtl)) {
                                                             <input type="hidden" name="<?php echo 'CustomSHCess' . $index ?>" id="<?php echo 'CustomSHCess' . $index ?>" value="<?php echo $record->CustomSHCess; ?>" />
                                                             <input type="hidden" name="<?php echo 'AfterCustomSHCess' . $index ?>" id="<?php echo 'AfterCustomSHCess' . $index ?>" value="<?php echo $record->AfterCustomSHCess; ?>" />
 
-                                                            <!-- <input type="hidden" name="<?php echo 'Grossdutypayable' . $index ?>" id="<?php echo 'Grossdutypayable' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" /> -->
-                                                            <!-- <input type="hidden" name="<?php echo 'QuantityKG' . $index ?>" id="<?php echo 'QuantityKG' . $index ?>" value="<?php echo $record->QuantityKG; ?>" />-->
+                                                            <!-- <input type="hidden" name="<?php // echo 'Grossdutypayable' . $index ?>" id="<?php // echo 'Grossdutypayable' . $index ?>" value="<?php // echo $record->Grossdutypayable; ?>" /> -->
+                                                            <!-- <input type="hidden" name="<?php // echo 'QuantityKG' . $index ?>" id="<?php // echo 'QuantityKG' . $index ?>" value="<?php // echo $record->QuantityKG; ?>" />-->
 
 
                                                             <input type="hidden" name="<?php echo 'BasicPriceInMTon' . $index ?>" id="<?php echo 'BasicPriceInMTonG' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
@@ -947,7 +941,7 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                            <!-- <input type="hidden" name="<?php echo 'Grossdutypayable' . $index ?>" id="<?php echo 'Grossdutypayable' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" />-->
+                                                            <!-- <input type="hidden" name="<?php // echo 'Grossdutypayable' . $index ?>" id="<?php // echo 'Grossdutypayable' . $index ?>" value="<?php // echo $record->Grossdutypayable; ?>" />-->
 
                                                             <input type="hidden" name="<?php echo 'BasicINRValue' . $index ?>" id="<?php echo 'BasicINRValue' . $index ?>" value="<?php echo $record->BasicINRValue; ?>" />
 
@@ -955,10 +949,10 @@ if (!empty($getlogpodtl)) {
                                                             <input type="hidden" name="<?php echo 'ExchangeRate' . $index ?>" id="<?php echo 'ExchangeRate' . $index ?>" value="<?php echo $record->ExchangeRate; ?>" />
 
 
-                                                            <!-- <input type="hidden" name="<?php echo 'AfterCustomEDcess' . $index ?>" id="<?php echo 'AfterCustomEDcess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" /> -->
+                                                            <!-- <input type="hidden" name="<?php // echo 'AfterCustomEDcess' . $index ?>" id="<?php // echo 'AfterCustomEDcess' . $index ?>" value="<?php // echo $record->AfterCustomEdCess; ?>" /> -->
 
 
-                                                            <!-- <input type="hidden" name="<?php echo 'CustomEDcess' . $index ?>" id="<?php echo 'CustomEDcess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" /> -->
+                                                            <!-- <input type="hidden" name="<?php // echo 'CustomEDcess' . $index ?>" id="<?php // echo 'CustomEDcess' . $index ?>" value="<?php // echo $record->CustomEdCess; ?>" /> -->
 
 
                                                             <input type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
@@ -973,7 +967,7 @@ if (!empty($getlogpodtl)) {
 
                                                             <input type="hidden" name="<?php echo 'Addinstruction' . $index ?>" id="<?php echo 'Addinstruction' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
 
-                                                            <!-- <input type="hidden" name="<?php echo 'AfterFreightValue' . $index ?>" id="<?php echo 'AfterFreightValue' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" /> -->
+                                                            <!-- <input type="hidden" name="<?php // echo 'AfterFreightValue' . $index ?>" id="<?php // echo 'AfterFreightValue' . $index ?>" value="<?php // echo $record->AfterFreightValue; ?>" /> -->
 
 
                                                             <input type="hidden" name="<?php echo 'AssessableValue' . $index ?>" id="<?php echo 'AssessableValue' . $index ?>" value="<?php echo $record->AssessableValue; ?>" />
@@ -992,7 +986,7 @@ if (!empty($getlogpodtl)) {
                                                             <input type="hidden" name="<?php echo 'NetValue' . $index ?>" id="<?php echo 'NetValue' . $index ?>" value="<?php echo $record->NetValue; ?>" />
 
                                                             <input type="hidden" name="<?php echo 'AfterCustomEdCess1' . $index ?>" id="<?php echo 'AfterCustomEdCess1' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
-                                                            <input type="hidden" name="<?php echo 'LineItemNoteForAuditor' . $index ?>" id="<?php echo 'LineItemNoteForAuditor' . $index ?>"  value="<?php echo $record->LineitemAuditorNotes; ?>" />
+                                                            <input type="hidden" name="<?php echo 'LineItemNoteForAuditor' . $index ?>" id="<?php echo 'LineItemNoteForAuditor' . $index ?>" value="<?php echo $record->LineitemAuditorNotes; ?>" />
 
 
                                                             <?php
@@ -1078,15 +1072,11 @@ if (!empty($getlogpodtl)) {
 
 
                                             </tbody>
-                                    </table>
-                                            </div>
-                                            </div>
-                            </div>
-                            </div>
+                                        </table>
+                                    </div>
+                                </div>
 
-                            <br><br>
-
-                        
+                                <br><br>
 
                                 <div class="form-row">
 
@@ -1196,8 +1186,8 @@ if (!empty($getlogpodtl)) {
 
                                 <input type="hidden" name="txttot" id="txttot" value=<?php echo $totalhidden ?>>
 
-                                <!--##################################################################   -->
-                                <?php if (!empty($update)){ ?>
+                                <!-- ##################################################################   -->
+                                <?php if (!empty($update)) { ?>
                                     <div class="form-row" id="editpodiv">
                                         <div class="form-group col-md-12"><label>Editable POScreen</label>
                                             <table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
@@ -1269,44 +1259,41 @@ if (!empty($getlogpodtl)) {
                                             </table>
                                         </div>
                                     </div>
-
                                 <?php } ?>
-                                           
+
 
                                 <div class="form-row ">
-                                        <div class="form-group col-md-12">
-                                            <label>Special Instructions </label> 
-                                            <?php
-                                                $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-                                                echo form_textarea($data);
-                                            ?>
-                                        </div>
+                                    <div class="form-group col-md-12">
+                                        <label>Special Instructions </label>
+                                        <?php
+                                        $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+                                        echo form_textarea($data);
+                                        ?>
                                     </div>
-
                                 </div>
-                            
 
+                            </div> <!-- ends box-body -->
 
                             <div class="form-row px-4">
-                                      <label>Select Purchase Order File</label>
-                                            <div class="form-group col-md-12" align="left">  
-                                            
-                                            <input type="file" class="" name="POFile" id="POFile">
-                                                                                                    
-                                            </div>
-                                        
+                                <label>Select Purchase Order File</label>
+                                <div class="form-group col-md-12" align="left">
+
+                                    <input type="file" class="" name="POFile" id="POFile">
+
+                                </div>
+
                             </div>
 
                             <div class="form-row px-4">
                                 <div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
-                                    <div> 
+                                    <div>
                                         <?php if ($PrePOFile) { ?>
                                             <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previously Uploaded Purchase Order File- </span><small><?= $PrePOFile; ?></small></a></label>
                                             &nbsp;&nbsp;&nbsp;&nbsp;
                                             <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
                                         <?php } ?>
                                         <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" />
-                            
+
                                     </div>
                                 </div>
                             </div>
@@ -1315,71 +1302,71 @@ if (!empty($getlogpodtl)) {
 
                                 <div class="form-group col-md-12">
 
-                                        <div align="right">
-                                        
-                                            <input type="hidden" name="txtPoRange" id="txtPoRange" />
-                                            <input type="hidden" name="isEdit" id="isEdit" value="0" />
-                                            <input type="hidden" name="txtStatus" id="txtStatus" />
-                                            <!-- <input type="hidden" name="txtRowCount" id="txtRowCount" /> -->
-                                            <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-                                            <input type="hidden" name="txtRow" id="txtRow" value="<?php echo $index; ?>" />
-                                            <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+                                    <div align="right">
 
-                                            <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
+                                        <input type="hidden" name="txtPoRange" id="txtPoRange" />
+                                        <input type="hidden" name="isEdit" id="isEdit" value="0" />
+                                        <input type="hidden" name="txtStatus" id="txtStatus" />
+                                        <!-- <input type="hidden" name="txtRowCount" id="txtRowCount" /> -->
+                                        <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+                                        <input type="hidden" name="txtRow" id="txtRow" value="<?php echo $index; ?>" />
+                                        <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 
-                                            <a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
-                                            <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) {
-                                                if ($PONOStatus == PO_DRAFT) { ?>
-                                                    <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                                <?php } ?>
-                                                <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                <a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-                                                <!--  <input type="reset" class="btn btn-success" value="Reset"> -->
-                                            <?php } else { ?>
+                                        <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
 
-
-                                                <?php if ($DEPCode == FINANCE) { ?>
-                                                    <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
-
-                                                <?php } else { ?>
-                                                    <!-- <input type="reset" class="btn btn-success" value = "OK"> -->
-                                                    <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                    <a class="btn 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-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
-                                                <?php } ?>
+                                        <a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
+                                        <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) {
+                                            if ($PONOStatus == PO_DRAFT) { ?>
+                                                <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
                                             <?php } ?>
+                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                            <a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                            <!--  <input type="reset" class="btn btn-success" value="Reset"> -->
+                                        <?php } else { ?>
 
 
-                                        </div>
+                                            <?php if ($DEPCode == FINANCE) { ?>
+                                                <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
+
+                                            <?php } else { ?>
+                                                <!-- <input type="reset" class="btn btn-success" value = "OK"> -->
+                                                <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                <a class="btn 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-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
+                                            <?php } ?>
+                                        <?php } ?>
+
+
+                                    </div>
 
                                 </div>
 
                             </div>
 
                             <div class="form-row px-4 ">
-                                <div class="form-group col-md-12" align="left" >
-                                   
-                                        <label>Request On :</label><?php echo $Reqon; ?><br />
-                                        <label>Request By :</label><?php echo $RequesterName; ?><br />
-                                        <label>Status : </label><?php
-                                                                $statusMappings = [
-                                                                    'PO APPROVED' => 'AWAITING APPROVE',
-                                                                    'AWAITING RELEASE' => 'AWAITING APPROVE',
-                                                                    'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-                                                                    'PO RELEASED' => 'PO APPROVED',
-                                                                ];
+                                <div class="form-group col-md-12" align="left">
 
-                                                                if (isset($StatusName) && !empty($StatusName)) {
-                                                                    if (isset($statusMappings[$StatusName])) {
-                                                                        echo $statusMappings[$StatusName];
-                                                                    } else {
-                                                                        echo $StatusName;
-                                                                    }
+                                    <label>Request On :</label><?php echo $Reqon; ?><br />
+                                    <label>Request By :</label><?php echo $RequesterName; ?><br />
+                                    <label>Status : </label><?php
+                                                            $statusMappings = [
+                                                                'PO APPROVED' => 'AWAITING APPROVE',
+                                                                'AWAITING RELEASE' => 'AWAITING APPROVE',
+                                                                'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+                                                                'PO RELEASED' => 'PO APPROVED',
+                                                            ];
+
+                                                            if (isset($StatusName) && !empty($StatusName)) {
+                                                                if (isset($statusMappings[$StatusName])) {
+                                                                    echo $statusMappings[$StatusName];
                                                                 } else {
-                                                                    echo "Status not provided";
+                                                                    echo $StatusName;
                                                                 }
-                                                                ?>
-                                   
+                                                            } else {
+                                                                echo "Status not provided";
+                                                            }
+                                                            ?>
+
                                     <br />
                                 </div>
                             </div>
@@ -1388,19 +1375,19 @@ if (!empty($getlogpodtl)) {
 
 
 
-                    </div> <!-- end card body-->
-                </div> <!-- end card -->
-            </div><!-- end col-->
-        </div>
-    </div> <!-- container -->
-</div> <!-- content -->
-</div>
+                        </div> <!-- end card body-->
+                    </div> <!-- end card -->
+                </div><!-- end col-->
+            </div><!-- end second row -->
+        </div> <!-- end container fluid -->
+    </div> <!-- end Content -->
+</div> <!-- end content-page -->
 
 <div align="center">
     <div id="importpomodel" class="modal fade" tabindex="-1" role="dialog"
         aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-        <div class="modal-dialog modal-full-width "  >
-            <div class="modal-content" style="width:1060px;"    >
+        <div class="modal-dialog modal-full-width ">
+            <div class="modal-content" style="width:1060px;">
                 <div class="modal-header">
                     <h4 class="modal-title">Add Import Purchase Order Item</h4>
                     <button type="button" class="close" data-dismiss="modal"
@@ -1408,7 +1395,7 @@ if (!empty($getlogpodtl)) {
                 </div>
                 <form class="form-control">
 
-                
+
                     <div class="modal-body p-4" align="left">
 
 
@@ -1545,7 +1532,8 @@ if (!empty($getlogpodtl)) {
                             </div>
 
                             <div class="form-group col-md-3">
-                                <!-- <P id=labelRate> --> <label id=labelRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
+                                <!-- <P id=labelRate> --> 
+                                <label id=labelRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
                                 <div>
                                     <?php
                                     $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),validateExceedLimit(),calculateFreight(0)');
@@ -2006,8 +1994,8 @@ if (!empty($getlogpodtl)) {
 <div align="center">
     <div id="editimportpomodel" class="modal fade" tabindex="-1" role="dialog"
         aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-        <div class="modal-dialog modal-full-width "  >
-            <div class="modal-content" style="width:1060px;"    >
+        <div class="modal-dialog modal-full-width ">
+            <div class="modal-content" style="width:1060px;">
                 <div class="modal-header">
                     <h4 class="modal-title">Edit Import Purchase Order Item</h4>
                     <button type="button" class="close" data-dismiss="modal"
@@ -2209,7 +2197,7 @@ if (!empty($getlogpodtl)) {
                         <br>
 
                         <div class="form-row" style="border:1px solid black;">
-                            <br/>
+                            <br />
                             <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
@@ -2351,7 +2339,7 @@ if (!empty($getlogpodtl)) {
                                 </div>
                             </div>
                             <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
-                                
+
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
                                         <!-- Additional Excise duty : (g) -->
@@ -2643,7 +2631,7 @@ if (!empty($getlogpodtl)) {
                                 echo form_input($data); ?>
                             </div>
                         </div>
-                   
+
                     </div>
 
                     <div class="form-row" style="margin-bottom: 10px;">
@@ -2677,324 +2665,324 @@ if (!empty($getlogpodtl)) {
                     <div class="form-row" style="margin-bottom: 10px;">
                         <div class="form-group col-md-3"></div>
 
-                            <div class="form-group col-md-3">
-                                <!-- Basic Price in US $ per Ton : -->
-                                <label id=labelEditBasicPriceUs>
-                                    <?php echo "Basic Price in $Currencycode ($Value)" ?>
-                                </label>
-                                <div>
-                                    <?php
-                                    $data = array('name' => 'ViewimBasicPrice', 'value' => set_value('ViewimBasicPrice'), 'id' => 'ViewimBasicPrice',  'class' => 'form-control num', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
+                        <div class="form-group col-md-3">
+                            <!-- Basic Price in US $ per Ton : -->
+                            <label id=labelEditBasicPriceUs>
+                                <?php echo "Basic Price in $Currencycode ($Value)" ?>
+                            </label>
+                            <div>
+                                <?php
+                                $data = array('name' => 'ViewimBasicPrice', 'value' => set_value('ViewimBasicPrice'), 'id' => 'ViewimBasicPrice',  'class' => 'form-control num', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                        </div>
+                        <div class="form-group col-md-3">
+                            <!--  Exchange Rate : -->
+                            <label id=labelviewexc><?php echo "Exchange Rate ($Currencycode ($Value))" ?></label>
+                            <div>
+                                <?php $data = array('name' => 'ViewExchangeRt', 'value' => set_value('ViewExchangeRt', $ExchangeRate), 'id' => 'ViewExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                echo form_input($data); ?>
+                            </div>
+                        </div>
+                        <div class="form-group col-md-3">
+                            <!--  Basic value in INR : -->
+                            <label id=labelEditBasicINR><?php echo "Basic value in ($INR) :"; ?></label>
+                            <div>
+                                <?php
+                                $data = array('name' => 'ViewINRBasicvalue', 'value' => set_value('ViewINRBasicvalue'), 'id' => 'ViewINRBasicvalue',  'class' => 'form-control num', 'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                        </div>
+                        <!--<div class="form-group col-md-3">
+                                <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
+                                </div>-->
+                    </div>
+
+                    <br>
+
+                    <div class="form-row p-2" style="border: 1px solid;padding:0px;margin: 10px 0px;">
+                        <br>
+
+                        <div class="form-group col-md-6" style="padding:15px;">
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <label> Basic Price (<?php echo $INR ?>)</label>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'ViewAfterBasicPriceTax', 'value' => set_value('ViewAfterBasicPriceTax'), 'id' => 'ViewAfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
                                 </div>
                             </div>
-                            <div class="form-group col-md-3">
-                                <!--  Exchange Rate : -->
-                                <label id=labelviewexc><?php echo "Exchange Rate ($Currencycode ($Value))" ?></label>
-                                <div>
-                                    <?php $data = array('name' => 'ViewExchangeRt', 'value' => set_value('ViewExchangeRt', $ExchangeRate), 'id' => 'ViewExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <!--  Landing charge -->
+                                    <label><?php echo "Landing Charge ($INR)"; ?></label>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php $data = array('name' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php $data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'readonly' => true, 'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <!-- High seas sales charge -->
+                                    <label><?php echo "Assessable Value (A) ($INR)"; ?></label>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div style="display: none">
+                                        <?php
+                                        $data = array('name' => 'ViewHighseas ', 'value' => set_value('ViewHighseas'), 'id' => 'ViewHighseas',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'ViewAfterAssessable', 'value' => set_value('ViewAfterAssessable'), 'id' => 'ViewAfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <!-- Custom duty : (a) -->
+                                    <label><?php echo "Custom duty (B) ($INR)"; ?></label>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'ViewAfterCustomduty', 'value' => set_value('ViewAfterCustomduty'), 'id' => 'ViewAfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <!--  Custom ED_cess : (e) -->
+                                    <label><?php echo "Custom ED_cess (C) ($INR)"; ?></label>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php $data = array('name' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php $data = array('name' => 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <!--  Custom S & H cess : (f) -->
+                                    <label><?php echo "Custom S & H cess (D) ($INR)"; ?></label>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php $data = array('name' => 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md-6" style="padding:15px;">
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <!-- Additional Excise duty : (g) -->
+                                    <label><?php echo "Subtotal (E) ($INR)  (A+B+C+D)"; ?></label>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div style="display: none;">
+                                        <?php $data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php $data = array('name' => 'ViewSubtotal', 'value' => set_value('ViewSubtotal'), 'id' => 'ViewSubtotal',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <!-- Additional Excise duty : (g) -->
+                                    <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php $data = array('name' => 'ViewIgst ', 'value' => set_value('ViewIgst', 0), 'id' => 'ViewIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'EditCalculateIgst()');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php $data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst', 0), 'id' => 'ViewAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-8">
+                                    <!-- Gross duty payable -->
+                                    <label><?php echo "Total Duty ($INR)   (B+C+D+F)"; ?></label>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div>
+                                        <?php $data = array('name' => 'ViewGrossdutypayable ', 'value' => set_value('ViewGrossdutypayable'), 'id' => 'ViewGrossdutypayable',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <br>
+                            <!--Start of Adding of Frieght model-->
+                            <div class="form-row" style="padding:0px;">
+                                <div class="form-group col-md-4">
+                                    <span>Freight Type </span>
+                                    <?php
+                                    $options = array("0" => 'Select Freight Type');
+                                    //print_r(  $options);
+                                    if (!empty($FreightType)) {
+                                        foreach ($FreightType as $SID) :
+                                            $options[$SID->ConfigValue] =  $SID->ConfigValue;
+                                        endforeach;
+                                    }
+                                    echo form_dropdown('drpviewFreight', $options, set_value('drpviewFreight'), 'id="drpviewFreight" class="form-control " disabled'); ?>
+                                </div>
+                                <div class="form-group col-md-4" id="ViewTripsValue" style="display:block;">
+                                    <span>NO Of Trips</span>
+                                    <?php $data = array('name' => 'viewNOOfTrips', 'value' => set_value('viewNOOfTrips'), 'id' => 'viewNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(2);', 'disabled' => 'disabled');
+                                    echo form_input($data); ?>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <span>Freight Rate </span>
+                                    <?php $data = array('name' => 'viewtxtFreight', 'value' => set_value('viewtxtFreight'), 'id' => 'viewtxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);', 'readonly' => 'true');
+                                    echo form_input($data); ?>
+                                </div>
+                                <div class="form-group col-md-4" style="padding-left: 0px;">
+                                    <span>Freight Amt In <?php echo $INR; ?></span>
+                                    <?php $data = array('name' => 'viewtxtAfterFreight', 'value' => set_value('viewtxtAfterFreight'), 'id' => 'viewtxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
                                     echo form_input($data); ?>
                                 </div>
                             </div>
-                            <div class="form-group col-md-3">
-                                <!--  Basic value in INR : -->
-                                <label id=labelEditBasicINR><?php echo "Basic value in ($INR) :"; ?></label>
-                                <div>
-                                    <?php
-                                    $data = array('name' => 'ViewINRBasicvalue', 'value' => set_value('ViewINRBasicvalue'), 'id' => 'ViewINRBasicvalue',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                            <!--<div class="form-group col-md-3">
-                                <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
-                                </div>-->
-                        </div>
 
-                        <br>
-
-                        <div class="form-row p-2" style="border: 1px solid;padding:0px;margin: 10px 0px;">
                             <br>
 
-                            <div class="form-group col-md-6" style="padding:15px;">
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                      <label>  Basic Price (<?php echo $INR ?>)</label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php
-                                            $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php
-                                            $data = array('name' => 'ViewAfterBasicPriceTax', 'value' => set_value('ViewAfterBasicPriceTax'), 'id' => 'ViewAfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
+                            <center> <label>Cost of the product Per KG</label></center>
+                            <hr />
+
+                            <!--End of Adding of freight in edit model -->
+                            <div class="form-row">
+
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-6">
+                                    <label>Duty Impact</label>
+                                    <div>
+                                        <?php $data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                        echo form_input($data); ?>
                                     </div>
                                 </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        <!--  Landing charge -->
-                                        <label><?php echo "Landing Charge ($INR)"; ?></label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php $data = array('name' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php $data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'readonly' => true, 'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        <!-- High seas sales charge -->
-                                        <label><?php echo "Assessable Value (A) ($INR)"; ?></label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div style="display: none">
-                                            <?php
-                                            $data = array('name' => 'ViewHighseas ', 'value' => set_value('ViewHighseas'), 'id' => 'ViewHighseas',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php
-                                            $data = array('name' => 'ViewAfterAssessable', 'value' => set_value('ViewAfterAssessable'), 'id' => 'ViewAfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        <!-- Custom duty : (a) -->
-                                        <label><?php echo "Custom duty (B) ($INR)"; ?></label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php
-                                            $data = array('name' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php
-                                            $data = array('name' => 'ViewAfterCustomduty', 'value' => set_value('ViewAfterCustomduty'), 'id' => 'ViewAfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        <!--  Custom ED_cess : (e) -->
-                                        <label><?php echo "Custom ED_cess (C) ($INR)"; ?></label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php $data = array('name' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php $data = array('name' => 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        <!--  Custom S & H cess : (f) -->
-                                        <label><?php echo "Custom S & H cess (D) ($INR)"; ?></label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php
-                                            $data = array('name' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php $data = array('name' => 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data); ?>
-                                        </div>
+                                <div class="form-group col-md-6">
+                                    <label>Quantity</label>
+                                    <div>
+                                        <?php $data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
+                                        echo form_input($data); ?>
                                     </div>
                                 </div>
                             </div>
-
-                            <div class="form-group col-md-6" style="padding:15px;">
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        <!-- Additional Excise duty : (g) -->
-                                        <label><?php echo "Subtotal (E) ($INR)  (A+B+C+D)"; ?></label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div style="display: none;">
-                                            <?php $data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php $data = array('name' => 'ViewSubtotal', 'value' => set_value('ViewSubtotal'), 'id' => 'ViewSubtotal',  'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        <!-- Additional Excise duty : (g) -->
-                                        <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php $data = array('name' => 'ViewIgst ', 'value' => set_value('ViewIgst', 0), 'id' => 'ViewIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'EditCalculateIgst()');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php $data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst', 0), 'id' => 'ViewAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-8">
-                                        <!-- Gross duty payable -->
-                                        <label><?php echo "Total Duty ($INR)   (B+C+D+F)"; ?></label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div>
-                                            <?php $data = array('name' => 'ViewGrossdutypayable ', 'value' => set_value('ViewGrossdutypayable'), 'id' => 'ViewGrossdutypayable',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <br>
-                                <!--Start of Adding of Frieght model-->
-                                <div class="form-row" style="padding:0px;">
-                                    <div class="form-group col-md-4">
-                                        <span>Freight Type </span>
+                            <div class="form-row">
+                                <div class="form-group col-md-6">
+                                    <label><?php echo "Custom Duty($INR) /UOM" ?></label>
+                                    <div>
                                         <?php
-                                        $options = array("0" => 'Select Freight Type');
-                                        //print_r(  $options);
-                                        if (!empty($FreightType)) {
-                                            foreach ($FreightType as $SID) :
-                                                $options[$SID->ConfigValue] =  $SID->ConfigValue;
-                                            endforeach;
-                                        }
-                                        echo form_dropdown('drpviewFreight', $options, set_value('drpviewFreight'), 'id="drpviewFreight" class="form-control " disabled'); ?>
-                                    </div>
-                                    <div class="form-group col-md-4" id="ViewTripsValue" style="display:block;">
-                                        <span>NO Of Trips</span>
-                                        <?php $data = array('name' => 'viewNOOfTrips', 'value' => set_value('viewNOOfTrips'), 'id' => 'viewNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(2);', 'disabled' => 'disabled');
-                                        echo form_input($data); ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <span>Freight Rate </span>
-                                        <?php $data = array('name' => 'viewtxtFreight', 'value' => set_value('viewtxtFreight'), 'id' => 'viewtxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);', 'readonly' => 'true');
-                                        echo form_input($data); ?>
-                                    </div>
-                                    <div class="form-group col-md-4" style="padding-left: 0px;">
-                                        <span>Freight Amt In <?php echo $INR; ?></span>
-                                        <?php $data = array('name' => 'viewtxtAfterFreight', 'value' => set_value('viewtxtAfterFreight'), 'id' => 'viewtxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data); ?>
-                                    </div>
-                                </div>
-
-                                <br>
-
-                                <center> <label>Cost of the product Per KG</label></center>
-                                <hr />
-
-                                <!--End of Adding of freight in edit model -->
-                                <div class="form-row">
-                                
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-6">
-                                        <label>Duty Impact</label>
-                                        <div>
-                                            <?php $data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-6">
-                                        <label>Quantity</label>
-                                        <div>
-                                            <?php $data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
-                                            echo form_input($data); ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-6">
-                                        <label><?php echo "Custom Duty($INR) /UOM" ?></label>
-                                        <div>
-                                            <?php
-                                            $data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-6">
-                                        <!-- RMC Including Customers -->
-                                        <label><?php echo "Clearing Charges ($INR)"; ?></label>
-                                        <div>
-                                            <?php
-                                            $data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-6">
-                                        <!-- RMC Including Customers -->
-                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
-                                        <div>
-                                            <?php
-                                            $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-4" style="display:none;">
-                                        <!-- Total Amount: -->
-                                        <label id=labelViewTotalAmount>Total Amount</label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div style="display:none;">
-                                            <?php $data = array('name' => 'ViewTotalExp', 'value' => set_value('ViewTotalExp'), 'id' => 'ViewTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                            echo form_input($data); ?>
-                                        </div>
+                                        $data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-6">
+                                    <!-- RMC Including Customers -->
+                                    <label><?php echo "Clearing Charges ($INR)"; ?></label>
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-6">
+                                    <!-- RMC Including Customers -->
+                                    <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4" style="display:none;">
+                                    <!-- Total Amount: -->
+                                    <label id=labelViewTotalAmount>Total Amount</label>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div style="display:none;">
+                                        <?php $data = array('name' => 'ViewTotalExp', 'value' => set_value('ViewTotalExp'), 'id' => 'ViewTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                        echo form_input($data); ?>
                                     </div>
                                 </div>
                             </div>
-
-
                         </div>
-                    
+
+
+                    </div>
+
 
                     <br>
 
@@ -3375,6 +3363,12 @@ if (!empty($getlogpodtl)) {
                         $("#ItemName").val(obj.MaterialName);
                         $("#UOM").val(obj.UOM);
                         $("#Quantity").val(obj.Quantity).trigger('change');
+                        $("#Rate").val(obj.material_rate);
+                        if (obj.material_rate != 0) {
+                            Ratechange();
+                            validateExceedLimit();
+                            calculateFreight(0);
+                        }
                         RequistQuantity = obj.Quantity;
                         reqq = RequistQuantity;
                         //RequistQuantity=parseFloat($('#Quantity').val());
@@ -4283,16 +4277,16 @@ if (!empty($getlogpodtl)) {
 
 
             //alert('in');
-            PONOStatus = <?php echo $PONOStatus; ?> 
-            var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;  
+            PONOStatus = <?php echo $PONOStatus; ?>
+            var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;
             var rowHtml = `
                 <tr id="${temp}">
                     <td align="left">${temp}</td>
-                    <td align="left">${Reqnumber}</td>
+                    <td align="center">${Reqnumber}</td>
                     <td align="left">${materialCode}</td>
                     <td align="left">${shorten}</td>`;
-                    	if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
-							rowHtml += `<td><a href="#" class="editable-field" 
+            if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
+                rowHtml += `<td><a href="#" class="editable-field" 
 											data-id="${temp}"
 											data-notes="-">-</a>
 											<div class="edit-container" style="display:none;">
@@ -4300,8 +4294,10 @@ if (!empty($getlogpodtl)) {
 												<button class="save-btn">✔</button>
 												<button class="cancel-btn">✖</button>
 											</div></td>`;
-						}else{ rowHtml += `<td>-</td>`; }
-                    rowHtml += `<td align="left">${quantity}</td>
+            } else {
+                rowHtml += `<td>-</td>`;
+            }
+            rowHtml += `<td align="left">${quantity}</td>
                     <td align="left">${uom}</td>
                     <td align="left">${itemRate}</td>
                     <td align="left">${BasicAmt}</td>
@@ -5330,7 +5326,7 @@ if (!empty($getlogpodtl)) {
                     DelRows = "0" + ":" + rowid;
                 }
                 $('#txtDeletedRow').val(DelRows);
-     $('#loader').show();
+                $('#loader').show();
 
                 $.ajax({
                     data: {
@@ -5339,8 +5335,8 @@ if (!empty($getlogpodtl)) {
                     type: "POST",
                     url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
                     success: function(data) {
-                         $('#loader').hide();
-                         (data) ? alert(response) : alert("Error");
+                        $('#loader').hide();
+                        (data) ? alert(response): alert("Error");
                     }
                 });
             }
@@ -5502,43 +5498,43 @@ if (!empty($getlogpodtl)) {
             //     $('#Deliverydt').focus();
             //     return false;
             // } else {
-                // $('#content').loader('show');
-                var formData = new FormData($('.ImportPO')[0]);
-                formData.append('txtRowCount', Row);
-                formData.append('txtDeletedRow', txtDeletedRow);
-                formData.append('textStatus', stat);
-                $('#loader').show();
-                // disableButtons();
-                $.ajax({
-                    // data:$('.ImportPO').serialize()+"&txtRowCount="+Row+"&txtDeletedRow="+txtDeletedRow+"&textStatus="+stat,
-                    data: formData,
-                    processData: false,
-                    contentType: false,
-                    //data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeQletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextExchangerate"+ExcLandingCharge="+hangerate+"Status="+TextStatus,
-                    type: "POST",
-                    url: "<?php echo base_url() ?>purchaseorder/EditImportPurchaseOrder",
-                    success: function(data) {
-                        $('#loader').hide();
+            // $('#content').loader('show');
+            var formData = new FormData($('.ImportPO')[0]);
+            formData.append('txtRowCount', Row);
+            formData.append('txtDeletedRow', txtDeletedRow);
+            formData.append('textStatus', stat);
+            $('#loader').show();
+            // disableButtons();
+            $.ajax({
+                // data:$('.ImportPO').serialize()+"&txtRowCount="+Row+"&txtDeletedRow="+txtDeletedRow+"&textStatus="+stat,
+                data: formData,
+                processData: false,
+                contentType: false,
+                //data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeQletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextExchangerate"+ExcLandingCharge="+hangerate+"Status="+TextStatus,
+                type: "POST",
+                url: "<?php echo base_url() ?>purchaseorder/EditImportPurchaseOrder",
+                success: function(data) {
+                    $('#loader').hide();
 
-                        // console.log(data);
-                        if (data) {
-                            // // $('#content').loader('hide');
-                            alert(data);
-                            $('#txtRowCount').val('');
-                            $('#txtDeletedRow').val('');
-                            //$('#SpcialInstruction').val('');
-                            //$('#txtDeliveryAddress').val('');
-                            window.location = "purchaseorderListing";
-                            // setTimeout(function() { enableButtons(); }, 2000);
-
-                        } else {
-                            alert("Error");
-                            // setTimeout(function() { enableButtons(); }, 2000);
-                        }
+                    // console.log(data);
+                    if (data) {
+                        // // $('#content').loader('hide');
+                        alert(data);
+                        $('#txtRowCount').val('');
+                        $('#txtDeletedRow').val('');
+                        //$('#SpcialInstruction').val('');
+                        //$('#txtDeliveryAddress').val('');
+                        window.location = "purchaseorderListing";
+                        // setTimeout(function() { enableButtons(); }, 2000);
 
+                    } else {
+                        alert("Error");
+                        // setTimeout(function() { enableButtons(); }, 2000);
                     }
 
-                });
+                }
+
+            });
 
             // }
         }
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index 1cf5ae16..f5f1a0b4 100755
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -2274,6 +2274,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
             });
 
         }
+        $("#PaymentTerms").trigger('change');
     });
 
 
@@ -2393,10 +2394,16 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                         $("#ItemName").val(obj.MaterialName);
                         $("#UOM").val(obj.UOM);
                         $("#Quantity").val(obj.Quantity);
+                        $("#Rate").val(obj.material_rate);
                         RequistQuantity = obj.Quantity;
                         unit = obj.UOM;
                         // document.getElementById("labelPurchaseRate").innerHTML ='purchase rate [Basic]/'+unit;
                         // document.getElementById("labelEditPurchaseRate").innerHTML ='purchase rate [Basic]/'+unit;
+                        if(obj.material_rate != 0){
+                            Ratechange();
+                            validateExceedLimit();
+                            calculateFreight(0);
+                        }
 
                     }
                 });
@@ -4198,7 +4205,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                 formData.append('txtDeletedRow', txtDeletedRow);
                 formData.append('textStatus', stat);
                 // disableButtons();
-
+                $('#loader').show();
                 $.ajax({
                     // data:$('.ImportPO').serialize()+"&txtRowCount="+txtRowCount+"&txtDeletedRow="+txtDeletedRow+"&textStatus="+stat,
                     //data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeQletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextExchangerate"+ExcLandingCharge="+hangerate+"Status="+TextStatus,
@@ -4208,6 +4215,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                     processData: false,
                     contentType: false,
                     success: function(data) {
+                        $('#loader').hide();
                         if (data) {
                             // $('#content').loader('hide');  
                             alert(data);
@@ -4219,6 +4227,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 							// setTimeout(function() { enableButtons(); }, 2000);
 
                         } else {
+                            $('#loader').hide();
                             alert("Error");
                             // setTimeout(function() { enableButtons(); }, 2000);
                         }
diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php
index 4989dffd..c7e7877f 100755
--- a/app/Views/monthlypayinputs.php
+++ b/app/Views/monthlypayinputs.php
@@ -371,17 +371,17 @@
 
                                                      <td style="max-width:80px;text-align:right;"><?php echo number_format($workedSalary, 2, '.', ''); ?></td>
 
-                                                     <td style="max-width:80px;text-align:right;">
+                                                     <td id="bassalary<?php echo $index ?>" style="max-width:80px;text-align:right;">
                                                          <?php $basicWorked = $workedSalary * 70 / 100;
                                                             echo number_format($basicWorked, 2, '.', ''); ?>
                                                      </td>
 
-                                                     <td style="max-width:80px;text-align:right;">
+                                                     <td id="hrasalary<?php echo $index ?>" style="max-width:80px;text-align:right;">
                                                          <?php $hraWorked = $workedSalary * 30 / 100;
                                                             echo number_format($hraWorked, 2, '.', ''); ?>
                                                      </td>
 
-                                                     <td style="max-width:80px;text-align:right;">
+                                                     <td id="grosalary<?php echo $index ?>" style="max-width:80px;text-align:right;">
                                                          <?php echo number_format($basicWorked + $hraWorked, 2, '.', ''); ?>
                                                      </td>
 
@@ -583,17 +583,17 @@
                                                      <?php echo number_format($sum_of_amount, 2, '.', ''); ?>
                                                      </td>
 
-                                                     <td style="max-width:80px;text-align:right;">
+                                                     <td id="bassalary<?php echo $inx ?>" style="max-width:80px;text-align:right;">
                                                          <?php 
                                                             echo number_format($basic_worked, 2, '.', ''); ?>
                                                      </td>
 
-                                                     <td style="max-width:80px;text-align:right;">
+                                                     <td id="hrasalary<?php echo $inx ?>" style="max-width:80px;text-align:right;">
                                                          <?php 
                                                             echo number_format($hra_worked, 2, '.', ''); ?>
                                                      </td>
 
-                                                     <td style="max-width:80px;text-align:right;">
+                                                     <td id="grosalary<?php echo $inx ?>" style="max-width:80px;text-align:right;">
                                                          <?php echo number_format($basic_worked + $hra_worked, 2, '.', ''); ?>
                                                      </td>
 
@@ -653,11 +653,11 @@
                                                          <?php if (!empty($record->payroll_id)) { ?> title="Payslip Calculated"
                                                          style="text-align:right;color:blue;" <?php }else{ ?>style="text-align:right;" <?php } ?>>
                                                          <?php if (!empty($record->driver_final_payment)) {
-                                                                echo $record->driver_final_payment;
-                                                                $estTotal[] = $record->driver_final_payment;
+                                                                echo ($basic_worked + $hra_worked + $record->Festival_Bonus)-($record->Monthly_Due+$record->esi_amount+$record->pf_amount);
+                                                                $estTotal[] = ($basic_worked + $hra_worked + $record->Festival_Bonus)-($record->Monthly_Due+$record->esi_amount+$record->pf_amount);
                                                             } else {
-                                                                echo $empSalary[$i];
-                                                                $estTotal[] = $empSalary[$i];
+                                                                echo ($basic_worked + $hra_worked + $record->Festival_Bonus)-($record->Monthly_Due+$record->esi_amount+$record->pf_amount);
+                                                                $estTotal[] = ($basic_worked + $hra_worked + $record->Festival_Bonus)-($record->Monthly_Due+$record->esi_amount+$record->pf_amount);
                                                             }
                                                             ?>
                                                      </td>
@@ -1144,10 +1144,16 @@ $(document).ready(function () {
         //  console.log(sno);return true;
 
          var driverEarn = parseFloat(document.getElementById('ttlsalary' + sno).textContent);
-
+         var grosssalary = parseFloat(document.getElementById('grosalary' + sno).textContent);
+         var basicsalary = parseFloat(document.getElementById('bassalary' + sno).textContent);
+         var hrasalary = parseFloat(document.getElementById('hrasalary' + sno).textContent);
+         
          var Festivals = parseFloat(document.getElementById('Festival' + sno).textContent);
          totalfestival[sno] = Festivals;
 
+         var ESI = parseFloat(document.getElementById('esiAmt' + sno).textContent);
+         var PF = parseFloat(document.getElementById('pfAmt' + sno).textContent);
+
          var element = document.getElementById('loanatm' + sno);
 
          var loanamt = parseFloat(element.value);
@@ -1171,6 +1177,7 @@ $(document).ready(function () {
          
          var current_loan_amt = 0;
          var autoLoan = parseFloat(monthDue);
+         console.log(autoLoan,"autoLoan");
          var Balance_Amount = loanamt - paidamt;
         
          if (autoLoan > Balance_Amount) {
@@ -1181,21 +1188,21 @@ $(document).ready(function () {
              current_loan_amt = autoLoan;
          }
          
-         if (isNaN(driverEarn)) { driverEarn = 0; }
-         
+         if (isNaN(basicsalary)) { basicsalary = 0; }
+         if (isNaN(hrasalary)) { hrasalary = 0; }
          
+ 
+         var driverSalaryAdd = basicsalary + hrasalary + Festivals;
+        console.log('bas + hra + bon ',driverSalaryAdd);
 
-         
-
-         
-         var driverSalaryAdd = driverEarn + Festivals;
-        
-         var driverSalarySub = current_loan_amt;
-        console.log("current loan amt == ",current_loan_amt);
+         var driverSalarySub = current_loan_amt+ESI + PF ; 
+        console.log("L + E + P ",current_loan_amt);
 
 
          var driverMonthSalary = driverSalaryAdd - driverSalarySub
          var driverSalary = Math.round(driverMonthSalary);
+        console.log("Sal ",driverSalary);
+        
 
          var cals = (driverSalary).toFixed(0);
 
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index c7e71882..d4859d4e 100755
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -293,7 +293,7 @@ if (!empty($INRSYMBOL)) {
 			}
 			$("#PaymentTerms").trigger('change');
 		});
-		
+
 		$('#drpSupplier').change(function() {
 
 			var id = $('#drpSupplier').val();
@@ -434,6 +434,9 @@ if (!empty($INRSYMBOL)) {
 							$("#Quantity").val(obj.Quantity);
 							$("#Rate").val(obj.material_rate);
 							RequistQuantity = obj.Quantity;
+							if(obj.material_rate != 0){
+								change();
+							}
 						}
 					});
 				}
@@ -2103,7 +2106,7 @@ if (!empty($INRSYMBOL)) {
 									</div>
 								</div>
 								<div class="form-group col-md-3">
-									<label for="payablefrom">Payable Terms</label>
+									<label for="payablefrom">Payable Terms<span class="text-danger">*</span></label>
 									<?php
 									if (!empty($Payment)) {
 										$options6 = array("0" => 'Select Payment Terms ');
@@ -3946,7 +3949,7 @@ if (!empty($INRSYMBOL)) {
 			// else {
 
 				var formData = new FormData($('.CreatePO')[0]);
-				// disableButtons();
+				$('#loader').show();
 				
 				$.ajax({
 					type: "POST",
@@ -3955,6 +3958,7 @@ if (!empty($INRSYMBOL)) {
 					processData: false,
 					contentType: false,
 					success: function(data) {
+						$('#loader').hide();
 						if (data) {
 
 							alert(data);
@@ -3973,6 +3977,7 @@ if (!empty($INRSYMBOL)) {
 
 					},
 					error: function(jqXHR, textStatus, errorThrown) {
+						$('#loader').hide();
 						console.error("AJAX Error: " + textStatus + ": " + errorThrown);
 						alert("Error: " + textStatus);
 						// setTimeout(function() { enableButtons(); }, 2000);
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php
index 74a51a19..eae14825 100755
--- a/app/Views/servicePurchaseorder.php
+++ b/app/Views/servicePurchaseorder.php
@@ -208,6 +208,7 @@ if (!empty($INRSYMBOL)) {
 
 				});
 			}
+			$("#PaymentTerms").trigger('change');
 		});
 
 		document.getElementById("Date").checked = true;
@@ -369,6 +370,10 @@ if (!empty($INRSYMBOL)) {
 								$('#otherdescription').show();
 								$('#OtheritemDescription').val(obj.MaterialDescription);
 							}
+
+							if(obj.material_rate != 0){
+								Ratechange();
+							}
 						}
 					});
 				}
@@ -1047,7 +1052,7 @@ if (!empty($INRSYMBOL)) {
 							</div><!-- 6. form-row div closed here -->
 							<div class="form-row">
 								<div class="table-responsive" style="padding-bottom: 30px;">
-								    <table id="serviceTax" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;">
+								    <table id="ServiceTable" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;">
 										<thead>
 											<tr>
 												<th style="white-space: nowrap !important;">SNo</th>
@@ -1066,7 +1071,7 @@ if (!empty($INRSYMBOL)) {
 										</thead>
 										<tbody id='ServiceAppend'>
 										</tbody>
-									</table><!-- serviceTax table closed here -->
+									</table><!-- ServiceTable table closed here -->
 								</div>
 							</div><!-- 7. form-row div closed here -->
 
@@ -2096,7 +2101,7 @@ if (!empty($INRSYMBOL)) {
 
 	function populateValueMainFormForEditServiceTax() {
 
-		var rows = $('#serviceTax tbody tr').length;
+		var rows = $('#ServiceTable tbody tr').length;
 
 		var TotCgst = 0;
 		var TotSgst = 0;
@@ -2380,10 +2385,10 @@ if (!empty($INRSYMBOL)) {
 		var AvlBudAmt = '<?php echo $AvlAmount ?>';
 		var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
 		if (serviceValidate()) {
-			// if (document.getElementById('serviceTax').rows.length < 2) {
-			// 	alert('Please Select Line item to Create PO');
-			// 	return false;
-			// }
+			if (document.getElementById('ServiceTable').rows.length < 1) {
+				alert('Atleast One Line needed');
+				return false;
+			}
 			// else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
 			// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
 			//        return false;
@@ -2392,17 +2397,17 @@ if (!empty($INRSYMBOL)) {
 			// alert('Please Enter Other Payable Terms Description');
 			// $('#Otherpayment').focus();
 			// return false;
-			// } else if ($('#descofpo').val().trim() == '') {
-			// 	alert('Please Enter Description Of Service');
-			// 	$('#descofpo').focus();
-			// 	return false;
+			} else if ($('#descofpo').val().trim() == '') {
+				alert('Please Enter Description Of Service');
+				$('#descofpo').focus();
+				return false;
 			// } else if ($('#PoTypeOptions').val() == "0") {
 			// 	alert('Please Select POType');
 			// 	$('#PoTypeOptions').focus();
 			// 	return false;
-			// } else {
+			} else {
 				var formData = new FormData($('.ServicePO')[0]);
-				// disableButtons();
+				$('#loader').show();
 				console.log("inside add service purchase order view page");
 
 				console.log(formData);
@@ -2415,6 +2420,7 @@ if (!empty($INRSYMBOL)) {
 					processData: false,
 					contentType: false,
 					success: function(data) {
+						$('#loader').hide();
 						if (data) {
 							alert(data);
 							$('#txtRowCount').val('');
@@ -2424,6 +2430,7 @@ if (!empty($INRSYMBOL)) {
 							window.location = "purchaseorderListing";
 							// setTimeout(function() { enableButtons(); }, 2000);
 						} else {
+							$('#loader').hide();
 							alert("Error");
 							// setTimeout(function() { enableButtons(); }, 2000);
 						}
diff --git a/public/assets/js/CreatePOValidation.js b/public/assets/js/CreatePOValidation.js
index 92e8ab86..aba375d6 100755
--- a/public/assets/js/CreatePOValidation.js
+++ b/public/assets/js/CreatePOValidation.js
@@ -145,14 +145,16 @@ function serviceValidate(){
         alert('Please Select Budget Type');
         $('#BudgetType').focus();
         return false;
-    }else if ($('#serviceTax tbody tr').length < 1) {
-		alert('Atleast One Line needed');
-		return false;
-	} else if ($('#descofpo').val().trim() == '') {
-			alert('Please Enter Description Of Service');
-			$('#descofpo').focus();
-			return false;
-	}else {
+    }
+	// else if ($('#ServiceTable tbody tr').length < 1) {
+	// 	alert('Atleast One Line needed');
+	// 	return false;
+	// } else if ($('#descofpo').val().trim() == '') {
+	// 		alert('Please Enter Description Of Service');
+	// 		$('#descofpo').focus();
+	// 		return false;
+	// }
+	else {
 		return true;
     }
 }