diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index ad31b7fc..22ff4c48 100644
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -717,8 +717,6 @@ if (!empty($getlogpodtl)) {
 	});
 </script>
 <style>
-	
-
 	.num {
 		text-align: right;
 	}
@@ -747,7 +745,6 @@ if (!empty($getlogpodtl)) {
 	.centered input {
 		margin: 0 5px;
 	}
-
 </style>
 
 <div class="content-page">
@@ -794,7 +791,7 @@ if (!empty($getlogpodtl)) {
 									</div>
 									<div class="form-group  col-md-3">
 										<label>Purchase Order Type</label>
-										<div class="form-group">
+										<div>
 
 											<?php
 											$data = array('name' => 'POType', 'value' => set_value('POType', SERVICE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
@@ -814,7 +811,7 @@ if (!empty($getlogpodtl)) {
 											endforeach;
 										}
 
-										echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2');
+										echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2"');
 
 										?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId; ?>">
 
@@ -823,7 +820,7 @@ if (!empty($getlogpodtl)) {
 									</div>
 									<div class="form-group  col-md-3">
 										<label>Supplier Address</label>
-										<div class="form-group">
+										<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);
@@ -856,7 +853,7 @@ if (!empty($getlogpodtl)) {
 											endforeach;
 										}
 
-										echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus"', 'required="true"', 'class="form-control select2');
+										echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus" required="true" class="form-control select2"');
 
 										?>
 									</div>
@@ -870,7 +867,7 @@ if (!empty($getlogpodtl)) {
 									</div>
 									<div class="form-group  col-md-3" id="Deliverydtdiv">
 										<label>Delivery Date<span class="text-danger">*</span></label>
-										<div class="form-group">
+										<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);
@@ -887,7 +884,7 @@ if (!empty($getlogpodtl)) {
 									</div>
 									<div class="form-group  col-md-3">
 										<label>Delivery Address</label>
-										<div class="form-group">
+										<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);
@@ -900,7 +897,7 @@ if (!empty($getlogpodtl)) {
 								<div class="form-row">
 									<div class="form-group col-md-3">
 										<label>Purchase Order Date</label>
-										<div class="form-group">
+										<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);
@@ -909,7 +906,7 @@ if (!empty($getlogpodtl)) {
 									</div>
 									<div class="form-group col-md-3">
 										<label>Mode Of Shipment</label>
-										<div class="form-group">
+										<div>
 
 											<?php
 											$data = array('name' => 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $ModeOfShipment), 'id' => 'editmodeofshipment',  'class' => 'form-control');
@@ -919,7 +916,7 @@ if (!empty($getlogpodtl)) {
 									</div>
 									<div class="form-group col-md-3">
 										<label>Contact Reference</label>
-										<div class="form-group">
+										<div>
 
 											<?php
 											$data = array('name' => 'editsupplierreference', 'value' => set_value('editsupplierreference', $SupplierReference), 'id' => 'editsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
@@ -929,7 +926,7 @@ if (!empty($getlogpodtl)) {
 									</div>
 									<div class="form-group col-md-3">
 										<label>Supplier's Offer No</label>
-										<div class="form-group">
+										<div>
 
 											<?php
 											$data = array('name' => 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $SuppliersOfferNo), 'id' => 'editsupplierofferno',  'class' => 'form-control');
@@ -941,10 +938,10 @@ if (!empty($getlogpodtl)) {
 								</div>
 								<div class="form-row">
 									<div class="form-group col-md-3">
-										<div class="form-group col-md-12" style="padding:0px;">
+										<div style="padding:0px;">
 
 											<label>Our Reference(S)</label>
-											<div class="form-group">
+											<div>
 
 												<?php
 												$data = array('name' => 'editotherreference', 'value' => set_value('editotherreference', $OtherReferences), 'id' => 'editotherreference',  'class' => 'form-control');
@@ -958,7 +955,7 @@ if (!empty($getlogpodtl)) {
 
 
 										<label>Service Type Options<span class="text-danger">*</span></label>
-										<div class="form-group">
+										<div>
 
 											<?php
 
@@ -980,7 +977,7 @@ if (!empty($getlogpodtl)) {
 												endforeach;
 											}
 
-											echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
+											echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions" required="true" class="form-control select2"');
 
 
 											?>
@@ -1004,12 +1001,12 @@ if (!empty($getlogpodtl)) {
 												}
 											endforeach;
 										}
-										echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2');
+										echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms" required="true" class="form-control select2"');
 										?>
 									</div>
 									<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
 										<label>Description of Payable Terms<span class="text-danger">*</span></label>
-										<div class="form-group">
+										<div>
 											<?php
 											$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
 											echo form_input($data);
@@ -1020,7 +1017,7 @@ if (!empty($getlogpodtl)) {
 								<div class="form-row">
 									<div class="form-group col-md-3">
 										<label>Insurance Options<span class="text-danger">*</span></label>
-										<div class="form-group">
+										<div>
 
 											<?php
 
@@ -1043,7 +1040,7 @@ if (!empty($getlogpodtl)) {
 												endforeach;
 											}
 
-											echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus"', 'required="true"', 'class="form-control select2');
+											echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2"');
 
 
 											?>
@@ -1055,7 +1052,7 @@ if (!empty($getlogpodtl)) {
 									</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 class="form-group">
+										<div>
 											<?php
 											$data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber', $InsuranceNumber), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
 											echo form_input($data);
@@ -1064,7 +1061,7 @@ if (!empty($getlogpodtl)) {
 									</div>
 									<div class="form-group col-md-3">
 										<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
-										<select id='BudgetType' name='BudgetType' required='true'>
+										<select id='BudgetType' name='BudgetType' class="form-control" required='true'>
 											<?php if ($BudgetType == 'CAPITAL') {
 												$opt1 = 'CAPITAL';
 												$opt2 = 'REVENUE';
@@ -1080,14 +1077,14 @@ if (!empty($getlogpodtl)) {
 								<div class="form-row">
 									<div align="right">
 										<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-											<div class="col-md-12">
+											<div class="form-group col-md-12">
 												<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-													<div class="col-md-3 col-md-offset-7" align="right" style="padding:5px">
+													<div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:5px">
 														<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
 													</div>
-													<div class="col-md-1" align="right">
+													<div class="form-group col-md-1" align="right">
 													<?php } else { ?>
-														<div class="col-md-12" align="right">
+														<div class="form-group col-md-12" align="right">
 														<?php } ?>
 														<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
 														</div>
@@ -1208,7 +1205,7 @@ if (!empty($getlogpodtl)) {
 																	<?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="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+																		<td> <a data-target='#EDITSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></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" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
@@ -1282,7 +1279,7 @@ if (!empty($getlogpodtl)) {
 												<!--start new fields 1 sep-->
 												<div class="form-group col-md-12">
 													<label>Description Of Service <span class="text-danger">*</label>
-													<div class="form-group">
+													<div>
 														<?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);
@@ -1303,7 +1300,7 @@ if (!empty($getlogpodtl)) {
 													<label>Special po Table List</label>
 													<table id="table2" class="table table-striped table-hover mb-0" style="font-size:12px;">
 
-														<div class="col-md-12">
+														<div class="form-group col-md-12">
 
 
 															<div class="col-md-offset-10 col-md-8">
@@ -1343,7 +1340,7 @@ if (!empty($getlogpodtl)) {
 																		<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="fa fa-pencil" data-toggle="tooltip" title="Click here to Edit the Revenue SplPO details"></i></span>
+																		<td><span onclick="openmodel(<?= $row ?>);"><i class="fas fa-pencil-alt" 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 } ?>
@@ -1358,8 +1355,8 @@ if (!empty($getlogpodtl)) {
 												</div>
 
 												<?php if (!empty($update)) { ?>
-													<div class="col-md-12" id="editpodiv">
-														<div class="col-md-12"><label>Editable POScreen</label>
+													<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>
@@ -1433,7 +1430,7 @@ if (!empty($getlogpodtl)) {
 														</div>
 													</div>
 
-													<div class="col-md-12">
+													<div class="form-group col-md-12">
 
 														<div align="right"><br />
 															<div>
@@ -1455,7 +1452,7 @@ if (!empty($getlogpodtl)) {
 																	<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</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-approved Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+																<a class="btn btn btn-soft-primary waves-effect waves-light 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>
@@ -1504,7 +1501,7 @@ if (!empty($getlogpodtl)) {
 		<!-- Model for servicepo -->
 		<div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
 			aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-			<div class="modal-dialog">
+			<div class="modal-dialog modal-lg">
 				<div class="modal-content">
 					<div class="modal-header">
 						<h4 class="modal-title">Add Service Purchase Order Item</h4>
@@ -1526,62 +1523,62 @@ if (!empty($getlogpodtl)) {
 											endforeach;
 										}
 
-										echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo"', 'class="form-control"');
+										echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
 
 										?>
 									</div>
 								</div>
 								<div class="form-group col-md-3">
 									<label>Department Name</label>
-										<?php
-										$data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  'class' => 'form-control', 'readonly' => 'true');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 								</div>
 								<div class="form-group col-md-3">
 									<label>Cost Center Code</label>
-										<?php
-										$data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
-										echo form_input($data);
+									<?php
+									$data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
 
-										?>
+									?>
 								</div>
 								<div class="form-group col-md-3">
 									<label>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
-										<?php
-										$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 								</div>
 							</div>
 							<div class="row">
 								<div class="form-group col-md-3">
 									<label>Item Code<span class="text-danger">*</span></label>
-										<?php
-										$options = array("0" => 'Item Code');
-										//print_r(  $options);
+									<?php
+									$options = array("0" => 'Item Code');
+									//print_r(  $options);
 
 
 
-										echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control"');
+									echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control"');
 
-										?>
+									?>
 								</div>
 								<div class="form-group col-md-3">
 									<label>Item Name</label>
-										<?php
-										$data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 								</div>
 
 
 								<div class="form-group col-md-3" id="otherdescription">
 									<label>Item Description</label>
-										<?php
-										$data = array('name' => 'OtheritemDescription', 'value' => set_value('OtheritemDescription'), 'id' => 'OtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'OtheritemDescription', 'value' => set_value('OtheritemDescription'), 'id' => 'OtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 								</div>
 
 
@@ -1589,18 +1586,18 @@ if (!empty($getlogpodtl)) {
 
 								<div class="form-group col-md-3">
 									<label>UOM</label>
-										<?php
-										$data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 								</div>
 								<div class="form-group col-md-3">
 									<label>Service Schedule Type</label>
-										<?php
-										$data = array('name' => 'Frequency', 'value' => set_value('Frequency'), 'id' => 'Frequency',  'class' => 'form-control', 'readonly' => 'true');
-										echo form_input($data);
-										?>
-										<input type="hidden" name="FrequencyNo" id="FrequencyNo" value="FrequencyNo" />
+									<?php
+									$data = array('name' => 'Frequency', 'value' => set_value('Frequency'), 'id' => 'Frequency',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+									<input type="hidden" name="FrequencyNo" id="FrequencyNo" value="FrequencyNo" />
 								</div>
 
 
@@ -1609,17 +1606,17 @@ if (!empty($getlogpodtl)) {
 
 								<div class="form-group col-md-3">
 									<label>Quantity<span class="text-danger">*</span></label>
-										<?php
-										$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
+									echo form_input($data);
+									?>
 								</div>
 								<div class="form-group col-md-3">
 									<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>
-										<?php
-										$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
+									echo form_input($data);
+									?>
 								</div>
 								<div class="form-group col-md-3">
 									<label>Per</label> <?php
@@ -1628,10 +1625,10 @@ if (!empty($getlogpodtl)) {
 								</div>
 								<div class="form-group col-md-3">
 									<label><?php echo "Basic Amount ($INRSYM)" ?></label>
-										<?php
-										$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 								</div>
 
 							</div>
@@ -1643,17 +1640,17 @@ if (!empty($getlogpodtl)) {
 
 								<div class="form-group col-md-3">
 
-										<?php
-										$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);');
+									echo form_input($data);
+									?>
 
 								</div>
 								<div class="form-group col-md-3">
-										<?php
-										$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst'), 'id' => 'AfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst'), 'id' => 'AfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 								</div>
 
 							</div>
@@ -1665,17 +1662,17 @@ if (!empty($getlogpodtl)) {
 
 								<div class="form-group col-md-3">
 
-										<?php
-										$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+									echo form_input($data);
+									?>
 
 								</div>
 								<div class="form-group col-md-3">
-										<?php
-										$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst'), 'id' => 'AfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst'), 'id' => 'AfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST');
+									echo form_input($data);
+									?>
 								</div>
 
 							</div>
@@ -1687,57 +1684,57 @@ if (!empty($getlogpodtl)) {
 
 								<div class="form-group col-md-3">
 
-										<?php
-										$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+									echo form_input($data);
+									?>
 
 								</div>
 								<div class="form-group col-md-3">
 
-										<?php
-										$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst'), 'id' => 'AfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst'), 'id' => 'AfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 
 								</div>
 
 							</div>
 							<div class="row">
-								<div class="col-md-5 col-md-offset-4" align="right">
+								<div class="form-group col-md-5 col-md-offset-4" align="right">
 									<label>Other Allowances <?php echo "($INRSYM)" ?></label>
 								</div>
 								<div class="form-group col-md-3">
-										<?php
-										$data = array('name' => 'OtherAllowances', 'value' => set_value('OtherAllowances', 0), 'id' => 'OtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'OtherAllowances', 'value' => set_value('OtherAllowances', 0), 'id' => 'OtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+									echo form_input($data);
+									?>
 								</div>
 							</div>
 							<div class="row">
-								<div class="col-md-5 col-md-offset-4" align="right">
+								<div class="form-group col-md-5 col-md-offset-4" align="right">
 									<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
 								</div>
 								<div class="form-group col-md-3">
-										<?php
-										$data = array('name' => 'TotalOrderValue', 'value' => set_value('TotalOrderValue'), 'id' => 'TotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
-										echo form_input($data);
-										?>
+									<?php
+									$data = array('name' => 'TotalOrderValue', 'value' => set_value('TotalOrderValue'), 'id' => 'TotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
+									echo form_input($data);
+									?>
 								</div>
 							</div>
-							<div class="row" style="padding: 0px 30px 10px 30px;">
+							<div class="row">
+							<div class="form-group col-md-12">
 								<label>Service Description <span class="text-danger">*</span></label> <?php
-																											$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-																											echo form_textarea($data);
-																											?>
+																										$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+																										echo form_textarea($data);
+																										?>
+							</div>
 
 							</div>
 						</div>
 						<div class="modal-footer">
-							<div class="col-md-12">
 								<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
 								<a class="btn btn-success font AddService" ID="AddService"><span class="bold">Add Service</span></a>
-							</div>
 						</div>
 					</form>
 
@@ -1747,7 +1744,7 @@ if (!empty($getlogpodtl)) {
 		<!-- Service Special PO Modal Starts Here -->
 		<div id="EditServiceSplPOModel" class="modal fade" tabindex="-1" role="dialog"
 			aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-			<div class="modal-dialog">
+			<div class="modal-dialog modal-lg">
 				<div class="modal-content">
 					<div class="modal-header">
 						<h4 class="modal-title">Update Bill <span id="bill"><span> Details</h4>
@@ -1757,8 +1754,8 @@ if (!empty($getlogpodtl)) {
 					<form class="tagForm" id="tag-form" method="post" enctype="multipart/form-data">
 
 						<div class="modal-body p-4">
-							<div class="col-md-12">
-								<div class="col-md-5">
+							<div class="form-group col-md-12">
+								<div class="form-group col-md-5">
 									<label for="oldimagename">Old file Name :<div class="oldimage"></div></label>
 									<input type="file" size="20" input accept=".docx,.pdf,.doc.JPG,.PNG,.jpg" id="imag" name="images" onChange="filecheck();" />
 									<label for="images">Select file <br /><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
@@ -1782,7 +1779,7 @@ if (!empty($getlogpodtl)) {
 		<!-- Edit Service Modal content Starts Here-->
 		<div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
 			aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-			<div class="modal-dialog">
+			<div class="modal-dialog modal-lg">
 				<div class="modal-content">
 					<div class="modal-header">
 						<h4 class="modal-title">Edit Service Purchase Order Item</h4>
@@ -1791,10 +1788,10 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<!-- Modal content-->
 					<form>
-						<div align="left">
+						<div class="modal-body p-4">
 
-							<div class="col-md-12">
-								<div class="col-md-3">
+							<div class="form-row">
+								<div class="form-group col-md-3">
 									<label>Req No<span class="text-danger">*</span></label>
 									<div>
 										<?php
@@ -1805,19 +1802,18 @@ if (!empty($getlogpodtl)) {
 
 									</div>
 								</div>
-
-								<div class="col-md-3">
+								<div class="form-group col-md-3">
 									<label>Department Name</label>
-									<div class="form-group">
+									<div>
 										<?php
 										$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
 										echo form_input($data);
 										?>
 									</div>
 								</div>
-								<div class="col-md-3">
+								<div class="form-group col-md-3">
 									<label>Cost Center Code</label>
-									<div class="form-group">
+									<div>
 										<?php
 										$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
 										echo form_input($data);
@@ -1825,9 +1821,9 @@ if (!empty($getlogpodtl)) {
 										?>
 									</div>
 								</div>
-								<div class="col-md-3">
+								<div class="form-group col-md-3">
 									<label>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
-									<div class="form-group">
+									<div>
 										<?php
 										$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
 										echo form_input($data);
@@ -1835,8 +1831,8 @@ if (!empty($getlogpodtl)) {
 									</div>
 								</div>
 							</div>
-							<div class="col-md-12">
-								<div class="col-md-3">
+							<div class="form-row">
+								<div class="form-group col-md-3">
 									<label>Item Code<span class="text-danger">*</span></label>
 									<div>
 										<?php
@@ -1848,41 +1844,34 @@ if (!empty($getlogpodtl)) {
 										?>
 									</div>
 								</div>
-								<div class="col-md-3">
+								<div class="form-group col-md-3">
 									<label>Item Name</label>
-									<div class="form-group">
+									<div>
 										<?php
 										$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
 										echo form_input($data);
 										?>
 									</div>
 								</div>
-
-
-
-								<div class="col-md-3" id=EditotherDescription>
+								<div class="form-group col-md-3" id=EditotherDescription>
 									<label>Item Description</label>
-									<div class="form-group">
+									<div>
 										<?php
 										$data = array('name' => 'EditOtheritemDescription', 'value' => set_value('EditOtheritemDescription'), 'id' => 'EditOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
 										echo form_input($data);
 										?>
 									</div>
 								</div>
-
-
-
-
-								<div class="col-md-3">
+								<div class="form-group col-md-3">
 									<label>UOM</label>
-									<div class="form-group">
+									<div>
 										<?php
 										$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
 										echo form_input($data);
 										?>
 									</div>
 								</div>
-								<div class="col-md-3">
+								<div class="form-group col-md-3">
 									<label>Service Schedule Type</label>
 									<div>
 										<?php
@@ -1892,37 +1881,34 @@ if (!empty($getlogpodtl)) {
 										<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
 									</div>
 								</div>
-
-
 							</div>
-							<div class="col-md-12">
-
-								<div class="col-md-3">
+							<div class="form-row">
+								<div class="form-group col-md-3">
 									<label>Quantity<span class="text-danger">*</span></label>
-									<div class="form-group">
+									<div>
 										<?php
 										$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
 										echo form_input($data);
 										?>
 									</div>
 								</div>
-								<div class="col-md-3">
+								<div class="form-group col-md-3">
 									<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>
-									<div class="form-group">
+									<div>
 										<?php
 										$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
 										echo form_input($data);
 										?>
 									</div>
 								</div>
-								<div class="col-md-3">
+								<div class="form-group col-md-3">
 									<label>Per</label> <?php
 														$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
 														echo form_input($data); ?>
 								</div>
-								<div class="col-md-3">
+								<div class="form-group col-md-3">
 									<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
-									<div class="form-group">
+									<div>
 										<?php
 										$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
 										echo form_input($data);
@@ -1931,42 +1917,37 @@ if (!empty($getlogpodtl)) {
 								</div>
 
 							</div>
-							<div class="col-md-12">
-								<div class="col-md-6" align="right">
+							<div class="form-row">
+								<div class="form-group col-md-6" align="right">
 
 									CGST In %
 								</div>
 
-								<div class="col-md-3">
-									<div class="form-group">
+								<div class="form-group col-md-3">
 
 										<?php
 										$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
 										echo form_input($data);
 										?>
-									</div>
 
 								</div>
-								<div class="col-md-3">
-									<div class="form-group">
+								<div class="form-group col-md-3">
 
 										<?php
 										$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
 										echo form_input($data);
 										?>
-									</div>
 
 								</div>
 
 							</div>
-							<div class="col-md-12">
-								<div class="col-md-6" align="right">
+							<div class="form-row">
+								<div class="form-group col-md-6" align="right">
 
 									SGST In %
 								</div>
-
-								<div class="col-md-3">
-									<div class="form-group">
+								<div class="form-group col-md-3">
+									<div>
 
 										<?php
 										$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
@@ -1975,8 +1956,8 @@ if (!empty($getlogpodtl)) {
 									</div>
 
 								</div>
-								<div class="col-md-3">
-									<div class="form-group">
+								<div class="form-group col-md-3">
+									<div>
 
 										<?php
 										$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
@@ -1985,17 +1966,13 @@ if (!empty($getlogpodtl)) {
 									</div>
 
 								</div>
-
 							</div>
-
-							<div class="col-md-12">
-								<div class="col-md-6" align="right">
-
+							<div class="form-row">
+								<div class="form-group col-md-6" align="right">
 									IGST In %
 								</div>
-
-								<div class="col-md-3">
-									<div class="form-group">
+								<div class="form-group col-md-3">
+									<div>
 
 										<?php
 										$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
@@ -2004,8 +1981,8 @@ if (!empty($getlogpodtl)) {
 									</div>
 
 								</div>
-								<div class="col-md-3">
-									<div class="form-group">
+								<div class="form-group col-md-3">
+									<div>
 
 										<?php
 										$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
@@ -2014,54 +1991,44 @@ if (!empty($getlogpodtl)) {
 									</div>
 
 								</div>
-
 							</div>
-							<div class="col-md-12">
-								<div class="col-md-5  col-md-offset-4" align="right">
+							<div class="form-row">
+								<div class="form-group col-md-5  col-md-offset-4" align="right">
 									<label>Other Allowances <?php echo "($INRSYM)" ?></label>
 								</div>
-								<div class="col-md-3">
-									<div class="form-group">
+								<div class="form-group col-md-3">	
 										<?php
 										$data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'onchange' => 'EditRatechange()');
 										echo form_input($data);
 										?>
-									</div>
 								</div>
 							</div>
-							<div class="col-md-12">
-								<div class="col-md-5  col-md-offset-4" align="right">
+							<div class="form-row">
+								<div class="form-group col-md-5  col-md-offset-4" align="right">
 									<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
 								</div>
-								<div class="col-md-3">
-									<div class="form-group">
+								<div class="form-group col-md-3">
 										<?php
 										$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
 										echo form_input($data);
 										?>
-									</div>
 								</div>
 							</div>
-							<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
+							<div class="form-row">
 								<label>Service Description<span class="text-danger">*</span></label> <?php
-																											$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-																											echo form_textarea($data);
-																											?> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
+																										$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+																										echo form_textarea($data);
+																										?> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
 							</div>
-
-
-
-
-
 							<br />
-
+						</div>
 							<div class="modal-footer">
-								<div class="col-md-12">
+								<div class="form-row">
 									<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
 									<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
 								</div>
 							</div>
-						</div>
+						
 					</form>
 
 				</div>
@@ -2071,7 +2038,7 @@ if (!empty($getlogpodtl)) {
 		<!-- View Service Modal content Starts Here-->
 		<div id="VIEWSERVICE" class="modal fade" tabindex="-1" role="dialog"
 			aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-			<div class="modal-dialog">
+			<div class="modal-dialog modal-lg">
 				<div class="modal-content">
 					<div class="modal-header">
 						<h4 class="modal-title">View Service Purchase Order Item</h4>
@@ -2079,33 +2046,31 @@ if (!empty($getlogpodtl)) {
 							aria-hidden="true">×</button>
 					</div>
 					<form>
+					 <div class="modal-body p-4">
 
-
-						<div class="col-md-12">
-							<div class="col-md-3">
+						<div class="form-row">
+							<div class="form-group col-md-3">
 								<label>Req No<span class="text-danger">*</span></label>
 								<div>
 									<?php
-
 									$data = array('name' => 'ViewReqNo', 'value' => set_value('ViewReqNo'), 'id' => 'ViewReqNo',  'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 
 								</div>
 							</div>
-
-							<div class="col-md-3">
+							<div class="form-group col-md-3">
 								<label>Department Name</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'ViewdeptName', 'value' => set_value('ViewdeptName'), 'id' => 'ViewdeptName',  'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
 							</div>
-							<div class="col-md-3">
+							<div class="form-group col-md-3">
 								<label>Cost Center Code</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'ViewCostCenter', 'value' => set_value('ViewCostCenter'), 'id' => 'ViewCostCenter',  'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
@@ -2113,9 +2078,9 @@ if (!empty($getlogpodtl)) {
 									?>
 								</div>
 							</div>
-							<div class="col-md-3">
+							<div class="form-group col-md-3">
 								<label>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'ViewAvlBudAmt', 'value' => set_value('ViewAvlBudAmt'), 'id' => 'ViewAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
 									echo form_input($data);
@@ -2123,22 +2088,22 @@ if (!empty($getlogpodtl)) {
 								</div>
 							</div>
 						</div>
-						<div class="col-md-12">
-							<div class="col-md-3">
+						<div class="form-row">
+							<div class="form-group col-md-3">
 								<label>Item Code<span class="text-danger">*</span></label>
 								<div>
 									<?php
 									//$options = array("0"=>'Item Code');     
 									//print_r(  $options);
 
-									echo form_dropdown('ViewMaterialCode', $options, set_value('ViewMaterialCode'), 'id="ViewMaterialCode"', 'class="form-control"');
+									echo form_dropdown('ViewMaterialCode', $options, set_value('ViewMaterialCode'), 'id="ViewMaterialCode" class="form-control"');
 
 									?>
 								</div>
 							</div>
-							<div class="col-md-3">
+							<div class="form-group col-md-3">
 								<label>Item Name</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'ViewItemName', 'value' => set_value('ViewItemName'), 'id' => 'ViewItemName',  'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
@@ -2148,9 +2113,9 @@ if (!empty($getlogpodtl)) {
 
 
 
-							<div class="col-md-3" id="ViewotherDescription">
+							<div class="form-group col-md-3" id="ViewotherDescription">
 								<label>Item Name</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'ViewOtheritemDescription', 'value' => set_value('ViewOtheritemDescription'), 'id' => 'ViewOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
@@ -2161,16 +2126,16 @@ if (!empty($getlogpodtl)) {
 
 
 
-							<div class="col-md-3">
+							<div class="form-group col-md-3">
 								<label>UOM</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'ViewUOM', 'value' => set_value('ViewUOM'), 'id' => 'ViewUOM',  'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
 							</div>
-							<div class="col-md-3">
+							<div class="form-group col-md-3">
 								<label>Service Schedule Type</label>
 								<div>
 									<?php
@@ -2183,34 +2148,34 @@ if (!empty($getlogpodtl)) {
 
 
 						</div>
-						<div class="col-md-12">
+						<div class="form-row">
 
-							<div class="col-md-3">
+							<div class="form-group col-md-3">
 								<label>Quantity<span class="text-danger">*</span></label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'ViewQuantity', 'value' => set_value('ViewQuantity'), 'id' => 'ViewQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
 							</div>
-							<div class="col-md-3">
+							<div class="form-group col-md-3">
 								<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
 							</div>
-							<div class="col-md-3">
+							<div class="form-group col-md-3">
 								<label>Per</label> <?php
 													$data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer',  'class' => 'form-control');
 													echo form_input($data); ?>
 							</div>
-							<div class="col-md-3">
+							<div class="form-group col-md-3">
 								<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'txtViewBasicValue', 'value' => set_value('txtViewBasicValue'), 'id' => 'txtViewBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
 									echo form_input($data);
@@ -2219,14 +2184,14 @@ if (!empty($getlogpodtl)) {
 							</div>
 
 						</div>
-						<div class="col-md-12">
-							<div class="col-md-6" align="right">
+						<div class="form-row">
+							<div class="form-group col-md-6" align="right">
 
 								CGST In %
 							</div>
 
-							<div class="col-md-3">
-								<div class="form-group">
+							<div class="form-group col-md-3">
+								<div>
 
 									<?php
 									$data = array('name' => 'ViewCgst', 'value' => set_value('ViewCgst'), 'id' => 'ViewCgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'readonly' => 'true');
@@ -2235,8 +2200,8 @@ if (!empty($getlogpodtl)) {
 								</div>
 
 							</div>
-							<div class="col-md-3">
-								<div class="form-group">
+							<div class="form-group col-md-3">
+								<div>
 
 									<?php
 									$data = array('name' => 'ViewAfterCgst', 'value' => set_value('ViewAfterCgst'), 'id' => 'ViewAfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
@@ -2247,14 +2212,14 @@ if (!empty($getlogpodtl)) {
 							</div>
 
 						</div>
-						<div class="col-md-12">
-							<div class="col-md-6" align="right">
+						<div class="form-row">
+							<div class="form-group col-md-6" align="right">
 
 								SGST In %
 							</div>
 
-							<div class="col-md-3">
-								<div class="form-group">
+							<div class="form-group col-md-3">
+								<div>
 
 									<?php
 									$data = array('name' => 'ViewSgst', 'value' => set_value('ViewSgst'), 'id' => 'ViewSgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'readonly' => 'true');
@@ -2263,8 +2228,8 @@ if (!empty($getlogpodtl)) {
 								</div>
 
 							</div>
-							<div class="col-md-3">
-								<div class="form-group">
+							<div class="form-group col-md-3">
+								<div>
 
 									<?php
 									$data = array('name' => 'ViewAfterSgst', 'value' => set_value('ViewAfterSgst'), 'id' => 'ViewAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
@@ -2275,14 +2240,14 @@ if (!empty($getlogpodtl)) {
 							</div>
 
 						</div>
-						<div class="col-md-12">
-							<div class="col-md-6" align="right">
+						<div class="form-row">
+							<div class="form-group col-md-6" align="right">
 
 								IGST In %
 							</div>
 
-							<div class="col-md-3">
-								<div class="form-group">
+							<div class="form-group col-md-3">
+								<div>
 
 									<?php
 									$data = array('name' => 'ViewIgst', 'value' => set_value('ViewIgst'), 'id' => 'ViewIgst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'readonly' => 'true');
@@ -2291,8 +2256,8 @@ if (!empty($getlogpodtl)) {
 								</div>
 
 							</div>
-							<div class="col-md-3">
-								<div class="form-group">
+							<div class="form-group col-md-3">
+								<div>
 
 									<?php
 									$data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst'), 'id' => 'ViewAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
@@ -2303,12 +2268,12 @@ if (!empty($getlogpodtl)) {
 							</div>
 
 						</div>
-						<div class="col-md-12">
-							<div class="col-md-5  col-md-offset-4" align="right">
+						<div class="form-row">
+							<div class="form-group col-md-5  col-md-offset-4" align="right">
 								<label>Other Allowances <?php echo "($INRSYM)" ?></label>
 							</div>
-							<div class="col-md-3">
-								<div class="form-group">
+							<div class="form-group col-md-3">
+								<div>
 									<?php
 									$data = array('name' => 'ViewOtherAllowances', 'value' => set_value('ViewOtherAllowances'), 'id' => 'ViewOtherAllowances',  'class' => 'form-control num', 'readonly' => 'true');
 									echo form_input($data);
@@ -2316,12 +2281,12 @@ if (!empty($getlogpodtl)) {
 								</div>
 							</div>
 						</div>
-						<div class="col-md-12">
-							<div class="col-md-5  col-md-offset-4" align="right">
+						<div class="form-row">
+							<div class="form-group col-md-5  col-md-offset-4" align="right">
 								<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
 							</div>
-							<div class="col-md-3">
-								<div class="form-group">
+							<div class="form-group col-md-3">
+								<div>
 									<?php
 									$data = array('name' => 'ViewTotalOrderValue', 'value' => set_value('ViewTotalOrderValue'), 'id' => 'ViewTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
 									echo form_input($data);
@@ -2329,15 +2294,17 @@ if (!empty($getlogpodtl)) {
 								</div>
 							</div>
 						</div>
-						<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
+						<div class="form-row">
+						<div class="form-group col-md-12">
 							<label>Service Description<span class="text-danger">*</span></label> <?php
-																										$data = array('name' => 'ViewtxtSpcialInstruction', 'value' => set_value('ViewtxtSpcialInstruction'), 'id' => 'ViewtxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40', 'readonly' => 'true');
-																										echo form_textarea($data);
-																										?>
+																									$data = array('name' => 'ViewtxtSpcialInstruction', 'value' => set_value('ViewtxtSpcialInstruction'), 'id' => 'ViewtxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40', 'readonly' => 'true');
+																									echo form_textarea($data);
+																									?>
+																									</div>
 						</div><br />
 
 						<div class="modal-footer">
-							<div class="col-md-12">
+							<div class="form-row">
 
 								<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
 							</div>
@@ -2365,7 +2332,7 @@ if (!empty($getlogpodtl)) {
 				<td align="left"><%=Taxvalue%></td>
 				<td align="left"><%=TotalValue%></td>
 				<td>
-					<a data-target='#EDITSERVICE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+					<a data-target='#EDITSERVICE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
 				</td>
 			</tr>
 		</script>
@@ -3568,14 +3535,14 @@ if (!empty($getlogpodtl)) {
 					div.id = "divid";
 					div.className = "row";
 					//alert(counter);
-					div.innerHTML = '<div class="col-md-12">' +
+					div.innerHTML = '<div class="form-row">' +
 
-						'<div class="col-md-3">' +
+						'<div class="form-group col-md-3">' +
 						'<label><br></label>' +
 						'<input type="file" name="browseFiles" id="images' + counter + '" onchange="Copyfilename(this.name); "><br>' +
 						'</div>' +
 
-						'<div class="col-md-2">' +
+						'<div class="form-group col-md-2">' +
 						'<label><br><br></label>' +
 						'<button class="btn btn-success add add_this" id="addbtn" onclick="addRow()">ADD</button></div>' +
 						'</div>' +
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 9d688d81..3a4cd529 100644
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -1,6 +1,7 @@
 <?php
 $insuranceStatus = array(
-    array("name" => "NO", "value" => "0"), array("name" => "YES", "value" => "1")
+    array("name" => "NO", "value" => "0"),
+    array("name" => "YES", "value" => "1")
 );
 $ReqType = '';
 $CompanyAddress = '';
@@ -2020,141 +2021,139 @@ if (!empty($INRSYMBOL)) {
     .num {
         text-align: right;
     }
+
     .header-container {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            padding: 25px;
-        }
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 25px;
+    }
 
-        .header-container h2 {
-            flex: 1;
-            text-align: center;
-            margin: 0;
-        }
+    .header-container h2 {
+        flex: 1;
+        text-align: center;
+        margin: 0;
+    }
 
-        .centered {
-            display: flex;
-            /* justify-content: center; */
-            align-items: center;
-            height: 10vh;
-        }
+    .centered {
+        display: flex;
+        /* justify-content: center; */
+        align-items: center;
+        height: 10vh;
+    }
 
-        .centered label,
-        .centered input {
-            margin: 0 5px;
-        }
-
-        .mandatory {
-            color: red;
-            text-align: right;
-            background-color: white;
-        }
+    .centered label,
+    .centered input {
+        margin: 0 5px;
+    }
 </style>
 
-<div class="content-wrapper">
-    <?php
-    $attributes = array('class' => 'form-label-left CreatealterPO ', 'name'  => 'CreatealterPO', 'id'  => 'CreatealterPO');
-
-    echo form_open(base_url() . '/purchaseorder/addalterPO/', $attributes); ?>
-
-    <section class="content">
-        <div class="box">
-            <div id="content"></div>
-            <div class="header-container">
-                        <h2>Emergency Purchase Order</h2>
-            </div>
-            <div class="container-fluid">
+<!-- sorce code  -->
+<div class="content-page">
+    <div class="content">
+        <!-- Start Content-->
+        <div class="container-fluid">
+            <!-- start page title -->
             <div class="row">
-                    <div class="col-md-12">
-                    <div class="col-md-3">
-                                <label>Request Type <span class="badge mandatory">*</span></label>
-                                <?php
-                                $options = array("-1" => 'Select Request Type');
+                <div class="col-12">
+                    <div class="page-title-box page-title-box-alt">
+                        <h4><?= "Emergency Purchase Order"; ?></h4>
+                    </div>
+                </div>
+            </div>
+            <!-- end page title -->
+            <!-- Form row -->
+            <div class="row">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-body">
+                            <?php
+                            $attributes = array('class' => 'form-label-left CreatealterPO ', 'name'  => 'CreatealterPO', 'id'  => 'CreatealterPO');
+                            echo form_open(base_url() . '/purchaseorder/addalterPO/', $attributes);
+                            ?>
 
-                                if (!empty($RequestType)) {
+                            <div class="form-row">
+                                <div class="form-group col-md-3">
+                                    <label>Request Type <span class="text-danger">*</span></label>
+                                    <?php
+                                    $options = array("-1" => 'Select Request Type');
 
-                                    foreach ($RequestType as $RID) :
-                                        if ($RID->ConfigValue == "SERVICE" || $RID->ConfigValue == "REVENUE") {
-                                            $options[$RID->ConfigValue] =  $RID->ConfigValue;
-                                        }
-                                    endforeach;
-                                }
+                                    if (!empty($RequestType)) {
 
-                                echo form_dropdown('RequestType', $options, set_value('ConfigValue'), 'id="purpose"', 'class = "form-control select2"', 'required="true"');
+                                        foreach ($RequestType as $RID) :
+                                            if ($RID->ConfigValue == "SERVICE" || $RID->ConfigValue == "REVENUE") {
+                                                $options[$RID->ConfigValue] =  $RID->ConfigValue;
+                                            }
+                                        endforeach;
+                                    }
 
-                                ?>
+                                    echo form_dropdown('RequestType', $options, set_value('ConfigValue'), 'id="purpose"', 'class = "form-control select2"', 'required="true"');
 
-                            </div>
-                            <div class="col-md-3">
-                                <label>Purchase Order Type</label>
-                                <div class="form-group">
+                                    ?>
 
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Purchase Order Type</label>
                                     <?php
                                     $data = array('name' => 'POType', 'value' => set_value('POType', $ReqType), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
                                     echo form_input($data);
                                     ?>
                                 </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label>Select Supplier<span class="badge mandatory" >*</span></label>
-                                <div>
-                                    <?php
-                                    $options = array("0" => 'Select Supplier');
-                                    //print_r(  $options);
+                                <div class="form-group col-md-3">
+                                    <label>Select Supplier<span class="text-danger">*</span></label>
+                                    <div>
+                                        <?php
+                                        $options = array("0" => 'Select Supplier');
+                                        //print_r(  $options);
 
-                                    if (!empty($Suplist)) {
-                                        foreach ($Suplist as $SID) :
-                                            $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
-                                        endforeach;
-                                    }
+                                        if (!empty($Suplist)) {
+                                            foreach ($Suplist as $SID) :
+                                                $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
+                                            endforeach;
+                                        }
 
-                                    echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier"', 'required="true"', 'class="form-control select2"');
+                                        echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier"', 'required="true"', 'class="form-control select2"');
 
-                                    ?>
+                                        ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label>Supplier Address</label>
-                                <div class="form-group">
+                                <div class="form-group col-md-3">
+                                    <label>Supplier Address</label>
                                     <?php
                                     $data = array('name' => 'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
                                     echo Form_textarea($data);
                                     ?>
                                 </div>
                             </div>
-                    </div>
-            </div>
-            <div class="row">
-                    <div class="col-md-12">
-                            <div class="col-md-3" style='display:none;' id='txtPoRange'>
-                                <b><u>Select Tax Range<span class="badge mandatory">*</span></u></b><br />
-                                <div class="centered">
+                            <div class="form-row">
+                                <div class="form-group col-md-3" style='display:none;' id='txtPoRange'>
+                                    <b><u>Select Tax Range<span class="text-danger">*</span></u></b><br />
+                                    <div class="centered">
                                         <?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", "id" => "Local", "value" => "0", 'checked' => set_radio('Range', '0', TRUE))); ?>
                                         <?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", "id" => "Inter_state", "value" => "1", 'checked' => set_radio('Range', '1', FALSE))); ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="col-md-3" style='display:none;' id='workstatus'>
-                                <label>Work Status<span class="badge mandatory">*</span></label>
-                                <?php
-                                if (!empty($WorkStatus)) {
-                                    //$options4 = array("0"=>'Selected Work Status'); 
-                                    foreach ($WorkStatus as $WSID) :
-                                        $options4[$WSID->StatusCode] =  $WSID->StatusName;
-                                    endforeach;
-                                }
-                                echo form_dropdown('workstatus', $options4, set_value('workstatus'), 'id="workstatusValue"', 'required="true"', 'class="form-control select2');
-                                ?>
-                            </div>
-                            <div class="col-md-3" id="Deliveryby">
-                                <b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
-                                <div class="centered">
+                                <div class="form-group col-md-3" style='display:none;' id='workstatus'>
+                                    <label>Work Status<span class="text-danger">*</span></label>
+                                    <?php
+                                    if (!empty($WorkStatus)) {
+                                        //$options4 = array("0"=>'Selected Work Status'); 
+                                        foreach ($WorkStatus as $WSID) :
+                                            $options4[$WSID->StatusCode] =  $WSID->StatusName;
+                                        endforeach;
+                                    }
+                                    echo form_dropdown('workstatus', $options4, set_value('workstatus'), 'id="workstatusValue"', 'required="true"', 'class="form-control select2');
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-3" id="Deliveryby">
+                                    <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", "id" => "Date", "value" => "0", 'checked' => set_radio('DateRange', '0', true))); ?>
                                         <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1", 'checked' => set_radio('DateRange', '1', false))); ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="col-md-3" id="Schedulediv">
-                                    <label>Schedule By<span class="badge mandatory">*</span></label>
+                                <div class="form-group col-md-3" id="Schedulediv">
+                                    <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');
@@ -2162,125 +2161,119 @@ if (!empty($INRSYMBOL)) {
                                     ?>
 
                                 </div>
-                                <div class="col-md-3" id="Deliverydtdiv" style="display:none;">
-                                    <label>Delivery Date<span class="badge mandatory">*</span></label>
+                                <div class="form-group col-md-3" id="Deliverydtdiv" style="display:none;">
+                                    <label>Delivery Date<span class="text-danger">*</span></label>
                                     <?php
                                     $data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $CurrentDate), 'id' => 'Deliverydt',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
                                     echo form_input($data);
                                     ?>
 
                                 </div>
-                            <div class="col-md-3">
-                                <label>Delivery Address</label>
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $CompanyAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
-                                    echo Form_textarea($data);
-                                    ?>
-
-                                </div>
-                            </div>
-                    </div>
-            </div>
-            <div class="row">
-                <div class="col-md-12">
-                <div id="currencyexchange" style='display:none;'>
-                                <div class="col-md-3">
-                                    <label>Currency Type<span class="badge mandatory">*</span></label>
-
-                                    <?php
-                                    $data = array('name' => 'txtcurrencytype', 'value' => set_value('txtcurrencytype'), 'id' => 'txtcurrencytype',  'class' => 'form-control', 'required' => 'true');
-                                    echo form_input($data);
-                                    ?>
-
-                                </div>
-                                <div class="col-md-3">
-                                    <label>Exchange Rate</label>
-
-                                    <?php
-                                    $data = array('name' => 'txtexachangerate', 'value' => set_value('txtexachangerate'), 'id' => 'txtexachangerate',  'class' => 'form-control', 'required' => 'true');
-                                    echo form_input($data);
-                                    ?>
-
-                                </div>
-                                <div class="col-md-3">
-                                    <a href="http://www.xe.com/" target="_blank"><u>To check Today's Foreign Exchange value</u></a>
-                                </div>
-                            </div>
-                </div>
-            </div>
-            <div class="row">
-                    <div class="col-md-12">
-                    <div class="col-md-3">
-                                <label>Department Name<span class="badge mandatory">*</span></label>
-                                <div>
-                                    <?php
-                                    $options1 = array("0" => 'Select Department Name');
-
-                                    if (!empty($DeptList)) {
-
-                                        foreach ($DeptList as $DID) :
-
-                                            $options1[$DID->DEPCode] =  $DID->DEPCode . ' ' . ' - ' . ' ' . $DID->DepartmentName;
-
-                                        endforeach;
-                                    }
-
-                                    echo form_dropdown('drpDepartment', $options1, set_value('drpDepartment'), 'id="DepartmentName"', 'class = "form-control select2"', 'required="true"', 'disabled="disabled"');
-
-                                    ?>
-
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label>Cost Center Name<span class="badge mandatory">*</span></label>
-                                <div>
-                                    <?php
-                                    $options2 = array("0" => 'Cost Center Name');
-
-
-                                    if (!empty($CostList)) {
-
-                                        foreach ($CostList as $cost) :
-
-
-                                            $options2[$cost['CostCenterCode']] =  $cost['CostCenterCode'] . ' ' . ' - ' . ' ' . $cost['CostCenterName'];
-
-                                        endforeach;
-                                    }
-
-                                    echo form_dropdown('CostCenterName', $options2, set_value('CostCenterName'), 'id="CostCenterName"', 'class="form-control select2"', 'required="true"', 'multiple="true"');
-
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="col-md-3" style="display:none;">
-                                <label>Available Budget <?php echo "($INRSYM)" ?></label><img id="AlertImg" src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image" width="25px" style="display:none;" />
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'AvalBuget', 'value' => set_value('AvalBuget'), 'id' => 'AvalBuget',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_hidden($data);
-                                    // echo form_input($data);
-
-
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="col-md-3" id="DisplayScheduleDiv" style="display:none;">
-                                    <label>Select Service Schedule Type</label>
-                                    <div class="form-group">
+                                <div class="form-group col-md-3">
+                                    <label>Delivery Address</label>
+                                    <div>
                                         <?php
-                                        $Schdule = array("One Time", "Recurring");
-                                        if (!empty($Schdule)) {
-                                            foreach ($Schdule as $Sch) :
-                                                $SchType[$Sch] =  $Sch;
+                                        $data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $CompanyAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
+                                        echo Form_textarea($data);
+                                        ?>
+
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div id="currencyexchange" style='display:none;'>
+                                    <div class="form-group col-md-3">
+                                        <label>Currency Type<span class="text-danger">*</span></label>
+
+                                        <?php
+                                        $data = array('name' => 'txtcurrencytype', 'value' => set_value('txtcurrencytype'), 'id' => 'txtcurrencytype',  'class' => 'form-control', 'required' => 'true');
+                                        echo form_input($data);
+                                        ?>
+
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <label>Exchange Rate</label>
+
+                                        <?php
+                                        $data = array('name' => 'txtexachangerate', 'value' => set_value('txtexachangerate'), 'id' => 'txtexachangerate',  'class' => 'form-control', 'required' => 'true');
+                                        echo form_input($data);
+                                        ?>
+
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <a href="http://www.xe.com/" target="_blank"><u>To check Today's Foreign Exchange value</u></a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-3">
+                                    <label>Department Name<span class="text-danger">*</span></label>
+                                    <div>
+                                        <?php
+                                        $options1 = array("0" => 'Select Department Name');
+
+                                        if (!empty($DeptList)) {
+
+                                            foreach ($DeptList as $DID) :
+
+                                                $options1[$DID->DEPCode] =  $DID->DEPCode . ' ' . ' - ' . ' ' . $DID->DepartmentName;
+
                                             endforeach;
                                         }
-                                        echo form_dropdown('ScheduleType', $SchType, set_value('ScheduleType'), 'id="ScheduleType"', 'class = "form-control"');
+
+                                        echo form_dropdown('drpDepartment', $options1, set_value('drpDepartment'), 'id="DepartmentName"', 'class = "form-control select2"', 'required="true"', 'disabled="disabled"');
+
+                                        ?>
+
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Cost Center Name<span class="text-danger">*</span></label>
+                                    <div>
+                                        <?php
+                                        $options2 = array("0" => 'Cost Center Name');
+
+
+                                        if (!empty($CostList)) {
+
+                                            foreach ($CostList as $cost) :
+
+
+                                                $options2[$cost['CostCenterCode']] =  $cost['CostCenterCode'] . ' ' . ' - ' . ' ' . $cost['CostCenterName'];
+
+                                            endforeach;
+                                        }
+
+                                        echo form_dropdown('CostCenterName', $options2, set_value('CostCenterName'), 'id="CostCenterName"', 'class="form-control select2"', 'required="true"', 'multiple="true"');
+
                                         ?>
                                     </div>
                                 </div>
-                                <div class="col-md-3" id="ServicePeriodOption" style="display:none;">
+                                <div class="form-group col-md-3" style="display:none;">
+                                    <label>Available Budget <?php echo "($INRSYM)" ?></label><img id="AlertImg" src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image" width="25px" style="display:none;" />
+                                    <div class="form-group">
+                                        <?php
+                                        $data = array('name' => 'AvalBuget', 'value' => set_value('AvalBuget'), 'id' => 'AvalBuget',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_hidden($data);
+                                        // echo form_input($data);
+
+
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3" id="DisplayScheduleDiv" style="display:none;">
+                                    <label>Select Service Schedule Type</label>
+                                    <?php
+                                    $Schdule = array("One Time", "Recurring");
+                                    if (!empty($Schdule)) {
+                                        foreach ($Schdule as $Sch) :
+                                            $SchType[$Sch] =  $Sch;
+                                        endforeach;
+                                    }
+                                    echo form_dropdown('ScheduleType', $SchType, set_value('ScheduleType'), 'id="ScheduleType"', 'class = "form-control"');
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-3" id="ServicePeriodOption" style="display:none;">
                                     <label>Select Service Period Option</label>
                                     <div class="form-group">
                                         <?php
@@ -2299,7 +2292,7 @@ if (!empty($INRSYMBOL)) {
                                         ?>
                                     </div>
                                 </div>
-                                <div class="col-md-3" id="NoServices" style="display:none;">
+                                <div class="form-group col-md-3" id="NoServices" style="display:none;">
                                     <label>Number of Services</label>
                                     <div class="form-group">
                                         <?php
@@ -2309,89 +2302,68 @@ if (!empty($INRSYMBOL)) {
                                         ?>
                                     </div>
                                 </div>
-                    </div>
-            </div>
-            <div class="row">
-                    <div class="col-md-12">
-                            <div class="col-md-3">
-                                <label>Purchase Order Date</label>
-                                <div class="form-group">
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-3">
+                                    <label>Purchase Order Date</label>
                                     <?php
                                     $data = array('name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
                                     echo form_input($data);
                                     ?>
                                 </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label>Mode Of Shipment</label>
-                                <div class="form-group">
+                                <div class="form-group col-md-3">
+                                    <label>Mode Of Shipment</label>
                                     <?php
                                     $data = array('name' => 'emergmodeofshipment', 'value' => set_value('emergmodeofshipment'), 'id' => 'emergmodeofshipment',  'class' => 'form-control');
                                     echo form_input($data);
                                     ?>
                                 </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label>Contact Reference</label>
-                                <div class="form-group">
-
+                                <div class="form-group col-md-3">
+                                    <label>Contact Reference</label>
                                     <?php
                                     $data = array('name' => 'emergsupplierreference', 'value' => set_value('emergsupplierreference'), 'id' => 'emergsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
                                     echo form_input($data);
                                     ?>
                                 </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label>Supplier's Offer No</label>
-                                <div class="form-group">
+                                <div class="form-group col-md-3">
+                                    <label>Supplier's Offer No</label>
                                     <?php
                                     $data = array('name' => 'emergsupplierofferno', 'value' => set_value('emergsupplierofferno'), 'id' => 'emergsupplierofferno',  'class' => 'form-control');
                                     echo form_input($data);
                                     ?>
                                 </div>
-
                             </div>
-                    </div>
-            </div>
-            <div class="row">
-                    <div class="col-md-12">
-                                    <div class="col-md-3">
-                                            <label>Our Reference(S)</label>
-                                            <div class="form-group">
-
-                                                <?php
-                                                $data = array('name' => 'emergotherreference', 'value' => set_value('emergotherreference'), 'id' => 'emergotherreference',  'class' => 'form-control');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                    </div>
-                                    <div class="col-md-3">
-                                    <label id="typeOptions">Service Type Options<span class="badge mandatory">*</span></label>
-                                    <div class="form-group">
-                                        <?php
-
-                                        $optionsPO = array("0" => 'Select');
-
-                                        if (!empty($PoTypeOptions)) {
-                                            foreach ($PoTypeOptions as $POpt) :
-
-
-                                                $optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
-
-                                            endforeach;
-                                        }
-
-                                        echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
-
-
-                                        ?>
-                                    </div>
-
-
-
+                            <div class="form-row">
+                                <div class="form-group col-md-3">
+                                    <label>Our Reference(S)</label>
+                                    <?php
+                                    $data = array('name' => 'emergotherreference', 'value' => set_value('emergotherreference'), 'id' => 'emergotherreference',  'class' => 'form-control');
+                                    echo form_input($data);
+                                    ?>
                                 </div>
-                                <div class="col-md-3">
-                                    <label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
+                                <div class="form-group col-md-3">
+                                    <label id="typeOptions">Service Type Options<span class="text-danger">*</span></label>
+
+                                    <?php
+
+                                    $optionsPO = array("0" => 'Select');
+
+                                    if (!empty($PoTypeOptions)) {
+                                        foreach ($PoTypeOptions as $POpt) :
+
+
+                                            $optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
+
+                                        endforeach;
+                                    }
+
+                                    echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
+
+
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label for="payablefrom">Payable Terms<span class="text-danger">*</span></label>
                                     <?php
                                     $options1 = array("0" => 'Select Payment method');
                                     //print_r(  $options);
@@ -2406,90 +2378,302 @@ if (!empty($INRSYMBOL)) {
                                     echo form_dropdown('PaymentMethod', $options1, set_value('PaymentMethod'), 'id="PaymentMethod"', 'class="form-control"');
                                     ?>
                                 </div>
+                                <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
+                                    <label>Description of Payable Terms<span class="text-danger">*</span></label>
+                                    <?php
+                                    $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-row">
 
-                                <div class="col-md-3" id="otheroptiondiv" style="display:none;">
-                                    <label>Description of Payable Terms<span class="badge mandatory">*</span></label>
-                                    <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
-                                        echo form_input($data);
-                                        ?>
+                                <div class="form-group col-md-3">
+                                    <label>Insurance Options<span class="text-danger">*</span></label>
+                                    <?php
+                                    if (!empty($insuranceStatus)) {
+                                        foreach ($insuranceStatus as $INS) :
+
+
+                                            $optionsInsurance[$INS['value']] =  $INS['name'];
+
+                                        endforeach;
+                                    }
+
+                                    echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus"', 'required="true"', 'class="form-control select2');
+
+
+                                    ?>
+
+
+
+
+
+
+                                </div>
+                                <div class="form-group col-md-3" id="insuranceTxtDiv" style="display:block;">
+                                    <label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
+                                    <?php
+                                    $data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber'), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
+                                    <?php
+                                    $optionsnew = array('0' => 'Select', '1' => 'REVENUE', '2' => 'CAPITAL');
+                                    echo form_dropdown('BudgetType', $optionsnew, set_value('BudgetType'), 'id="BudgetType"', 'required="true"', 'class="form-control select2');
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-3">
+
+                                </div>
+
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:10px">
+                                    <input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT
+                                </div>
+                                <div class="form-group col-md-1" align="right">
+                                    <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a>
+                                </div>
+
+                            </div>
+                            <div class="form-row">
+                                <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px">
+                                    <thead style="background-color: #ddd;">
+                                        <tr>
+                                            <th>SNo</th>
+                                            <th>Requisition No</th>
+                                            <th>Item Code</th>
+                                            <th>Item Description</th>
+                                            <th>Quantity</th>
+                                            <th>UOM</th>
+                                            <th>Rate<?php echo "($INRSYM)" ?></th>
+                                            <th>Basic Amount<?php echo "($INRSYM)" ?></th>
+                                            <th>Tax Amount<?php echo "($INRSYM)" ?></th>
+                                            <th>Total Order Amount<?php echo "($INRSYM)" ?></th>
+                                            <th>Action</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody id="ServiceAppend"></tbody>
+                                    <tbody id="RevenueAppend"></tbody>
+                                </table>
+                            </div>
+                            <div class="form-row">
+                                <!-- Revenue po taxes -->
+                                <div class="form-group col-md-12" style='display:none;' id="revenuepotaxes">
+                                    <br />
+                                    <div class="form-group col-md-12">
+                                        <div class="form-group col-md-3">
+                                            <label>Basic Amount <?php echo "($INRSYM)" ?> </label>
+                                            <?php
+                                            $data = array('name' => 'txtTotBasicAmountRevenue', 'value' => set_value('txtTotBasicAmountRevenue'), 'id' => 'txtTotBasicAmountRevenue',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+
+                                        </div>
+                                        <div class="form-group col-md-3">
+                                            <label>Total Discount <?php echo "($INRSYM)" ?> </label>
+                                            <?php
+                                            $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount'), 'id' => 'txtTotalDiscount',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+
+                                        <div class="form-group col-md-3">
+                                            <label>CGST <?php echo "($INRSYM)" ?> </label>
+                                            <?php
+                                            $data = array('name' => 'txtTotalCGST', 'value' => set_value('txtTotalCGST'), 'id' => 'txtTotalCGST',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+
+                                        <div class="form-group col-md-3" id="displaySGST">
+                                            <label>SGST <?php echo "($INRSYM)" ?> </label>
+                                            <?php
+                                            $data = array('name' => 'txtTotalSGST', 'value' => set_value('txtTotalSGST'), 'id' => 'txtTotalSGST',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                        <div class="form-group col-md-3" id="displayIGST" style="display:none;">
+                                            <label> IGST <?php echo "($INRSYM)" ?> </label>
+                                            <?php
+                                            $data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST'), 'id' => 'txtTotalIGST',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-12">
+                                        <div class="form-group col-md-3">
+                                            <label>Total Packaging <?php echo "($INRSYM)" ?> </label>
+                                            <?php
+                                            $data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing'), 'id' => 'txtTotalPackaing',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+
+
+                                        <div class="form-group col-md-3">
+                                            <label>Total Insurance <?php echo "($INRSYM)" ?> </label>
+                                            <?php
+                                            $data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance'), 'id' => 'txtTotalInsurance',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+
+                                        <div class="form-group col-md-3">
+                                            <label>Total Freight <?php echo "($INRSYM)" ?></label>
+                                            <?php
+                                            $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight'), 'id' => 'txtTotalFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+
+                                        <div class="form-group col-md-3">
+                                            <label>Total Order Value <?php echo "($INRSYM)" ?></label>
+                                            <?php
+                                            $data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary'), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-12">
+                                        <div class="form-group col-md-12">
+                                            <label>Special Instructions </label>
+                                            <?php
+                                            $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '8');
+                                            echo form_textarea($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-12">
+                                        <div class="form-group col-md-3 col-md-offset-9"><br />
+                                            <input type="file" name="POFiles" id="POFiles"><br>
+                                            <input type="hidden" name="txtPoRange" id="txtPoRange" />
+                                            <input type="hidden" name="isEdit" id="isEdit" value="0" />
+                                            <input type="hidden" name="txtStatus1" id="txtStatus1" />
+                                            <input type="hidden" name="txtRowCount1" id="txtRowCount1" />
+                                            <input type="hidden" name="txtDeletedRow1" id="txtDeletedRow1" />
+                                            <input type="hidden" name="CheckLocalInter" id="CheckLocalInter" />
+                                            <input type="hidden" name="Budget" id="Budget" />
+                                            <input type="hidden" name="txtSpecial" id="txtSpecial" />
+                                            <input type="hidden" name="txtQuality" id="txtQuality" />
+                                            <!-- <a class="btn btn-success Save"  ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
+                                            <a class="btn btn-reset Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                            <a class="btn btn-success Submit" ID="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+
+
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-12" style="padding:0px;"><br />
                                     </div>
                                 </div>
-                    </div>
+
+                                <!-- Service po taxes -->
+                                <div class="form-group col-md-12" style="display:none;" id="servicepotaxes">
+                                    <div class="form-group col-md-12" style="padding:0px;">
+                                        <div class="form-group col-md-2">
+                                            <label>Basic Amount <?php echo "($INRSYM)" ?></label>
+                                            <?php
+                                            $data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount'), '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'), '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'), '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'), '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' => 'txtTotOtherAllo', 'value' => set_value('txtTotOtherAllo'), 'id' => 'txtTotOtherAllo',  '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' => 'txtTotalOrderValueSummaryService', 'value' => set_value('txtTotalOrderValueSummaryService'), 'id' => 'txtTotalOrderValueSummaryService',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+
+
+                                        </div>
+                                    </div>
+                                    <!--start new fields 1 sep-->
+                                    <div class="form-group col-md-12" id="emergdescofpoDiv" style="display:none;">
+                                        <label>Description Of Service<span class="text-danger">*</label>
+
+                                        <?php
+                                        $data = array('name' => 'emergdescofpo', 'value' => set_value('emergdescofpo'), 'id' => 'emergdescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+                                        echo form_textarea($data);
+                                        ?>
+
+                                    </div><!--end new fields 1 sep-->
+                                    <div class="form-group col-md-12" style="padding:0px;">
+
+                                        <label>Scope Of Work</label> <?php
+                                                                        $data = array('name' => 'ScopeOfWork', 'value' => set_value('ScopeOfWork'), 'id' => 'ScopeOfWork',  'class' => 'form-control', 'rows' => '8');
+                                                                        echo form_textarea($data); ?>
+
+                                    </div>
+
+                                    <div class="form-group col-md-12">
+                                        <br />
+                                        <div align="right" style="padding-right:10px">
+                                            <input type="file" name="POFile" id="POFile"><br>
+                                            <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="SpcialInstruction" id="SpcialInstruction">
+                                            <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress">
+                                            <input type="hidden" name="txtSpecialservice" id="txtSpecialservice" />
+                                            <input type="hidden" name="txtworkstatus" id="txtworkstatus" />
+                                            <a class="btn btn-reset Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                            <a class="btn btn-success Submit" ID="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                        </div><br />
+                                    </div>
+                                    <br />
+                                </div>
+                            </div>
+                        </div> <!-- end card body-->
+                    </div> <!-- end card -->
+                </div><!-- end col-->
             </div>
-            <div class="row">
-                    <div class="col-md-12">
-                    <div class="col-md-3">
-                                    <label>Insurance Options<span class="badge mandatory">*</span></label>
-                                    <div class="form-group">
-
-                                        <?php
-
-                                        if (!empty($insuranceStatus)) {
-                                            foreach ($insuranceStatus as $INS) :
-
-
-                                                $optionsInsurance[$INS['value']] =  $INS['name'];
-
-                                            endforeach;
-                                        }
-
-                                        echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus"', 'required="true"', 'class="form-control select2');
-
-
-                                        ?>
-                                    </div>
-
-
-
-
-
-                                </div>
-                                <div class="col-md-3" id="insuranceTxtDiv" style="display:block;">
-                                    <label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
-                                    <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber'), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            <div class="col-md-3">
-                                <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
-                                <?php
-                                $optionsnew = array('0' => 'Select', '1' => 'REVENUE', '2' => 'CAPITAL');
-                                echo form_dropdown('BudgetType', $optionsnew, set_value('BudgetType'), 'id="BudgetType"', 'required="true"', 'class="form-control select2');
-                                ?>
-                            </div>
-                            <div class="col-md-3">
-                                
-                            </div>
-                    </div>
+        </div> <!-- container -->
+    </div> <!-- content -->
+</div>
+<!-- Modal for Packing Calculation -->
+<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Packing Calculation On</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
             </div>
-
-                <div class="col-md-12">
-                    <div class="col-md-3 col-md-offset-7" align="right" style="padding:10px">
-                        <input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT
-                    </div>
-                    <div class="col-md-1" align="right">
-                        <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a>
-                    </div>
-
-                </div>
-                <!-- Modal for Packing Calculation -->
-                <div id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-                    <div class="modal-dialog">
-
-                        <!-- Modal content-->
-                        <div class="modal-content">
-                            <div class="modal-header">
-                                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                                <h4 class="modal-title">Packing Calculation On</h4>
-                            </div>
-                            <div class="modal-body">
+            <div class="modal-body p-4">
                                 <form>
-
                                     <div class="radio">
                                         <label><input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount</label>
                                     </div>
@@ -2497,27 +2681,25 @@ if (!empty($INRSYMBOL)) {
                                         <label><input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount</label>
                                     </div>
                                 </form>
-                            </div>
-                            <div class="modal-footer">
-                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                                <a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-                <div id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-                    <div class="modal-dialog">
-
-                        <!-- Modal content-->
-                        <div class="modal-content">
-                            <div class="modal-header">
-
-                                <h4 class="modal-title">Packing Calculation On</h4>
-                            </div>
-                            <div class="modal-body">
-                                <form>
-
+            </div>
+            <div class="modal-footer">
+                <a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>
+                <a class="btn btn-info waves-effect waves-light" ID="PackagingOption" onclick="SetPackagingOption();">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+            </div>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Packing Calculation On</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body p-4">
+                <form>
                                     <div class="radio">
                                         <label><input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount</label>
                                     </div>
@@ -2525,59 +2707,56 @@ if (!empty($INRSYMBOL)) {
                                         <label><input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount</label>
                                     </div>
                                 </form>
-                            </div>
-                            <div class="modal-footer">
-                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                                <a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-                <div id="submitmodel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel">
-                    <div class="modal-dialog">
-
-                        <!-- Modal content-->
-                        <div class="modal-content">
-                            <div class="modal-header">
-
-                                <h4 class="modal-title">Material has been Received</h4>
-                            </div>
-                            <div class="modal-body">
-                                <form>
-
-                                    <div class="radio">
+            </div>
+            <div class="modal-footer">
+                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+                <a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+            </div>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<div id="submitmodel" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Material has been Received</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <form>
+            <div class="modal-body p-4">
+                 <div class="radio">
                                         <label><input type="radio" name="optsubmit" id="optsubmit" value='1'>YES</label>
                                     </div>
 
                                     <div class="radio">
                                         <label><input type="radio" name="optsubmit" checked="checked" value='0' id="optsubmit">NO</label>
                                     </div>
-
-                                    <div class="modal-footer">
-                                        <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+            </div>
+            <div class="modal-footer">
+            <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
                                         <a class="btn btn-success" ID="PackagingOption" onclick="submitoption();dropdownselect();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
                                     </div>
                                 </form>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-                <div id="filemodel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel">
-                    <div class="modal-dialog">
-
-                        <!-- Modal content-->
-                        <div class="modal-content" style="width:950px;">
-                            <div class="modal-header">
-
-                                <h4 class="modal-title">Add Bill Details</h4>
-                            </div>
-                            <div class="modal-body" style="padding:0px;">
+        </div>
+    </div>
+</div><!-- /.modal -->
+<div id="filemodel" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Add Bill Details</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body p-4">
+            <div style="padding:0px;">
                                 <div class="col-md-12">
                                     <!-- <div class="col-md-4 pad"><strong>Select Item Code</strong>
                                   <select id="emergencyitemcode" name="emergencyitemcode" class = "form-control select2">
-<!-- <option value="1"> select material code</option> 
+                                    <!-- <option value="1"> select material code</option> 
                                </select>
        
                                 </div>-->
@@ -2632,14 +2811,14 @@ if (!empty($INRSYMBOL)) {
 
                                 <div class="col-md-12">
                                     <!-- <div class="col-md-5">
-                             <input type = "file"  size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG,.jpg"  id="imag" name="images" onChange="filecheck();"/>  
+                                        <input type = "file"  size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG,.jpg"  id="imag" name="images" onChange="filecheck();"/>  
        
 
 
 
 
-                     <label for="images">Select file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label> 
-</div>  -->
+                                     <label for="images">Select file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label> 
+                                    </div>  -->
                                     <div class="col-md-10">
 
                                         <!--  <legend>Multiple File</legend>  -->
@@ -2668,68 +2847,52 @@ if (!empty($INRSYMBOL)) {
 
 
                                     <!--<thead>
-<tr>             
-<th>MaterialCode1</th>              
-<th>DeliveryChallanDate</th>          
-<th>DeliveryChallanNo</th>   
-<th>VehicleNo</th>         
-<th>CourierNo</th>
-<th>Quantity12</th>
-<th>File</th>
-</tr>         
-</thead>-->
+                                        <tr>             
+                                        <th>MaterialCode1</th>              
+                                        <th>DeliveryChallanDate</th>          
+                                        <th>DeliveryChallanNo</th>   
+                                        <th>VehicleNo</th>         
+                                        <th>CourierNo</th>
+                                        <th>Quantity12</th>
+                                        <th>File</th>
+                                        </tr>         
+                                        </thead>-->
 
                                     <tbody id="specialappend">
 
                                     </tbody>
                                 </table>
                             </div>
-
-                            <div class="modal-footer">
-                                <div class="col-md-12 text-right">
-                                    <!--  <div class="col-md-4">
-                           <a class="btn btn-success  Add" onclick="addtable();"><span class="bold">Add table</span></a>
-                           </div>  -->
-
-
-                                    <div class="col-md-4 col-md-offset-8">
-                                        <a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
-                                        <a class="btn btn-success ok" ID="ExciseOption12" onclick="rfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- </form> -->
-                </div>
-
-
-                <div id="servicemodel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel">
-                    <div class="modal-dialog">
-
-                        <!-- Modal content-->
-                        <div class="modal-content" style="width:950px;">
-                            <div class="modal-header">
-
-                                <h4 class="modal-title">SERVICE Bill Details</h4>
-                            </div>
-                            <div class="modal-body" style="padding:0px;">
-                                <div class="col-md-12">
-
-
-                                    <!--                  <div class="col-md-4">
+            </div>
+            <div class="modal-footer">
+            <a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
+            <a class="btn btn-success ok" ID="ExciseOption12" onclick="rfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+            </div>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<div id="servicemodel" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">SERVICE Bill Details</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body p-4">
+                 <!--                  <div class="col-md-4">
                                 <input type = "file"  size = "20" input accept=".docx,.pdx,.doc.JPG,.PNG,.jpg"  id="images1" name="images1" onChange="sfilecheck();"/> 
                                 <label for="images">Select Company file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
-</div>  
-                               
-                            </div> -->
+                                            </div>  
+                                                                        
+                                                                        </div> -->
 
 
-                                    <!-- <div class="col-md-10"> -->
+                                                                                <!-- <div class="col-md-10"> -->
 
                                     <!--  <legend>Multiple File</legend>  -->
-                                    <div class="col-md-offset-0 col-md-1">
+                                       <div class="col-md-offset-0 col-md-1">
                                         <input type="button" class="btn btn-success" id="addemorebutton" value=" + ADD FILES..">
                                     </div>
 
@@ -2738,45 +2901,25 @@ if (!empty($INRSYMBOL)) {
                                     <input type="hidden" name="hidecounters" id="hidecounters" value="0" />
                                     <input type="hidden" name="hideconstants" id="hideconstants" value="0" />
 
-
-                                </div>
-
-
-
-                            </div>
-
-
-
-                            <div class="modal-footer">
-                                <div class="col-md-12 text-right">
-
-                                    <div class="col-md-4 col-md-offset-8">
-                                        <a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
-                                        <a class="btn btn-success ok" ID="ExciseOption12" onclick="sfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-
-                </div>
-
-
-
-
-
-                <div id="freightmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-                    <div class="modal-dialog">
-
-                        <!-- Modal content-->
-                        <div class="modal-content">
-                            <div class="modal-header">
-
-                                <h4 class="modal-title">Freight Calculation On</h4>
-                            </div>
-                            <div class="modal-body">
-                                <form>
+            </div>
+            <div class="modal-footer">
+            <a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
+            <a class="btn btn-success ok" ID="ExciseOption12" onclick="sfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+            </div>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<div id="freightmodel" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Freight Calculation On</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body p-4">
+                <form>
 
                                     <div class="radio">
                                         <label><input type="radio" name="optfreight" checked="checked" value='0' id="optfreight"> Basic Amount</label>
@@ -2785,28 +2928,26 @@ if (!empty($INRSYMBOL)) {
                                         <label><input type="radio" name="optfreight" id="optfreight" value='1'> After Discount Amount</label>
                                     </div>
                                 </form>
-                            </div>
-                            <div class="modal-footer">
-                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                                <a class="btn btn-success" ID="freightOption" onclick="setfreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-
-                <!-- Modal for Excise Duty Calculation-->
-                <div class="modal fade" id="ExciseDutyCalModel" role="dialog">
-                    <div class="modal-dialog">
-
-                        <!-- Modal content-->
-                        <div class="modal-content">
-                            <div class="modal-header">
-
-                                <h4 class="modal-title">Excise Duty Calculation On</h4>
-                            </div>
-                            <div class="modal-body">
-                                <form>
+            </div>
+            <div class="modal-footer">
+            <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+            <a class="btn btn-success" ID="freightOption" onclick="setfreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+            </div>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<!-- Modal for Excise Duty Calculation-->
+<div id="ExciseDutyCalModel" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Excise Duty Calculation On</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body p-4">
+                <form>
                                     <div class="radio">
                                         <label><input type="radio" name="optExcise" checked="checked" value="0" id="optExcise">From Basic Amount</label>
                                     </div>
@@ -2821,29 +2962,26 @@ if (!empty($INRSYMBOL)) {
                                     </div>
 
                                 </form>
-                            </div>
-                            <div class="modal-footer">
-                                <a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                                <a class="btn btn-success" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-
-
-                <!-- Modal for Vat Calculation -->
-                <div class="modal fade" id="VatCalModel" role="dialog">
-                    <div class="modal-dialog">
-
-                        <!-- Modal content-->
-                        <div class="modal-content">
-                            <div class="modal-header">
-
-                                <h4 class="modal-title">Vat Calculation On</h4>
-                            </div>
-                            <div class="modal-body">
-                                <form>
+            </div>
+            <div class="modal-footer">
+                <a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" style="margin-top: -24px;" value="Cancel">Cancel</a>
+                <a class="btn btn-success" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+            </div>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<!-- Modal for Vat Calculation -->
+<div id="VatCalModel" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Vat Calculation On</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body p-4">
+                 <form>
 
                                     <div class="radio">
                                         <label><input type="radio" name="optVat" checked="checked" value="0" id="optVat">Basic Amount</label>
@@ -2852,27 +2990,27 @@ if (!empty($INRSYMBOL)) {
                                         <label><input type="radio" name="optVat" value="1" id="optVat">Excise Duty</label>
                                     </div>
                                 </form>
-                            </div>
-                            <div class="modal-footer">
-                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                                <a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                            </div>
-                        </div>
+            </div>
+            <div class="modal-footer">
+            <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+            <a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+            </div>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<!-- Modal for CST Calculation -->
 
-                    </div>
-                </div>
-                <!-- Modal for CST Calculation -->
-                <div class="modal fade" id="CSTCalModel" role="dialog">
-                    <div class="modal-dialog">
-
-                        <!-- Modal for CST Calculation-->
-                        <div class="modal-content">
-                            <div class="modal-header">
-
-                                <h4 class="modal-title">CST Calculation On</h4>
-                            </div>
-                            <div class="modal-body">
-                                <form>
+<div id="add-req-modal" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">CST Calculation On</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body p-4">
+                 <form>
 
                                     <div class="radio">
                                         <label><input type="radio" name="optCST" checked="checked" value="0" id="optCST">Basic Amount</label>
@@ -2881,351 +3019,345 @@ if (!empty($INRSYMBOL)) {
                                         <label><input type="radio" name="optCST" value="1" id="optCST">Excise Duty</label>
                                     </div>
                                 </form>
-                            </div>
-                            <div class="modal-footer">
-                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                                <a class="btn btn-success" ID="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-                <!-- Edit Service Modal content-->
-                <div class="modal fade" id="EDITSERVICE" role="dialog" style="overflow-y:scroll !important">
-                    <div class="modal-dialog">
-                        <!-- Modal content-->
-                        <form>
-                            <div class="modal-content" style="width:1000px;">
-                                <div class="modal-header">
-
-                                    <center>
-                                        <h4>Edit Service Purchase Order Item </h4>
-                                    </center>
-                                </div>
-                                <div align="left">
-
-                                    <div class="col-md-12">
-                                        <div class="col-md-3">
-                                            <label>Req No<span class="badge mandatory">*</span></label>
-                                            <div>
-                                                <?php
-
-                                                $data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-
-                                            </div>
-                                        </div>
-
-                                        <div class="col-md-3">
-                                            <label>Department Name</label>
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-3">
-                                            <label>Cost Center Code</label>
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-3" style="display:none;">
-                                            <label>Available Budget Amount</label><img id="AlertImg" src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image" width="25px" style="display:none;" />
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_hidden($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                    </div>
-                                    <div class="col-md-12">
-                                        <div class="col-md-3">
-                                            <label>Item Code<span class="badge mandatory">*</span></label>
-                                            <div>
-                                                <?php
-                                                $options = array("0" => 'Item Code');
-                                                //print_r(  $options);
-
-                                                echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
-
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                        <div class="col-md-3">
-                                            <label>Item Name</label>
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-3">
-                                            <label>UOM</label>
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-3">
-                                            <label>Frequency</label>
-                                            <div class="form-group">
-
-                                                <?php
-                                                $data = array('name' => 'EditFrequencyChange', 'value' => set_value('EditFrequencyChange'), 'id' => 'EditFrequencyChange',  'class' => 'form-control', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-
-                                            </div>
-                                        </div>
-
-                                    </div>
-
-                                    <!-- <div class="col-md-12">
-                                                <div class="col-md-4" id="EditDisplayScheduleDiv" style="display:none;">
-                                                         <label>Select Service Schedule Type</label>
-                                                            <div class="form-group">
-                                                                 <?php
-                                                                    $Schdule = array("One Time", "Recurring");
-
-
-                                                                    if (!empty($Schdule)) {
-                                                                        foreach ($Schdule as $Sch) :
-
-                                                                            $SchType[$Sch] =  $Sch;
-
-                                                                        endforeach;
-                                                                    }
-                                                                    echo form_dropdown('EditScheduleType', $SchType, set_value('EditScheduleType'), 'id="EditScheduleType"', 'class = "form-control"');
-
-                                                                    ?>  
-                                                            </div>
-                                                         </div>
-                                                    <div class="col-md-4" id="EditServicePeriodOption" style="display:none;">
-                                                         <label>Select Service Period Option</label>
-                                                            <div class="form-group">
-                                                                 <?php
-
-
-
-                                                                    if (!empty($ServiceOption)) {
-                                                                        foreach ($ServiceOption as $SerOption) :
-
-
-                                                                            $ServiceOptions[$SerOption->ConfigValue] =  $SerOption->ConfigValue;
-                                                                        endforeach;
-                                                                    }
-                                                                    echo form_dropdown('EditServiceOptions', $ServiceOptions, set_value('EditServiceOptions'), 'id="EditServiceOptions"', 'class = "form-control"');
-
-                                                                    ?>  
-                                                            </div>
-                                                         </div>
-                                                          <div class="col-md-4" id="EditNoServices" style="display:none;">
-                                                         <label>Number of Services</label>
-                                                            <div class="form-group">
-                                                                 <?php
-
-                                                                    $data = array('name' => 'EditServiceNo', 'value' => set_value('EditServiceNo'), 'id' => 'EditServiceNo',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                            </div>
-                                                         </div>
-                                                </div> -->
-                                    <div class="col-md-12">
-
-
-                                        <div class="col-md-3">
-                                            <label>Quantity<span class="badge mandatory">*</span></label>
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-3">
-                                            <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-3">
-                                            <label>Per</label> <?php
-                                                                $data = array('name' => 'EditEmergPer', 'value' => set_value('EditEmergPer'), 'id' => 'EditEmergPer',  'class' => 'form-control');
-                                                                echo form_input($data); ?>
-                                        </div>
-                                        <div class="col-md-3">
-                                            <label><?php echo "Basic Amount In ($INRSYM)"; ?></label>
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-md-12" style="padding:0px;">
-                                        <div class="col-md-12">
-                                            <div class="col-md-6" align="right">
-
-                                                CGST In %
-                                            </div>
-
-                                            <div class="col-md-3">
-                                                <div class="form-group">
-
-                                                    <?php
-                                                    $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
-                                                    echo form_input($data);
-                                                    ?>
-                                                </div>
-
-                                            </div>
-                                            <div class="col-md-3">
-                                                <div class="form-group">
-
-                                                    <?php
-                                                    $data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-                                                    echo form_input($data);
-                                                    ?>
-                                                </div>
-
-                                            </div>
-
-                                        </div>
-                                        <div class="col-md-12">
-                                            <div class="col-md-6" align="right">
-
-                                                SGST In %
-                                            </div>
-
-                                            <div class="col-md-3">
-                                                <div class="form-group">
-
-                                                    <?php
-                                                    $data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                                    echo form_input($data);
-                                                    ?>
-                                                </div>
-
-                                            </div>
-                                            <div class="col-md-3">
-                                                <div class="form-group">
-
-                                                    <?php
-                                                    $data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-                                                    echo form_input($data);
-                                                    ?>
-                                                </div>
-
-                                            </div>
-
-                                        </div>
-                                        <div class="col-md-12">
-                                            <div class="col-md-6" align="right">
-
-                                                IGST In %
-                                            </div>
-
-                                            <div class="col-md-3">
-                                                <div class="form-group">
-
-                                                    <?php
-                                                    $data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                                    echo form_input($data);
-                                                    ?>
-                                                </div>
-
-                                            </div>
-                                            <div class="col-md-3">
-                                                <div class="form-group">
-
-                                                    <?php
-                                                    $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-                                                    echo form_input($data);
-                                                    ?>
-                                                    <input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
-                                                </div>
-
-                                            </div>
-
-                                        </div>
-                                        <div class="col-md-12">
-                                            <div class="col-md-5 col-md-offset-4" align="right">
-                                                <label>Other Allowances <?php echo "($INRSYM)" ?></label>
-                                            </div>
-                                            <div class="col-md-3">
-                                                <div class="form-group">
-                                                    <?php
-                                                    $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                                    echo form_input($data);
-                                                    ?>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-12">
-                                            <div class="col-md-5 col-md-offset-4" align="right">
-                                                <label> <?php echo "Total Order Amount In ($INRSYM)"; ?></label>
-                                            </div>
-                                            <div class="col-md-3">
-                                                <div class="form-group">
-                                                    <?php
-                                                    $data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
-                                                    echo form_input($data);
-                                                    ?>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-12" style="padding: 0px 30px 10px 30px;">
-                                            <label>Service Description<span class="badge mandatory">*</span></label> <?php
-                                                                                                                                                                        $data = array('name' => 'EdittxtSpcialInstructionSingle', 'value' => set_value('EdittxtSpcialInstructionSingle'), 'id' => 'EdittxtSpcialInstructionSingle',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-                                                                                                                                                                        echo form_textarea($data); ?>
-                                        </div>
-
-
-                                    </div>
-
-                                    <div class="modal-footer">
-                                        <div class="col-md-12">
-                                            <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                                            <a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
-                                        </div>
-                                    </div>
-                                </div>
-                        </form>
-
-                    </div>
-                </div>
             </div>
-            <!-- Edit Revenue Modal -->
-            <div id="EDITREVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="overflow-y:scroll !important">
-                <div class="modal-dialog">
-                    <!-- Modal content-->
-                    <form>
-                        <div class="modal-content" style="width:1150px;">
-                            <div class="modal-header">
-                                <center>
-                                    <h4>Edit Revenue Purchase Order Line Item </h4>
-                                </center>
-                            </div>
-                            <div align="left">
-                                <div class="col-md-12">
+            <div class="modal-footer">
+            <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+            <a class="btn btn-success" ID="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+            </div>
+        </div>
+    </div>
+</div><!-- /.modal -->
+                <!-- Edit Service Modal content-->
+
+<div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Edit Service Purchase Order Item</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <form>
+                <div class="modal-body p-4">
+                <div class="row">
+                                            <div class="col-md-3">
+                                                <label>Req No<span class="text-danger">*</span></label>
+                                                <div>
+                                                    <?php
+
+                                                    $data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+
+                                                </div>
+                                            </div>
+
+                                            <div class="col-md-3">
+                                                <label>Department Name</label>
+                                                <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Cost Center Code</label>
+                                                <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-3" style="display:none;">
+                                                <label>Available Budget Amount</label><img id="AlertImg" src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image" width="25px" style="display:none;" />
+                                                <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_hidden($data);
+                                                    ?>
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-md-3">
+                                                <label>Item Code<span class="text-danger">*</span></label>
+                                                <div>
+                                                    <?php
+                                                    $options = array("0" => 'Item Code');
+                                                    //print_r(  $options);
+
+                                                    echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
+
+                                                    ?>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-md-3">
+                                                <label>Item Name</label>
+                                                <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>UOM</label>
+                                                <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Frequency</label>
+                                                <div class="form-group">
+
+                                                    <?php
+                                                    $data = array('name' => 'EditFrequencyChange', 'value' => set_value('EditFrequencyChange'), 'id' => 'EditFrequencyChange',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+
+                                                </div>
+                                            </div>
+
+                                        </div>
+
+                                        <!-- <div class="row">
+                                                    <div class="col-md-4" id="EditDisplayScheduleDiv" style="display:none;">
+                                                            <label>Select Service Schedule Type</label>
+                                                                <div class="form-group">
+                                                                    <?php
+                                                                        $Schdule = array("One Time", "Recurring");
+
+
+                                                                        if (!empty($Schdule)) {
+                                                                            foreach ($Schdule as $Sch) :
+
+                                                                                $SchType[$Sch] =  $Sch;
+
+                                                                            endforeach;
+                                                                        }
+                                                                        echo form_dropdown('EditScheduleType', $SchType, set_value('EditScheduleType'), 'id="EditScheduleType"', 'class = "form-control"');
+
+                                                                        ?>  
+                                                                </div>
+                                                            </div>
+                                                        <div class="col-md-4" id="EditServicePeriodOption" style="display:none;">
+                                                            <label>Select Service Period Option</label>
+                                                                <div class="form-group">
+                                                                    <?php
+
+
+
+                                                                        if (!empty($ServiceOption)) {
+                                                                            foreach ($ServiceOption as $SerOption) :
+
+
+                                                                                $ServiceOptions[$SerOption->ConfigValue] =  $SerOption->ConfigValue;
+                                                                            endforeach;
+                                                                        }
+                                                                        echo form_dropdown('EditServiceOptions', $ServiceOptions, set_value('EditServiceOptions'), 'id="EditServiceOptions"', 'class = "form-control"');
+
+                                                                        ?>  
+                                                                </div>
+                                                            </div>
+                                                            <div class="col-md-4" id="EditNoServices" style="display:none;">
+                                                            <label>Number of Services</label>
+                                                                <div class="form-group">
+                                                                    <?php
+
+                                                                        $data = array('name' => 'EditServiceNo', 'value' => set_value('EditServiceNo'), 'id' => 'EditServiceNo',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                </div>
+                                                            </div>
+                                                    </div> -->
+                                        <div class="row">
+
+
+                                            <div class="col-md-3">
+                                                <label>Quantity<span class="text-danger">*</span></label>
+                                                <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+                                                    echo form_input($data);
+                                                    ?>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
+                                                <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+                                                    echo form_input($data);
+                                                    ?>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label>Per</label> <?php
+                                                                    $data = array('name' => 'EditEmergPer', 'value' => set_value('EditEmergPer'), 'id' => 'EditEmergPer',  'class' => 'form-control');
+                                                                    echo form_input($data); ?>
+                                            </div>
+                                            <div class="col-md-3">
+                                                <label><?php echo "Basic Amount In ($INRSYM)"; ?></label>
+                                                <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row" style="padding:0px;">
+                                            <div class="row">
+                                                <div class="col-md-6" align="right">
+
+                                                    CGST In %
+                                                </div>
+
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+
+                                                        <?php
+                                                        $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+
+                                                        <?php
+                                                        $data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+
+                                                </div>
+
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-6" align="right">
+
+                                                    SGST In %
+                                                </div>
+
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+
+                                                        <?php
+                                                        $data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+
+                                                        <?php
+                                                        $data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+
+                                                </div>
+
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-6" align="right">
+
+                                                    IGST In %
+                                                </div>
+
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+
+                                                        <?php
+                                                        $data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+
+                                                        <?php
+                                                        $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                        <input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
+                                                    </div>
+
+                                                </div>
+
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-5 col-md-offset-4" align="right">
+                                                    <label>Other Allowances <?php echo "($INRSYM)" ?></label>
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-5 col-md-offset-4" align="right">
+                                                    <label> <?php echo "Total Order Amount In ($INRSYM)"; ?></label>
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row" style="padding: 0px 30px 10px 30px;">
+                                                <label>Service Description<span class="text-danger">*</span></label> <?php
+                                                                                                                                                                            $data = array('name' => 'EdittxtSpcialInstructionSingle', 'value' => set_value('EdittxtSpcialInstructionSingle'), 'id' => 'EdittxtSpcialInstructionSingle',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+                                                                                                                                                                            echo form_textarea($data); ?>
+                                            </div>
+                                        </div>
+
+                </div>
+                <div class="modal-footer">
+                <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+                <a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
+                </div>
+            </form>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<!-- Edit Revenue Modal -->
+<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <form>
+            <div class="modal-body p-4">
+                <div>
+                                <div class="row">
                                     <div class="col-md-4">
-                                        <label>Req No<span class="badge mandatory">*</span></label>
+                                        <label>Req No<span class="text-danger">*</span></label>
                                         <div>
                                             <?php
 
@@ -3264,9 +3396,9 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-md-12">
+                                <div class="row">
                                     <div class="col-md-2">
-                                        <label>Item Code<span class="badge mandatory">*</span></label>
+                                        <label>Item Code<span class="text-danger">*</span></label>
                                         <div>
                                             <?php
                                             $options = array("0" => 'Item Code');
@@ -3297,7 +3429,7 @@ if (!empty($INRSYMBOL)) {
                                     </div>
                                     <div class="col-md-6" style="padding: 0px;">
                                         <div class="col-md-2" style="padding-right:0px;">
-                                            <label>Quantity<span class="badge mandatory">*</span></label>
+                                            <label>Quantity<span class="text-danger">*</span></label>
                                             <div class="form-group">
                                                 <?php
                                                 $data = array('name' => 'EditRevenueQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditRevenueQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@@ -3306,7 +3438,7 @@ if (!empty($INRSYMBOL)) {
                                             </div>
                                         </div>
                                         <div class="col-md-2" style="padding-right: 0px;">
-                                            <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
+                                            <label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
                                             <div class="form-group">
                                                 <?php
                                                 $data = array('name' => 'EditRevenueRate', 'value' => set_value('EditRate'), 'id' => 'EditRevenueRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@@ -3330,7 +3462,7 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-md-12">
+                                <div class="row">
                                     <div class="col-md-4"></div>
                                     <div class="col-md-4">
                                         <label>Discount Type </label>
@@ -3372,7 +3504,7 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-md-12" style="text-align:left;">
+                                <div class="row" style="text-align:left;">
                                     <div class="col-md-4"></div>
                                     <div class="col-md-4">
                                         <label>Packaging Type </label>
@@ -3414,7 +3546,7 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-md-12">
+                                <div class="row">
                                     <div class="col-md-4"></div>
                                     <div class="col-md-4">
                                         <label>Freight Type </label>
@@ -3470,7 +3602,7 @@ if (!empty($INRSYMBOL)) {
 
 
                                 </div>
-                                <div class="col-md-12">
+                                <div class="row">
                                     <div class="col-md-8">
                                     </div>
                                     <div class="col-md-2">
@@ -3493,7 +3625,7 @@ if (!empty($INRSYMBOL)) {
                                     </div>
                                 </div>
                                
-                                    <div  class="col-md-12" id="SGSTEditModel">
+                                    <div  class="row" id="SGSTEditModel">
                                         <div class="col-md-8">
                                         </div>
                                         <div class="col-md-2">
@@ -3515,7 +3647,7 @@ if (!empty($INRSYMBOL)) {
                                             </div>
                                         </div>
                                     </div>
-                                    <div  class="col-md-12" id="IGSTEditModel">
+                                    <div  class="row" id="IGSTEditModel">
                                         <div class="col-md-8">
                                         </div>
                                         <div class="col-md-2">
@@ -3537,7 +3669,7 @@ if (!empty($INRSYMBOL)) {
                                             </div>
                                         </div>
                                     </div>
-                                <div class="col-md-12">
+                                <div class="row">
                                     <div class="col-md-8">
                                     </div>
                                     <div class="col-md-4">
@@ -3551,7 +3683,7 @@ if (!empty($INRSYMBOL)) {
                                     </div>
                                 </div>
                                 
-                                <div class="col-md-12">
+                                <div class="row">
                                     <div class="col-md-8">
                                     </div>
                                     <div class="col-md-4">
@@ -3564,7 +3696,7 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-md-12">
+                                <div class="row">
                                     <label><?php echo "Revenue Description"; ?></label>
                                     <div class="form-group">
                                         <?php
@@ -3573,45 +3705,33 @@ if (!empty($INRSYMBOL)) {
                                         ?>
                                     </div>
                                 </div>
-                                <div class="col-md-offset-9 col-md-3">
-                                    <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                                    <a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
-                                </div>
+                                
                             </div>
-
-                            <!-- footer for revenue po -->
-                            <div class="modal-footer">
-
-                            </div>
-                        </div>
-
-
-                    </form>
-                </div>
             </div>
-
-
-
-
-            <div class="container-fluid">
-                <table class="table table-bordered">
-                    <div align="right" style="padding-right:10px">
-
-                        <!-- Model for revenue PO -->
-                        <div id="REVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                            <div class="modal-dialog">
-                                <!-- Modal content-->
-                                <form>
-                                    <div class="modal-content" style="width:1060px;">
-                                        <div class="modal-header">
-                                            <center>
-                                                <h4>Select Revenue Purchase Order Line Item </h4>
-                                            </center>
-                                        </div>
-                                        <div align="left">
-                                            <div class="col-md-12">
+            <div class="modal-footer">
+            <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+            <a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
+            </div>
+            </form>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<!-- Model for revenue PO -->
+<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body p-4">
+            <form>
+                                        <div>
+                                            <div class="row">
                                                 <div class="col-md-2">
-                                                    <label>Item Code<span class="badge mandatory">*</span></label>
+                                                    <label>Item Code<span class="text-danger">*</span></label>
                                                     <div>
                                                         <?php
                                                         $options = array("0" => 'Item Code');
@@ -3643,7 +3763,7 @@ if (!empty($INRSYMBOL)) {
                                                 </div>
                                                 <div class="col-md-6" style="padding:0px;">
                                                     <div class="col-md-3">
-                                                        <label>Quantity<span class="badge mandatory">*</span></label>
+                                                        <label>Quantity<span class="text-danger">*</span></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
@@ -3652,7 +3772,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                     <div class="col-md-3">
-                                                        <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory"></label>
+                                                        <label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger"></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
@@ -3677,12 +3797,12 @@ if (!empty($INRSYMBOL)) {
                                                 </div>
                                             </div>
 
-                                            <div>
+                                            
 
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <div class="col-md-4"></div>
                                                     <div class="col-md-4">
-                                                        <label>Discount Type <span class="badge mandatory"></span></label>
+                                                        <label>Discount Type <span class="text-danger"></span></label>
                                                         <div>
                                                             <?php
                                                             $options = array("0" => 'Select Discount Type');
@@ -3703,7 +3823,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                     <div class="col-md-2">
-                                                        <label>Discount Rate<span class="badge mandatory"></span> </label>
+                                                        <label>Discount Rate<span class="text-danger"></span> </label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();calculateDiscount(0);');
@@ -3721,10 +3841,10 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-12" style="text-align:left;">
+                                                <div class="row" style="text-align:left;">
                                                     <div class="col-md-4"></div>
                                                     <div class="col-md-4">
-                                                        <label>Packaging Type <span class="badge mandatory"></span></label>
+                                                        <label>Packaging Type <span class="text-danger"></span></label>
                                                         <div>
                                                             <?php
                                                             $options = array("0" => 'Select Packaging Type');
@@ -3745,7 +3865,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                     <div class="col-md-2">
-                                                        <label>Packaging Rate <span class="badge mandatory"></span></label>
+                                                        <label>Packaging Rate <span class="text-danger"></span></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging(0);change();');
@@ -3763,10 +3883,10 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <div class="col-md-4"></div>
                                                     <div class="col-md-4">
-                                                        <label>Freight Type <span class="badge mandatory"></label>
+                                                        <label>Freight Type <span class="text-danger"></label>
                                                         <div>
                                                             <?php
                                                             $options = array("0" => 'Select Freight Type');
@@ -3787,7 +3907,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                     <div class="col-md-2" id="TripsValue" style="display:none;">
-                                                        <label>NO Of Trips<span class="badge mandatory"></label>
+                                                        <label>NO Of Trips<span class="text-danger"></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
@@ -3796,7 +3916,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                     <div class="col-md-2">
-                                                        <label>Freight Rate <span class="badge mandatory"></label>
+                                                        <label>Freight Rate <span class="text-danger"></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);change();');
@@ -3815,7 +3935,7 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
                                                 </div>
 
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <div class="col-md-8"></div>
                                                     <div class="col-md-2">
                                                         <label>CGST In %</label>
@@ -3836,7 +3956,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                 </div>           
-                                                <div class="col-md-12" style="text-align:left;">
+                                                <div class="row" style="text-align:left;">
                                                     <div id="SGSTAddModel">
                                                         <div class="col-md-8"></div>
                                                         <div class="col-md-2">
@@ -3859,7 +3979,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-12" style="text-align:left;">
+                                                <div class="row" style="text-align:left;">
                                                     <div id="IGSTAddModel" style="display:none;">
                                                        <div class="col-md-8"></div>
                                                         <div class="col-md-2">
@@ -3883,7 +4003,7 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
                                                 </div>
                                                 
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <div class="col-md-8">
                                                     </div>
                                                     <div class="col-md-4">
@@ -3897,7 +4017,7 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
                                                 </div>
 
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <div class="col-md-8">
                                                     </div>
                                                     <div class="col-md-4 ">
@@ -3912,7 +4032,7 @@ if (!empty($INRSYMBOL)) {
 
 
                                                 </div>
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <label><?php echo "Revenue Description"; ?></label>
                                                     <div class="form-group">
                                                         <?php
@@ -3923,38 +4043,35 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
 
                                                 </div>
-                                                <div class="col-md-offset-9 col-md-3">
-                                                    <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                                                    <a class="btn btn-success font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
-                                                </div>
 
-                                            </div>
+                                            
 
 
                                         </div>
-                                        <!-- footer for revenue po -->
-                                        <div class="modal-footer"></div>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-
-                        <!-- Model for service PO -->
-                        <div class="modal fade" id="SERVICE" role="dialog">
-                            <div class="modal-dialog">
-                                <!-- Modal content-->
-                                <form>
-                                    <div class="modal-content" style="width:1000px;">
-                                        <div class="modal-header">
-                                            <center>
-                                                <h4>Add Service Purchase Order Item </h4>
-                                            </center>
-                                        </div>
-                                        <div align="left">
-
-                                            <div class="col-md-12">
+            </div>
+            <div class="modal-footer">
+            <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+            <a class="btn btn-success font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
+            </div>
+            </form>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<!-- Model for service PO -->
+<div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Add Service Purchase Order Item</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <form>
+            <div class="modal-body p-4">
+              <div class="row">
                                                 <div class="col-md-3">
-                                                    <label>Item Code<span class="badge mandatory">*</span></label>
+                                                    <label>Item Code<span class="text-danger">*</span></label>
                                                     <div>
                                                         <?php
                                                         $options = array("0" => 'Item Code');
@@ -4007,7 +4124,7 @@ if (!empty($INRSYMBOL)) {
                                             </div>
 
 
-                                            <!-- <div class="col-md-12">
+                                            <!-- <div class="row">
                                                 <div class="col-md-4" id="DisplayScheduleDiv" style="display:none;">
                                                          <label>Select Service Schedule Type</label>
                                                             <div class="form-group">
@@ -4058,11 +4175,11 @@ if (!empty($INRSYMBOL)) {
                                                          </div>
                                                 </div> -->
 
-                                            <div class="col-md-12">
+                                            <div class="row">
 
 
                                                 <div class="col-md-3">
-                                                    <label>Quantity<span class="badge mandatory">*</span></label>
+                                                    <label>Quantity<span class="text-danger">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'ServiceQuantity', 'value' => set_value('ServiceQuantity'), 'id' => 'ServiceQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
@@ -4071,7 +4188,7 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
                                                 </div>
                                                 <div class="col-md-3">
-                                                    <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
+                                                    <label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'ServiceRate', 'value' => set_value('ServiceRate'), 'id' => 'ServiceRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
@@ -4094,11 +4211,7 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
                                                 </div>
                                             </div>
-
-
-                                            <div class="col-md-12" style="padding:0px;">
-
-                                                <div class="col-md-12">
+                                                    <div class="col-md-12">
                                                     <div class="col-md-6" align="right">
 
                                                         CGST In %
@@ -4154,7 +4267,6 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
 
                                                 </div>
-
                                                 <div class="col-md-12">
                                                     <div class="col-md-6" align="right">
 
@@ -4215,42 +4327,32 @@ if (!empty($INRSYMBOL)) {
 
                                                 </div>
                                                 <div class="col-md-12" style="padding: 0px 30px 10px 30px;">
-                                                    <label>Service Description<span class="badge mandatory">*</span></label> <?php
+                                                    <label>Service Description<span class="text-danger">*</span></label> <?php
                                                                                                                                                                                 $data = array('name' => 'txtSpcialInstructionSingle', 'value' => set_value('txtSpcialInstructionSingle'), 'id' => 'txtSpcialInstructionSingle',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
                                                                                                                                                                                 echo form_textarea($data); ?>
                                                 </div>
-
-
-                                            </div>
-
-
-                                            <div class="modal-footer">
-                                                <div class="col-md-12">
-                                                    <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                                                    <a class="btn btn-success font AddService" ID="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
-                                                </div>
-                                            </div>
-                                        </div>
-                                </form>
-
-                            </div>
-                        </div>
-
-
-                        <!-- model for import PO -->
-
-                        <div class="modal fade" id="IMPORT" role="dialog">
-                            <div class="modal-dialog">
-                                <!-- Modal content-->
-                                <form>
-                                    <div class="modal-content" style="width:900px;">
-                                        <div class="modal-header">
-
-                                            <center>
-                                                <h4>Add Import Purchase Order Item </h4>
-                                            </center>
-                                        </div>
-                                        <div align="left">
+            </div>
+            <div class="modal-footer">
+            <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+            <a class="btn btn-success font AddService" ID="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
+            </div>
+            </form>
+        </div>
+    </div>
+</div><!-- /.modal -->
+<!-- model for import PO -->
+<div id="IMPORT" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Add Import Purchase Order Item</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <form>
+            <div class="modal-body p-4">
+                 <div>
 
                                             <div class="col-md-12">
                                                 <div class="col-md-3">
@@ -4406,7 +4508,7 @@ if (!empty($INRSYMBOL)) {
                                                 </div>
                                                 <!--<div class="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>-->
 
                                                 <div class="col-md-12" style="border:1px solid #000;padding:0px;">
                                                     <br />
@@ -4729,730 +4831,474 @@ if (!empty($INRSYMBOL)) {
                                             </div>
 
                                         </div>
-                                        <div class="modal-footer">
-                                            <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                                            <a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
-                                        </div>
-                                    </div>
-                                </form>
-
-                            </div>
-                        </div>
-
-                        <!-- Model for Capital PO -->
-                        <div class="modal fade" id="CAPITAL" role="dialog">
-                            <div class="modal-dialog">
-                                <!-- Modal content-->
-                                <form>
-                                    <div class="modal-content" style="width:900px;">
-                                        <div class="modal-header">
-
-                                            <center>
-                                                <h4>Add Capital Purchase Order Item </h4>
-                                            </center>
-                                        </div>
-                                        <div align="left">
-
-                                            <div class="col-md-12">
-                                                <div class="col-md-2">
-                                                    <label>Item Code</label>
-                                                    <div>
-                                                        <?php
-                                                        $options = array("0" => 'Item Code');
-
-                                                        if (!empty($MaterialList)) {
-                                                            foreach ($MaterialList as $SID) :
-
-
-                                                                $options[$SID->MaterialCode] =  $SID->MaterialCode . ' ' . ' - ' . ' ' . $SID->MaterialName;
-
-                                                            endforeach;
-                                                        }
-
-                                                        echo form_dropdown('ImportMaterialCode', $options, set_value('ImportMaterialCode'), 'id="ImportMaterialCode"', 'class="form-control"');
-
-                                                        ?>
-                                                    </div>
-                                                </div>
-
-                                                <div class="col-md-2">
-                                                    <label>Item Name</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ImportItemName', 'value' => set_value('ImportItemName'), 'id' => 'ImportItemName',  'class' => 'form-control', 'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                    <label>UOM</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ImUOM', 'value' => set_value('ImUOM'), 'id' => 'ImUOM',  'class' => 'form-control', 'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                    <label>Quantity</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'imQuantity', 'value' => set_value('imQuantity'), 'id' => 'imQuantity',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                    <label><?php echo "Rate  ($INRSYM)"; ?> </label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'imRate', 'value' => set_value('imRate'), 'id' => 'imRate',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                    <label><?php echo "Basic Amount In ($INRSYM)"; ?> </label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'imTotalAmount', 'value' => set_value('imTotalAmount'), 'id' => 'imTotalAmount',  'class' => 'form-control', 'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="col-md-12">
-
-                                                <div class="col-md-3">
-
-                                                    Basic Price in US $ per Ton :
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'imBasicPrice', 'value' => set_value('imBasicPrice'), 'id' => 'imBasicPrice',  'class' => 'form-control', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-
-                                                <div class="col-md-3">
-
-                                                    Exchange Rate :
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ExchangeRt', 'value' => set_value('ExchangeRt'), 'id' => 'ExchangeRt',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-
-                                                </div>
-
-                                                <div class="col-md-3">
-
-                                                    Basic value <?php echo "($INRSYM)" ?> :
-
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'INRBasicvalue', 'value' => set_value('INRBasicvalue'), 'id' => 'INRBasicvalue',  'class' => 'form-control', 'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <!--<div class="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 class="col-md-12" style="border:1px solid #000;padding:0px;">
-                                                    <br />
-                                                    <div class="col-md-6" style="padding:0px;">
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Basic Price:
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Landing charge
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge'), 'id' => 'LandingCharge',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                High seas sales charge
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'Highseas ', 'value' => set_value('Highseas'), 'id' => 'Highseas',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterHighseas', 'value' => set_value('AfterHighseas'), 'id' => 'AfterHighseas',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Custom duty : (a)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'Customduty', 'value' => set_value('Customduty'), 'id' => 'Customduty',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Excise duty : (b)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ExcisedutyTax', 'value' => set_value('ExcisedutyTax'), 'id' => 'ExcisedutyTax',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterExcisedutyTax', 'value' => set_value('AfterExcisedutyTax'), 'id' => 'AfterExcisedutyTax',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Excise duty ED_cess : (C)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ExcisedutyEDcess', 'value' => set_value('ExcisedutyEDcess'), 'id' => 'ExcisedutyEDcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterExcisedutyEDcess', 'value' => set_value('AfterExcisedutyEDcess'), 'id' => 'AfterExcisedutyEDcess',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Excise duty S & H cess :(d)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ExcisedutySHcess', 'value' => set_value('ExcisedutySHcess'), 'id' => 'ExcisedutySHcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterExcisedutySHcess', 'value' => set_value('AfterExcisedutySHcess'), 'id' => 'AfterExcisedutySHcess',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Custom ED_cess : (e)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess'), 'id' => 'CustomEDcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Custom S & H cess : (f)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess'), 'id' => 'CustomSHcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-6" style="padding:0px;">
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Additional Excise duty : (g)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty'), 'id' => 'AdditionalExciseduty',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterAdditionalExciseduty', 'value' => set_value('AfterAdditionalExciseduty'), 'id' => 'AfterAdditionalExciseduty',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-8">
-                                                                Gross duty payable
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-8">
-                                                                Available Modvat set-off on import :
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AvailableModvat', 'value' => set_value('AvailableModvat'), 'id' => 'AvailableModvat',  'class' => 'form-control', 'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?> (b + c + d + g)
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-                                                        <div class="col-md-12">
-
-                                                            <div class="col-md-8">
-                                                                Gross expenses due to custom duty:
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'Grossexpenses', 'value' => set_value('Grossexpenses'), 'id' => 'Grossexpenses',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-
-                                                        <div class="col-md-12">
-                                                            <center> <label>Cost of the product Per KG</label></center>
-                                                            <hr />
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                purchase rate [Basic]
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'purchaserate', 'value' => set_value('purchaserate'), 'id' => 'purchaserate',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4" style="margin-top: -4.8%">
-                                                                <span>Quantity</span>
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-                                                        <div class="col-md-12">
-
-                                                            <div class="col-md-4">
-                                                                Custom Duty Expenses
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                RMC Including Customers
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'RMCIncludingCustomers', 'value' => set_value('RMCIncludingCustomers'), 'id' => 'RMCIncludingCustomers',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-
-
-                                                        </div>
-
-
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                        </div>
-                                        <div class="modal-footer">
-                                            <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                                            <a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
-                                        </div>
-                                    </div>
-                                </form>
-
-                            </div>
-                        </div>
-
-                        <br />
-                    </div>
-
-
-                    <div class="box-body">
-                        <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px">
-                            <thead style="background-color: #ddd;">
-                                <tr>
-                                    <th>SNo</th>
-                                    <th>Requisition No</th>
-                                    <th>Item Code</th>
-                                    <th>Item Description</th>
-                                    <th>Quantity</th>
-                                    <th>UOM</th>
-                                    <th>Rate<?php echo "($INRSYM)" ?></th>
-                                    <th>Basic Amount<?php echo "($INRSYM)" ?></th>
-                                    <th>Tax Amount<?php echo "($INRSYM)" ?></th>
-                                    <th>Total Order Amount<?php echo "($INRSYM)" ?></th>
-                                    <th>Action</th>
-                                </tr>
-                            </thead>
-                            <tbody id="ServiceAppend"></tbody>
-                            <tbody id="RevenueAppend"></tbody>
-                        </table>
-                    </div>
-
-                    <!-- /.box-body -->
             </div>
-
-            </table>
-            <div class="container-fluid">
-
-                <div class="row">
-                    <!-- Revenue po taxes -->
-                    <div class="col-md-12" style='border : 1px solid; display:none;' id="revenuepotaxes">
-                        <br />
-                        <div class="col-md-12">
-                            <div class="col-md-3">
-                                <label>Basic Amount <?php echo "($INRSYM)" ?> </label>
-                                <?php
-                                $data = array('name' => 'txtTotBasicAmountRevenue', 'value' => set_value('txtTotBasicAmountRevenue'), 'id' => 'txtTotBasicAmountRevenue',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-
-                            </div>
-                            <div class="col-md-3">
-                                <label>Total Discount <?php echo "($INRSYM)" ?> </label>
-                                <?php
-                                $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount'), 'id' => 'txtTotalDiscount',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-
-
-                            <div class="col-md-3">
-                                <label>CGST <?php echo "($INRSYM)" ?> </label>
-                                <?php
-                                $data = array('name' => 'txtTotalCGST', 'value' => set_value('txtTotalCGST'), 'id' => 'txtTotalCGST',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-                            <div class="col-md-3" id="displaySGST">
-                                <label>SGST <?php echo "($INRSYM)" ?> </label>
-                                <?php
-                                $data = array('name' => 'txtTotalSGST', 'value' => set_value('txtTotalSGST'), 'id' => 'txtTotalSGST',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                            <div class="col-md-3" id="displayIGST" style="display:none;">
-                                <label> IGST <?php echo "($INRSYM)" ?> </label>
-                                <?php
-                                $data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST'), 'id' => 'txtTotalIGST',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="col-md-12">
-
-
-
-                            <div class="col-md-3">
-                                <label>Total Packaging <?php echo "($INRSYM)" ?> </label>
-                                <?php
-                                $data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing'), 'id' => 'txtTotalPackaing',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-
-                            <div class="col-md-3">
-                                <label>Total Insurance <?php echo "($INRSYM)" ?> </label>
-                                <?php
-                                $data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance'), 'id' => 'txtTotalInsurance',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-
-
-
-                            <div class="col-md-3">
-                                <label>Total Freight <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight'), 'id' => 'txtTotalFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-                            <div class="col-md-3">
-                                <label>Total Order Value <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary'), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="col-md-12">
-                            <div class="col-md-12">
-                                <label>Special Instructions </label>
-                                <?php
-                                $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '8');
-                                echo form_textarea($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="col-md-12">
-                            <div class="col-md-3 col-md-offset-9"><br />
-                                <input type="file" name="POFiles" id="POFiles"><br>
-                                <input type="hidden" name="txtPoRange" id="txtPoRange" />
-                                <input type="hidden" name="isEdit" id="isEdit" value="0" />
-                                <input type="hidden" name="txtStatus1" id="txtStatus1" />
-                                <input type="hidden" name="txtRowCount1" id="txtRowCount1" />
-                                <input type="hidden" name="txtDeletedRow1" id="txtDeletedRow1" />
-                                <input type="hidden" name="CheckLocalInter" id="CheckLocalInter" />
-                                <input type="hidden" name="Budget" id="Budget" />
-                                <input type="hidden" name="txtSpecial" id="txtSpecial" />
-                                <input type="hidden" name="txtQuality" id="txtQuality" />
-                                <!-- <a class="btn btn-success Save"  ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
-                                <a class="btn btn-reset Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                <a class="btn btn-success Submit" ID="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-
-
-                            </div>
-                        </div>
-                        <div class="col-md-12" style="padding:0px;"><br />
-                        </div>
-                    </div>
-
-                    <!-- Service po taxes -->
-                    <div class="col-md-12" style="border : 1px solid; display:none;" id="servicepotaxes">
-                        <div class="col-md-12" style="padding:0px;">
-
-                            <div class="col-md-2">
-                                <label>Basic Amount <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount'), 'id' => 'txtTotBasicAmount',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                            <div class="col-md-2">
-                                <label>CGST <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotCgst', 'value' => set_value('txtTotCgst'), 'id' => 'txtTotCgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-
-                            <div class="col-md-2">
-                                <label>SGST <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotSgst', 'value' => set_value('txtTotSgst'), 'id' => 'txtTotSgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                            <div class="col-md-2">
-                                <label>IGST <?php echo "($INRSYM)" ?> </label>
-                                <?php
-                                $data = array('name' => 'txtTotIgst', 'value' => set_value('txtTotIgst'), 'id' => 'txtTotIgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                            <div class="col-md-2">
-                                <label>Other Allowances <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotOtherAllo', 'value' => set_value('txtTotOtherAllo'), 'id' => 'txtTotOtherAllo',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-
-
-                            <div class="col-md-2">
-
-                                <label>Total Order Value <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotalOrderValueSummaryService', 'value' => set_value('txtTotalOrderValueSummaryService'), 'id' => 'txtTotalOrderValueSummaryService',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-
-
-                            </div>
-                        </div>
-                        <!--start new fields 1 sep-->
-                        <div class="col-md-12" id="emergdescofpoDiv" style="display:none;">
-                            <label>Description Of Service<span class="badge mandatory">*</label>
-                            <div class="form-group">
-                                <?php
-                                $data = array('name' => 'emergdescofpo', 'value' => set_value('emergdescofpo'), 'id' => 'emergdescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-                                echo form_textarea($data);
-                                ?>
-                            </div>
-                        </div><!--end new fields 1 sep-->
-                        <div class="col-md-12" style="padding:0px;">
-                            <div class="col-md-12">
-                                <label>Scope Of Work</label> <?php
-                                                                $data = array('name' => 'ScopeOfWork', 'value' => set_value('ScopeOfWork'), 'id' => 'ScopeOfWork',  'class' => 'form-control', 'rows' => '8');
-                                                                echo form_textarea($data); ?>
-                            </div>
-                        </div>
-
-                        <div class="col-md-12">
-                            <div class="row">
-                                <br />
-                                <div align="right" style="padding-right:10px">
-                                    <input type="file" name="POFile" id="POFile"><br>
-                                    <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="SpcialInstruction" id="SpcialInstruction">
-                                    <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress">
-
-
-                                    <input type="hidden" name="txtSpecialservice" id="txtSpecialservice" />
-
-                                    <input type="hidden" name="txtworkstatus" id="txtworkstatus" />
-                                    <a class="btn btn-reset Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                    <a class="btn btn-success Submit" ID="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                </div><br />
-                            </div>
-                        </div>
-                        <br />
-                    </div>
-                </div>
+            <div class="modal-footer">
+            <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+            <a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
             </div>
-
+            </form>
         </div>
+    </div>
+</div><!-- /.modal -->
+                        <!-- Model for Capital PO -->
+
+<div id="CAPITAL" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Add Capital Purchase Order Item</h4>
+                <button type="button" class="close" data-dismiss="modal"
+                    aria-hidden="true">×</button>
+            </div>
+            <form>
+                                    <div class="modal-body p-4">
+                                         <div class="row">
+                                             <div class="col-md-2">
+                                                 <label>Item Code</label>
+                                                 <div>
+                                                     <?php
+                                                     $options = array("0" => 'Item Code');
+
+                                                     if (!empty($MaterialList)) {
+                                                         foreach ($MaterialList as $SID) :
+
+
+                                                             $options[$SID->MaterialCode] =  $SID->MaterialCode . ' ' . ' - ' . ' ' . $SID->MaterialName;
+
+                                                         endforeach;
+                                                     }
+
+                                                     echo form_dropdown('ImportMaterialCode', $options, set_value('ImportMaterialCode'), 'id="ImportMaterialCode"', 'class="form-control"');
+
+                                                     ?>
+                                                 </div>
+                                             </div>
+
+                                             <div class="col-md-2">
+                                                 <label>Item Name</label>
+                                                 <div class="form-group">
+                                                     <?php
+                                                     $data = array('name' => 'ImportItemName', 'value' => set_value('ImportItemName'), 'id' => 'ImportItemName',  'class' => 'form-control', 'readonly' => 'true');
+                                                     echo form_input($data);
+                                                     ?>
+                                                 </div>
+                                             </div>
+                                             <div class="col-md-2">
+                                                 <label>UOM</label>
+                                                 <div class="form-group">
+                                                     <?php
+                                                     $data = array('name' => 'ImUOM', 'value' => set_value('ImUOM'), 'id' => 'ImUOM',  'class' => 'form-control', 'readonly' => 'true');
+                                                     echo form_input($data);
+                                                     ?>
+                                                 </div>
+                                             </div>
+                                             <div class="col-md-2">
+                                                 <label>Quantity</label>
+                                                 <div class="form-group">
+                                                     <?php
+                                                     $data = array('name' => 'imQuantity', 'value' => set_value('imQuantity'), 'id' => 'imQuantity',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                     echo form_input($data);
+                                                     ?>
+                                                 </div>
+                                             </div>
+                                             <div class="col-md-2">
+                                                 <label><?php echo "Rate  ($INRSYM)"; ?> </label>
+                                                 <div class="form-group">
+                                                     <?php
+                                                     $data = array('name' => 'imRate', 'value' => set_value('imRate'), 'id' => 'imRate',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                     echo form_input($data);
+                                                     ?>
+                                                 </div>
+                                             </div>
+                                             <div class="col-md-2">
+                                                 <label><?php echo "Basic Amount In ($INRSYM)"; ?> </label>
+                                                 <div class="form-group">
+                                                     <?php
+                                                     $data = array('name' => 'imTotalAmount', 'value' => set_value('imTotalAmount'), 'id' => 'imTotalAmount',  'class' => 'form-control', 'readonly' => 'true');
+                                                     echo form_input($data);
+                                                     ?>
+                                                 </div>
+                                             </div>
+                                         </div>
+                                         <div class="row">
+
+                                             <div class="col-md-3">
+
+                                                 Basic Price in US $ per Ton :
+
+
+                                                 <div class="form-group">
+                                                     <?php
+                                                     $data = array('name' => 'imBasicPrice', 'value' => set_value('imBasicPrice'), 'id' => 'imBasicPrice',  'class' => 'form-control', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);');
+                                                     echo form_input($data);
+                                                     ?>
+                                                 </div>
+                                             </div>
+
+                                             <div class="col-md-3">
+
+                                                 Exchange Rate :
+
+
+                                                 <div class="form-group">
+                                                     <?php
+                                                     $data = array('name' => 'ExchangeRt', 'value' => set_value('ExchangeRt'), 'id' => 'ExchangeRt',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                     echo form_input($data);
+                                                     ?>
+                                                 </div>
+
+                                             </div>
+
+                                             <div class="col-md-3">
+
+                                                 Basic value <?php echo "($INRSYM)" ?> :
+
+
+
+                                                 <div class="form-group">
+                                                     <?php
+                                                     $data = array('name' => 'INRBasicvalue', 'value' => set_value('INRBasicvalue'), 'id' => 'INRBasicvalue',  'class' => 'form-control', 'readonly' => 'true');
+                                                     echo form_input($data);
+                                                     ?>
+                                                 </div>
+                                             </div>
+                                             <!--<div class="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 class="row" style="border:1px solid #000;padding:0px;">
+                                                 <br />
+                                                 <div class="col-md-6" style="padding:0px;">
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             Basic Price:
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             Landing charge
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge'), 'id' => 'LandingCharge',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             High seas sales charge
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'Highseas ', 'value' => set_value('Highseas'), 'id' => 'Highseas',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AfterHighseas', 'value' => set_value('AfterHighseas'), 'id' => 'AfterHighseas',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             Custom duty : (a)
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'Customduty', 'value' => set_value('Customduty'), 'id' => 'Customduty',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             Excise duty : (b)
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'ExcisedutyTax', 'value' => set_value('ExcisedutyTax'), 'id' => 'ExcisedutyTax',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AfterExcisedutyTax', 'value' => set_value('AfterExcisedutyTax'), 'id' => 'AfterExcisedutyTax',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             Excise duty ED_cess : (C)
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'ExcisedutyEDcess', 'value' => set_value('ExcisedutyEDcess'), 'id' => 'ExcisedutyEDcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AfterExcisedutyEDcess', 'value' => set_value('AfterExcisedutyEDcess'), 'id' => 'AfterExcisedutyEDcess',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             Excise duty S & H cess :(d)
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'ExcisedutySHcess', 'value' => set_value('ExcisedutySHcess'), 'id' => 'ExcisedutySHcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AfterExcisedutySHcess', 'value' => set_value('AfterExcisedutySHcess'), 'id' => 'AfterExcisedutySHcess',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             Custom ED_cess : (e)
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess'), 'id' => 'CustomEDcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             Custom S & H cess : (f)
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess'), 'id' => 'CustomSHcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                 </div>
+                                                 <div class="col-md-6" style="padding:0px;">
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             Additional Excise duty : (g)
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty'), 'id' => 'AdditionalExciseduty',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AfterAdditionalExciseduty', 'value' => set_value('AfterAdditionalExciseduty'), 'id' => 'AfterAdditionalExciseduty',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-8">
+                                                             Gross duty payable
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-8">
+                                                             Available Modvat set-off on import :
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'AvailableModvat', 'value' => set_value('AvailableModvat'), 'id' => 'AvailableModvat',  'class' => 'form-control', 'readonly' => 'true');
+                                                                 echo form_input($data);
+                                                                 ?> (b + c + d + g)
+                                                             </div>
+                                                         </div>
+
+                                                     </div>
+                                                     <div class="col-md-12">
+
+                                                         <div class="col-md-8">
+                                                             Gross expenses due to custom duty:
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'Grossexpenses', 'value' => set_value('Grossexpenses'), 'id' => 'Grossexpenses',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                     </div>
+
+                                                     <div class="col-md-12">
+                                                         <center> <label>Cost of the product Per KG</label></center>
+                                                         <hr />
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             purchase rate [Basic]
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'purchaserate', 'value' => set_value('purchaserate'), 'id' => 'purchaserate',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+                                                         <div class="col-md-4" style="margin-top: -4.8%">
+                                                             <span>Quantity</span>
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+
+                                                     </div>
+                                                     <div class="col-md-12">
+
+                                                         <div class="col-md-4">
+                                                             Custom Duty Expenses
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+
+                                                     </div>
+                                                     <div class="col-md-12">
+                                                         <div class="col-md-4">
+                                                             RMC Including Customers
+                                                         </div>
+                                                         <div class="col-md-4">
+                                                             <div class="form-group">
+                                                                 <?php
+                                                                 $data = array('name' => 'RMCIncludingCustomers', 'value' => set_value('RMCIncludingCustomers'), 'id' => 'RMCIncludingCustomers',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                                 echo form_input($data);
+                                                                 ?>
+                                                             </div>
+                                                         </div>
+
+
+                                                     </div>
+
+
+                                                 </div>
+                                             </div>
+                                         </div>
+
+                                     </div>
+                                     <div class="modal-footer">
+                                         <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+                                         <a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
+                                     </div>
+                             </form>
+        </div>
+    </div>
+</div><!-- /.modal -->
+
 
-</div>
 
-</div>
-</section>
-</div>
 <script type="text/html" id="RevenueList">
     <tr id="<%=index%>">
         <td align="left"><%=index%></td>
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index b41835eb..09520a66 100644
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -234,11 +234,6 @@
             margin: 0 5px;
         }
 
-        .mandatory {
-            color: red;
-            text-align: right;
-            background-color: white;
-        }
 
         .content-wrapper {
             min-height: 600px ! important;
@@ -456,7 +451,7 @@
         <section class="content">
 
             <div class="box">
-                <div class="col-md-12">
+                <div class="form-group col-md-12">
                     <div class="header-container">
                         <h2> Amended Capital Purchase Order-<?php echo "$PONO" ?></h2>
                         <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a>
@@ -467,8 +462,8 @@
                 </div>
                 <div class="container-fluid">
                     <div class="row">
-                        <div class="col-md-12">
-                            <div class="col-md-3">
+                        <div class="form-group col-md-12">
+                            <div class="form-group col-md-3">
                                 <label>Requistion No</label>
                                 <?php
 
@@ -485,7 +480,7 @@
 
                                 ?>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>Purchase Order Type</label>
                                 <div class="form-group">
 
@@ -495,7 +490,7 @@
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>Select Supplier</label>
                                 <?php
                                 if (!empty($Suplist)) {
@@ -506,7 +501,7 @@
                                 echo form_dropdown('drpSupplier', $options2, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2');
                                 ?>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>Supplier Address</label>
                                 <div class="form-group">
                                     <?php
@@ -518,8 +513,8 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-12">
-                            <div class="col-md-3" id="currencyTypeDiv">
+                        <div class="form-group col-md-12">
+                            <div class="form-group col-md-3" id="currencyTypeDiv">
                                 <label>Currency Type</label>
                                 <div class="form-group">
 
@@ -545,7 +540,7 @@
 
                                 </div>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <b><u>Select Delivery By</u></b>
                                 <div style="display:inline-flex;">
                                     <div class="centered">
@@ -561,7 +556,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-md-3" id="Schedulediv" style="display:none;">
+                            <div class="form-group col-md-3" id="Schedulediv" style="display:none;">
                                 <label>Schedule By </label>
                                 <input type="hidden" name="beforeSchedule" value="<?php echo $DeliverSchedule; ?>">
                                 <?php
@@ -570,7 +565,7 @@
                                 ?>
 
                             </div>
-                            <div class="col-md-3" id="deliverydateby" style="display:none;">
+                            <div class="form-group col-md-3" id="deliverydateby" style="display:none;">
                                 <label>Delivery Date</label>
                                 <?php if (($DeliverOption == 1) || ($DeliverOption == 2)) {
                                     $Deliverydt = null;
@@ -585,7 +580,7 @@
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-3" id="Deliverydtdiv">
+                            <div class="form-group col-md-3" id="Deliverydtdiv">
                                 <label>Dispatch Instruction</label>
                                 <input type="hidden" name="beforeDisins" value="<?php echo $Import_DispatchDetails; ?>">
                                 <?php
@@ -598,7 +593,7 @@
 
                             </div>
 
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>Delivery Address</label>
                                 <div class="form-group">
                                     <?php
@@ -610,11 +605,11 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-12">
-                            <div class="col-md-3" id="FromOnline" style="display:none;">
+                        <div class="form-group col-md-12">
+                            <div class="form-group col-md-3" id="FromOnline" style="display:none;">
                                 Check Today's Foreign Exchange value <a href="http://www.xe.com/" target="_blank"><u>(Click here)</u></a>
                             </div>
-                            <div class="col-md-3" id="ExchangeRateOnDiv" style="display:none;">
+                            <div class="form-group col-md-3" id="ExchangeRateOnDiv" style="display:none;">
                                 <label>Exchange Rate On</label>
                                 <div class="form-group">
                                     <?php
@@ -623,7 +618,7 @@
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-3" id="ExchangeRateDiv" style="display:none;">
+                            <div class="form-group col-md-3" id="ExchangeRateDiv" style="display:none;">
                                 <label id="CurrencySymbol">Exchange Rate </label>
                                 <div class="form-group">
                                     <?php
@@ -633,7 +628,7 @@
                                 </div>
 
                             </div>
-                            <div class="col-md-3" id="placeoforgin">
+                            <div class="form-group col-md-3" id="placeoforgin">
                                 <label>Place of Origin</label>
                                 <div class="form-group">
                                     <?php
@@ -647,8 +642,8 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-12">
-                            <div class="col-md-3">
+                        <div class="form-group col-md-12">
+                            <div class="form-group col-md-3">
                                 <label>Purchase Order Date</label>
                                 <div class="form-group">
                                     <?php
@@ -657,7 +652,7 @@
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>Mode Of Shipment</label>
                                 <div class="form-group">
 
@@ -667,7 +662,7 @@
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>Contact Reference</label>
                                 <div class="form-group">
 
@@ -677,7 +672,7 @@
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>Supplier's Offer No</label>
                                 <div class="form-group">
 
@@ -691,8 +686,8 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-12">
-                            <div class="col-md-3">
+                        <div class="form-group col-md-12">
+                            <div class="form-group col-md-3">
                                 <label>Our Reference(S)</label>
                                 <div class="form-group">
 
@@ -702,8 +697,8 @@
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-3">
-                                <label>Capital Type Options<span class="badge mandatory">*</span></label>
+                            <div class="form-group col-md-3">
+                                <label>Capital Type Options<span class="text-danger">*</span></label>
                                 <div class="form-group">
                                     <?php
                                     if (!empty($PoTypeOptions)) {
@@ -723,7 +718,7 @@
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-3"><input type="hidden" name="beforePaymentmethod" id="beforePaymentmethod" value="<?php echo $PaymentTerms; ?>">
+                            <div class="form-group col-md-3"><input type="hidden" name="beforePaymentmethod" id="beforePaymentmethod" value="<?php echo $PaymentTerms; ?>">
                                 <label for="payablefrom">Payable Terms</label>
                                 <?php
                                 foreach ($Payment as $rl) :
@@ -755,7 +750,7 @@
                                 ?>
                             </div>
 
-                            <div class="col-md-3" id="otheroptiondiv" style="display:none;">
+                            <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
                                 <label>Description of Payable Terms<span class="badge">*</span></label>
                                 <div class="form-group">
                                     <?php
@@ -768,9 +763,9 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-12">
-                            <div class="col-md-3">
-                                <label>Insurance Options<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-12">
+                            <div class="form-group col-md-3">
+                                <label>Insurance Options<span class="text-danger">*</span></label>
                                 <div class="form-group">
                                     <?php
                                     if (!empty($insuranceStatus)) {
@@ -794,7 +789,7 @@
                                 </div>
 
                             </div>
-                            <div class="col-md-3" id="insuranceTxtDiv" style="display:block;">
+                            <div class="form-group col-md-3" id="insuranceTxtDiv" style="display:block;">
                                 <label>Insurance No / Insurance Details<span class="badge">*</span></label>
                                 <div class="form-group">
                                     <?php
@@ -803,8 +798,8 @@
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-3">
-                                <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
+                            <div class="form-group col-md-3">
+                                <label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
                                 <select id='BudgetType' name='BudgetType'>
                                     <?php if ($BudgetType == 'CAPITAL') {
                                         $opt1 = 'CAPITAL';
@@ -817,7 +812,7 @@
                                     <option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
                                 </select>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                             </div>
                         </div>
                     </div>
@@ -856,7 +851,7 @@
 
 
 
-                    <div class="col-md-12">
+                    <div class="form-group col-md-12">
                         <div align="right">
                             <!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a>  -->
                         </div>
@@ -1117,7 +1112,7 @@
 
 
 
-                                            <td> <a data-target='#EDITCAPITAL' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITCAPITAL"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <!-- <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a> -->
+                                            <td> <a data-target='#EDITCAPITAL' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITCAPITAL"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <!-- <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a> -->
 
                                                 <!-- <td>   <a    data-target='#VIEWCAPITAL'	data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWCAPITAL"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>	  </td>  -->
 
@@ -1235,10 +1230,10 @@
                                                     </center>
                                                 </div>
                                                 <div align="left">
-                                                    <div class="col-md-12" style="padding:0px;">
-                                                        <div class="col-md-12" style="padding:0px;">
-                                                            <div class="col-md-5" style="padding:0px;">
-                                                                <div class="col-md-6">
+                                                    <div class="form-group col-md-12" style="padding:0px;">
+                                                        <div class="form-group col-md-12" style="padding:0px;">
+                                                            <div class="form-group col-md-5" style="padding:0px;">
+                                                                <div class="form-group col-md-6">
                                                                     <label>Req No</label>
                                                                     <div>
 
@@ -1259,7 +1254,7 @@
 
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-6">
+                                                                <div class="form-group col-md-6">
                                                                     <label>Department Name</label>
                                                                     <div>
                                                                         <?php
@@ -1269,8 +1264,8 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-5">
-                                                                <div class="col-md-6">
+                                                            <div class="form-group col-md-5">
+                                                                <div class="form-group col-md-6">
                                                                     <label>Cost Center Code</label>
                                                                     <div>
                                                                         <?php
@@ -1281,7 +1276,7 @@
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-6">
+                                                                <div class="form-group col-md-6">
                                                                     <label>Avail Bud Amount<?php echo "($INR)" ?></label>
                                                                     <div class="form-group">
                                                                         <?php
@@ -1291,7 +1286,7 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-2" id="ExchangeRateModalEditDiv" style="display:none;">
+                                                            <div class="form-group col-md-2" id="ExchangeRateModalEditDiv" style="display:none;">
                                                                 <label> Exchange Rate</label>
                                                                 <div class="form-group">
                                                                     <?php
@@ -1302,9 +1297,9 @@
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12" style="padding:0px;">
-                                                        <div class="col-md-12" style="padding:0px;">
-                                                            <div class="col-md-2">
+                                                    <div class="form-group col-md-12" style="padding:0px;">
+                                                        <div class="form-group col-md-12" style="padding:0px;">
+                                                            <div class="form-group col-md-2">
                                                                 <label>Item Code</label>
                                                                 <div>
                                                                     <?php
@@ -1313,7 +1308,7 @@
                                                                     ?>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-2">
+                                                            <div class="form-group col-md-2">
                                                                 <label>Item Name</label>
                                                                 <div class="form-group">
                                                                     <?php
@@ -1323,7 +1318,7 @@
                                                                 </div>
                                                             </div>
 
-                                                            <div class="col-md-2">
+                                                            <div class="form-group col-md-2">
                                                                 <label>UOM</label>
                                                                 <div class="form-group">
                                                                     <?php
@@ -1332,8 +1327,8 @@
                                                                     ?>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-6" style="padding:0px;">
-                                                                <div class="col-md-3">
+                                                            <div class="form-group col-md-6" style="padding:0px;">
+                                                                <div class="form-group col-md-3">
                                                                     <label>Quantity</label>
                                                                     <div class="form-group">
                                                                         <?php
@@ -1342,7 +1337,7 @@
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-3" style="padding-right: 0px;">
+                                                                <div class="form-group col-md-3" style="padding-right: 0px;">
                                                                     <label id="EditRateIn">Rate(in INR/UOM)</label>
                                                                     <div class="form-group">
                                                                         <?php
@@ -1351,12 +1346,12 @@
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-3">
+                                                                <div class="form-group col-md-3">
                                                                     <label>Per</label> <?php
                                                                                         $data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer',  'class' => 'form-control');
                                                                                         echo form_input($data); ?>
                                                                 </div>
-                                                                <div class="col-md-3">
+                                                                <div class="form-group col-md-3">
                                                                     <label id="EditTotalAmount">Basic value in <?php echo "($INR)" ?></label>
                                                                     <div class="form-group">
                                                                         <?php
@@ -1368,12 +1363,12 @@
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12" style="padding:0px;">
-                                                        <div class="col-md-12" id="EDITCAPdiv" style="padding:0px;">
-                                                            <div class="col-md-12" id="" style="padding:0px;"><!--EDITCAPdiv -->
-                                                                <div class="col-md-12"> <!--<div class="col-md-4">
+                                                    <div class="form-group col-md-12" style="padding:0px;">
+                                                        <div class="form-group col-md-12" id="EDITCAPdiv" style="padding:0px;">
+                                                            <div class="form-group col-md-12" id="" style="padding:0px;"><!--EDITCAPdiv -->
+                                                                <div class="form-group col-md-12"> <!--<div class="form-group col-md-4">
                                                                                                         </div>-->
-                                                                    <div class="col-md-3">
+                                                                    <div class="form-group col-md-3">
                                                                         <label>Discount Type </label>
                                                                         <div>
                                                                             <?php
@@ -1394,7 +1389,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-3">
+                                                                    <div class="form-group col-md-3">
                                                                         <label>Discount Rate </label>
                                                                         <div class="form-group">
                                                                             <?php
@@ -1403,7 +1398,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-3">
+                                                                    <div class="form-group col-md-3">
                                                                         <label>Discounted Amt <?php echo "($INR)" ?> </label>
                                                                         <div class="form-group">
                                                                             <?php
@@ -1414,8 +1409,8 @@
                                                                     </div>
 
 
-                                                                    <div class="col-md-12" style="padding:0px">
-                                                                        <div class="col-md-3">
+                                                                    <div class="form-group col-md-12" style="padding:0px">
+                                                                        <div class="form-group col-md-3">
                                                                             <label>Freight Type </label>
                                                                             <div>
                                                                                 <?php
@@ -1436,7 +1431,7 @@
                                                                                 ?>
                                                                             </div>
                                                                         </div>
-                                                                        <div class="col-md-3" id="TripsValuelocedit" style="display:none;">
+                                                                        <div class="form-group col-md-3" id="TripsValuelocedit" style="display:none;">
                                                                             <label>NO Of Trips</label>
                                                                             <div class="form-group">
                                                                                 <?php
@@ -1445,7 +1440,7 @@
                                                                                 ?>
                                                                             </div>
                                                                         </div>
-                                                                        <div class="col-md-3">
+                                                                        <div class="form-group col-md-3">
                                                                             <label>Freight Rate </label>
                                                                             <div class="form-group">
                                                                                 <?php
@@ -1455,7 +1450,7 @@
                                                                             </div>
                                                                         </div>
 
-                                                                        <div class="col-md-3" style="padding-left: -2px;">
+                                                                        <div class="form-group col-md-3" style="padding-left: -2px;">
                                                                             <label>Freight Amt <?php echo "($INR)" ?></label>
                                                                             <div class="form-group">
                                                                                 <?php
@@ -1474,12 +1469,12 @@
 
 
                                                                 </div>
-                                                                <div class="col-md-6" align="right">
+                                                                <div class="form-group col-md-6" align="right">
 
                                                                     CGST In %
                                                                 </div>
 
-                                                                <div class="col-md-3">
+                                                                <div class="form-group col-md-3">
                                                                     <div class="form-group">
 
                                                                         <?php
@@ -1489,7 +1484,7 @@
                                                                     </div>
 
                                                                 </div>
-                                                                <div class="col-md-3">
+                                                                <div class="form-group col-md-3">
                                                                     <div class="form-group">
 
                                                                         <?php
@@ -1501,13 +1496,13 @@
                                                                 </div>
 
                                                             </div>
-                                                            <div class="col-md-12" id="EDITCAPdiv1" style="padding:0px;"><!--EDITCAPdiv1 -->
-                                                                <div class="col-md-6" align="right">
+                                                            <div class="form-group col-md-12" id="EDITCAPdiv1" style="padding:0px;"><!--EDITCAPdiv1 -->
+                                                                <div class="form-group col-md-6" align="right">
 
                                                                     SGST In %
                                                                 </div>
 
-                                                                <div class="col-md-3">
+                                                                <div class="form-group col-md-3">
                                                                     <div class="form-group">
 
                                                                         <?php
@@ -1517,7 +1512,7 @@
                                                                     </div>
 
                                                                 </div>
-                                                                <div class="col-md-3">
+                                                                <div class="form-group col-md-3">
                                                                     <div class="form-group">
 
                                                                         <?php
@@ -1530,13 +1525,13 @@
 
                                                             </div>
 
-                                                            <div class="col-md-12" id="EDITCAPdiv2" style="padding:0px;"><!--EDITCAPdiv2 -->
-                                                                <div class="col-md-6" align="right">
+                                                            <div class="form-group col-md-12" id="EDITCAPdiv2" style="padding:0px;"><!--EDITCAPdiv2 -->
+                                                                <div class="form-group col-md-6" align="right">
 
                                                                     IGST In %
                                                                 </div>
 
-                                                                <div class="col-md-3">
+                                                                <div class="form-group col-md-3">
                                                                     <div class="form-group">
 
                                                                         <?php
@@ -1546,7 +1541,7 @@
                                                                     </div>
 
                                                                 </div>
-                                                                <div class="col-md-3">
+                                                                <div class="form-group col-md-3">
                                                                     <div class="form-group">
 
                                                                         <?php
@@ -1558,12 +1553,12 @@
                                                                 </div>
 
                                                             </div>
-                                                            <div class="col-md-12" id="EDITCAPdiv3" style="padding:0px;"><!--EDITCAPdiv3 -->
+                                                            <div class="form-group col-md-12" id="EDITCAPdiv3" style="padding:0px;"><!--EDITCAPdiv3 -->
                                                                 <div class="col-md-5 col-md-offset-4" align="right">
                                                                     <label>Other Allowances <?php echo "($INR)" ?></label>
                                                                 </div>
 
-                                                                <div class="col-md-3">
+                                                                <div class="form-group col-md-3">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
@@ -1575,12 +1570,12 @@
 
 
 
-                                                                <div class="col-md-12" id="EDITCAPdiv4" style="padding:0px;display:block;"><!--EDITCAPdiv4 -->
+                                                                <div class="form-group col-md-12" id="EDITCAPdiv4" style="padding:0px;display:block;"><!--EDITCAPdiv4 -->
                                                                     <div class="col-md-5 col-md-offset-4" align="right">
                                                                         <label>Total Order Value <?php echo "($INR)" ?></label>
                                                                     </div>
 
-                                                                    <div class="col-md-3">
+                                                                    <div class="form-group col-md-3">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'Editservicetotalordervaue', 'value' => set_value('Editservicetotalordervaue'), 'id' => 'Editservicetotalordervaue',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1591,15 +1586,15 @@
                                                                 </div>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-12" style="padding:1%;"></div>
-                                                        <div class="col-md-12" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;">
+                                                        <div class="form-group col-md-12" style="padding:1%;"></div>
+                                                        <div class="form-group col-md-12" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;">
                                                             <br />
-                                                            <div class="col-md-6" style="padding:0px;">
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                            <div class="form-group col-md-6" style="padding:0px;">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         Basic Price In<?php echo "($INR)" ?>
                                                                     </div>
-                                                                    <!--<div class="col-md-4">
+                                                                    <!--<div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
@@ -1616,11 +1611,11 @@
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         Landing charge<?php echo "$INR" ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
@@ -1628,7 +1623,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1637,11 +1632,11 @@
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         Assessable Value (A)<?php echo "$INR" ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group" style="display: none;">
                                                                             <?php
                                                                             $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
@@ -1649,7 +1644,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1658,11 +1653,11 @@
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         Custom duty (B) :<?php echo "$INR" ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
@@ -1670,7 +1665,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1682,11 +1677,11 @@
 
 
 
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         Custom ED_cess : (C)<?php echo "($INR)" ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
@@ -1694,7 +1689,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1703,11 +1698,11 @@
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         Custom S & H cess : (D)<?php echo "($INR)" ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
@@ -1715,7 +1710,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1725,12 +1720,12 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-6" style="padding:0px;">
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                            <div class="form-group col-md-6" style="padding:0px;">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         Subtotal: (E)<?php echo "($INR)" ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group" style="display: none">
                                                                             <?php
                                                                             $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
@@ -1738,7 +1733,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1753,13 +1748,13 @@
 
 
 
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         <!-- Additional Excise duty : (g) -->
                                                                         IGST on (E): (F)
                                                                         <?php echo " ($INR)"; ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditIgstInt ', 'value' => set_value('EditIgstInt', 0), 'id' => 'EditIgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
@@ -1767,7 +1762,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterIgstInt', 'value' => set_value('EditAfterIgstInt', 0), 'id' => 'EditAfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1784,11 +1779,11 @@
 
 
 
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-8">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-8">
                                                                         Total Duty <?php echo "($INR)" ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
@@ -1799,8 +1794,8 @@
                                                                 </div>
 
                                                                 <!--Start of Adding of Frieght model-->
-                                                                <div class="col-md-12" style="padding:0px;">
-                                                                    <div class="col-md-3">
+                                                                <div class="form-group col-md-12" style="padding:0px;">
+                                                                    <div class="form-group col-md-3">
                                                                         <span>Freight Type </span>
                                                                         <div>
                                                                             <?php
@@ -1821,7 +1816,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-3" id="AmendTripsValue" style="display:none;">
+                                                                    <div class="form-group col-md-3" id="AmendTripsValue" style="display:none;">
                                                                         <span>NO Of Trips</span>
                                                                         <div class="form-group">
                                                                             <?php
@@ -1830,7 +1825,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-3">
+                                                                    <div class="form-group col-md-3">
                                                                         <span>Freight Rate </span>
                                                                         <div class="form-group">
                                                                             <?php
@@ -1840,7 +1835,7 @@
                                                                         </div>
                                                                     </div>
 
-                                                                    <div class="col-md-3" style="padding-left: 0px;">
+                                                                    <div class="form-group col-md-3" style="padding-left: 0px;">
                                                                         <span>Freight Amt <?php echo "($INR)" ?></span>
                                                                         <div class="form-group">
                                                                             <?php
@@ -1853,15 +1848,15 @@
                                                                 </div>
                                                                 <!--End of Adding of freight in edit model -->
 
-                                                                <div class="col-md-12">
+                                                                <div class="form-group col-md-12">
                                                                     <center> <label>Cost of the product Per UOM</label></center>
                                                                     <hr />
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         Duty Impact
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
@@ -1869,7 +1864,7 @@
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4" style="margin-top: -4.8%">
+                                                                    <div class="form-group col-md-4" style="margin-top: -4.8%">
                                                                         <span>Quantity</span>
                                                                         <div class="form-group">
                                                                             <?php
@@ -1880,12 +1875,12 @@
                                                                     </div>
 
                                                                 </div>
-                                                                <div class="col-md-12">
+                                                                <div class="form-group col-md-12">
 
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         Custom Duty<?php echo "($INR)/UOM" ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
@@ -1895,11 +1890,11 @@
                                                                     </div>
 
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         Clearing Charges <?php echo "($INR)" ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
@@ -1913,11 +1908,11 @@
 
 
 
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <!-- RMC Including Customers -->
                                                                         Nett per UOM<?php echo "($INR)"; ?>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1930,8 +1925,8 @@
 
                                                                 </div>
 
-                                                                <div class="col-md-6" align="right" style="display:none;"> <label>Total Order Amount :</label></div>
-                                                                <div class="col-md-6" style="display:none;">
+                                                                <div class="form-group col-md-6" align="right" style="display:none;"> <label>Total Order Amount :</label></div>
+                                                                <div class="form-group col-md-6" style="display:none;">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'EdittxtTotalOrderValue', 'value' => set_value('EdittxtTotalOrderValue'), 'id' => 'EdittxtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1949,7 +1944,7 @@
 
 
 
-                                                    <div class="col-md-12" style="padding: 0px 30px 10px 30px;text-align: left;">
+                                                    <div class="form-group col-md-12" style="padding: 0px 30px 10px 30px;text-align: left;">
                                                         <label>Capital Description </label>
 
 
@@ -1975,9 +1970,9 @@
 
                                 <br />
                         </table>
-                        <div class="col-md-12" style="border: 1px solid;" id="CAPdiv">
+                        <div class="form-group col-md-12" style="border: 1px solid;" id="CAPdiv">
 
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>Total Basic Amount <?php echo "($INR)" ?></label>
                                 <?php
                                 $data = array('name' => 'txtTotalBasic', 'value' => set_value('txtTotalBasic', number_format($FinalTotalBasic, 2, '.', '')), 'id' => 'txtTotalBasic',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1987,14 +1982,14 @@
 
 
 
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>Total Discount Amount <?php echo "($INR)" ?></label>
                                 <?php
                                 $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($TotalDiscountedAmt, 2, '.', '')), 'id' => 'txtTotalDiscount',  'class' => 'form-control num', 'readonly' => 'true');
                                 echo form_input($data);
                                 ?>
                             </div>
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>CGST <?php echo "($INR)" ?></label>
                                 <?php
                                 $data = array('name' => 'txtTotCgst', 'value' => set_value('txtTotCgst', number_format($TotalCGST, 2, '.', '')), 'id' => 'txtTotCgst',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2003,7 +1998,7 @@
                             </div>
 
 
-                            <div class="col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>SGST <?php echo "($INR)" ?></label>
                                 <?php
                                 $data = array('name' => 'txtTotSgst', 'value' => set_value('txtTotSgst', number_format($TotalSGST, 2, '.', '')), 'id' => 'txtTotSgst',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2013,15 +2008,15 @@
 
 
 
-                            <div class="col-md-12">
-                                <div class="col-md-3">
+                            <div class="form-group col-md-12">
+                                <div class="form-group col-md-3">
                                     <label>IGST <?php echo "($INR)" ?></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="col-md-3" style="padding: 0px;">
+                                <div class="form-group col-md-3" style="padding: 0px;">
                                     <label>Other Allowances <?php echo "($INR)" ?> </label>
                                     <?php
                                     $data = array('name' => 'TotalOtherAllowances', 'value' => set_value('TotalOtherAllowances', number_format($Totalotherallowances, 2, '.', '')), 'id' => 'TotalOtherAllowances',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2031,7 +2026,7 @@
                                 </div>
 
 
-                                <div class="col-md-3">
+                                <div class="form-group col-md-3">
                                     <label>Total Freight <?php echo "($INR)" ?> </label>
                                     <?php
                                     $data = array('name' => 'TotalFreight', 'value' => set_value('TotalFreight', number_format($TotalFreightvalue, 2, '.', '')), 'id' => 'TotalFreight',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2045,7 +2040,7 @@
 
 
 
-                                <div class="col-md-3">
+                                <div class="form-group col-md-3">
                                     <label>Total Order Value <?php echo "($INR)" ?> </label>
                                     <input type="hidden" name="preServiceTotalorderValue" value="<?php echo $totalCapitalOrder ?>">
                                     <?php
@@ -2062,9 +2057,9 @@
 
                     </div>
 
-                    <div class="col-md-12" style="border: 1px solid;padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
+                    <div class="form-group col-md-12" style="border: 1px solid;padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
 
-                        <div class="col-md-4">
+                        <div class="form-group col-md-4">
                             <label>Total Frieght Amount <?php echo "($INR)" ?></label>
 
                             <?php
@@ -2072,7 +2067,7 @@
                             echo form_input($data);
                             ?>
                         </div>
-                        <div class="col-md-4">
+                        <div class="form-group col-md-4">
                             <label>Total Landing Charge <?php echo "($INR)" ?></label>
 
                             <?php
@@ -2081,7 +2076,7 @@
                             ?>
                         </div>
 
-                        <div class="col-md-4">
+                        <div class="form-group col-md-4">
                             <label>Total Assessable Value <?php echo "($INR)" ?></label>
 
                             <?php
@@ -2090,7 +2085,7 @@
                             ?>
                         </div>
 
-                        <div class="col-md-4">
+                        <div class="form-group col-md-4">
                             <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
 
                             <?php
@@ -2102,7 +2097,7 @@
 
 
 
-                        <div class="col-md-4">
+                        <div class="form-group col-md-4">
                             <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
 
                             <?php
@@ -2111,7 +2106,7 @@
                             ?>
                         </div>
 
-                        <div class="col-md-4">
+                        <div class="form-group col-md-4">
                             <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
 
                             <?php
@@ -2120,7 +2115,7 @@
                             ?>
                         </div>
 
-                        <div class="col-md-4">
+                        <div class="form-group col-md-4">
                             <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
 
                             <?php
@@ -2130,7 +2125,7 @@
                         </div>
 
 
-                        <div class="col-md-4">
+                        <div class="form-group col-md-4">
                             <label>Total IGST <?php echo "($INR)" ?></label>
 
                             <?php
@@ -2141,7 +2136,7 @@
 
 
 
-                        <div class="col-md-4">
+                        <div class="form-group col-md-4">
                             <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
 
                             <?php
@@ -2173,7 +2168,7 @@
                                               </div>
                 </div>  -->
 
-                        <div class="col-md-4">
+                        <div class="form-group col-md-4">
                             <label id="lbl_international">Total Order Value <?php echo "($INR)" ?> </label>
                             <input type="hidden" name="preinterTotalorderValue" value="<?php echo $totalCapitalOrder ?>">
                             <?php
@@ -2186,7 +2181,7 @@
 
 
                     </div>
-                    <div class="col-md-12">
+                    <div class="form-group col-md-12">
                         <label>Special Instructions </label> <?php
                                                                 $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', $scopeofwork), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
                                                                 echo form_textarea($data);
@@ -2271,7 +2266,7 @@
             <td align="left"><%=TotalValue%></td>
 
             <td>
-                <a data-target='#EDITCAPITAL' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow('<%=index%>')" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+                <a data-target='#EDITCAPITAL' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow('<%=index%>')" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
 
 
             </td>
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index 07bee5e4..8590e568 100644
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -1,7 +1,8 @@
     <?php $parentPO = '';
     $AvlCapitalBudAmt = isset($AvlCapitalBudAmt) ? (int)$AvlCapitalBudAmt : 0;
     $insuranceStatus = array(
-      array("name" => "NO", "value" => "0"), array("name" => "YES", "value" => "1")
+      array("name" => "NO", "value" => "0"),
+      array("name" => "YES", "value" => "1")
     );
     $requestedBy = $RequistionDetails[0]->FirstName;
     $Updateddt =  new DateTime($RequistionDetails[0]->ReqDate);
@@ -222,15 +223,6 @@
         margin: 0 5px;
       }
 
-      .mandatory {
-        color: red;
-        text-align: right;
-        background-color: white;
-      }
-
-
-
-
       #packagingcalmodel {
         margin-top: 200px;
         z-index: 1080 !important;
@@ -442,3270 +434,3254 @@
 
       });
     </script>
-<div class="content-page">
-	<div class="content">
-		<!-- Start Content-->
-		<div class="container-fluid">
-			<!-- start page title -->
-			<div class="row">
-				<div class="col-12">
-					<div class="page-title-box page-title-box-alt">
-              <?php if ($parentPO == '') { ?>
-								<h4><?= "Edit Capital Purchase Order - $PONO "; ?></h4>
-							<?php } else { ?>
-								<h4><?= "Amended Capital Purchase Order - $PONO "; ?></h4>
-							<?php } ?>
-							<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-cancel" id="back" value="Back">Back</a>
-					</div>
-				</div>
-			</div>
-			<!-- end page title -->
-			<!-- Form row -->
-			<div class="row">
-				<div class="col-12">
-					<div class="card">
-						<div class="card-body">
-
-    <div class="content-wrapper">
-      <div id="content"></div>
-      <?php
-      // $attributes = array('class' => 'form-label-left CapitalPO ','name'  => 'CapitalPO','id'  => 'ImportPO');
-
-      $attributes = array('class' => 'form-label-left CapitalPO ', 'name'  => 'CapitalPO', 'id'  => 'CapitalPO', 'enctype' => 'multipart/form-data');
-
-
-
-      echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
-
-
-      <section class="content">
-
-        <div class="box">
-          <div class="col-md-12">
-            <div class="header-container">
-              <?php if ($parentPO == '') { ?>
-                <h2> Edit Capital Purchase Order - <?php echo $PONO; ?></h2>
-              <?php } else { ?>
-                <h2> Amended Capital Purchase Order - <?php echo $PONO; ?></h2>
-              <?php } ?>
-              <a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-cancel" id="back" value="Back">Back</a>
-            </div>
-            <!-- <div class="col-md-1"><br/>
-                                     <a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorder/CreatecapitalPOPrint" target="_blank">Print</a>
-                                    </div> -->
-          </div>
-          <div class="container-fluid">
-            <div class="row">
-              <div class="col-md-12">
-                <div class="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="col-md-3">
-                  <label>Purchase Order Type</label>
-                  <div class="form-group">
-
-                    <?php
-                    $data = array('name' => 'POType', 'value' => set_value('POType', CAPITAL), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
-                    echo form_input($data);
-                    ?>
-                  </div>
-                </div>
-                <div class="col-md-3">
-                  <label>Supplier<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
-
-                  <?php
-
-
-
-                  if (!empty($Suplist)) {
-                    foreach ($Suplist as $SID) :
-                      $options2[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
-                    endforeach;
-                  }
-
-                  echo form_dropdown('drpSupplier', $options2, 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="col-md-3">
-                  <label>Address</label>
-                  <div class="form-group">
-                    <?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 class="content-page">
+      <div class="content">
+        <!-- Start Content-->
+        <div class="container-fluid">
+          <!-- start page title -->
+          <div class="row">
+            <div class="col-12">
+              <div class="page-title-box page-title-box-alt">
+                <?php if ($parentPO == '') { ?>
+                  <h4><?= "Edit Capital Purchase Order - $PONO "; ?></h4>
+                <?php } else { ?>
+                  <h4><?= "Amended Capital Purchase Order - $PONO "; ?></h4>
+                <?php } ?>
+                <a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-cancel" id="back" value="Back">Back</a>
               </div>
             </div>
-            <div class="row">
-              <div class="col-md-12">
-                <div class="col-md-3" id="currencyTypeDiv">
-                  <label>Currency Type<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
-                  <div class="form-group"> <?php if (!empty($Currency)) {
-                                              // $currentCurrencyType=$CurrencyDetail[0]->CurrencyCode;
-                                              $options1[$CurrencyDetail[0]->Currency_Code] =  $CurrencyDetail[0]->Currency_Code . ' ' . ' - ' . ' ' . $CurrencyDetail[0]->Country_and_Currency;
-                                              foreach ($Currency as $Cur) :
-                                                if ($CurrencyDetail[0]->Currency_Code != $Cur->Currency_Code) {
-                                                  $options1[$Cur->Currency_Code] =  $Cur->Currency_Code . ' ' . ' - ' . ' ' . $Cur->Country_and_Currency;
-                                                }
-                                              endforeach;
-                                            }
-                                            echo form_dropdown('currencytype', $options1, set_value('currencytype', $currentCurrencyType), 'id="currencytype"', 'class="form-control select2"', 'required="true"');
-                                            ?>
-                  </div>
-                </div>
-                <div class="col-md-3">
-                  <b><u>Select Delivery By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></u></b> <br />
-                  <div style="display:inline-flex;">
-                    <div class="centered">
-
-                      <div id="dispatchinternational" style="display:none;">
-                        <?php echo form_label('Dispatch instruction', 'Dispatch instruction') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "2", 'checked' => ('2' == $DeliverOption) ? TRUE : FALSE)); ?>&nbsp;&nbsp;&nbsp;&nbsp;
-                      </div>
-                      <div id="datedomestic" style="display:none;">
-                        <?php echo form_label('Deilvery Date', 'Deilvery Date') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "DeliverycheckDate", "value" => "0", 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE)); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-                      </div>
-                      <div>
-                        <?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>
-                </div>
-
-                <div class="col-md-3" id="Schedulediv" style="display:none;">
-                  <label>Schedule BY<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</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="col-md-3" id="deliverydateby" style="display:none;">
-                  <label>Delivery Date<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
-                  <div class="form-group">
-                    <?php
-                    $data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
-                    echo form_input($data);
-                    ?>
-                  </div>
-                </div>
-                <div class="col-md-3" id="Deliverydtdiv">
-                  <label>Dispatch Instruction<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
-
-                  <?php
-                  // $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
-                  //         echo form_input($data);
-
-                  $data = array('name' => 'Dispatch', 'value' => set_value('Dispatch', $Import_DispatchDetails), 'id' => 'Dispatch',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
-                  echo Form_textarea($data);
-                  ?>
-                </div>
-                <div class="col-md-3">
-                  <label>Delivery Address</label>
-                  <div class="form-group">
-                    <?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);
-                    ?>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="row">
-              <div class="col-md-12">
-                <div class="col-md-3" id="FromOnline" style="display:none;">
-                  Check Today's Foreign Exchange value <a href="http://www.xe.com/" target="_blank"><u>(Click here)</u></a>
-                </div>
-                <div class="col-md-3" id="ExchangeRateOnDiv" style="display:none;">
-                  <label>Exchange Rate On</label>
-                  <div class="form-group">
-                    <?php
-                    $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
-                    echo form_input($data);
-                    ?>
-                  </div>
-                </div>
-                <div class="col-md-3" id="ExchangeRateDiv" style="display:none;">
-                  <label id="CurrencySymbol">Exchange Rate </label><span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span>
-                  <div class="form-group">
-                    <?php
-                    $data = array('name' => 'ExchangeRt', 'value' => set_value('ExchangeRt', $exchangeRate), 'id' => 'ExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                    echo form_input($data);
-                    ?>
-                  </div>
-                </div>
-                <div class="col-md-3" id="PlaceOforigindiv">
-
-                  <label>Place of Origin<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
-                  <div class="form-group">
-                    <?php
-                    //  $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
-                    // echo form_input($data);
-                    $data = array('name' => 'PlaceOforigin', 'value' => set_value('PlaceOforigin', $Import_PlaceofOrgin), 'id' => 'PlaceOforigin',  'class' => 'form-control', 'required' => 'true');
-                    echo form_input($data);
-                    ?>
-                  </div>
-
-                </div>
-              </div>
-            </div>
-            <div class="row">
-              <div class="col-md-12">
-                <div class="col-md-3">
-                  <label>PO Date</label>
-                  <div class="form-group">
-                    <?php
-                    $data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
-                    echo form_input($data);
-                    ?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
-                  </div>
-                </div>
-                <div class="col-md-3">
-                  <label>Mode Of Shipment</label>
-                  <div class="form-group">
-
-                    <?php
-                    $data = array('name' => 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $ModeOfShipment), 'id' => 'editmodeofshipment',  'class' => 'form-control');
-                    echo form_input($data);
-                    ?>
-                  </div>
-                </div>
-                <div class="col-md-3">
-                  <label>Contact Reference</label>
-                  <div class="form-group">
-
-                    <?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="col-md-3"><label>Supplier's Offer No</label>
-                  <div class="form-group">
-
-                    <?php
-                    $data = array('name' => 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $SuppliersOfferNo), 'id' => 'editsupplierofferno',  'class' => 'form-control');
-                    echo form_input($data);
-
-                    ?>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="row">
-              <div class="col-md-12">
-                <div class="col-md-3">
-                  <label>Our Reference(S)</label>
-                  <div class="form-group">
-
-                    <?php
-                    $data = array('name' => 'editotherreference', 'value' => set_value('editotherreference', $OtherReferences), 'id' => 'editotherreference',  'class' => 'form-control');
-                    echo form_input($data);
-                    ?>
-                  </div>
-                </div>
-                <div class="col-md-3">
-                  <label>Capital Type Options</label>
-                  <div class="form-group">
-
-                    <?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 ($PoTypeOptions as $POpt1) :
-                        if ($ServiceTypeOptions != $POpt1->ConfigValue) {
-                          $optionsPO[$POpt1->ConfigValue] =  $POpt1->ConfigValue;
-                        }
-                      endforeach;
-                    }
-
-                    echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
-
-
-                    ?>
-                  </div>
-                </div>
-                <div class="col-md-3">
-                  <label for="payablefrom">Payable Terms</label>
-                  <?php
-                  foreach ($Payment as $rl) :
-                    if ($PaymentTerms == $rl->PaymentTerms) {
-                      $options6[$rl->PaymentID] =  $rl->PaymentTerms;
-                    }
-                  endforeach;
-
-
-                  if (!empty($Payment)) {
-                    foreach ($Payment as $rl2) :
-                      if ($PaymentTerms != $rl2->PaymentTerms) {
-                        $options6[$rl2->PaymentID] =  $rl2->PaymentTerms;
-                      }
-
-                    endforeach;
-                  }
-
-                  echo form_dropdown('PaymentMethod', $options6, set_value('PaymentMethod', $PaymentTerms), 'id="PaymentMethod"', 'required="true"', 'class="form-control select2"');
-
-                  ?>
-
-
-
-                </div>
-                <div class="col-md-3" id="otheroptiondiv" style="display:none;">
-                  <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
-                  <div class="form-group">
-                    <?php
-                    $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
-                    echo form_input($data);
-                    ?>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="row">
-              <div class="col-md-12">
-                <div class="col-md-3">
-                  <label>Insurance Options</label>
-                  <div class="form-group">
-
-                    <?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="col-md-3" id="insuranceTxtDiv" style="display:block;">
-                  <label>Insurance No / Insurance Details<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
-                  <div class="form-group">
-                    <?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="col-md-3">
-                  <label for="BudgetType">Budget Type</label>
-                  <select id='BudgetType' name='BudgetType'>
-                    <?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 class="col-md-3">
-
-                </div>
-              </div>
-            </div>
-
-          </div>
-
-          <div id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-            <div class="modal-dialog">
-
-              <!-- Modal content-->
-              <div class="modal-content">
-                <div class="modal-header">
-                  <button type="button" class="close" data-dismiss="modal">&times;</button>
-                  <h4 class="modal-title">Freight Calculation On</h4>
-                </div>
-                <div class="modal-body">
-                  <form>
-
-                    <div class="radio">
-                      <label><input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount</label>
-                    </div>
-                    <div class="radio">
-                      <label><input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount</label>
-                    </div>
-                  </form>
-                </div>
-                <div class="modal-footer">
-                  <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                  <a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                </div>
-              </div>
-
-            </div>
           </div>
+          <!-- end page title -->
+          <!-- Form row -->
+          <div class="row">
+            <div class="col-12">
+              <div class="card">
+                <div class="card-body">
 
-          <!-- Modal for Packing Calculation -->
-          <div id="editpackagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-            <div class="modal-dialog">
+                  <div class="content-wrapper">
+                    <div id="content"></div>
+                    <?php
 
-              <!-- Modal content-->
-              <div class="modal-content">
-                <div class="modal-header">
-                  <button type="button" class="close" data-dismiss="modal">&times;</button>
-                  <h4 class="modal-title">Freight Calculation On</h4>
-                </div>
-                <div class="modal-body">
-                  <form>
-
-                    <div class="radio">
-                      <label><input type="radio" name="editoptPackaging" checked="checked" value='0' id="editoptPackaging"> Basic Amount</label>
-                    </div>
-                    <div class="radio">
-                      <label><input type="radio" name="editoptPackaging" id="editoptPackaging" value='1'> After Discount Amount</label>
-                    </div>
-                  </form>
-                </div>
-                <div class="modal-footer">
-                  <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                  <a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                </div>
-              </div>
-
-            </div>
-          </div>
-
-          <div id="viewpackagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-            <div class="modal-dialog">
-
-              <!-- Modal content-->
-              <div class="modal-content">
-                <div class="modal-header">
-                  <button type="button" class="close" data-dismiss="modal">&times;</button>
-                  <h4 class="modal-title">Freight Calculation On</h4>
-                </div>
-                <div class="modal-body">
-                  <form>
-
-                    <div class="radio">
-                      <label><input type="radio" name="viewoptPackaging" checked="checked" value='0' id="editoptPackaging"> Basic Amount</label>
-                    </div>
-                    <div class="radio">
-                      <label><input type="radio" name="viewoptPackaging" id="editoptPackaging" value='1'> After Discount Amount</label>
-                    </div>
-                  </form>
-                </div>
-                <div class="modal-footer">
-                  <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                  <a class="btn btn-success" ID="viewPackagingOption" onclick="calculateFreightlocviewper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                </div>
-              </div>
-
-            </div>
-          </div>
+                    $attributes = array('class' => 'form-label-left CapitalPO ', 'name'  => 'CapitalPO', 'id'  => 'CapitalPO', 'enctype' => 'multipart/form-data');
+                    echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
 
 
-          <div class="col-md-12">
-            <div class="col-md-3 col-md-offset-7" align="right" style="padding:10px">
-              <!-- <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
-            </div>
-            <div class="col-md-1" align="right">
-              <?php if ($POStatus == PO_DRAFT || $POStatus == PO_CREATED) { ?>
-                <a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
-              <?php } ?>
-            </div>
-            <br>
-          </div>
+                    <section class="content">
 
-          <div class="box-body">
-            <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-              <thead>
-                <tr>
-                  <th>SNo</th>
-                  <th>Requisition No</th>
-                  <th>Item Code</th>
-                  <th>Item Description</th>
-                  <th>Quantity</th>
-                  <th>UOM</th>
-                  <th>Rate<?php echo "($INR)" ?></th>
-                  <th>Basic Amount<?php echo "($INR)" ?></th>
-                  <th>Tax Amount<?php echo "($INR)" ?></th>
-                  <th>Total Order Amount<?php echo "($INR)" ?></th>
-                  <!-- <th>Actual Quantity</th>
+                      <div class="box">
+
+                        <div class="container-fluid">
+                          <div class="row">
+                            <div class="form-group col-md-12">
+                              <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 class="form-group">
+
+                                  <?php
+                                  $data = array('name' => 'POType', 'value' => set_value('POType', CAPITAL), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
+                                  echo form_input($data);
+                                  ?>
+                                </div>
+                              </div>
+                              <div class="form-group col-md-3">
+                                <label>Supplier<span class="text-danger">*</span></label>
+
+                                <?php
+
+
+
+                                if (!empty($Suplist)) {
+                                  foreach ($Suplist as $SID) :
+                                    $options2[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
+                                  endforeach;
+                                }
+
+                                echo form_dropdown('drpSupplier', $options2, 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>Address</label>
+                                <div class="form-group">
+                                  <?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>
+                          <div class="row">
+                            <div class="form-group col-md-12">
+                              <div class="form-group col-md-3" id="currencyTypeDiv">
+                                <label>Currency Type<span class="text-danger">*</span></label>
+                                <div class="form-group"> <?php if (!empty($Currency)) {
+                                                            // $currentCurrencyType=$CurrencyDetail[0]->CurrencyCode;
+                                                            $options1[$CurrencyDetail[0]->Currency_Code] =  $CurrencyDetail[0]->Currency_Code . ' ' . ' - ' . ' ' . $CurrencyDetail[0]->Country_and_Currency;
+                                                            foreach ($Currency as $Cur) :
+                                                              if ($CurrencyDetail[0]->Currency_Code != $Cur->Currency_Code) {
+                                                                $options1[$Cur->Currency_Code] =  $Cur->Currency_Code . ' ' . ' - ' . ' ' . $Cur->Country_and_Currency;
+                                                              }
+                                                            endforeach;
+                                                          }
+                                                          echo form_dropdown('currencytype', $options1, set_value('currencytype', $currentCurrencyType), 'id="currencytype"', 'class="form-control select2"', 'required="true"');
+                                                          ?>
+                                </div>
+                              </div>
+                              <div class="form-group col-md-3">
+                                <b><u>Select Delivery By<span class="text-danger">*</span></u></b> <br />
+                                <div style="display:inline-flex;">
+                                  <div class="centered">
+
+                                    <div id="dispatchinternational" style="display:none;">
+                                      <?php echo form_label('Dispatch instruction', 'Dispatch instruction') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "2", 'checked' => ('2' == $DeliverOption) ? TRUE : FALSE)); ?>&nbsp;&nbsp;&nbsp;&nbsp;
+                                    </div>
+                                    <div id="datedomestic" style="display:none;">
+                                      <?php echo form_label('Deilvery Date', 'Deilvery Date') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "DeliverycheckDate", "value" => "0", 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE)); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+                                    </div>
+                                    <div>
+                                      <?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>
+                              </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" id="deliverydateby" style="display:none;">
+                                <label>Delivery Date<span class="text-danger">*</span></label>
+                                <div class="form-group">
+                                  <?php
+                                  $data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
+                                  echo form_input($data);
+                                  ?>
+                                </div>
+                              </div>
+                              <div class="form-group col-md-3" id="Deliverydtdiv">
+                                <label>Dispatch Instruction<span class="text-danger">*</span></label>
+
+                                <?php
+                                // $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
+                                //         echo form_input($data);
+
+                                $data = array('name' => 'Dispatch', 'value' => set_value('Dispatch', $Import_DispatchDetails), 'id' => 'Dispatch',  '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 class="form-group">
+                                  <?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);
+                                  ?>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <div class="row">
+                            <div class="form-group col-md-12">
+                              <div class="form-group col-md-3" id="FromOnline" style="display:none;">
+                                Check Today's Foreign Exchange value <a href="http://www.xe.com/" target="_blank"><u>(Click here)</u></a>
+                              </div>
+                              <div class="form-group col-md-3" id="ExchangeRateOnDiv" style="display:none;">
+                                <label>Exchange Rate On</label>
+                                <div class="form-group">
+                                  <?php
+                                  $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                  echo form_input($data);
+                                  ?>
+                                </div>
+                              </div>
+                              <div class="form-group col-md-3" id="ExchangeRateDiv" style="display:none;">
+                                <label id="CurrencySymbol">Exchange Rate </label><span class="text-danger">*</span>
+                                <div class="form-group">
+                                  <?php
+                                  $data = array('name' => 'ExchangeRt', 'value' => set_value('ExchangeRt', $exchangeRate), 'id' => 'ExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                  echo form_input($data);
+                                  ?>
+                                </div>
+                              </div>
+                              <div class="form-group col-md-3" id="PlaceOforigindiv">
+
+                                <label>Place of Origin<span class="text-danger">*</span></label>
+                                <div class="form-group">
+                                  <?php
+                                  //  $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+                                  // echo form_input($data);
+                                  $data = array('name' => 'PlaceOforigin', 'value' => set_value('PlaceOforigin', $Import_PlaceofOrgin), 'id' => 'PlaceOforigin',  'class' => 'form-control', 'required' => 'true');
+                                  echo form_input($data);
+                                  ?>
+                                </div>
+
+                              </div>
+                            </div>
+                          </div>
+                          <div class="row">
+                            <div class="form-group col-md-12">
+                              <div class="form-group col-md-3">
+                                <label>PO Date</label>
+                                <div class="form-group">
+                                  <?php
+                                  $data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                  echo form_input($data);
+                                  ?> <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 class="form-group">
+
+                                  <?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 class="form-group">
+
+                                  <?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 class="form-group">
+
+                                  <?php
+                                  $data = array('name' => 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $SuppliersOfferNo), 'id' => 'editsupplierofferno',  'class' => 'form-control');
+                                  echo form_input($data);
+
+                                  ?>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <div class="row">
+                            <div class="form-group col-md-12">
+                              <div class="form-group col-md-3">
+                                <label>Our Reference(S)</label>
+                                <div class="form-group">
+
+                                  <?php
+                                  $data = array('name' => 'editotherreference', 'value' => set_value('editotherreference', $OtherReferences), 'id' => 'editotherreference',  'class' => 'form-control');
+                                  echo form_input($data);
+                                  ?>
+                                </div>
+                              </div>
+                              <div class="form-group col-md-3">
+                                <label>Capital Type Options</label>
+                                <div class="form-group">
+
+                                  <?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 ($PoTypeOptions as $POpt1) :
+                                      if ($ServiceTypeOptions != $POpt1->ConfigValue) {
+                                        $optionsPO[$POpt1->ConfigValue] =  $POpt1->ConfigValue;
+                                      }
+                                    endforeach;
+                                  }
+
+                                  echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
+
+
+                                  ?>
+                                </div>
+                              </div>
+                              <div class="form-group col-md-3">
+                                <label for="payablefrom">Payable Terms</label>
+                                <?php
+                                foreach ($Payment as $rl) :
+                                  if ($PaymentTerms == $rl->PaymentTerms) {
+                                    $options6[$rl->PaymentID] =  $rl->PaymentTerms;
+                                  }
+                                endforeach;
+
+
+                                if (!empty($Payment)) {
+                                  foreach ($Payment as $rl2) :
+                                    if ($PaymentTerms != $rl2->PaymentTerms) {
+                                      $options6[$rl2->PaymentID] =  $rl2->PaymentTerms;
+                                    }
+
+                                  endforeach;
+                                }
+
+                                echo form_dropdown('PaymentMethod', $options6, set_value('PaymentMethod', $PaymentTerms), 'id="PaymentMethod"', '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 class="form-group">
+                                  <?php
+                                  $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+                                  echo form_input($data);
+                                  ?>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <div class="row">
+                            <div class="form-group col-md-12">
+                              <div class="form-group col-md-3">
+                                <label>Insurance Options</label>
+                                <div class="form-group">
+
+                                  <?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 class="form-group">
+                                  <?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</label>
+                                <select id='BudgetType' name='BudgetType'>
+                                  <?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 class="form-group col-md-3">
+
+                              </div>
+                            </div>
+                          </div>
+
+                        </div>
+
+                        <div id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+                          <div class="modal-dialog">
+
+                            <!-- Modal content-->
+                            <div class="modal-content">
+                              <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                <h4 class="modal-title">Freight Calculation On</h4>
+                              </div>
+                              <div class="modal-body">
+                                <form>
+
+                                  <div class="radio">
+                                    <label><input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount</label>
+                                  </div>
+                                  <div class="radio">
+                                    <label><input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount</label>
+                                  </div>
+                                </form>
+                              </div>
+                              <div class="modal-footer">
+                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+                                <a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+                              </div>
+                            </div>
+
+                          </div>
+                        </div>
+
+                        <!-- Modal for Packing Calculation -->
+                        <div id="editpackagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+                          <div class="modal-dialog">
+
+                            <!-- Modal content-->
+                            <div class="modal-content">
+                              <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                <h4 class="modal-title">Freight Calculation On</h4>
+                              </div>
+                              <div class="modal-body">
+                                <form>
+
+                                  <div class="radio">
+                                    <label><input type="radio" name="editoptPackaging" checked="checked" value='0' id="editoptPackaging"> Basic Amount</label>
+                                  </div>
+                                  <div class="radio">
+                                    <label><input type="radio" name="editoptPackaging" id="editoptPackaging" value='1'> After Discount Amount</label>
+                                  </div>
+                                </form>
+                              </div>
+                              <div class="modal-footer">
+                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+                                <a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+                              </div>
+                            </div>
+
+                          </div>
+                        </div>
+
+                        <div id="viewpackagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+                          <div class="modal-dialog">
+
+                            <!-- Modal content-->
+                            <div class="modal-content">
+                              <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                <h4 class="modal-title">Freight Calculation On</h4>
+                              </div>
+                              <div class="modal-body">
+                                <form>
+
+                                  <div class="radio">
+                                    <label><input type="radio" name="viewoptPackaging" checked="checked" value='0' id="editoptPackaging"> Basic Amount</label>
+                                  </div>
+                                  <div class="radio">
+                                    <label><input type="radio" name="viewoptPackaging" id="editoptPackaging" value='1'> After Discount Amount</label>
+                                  </div>
+                                </form>
+                              </div>
+                              <div class="modal-footer">
+                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+                                <a class="btn btn-success" ID="viewPackagingOption" onclick="calculateFreightlocviewper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+                              </div>
+                            </div>
+
+                          </div>
+                        </div>
+
+
+                        <div class="form-group col-md-12">
+                          <div class="col-md-3 col-md-offset-7" align="right" style="padding:10px">
+                            <!-- <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
+                          </div>
+                          <div class="form-group col-md-1 align="right">
+                            <?php if ($POStatus == PO_DRAFT || $POStatus == PO_CREATED) { ?>
+                              <a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
+                            <?php } ?>
+                          </div>
+                          <br>
+                        </div>
+
+                        <div class="box-body">
+                          <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+                            <thead>
+                              <tr>
+                                <th>SNo</th>
+                                <th>Requisition No</th>
+                                <th>Item Code</th>
+                                <th>Item Description</th>
+                                <th>Quantity</th>
+                                <th>UOM</th>
+                                <th>Rate<?php echo "($INR)" ?></th>
+                                <th>Basic Amount<?php echo "($INR)" ?></th>
+                                <th>Tax Amount<?php echo "($INR)" ?></th>
+                                <th>Total Order Amount<?php echo "($INR)" ?></th>
+                                <!-- <th>Actual Quantity</th>
                         <th>Received Quantity</th>
                         <th>Pending Quantity</th> -->
-                  <th>Action</th>
-                </tr>
-              </thead>
+                                <th>Action</th>
+                              </tr>
+                            </thead>
 
-              <tbody id='capitalAppend'>
-                <?php
-                if (!empty($POItem)) {
-                  $index = 0;
-                  $totalCapitalOrder = 0;
-                  $TotalDiscountedAmt = 0;
-                  $TotalFreightAmt = 0;
-                  $ExitDiscountedAmt = 0;
-                  foreach ($POItem as $record) {
-                    $index = $index + 1;
-                    $ExitTotalBasicOrderValue = $ExitTotalBasicOrderValue + ($record->Rate * $record->Quantity);
+                            <tbody id='capitalAppend'>
+                              <?php
+                              if (!empty($POItem)) {
+                                $index = 0;
+                                $totalCapitalOrder = 0;
+                                $TotalDiscountedAmt = 0;
+                                $TotalFreightAmt = 0;
+                                $ExitDiscountedAmt = 0;
+                                foreach ($POItem as $record) {
+                                  $index = $index + 1;
+                                  $ExitTotalBasicOrderValue = $ExitTotalBasicOrderValue + ($record->Rate * $record->Quantity);
 
-                ?>
-                    <tr id="<?php echo $index; ?>">
-                      <td align="left"><?php echo $index; ?></td>
-                      <td><?php echo $record->ReqNo ?></td>
-                      <td><?php echo $record->MaterialCode ?></td>
-                      <td><?php echo $record->MaterialName ?></td>
-                      <td><?php echo $record->Quantity ?></td>
-                      <td><?php echo $record->UOM ?></td>
-                      <td><?php echo $record->Rate ?></td>
-                      <td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
-                      <?php if ($CapitalRange == '1') { ?>
-                        <td><?php echo $record->ServiceTaxamount; ?></td>
-                        <td><?php echo number_format($record->Rate * $record->Quantity  + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?></td>
+                              ?>
+                                  <tr id="<?php echo $index; ?>">
+                                    <td align="left"><?php echo $index; ?></td>
+                                    <td><?php echo $record->ReqNo ?></td>
+                                    <td><?php echo $record->MaterialCode ?></td>
+                                    <td><?php echo $record->MaterialName ?></td>
+                                    <td><?php echo $record->Quantity ?></td>
+                                    <td><?php echo $record->UOM ?></td>
+                                    <td><?php echo $record->Rate ?></td>
+                                    <td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
+                                    <?php if ($CapitalRange == '1') { ?>
+                                      <td><?php echo $record->ServiceTaxamount; ?></td>
+                                      <td><?php echo number_format($record->Rate * $record->Quantity  + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?></td>
 
-                      <?php } ?>
-                      <?php if ($CapitalRange == '0') { ?>
-                        <td><?php echo '0'; ?></td>
+                                    <?php } ?>
+                                    <?php if ($CapitalRange == '0') { ?>
+                                      <td><?php echo '0'; ?></td>
 
-                        <td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
+                                      <td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
 
-                      <?php } ?>
+                                    <?php } ?>
 
 
-                      <!-- <td align="right"><?php echo $record->Quantity ?></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> -->
-                      <?php
-                      $row = array("materialCode" => $record->MaterialCode, "ReqNo" => $record->ReqNo);
-                      array_push($res_arr_values, $row);
-                      ?>
-
-                      <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 '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 'CPCostCode' . $index ?>" id="<?php echo 'CPCostCode' . $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 '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 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
-                      <input type="hidden" name="<?php echo 'CapitalItemDescrition' . $index ?>" id="<?php echo 'CapitalItemDescrition' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
-                      <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; ?>" />
-
-                      <?php if ($CapitalRange == '1') { ?>
-
-                        <input type="hidden" name="<?php echo 'rateInUs' . $index ?>" id="<?php echo 'rateInUs' . $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 '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 '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 'AfterIgst' . $index ?>" id="<?php echo 'AfterIgst' . $index ?>" value="<?php echo $record->After_IGST; ?>" />
-                        <input type="hidden" name="<?php echo 'OtherAmt' . $index ?>" id="<?php echo 'OtherAmt' . $index ?>" value="<?php echo $record->otherallowance; ?>" />
-                        <input type="hidden" name="<?php echo 'ServiceTotalOrderValue' . $index ?>" id="<?php echo 'ServiceTotalOrderValue' . $index ?>" value="<?php echo $record->ServiceTaxamount; ?>" />
-                        <input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->discount; ?>" />
-                        <input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->discountval; ?>" />
-                        <input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->Afterdiscountval; ?>" />
-                        <input type="hidden" name="<?php echo 'basicvalInINR' . $index ?>" id="<?php echo 'basicvalInINR' . $index ?>" value="<?php echo $record->Rate * $record->Quantity + $record->After_CGST + $record->After_SGST + $record->After_IGST + $record->otherallowance - $record->Afterdiscountval; ?>" />
-
-
-                        <input type="hidden" name="<?php echo 'Ftype' . $index ?>" id="<?php echo 'Ftype' . $index ?>" value="<?php echo $record->Ftype; ?>" />
-
-                        <input type="hidden" name="<?php echo 'NoTrip' . $index ?>" id="<?php echo 'NoTrip' . $index ?>" value="<?php echo $record->NoTrip; ?>" />
-
-                        <input type="hidden" name="<?php echo 'Fvalue' . $index ?>" id="<?php echo 'Fvalue' . $index ?>" value="<?php echo $record->Fvalue; ?>" />
-
-                        <input type="hidden" name="<?php echo 'Afvalue' . $index ?>" id="<?php echo 'Afvalue' . $index ?>" value="<?php echo $record->Afvalue; ?>" />
-
-
-
-
-                      <?php } ?>
-
-                      <?php if ($CapitalRange == '0') { ?>
-                        <input align="right" type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
-
-
-                        <input align="right" type="hidden" name="<?php echo 'NoOfTrip' . $index ?>" id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-
-
-                        <input align="right" type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-
-
-                        <input align="right" type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-
-
-                        <input type="hidden" name="<?php echo 'rateInUs' . $index ?>" id="<?php echo 'rateInUs' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
-
-
-                        <input type="hidden" name="<?php echo 'basicvalInINR' . $index ?>" id="<?php echo 'basicvalInINR' . $index ?>" value="<?php echo $record->ProductPrice; ?>" />
-
-
-                        <input type="hidden" name="<?php echo 'beforeLanding' . $index ?>" id="<?php echo 'beforeLanding' . $index ?>" value="<?php echo $record->LandingCharge; ?>" />
-
-
-                        <input type="hidden" name="<?php echo 'landingCharge' . $index ?>" id="<?php echo 'landingCharge' . $index ?>" value="<?php echo $record->AfterLandingCharge; ?>" />
-
-
-
-
-                        <input type="hidden" name="<?php echo 'beforeCustomDuty' . $index ?>" id="<?php echo 'beforeCustomDuty' . $index ?>" value="<?php echo $record->CustomDuty; ?>" />
-
-
-                        <input type="hidden" name="<?php echo 'CustomDuty' . $index ?>" id="<?php echo 'CustomDuty' . $index ?>" value="<?php echo $record->AfterCustomDuty; ?>" />
-
-
-
-                        <input type="hidden" name="<?php echo 'beforeCustomEDCess' . $index ?>" id="<?php echo 'beforeCustomEDCess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
-
-
-                        <input type="hidden" name="<?php echo 'CustomEDCess' . $index ?>" id="<?php echo 'CustomEDCess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
-
-
-                        <input type="hidden" name="<?php echo 'beforeCustomSHCess' . $index ?>" id="<?php echo 'beforeCustomSHCess' . $index ?>" value="<?php echo $record->CustomSHCess; ?>" />
-
-
-                        <input type="hidden" name="<?php echo 'CustomSHCess' . $index ?>" id="<?php echo 'CustomSHCess' . $index ?>" value="<?php echo $record->AfterCustomSHCess; ?>" />
-
-                        <input type="hidden" name="<?php echo 'echangeRate' . $index ?>" id="<?php echo 'echangeRate' . $index ?>" value="<?php echo $record->ExchangeRate; ?>" />
-
-
-
-                        <input type="hidden" name="<?php echo 'GrossDutyPayable' . $index ?>" id="<?php echo 'GrossDutyPayable' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" />
-
-
-
-
-                        <input type="hidden" name="<?php echo 'CustomDutyExpenses' . $index ?>" id="<?php echo 'CustomDutyExpenses' . $index ?>" value="<?php echo $record->CustomDutyExpensesPerKG; ?>" />
-
-
-
-                        <input type="hidden" name="<?php echo 'PurQuantity' . $index ?>" id="<?php echo 'PurQuantity' . $index ?>" value="<?php echo $record->QuantityKG; ?>" />
-
-                        <input type="hidden" name="<?php echo 'PerKgExpense' . $index ?>" id="<?php echo 'PerKgExpense' . $index ?>" value="<?php echo $record->ImportTotalValue; ?>" />
-
-                        <input type="hidden" name="<?php echo 'Cgst' . $index ?>" id="<?php echo 'Cgst' . $index ?>" value="0" />
-
-
-                        <input type="hidden" name="<?php echo 'AfterCgst' . $index ?>" id="<?php echo 'AfterCgst' . $index ?>" value="0" />
-
-                        <input type="hidden" name="<?php echo 'Sgst' . $index ?>" id="<?php echo 'Sgst' . $index ?>" value="0" />
-
-                        <input type="hidden" name="<?php echo 'AfterSgst' . $index ?>" id="<?php echo 'AfterSgst' . $index ?>" value="0" />
-
-                        <input type="hidden" name="<?php echo 'Igst' . $index ?>" id="<?php echo 'Igst' . $index ?>" value="0" />
-
-                        <input type="hidden" name="<?php echo 'AfterIgst' . $index ?>" id="<?php echo 'AfterIgst' . $index ?>" value="0" />
-
-                        <input type="hidden" name="<?php echo 'OtherAmt' . $index ?>" id="<?php echo 'OtherAmt' . $index ?>" value="0" />
-
-                        <input type="hidden" name="<?php echo 'ServiceTotalOrderValue' . $index ?>" id="<?php echo 'ServiceTotalOrderValue' . $index ?>" value="0" />
-
-                        <input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="0" />
-
-                        <input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="0" />
-
-                        <input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="0" />
-
-
-
-
-                        <input type="hidden" name="<?php echo 'AssessableValue' . $index ?>" id="<?php echo 'AssessableValue' . $index ?>" value="<?php echo $record->AssessableValue; ?>" />
-
-                        <input type="hidden" name="<?php echo 'SubTotal' . $index ?>" id="<?php echo 'SubTotal' . $index ?>" value="<?php echo $record->SubTotal; ?>" />
-
-                        <input type="hidden" name="<?php echo 'IGSTInt' . $index ?>" id="<?php echo 'IGSTInt' . $index ?>" value="<?php echo $record->IGST; ?>" />
-
-                        <input type="hidden" name="<?php echo 'AfterIGSTInt' . $index ?>" id="<?php echo 'AfterIGSTInt' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
-
-                        <input type="hidden" name="<?php echo 'DutyImpact' . $index ?>" id="<?php echo 'DutyImpact' . $index ?>" value="<?php echo $record->DutyImpact; ?>" />
-
-                        <input type="hidden" name="<?php echo 'ClearingCharge' . $index ?>" id="<?php echo 'ClearingCharge' . $index ?>" value="<?php echo $record->ClearingCharge; ?>" />
-
-                        <input type="hidden" name="<?php echo 'NetValue' . $index ?>" id="<?php echo 'NetValue' . $index ?>" value="<?php echo $record->NetValue; ?>" />
-
-
-
-                      <?php } ?>
-
-                      <input type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->Rate * $record->Quantity; ?>" />
-
-
-
-
-
-
-
-                      <?php
-
-                      if ($POStatus == PO_DRAFT || $POStatus == PO_CREATED) { ?>
-                        <td> <a data-target='#EDITCAPITAL' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITCAPITAL"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
-                        <?php
-                      } else { ?>
-                        <td> <a data-target='#VIEWCAPITAL' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWCAPITAL"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
-                      <?php
-                      } ?>
-                    </tr> <?php
-                          if ($CapitalRange == '1') {
-                            $TotalCgst = $TotalCgst + $record->After_CGST;
-                            $TotalSgst = $TotalSgst + $record->After_SGST;
-                            $TotalIgst = $TotalIgst + $record->After_IGST;
-                            $OtherAmt =  $OtherAmt +  $record->otherallowance;
-                            $TotalFreightvalue = $TotalFreightvalue + $record->Afvalue;
-
-
-                            $TotalSummary = $TotalSummary + $record->ServiceTaxamount;
-
-                            $TotalDiscountedAmt = $record->Afterdiscountval;
-
-                            $ExitDiscountedAmt = $ExitDiscountedAmt + $record->Afterdiscountval;
-
-                            $totalCapitalOrder = $totalCapitalOrder + $record->Rate * $record->Quantity + $record->After_CGST + $record->After_SGST + $record->After_IGST + $record->otherallowance + $record->Afvalue - $TotalDiscountedAmt;
-                          }
-                          $TotalBasicAmount = $TotalBasicAmount + $record->BasicValue;
-                          $ServiceDescription = $ServiceDescription;
-
-
-                          if ($CapitalRange == '0') {
-                            $TotalLanding  = $TotalLanding + $record->AfterLandingCharge;
-                            $tothighseas   = $tothighseas + $record->AfterHighSeasSalesCharge;
-                            $totcustom  = $totcustom + $record->AfterCustomDuty;
-                            $totexciseduty  = $totexciseduty + $record->AfterExciseDuty;
-                            $totexcisedutyED  = $totexcisedutyED + $record->AfterExciseDutyEdCess;
-                            $totexciseSH  = $totexciseSH + $record->AfterExciseDutySHCess;
-                            $totcustomED  = $totcustomED + $record->AfterCustomEdCess;
-
-                            $totcustomSH   = $totcustomSH + $record->AfterCustomSHCess;
-                            $totaddtnlexcise = $totaddtnlexcise + $record->AfterAddlExciseDuty;
-                            $totgrossduty   = $totgrossduty + $record->Grossdutypayable;
-                            $totavlmodvat    = $totavlmodvat + $record->AvailableModvat;
-                            $TotalFreightAmt = $TotalFreightAmt + $record->AfterFreightValue;
-
-                            $totgrossexpense = $totgrossexpense + $record->Grossexpensesduetocustomduty;
-                            $ExchangeRate = $record->ExchangeRate;
-                            $totalCapitalOrder = $totalCapitalOrder + $record->Rate * $record->Quantity;
-
-
-                            $totassesable = $totassesable + $record->AssessableValue;
-                            $totSubtotal = $totSubtotal + $record->SubTotal;
-                            $totigst = $totigst + $record->AfterIGST;
-                          }
-
-
-                          // $totorder=$totorder+$record->TotalOrderValue;
-
-
-
-
-                        }
-                          ?> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index; ?>">
-                  <!-- <input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder"  value="<?php echo $totalCapitalOrder; ?>"> -->
-                  <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
-                  <input type="hidden" name="capitalType" id="capitalType" value="<?php echo $CapitalRange; ?>" />
-
-
-                <?php
-
-                }
-                ?>
-              </tbody>
-            </table>
-          </div>
-
-          <div class="container-fluid">
-            <table class="table table-bordered" style="border:1px solid #333">
-              <div align="right" style="padding-right:10px">
-                <div align="right">
-                  <div class="modal fade" id="CAPITAL" role="dialog" style="overflow-y:scroll !important">
-                    <div class="modal-dialog">
-                      <!-- Modal content-->
-                      <form>
-                        <div class="modal-content" style="width:1160px;">
-                          <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal">&times;</button>
-                            <center>
-                              <h4>Add Capital Purchase Order Item </h4>
-                            </center>
-                          </div>
-                          <div align="left">
-                            <div class="col-md-12" style="padding:0px">
-                              <div class="col-md-12">
-                                <div class="col-md-5" style="padding:0px;">
-                                  <div class="col-md-6" style="padding:0px">
-                                    <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
-                                    <div>
-
-                                      <?php
-                                      $RL = array("0" => 'Select Req No');
-                                      if (!empty($RequistionDetails)) {
-                                        foreach ($RequistionDetails as $SID) :
-                                          $RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
-                                        endforeach;
-                                      }
-
-                                      echo form_dropdown('Reqnumber', $RL, set_value('Reqnumber'), 'id="Reqnumber"', 'class="form-control select2 required"');
-
-                                      ?>
-
-
-
-                                    </div>
-                                  </div>
-                                  <div class="col-md-6">
-                                    <label>Department Name</label>
-                                    <div>
-                                      <?php
-                                      $data = array('name' => 'CapitalDepartmentName', 'value' => set_value('CapitalDepartmentName'), 'id' => 'CapitalDepartmentName',  'class' => 'form-control', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-5">
-                                  <div class="col-md-6">
-                                    <label>Cost Center Code</label>
-                                    <div>
-                                      <?php
-
-                                      $data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
-                                      echo form_input($data);
-
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-6">
-                                    <label>Avail Bud Amount<?php echo "($INR)" ?></label>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'CapitalbudAmt', 'value' => set_value('CapitalbudAmt'), 'id' => 'CapitalbudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-2" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;">
-                                  <label> Exchange Rate</label>
-                                  <div class="form-group">
                                     <?php
-                                    $data = array('name' => 'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
+                                    $row = array("materialCode" => $record->MaterialCode, "ReqNo" => $record->ReqNo);
+                                    array_push($res_arr_values, $row);
                                     ?>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                            <div class="col-md-12" style="padding:0px">
-                              <div class="col-md-12" style="padding:0px">
-                                <div class="col-md-6" style="padding:0px">
-                                  <div class="col-md-3">
-                                    <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
-                                    <div>
-                                      <?php
-                                      $options = array("0" => 'Item Code');
-                                      echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control select2"');
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-3">
-                                    <label>Item Name</label>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'CapitalItemName', 'value' => set_value('ICapitalItemName'), 'id' => 'CapitalItemName',  'class' => 'form-control', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
 
-                                  <div class="col-md-3">
-                                    <label>UOM</label>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'CPUOM', 'value' => set_value('CPUOM'), 'id' => 'CPUOM',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-3">
-                                    <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'CPQuantity', 'value' => set_value('CPQuantity'), 'id' => 'CPQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();calculateFreight(3);calculateFreightlocaddper()');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-6" style="padding: 0px;">
+                                    <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; ?>" />
 
-                                  <div class="col-md-4" style="padding: 0px;">
-                                    <label id="RateIn">Rate(In INR /UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
-                                    <div class="form-group">
+                                    <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 'CPCostCode' . $index ?>" id="<?php echo 'CPCostCode' . $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 '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 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
+                                    <input type="hidden" name="<?php echo 'CapitalItemDescrition' . $index ?>" id="<?php echo 'CapitalItemDescrition' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
+                                    <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; ?>" />
+
+                                    <?php if ($CapitalRange == '1') { ?>
+
+                                      <input type="hidden" name="<?php echo 'rateInUs' . $index ?>" id="<?php echo 'rateInUs' . $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 '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 '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 'AfterIgst' . $index ?>" id="<?php echo 'AfterIgst' . $index ?>" value="<?php echo $record->After_IGST; ?>" />
+                                      <input type="hidden" name="<?php echo 'OtherAmt' . $index ?>" id="<?php echo 'OtherAmt' . $index ?>" value="<?php echo $record->otherallowance; ?>" />
+                                      <input type="hidden" name="<?php echo 'ServiceTotalOrderValue' . $index ?>" id="<?php echo 'ServiceTotalOrderValue' . $index ?>" value="<?php echo $record->ServiceTaxamount; ?>" />
+                                      <input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->discount; ?>" />
+                                      <input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->discountval; ?>" />
+                                      <input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->Afterdiscountval; ?>" />
+                                      <input type="hidden" name="<?php echo 'basicvalInINR' . $index ?>" id="<?php echo 'basicvalInINR' . $index ?>" value="<?php echo $record->Rate * $record->Quantity + $record->After_CGST + $record->After_SGST + $record->After_IGST + $record->otherallowance - $record->Afterdiscountval; ?>" />
+
+
+                                      <input type="hidden" name="<?php echo 'Ftype' . $index ?>" id="<?php echo 'Ftype' . $index ?>" value="<?php echo $record->Ftype; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'NoTrip' . $index ?>" id="<?php echo 'NoTrip' . $index ?>" value="<?php echo $record->NoTrip; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'Fvalue' . $index ?>" id="<?php echo 'Fvalue' . $index ?>" value="<?php echo $record->Fvalue; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'Afvalue' . $index ?>" id="<?php echo 'Afvalue' . $index ?>" value="<?php echo $record->Afvalue; ?>" />
+
+
+
+
+                                    <?php } ?>
+
+                                    <?php if ($CapitalRange == '0') { ?>
+                                      <input align="right" type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
+
+
+                                      <input align="right" type="hidden" name="<?php echo 'NoOfTrip' . $index ?>" id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
+
+
+                                      <input align="right" type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
+
+
+                                      <input align="right" type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
+
+
+                                      <input type="hidden" name="<?php echo 'rateInUs' . $index ?>" id="<?php echo 'rateInUs' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
+
+
+                                      <input type="hidden" name="<?php echo 'basicvalInINR' . $index ?>" id="<?php echo 'basicvalInINR' . $index ?>" value="<?php echo $record->ProductPrice; ?>" />
+
+
+                                      <input type="hidden" name="<?php echo 'beforeLanding' . $index ?>" id="<?php echo 'beforeLanding' . $index ?>" value="<?php echo $record->LandingCharge; ?>" />
+
+
+                                      <input type="hidden" name="<?php echo 'landingCharge' . $index ?>" id="<?php echo 'landingCharge' . $index ?>" value="<?php echo $record->AfterLandingCharge; ?>" />
+
+
+
+
+                                      <input type="hidden" name="<?php echo 'beforeCustomDuty' . $index ?>" id="<?php echo 'beforeCustomDuty' . $index ?>" value="<?php echo $record->CustomDuty; ?>" />
+
+
+                                      <input type="hidden" name="<?php echo 'CustomDuty' . $index ?>" id="<?php echo 'CustomDuty' . $index ?>" value="<?php echo $record->AfterCustomDuty; ?>" />
+
+
+
+                                      <input type="hidden" name="<?php echo 'beforeCustomEDCess' . $index ?>" id="<?php echo 'beforeCustomEDCess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
+
+
+                                      <input type="hidden" name="<?php echo 'CustomEDCess' . $index ?>" id="<?php echo 'CustomEDCess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
+
+
+                                      <input type="hidden" name="<?php echo 'beforeCustomSHCess' . $index ?>" id="<?php echo 'beforeCustomSHCess' . $index ?>" value="<?php echo $record->CustomSHCess; ?>" />
+
+
+                                      <input type="hidden" name="<?php echo 'CustomSHCess' . $index ?>" id="<?php echo 'CustomSHCess' . $index ?>" value="<?php echo $record->AfterCustomSHCess; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'echangeRate' . $index ?>" id="<?php echo 'echangeRate' . $index ?>" value="<?php echo $record->ExchangeRate; ?>" />
+
+
+
+                                      <input type="hidden" name="<?php echo 'GrossDutyPayable' . $index ?>" id="<?php echo 'GrossDutyPayable' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" />
+
+
+
+
+                                      <input type="hidden" name="<?php echo 'CustomDutyExpenses' . $index ?>" id="<?php echo 'CustomDutyExpenses' . $index ?>" value="<?php echo $record->CustomDutyExpensesPerKG; ?>" />
+
+
+
+                                      <input type="hidden" name="<?php echo 'PurQuantity' . $index ?>" id="<?php echo 'PurQuantity' . $index ?>" value="<?php echo $record->QuantityKG; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'PerKgExpense' . $index ?>" id="<?php echo 'PerKgExpense' . $index ?>" value="<?php echo $record->ImportTotalValue; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'Cgst' . $index ?>" id="<?php echo 'Cgst' . $index ?>" value="0" />
+
+
+                                      <input type="hidden" name="<?php echo 'AfterCgst' . $index ?>" id="<?php echo 'AfterCgst' . $index ?>" value="0" />
+
+                                      <input type="hidden" name="<?php echo 'Sgst' . $index ?>" id="<?php echo 'Sgst' . $index ?>" value="0" />
+
+                                      <input type="hidden" name="<?php echo 'AfterSgst' . $index ?>" id="<?php echo 'AfterSgst' . $index ?>" value="0" />
+
+                                      <input type="hidden" name="<?php echo 'Igst' . $index ?>" id="<?php echo 'Igst' . $index ?>" value="0" />
+
+                                      <input type="hidden" name="<?php echo 'AfterIgst' . $index ?>" id="<?php echo 'AfterIgst' . $index ?>" value="0" />
+
+                                      <input type="hidden" name="<?php echo 'OtherAmt' . $index ?>" id="<?php echo 'OtherAmt' . $index ?>" value="0" />
+
+                                      <input type="hidden" name="<?php echo 'ServiceTotalOrderValue' . $index ?>" id="<?php echo 'ServiceTotalOrderValue' . $index ?>" value="0" />
+
+                                      <input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="0" />
+
+                                      <input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="0" />
+
+                                      <input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="0" />
+
+
+
+
+                                      <input type="hidden" name="<?php echo 'AssessableValue' . $index ?>" id="<?php echo 'AssessableValue' . $index ?>" value="<?php echo $record->AssessableValue; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'SubTotal' . $index ?>" id="<?php echo 'SubTotal' . $index ?>" value="<?php echo $record->SubTotal; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'IGSTInt' . $index ?>" id="<?php echo 'IGSTInt' . $index ?>" value="<?php echo $record->IGST; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'AfterIGSTInt' . $index ?>" id="<?php echo 'AfterIGSTInt' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'DutyImpact' . $index ?>" id="<?php echo 'DutyImpact' . $index ?>" value="<?php echo $record->DutyImpact; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'ClearingCharge' . $index ?>" id="<?php echo 'ClearingCharge' . $index ?>" value="<?php echo $record->ClearingCharge; ?>" />
+
+                                      <input type="hidden" name="<?php echo 'NetValue' . $index ?>" id="<?php echo 'NetValue' . $index ?>" value="<?php echo $record->NetValue; ?>" />
+
+
+
+                                    <?php } ?>
+
+                                    <input type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->Rate * $record->Quantity; ?>" />
+
+
+
+
+
+
+
+                                    <?php
+
+                                    if ($POStatus == PO_DRAFT || $POStatus == PO_CREATED) { ?>
+                                      <td> <a data-target='#EDITCAPITAL' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITCAPITAL"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
                                       <?php
-                                      $data = array('name' => 'CPRate', 'value' => set_value('CPRate'), 'id' => 'CPRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();calculateFreight(3);calculateFreightlocaddper()');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <label>Per</label> <?php
-                                                        $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
-                                                        echo form_input($data); ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <label id="TotalAmount">Basic value <?php echo "($INR)" ?></label>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'CPTotalAmount', 'value' => set_value('CPTotalAmount'), 'id' => 'CPTotalAmount',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                            <div class="col-md-12" style="padding:2%">
-                              <div class="col-md-12" id="ADDCAPdiv" style="padding:0px;">
-                                <div class="col-md-12" style="border:1px solid #000;">
-                                  <div class="col-md-12"> <!--<div class="col-md-4">
+                                    } else { ?>
+                                      <td> <a data-target='#VIEWCAPITAL' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWCAPITAL"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
+                                    <?php
+                                    } ?>
+                                  </tr> <?php
+                                        if ($CapitalRange == '1') {
+                                          $TotalCgst = $TotalCgst + $record->After_CGST;
+                                          $TotalSgst = $TotalSgst + $record->After_SGST;
+                                          $TotalIgst = $TotalIgst + $record->After_IGST;
+                                          $OtherAmt =  $OtherAmt +  $record->otherallowance;
+                                          $TotalFreightvalue = $TotalFreightvalue + $record->Afvalue;
+
+
+                                          $TotalSummary = $TotalSummary + $record->ServiceTaxamount;
+
+                                          $TotalDiscountedAmt = $record->Afterdiscountval;
+
+                                          $ExitDiscountedAmt = $ExitDiscountedAmt + $record->Afterdiscountval;
+
+                                          $totalCapitalOrder = $totalCapitalOrder + $record->Rate * $record->Quantity + $record->After_CGST + $record->After_SGST + $record->After_IGST + $record->otherallowance + $record->Afvalue - $TotalDiscountedAmt;
+                                        }
+                                        $TotalBasicAmount = $TotalBasicAmount + $record->BasicValue;
+                                        $ServiceDescription = $ServiceDescription;
+
+
+                                        if ($CapitalRange == '0') {
+                                          $TotalLanding  = $TotalLanding + $record->AfterLandingCharge;
+                                          $tothighseas   = $tothighseas + $record->AfterHighSeasSalesCharge;
+                                          $totcustom  = $totcustom + $record->AfterCustomDuty;
+                                          $totexciseduty  = $totexciseduty + $record->AfterExciseDuty;
+                                          $totexcisedutyED  = $totexcisedutyED + $record->AfterExciseDutyEdCess;
+                                          $totexciseSH  = $totexciseSH + $record->AfterExciseDutySHCess;
+                                          $totcustomED  = $totcustomED + $record->AfterCustomEdCess;
+
+                                          $totcustomSH   = $totcustomSH + $record->AfterCustomSHCess;
+                                          $totaddtnlexcise = $totaddtnlexcise + $record->AfterAddlExciseDuty;
+                                          $totgrossduty   = $totgrossduty + $record->Grossdutypayable;
+                                          $totavlmodvat    = $totavlmodvat + $record->AvailableModvat;
+                                          $TotalFreightAmt = $TotalFreightAmt + $record->AfterFreightValue;
+
+                                          $totgrossexpense = $totgrossexpense + $record->Grossexpensesduetocustomduty;
+                                          $ExchangeRate = $record->ExchangeRate;
+                                          $totalCapitalOrder = $totalCapitalOrder + $record->Rate * $record->Quantity;
+
+
+                                          $totassesable = $totassesable + $record->AssessableValue;
+                                          $totSubtotal = $totSubtotal + $record->SubTotal;
+                                          $totigst = $totigst + $record->AfterIGST;
+                                        }
+
+
+                                        // $totorder=$totorder+$record->TotalOrderValue;
+
+
+
+
+                                      }
+                                        ?> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index; ?>">
+                                <!-- <input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder"  value="<?php echo $totalCapitalOrder; ?>"> -->
+                                <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+                                <input type="hidden" name="capitalType" id="capitalType" value="<?php echo $CapitalRange; ?>" />
+
+
+                              <?php
+
+                              }
+                              ?>
+                            </tbody>
+                          </table>
+                        </div>
+
+                        <div class="container-fluid">
+                          <table class="table table-bordered" style="border:1px solid #333">
+                            <div align="right" style="padding-right:10px">
+                              <div align="right">
+                                <div class="modal fade" id="CAPITAL" role="dialog" style="overflow-y:scroll !important">
+                                  <div class="modal-dialog">
+                                    <!-- Modal content-->
+                                    <form>
+                                      <div class="modal-content" style="width:1160px;">
+                                        <div class="modal-header">
+                                          <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                          <center>
+                                            <h4>Add Capital Purchase Order Item </h4>
+                                          </center>
+                                        </div>
+                                        <div align="left">
+                                          <div class="form-group col-md-12" style="padding:0px">
+                                            <div class="form-group col-md-12">
+                                              <div class="form-group col-md-5" style="padding:0px;">
+                                                <div class="form-group col-md-6" style="padding:0px">
+                                                  <label>Req No<span class="text-danger">*</span></label>
+                                                  <div>
+
+                                                    <?php
+                                                    $RL = array("0" => 'Select Req No');
+                                                    if (!empty($RequistionDetails)) {
+                                                      foreach ($RequistionDetails as $SID) :
+                                                        $RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
+                                                      endforeach;
+                                                    }
+
+                                                    echo form_dropdown('Reqnumber', $RL, set_value('Reqnumber'), 'id="Reqnumber"', 'class="form-control select2 required"');
+
+                                                    ?>
+
+
+
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-6">
+                                                  <label>Department Name</label>
+                                                  <div>
+                                                    <?php
+                                                    $data = array('name' => 'CapitalDepartmentName', 'value' => set_value('CapitalDepartmentName'), 'id' => 'CapitalDepartmentName',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-5">
+                                                <div class="form-group col-md-6">
+                                                  <label>Cost Center Code</label>
+                                                  <div>
+                                                    <?php
+
+                                                    $data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-6">
+                                                  <label>Avail Bud Amount<?php echo "($INR)" ?></label>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'CapitalbudAmt', 'value' => set_value('CapitalbudAmt'), 'id' => 'CapitalbudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-2" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;">
+                                                <label> Exchange Rate</label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                            </div>
+                                          </div>
+                                          <div class="form-group col-md-12" style="padding:0px">
+                                            <div class="form-group col-md-12" style="padding:0px">
+                                              <div class="form-group col-md-6" style="padding:0px">
+                                                <div class="form-group col-md-3">
+                                                  <label>Item Code<span class="text-danger">*</span></label>
+                                                  <div>
+                                                    <?php
+                                                    $options = array("0" => 'Item Code');
+                                                    echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control select2"');
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-3">
+                                                  <label>Item Name</label>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'CapitalItemName', 'value' => set_value('ICapitalItemName'), 'id' => 'CapitalItemName',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+                                                <div class="form-group col-md-3">
+                                                  <label>UOM</label>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'CPUOM', 'value' => set_value('CPUOM'), 'id' => 'CPUOM',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-3">
+                                                  <label>Quantity<span class="text-danger">*</span></label>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'CPQuantity', 'value' => set_value('CPQuantity'), 'id' => 'CPQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();calculateFreight(3);calculateFreightlocaddper()');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-6" style="padding: 0px;">
+
+                                                <div class="form-group col-md-4" style="padding: 0px;">
+                                                  <label id="RateIn">Rate(In INR /UOM)</label><span class="text-danger">*</span>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'CPRate', 'value' => set_value('CPRate'), 'id' => 'CPRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();calculateFreight(3);calculateFreightlocaddper()');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <label>Per</label> <?php
+                                                                      $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
+                                                                      echo form_input($data); ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <label id="TotalAmount">Basic value <?php echo "($INR)" ?></label>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'CPTotalAmount', 'value' => set_value('CPTotalAmount'), 'id' => 'CPTotalAmount',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                            </div>
+                                          </div>
+                                          <div class="form-group col-md-12" style="padding:2%">
+                                            <div class="form-group col-md-12" id="ADDCAPdiv" style="padding:0px;">
+                                              <div class="form-group col-md-12" style="border:1px solid #000;">
+                                                <div class="form-group col-md-12"> <!--<div class="form-group col-md-4">
                                                             </div>-->
-                                    <div class="col-md-3">
-                                      <label>Discount Type </label>
-                                      <div>
-                                        <?php
-                                        $options = array("0" => 'Select Discount Type');
-                                        //print_r(  $options);
+                                                  <div class="form-group col-md-3">
+                                                    <label>Discount Type </label>
+                                                    <div>
+                                                      <?php
+                                                      $options = array("0" => 'Select Discount Type');
+                                                      //print_r(  $options);
 
-                                        if (!empty($TaxType)) {
-                                          foreach ($TaxType as $SID) :
+                                                      if (!empty($TaxType)) {
+                                                        foreach ($TaxType as $SID) :
 
 
-                                            $options[$SID->ConfigValue] =  $SID->ConfigValue;
+                                                          $options[$SID->ConfigValue] =  $SID->ConfigValue;
 
-                                          endforeach;
-                                        }
+                                                        endforeach;
+                                                      }
 
-                                        echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType"', 'class="form-control"');
+                                                      echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType"', 'class="form-control"');
 
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-3">
-                                      <label>Discount Rate </label>
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount(0);');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-3"> <!--style="padding:0px"> -->
-                                      <label>Discounted Amt <?php echo "($INR)" ?></label>
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount', 0.00), 'id' => 'txtAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-3">
+                                                    <label>Discount Rate </label>
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount(0);');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-3"> <!--style="padding:0px"> -->
+                                                    <label>Discounted Amt <?php echo "($INR)" ?></label>
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount', 0.00), 'id' => 'txtAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+
+
+                                                  <div class="form-group col-md-12" style="padding:2px">
+                                                    <div class="form-group col-md-3">
+                                                      <label>Freight Type </label>
+                                                      <div class="form-group">
+                                                        <?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('drpFreightloc', $options, set_value('drpFreightloc'), 'id="drpFreightloc"', 'class="form-control "');
+
+                                                        ?>
+                                                      </div>
+                                                    </div>
+
+                                                    <div class="form-group col-md-3" id="TripsValueloc" style="display:none;">
+                                                      <label>NO Of Trips</label>
+                                                      <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'NOOfTripsloc', 'value' => set_value('NOOfTripsloc'), 'id' => 'NOOfTripsloc',  'class' => 'form-control num', 'onchange' => 'calculateFreightlocaddper(0);');
+                                                        echo form_input($data);
+                                                        ?>
+                                                      </div>
+                                                    </div>
+                                                    <div class="form-group col-md-3">
+                                                      <label>Freight Rate </label>
+                                                      <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'txtFreightloc', 'value' => set_value('txtFreightloc'), 'id' => 'txtFreightloc',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightlocaddper();');
+                                                        echo form_input($data);
+                                                        ?>
+                                                      </div>
+                                                    </div>
+
+                                                    <div class="form-group col-md-3" style="padding-left: -2px;">
+                                                      <label>Freight Amt <?php echo "($INR)"; ?></label>
+                                                      <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'txtAfterFreightloc', 'value' => set_value('txtAfterFreightloc'), 'id' => 'txtAfterFreightloc',  'class' => 'form-control num', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                      </div>
+                                                    </div>
+
+                                                  </div>
+
+
+
+
+
+
+
+
+                                                </div>
+                                                <div class="form-group col-md-6" align="right">
+
+                                                  CGST In %
+                                                </div>
+
+                                                <div class="form-group col-md-3">
+                                                  <div class="form-group">
+
+                                                    <?php
+                                                    $data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+
+                                                </div>
+                                                <div class="form-group col-md-3">
+                                                  <div class="form-group">
+
+                                                    <?php
+                                                    $data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+
+                                                </div>
+
+
+                                                <div class="form-group col-md-12" id="ADDCAPdiv3" style="padding:0px">
+                                                  <div class="form-group col-md-6" align="right">
+
+                                                    SGST In %
+                                                  </div>
+
+                                                  <div class="form-group col-md-3">
+                                                    <div class="form-group">
+
+                                                      <?php
+                                                      $data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+
+                                                  </div>
+                                                  <div class="form-group col-md-3">
+                                                    <div class="form-group">
+
+                                                      <?php
+                                                      $data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0), 'id' => 'AfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+
+                                                  </div>
+
+                                                </div>
+
+                                                <div class="form-group col-md-12" id="ADDCAPdiv2" style="padding:0px">
+                                                  <div class="form-group col-md-6" align="right">
+
+                                                    IGST In %
+                                                  </div>
+
+                                                  <div class="form-group col-md-3">
+                                                    <div class="form-group">
+
+                                                      <?php
+                                                      $data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+
+                                                  </div>
+                                                  <div class="form-group col-md-3">
+                                                    <div class="form-group">
+
+                                                      <?php
+                                                      $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+
+                                                  </div>
+
+                                                </div>
+                                                <div class="form-group col-md-12" id="ADDCAPdiv1" style="padding:0px">
+                                                  <div class="col-md-5 col-md-offset-4" align="right">
+                                                    <label>Other Allowances <?php echo "($INR)" ?></label>
+                                                  </div>
+                                                  <div class="form-group col-md-3">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'OtherAllowances', 'value' => set_value('OtherAllowances', 0), 'id' => 'OtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="col-md-5 col-md-offset-4" align="right">
+                                                    <label>Total Amount <?php echo "($INR)" ?></label>
+                                                  </div>
+                                                  <div class="form-group col-md-3">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue', 0), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+
+
+                                                </div>
+                                              </div>
+                                            </div>
+                                          </div>
+
+                                          <div class="form-group col-md-12" style="padding:1%;"></div>
+                                          <div class="form-group col-md-12" style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide" style="display:none;">
+                                            <br />
+                                            <div class="form-group col-md-6" style="padding:0px;">
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Basic Price <?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4" style="display:none;">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Landing charge <?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge'), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Assessable Value (A) <?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group" style="display: none;">
+                                                    <?php
+                                                    $data = array('name' => 'Highseas ', 'value' => set_value('Highseas'), 'id' => 'Highseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Custom duty (B)<?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'Customduty', 'value' => set_value('Customduty'), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+
+
+
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Custom ED_cess (C)<?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess'), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Custom S & H cess (D)<?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess'), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                            </div>
+                                            <div class="form-group col-md-6" style="padding:0px;">
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  <!-- Subtotal (E)<?php echo "($INR)" ?> -->
+                                                  Subtotal (E) <?php echo "($INR)  (A+B+C+D)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group" style="display: none">
+                                                    <?php
+                                                    $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty'), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+
+
+
+
+
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  <!-- Additional Excise duty : (g) -->
+                                                  IGST on (E): (F)<?php echo " ($INR)"; ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'IgstInt', 'value' => set_value('IgstInt', 0), 'id' => 'IgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateIgst()');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'AfterIgstInt', 'value' => set_value('AfterIgstInt', 0), 'id' => 'AfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+
+
+
+
+
+
+
+
+
+
+
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-8">
+                                                  <!-- Total Duty (G)<?php echo "($INR)" ?> -->
+                                                  Total Duty (G) <?php echo "($INR) (B+C+D+F)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+
+
+                                              <!--Start of Adding of Frieght model-->
+                                              <div class="form-group col-md-12" style="padding:0px;">
+                                                <div class="form-group col-md-3">
+                                                  <span>Freight Type </span>
+                                                  <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('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight"', 'class="form-control "');
+
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-3" id="AddTripsValue" style="display:none;">
+                                                  <span>NO Of Trips</span>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-3">
+                                                  <span>Freight Rate </span>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+                                                <div class="form-group col-md-3" style="padding-left: 0px;">
+                                                  <span>Freight Amt <?php echo "($INR)" ?></span>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+                                              </div>
+                                              <!--End of Adding of freight in edit model -->
+
+
+                                              <div class="form-group col-md-12">
+                                                <center> <label>Cost of the product Per UOM</label></center>
+                                                <hr />
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Duty Impact
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4" style="margin-top:-20px;">
+                                                  <span>Quantity</span>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+                                              </div>
+                                              <div class="form-group col-md-12">
+
+                                                <div class="form-group col-md-4">
+                                                  Custom Duty Expenses <?php echo "($INR)/UOM " ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Clearing Charges <?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+
+
+
+                                                <div class="form-group col-md-4" style="margin-top: -25px;">
+                                                  <!-- RMC Including Customers -->
+                                                  <span><?php echo "Nett per UOM($INR)"; ?></span>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+
+                                              </div>
+
+
+                                            </div>
+
+                                          </div>
+
+                                        </div>
+
+
+
+
+
+
+                                        <div class="form-group col-md-12" style="padding: 0px 30px 10px 30px;text-align: left;">
+                                          <label>Capital Description </label>
 
 
-                                    <div class="col-md-12" style="padding:2px">
-                                      <div class="col-md-3">
-                                        <label>Freight Type </label>
-                                        <div class="form-group">
                                           <?php
-                                          $options = array("0" => 'Select Freight Type');
-                                          //print_r(  $options);
+                                          $data = array('name' => 'ItemDescription', 'value' => set_value('ItemDescription'), 'id' => 'ItemDescription',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+                                          echo form_textarea($data); ?>
 
-                                          if (!empty($FreightType)) {
-                                            foreach ($FreightType as $SID) :
+                                        </div>
 
-
-                                              $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-                                            endforeach;
-                                          }
-
-                                          echo form_dropdown('drpFreightloc', $options, set_value('drpFreightloc'), 'id="drpFreightloc"', 'class="form-control "');
-
-                                          ?>
+                                        <div class="modal-footer">
+                                          <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+                                          <a class="btn btn-success font AddCapital" ID="AddCapital"> &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
                                         </div>
                                       </div>
+                                    </form>
+
+                                  </div>
+                                </div>
+                              </div>
+
+                              <div class="modal fade" id="EDITCAPITAL" role="dialog" style="overflow-y:scroll !important">
+                                <div class="modal-dialog">
+                                  <!-- Modal content-->
+                                  <form>
+                                    <div class="modal-content" style="width:1160px;">
+                                      <div class="modal-header">
+                                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                        <center>
+                                          <h4>Edit Capital Purchase Order Item </h4>
+                                        </center>
+                                      </div>
+                                      <div align="left">
+                                        <div class="form-group col-md-12" style="padding: 0px;">
+                                          <div class="form-group col-md-12" style="padding: 0px;">
+                                            <div class="form-group col-md-5" style="padding:0px;">
+                                              <div class="form-group col-md-6">
+                                                <label>Req No<span class="text-danger">*</span></label>
+                                                <div>
+
+                                                  <?php
+                                                  $RL = array("0" => 'Select Req No');
+                                                  if (!empty($RequistionDetails)) {
+                                                    foreach ($RequistionDetails as $SID) :
+                                                      $RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
+                                                    endforeach;
+                                                  }
+
+
+                                                  $data = array('name' => 'EditReqnumber', 'value' => set_value('EditReqnumber'), 'id' => 'EditReqnumber',  'class' => 'form-control', 'readonly' => 'true');
+                                                  echo form_input($data);
+
+                                                  ?>
+
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-6">
+                                                <label>Department Name</label>
+                                                <div>
+                                                  <?php
+                                                  $data = array('name' => 'EditCapitalDepartmentName', 'value' => set_value('EditCapitalDepartmentName'), 'id' => 'EditCapitalDepartmentName',  'class' => 'form-control', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                            </div>
+                                            <div class="form-group col-md-5">
+                                              <div class="form-group col-md-6">
+                                                <label>Cost Center Code</label>
+                                                <div>
+                                                  <?php
+
+                                                  $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+                                                  echo form_input($data);
+
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-6">
+                                                <label>Avail Bud Amount<?php echo "($INR)" ?></label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt',  'class' => 'form-control', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                            </div>
+                                            <div class="form-group col-md-2" id="ExchangeRateModalEditDiv" style="display:none;">
+                                              <label> Exchange Rate</label>
+                                              <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal',  'class' => 'form-control', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+                                            </div>
+                                          </div>
+                                        </div>
+                                        <div class="form-group col-md-12" style="padding: 0px;">
+                                          <div class="form-group col-md-12" style="padding: 0px;">
+                                            <div class="form-group col-md-6" style="padding: 0px;">
+                                              <div class="form-group col-md-3">
+                                                <label>Item Code<span class="text-danger">*</span></label>
+                                                <div>
+                                                  <?php
+                                                  $options = array("0" => 'Item Code');
+                                                  echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control select2"');
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <label>Item Name</label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'EditCapitalItemName', 'value' => set_value('EditCapitalItemName'), 'id' => 'EditCapitalItemName',  'class' => 'form-control', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <label>UOM</label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'EditCPUOM', 'value' => set_value('EditCPUOM'), 'id' => 'EditCPUOM',  'class' => 'form-control', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <label>Quantity<span class="text-danger">*</span></label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'EditCPQuantity', 'value' => set_value('EditCPQuantity'), 'id' => 'EditCPQuantity',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                            </div>
+                                            <div class="form-group col-md-6">
+
+                                              <div class="form-group col-md-4" style="padding: 0px;">
+                                                <label id="EditRateIn">Rate(in INR/UOM)</label><span class="text-danger">*</span>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-4">
+                                                <label>Per</label> <?php
+                                                                    $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
+                                                                    echo form_input($data); ?>
+                                              </div>
+                                              <div class="form-group col-md-4" style="padding-right: 0px;">
+                                                <label id="EditTotalAmount">Basic value <?php echo "($INR)" ?></label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'EditCPTotalAmount', 'value' => set_value('EditCPTotalAmount'), 'id' => 'EditCPTotalAmount',  'class' => 'form-control', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                            </div>
+                                          </div>
+                                        </div>
+                                        <div class="form-group col-md-12">
+                                          <div class="form-group col-md-12" style="border:1px solid #000;padding:0px;">
+                                            <div class="form-group col-md-12" id="EDITCAPdiv">
+                                              <div class="form-group col-md-12"> <!-- <div class="form-group col-md-4">
+                                                                                                        </div>-->
+                                                <div class="form-group col-md-3">
+                                                  <label>Discount Type </label>
+                                                  <div>
+                                                    <?php
+                                                    $options = array("0" => 'Select Discount Type');
+                                                    //print_r(  $options);
+
+                                                    if (!empty($TaxType)) {
+                                                      foreach ($TaxType as $SID) :
+
+
+                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                      endforeach;
+                                                    }
+
+                                                    echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType"', 'class="form-control"');
+
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-3">
+                                                  <label>Discount Rate </label>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateDiscount(1);', 'style' => 'text-align:right;');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-3" style="padding:0px;">
+                                                  <label>Discounted Amt <?php echo "($INR)" ?> </label>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+
+
+                                                <div class="form-group col-md-12" style="padding:0px">
+                                                  <div class="form-group col-md-3">
+                                                    <label>Freight Type </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('drpFreighteditloc', $options, set_value('drpFreighteditloc'), 'id="drpFreighteditloc"', 'class="form-control "');
+
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-3" id="TripsValuelocedit" style="display:none;">
+                                                    <label>NO Of Trips</label>
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'NOOfTripslocedit', 'value' => set_value('NOOfTripslocedit'), 'id' => 'NOOfTripslocedit',  'class' => 'form-control num', 'onchange' => 'calculateFreightloceditper();');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-3">
+                                                    <label>Freight Rate </label>
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'txtFreightlocedit', 'value' => set_value('txtFreightlocedit'), 'id' => 'txtFreightlocedit',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightloceditper();');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+
+                                                  <div class="form-group col-md-3" style="padding: 1px;">
+                                                    <label>Freight Amt <?php echo "($INR)"; ?></label>
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'txtAfterFreightlocedit', 'value' => set_value('txtAfterFreightlocedit'), 'id' => 'txtAfterFreightlocedit',  'class' => 'form-control num', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+
+                                                </div>
+
+
+
+
+
+                                              </div>
+
+
+
+
+
+
+
+
+                                              <div class="form-group col-md-6" align="right">
+
+                                                CGST In %
+                                              </div>
+
+                                              <div class="form-group col-md-3">
+                                                <div class="form-group">
+
+                                                  <?php
+                                                  $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <div class="form-group">
+
+                                                  <?php
+                                                  $data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+
+                                              </div>
+
+                                            </div>
+                                            <div class="form-group col-md-12" id="EDITCAPdiv1">
+                                              <div class="form-group col-md-6" align="right">
+
+                                                SGST In %
+                                              </div>
+
+                                              <div class="form-group col-md-3">
+                                                <div class="form-group">
+
+                                                  <?php
+                                                  $data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <div class="form-group">
+
+                                                  <?php
+                                                  $data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+
+                                              </div>
+
+                                            </div>
+
+                                            <div class="form-group col-md-12" id="EDITCAPdiv2">
+                                              <div class="form-group col-md-6" align="right">
+
+                                                IGST In %
+                                              </div>
+
+                                              <div class="form-group col-md-3">
+                                                <div class="form-group">
+
+                                                  <?php
+                                                  $data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <div class="form-group">
+
+                                                  <?php
+                                                  $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+
+                                              </div>
+
+                                            </div>
+                                            <div class="form-group col-md-12" id="EDITCAPdiv3">
+                                              <div class="col-md-5 col-md-offset-4" align="right">
+                                                <label>Other Allowances <?php echo "($INR)" ?></label>
+                                              </div>
+
+                                              <div class="form-group col-md-3">
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="col-md-5 col-md-offset-4" align="right">
+                                                <label>Total Amount <?php echo "($INR)" ?></label>
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'EdittxtTotalOrderValue', 'value' => set_value('EdittxtTotalOrderValue'), 'id' => 'EdittxtTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                            </div>
+                                          </div>
+                                          <div class="form-group col-md-12" style="padding:1%;"></div>
+                                          <div class="form-group col-md-12" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;">
+                                            <br />
+                                            <div class="form-group col-md-6" style="padding:0px;">
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Basic Price <?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4" style="display:none;">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Landing charge <?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Assessable Value (A) <?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group" style="display: none;">
+                                                    <?php
+                                                    $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Custom duty (B)<?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+
+
+
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Custom ED_cess (C)<?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Custom S & H cess (D)<?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+                                            </div>
+                                            <div class="form-group col-md-6" style="padding:0px;">
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Subtotal (E) <?php echo "($INR) (A+B+C+D)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group" style="display: none;">
+                                                    <?php
+                                                    $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal',  'class' => 'form-control', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+
+
+
+
+
+
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  <!-- Additional Excise duty : (g) -->
+                                                  IGST on (E): (F) <?php echo " ($INR)"; ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditIgstInt ', 'value' => set_value('EditIgstInt', 0), 'id' => 'EditIgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditAfterIgstInt', 'value' => set_value('EditAfterIgstInt', 0), 'id' => 'EditAfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+
+
+
+
+
+
+
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-8">
+                                                  Total Duty (G) <?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+
+
+                                              <!--Start of Adding of Frieght model-->
+                                              <div class="form-group col-md-12" style="padding:0px;">
+                                                <div class="form-group col-md-3">
+                                                  <span>Freight Type </span>
+                                                  <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('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight"', 'class="form-control "');
+
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
+                                                  <span>NO Of Trips</span>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-3">
+                                                  <span>Freight Rate </span>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+                                                <div class="form-group col-md-3" style="padding-left: 0px;">
+                                                  <span>Freight Amt <?php echo "($INR)" ?></span>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+                                              </div>
+                                              <!--End of Adding of freight in edit model -->
+
+                                              <div class="form-group col-md-12">
+                                                <center> <label>Cost of the product Per UOM</label></center>
+                                                <hr />
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Duty Impact
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-4" style="margin-top: -20px;">
+                                                  <span>Quantity</span>
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+                                              </div>
+                                              <div class="form-group col-md-12">
+
+                                                <div class="form-group col-md-4">
+                                                  Custom Duty Expenses <?php echo "($INR)/UOM" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+                                              </div>
+                                              <div class="form-group col-md-12">
+                                                <div class="form-group col-md-4">
+                                                  Clearing Charges <?php echo "($INR)" ?>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+
+
+
+                                                <div class="form-group col-md-4" style="margin-top: -25px;">
+                                                  <!-- RMC Including Customers -->
+                                                  <span><?php echo "Nett per UOM($INR)"; ?></span>
+                                                </div>
+                                                <div class="form-group col-md-4">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+
+
+
+                                              </div>
+
+
+                                            </div>
+
+                                          </div>
+
+                                        </div>
+
+
+                                      </div>
+
+
+                                      <div class="form-group col-md-12" style="padding: 0px 30px 10px 30px;text-align: left;">
+                                        <label>Capital Description </label>
+
+
+                                        <?php
+                                        $data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+                                        echo form_textarea($data); ?>
+
+                                      </div>
+
+
+                                      <div class="modal-footer">
+                                        <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+                                        <a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
+                                      </div>
+                                    </div>
+                                  </form>
+
+                                </div>
+                              </div>
+
+                              <!-- this is view the added requistion details -->
+
+                              <div class="modal fade" id="VIEWCAPITAL" role="dialog" style="overflow-y:scroll !important">
+                                <div class="modal-dialog">
+                                  <!-- Modal content-->
+                                  <form>
+                                    <div class="modal-content" style="width:1160px;">
+                                      <div class="modal-header">
+                                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                        <center>
+                                          <h4>View Capital Purchase Order Item </h4>
+                                        </center>
+                                      </div>
+                                      <div align="left">
+                                        <div class="form-group col-md-12" style="padding: 0px;">
+                                          <div class="form-group col-md-12" style="padding: 0px;">
+
+                                            <div class="form-group col-md-3">
+                                              <label>Req No<span class="text-danger">*</span></label>
+                                              <div>
+
+                                                <?php
+
+                                                $data = array('name' => 'ViewReqnumber', 'value' => set_value('ViewReqnumber'), 'id' => 'ViewReqnumber',  'class' => 'form-control', 'readonly' => 'true');
+                                                echo form_input($data);
+
+                                                ?>
+
+
+
+                                              </div>
+                                            </div>
+                                            <div class="form-group col-md-3">
+                                              <label>Department Name</label>
+                                              <div>
+                                                <?php
+                                                $data = array('name' => 'ViewCapitalDepartmentName', 'value' => set_value('ViewCapitalDepartmentName'), 'id' => 'ViewCapitalDepartmentName',  'class' => 'form-control', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+                                            </div>
+
+                                            <div class="form-group col-md-2">
+
+                                              <label>Cost Center Code</label>
+                                              <div>
+                                                <?php
+
+                                                $data = array('name' => 'ViewCostCenter', 'value' => set_value('ViewCostCenter'), 'id' => 'ViewCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+                                                echo form_input($data);
+
+                                                ?>
+                                              </div>
+
+
+                                            </div>
+                                            <div class="form-group col-md-2" id="ExchangeRateModalViewDiv" style="display:none;padding-right: 0px;">
+                                              <label> Exchange Rate</label>
+                                              <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'ViewExchangeRtModal', 'value' => set_value('ViewExchangeRtModal'), 'id' => 'ViewExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+                                            </div>
+                                            <div class="form-group col-md-2">
+                                              <label>Avail Bud Amount<?php echo "($INR)" ?></label>
+                                              <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'ViewCapitalbudAmt', 'value' => set_value('ViewCapitalbudAmt'), 'id' => 'ViewCapitalbudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+                                            </div>
+                                          </div>
+                                        </div>
+                                        <div class="form-group col-md-12" style="padding: 0px;">
+                                          <div class="form-group col-md-12" style="padding: 0px;">
+                                            <div class="form-group col-md-6" style="padding: 0px;">
+                                              <div class="form-group col-md-3">
+                                                <label>Item Code<span class="text-danger">*</span></label>
+                                                <div>
+                                                  <?php
+
+
+                                                  $data = array('name' => 'ViewMaterialCode', 'value' => set_value('ViewMaterialCode'), 'id' => 'ViewMaterialCode',  'class' => 'form-control', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <label>Item Name</label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'ViewCapitalItemName', 'value' => set_value('ViewCapitalItemName'), 'id' => 'ViewCapitalItemName',  'class' => 'form-control', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+
+                                              <div class="form-group col-md-3">
+                                                <label>UOM</label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'ViewCPUOM', 'value' => set_value('ViewCPUOM'), 'id' => 'ViewCPUOM',  'class' => 'form-control', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <label>Quantity<span class="text-danger">*</span></label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'ViewCPQuantity', 'value' => set_value('ViewCPQuantity'), 'id' => 'ViewCPQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                            </div>
+                                            <div class="form-group col-md-6" style="padding: 0px;">
+
+                                              <div class="form-group col-md-4" style="padding: 0px;">
+                                                <label id="ViewRateIn">Rate(in INR/UOM)</label><span class="text-danger">*</span>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'ViewCPRate', 'value' => set_value('ViewCPRate'), 'id' => 'ViewCPRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-4">
+                                                <label>Per</label> <?php
+                                                                    $data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer',  'class' => 'form-control', 'readonly' => 'true');
+                                                                    echo form_input($data); ?>
+                                              </div>
+                                              <div class="form-group col-md-4">
+                                                <label id="EditTotalAmount">Basic value <?php echo "($INR)" ?></label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'ViewCPTotalAmount', 'value' => set_value('ViewCPTotalAmount'), 'id' => 'ViewCPTotalAmount',  'class' => 'form-control num', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                            </div>
+                                          </div>
+                                        </div>
+                                        <div class="form-group col-md-12" style="padding: 0px;border:0px;">
+                                          <div class="form-group col-md-12" id="VIEWCAPdiv" style="padding: 0px;">
+                                            <div class="form-group col-md-12"> <!-- <div class="form-group col-md-4">
+                                                                                                        </div>-->
+                                              <div class="form-group col-md-3">
+                                                <label>Discount Type </label>
+                                                <div>
+                                                  <?php
+
+
+                                                  $data = array('name' => 'ViewDiscountType', 'value' => set_value('ViewDiscountType'), 'id' => 'ViewDiscountType',  'class' => 'form-control num', 'readonly' => 'true');
+                                                  echo form_input($data);
+
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <label>Discount Rate </label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'txtViewDiscount', 'value' => set_value('txtViewDiscount'), 'id' => 'txtViewDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateDiscount(1);', 'style' => 'text-align:right;', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-3">
+                                                <label>Discounted Amt <?php echo "($INR)" ?> </label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'txtViewAfterDiscount', 'value' => set_value('txtViewAfterDiscount'), 'id' => 'txtViewAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                            </div>
+
+
+
+                                            <div class="form-group col-md-12">
+                                              <div class="form-group col-md-3">
+                                                <label>Freight Type </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('drpFreightviewloc', $options, set_value('drpFreightviewloc'), 'id="drpFreightviewloc"', 'class="form-control "');
+
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-3" id="TripsValuelocview" style="display:none;">
+                                                <label>NO Of Trips</label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'NOOfTripslocview', 'value' => set_value('NOOfTripslocview'), 'id' => 'NOOfTripslocview',  'class' => 'form-control num', 'onchange' => 'calculateFreightlocviewper();');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+                                              <div class="form-group col-md-3" style=padding:15px">
+                                                <label>Freight Rate </label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'txtFreightlocview', 'value' => set_value('txtFreightlocview'), 'id' => 'txtFreightlocview',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightlocviewper();');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+
+                                              <div class="form-group col-md-3" style=padding-left: -2px;">
+                                                <label>Freight Amt <?php echo "($INR)"; ?></label>
+                                                <div class="form-group">
+                                                  <?php
+                                                  $data = array('name' => 'txtAfterFreightlocview', 'value' => set_value('txtAfterFreightlocview'), 'id' => 'txtAfterFreightlocview',  'class' => 'form-control num', 'readonly' => 'true');
+                                                  echo form_input($data);
+                                                  ?>
+                                                </div>
+                                              </div>
+
+                                            </div>
+
+
+
+
+
+
+                                            <div class="form-group col-md-6" align="right">
+
+                                              CGST In %
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                              <div class="form-group">
+
+                                                <?php
+                                                $data = array('name' => 'ViewCgst', 'value' => set_value('ViewCgst'), 'id' => 'ViewCgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+
+                                            </div>
+                                            <div class="form-group col-md-3">
+                                              <div class="form-group">
+
+                                                <?php
+                                                $data = array('name' => 'ViewAfterCgst', 'value' => set_value('ViewAfterCgst'), 'id' => 'ViewAfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+
+                                            </div>
+
+                                          </div>
+                                          <div class="form-group col-md-12" id="VIEWCAPdiv1" style="padding: 0px;">
+                                            <div class="form-group col-md-6" align="right">
+
+                                              SGST In %
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                              <div class="form-group">
+
+                                                <?php
+                                                $data = array('name' => 'ViewSgst', 'value' => set_value('ViewSgst'), 'id' => 'ViewSgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+
+                                            </div>
+                                            <div class="form-group col-md-3">
+                                              <div class="form-group">
+
+                                                <?php
+                                                $data = array('name' => 'ViewAfterSgst', 'value' => set_value('ViewAfterSgst'), 'id' => 'ViewAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+
+                                            </div>
+
+                                          </div>
+
+                                          <div class="form-group col-md-12" id="VIEWCAPdiv2" style="padding: 0px;">
+                                            <div class="form-group col-md-6" align="right">
+
+                                              IGST In %
+                                            </div>
+
+                                            <div class="form-group col-md-3">
+                                              <div class="form-group">
+
+                                                <?php
+                                                $data = array('name' => 'ViewIgst', 'value' => set_value('ViewIgst'), 'id' => 'ViewIgst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+
+                                            </div>
+                                            <div class="form-group col-md-3">
+                                              <div class="form-group">
+
+                                                <?php
+                                                $data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst'), 'id' => 'ViewAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+
+                                            </div>
+
+                                          </div>
+                                          <div class="form-group col-md-12" id="VIEWCAPdiv3" style="padding: 0px;">
+                                            <div class="col-md-5 col-md-offset-4" align="right">
+                                              <label>Other Allowances <?php echo "($INR)" ?></label>
+                                            </div>
+                                            <div class="form-group col-md-3">
+                                              <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'ViewOtherAllowances', 'value' => set_value('ViewOtherAllowances'), 'id' => 'ViewOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+                                            </div>
+
+                                          </div>
+                                          <div class="form-group col-md-12" id="" style="padding: 0px;">
+                                            <div class="col-md-5 col-md-offset-4" align="right">
+                                              <label>Total Amount <?php echo "($INR)" ?></label>
+                                            </div>
+                                            <div class="form-group col-md-3">
+                                              <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'ViewTotalAmountlocal', 'value' => set_value('ViewTotalAmountlocal'), 'id' => 'ViewTotalAmountlocal',  'class' => 'form-control num', 'placeholder' => 'Total Amount', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                              </div>
+                                            </div>
+
+
+                                            <div class="form-group col-md-12" style="padding:1%;"></div>
+                                            <div class="form-group col-md-12" style="border:1px solid #000;padding:0px;" id="ViewModalImportTaxHide" style="display:none;">
+                                              <br />
+                                              <div class="form-group col-md-6" style="padding:0px;">
+                                                <div class="form-group col-md-12">
+                                                  <div class="form-group col-md-4">
+                                                    Basic Price <?php echo "($INR)" ?>
+                                                  </div>
+                                                  <div class="form-group col-md-4" style="display:none;">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?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-12">
+                                                  <div class="form-group col-md-4">
+                                                    Landing charge <?php echo "($INR)" ?>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                </div>
+                                                <div class="form-group col-md-12">
+                                                  <div class="form-group col-md-4">
+                                                    Assessable Value (A) <?php echo "($INR)" ?>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group" style="display: none;">
+                                                      <?php
+                                                      $data = array('name' => 'ViewHighseas ', 'value' => set_value('ViewHighseas'), 'id' => 'ViewHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?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-group col-md-12">
+                                                  <div class="form-group col-md-4">
+                                                    Custom duty (B)<?php echo "($INR)" ?>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?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-group col-md-12">
+                                                  <div class="form-group col-md-4">
+                                                    Custom ED_cess (C)
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?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-group col-md-12">
+                                                  <div class="form-group col-md-4">
+                                                    Custom S & H cess (D)
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?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:0px;">
+                                                <div class="form-group col-md-12">
+                                                  <div class="form-group col-md-4">
+                                                    Subtotal (E)<?php echo "($INR) (A+B+C+D)" ?>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group" style="display: none;">
+                                                      <?php
+                                                      $data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?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-group col-md-12">
+                                                  <div class="form-group col-md-4">
+                                                    <!-- Additional Excise duty : (g) -->
+                                                    IGST on (E): (F)
+                                                    <?php echo " ($INR)"; ?>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewIgstInt ', 'value' => set_value('ViewIgstInt', 0), 'id' => 'ViewIgstInt',  '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 class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewAfterIgstInt', 'value' => set_value('ViewAfterIgstInt', 0), 'id' => 'ViewAfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                </div>
+
+
+
+
+
+
+
+
+
+
+
+                                                <div class="form-group col-md-12">
+                                                  <div class="form-group col-md-8">
+                                                    Total Duty (G) <?php echo "($INR) (B+C+D+F)" ?>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewGrossdutypayable ', 'value' => set_value('ViewGrossdutypayable'), 'id' => 'ViewGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                </div>
+
+
+                                                <!--Start of Adding of Frieght model-->
+                                                <div class="form-group col-md-12" style="padding:0px;">
+                                                  <div class="form-group col-md-3">
+                                                    <span>Freight Type </span>
+                                                    <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 "');
+
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-3" id="ViewTripsValue" style="display:none;">
+                                                    <span>NO Of Trips</span>
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewNOOfTrips', 'value' => set_value('ViewNOOfTrips'), 'id' => 'ViewNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(2);');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-3">
+                                                    <span>Freight Rate </span>
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+
+                                                  <div class="form-group col-md-3" style="padding-left: 0px;">
+                                                    <span>Freight Amt <?php echo "($INR)" ?></span>
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'txtViewAfterFreight', 'value' => set_value('txtViewAfterFreight'), 'id' => 'txtViewAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+
+                                                </div>
+                                                <!--End of Adding of freight in edit model -->
+
+                                                <div class="form-group col-md-12">
+                                                  <center> <label>Cost of the product Per UOM</label></center>
+                                                  <hr />
+                                                </div>
+                                                <div class="form-group col-md-12">
+                                                  <div class="form-group col-md-4">
+                                                    Duty Impact
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+                                                  <div class="form-group col-md-4" style="margin-top: -20px;">
+                                                    <span>Quantity</span>
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+
+                                                </div>
+                                                <div class="form-group col-md-12">
+
+                                                  <div class="form-group col-md-4">
+                                                    Custom Duty Expenses<?php echo "($INR)/UOM" ?>
+
+
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+
+                                                </div>
+                                                <div class="form-group col-md-12">
+                                                  <div class="form-group col-md-4">
+                                                    Clearing Charges<?php echo "($INR)" ?>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?php
+                                                      $data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                                      echo form_input($data);
+                                                      ?>
+                                                    </div>
+                                                  </div>
+
+
+
+
+
+
+
+
+                                                  <div class="form-group col-md-4" style="margin-top: -25px;">
+                                                    <!-- RMC Including Customers -->
+                                                    <span><?php echo "Nett per UOM($INR)"; ?></span>
+                                                  </div>
+                                                  <div class="form-group col-md-4">
+                                                    <div class="form-group">
+                                                      <?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>
+
+
+                                                <div class="form-group col-md-6" align="right" style="display:none;"> <label>Total Order Amount :</label></div>
+                                                <div class="form-group col-md-6" style="display:none;">
+                                                  <div class="form-group">
+                                                    <?php
+                                                    $data = array('name' => 'ViewtxtTotalOrderValue', 'value' => set_value('ViewtxtTotalOrderValue'), 'id' => 'ViewtxtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
+                                                    echo form_input($data);
+                                                    ?>
+                                                  </div>
+                                                </div>
+                                              </div>
+
+                                            </div>
+
+                                          </div>
+
+
+                                        </div>
+
+
+
+
+                                        <div class="form-group col-md-12" style="padding: 0px 30px 10px 30px;text-align:left">
+                                          <label>Capital Description </label>
+
 
-                                      <div class="col-md-3" id="TripsValueloc" style="display:none;">
-                                        <label>NO Of Trips</label>
-                                        <div class="form-group">
                                           <?php
-                                          $data = array('name' => 'NOOfTripsloc', 'value' => set_value('NOOfTripsloc'), 'id' => 'NOOfTripsloc',  'class' => 'form-control num', 'onchange' => 'calculateFreightlocaddper(0);');
-                                          echo form_input($data);
-                                          ?>
+                                          $data = array('name' => 'ViewItemDescription', 'value' => set_value('ViewItemDescription'), 'id' => 'ViewItemDescription',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+                                          echo form_textarea($data); ?>
+
+                                        </div>
+
+
+                                        <div class="modal-footer">
+                                          <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+                                          <?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?>
+                                            <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
+                                          <?php } ?>
+
+
+                                          <!-- <a class="btn btn-success font UpdateViewCapital"  ID="UpdateViewCapital" > &nbsp;&nbsp;<span class="bold">Update</span></a> -->
+
+
                                         </div>
                                       </div>
-                                      <div class="col-md-3">
-                                        <label>Freight Rate </label>
-                                        <div class="form-group">
-                                          <?php
-                                          $data = array('name' => 'txtFreightloc', 'value' => set_value('txtFreightloc'), 'id' => 'txtFreightloc',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightlocaddper();');
-                                          echo form_input($data);
-                                          ?>
-                                        </div>
-                                      </div>
-
-                                      <div class="col-md-3" style="padding-left: -2px;">
-                                        <label>Freight Amt <?php echo "($INR)"; ?></label>
-                                        <div class="form-group">
-                                          <?php
-                                          $data = array('name' => 'txtAfterFreightloc', 'value' => set_value('txtAfterFreightloc'), 'id' => 'txtAfterFreightloc',  'class' => 'form-control num', 'readonly' => 'true');
-                                          echo form_input($data);
-                                          ?>
-                                        </div>
-                                      </div>
-
-                                    </div>
-
-
-
-
-
-
-
-
-                                  </div>
-                                  <div class="col-md-6" align="right">
-
-                                    CGST In %
-                                  </div>
-
-                                  <div class="col-md-3">
-                                    <div class="form-group">
-
-                                      <?php
-                                      $data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-
-                                  </div>
-                                  <div class="col-md-3">
-                                    <div class="form-group">
-
-                                      <?php
-                                      $data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-
-                                  </div>
-
-
-                                  <div class="col-md-12" id="ADDCAPdiv3" style="padding:0px">
-                                    <div class="col-md-6" align="right">
-
-                                      SGST In %
-                                    </div>
-
-                                    <div class="col-md-3">
-                                      <div class="form-group">
-
-                                        <?php
-                                        $data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-
-                                    </div>
-                                    <div class="col-md-3">
-                                      <div class="form-group">
-
-                                        <?php
-                                        $data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0), 'id' => 'AfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-
-                                    </div>
-
-                                  </div>
-
-                                  <div class="col-md-12" id="ADDCAPdiv2" style="padding:0px">
-                                    <div class="col-md-6" align="right">
-
-                                      IGST In %
-                                    </div>
-
-                                    <div class="col-md-3">
-                                      <div class="form-group">
-
-                                        <?php
-                                        $data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-
-                                    </div>
-                                    <div class="col-md-3">
-                                      <div class="form-group">
-
-                                        <?php
-                                        $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-
-                                    </div>
-
-                                  </div>
-                                  <div class="col-md-12" id="ADDCAPdiv1" style="padding:0px">
-                                    <div class="col-md-5 col-md-offset-4" align="right">
-                                      <label>Other Allowances <?php echo "($INR)" ?></label>
-                                    </div>
-                                    <div class="col-md-3">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'OtherAllowances', 'value' => set_value('OtherAllowances', 0), 'id' => 'OtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-5 col-md-offset-4" align="right">
-                                      <label>Total Amount <?php echo "($INR)" ?></label>
-                                    </div>
-                                    <div class="col-md-3">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue', 0), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-
-
-                                  </div>
+                                  </form>
                                 </div>
                               </div>
                             </div>
 
-                            <div class="col-md-12" style="padding:1%;"></div>
-                            <div class="col-md-12" style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide" style="display:none;">
-                              <br />
-                              <div class="col-md-6" style="padding:0px;">
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Basic Price <?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4" style="display:none;">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Landing charge <?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge'), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Assessable Value (A) <?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group" style="display: none;">
-                                      <?php
-                                      $data = array('name' => 'Highseas ', 'value' => set_value('Highseas'), 'id' => 'Highseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Custom duty (B)<?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'Customduty', 'value' => set_value('Customduty'), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-
-
-
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Custom ED_cess (C)<?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess'), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Custom S & H cess (D)<?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess'), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                              <div class="col-md-6" style="padding:0px;">
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    <!-- Subtotal (E)<?php echo "($INR)" ?> -->
-                                    Subtotal (E) <?php echo "($INR)  (A+B+C+D)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group" style="display: none">
-                                      <?php
-                                      $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty'), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-
-
-
-
-
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    <!-- Additional Excise duty : (g) -->
-                                    IGST on (E): (F)<?php echo " ($INR)"; ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'IgstInt', 'value' => set_value('IgstInt', 0), 'id' => 'IgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateIgst()');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'AfterIgstInt', 'value' => set_value('AfterIgstInt', 0), 'id' => 'AfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-
-
-
-
-
-
-
-
-
-
-
-                                <div class="col-md-12">
-                                  <div class="col-md-8">
-                                    <!-- Total Duty (G)<?php echo "($INR)" ?> -->
-                                    Total Duty (G) <?php echo "($INR) (B+C+D+F)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-
-
-                                <!--Start of Adding of Frieght model-->
-                                <div class="col-md-12" style="padding:0px;">
-                                  <div class="col-md-3">
-                                    <span>Freight Type </span>
-                                    <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('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight"', 'class="form-control "');
-
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-3" id="AddTripsValue" style="display:none;">
-                                    <span>NO Of Trips</span>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-3">
-                                    <span>Freight Rate </span>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-                                  <div class="col-md-3" style="padding-left: 0px;">
-                                    <span>Freight Amt <?php echo "($INR)" ?></span>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-                                </div>
-                                <!--End of Adding of freight in edit model -->
-
-
-                                <div class="col-md-12">
-                                  <center> <label>Cost of the product Per UOM</label></center>
-                                  <hr />
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Duty Impact
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4" style="margin-top:-20px;">
-                                    <span>Quantity</span>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-                                </div>
-                                <div class="col-md-12">
-
-                                  <div class="col-md-4">
-                                    Custom Duty Expenses <?php echo "($INR)/UOM " ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Clearing Charges <?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-
-
-
-                                  <div class="col-md-4" style="margin-top: -25px;">
-                                    <!-- RMC Including Customers -->
-                                    <span><?php echo "Nett per UOM($INR)"; ?></span>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-
-                                </div>
-
-
-                              </div>
-
-                            </div>
-
-                          </div>
-
-
-
-
-
-
-                          <div class="col-md-12" style="padding: 0px 30px 10px 30px;text-align: left;">
-                            <label>Capital Description </label>
-
+                          </table>
+                        </div><!-- Cloing div for container-fluid  -->
+                        <div class="form-group col-md-12" style="border: 1px solid;" id="CAPdiv">
+                          <div class="form-group col-md-3">
+                            <label>Total Basic Amount <?php echo "($INR)" ?> </label>
 
                             <?php
-                            $data = array('name' => 'ItemDescription', 'value' => set_value('ItemDescription'), 'id' => 'ItemDescription',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-                            echo form_textarea($data); ?>
-
+                            $data = array('name' => 'CapitalBasicOrder', 'value' => set_value('CapitalBasicOrder', number_format($ExitTotalBasicOrderValue, 2, '.', '')), 'id' => 'CapitalBasicOrder',  'class' => 'form-control num', 'readonly' => 'true',);
+                            echo form_input($data);
+                            ?>
                           </div>
-
-                          <div class="modal-footer">
-                            <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                            <a class="btn btn-success font AddCapital" ID="AddCapital"> &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
-                          </div>
-                        </div>
-                      </form>
-
-                    </div>
-                  </div>
-                </div>
-
-                <div class="modal fade" id="EDITCAPITAL" role="dialog" style="overflow-y:scroll !important">
-                  <div class="modal-dialog">
-                    <!-- Modal content-->
-                    <form>
-                      <div class="modal-content" style="width:1160px;">
-                        <div class="modal-header">
-                          <button type="button" class="close" data-dismiss="modal">&times;</button>
-                          <center>
-                            <h4>Edit Capital Purchase Order Item </h4>
-                          </center>
-                        </div>
-                        <div align="left">
-                          <div class="col-md-12" style="padding: 0px;">
-                            <div class="col-md-12" style="padding: 0px;">
-                              <div class="col-md-5" style="padding:0px;">
-                                <div class="col-md-6">
-                                  <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
-                                  <div>
-
-                                    <?php
-                                    $RL = array("0" => 'Select Req No');
-                                    if (!empty($RequistionDetails)) {
-                                      foreach ($RequistionDetails as $SID) :
-                                        $RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
-                                      endforeach;
-                                    }
-
-
-                                    $data = array('name' => 'EditReqnumber', 'value' => set_value('EditReqnumber'), 'id' => 'EditReqnumber',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-
-                                    ?>
-
-                                  </div>
-                                </div>
-                                <div class="col-md-6">
-                                  <label>Department Name</label>
-                                  <div>
-                                    <?php
-                                    $data = array('name' => 'EditCapitalDepartmentName', 'value' => set_value('EditCapitalDepartmentName'), 'id' => 'EditCapitalDepartmentName',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                              </div>
-                              <div class="col-md-5">
-                                <div class="col-md-6">
-                                  <label>Cost Center Code</label>
-                                  <div>
-                                    <?php
-
-                                    $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-6">
-                                  <label>Avail Bud Amount<?php echo "($INR)" ?></label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                              </div>
-                              <div class="col-md-2" id="ExchangeRateModalEditDiv" style="display:none;">
-                                <label> Exchange Rate</label>
-                                <div class="form-group">
-                                  <?php
-                                  $data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal',  'class' => 'form-control', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <div class="col-md-12" style="padding: 0px;">
-                            <div class="col-md-12" style="padding: 0px;">
-                              <div class="col-md-6" style="padding: 0px;">
-                                <div class="col-md-3">
-                                  <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
-                                  <div>
-                                    <?php
-                                    $options = array("0" => 'Item Code');
-                                    echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control select2"');
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-3">
-                                  <label>Item Name</label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditCapitalItemName', 'value' => set_value('EditCapitalItemName'), 'id' => 'EditCapitalItemName',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-3">
-                                  <label>UOM</label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditCPUOM', 'value' => set_value('EditCPUOM'), 'id' => 'EditCPUOM',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-3">
-                                  <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditCPQuantity', 'value' => set_value('EditCPQuantity'), 'id' => 'EditCPQuantity',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                              </div>
-                              <div class="col-md-6">
-
-                                <div class="col-md-4" style="padding: 0px;">
-                                  <label id="EditRateIn">Rate(in INR/UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-4">
-                                  <label>Per</label> <?php
-                                                      $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
-                                                      echo form_input($data); ?>
-                                </div>
-                                <div class="col-md-4" style="padding-right: 0px;">
-                                  <label id="EditTotalAmount">Basic value <?php echo "($INR)" ?></label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditCPTotalAmount', 'value' => set_value('EditCPTotalAmount'), 'id' => 'EditCPTotalAmount',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <div class="col-md-12">
-                            <div class="col-md-12" style="border:1px solid #000;padding:0px;">
-                              <div class="col-md-12" id="EDITCAPdiv">
-                                <div class="col-md-12"> <!-- <div class="col-md-4">
-                                                                                                        </div>-->
-                                  <div class="col-md-3">
-                                    <label>Discount Type </label>
-                                    <div>
-                                      <?php
-                                      $options = array("0" => 'Select Discount Type');
-                                      //print_r(  $options);
-
-                                      if (!empty($TaxType)) {
-                                        foreach ($TaxType as $SID) :
-
-
-                                          $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-                                        endforeach;
-                                      }
-
-                                      echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType"', 'class="form-control"');
-
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-3">
-                                    <label>Discount Rate </label>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateDiscount(1);', 'style' => 'text-align:right;');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-3" style="padding:0px;">
-                                    <label>Discounted Amt <?php echo "($INR)" ?> </label>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-
-
-                                  <div class="col-md-12" style="padding:0px">
-                                    <div class="col-md-3">
-                                      <label>Freight Type </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('drpFreighteditloc', $options, set_value('drpFreighteditloc'), 'id="drpFreighteditloc"', 'class="form-control "');
-
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-3" id="TripsValuelocedit" style="display:none;">
-                                      <label>NO Of Trips</label>
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'NOOfTripslocedit', 'value' => set_value('NOOfTripslocedit'), 'id' => 'NOOfTripslocedit',  'class' => 'form-control num', 'onchange' => 'calculateFreightloceditper();');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-3">
-                                      <label>Freight Rate </label>
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'txtFreightlocedit', 'value' => set_value('txtFreightlocedit'), 'id' => 'txtFreightlocedit',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightloceditper();');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-
-                                    <div class="col-md-3" style="padding: 1px;">
-                                      <label>Freight Amt <?php echo "($INR)"; ?></label>
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'txtAfterFreightlocedit', 'value' => set_value('txtAfterFreightlocedit'), 'id' => 'txtAfterFreightlocedit',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-
-                                  </div>
-
-
-
-
-
-                                </div>
-
-
-
-
-
-
-
-
-                                <div class="col-md-6" align="right">
-
-                                  CGST In %
-                                </div>
-
-                                <div class="col-md-3">
-                                  <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-
-                                </div>
-                                <div class="col-md-3">
-                                  <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-
-                                </div>
-
-                              </div>
-                              <div class="col-md-12" id="EDITCAPdiv1">
-                                <div class="col-md-6" align="right">
-
-                                  SGST In %
-                                </div>
-
-                                <div class="col-md-3">
-                                  <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-
-                                </div>
-                                <div class="col-md-3">
-                                  <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-
-                                </div>
-
-                              </div>
-
-                              <div class="col-md-12" id="EDITCAPdiv2">
-                                <div class="col-md-6" align="right">
-
-                                  IGST In %
-                                </div>
-
-                                <div class="col-md-3">
-                                  <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-
-                                </div>
-                                <div class="col-md-3">
-                                  <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-
-                                </div>
-
-                              </div>
-                              <div class="col-md-12" id="EDITCAPdiv3">
-                                <div class="col-md-5 col-md-offset-4" align="right">
-                                  <label>Other Allowances <?php echo "($INR)" ?></label>
-                                </div>
-
-                                <div class="col-md-3">
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-5 col-md-offset-4" align="right">
-                                  <label>Total Amount <?php echo "($INR)" ?></label>
-                                </div>
-                                <div class="col-md-3">
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EdittxtTotalOrderValue', 'value' => set_value('EdittxtTotalOrderValue'), 'id' => 'EdittxtTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                            <div class="col-md-12" style="padding:1%;"></div>
-                            <div class="col-md-12" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;">
-                              <br />
-                              <div class="col-md-6" style="padding:0px;">
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Basic Price <?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4" style="display:none;">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax',  'class' => 'form-control', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Landing charge <?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge',  'class' => 'form-control', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Assessable Value (A) <?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group" style="display: none;">
-                                      <?php
-                                      $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable',  'class' => 'form-control', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Custom duty (B)<?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty',  'class' => 'form-control', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-
-
-
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Custom ED_cess (C)<?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess',  'class' => 'form-control', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Custom S & H cess (D)<?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess',  'class' => 'form-control', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                              <div class="col-md-6" style="padding:0px;">
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Subtotal (E) <?php echo "($INR) (A+B+C+D)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group" style="display: none;">
-                                      <?php
-                                      $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal',  'class' => 'form-control', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-
-
-
-
-
-
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    <!-- Additional Excise duty : (g) -->
-                                    IGST on (E): (F) <?php echo " ($INR)"; ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditIgstInt ', 'value' => set_value('EditIgstInt', 0), 'id' => 'EditIgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditAfterIgstInt', 'value' => set_value('EditAfterIgstInt', 0), 'id' => 'EditAfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-
-
-
-
-
-
-
-                                <div class="col-md-12">
-                                  <div class="col-md-8">
-                                    Total Duty (G) <?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-
-
-                                <!--Start of Adding of Frieght model-->
-                                <div class="col-md-12" style="padding:0px;">
-                                  <div class="col-md-3">
-                                    <span>Freight Type </span>
-                                    <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('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight"', 'class="form-control "');
-
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-3" id="EditTripsValue" style="display:none;">
-                                    <span>NO Of Trips</span>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-3">
-                                    <span>Freight Rate </span>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-                                  <div class="col-md-3" style="padding-left: 0px;">
-                                    <span>Freight Amt <?php echo "($INR)" ?></span>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-                                </div>
-                                <!--End of Adding of freight in edit model -->
-
-                                <div class="col-md-12">
-                                  <center> <label>Cost of the product Per UOM</label></center>
-                                  <hr />
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Duty Impact
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-4" style="margin-top: -20px;">
-                                    <span>Quantity</span>
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-                                </div>
-                                <div class="col-md-12">
-
-                                  <div class="col-md-4">
-                                    Custom Duty Expenses <?php echo "($INR)/UOM" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-                                </div>
-                                <div class="col-md-12">
-                                  <div class="col-md-4">
-                                    Clearing Charges <?php echo "($INR)" ?>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-
-
-
-                                  <div class="col-md-4" style="margin-top: -25px;">
-                                    <!-- RMC Including Customers -->
-                                    <span><?php echo "Nett per UOM($INR)"; ?></span>
-                                  </div>
-                                  <div class="col-md-4">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-
-
-
-                                </div>
-
-
-                              </div>
-
-                            </div>
-
-                          </div>
-
-
-                        </div>
-
-
-                        <div class="col-md-12" style="padding: 0px 30px 10px 30px;text-align: left;">
-                          <label>Capital Description </label>
-
-
-                          <?php
-                          $data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-                          echo form_textarea($data); ?>
-
-                        </div>
-
-
-                        <div class="modal-footer">
-                          <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                          <a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
-                        </div>
-                      </div>
-                    </form>
-
-                  </div>
-                </div>
-
-                <!-- this is view the added requistion details -->
-
-                <div class="modal fade" id="VIEWCAPITAL" role="dialog" style="overflow-y:scroll !important">
-                  <div class="modal-dialog">
-                    <!-- Modal content-->
-                    <form>
-                      <div class="modal-content" style="width:1160px;">
-                        <div class="modal-header">
-                          <button type="button" class="close" data-dismiss="modal">&times;</button>
-                          <center>
-                            <h4>View Capital Purchase Order Item </h4>
-                          </center>
-                        </div>
-                        <div align="left">
-                          <div class="col-md-12" style="padding: 0px;">
-                            <div class="col-md-12" style="padding: 0px;">
-
-                              <div class="col-md-3">
-                                <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
-                                <div>
-
-                                  <?php
-
-                                  $data = array('name' => 'ViewReqnumber', 'value' => set_value('ViewReqnumber'), 'id' => 'ViewReqnumber',  'class' => 'form-control', 'readonly' => 'true');
-                                  echo form_input($data);
-
-                                  ?>
-
-
-
-                                </div>
-                              </div>
-                              <div class="col-md-3">
-                                <label>Department Name</label>
-                                <div>
-                                  <?php
-                                  $data = array('name' => 'ViewCapitalDepartmentName', 'value' => set_value('ViewCapitalDepartmentName'), 'id' => 'ViewCapitalDepartmentName',  'class' => 'form-control', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-                              </div>
-
-                              <div class="col-md-2">
-
-                                <label>Cost Center Code</label>
-                                <div>
-                                  <?php
-
-                                  $data = array('name' => 'ViewCostCenter', 'value' => set_value('ViewCostCenter'), 'id' => 'ViewCostCenter',  'class' => 'form-control', 'readonly' => 'true');
-                                  echo form_input($data);
-
-                                  ?>
-                                </div>
-
-
-                              </div>
-                              <div class="col-md-2" id="ExchangeRateModalViewDiv" style="display:none;padding-right: 0px;">
-                                <label> Exchange Rate</label>
-                                <div class="form-group">
-                                  <?php
-                                  $data = array('name' => 'ViewExchangeRtModal', 'value' => set_value('ViewExchangeRtModal'), 'id' => 'ViewExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-                              </div>
-                              <div class="col-md-2">
-                                <label>Avail Bud Amount<?php echo "($INR)" ?></label>
-                                <div class="form-group">
-                                  <?php
-                                  $data = array('name' => 'ViewCapitalbudAmt', 'value' => set_value('ViewCapitalbudAmt'), 'id' => 'ViewCapitalbudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <div class="col-md-12" style="padding: 0px;">
-                            <div class="col-md-12" style="padding: 0px;">
-                              <div class="col-md-6" style="padding: 0px;">
-                                <div class="col-md-3">
-                                  <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
-                                  <div>
-                                    <?php
-
-
-                                    $data = array('name' => 'ViewMaterialCode', 'value' => set_value('ViewMaterialCode'), 'id' => 'ViewMaterialCode',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-3">
-                                  <label>Item Name</label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'ViewCapitalItemName', 'value' => set_value('ViewCapitalItemName'), 'id' => 'ViewCapitalItemName',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-
-                                <div class="col-md-3">
-                                  <label>UOM</label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'ViewCPUOM', 'value' => set_value('ViewCPUOM'), 'id' => 'ViewCPUOM',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-3">
-                                  <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'ViewCPQuantity', 'value' => set_value('ViewCPQuantity'), 'id' => 'ViewCPQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                              </div>
-                              <div class="col-md-6" style="padding: 0px;">
-
-                                <div class="col-md-4" style="padding: 0px;">
-                                  <label id="ViewRateIn">Rate(in INR/UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'ViewCPRate', 'value' => set_value('ViewCPRate'), 'id' => 'ViewCPRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-4">
-                                  <label>Per</label> <?php
-                                                      $data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer',  'class' => 'form-control', 'readonly' => 'true');
-                                                      echo form_input($data); ?>
-                                </div>
-                                <div class="col-md-4">
-                                  <label id="EditTotalAmount">Basic value <?php echo "($INR)" ?></label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'ViewCPTotalAmount', 'value' => set_value('ViewCPTotalAmount'), 'id' => 'ViewCPTotalAmount',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <div class="col-md-12" style="padding: 0px;border:0px;">
-                            <div class="col-md-12" id="VIEWCAPdiv" style="padding: 0px;">
-                              <div class="col-md-12"> <!-- <div class="col-md-4">
-                                                                                                        </div>-->
-                                <div class="col-md-3">
-                                  <label>Discount Type </label>
-                                  <div>
-                                    <?php
-
-
-                                    $data = array('name' => 'ViewDiscountType', 'value' => set_value('ViewDiscountType'), 'id' => 'ViewDiscountType',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-3">
-                                  <label>Discount Rate </label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'txtViewDiscount', 'value' => set_value('txtViewDiscount'), 'id' => 'txtViewDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateDiscount(1);', 'style' => 'text-align:right;', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-3">
-                                  <label>Discounted Amt <?php echo "($INR)" ?> </label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'txtViewAfterDiscount', 'value' => set_value('txtViewAfterDiscount'), 'id' => 'txtViewAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                              </div>
-
-
-
-                              <div class="col-md-12">
-                                <div class="col-md-3">
-                                  <label>Freight Type </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('drpFreightviewloc', $options, set_value('drpFreightviewloc'), 'id="drpFreightviewloc"', 'class="form-control "');
-
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-3" id="TripsValuelocview" style="display:none;">
-                                  <label>NO Of Trips</label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'NOOfTripslocview', 'value' => set_value('NOOfTripslocview'), 'id' => 'NOOfTripslocview',  'class' => 'form-control num', 'onchange' => 'calculateFreightlocviewper();');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-                                <div class="col-md-3" style=padding:15px">
-                                  <label>Freight Rate </label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'txtFreightlocview', 'value' => set_value('txtFreightlocview'), 'id' => 'txtFreightlocview',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightlocviewper();');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-
-                                <div class="col-md-3" style=padding-left: -2px;">
-                                  <label>Freight Amt <?php echo "($INR)"; ?></label>
-                                  <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'txtAfterFreightlocview', 'value' => set_value('txtAfterFreightlocview'), 'id' => 'txtAfterFreightlocview',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                  </div>
-                                </div>
-
-                              </div>
-
-
-
-
-
-
-                              <div class="col-md-6" align="right">
-
-                                CGST In %
-                              </div>
-
-                              <div class="col-md-3">
-                                <div class="form-group">
-
-                                  <?php
-                                  $data = array('name' => 'ViewCgst', 'value' => set_value('ViewCgst'), 'id' => 'ViewCgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-
-                              </div>
-                              <div class="col-md-3">
-                                <div class="form-group">
-
-                                  <?php
-                                  $data = array('name' => 'ViewAfterCgst', 'value' => set_value('ViewAfterCgst'), 'id' => 'ViewAfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-
-                              </div>
-
-                            </div>
-                            <div class="col-md-12" id="VIEWCAPdiv1" style="padding: 0px;">
-                              <div class="col-md-6" align="right">
-
-                                SGST In %
-                              </div>
-
-                              <div class="col-md-3">
-                                <div class="form-group">
-
-                                  <?php
-                                  $data = array('name' => 'ViewSgst', 'value' => set_value('ViewSgst'), 'id' => 'ViewSgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-
-                              </div>
-                              <div class="col-md-3">
-                                <div class="form-group">
-
-                                  <?php
-                                  $data = array('name' => 'ViewAfterSgst', 'value' => set_value('ViewAfterSgst'), 'id' => 'ViewAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-
-                              </div>
-
-                            </div>
-
-                            <div class="col-md-12" id="VIEWCAPdiv2" style="padding: 0px;">
-                              <div class="col-md-6" align="right">
-
-                                IGST In %
-                              </div>
-
-                              <div class="col-md-3">
-                                <div class="form-group">
-
-                                  <?php
-                                  $data = array('name' => 'ViewIgst', 'value' => set_value('ViewIgst'), 'id' => 'ViewIgst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-
-                              </div>
-                              <div class="col-md-3">
-                                <div class="form-group">
-
-                                  <?php
-                                  $data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst'), 'id' => 'ViewAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-
-                              </div>
-
-                            </div>
-                            <div class="col-md-12" id="VIEWCAPdiv3" style="padding: 0px;">
-                              <div class="col-md-5 col-md-offset-4" align="right">
-                                <label>Other Allowances <?php echo "($INR)" ?></label>
-                              </div>
-                              <div class="col-md-3">
-                                <div class="form-group">
-                                  <?php
-                                  $data = array('name' => 'ViewOtherAllowances', 'value' => set_value('ViewOtherAllowances'), 'id' => 'ViewOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-                              </div>
-
-                            </div>
-                            <div class="col-md-12" id="" style="padding: 0px;">
-                              <div class="col-md-5 col-md-offset-4" align="right">
-                                <label>Total Amount <?php echo "($INR)" ?></label>
-                              </div>
-                              <div class="col-md-3">
-                                <div class="form-group">
-                                  <?php
-                                  $data = array('name' => 'ViewTotalAmountlocal', 'value' => set_value('ViewTotalAmountlocal'), 'id' => 'ViewTotalAmountlocal',  'class' => 'form-control num', 'placeholder' => 'Total Amount', 'readonly' => 'true');
-                                  echo form_input($data);
-                                  ?>
-                                </div>
-                              </div>
-
-
-                              <div class="col-md-12" style="padding:1%;"></div>
-                              <div class="col-md-12" style="border:1px solid #000;padding:0px;" id="ViewModalImportTaxHide" style="display:none;">
-                                <br />
-                                <div class="col-md-6" style="padding:0px;">
-                                  <div class="col-md-12">
-                                    <div class="col-md-4">
-                                      Basic Price <?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="col-md-4" style="display:none;">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?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="col-md-12">
-                                    <div class="col-md-4">
-                                      Landing charge <?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                  </div>
-                                  <div class="col-md-12">
-                                    <div class="col-md-4">
-                                      Assessable Value (A) <?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group" style="display: none;">
-                                        <?php
-                                        $data = array('name' => 'ViewHighseas ', 'value' => set_value('ViewHighseas'), 'id' => 'ViewHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?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="col-md-12">
-                                    <div class="col-md-4">
-                                      Custom duty (B)<?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?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="col-md-12">
-                                    <div class="col-md-4">
-                                      Custom ED_cess (C)
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?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="col-md-12">
-                                    <div class="col-md-4">
-                                      Custom S & H cess (D)
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?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="col-md-6" style="padding:0px;">
-                                  <div class="col-md-12">
-                                    <div class="col-md-4">
-                                      Subtotal (E)<?php echo "($INR) (A+B+C+D)" ?>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group" style="display: none;">
-                                        <?php
-                                        $data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?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="col-md-12">
-                                    <div class="col-md-4">
-                                      <!-- Additional Excise duty : (g) -->
-                                      IGST on (E): (F)
-                                      <?php echo " ($INR)"; ?>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewIgstInt ', 'value' => set_value('ViewIgstInt', 0), 'id' => 'ViewIgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'EditCalculateIgst()');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewAfterIgstInt', 'value' => set_value('ViewAfterIgstInt', 0), 'id' => 'ViewAfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                  </div>
-
-
-
-
-
-
-
-
-
-
-
-                                  <div class="col-md-12">
-                                    <div class="col-md-8">
-                                      Total Duty (G) <?php echo "($INR) (B+C+D+F)" ?>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewGrossdutypayable ', 'value' => set_value('ViewGrossdutypayable'), 'id' => 'ViewGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                  </div>
-
-
-                                  <!--Start of Adding of Frieght model-->
-                                  <div class="col-md-12" style="padding:0px;">
-                                    <div class="col-md-3">
-                                      <span>Freight Type </span>
-                                      <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 "');
-
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-3" id="ViewTripsValue" style="display:none;">
-                                      <span>NO Of Trips</span>
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewNOOfTrips', 'value' => set_value('ViewNOOfTrips'), 'id' => 'ViewNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(2);');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-3">
-                                      <span>Freight Rate </span>
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-
-                                    <div class="col-md-3" style="padding-left: 0px;">
-                                      <span>Freight Amt <?php echo "($INR)" ?></span>
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'txtViewAfterFreight', 'value' => set_value('txtViewAfterFreight'), 'id' => 'txtViewAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-
-                                  </div>
-                                  <!--End of Adding of freight in edit model -->
-
-                                  <div class="col-md-12">
-                                    <center> <label>Cost of the product Per UOM</label></center>
-                                    <hr />
-                                  </div>
-                                  <div class="col-md-12">
-                                    <div class="col-md-4">
-                                      Duty Impact
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-                                    <div class="col-md-4" style="margin-top: -20px;">
-                                      <span>Quantity</span>
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-
-                                  </div>
-                                  <div class="col-md-12">
-
-                                    <div class="col-md-4">
-                                      Custom Duty Expenses<?php echo "($INR)/UOM" ?>
-
-
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-
-                                  </div>
-                                  <div class="col-md-12">
-                                    <div class="col-md-4">
-                                      Clearing Charges<?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                      </div>
-                                    </div>
-
-
-
-
-
-
-
-
-                                    <div class="col-md-4" style="margin-top: -25px;">
-                                      <!-- RMC Including Customers -->
-                                      <span><?php echo "Nett per UOM($INR)"; ?></span>
-                                    </div>
-                                    <div class="col-md-4">
-                                      <div class="form-group">
-                                        <?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>
-
-
-                                  <div class="col-md-6" align="right" style="display:none;"> <label>Total Order Amount :</label></div>
-                                  <div class="col-md-6" style="display:none;">
-                                    <div class="form-group">
-                                      <?php
-                                      $data = array('name' => 'ViewtxtTotalOrderValue', 'value' => set_value('ViewtxtTotalOrderValue'), 'id' => 'ViewtxtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
-                                      echo form_input($data);
-                                      ?>
-                                    </div>
-                                  </div>
-                                </div>
-
-                              </div>
-
-                            </div>
-
-
-                          </div>
-
-
-
-
-                          <div class="col-md-12" style="padding: 0px 30px 10px 30px;text-align:left">
-                            <label>Capital Description </label>
-
+                          <div class="form-group col-md-3">
+                            <label>Total Discount Amount <?php echo "($INR)" ?> </label>
 
                             <?php
-                            $data = array('name' => 'ViewItemDescription', 'value' => set_value('ViewItemDescription'), 'id' => 'ViewItemDescription',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-                            echo form_textarea($data); ?>
+                            $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($ExitDiscountedAmt, 2, '.', '')), 'id' => 'txtTotalDiscount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
+
+                          </div>
+                          <div class="form-group col-md-3">
+                            <label>CGST <?php echo "($INR)" ?></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-3">
+                            <label>SGST <?php echo "($INR)" ?></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-3">
+                            <label>IGST <?php echo "($INR)" ?></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-3">
+                            <label>Other Allowances <?php echo "($INR)" ?> </label>
+                            <?php
+                            $data = array('name' => 'TotalOtherAllowances', 'value' => set_value('TotalOtherAllowances', number_format($OtherAmt, 2, '.', '')), 'id' => 'TotalOtherAllowances',  'class' => 'form-control num', 'readonly' => 'true');
+                            echo form_input($data);
+                            ?>
 
                           </div>
 
 
-                          <div class="modal-footer">
-                            <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                            <?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?>
-                              <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
-                            <?php } ?>
+                          <div class="form-group col-md-3">
+                            <label>Total Freight <?php echo "($INR)" ?> </label>
+                            <?php
+                            $data = array('name' => 'TotalFreight', 'value' => set_value('TotalFreight', number_format($TotalFreightvalue, 2, '.', '')), 'id' => 'TotalFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                            echo form_input($data);
+                            ?>
+
+                          </div>
 
 
-                            <!-- <a class="btn btn-success font UpdateViewCapital"  ID="UpdateViewCapital" > &nbsp;&nbsp;<span class="bold">Update</span></a> -->
+
+                        </div>
+
+                        <div class="form-group col-md-12" style="border: 1px solid;padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
+
+                          <div class="form-group col-md-4">
+                            <label>Total Landing Charge <?php echo "($INR)" ?></label>
+
+                            <?php
+                            $data = array('name' => 'txttotallanding', 'value' => set_value('txttotallanding', number_format($TotalLanding, 2, '.', '')), 'id' => 'txttotallanding',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
+                          </div>
 
 
+                          <div class="form-group col-md-4">
+                            <label>Total Assessable Value <?php echo "($INR)" ?></label>
+
+                            <?php
+                            $data = array('name' => 'txttotalAssessable', 'value' => set_value('txttotalAssessable', $totassesable), 'id' => 'txttotalAssessable',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
+                          </div>
+
+                          <div class="form-group col-md-4">
+                            <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
+
+                            <?php
+                            $data = array('name' => 'txttotalcustom', 'value' => set_value('txttotalcustom', number_format($totcustom, 2, '.', '')), 'id' => 'txttotalcustom',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
+                          </div>
+
+                          <div class="form-group col-md-4">
+                            <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
+
+                            <?php
+                            $data = array('name' => 'txttotalSubtotal', 'value' => set_value('txttotalSubtotal', $totSubtotal), 'id' => 'txttotalSubtotal',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
+                          </div>
+
+
+
+
+
+                          <div class="form-group col-md-4">
+                            <label>Total IGST <?php echo "($INR)" ?></label>
+
+                            <?php
+                            $data = array('name' => 'txttotalIgst', 'value' => set_value('txttotalIgst', $totigst), 'id' => 'txttotalIgst',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
+                          </div>
+
+
+
+                          <div class="form-group col-md-4">
+                            <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
+
+                            <?php
+                            $data = array('name' => 'txttotalcustomED', 'value' => set_value('txttotalcustomED', number_format($totcustomED, 2, '.', '')), 'id' => 'txttotalcustomED',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
+                          </div>
+
+                          <div class="form-group col-md-4">
+                            <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
+
+                            <?php
+                            $data = array('name' => 'txttotalcustomSH', 'value' => set_value('txttotalcustomSH', number_format($totcustomSH, 2, '.', '')), 'id' => 'txttotalcustomSH',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
+                          </div>
+
+
+
+
+                          <div class="form-group col-md-4">
+                            <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
+
+                            <?php
+                            $data = array('name' => 'txttotalgrossduty', 'value' => set_value('txttotalgrossduty', number_format($totgrossduty, 2, '.', '')), 'id' => 'txttotalgrossduty',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
+                          </div>
+
+
+
+
+                          <div class="form-group col-md-4">
+                            <label>Total Freight Amount <?php echo "($INR)" ?></label>
+
+                            <?php
+                            $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', number_format($TotalFreightAmt, 2, '.', '')), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
+
+                          </div>
+
+
+
+                        </div>
+
+                        <div class="form-group col-md-12" style="border: 1px solid;padding:1% 1%;">
+                          <div class="form-group col-md-3">
+                            <label id="lbl_international">Total Order Value <?php echo "($INR)" ?> </label>
+
+                            <?php
+                            $data = array('name' => 'CapitalToatlOrder', 'value' => set_value('CapitalToatlOrder', number_format($totalCapitalOrder, 2, '.', '')), 'id' => 'CapitalToatlOrder',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                            echo form_input($data);
+                            ?>
                           </div>
                         </div>
-                    </form>
-                  </div>
-                </div>
-              </div>
-
-            </table>
-          </div><!-- Cloing div for container-fluid  -->
-          <div class="col-md-12" style="border: 1px solid;" id="CAPdiv">
-            <div class="col-md-3">
-              <label>Total Basic Amount <?php echo "($INR)" ?> </label>
-
-              <?php
-              $data = array('name' => 'CapitalBasicOrder', 'value' => set_value('CapitalBasicOrder', number_format($ExitTotalBasicOrderValue, 2, '.', '')), 'id' => 'CapitalBasicOrder',  'class' => 'form-control num', 'readonly' => 'true',);
-              echo form_input($data);
-              ?>
-            </div>
-            <div class="col-md-3">
-              <label>Total Discount Amount <?php echo "($INR)" ?> </label>
-
-              <?php
-              $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($ExitDiscountedAmt, 2, '.', '')), 'id' => 'txtTotalDiscount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-
-            </div>
-            <div class="col-md-3">
-              <label>CGST <?php echo "($INR)" ?></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="col-md-3">
-              <label>SGST <?php echo "($INR)" ?></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="col-md-3">
-              <label>IGST <?php echo "($INR)" ?></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="col-md-3">
-              <label>Other Allowances <?php echo "($INR)" ?> </label>
-              <?php
-              $data = array('name' => 'TotalOtherAllowances', 'value' => set_value('TotalOtherAllowances', number_format($OtherAmt, 2, '.', '')), 'id' => 'TotalOtherAllowances',  'class' => 'form-control num', 'readonly' => 'true');
-              echo form_input($data);
-              ?>
-
-            </div>
-
-
-            <div class="col-md-3">
-              <label>Total Freight <?php echo "($INR)" ?> </label>
-              <?php
-              $data = array('name' => 'TotalFreight', 'value' => set_value('TotalFreight', number_format($TotalFreightvalue, 2, '.', '')), 'id' => 'TotalFreight',  'class' => 'form-control num', 'readonly' => 'true');
-              echo form_input($data);
-              ?>
-
-            </div>
 
 
 
-          </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-hover table-bordered" style="background-color:#fff;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>
 
-          <div class="col-md-12" style="border: 1px solid;padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
-
-            <div class="col-md-4">
-              <label>Total Landing Charge <?php echo "($INR)" ?></label>
-
-              <?php
-              $data = array('name' => 'txttotallanding', 'value' => set_value('txttotallanding', number_format($TotalLanding, 2, '.', '')), 'id' => 'txttotallanding',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-            </div>
+                                  </tr>
+                                </thead>
 
 
-            <div class="col-md-4">
-              <label>Total Assessable Value <?php echo "($INR)" ?></label>
+                                <tbody>
+                                  <?php
+                                  if (!empty($getlogpodtl)) {
+                                    //print_r($getlogpodtl); die;
+                                    $inde = 0;
+                                    foreach ($getlogpodtl as $oldpo) {
+                                      $inde = $inde + 1;
+                                  ?>
+                                      <tr id="<?php echo $inde; ?>">
 
-              <?php
-              $data = array('name' => 'txttotalAssessable', 'value' => set_value('txttotalAssessable', $totassesable), 'id' => 'txttotalAssessable',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-            </div>
+                                        <td><?php echo $inde; ?></td>
+                                        <td><?php echo $oldpo->PONO ?></td>
 
-            <div class="col-md-4">
-              <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
-
-              <?php
-              $data = array('name' => 'txttotalcustom', 'value' => set_value('txttotalcustom', number_format($totcustom, 2, '.', '')), 'id' => 'txttotalcustom',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-            </div>
-
-            <div class="col-md-4">
-              <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
-
-              <?php
-              $data = array('name' => 'txttotalSubtotal', 'value' => set_value('txttotalSubtotal', $totSubtotal), 'id' => 'txttotalSubtotal',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-            </div>
-
-
-
-
-
-            <div class="col-md-4">
-              <label>Total IGST <?php echo "($INR)" ?></label>
-
-              <?php
-              $data = array('name' => 'txttotalIgst', 'value' => set_value('txttotalIgst', $totigst), 'id' => 'txttotalIgst',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-            </div>
-
-
-
-            <div class="col-md-4">
-              <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
-
-              <?php
-              $data = array('name' => 'txttotalcustomED', 'value' => set_value('txttotalcustomED', number_format($totcustomED, 2, '.', '')), 'id' => 'txttotalcustomED',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-            </div>
-
-            <div class="col-md-4">
-              <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
-
-              <?php
-              $data = array('name' => 'txttotalcustomSH', 'value' => set_value('txttotalcustomSH', number_format($totcustomSH, 2, '.', '')), 'id' => 'txttotalcustomSH',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-            </div>
-
-
-
-
-            <div class="col-md-4">
-              <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
-
-              <?php
-              $data = array('name' => 'txttotalgrossduty', 'value' => set_value('txttotalgrossduty', number_format($totgrossduty, 2, '.', '')), 'id' => 'txttotalgrossduty',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-            </div>
-
-
-
-
-            <div class="col-md-4">
-              <label>Total Freight Amount <?php echo "($INR)" ?></label>
-
-              <?php
-              $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', number_format($TotalFreightAmt, 2, '.', '')), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-
-            </div>
-
-
-
-          </div>
-
-          <div class="col-md-12" style="border: 1px solid;padding:1% 1%;">
-            <div class="col-md-3">
-              <label id="lbl_international">Total Order Value <?php echo "($INR)" ?> </label>
-
-              <?php
-              $data = array('name' => 'CapitalToatlOrder', 'value' => set_value('CapitalToatlOrder', number_format($totalCapitalOrder, 2, '.', '')), 'id' => 'CapitalToatlOrder',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-              echo form_input($data);
-              ?>
-            </div>
-          </div>
-
-
-
-          <!--##################################################################   -->
-          <?php if (!empty($update)) { ?>
-            <div class="col-md-12" id="editpodiv">
-              <div class="col-md-12"><label>Editable POScreen</label>
-                <table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;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>
-
-                    </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; ?>">
-
-                          <td><?php echo $inde; ?></td>
-                          <td><?php echo $oldpo->PONO ?></td>
-
-                          <!--          
+                                        <!--          
                           <?php if ($oldpo->logDate != '-') {
                                         $logdate = date('d-m-Y', strtotime($oldpo->logDate));
                                       } else {
@@ -3713,121 +3689,122 @@
                                       } ?>
                          
                           <td><?= $logdate; ?></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>
+                                        <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
-                      }
-                    }
-                    ?>
-                  </tbody>
-                </table>
-              </div>
-            </div>
-          <?php } else { } ?>
-
-            <div class="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 align="right" style="padding:3% 2%;">
-              <div>
-                <input type="file" name="POFile" id="POFile">
-                <?php if ($PrePOFile) { ?>
-                  <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
-                <?php } ?>
-                <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
-              </div>
-              <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="txtDeletedRow" id="txtDeletedRow" />
-
-              <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
-
-
-              <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { ?>
-                <a class="btn btn-cancel 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) { ?>
-                  <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 Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                <a class="btn btn-approved Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-                <?php  } else {
-                if ($DEPCode == FINANCE) { ?>
-                  <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
-                  <?php } else if ($DEPCode != FINANCE) {
-                  if (($CapitalRange != 1)) { ?>
-                    <a class="btn btn-success Save" ID="Save" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                    <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
-                  <?php } else { ?>
-                    <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                    <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
-                <?php }
-                } ?>
-                <!-- <a class="btn btn-success"  ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> -->
-              <?php } ?>
-
-            </div>
-
-            <label>Request On :</label><?php echo $UpdatedOn; ?><br />
-            <label>Request By :</label><?php echo $requestedBy; ?><br />
-            <!--<label>Status :</label><?php echo $PoStatusName; ?> -->
-            <label>Status : </label><?php
-                                    $statusMappings = [
-                                      'PO APPROVED' => 'AWAITING APPROVE',
-                                      'AWAITING RELEASE' => 'AWAITING APPROVE',
-                                      'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-                                      'PO RELEASED' => 'PO APPROVED',
-                                    ];
-
-                                    if (isset($PoStatusName) && !empty($PoStatusName)) {
-                                      if (isset($statusMappings[$PoStatusName])) {
-                                        echo $statusMappings[$PoStatusName];
-                                      } else {
-                                        echo $PoStatusName;
-                                      }
-                                    } else {
-                                      echo "Status not provided";
+                                      </tr>
+                                  <?php
                                     }
-                                    ?>
+                                  }
+                                  ?>
+                                </tbody>
+                              </table>
+                            </div>
+                          </div>
+                        <?php } else {
+                        } ?>
 
-        </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 align="right" style="padding:3% 2%;">
+                          <div>
+                            <input type="file" name="POFile" id="POFile">
+                            <?php if ($PrePOFile) { ?>
+                              <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
+                            <?php } ?>
+                            <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+                          </div>
+                          <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="txtDeletedRow" id="txtDeletedRow" />
+
+                          <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
 
 
-      </section>
+                          <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { ?>
+                            <a class="btn btn-cancel 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) { ?>
+                              <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 Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                            <a class="btn btn btn-soft-primary waves-effect waves-light Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                            <?php  } else {
+                            if ($DEPCode == FINANCE) { ?>
+                              <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
+                              <?php } else if ($DEPCode != FINANCE) {
+                              if (($CapitalRange != 1)) { ?>
+                                <a class="btn btn-success Save" ID="Save" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
+                              <?php } else { ?>
+                                <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
+                            <?php }
+                            } ?>
+                            <!-- <a class="btn btn-success"  ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> -->
+                          <?php } ?>
+
+                        </div>
+
+                        <label>Request On :</label><?php echo $UpdatedOn; ?><br />
+                        <label>Request By :</label><?php echo $requestedBy; ?><br />
+                        <!--<label>Status :</label><?php echo $PoStatusName; ?> -->
+                        <label>Status : </label><?php
+                                                $statusMappings = [
+                                                  'PO APPROVED' => 'AWAITING APPROVE',
+                                                  'AWAITING RELEASE' => 'AWAITING APPROVE',
+                                                  'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+                                                  'PO RELEASED' => 'PO APPROVED',
+                                                ];
+
+                                                if (isset($PoStatusName) && !empty($PoStatusName)) {
+                                                  if (isset($statusMappings[$PoStatusName])) {
+                                                    echo $statusMappings[$PoStatusName];
+                                                  } else {
+                                                    echo $PoStatusName;
+                                                  }
+                                                } else {
+                                                  echo "Status not provided";
+                                                }
+                                                ?>
+
+                      </div>
+
+
+                    </section>
+                  </div>
+
+
+                </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>
-		</div> <!-- container -->
-	</div> <!-- content -->
-</div>
     <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
     <script type="text/html" id="CapitalList">
       <tr id="<%=index%>">
@@ -3845,7 +3822,7 @@
         <td align="left"><%=ReceivedQuantity%></td>
         <td align="left"><%=PendingQuantity%></td>
         <td>
-          <a data-target='#EDITCAPITAL' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+          <a data-target='#EDITCAPITAL' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
 
 
         </td>
diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php
index 5e5d1525..11208605 100644
--- a/app/Views/editImportAmendPO.php
+++ b/app/Views/editImportAmendPO.php
@@ -233,11 +233,6 @@ if (!empty($RequistionDetails)) {
         margin: 0 5px;
     }
 
-    .mandatory {
-        color: red;
-        text-align: right;
-        background-color: white;
-    }
 </style>
 
 <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript">
@@ -319,7 +314,8 @@ if (!empty($RequistionDetails)) {
 			<div class="row">
 				<div class="col-12">
 					<div class="page-title-box page-title-box-alt">
-						<h4><?= "Purchase Order - $PONO "; ?></h4>
+						<h4><?= "Amended Import Purchase Order - $PONO "; ?></h4>
+                        <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a>
 					</div>
 				</div>
 			</div>
@@ -329,33 +325,17 @@ if (!empty($RequistionDetails)) {
 				<div class="col-12">
 					<div class="card">
 						<div class="card-body">
-
-<div class="content-wrapper">
-
-    <section class="content">
-        <div id="content"></div>
-        <?php
-        $attributes = array('class' => 'form-label-left ImportPO ', 'name'  => 'ImportPO', 'id'  => 'ImportPO', 'enctype' => 'multipart/form-data');
-
-        echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
+                            <?php
+                                $attributes = array('class' => 'form-label-left ImportPO ', 'name'  => 'ImportPO', 'id'  => 'ImportPO', 'enctype' => 'multipart/form-data');
+                                echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
 
 
-        <!-- <section class="content"> -->
 
         <div style="border:2px solid #333;">
-            <div class="col-md-12">
-                <div class="header-container">
-                    <h2> Amended Import Purchase Order-<?php echo "$PONO" ?></h2>
-                    <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a>
-                </div>
-                <!--<div class="col-md-1"><br/>		
-			 <a class="btn btn-info" href="<?php echo base_url(); ?>purchaseorder/CreateimportPOPrint" target="_blank">Print</a>			
-			</div> -->
-            </div>
             <div class="container-fluid">
                 <div class="row">
-                    <div class="col-md-12">
-                        <div class="col-md-3">
+                    <div class="form-group col-md-12">
+                        <div class="form-group col-md-3">
                             <label>Requistion No</label>
                             <?php
                             $options = array("0" => 'Selected Requisition Numbers');
@@ -367,7 +347,7 @@ if (!empty($RequistionDetails)) {
                             echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
                             ?>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Purchase Order Type</label>
                             <div class="form-group">
 
@@ -377,8 +357,8 @@ if (!empty($RequistionDetails)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
-                            <label>Supplier<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-3">
+                            <label>Supplier<span class="text-danger">*</span></label>
 
                             <?php
                             $options = array("0" => 'Select Supplier');
@@ -395,7 +375,7 @@ if (!empty($RequistionDetails)) {
 
                             ?>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Address</label>
                             <div class="form-group">
                                 <?php
@@ -406,9 +386,9 @@ if (!empty($RequistionDetails)) {
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-md-12">
-                        <div class="col-md-3">
-                            <label>Currency Type<span class="badge mandatory">*</span></label>
+                    <div class="form-group col-md-12">
+                        <div class="form-group col-md-3">
+                            <label>Currency Type<span class="text-danger">*</span></label>
 
                             <?php
                             $options = array($CurCode => $Cur);
@@ -422,8 +402,8 @@ if (!empty($RequistionDetails)) {
                             echo form_dropdown('currencytype', $options, set_value('currencytype'), 'id="currencytype"', 'required="true"', 'class="form-control select2'); ?>
 
                         </div>
-                        <div class="col-md-3">
-                            <b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
+                        <div class="form-group col-md-3">
+                            <b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
 
                             <!--  <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "0", 'checked' => 'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> -->
 
@@ -433,7 +413,7 @@ if (!empty($RequistionDetails)) {
                             </div>
 
                         </div>
-                        <div class="col-md-3" id="Schedulediv" style="display:none;"> <br />
+                        <div class="form-group col-md-3" id="Schedulediv" style="display:none;"> <br />
                             <!--  <label >Schedule </label>
                          
                         <?php
@@ -441,7 +421,7 @@ if (!empty($RequistionDetails)) {
                         echo Form_textarea($data);
                         ?> -->
 
-                            <label>Schedule By<span class="badge mandatory">*</span></label>
+                            <label>Schedule By<span class="text-danger">*</span></label>
 
                             <?php
                             $data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverySchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
@@ -449,7 +429,7 @@ if (!empty($RequistionDetails)) {
                             ?>
 
                         </div>
-                        <div class="col-md-3" id="Deliverydtdiv">
+                        <div class="form-group col-md-3" id="Deliverydtdiv">
                             <!--  <label>Delivery Date</label>
                              
                                 <?php
@@ -458,7 +438,7 @@ if (!empty($RequistionDetails)) {
                                 ?> -->
 
 
-                            <label>Dispatch Instruction<span class="badge mandatory">*</span></label>
+                            <label>Dispatch Instruction<span class="text-danger">*</span></label>
 
                             <?php
                             // $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
@@ -469,7 +449,7 @@ if (!empty($RequistionDetails)) {
                             ?>
 
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Delivery Address</label>
                             <div class="form-group">
                                 <?php
@@ -481,11 +461,11 @@ if (!empty($RequistionDetails)) {
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-md-12">
-                        <div class="col-md-3">
+                    <div class="form-group col-md-12">
+                        <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>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Exchange Rate On</label>
                             <div class="form-group">
                                 <?php
@@ -494,10 +474,10 @@ if (!empty($RequistionDetails)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <!--  <label>Exchange Rate </label> -->
 
-                            <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="badge mandatory">*</span></label>
+                            <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="text-danger">*</span></label>
                             <div class="form-group">
                                 <?php
                                 $data = array('name' => 'ExchangeRate', 'value' => set_value('ExchangeRate', $ExchangeRate), 'id' => 'ExchangeRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()');
@@ -505,8 +485,8 @@ if (!empty($RequistionDetails)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
-                            <label>Place of Origin<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-3">
+                            <label>Place of Origin<span class="text-danger">*</span></label>
                             <div class="form-group">
                                 <?php
                                 //  $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
@@ -539,8 +519,8 @@ if (!empty($RequistionDetails)) {
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-md-12">
-                        <div class="col-md-3">
+                    <div class="form-group col-md-12">
+                        <div class="form-group col-md-3">
                             <label>Purchase Order Date</label>
                             <div class="form-group">
                                 <?php
@@ -549,7 +529,7 @@ if (!empty($RequistionDetails)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Mode Of Shipment</label>
                             <div class="form-group">
 
@@ -559,7 +539,7 @@ if (!empty($RequistionDetails)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Contact Reference</label>
                             <div class="form-group">
 
@@ -569,7 +549,7 @@ if (!empty($RequistionDetails)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Supplier's Offer No</label>
                             <div class="form-group">
 
@@ -582,8 +562,8 @@ if (!empty($RequistionDetails)) {
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-md-12">
-                        <div class="col-md-3">
+                    <div class="form-group col-md-12">
+                        <div class="form-group col-md-3">
                             <label>Our Reference(S)</label>
                             <div class="form-group">
 
@@ -593,8 +573,8 @@ if (!empty($RequistionDetails)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
-                            <label for="payablefrom">Import Type Options<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-3">
+                            <label for="payablefrom">Import Type Options<span class="text-danger">*</span></label>
 
                             <?php
                             //$options1 = array("0"=>'Select Import Option');       
@@ -619,8 +599,8 @@ if (!empty($RequistionDetails)) {
                             echo form_dropdown('Importoption', $options2, set_value('Importoption'), 'id="Importoption"', 'class="form-control"');                                              ?>
 
                         </div>
-                        <div class="col-md-3">
-                            <label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-3">
+                            <label for="payablefrom">Payable Terms<span class="text-danger">*</span></label>
                             <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
 
 
@@ -654,8 +634,8 @@ if (!empty($RequistionDetails)) {
                             echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2');                                                    ?>
 
                         </div>
-                        <div class="col-md-3" id="otheroptiondiv" style="display:none;">
-                            <label>Description of Payable Terms<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
+                            <label>Description of Payable Terms<span class="text-danger">*</span></label>
                             <div class="form-group">
                                 <?php
 
@@ -667,9 +647,9 @@ if (!empty($RequistionDetails)) {
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-md-12">
-                        <div class="col-md-3">
-                            <label for="payablefrom">Insurance<span class="badge mandatory">*</span></label>
+                    <div class="form-group col-md-12">
+                        <div class="form-group col-md-3">
+                            <label for="payablefrom">Insurance<span class="text-danger">*</span></label>
 
 
 
@@ -702,8 +682,8 @@ if (!empty($RequistionDetails)) {
                             ?>
 
                         </div>
-                        <div class="col-md-3" id="insurancenum" style="display:none;">
-                            <label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-3" id="insurancenum" style="display:none;">
+                            <label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
                             <div class="form-group">
                                 <?php
 
@@ -712,8 +692,8 @@ if (!empty($RequistionDetails)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
-                            <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-3">
+                            <label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
                             <select id='BudgetType' name='BudgetType'>
                                 <?php if ($BudgetType == 'CAPITAL') {
                                     $opt1 = 'CAPITAL';
@@ -728,7 +708,7 @@ if (!empty($RequistionDetails)) {
                                 <option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
                             </select>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                         </div>
                     </div>
                 </div>
@@ -759,9 +739,9 @@ if (!empty($RequistionDetails)) {
                                                 </div>
                                                 <div align="left">
 
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-3">
-                                                            <label>Req No<span class="badge mandatory">*</span></label>
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-3">
+                                                            <label>Req No<span class="text-danger">*</span></label>
                                                             <div>
                                                                 <?php
 
@@ -770,7 +750,7 @@ if (!empty($RequistionDetails)) {
                                                             </div>
                                                         </div>
 
-                                                        <div class="col-md-3">
+                                                        <div class="form-group col-md-3">
                                                             <label>Department Name</label>
                                                             <div class="form-group">
                                                                 <?php
@@ -779,7 +759,7 @@ if (!empty($RequistionDetails)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-3">
+                                                        <div class="form-group col-md-3">
                                                             <label>Cost Center Code</label>
                                                             <div class="form-group">
                                                                 <?php
@@ -793,7 +773,7 @@ if (!empty($RequistionDetails)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-3" style="padding-right: 0px;">
+                                                        <div class="form-group col-md-3" style="padding-right: 0px;">
                                                             <label>Available Budget Amount (<?php echo $INR ?>)</label>
                                                             <div class="form-group">
                                                                 <?php
@@ -808,9 +788,9 @@ if (!empty($RequistionDetails)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-2">
-                                                            <label>Item Code<span class="badge mandatory">*</span></label>
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-2">
+                                                            <label>Item Code<span class="text-danger">*</span></label>
 
                                                             <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                             <div>
@@ -828,7 +808,7 @@ if (!empty($RequistionDetails)) {
 
                                                         </div>
 
-                                                        <div class="col-md-2">
+                                                        <div class="form-group col-md-2">
                                                             <label>Item Name</label>
                                                             <div class="form-group">
                                                                 <?php
@@ -837,7 +817,7 @@ if (!empty($RequistionDetails)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-2">
+                                                        <div class="form-group col-md-2">
                                                             <label>UOM</label>
                                                             <div class="form-group">
                                                                 <?php
@@ -846,9 +826,9 @@ if (!empty($RequistionDetails)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-6" style="padding: 0px;">
-                                                            <div class="col-md-3">
-                                                                <label>Quantity<span class="badge mandatory">*</span></label>
+                                                        <div class="form-group col-md-6" style="padding: 0px;">
+                                                            <div class="form-group col-md-3">
+                                                                <label>Quantity<span class="text-danger">*</span></label>
                                                                 <div class="form-group">
                                                                     <?php
                                                                     $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck()');
@@ -857,11 +837,11 @@ if (!empty($RequistionDetails)) {
                                                                     ?>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-3" style="padding-left: 0px;">
+                                                            <div class="form-group col-md-3" style="padding-left: 0px;">
                                                                 <!--  <label>Rate </label> -->
 
 
-                                                                <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="badge mandatory">*</span> </label>
+                                                                <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="text-danger">*</span> </label>
                                                                 <div class="form-group">
                                                                     <?php
                                                                     $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
@@ -869,12 +849,12 @@ if (!empty($RequistionDetails)) {
                                                                     ?>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-3">
+                                                            <div class="form-group col-md-3">
                                                                 <label>Per</label> <?php
                                                                                     $data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer',  'class' => 'form-control');
                                                                                     echo form_input($data); ?>
                                                             </div>
-                                                            <div class="col-md-3" style="padding: 0px;">
+                                                            <div class="form-group col-md-3" style="padding: 0px;">
                                                                 <!-- <label><?php echo "Basic Value In"; ?></label>-->
                                                                 <label id="label3"><?php echo "Basic Value In $Currencycode ($Value)"; ?></label>
                                                                 <div class="form-group">
@@ -888,9 +868,9 @@ if (!empty($RequistionDetails)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
+                                                    <div class="form-group col-md-12">
 
-                                                        <div class="col-md-3">
+                                                        <div class="form-group col-md-3">
 
                                                             <!-- Basic Price in US $ per Ton : -->
 
@@ -905,7 +885,7 @@ if (!empty($RequistionDetails)) {
                                                             </div>
                                                         </div>
 
-                                                        <div class="col-md-3">
+                                                        <div class="form-group col-md-3">
 
                                                             <?php echo "Exchange Rate ($Currencycode ($Value))" ?>
 
@@ -918,7 +898,7 @@ if (!empty($RequistionDetails)) {
 
                                                         </div>
 
-                                                        <div class="col-md-3">
+                                                        <div class="form-group col-md-3">
 
                                                             <!--  Basic value in INR : -->
 
@@ -931,19 +911,19 @@ if (!empty($RequistionDetails)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <!--<div class="col-md-3">
+                                                        <!--<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 class="col-md-12" style="border:1px solid #000;padding:0px;">
+                                                        <div class="form-group col-md-12" style="border:1px solid #000;padding:0px;">
                                                             <br />
-                                                            <div class="col-md-6" style="padding:0px;">
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                            <div class="form-group col-md-6" style="padding:0px;">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         <!-- Basic Price: -->
                                                                         <label><?php echo "Basic Price ($INR)"; ?></label>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group" style="display:none;">
                                                                             <?php
                                                                             $data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
@@ -951,7 +931,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
@@ -960,12 +940,12 @@ if (!empty($RequistionDetails)) {
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         <!--  Landing charge -->
                                                                         <label><?php echo "Landing charge ($INR)"; ?></label>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
@@ -976,7 +956,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
@@ -985,12 +965,12 @@ if (!empty($RequistionDetails)) {
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         <!-- High seas sales charge -->
                                                                         <label><?php echo "Assessable Value (A) ($INR)"; ?></label>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group" style="display: none">
                                                                             <?php
                                                                             $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
@@ -998,7 +978,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1007,12 +987,12 @@ if (!empty($RequistionDetails)) {
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         <!-- Custom duty : (a) -->
                                                                         <label><?php echo "Custom duty (B)($INR)"; ?></label>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
@@ -1020,7 +1000,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1032,12 +1012,12 @@ if (!empty($RequistionDetails)) {
 
 
 
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         <!-- Custom ED_cess : (e) -->
                                                                         <label><?php echo "Custom ED_cess (C) ($INR)"; ?></label>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
@@ -1045,7 +1025,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1054,12 +1034,12 @@ if (!empty($RequistionDetails)) {
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <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="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
@@ -1067,7 +1047,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1077,13 +1057,13 @@ if (!empty($RequistionDetails)) {
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-6" style="padding:0px;">
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                            <div class="form-group col-md-6" style="padding:0px;">
+                                                                <div class="form-group col-md-12">
+                                                                    <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="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group" style="display: none">
                                                                             <?php
                                                                             $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
@@ -1091,7 +1071,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1105,12 +1085,12 @@ if (!empty($RequistionDetails)) {
 
 
 
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         <!-- Additional Excise duty : (g) -->
                                                                         <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditIgst ', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
@@ -1118,7 +1098,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1135,12 +1115,12 @@ if (!empty($RequistionDetails)) {
 
 
 
-                                                                <div class="col-md-12">
+                                                                <div class="form-group col-md-12">
                                                                     <div class="col-md-8">
                                                                         <!--  Gross duty payable -->
                                                                         <label><?php echo "Total Duty (G)($INR)  (B+C+D+E)"; ?></label>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
@@ -1152,8 +1132,8 @@ if (!empty($RequistionDetails)) {
 
 
                                                                 <!--Start of Adding of Frieght model-->
-                                                                <div class="col-md-12" style="padding:0px;">
-                                                                    <div class="col-md-3">
+                                                                <div class="form-group col-md-12" style="padding:0px;">
+                                                                    <div class="form-group col-md-3">
                                                                         <span>Freight Type </span>
                                                                         <div>
                                                                             <?php
@@ -1174,7 +1154,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-3" id="AmendTripsValue" style="display:block;">
+                                                                    <div class="form-group col-md-3" id="AmendTripsValue" style="display:block;">
                                                                         <span>NO Of Trips</span>
                                                                         <div class="form-group">
                                                                             <?php
@@ -1183,7 +1163,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-3">
+                                                                    <div class="form-group col-md-3">
                                                                         <span>Freight Rate </span>
                                                                         <div class="form-group">
                                                                             <?php
@@ -1193,7 +1173,7 @@ if (!empty($RequistionDetails)) {
                                                                         </div>
                                                                     </div>
 
-                                                                    <div class="col-md-3" style="padding-left: 0px;">
+                                                                    <div class="form-group col-md-3" style="padding-left: 0px;">
                                                                         <span>Freight Amt In <?php echo $INR; ?></span>
                                                                         <div class="form-group">
                                                                             <?php
@@ -1206,15 +1186,15 @@ if (!empty($RequistionDetails)) {
                                                                 </div>
                                                                 <!--End of Adding of freight in edit model -->
 
-                                                                <div class="col-md-12">
+                                                                <div class="form-group col-md-12">
                                                                     <center> <label>Cost of the product Per UOM</label></center>
                                                                     <hr />
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         Duty Impact
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1222,7 +1202,7 @@ if (!empty($RequistionDetails)) {
                                                                             ?>
                                                                         </div>
                                                                     </div>
-                                                                    <div class="col-md-4" style="margin-top: -4.8%">
+                                                                    <div class="form-group col-md-4" style="margin-top: -4.8%">
                                                                         <span>Quantity</span>
                                                                         <div class="form-group">
                                                                             <?php
@@ -1233,13 +1213,13 @@ if (!empty($RequistionDetails)) {
                                                                     </div>
 
                                                                 </div>
-                                                                <div class="col-md-12">
+                                                                <div class="form-group col-md-12">
 
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <!--  Custom Duty Expenses -->
                                                                         <label><?php echo "Custom Duty($INR) /UOM"; ?></label>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1249,12 +1229,12 @@ if (!empty($RequistionDetails)) {
                                                                     </div>
 
                                                                 </div>
-                                                                <div class="col-md-12">
-                                                                    <div class="col-md-4">
+                                                                <div class="form-group col-md-12">
+                                                                    <div class="form-group col-md-4">
                                                                         <!-- RMC Including Customers -->
                                                                         <label><?php echo "Clearing Charges ($INR)"; ?></label>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
@@ -1265,11 +1245,11 @@ if (!empty($RequistionDetails)) {
 
 
 
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <!-- RMC Including Customers -->
                                                                         <label><?php echo "Nett per UOM($INR)"; ?></label>
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group">
                                                                             <?php
                                                                             $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1283,10 +1263,10 @@ if (!empty($RequistionDetails)) {
 
 
 
-                                                                    <div class="col-md-4" style="display:none;">
+                                                                    <div class="form-group col-md-4" style="display:none;">
                                                                         <!-- Total Amount: -->
                                                                     </div>
-                                                                    <div class="col-md-4">
+                                                                    <div class="form-group col-md-4">
                                                                         <div class="form-group" style="display:none;">
                                                                             <?php
                                                                             $data = array('name' => 'EditTotalExp', 'value' => set_value('EditTotalExp'), 'id' => 'EditTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1301,8 +1281,8 @@ if (!empty($RequistionDetails)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-12">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-12">
                                                             <label>Import Description :</label>
                                                             <?php
                                                             $data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
@@ -1606,7 +1586,7 @@ if (!empty($RequistionDetails)) {
                                                     // if($PONOStatus == PO_DRAFT) 
                                                     // {
                                                     ?>
-                                                    <td> <a data-target='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <!-- <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>-->
+                                                    <td> <a data-target='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <!-- <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>-->
                                                         <?php
                                                         // } else {
                                                         ?>
@@ -1674,10 +1654,10 @@ if (!empty($RequistionDetails)) {
                                 </table>
                             </div>
 
-                            <div class="col-md-12" style="border: 1px solid;">
+                            <div class="form-group col-md-12" style="border: 1px solid;">
 
-                                <div class="col-md-12">
-                                    <div class="col-md-4">
+                                <div class="form-group col-md-12">
+                                    <div class="form-group col-md-4">
                                         <label>Total Landing Charge <?php echo "($INR)" ?></label>
 
                                         <?php
@@ -1686,7 +1666,7 @@ if (!empty($RequistionDetails)) {
                                         ?>
                                     </div>
 
-                                    <div class="col-md-4">
+                                    <div class="form-group col-md-4">
                                         <label>Total Assessable Value <?php echo "($INR)" ?></label>
 
                                         <?php
@@ -1695,7 +1675,7 @@ if (!empty($RequistionDetails)) {
                                         ?>
                                     </div>
 
-                                    <div class="col-md-4">
+                                    <div class="form-group col-md-4">
                                         <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
 
                                         <?php
@@ -1705,7 +1685,7 @@ if (!empty($RequistionDetails)) {
                                     </div>
 
 
-                                    <div class="col-md-4">
+                                    <div class="form-group col-md-4">
                                         <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
 
                                         <?php
@@ -1715,7 +1695,7 @@ if (!empty($RequistionDetails)) {
                                     </div>
 
 
-                                    <div class="col-md-4">
+                                    <div class="form-group col-md-4">
                                         <label>Total IGST <?php echo "($INR)" ?></label>
 
                                         <?php
@@ -1725,7 +1705,7 @@ if (!empty($RequistionDetails)) {
                                     </div>
 
 
-                                    <div class="col-md-4">
+                                    <div class="form-group col-md-4">
                                         <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
 
                                         <?php
@@ -1734,7 +1714,7 @@ if (!empty($RequistionDetails)) {
                                         ?>
                                     </div>
 
-                                    <div class="col-md-4">
+                                    <div class="form-group col-md-4">
                                         <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
 
                                         <?php
@@ -1743,7 +1723,7 @@ if (!empty($RequistionDetails)) {
                                         ?>
                                     </div>
 
-                                    <div class="col-md-4">
+                                    <div class="form-group col-md-4">
                                         <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
 
                                         <?php
@@ -1755,7 +1735,7 @@ if (!empty($RequistionDetails)) {
 
 
 
-                                    <div class="col-md-4">
+                                    <div class="form-group col-md-4">
                                         <label>Total Freight Value </label> <?php
                                                                             $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', $totfreight), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'required' => 'true', 'readonly' => 'true', 'style' => 'text-align:right;');
                                                                             echo form_input($data);
@@ -1765,7 +1745,7 @@ if (!empty($RequistionDetails)) {
 
 
                                     <input type="hidden" name="txttotamend" id="txttotamed" value=<?php echo $totorder; ?>>
-                                    <div class="col-md-4">
+                                    <div class="form-group col-md-4">
                                         <label>Total Order Value <?php echo "($Value)" ?></label> <?php
                                                                                                     $data = array('name' => 'txtToatlOrder', 'value' => set_value('txtToatlOrder', $totorder), 'id' => 'txtToatlOrder',  'class' => 'form-control', 'required' => 'true', 'readonly' => 'true', 'style' => 'text-align:right;');
                                                                                                     echo form_input($data);
@@ -1777,8 +1757,8 @@ if (!empty($RequistionDetails)) {
 
 
 
-                                <div class="col-md-12">
-                                    <div class="col-md-12">
+                                <div class="form-group col-md-12">
+                                    <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);
@@ -1850,9 +1830,7 @@ if (!empty($RequistionDetails)) {
                         </div>
                 </div>
 
-    </section>
-
-</div>
+   
 
 
                         </div> <!-- end card body-->
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index b6228d1d..b2564cd6 100644
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -929,11 +929,7 @@ if (!empty($INRSYMBOL)) {
 		margin: 0 5px;
 	}
 
-	.mandatory {
-		color: red;
-		text-align: right;
-		background-color: white;
-	}
+
 </style>
 
 <div class="content-page">
@@ -961,8 +957,8 @@ if (!empty($INRSYMBOL)) {
 
 									<div class="container-fluid">
 										<div class="row">
-											<div class="col-md-12">
-												<div class="col-md-3">
+											<div class="form-group col-md-12">
+												<div class="form-group col-md-3">
 													<label>Requistion No</label>
 													<?php
 													$options = array("0" => 'Selected Requisition Numbers');
@@ -976,7 +972,7 @@ if (!empty($INRSYMBOL)) {
 													echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
 													?>
 												</div>
-												<div class="col-md-3">
+												<div class="form-group col-md-3">
 													<label>Purchase Order Type</label>
 													<div class="form-group">
 
@@ -986,8 +982,8 @@ if (!empty($INRSYMBOL)) {
 														?>
 													</div>
 												</div>
-												<div class="col-md-3">
-													<label>Select Supplier<span class="badge mandatory">*</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);
@@ -1002,7 +998,7 @@ if (!empty($INRSYMBOL)) {
 
 													?>
 												</div>
-												<div class="col-md-3">
+												<div class="form-group col-md-3">
 													<label>Supplier Address</label>
 													<div class="form-group">
 														<?php
@@ -1014,8 +1010,8 @@ if (!empty($INRSYMBOL)) {
 											</div>
 										</div>
 										<div class="row">
-											<div class="col-md-12">
-												<div class="col-md-3">
+											<div class="form-group col-md-12">
+												<div class="form-group col-md-3">
 													<div id="div1" style="display:block;">
 														<b><u>Select Tax Range</u></b><br />
 														<div class="centered">
@@ -1024,21 +1020,21 @@ if (!empty($INRSYMBOL)) {
 														</div>
 													</div>
 												</div>
-												<div class="col-md-3">
-													<b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
+												<div class="form-group col-md-3">
+													<b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
 													<input type="hidden" name="beforeDelivery" value="<?php echo $DeliverOption; ?>">
 													<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') . form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
 													</div>
 												</div>
-												<div class="col-md-3" id="Deliverydtdiv">
+												<div class="form-group col-md-3" id="Deliverydtdiv">
 													<?php if ($DeliverOption == 1) {
 														$Deliverydt = null;
 													}
 													?>
 													<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt; ?>">
-													<label>Delivery Date<span class="badge mandatory">*</span></label>
+													<label>Delivery Date<span class="text-danger">*</span></label>
 													<div class="form-group">
 														<?php
 														$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
@@ -1046,15 +1042,15 @@ if (!empty($INRSYMBOL)) {
 														?>
 													</div>
 												</div>
-												<div class="col-md-3" id="Schedulediv" style="display:none;">
+												<div class="form-group col-md-3" id="Schedulediv" style="display:none;">
 													<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule; ?>">
-													<label>Schedule By<span class="badge mandatory">*</span></label>
+													<label>Schedule By<span class="text-danger">*</span></label>
 													<?php
 													$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverSchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
 													echo Form_textarea($data);
 													?>
 												</div>
-												<div class="col-md-3">
+												<div class="form-group col-md-3">
 													<label>Delivery Address</label>
 													<div class="form-group">
 														<?php
@@ -1066,8 +1062,8 @@ if (!empty($INRSYMBOL)) {
 											</div>
 										</div>
 										<div class="row">
-											<div class="col-md-12">
-												<div class="col-md-3">
+											<div class="form-group col-md-12">
+												<div class="form-group col-md-3">
 													<label>Purchase Order Date</label>
 													<div class="form-group">
 														<?php
@@ -1076,7 +1072,7 @@ if (!empty($INRSYMBOL)) {
 														?>
 													</div>
 												</div>
-												<div class="col-md-3">
+												<div class="form-group col-md-3">
 													<label>Mode Of Shipment</label>
 													<div class="form-group">
 
@@ -1089,7 +1085,7 @@ if (!empty($INRSYMBOL)) {
 
 
 												</div>
-												<div class="col-md-3">
+												<div class="form-group col-md-3">
 													<label>Contact Reference</label>
 													<div class="form-group">
 
@@ -1099,7 +1095,7 @@ if (!empty($INRSYMBOL)) {
 														?>
 													</div>
 												</div>
-												<div class="col-md-3">
+												<div class="form-group col-md-3">
 													<label>Supplier's Offer No</label>
 													<div class="form-group">
 
@@ -1113,8 +1109,8 @@ if (!empty($INRSYMBOL)) {
 											</div>
 										</div>
 										<div class="row">
-											<div class="col-md-12">
-												<div class="col-md-3">
+											<div class="form-group col-md-12">
+												<div class="form-group col-md-3">
 													<label>Other Reference(S)</label>
 													<div class="form-group">
 
@@ -1124,8 +1120,8 @@ if (!empty($INRSYMBOL)) {
 														?>
 													</div>
 												</div>
-												<div class="col-md-3">
-													<label>Revenue Type Options<span class="badge mandatory">*</span></label>
+												<div class="form-group col-md-3">
+													<label>Revenue Type Options<span class="text-danger">*</span></label>
 													<div class="form-group">
 
 														<?php
@@ -1151,8 +1147,8 @@ if (!empty($INRSYMBOL)) {
 
 
 												</div>
-												<div class="col-md-3">
-													<label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
+												<div class="form-group col-md-3">
+													<label for="payablefrom">Payable Terms<span class="text-danger">*</span></label>
 													<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
 
 
@@ -1189,8 +1185,8 @@ if (!empty($INRSYMBOL)) {
 													?>
 
 												</div>
-												<div class="col-md-3" id="otheroptiondiv" style="display:none;">
-													<label>Description of Payable Terms<span class="badge mandatory">*</span></label>
+												<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
+													<label>Description of Payable Terms<span class="text-danger">*</span></label>
 													<div class="form-group">
 														<?php
 
@@ -1202,16 +1198,16 @@ if (!empty($INRSYMBOL)) {
 											</div>
 										</div>
 										<div class="row">
-											<div class="col-md-12">
-												<div class="col-md-3">
-													<label for="insurance">Insurance<span class="badge mandatory">*</span></label>
+											<div class="form-group col-md-12">
+												<div class="form-group col-md-3">
+													<label for="insurance">Insurance<span class="text-danger">*</span></label>
 													<?php
 													$optionsnew = array('1' => 'Yes', '0' => 'No');
 													echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus"', 'required="true"', 'class="form-control select2', 'readonly ="true"');
 													?>
 												</div>
-												<div class="col-md-3" id="InsuranceNumberdiv" style="display:block;">
-													<label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
+												<div class="form-group col-md-3" id="InsuranceNumberdiv" style="display:block;">
+													<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
 													<div class="form-group">
 														<?php
 														$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
@@ -1219,8 +1215,8 @@ if (!empty($INRSYMBOL)) {
 														?>
 													</div>
 												</div>
-												<div class="col-md-3">
-													<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
+												<div class="form-group col-md-3">
+													<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
 													<select id='BudgetType' name='BudgetType'>
 														<?php if ($BudgetType == 'CAPITAL') {
 															$opt1 = 'CAPITAL';
@@ -1237,7 +1233,7 @@ if (!empty($INRSYMBOL)) {
 
 
 												</div>
-												<div class="col-md-3">
+												<div class="form-group col-md-3">
 												</div>
 											</div>
 										</div>
@@ -1411,9 +1407,9 @@ if (!empty($INRSYMBOL)) {
 															</div>
 															<div align="left">
 																<div>
-																	<div class="col-md-12">
-																		<div class="col-md-3">
-																			<label>Req No<span class="badge mandatory">*</span></label>
+																	<div class="form-group col-md-12">
+																		<div class="form-group col-md-3">
+																			<label>Req No<span class="text-danger">*</span></label>
 																			<div>
 																				<?php
 
@@ -1424,7 +1420,7 @@ if (!empty($INRSYMBOL)) {
 																			</div>
 																		</div>
 
-																		<div class="col-md-3">
+																		<div class="form-group col-md-3">
 																			<label>Department Name</label>
 																			<div class="form-group">
 																				<?php
@@ -1433,7 +1429,7 @@ if (!empty($INRSYMBOL)) {
 																				?>
 																			</div>
 																		</div>
-																		<div class="col-md-3">
+																		<div class="form-group col-md-3">
 																			<label>Cost Center Code</label>
 																			<div class="form-group">
 																				<?php
@@ -1443,7 +1439,7 @@ if (!empty($INRSYMBOL)) {
 																				?>
 																			</div>
 																		</div>
-																		<div class="col-md-3">
+																		<div class="form-group col-md-3">
 																			<label>Avl Bud Amt</label>
 																			<div class="form-group">
 																				<?php
@@ -1453,9 +1449,9 @@ if (!empty($INRSYMBOL)) {
 																			</div>
 																		</div>
 																	</div>
-																	<div class="col-md-12">
-																		<div class="col-md-2">
-																			<label>Item Code<span class="badge mandatory">*</span></label>
+																	<div class="form-group col-md-12">
+																		<div class="form-group col-md-2">
+																			<label>Item Code<span class="text-danger">*</span></label>
 																			<div>
 																				<?php
 
@@ -1469,7 +1465,7 @@ if (!empty($INRSYMBOL)) {
 																			</div>
 																		</div>
 
-																		<div class="col-md-2">
+																		<div class="form-group col-md-2">
 																			<label>Item Name</label>
 																			<div class="form-group">
 																				<?php
@@ -1478,7 +1474,7 @@ if (!empty($INRSYMBOL)) {
 																				?>
 																			</div>
 																		</div>
-																		<div class="col-md-2">
+																		<div class="form-group col-md-2">
 																			<label>UOM</label>
 																			<div class="form-group">
 																				<?php
@@ -1487,9 +1483,9 @@ if (!empty($INRSYMBOL)) {
 																				?>
 																			</div>
 																		</div>
-																		<div class="col-md-6" style="padding:0px;">
-																			<div class="col-md-3">
-																				<label>Quantity<span class="badge mandatory">*</span></label>
+																		<div class="form-group col-md-6" style="padding:0px;">
+																			<div class="form-group col-md-3">
+																				<label>Quantity<span class="text-danger">*</span></label>
 																				<div class="form-group">
 																					<?php
 																					$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@@ -1498,8 +1494,8 @@ if (!empty($INRSYMBOL)) {
 
 																				</div>
 																			</div>
-																			<div class="col-md-3">
-																				<label>Rate <?php echo "($INRSYM)" ?><span class="badge mandatory">*</span></label>
+																			<div class="form-group col-md-3">
+																				<label>Rate <?php echo "($INRSYM)" ?><span class="text-danger">*</span></label>
 																				<div class="form-group">
 																					<?php
 																					$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@@ -1507,12 +1503,12 @@ if (!empty($INRSYMBOL)) {
 																					?>
 																				</div>
 																			</div>
-																			<div class="col-md-3">
+																			<div class="form-group col-md-3">
 																				<label>Per</label> <?php
 																									$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer',  'class' => 'form-control');
 																									echo form_input($data); ?>
 																			</div>
-																			<div class="col-md-3" style="padding-left: 0px;">
+																			<div class="form-group col-md-3" style="padding-left: 0px;">
 																				<label>Basic Amt <?php echo "($INRSYM)" ?></label>
 																				<div class="form-group">
 																					<?php
@@ -1524,9 +1520,9 @@ if (!empty($INRSYMBOL)) {
 																		</div>
 																	</div>
 																</div><br />
-																<div class="col-md-12">
-																	<div class="col-md-4"></div>
-																	<div class="col-md-4">
+																<div class="form-group col-md-12">
+																	<div class="form-group col-md-4"></div>
+																	<div class="form-group col-md-4">
 																		<label>Discount Type </label>
 																		<div>
 																			<?php
@@ -1547,7 +1543,7 @@ if (!empty($INRSYMBOL)) {
 																			?>
 																		</div>
 																	</div>
-																	<div class="col-md-2">
+																	<div class="form-group col-md-2">
 																		<label>Discount Rate </label>
 																		<div class="form-group">
 																			<?php
@@ -1556,7 +1552,7 @@ if (!empty($INRSYMBOL)) {
 																			?>
 																		</div>
 																	</div>
-																	<div class="col-md-2">
+																	<div class="form-group col-md-2">
 																		<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
 																		<div class="form-group">
 																			<?php
@@ -1567,8 +1563,8 @@ if (!empty($INRSYMBOL)) {
 																	</div>
 																</div>
 																<div class="col-md-12 ">
-																	<div class="col-md-4"></div>
-																	<div class="col-md-4">
+																	<div class="form-group col-md-4"></div>
+																	<div class="form-group col-md-4">
 																		<label>Freight Type </label>
 																		<div>
 																			<?php
@@ -1589,7 +1585,7 @@ if (!empty($INRSYMBOL)) {
 																			?>
 																		</div>
 																	</div>
-																	<div class="col-md-2" id="EditTripsValue" style="display:none;">
+																	<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
 																		<label>NO Of Trips</label>
 																		<div class="form-group">
 																			<?php
@@ -1598,7 +1594,7 @@ if (!empty($INRSYMBOL)) {
 																			?>
 																		</div>
 																	</div>
-																	<div class="col-md-2">
+																	<div class="form-group col-md-2">
 																		<label>Freight Rate </label>
 																		<div class="form-group">
 																			<?php
@@ -1607,7 +1603,7 @@ if (!empty($INRSYMBOL)) {
 																			?>
 																		</div>
 																	</div>
-																	<div class="col-md-2">
+																	<div class="form-group col-md-2">
 																		<label>Freight Amt <?php echo "($INRSYM)" ?></label>
 																		<div class="form-group">
 																			<?php
@@ -1617,9 +1613,9 @@ if (!empty($INRSYMBOL)) {
 																		</div>
 																	</div>
 																</div>
-																<div class="col-md-12" style="text-align:left;">
-																	<div class="col-md-4"></div>
-																	<div class="col-md-4">
+																<div class="form-group col-md-12" style="text-align:left;">
+																	<div class="form-group col-md-4"></div>
+																	<div class="form-group col-md-4">
 																		<label>Packaging Type </label>
 																		<div>
 																			<?php
@@ -1640,7 +1636,7 @@ if (!empty($INRSYMBOL)) {
 																			?>
 																		</div>
 																	</div>
-																	<div class="col-md-2">
+																	<div class="form-group col-md-2">
 																		<label>Packaging Rate </label>
 																		<div class="form-group">
 																			<?php
@@ -1649,7 +1645,7 @@ if (!empty($INRSYMBOL)) {
 																			?>
 																		</div>
 																	</div>
-																	<div class="col-md-2">
+																	<div class="form-group col-md-2">
 																		<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
 																		<div class="form-group">
 																			<?php
@@ -1659,9 +1655,9 @@ if (!empty($INRSYMBOL)) {
 																		</div>
 																	</div>
 																</div>
-																<div class="col-md-12" id="CGSTArea">
-																	<div class="col-md-8"></div>
-																	<div class="col-md-2">
+																<div class="form-group col-md-12" id="CGSTArea">
+																	<div class="form-group col-md-8"></div>
+																	<div class="form-group col-md-2">
 																		<label>CGST in %</label>
 																		<div class="form-group">
 																			<?php
@@ -1670,7 +1666,7 @@ if (!empty($INRSYMBOL)) {
 																			?>
 																		</div>
 																	</div>
-																	<div class="col-md-2">
+																	<div class="form-group col-md-2">
 																		<label>CGST Amt <?php echo "($INRSYM)" ?></label>
 																		<div class="form-group">
 																			<?php
@@ -1680,9 +1676,9 @@ if (!empty($INRSYMBOL)) {
 																		</div>
 																	</div>
 																</div>
-																<div class="col-md-12" id="SGSTModel">
-																	<div class="col-md-8"></div>
-																	<div class="col-md-2">
+																<div class="form-group col-md-12" id="SGSTModel">
+																	<div class="form-group col-md-8"></div>
+																	<div class="form-group col-md-2">
 																		<label>SGST in %</label>
 																		<div class="form-group">
 																			<?php
@@ -1692,7 +1688,7 @@ if (!empty($INRSYMBOL)) {
 																		</div>
 
 																	</div>
-																	<div class="col-md-2">
+																	<div class="form-group col-md-2">
 																		<label>SGST Amt <?php echo "($INRSYM)" ?></label>
 																		<div class="form-group">
 																			<?php
@@ -1703,9 +1699,9 @@ if (!empty($INRSYMBOL)) {
 
 																	</div>
 																</div>
-																<div class="col-md-12" id="IGSTModel" style="display:none;">
-																	<div class="col-md-8"></div>
-																	<div class="col-md-2">
+																<div class="form-group col-md-12" id="IGSTModel" style="display:none;">
+																	<div class="form-group col-md-8"></div>
+																	<div class="form-group col-md-2">
 																		<label>IGST in %</label>
 																		<div class="form-group">
 																			<?php
@@ -1714,7 +1710,7 @@ if (!empty($INRSYMBOL)) {
 																			?>
 																		</div>
 																	</div>
-																	<div class="col-md-2">
+																	<div class="form-group col-md-2">
 																		<label>IGST Amt <?php echo "($INRSYM)" ?></label>
 																		<div class="form-group">
 																			<?php
@@ -1727,9 +1723,9 @@ if (!empty($INRSYMBOL)) {
 
 
 																</div>
-																<div class="col-md-12">
-																	<div class="col-md-8"></div>
-																	<div class="col-md-4">
+																<div class="form-group col-md-12">
+																	<div class="form-group col-md-8"></div>
+																	<div class="form-group col-md-4">
 																		<label> Insurance Amt <?php echo "($INRSYM)" ?>(if Any)</label>
 																		<div class="form-group">
 																			<?php
@@ -1739,7 +1735,7 @@ if (!empty($INRSYMBOL)) {
 																		</div>
 																	</div>
 																</div>
-																<div class="col-md-12">
+																<div class="form-group col-md-12">
 
 																	<div class="col-md-4 col-md-offset-8">
 																		<label>Total Order Amt <?php echo "($INRSYM)" ?></label>
@@ -1751,7 +1747,7 @@ if (!empty($INRSYMBOL)) {
 																		</div>
 																	</div>
 																</div>
-																<div class="col-md-12">
+																<div class="form-group col-md-12">
 
 																	<label><?php echo "Revenue Description"; ?></label>
 																	<div class="form-group">
@@ -1765,7 +1761,7 @@ if (!empty($INRSYMBOL)) {
 															</div>
 															<hr />
 															<div class="row">
-																<div class="col-md-12">
+																<div class="form-group col-md-12">
 																	<div class="col-md-3 col-md-offset-9">
 																		<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
 																		<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
@@ -1879,9 +1875,9 @@ if (!empty($INRSYMBOL)) {
 
 
 
-																	<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to Amend the  <?php echo $record->ReqNo; ?> Requisition details"></i></a>
+																	<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to Amend the  <?php echo $record->ReqNo; ?> Requisition details"></i></a>
 
-																		<!--	<td>   <a  	data-toggle="tooltip"  href="#"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php //echo $record->ReqNo; 
+																		<!--	<td>   <a  	data-toggle="tooltip"  href="#"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="<?php //echo $record->ReqNo; 
 																																													?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td>  -->
 
 																	</td>
@@ -1913,8 +1909,8 @@ if (!empty($INRSYMBOL)) {
 											<!-- /.box-body -->
 											<br>
 											<div class="row">
-												<div class="col-md-12">
-													<div class="col-md-3">
+												<div class="form-group col-md-12">
+													<div class="form-group col-md-3">
 														<label>Basic Amount <?php echo "($INRSYM)" ?> </label>
 
 														<?php
@@ -1924,7 +1920,7 @@ if (!empty($INRSYMBOL)) {
 
 
 													</div>
-													<div class="col-md-3">
+													<div class="form-group col-md-3">
 														<label>Total Discount Amount <?php echo "($INRSYM)" ?> </label>
 
 														<?php
@@ -1933,7 +1929,7 @@ if (!empty($INRSYMBOL)) {
 														?>
 
 													</div>
-													<div class="col-md-3" id="SGSTShow">
+													<div class="form-group col-md-3" id="SGSTShow">
 														<label>Total SGST Amount <?php echo "($INRSYM)" ?></label>
 
 														<?php
@@ -1942,7 +1938,7 @@ if (!empty($INRSYMBOL)) {
 														?>
 
 													</div>
-													<div class="col-md-3" id="IGSTShow" style="display:none;">
+													<div class="form-group col-md-3" id="IGSTShow" style="display:none;">
 														<label>Total IGST Amount In INR </label>
 
 														<?php
@@ -1951,7 +1947,7 @@ if (!empty($INRSYMBOL)) {
 														?>
 
 													</div>
-													<div class="col-md-3" id="CGSTshow">
+													<div class="form-group col-md-3" id="CGSTshow">
 														<label>Total CGST Amount <?php echo "($INRSYM)" ?> </label>
 
 														<?php
@@ -1962,10 +1958,10 @@ if (!empty($INRSYMBOL)) {
 													</div>
 
 												</div>
-												<div class="col-md-12">
+												<div class="form-group col-md-12">
 
 
-													<div class="col-md-3">
+													<div class="form-group col-md-3">
 														<label>Total Packaging Amount <?php echo "($INRSYM)" ?></label>
 
 														<?php
@@ -1974,7 +1970,7 @@ if (!empty($INRSYMBOL)) {
 														?>
 
 													</div>
-													<div class="col-md-3">
+													<div class="form-group col-md-3">
 														<label>Total Insurance Amount <?php echo "($INRSYM)" ?> </label>
 
 														<?php
@@ -1983,7 +1979,7 @@ if (!empty($INRSYMBOL)) {
 														?>
 
 													</div>
-													<div class="col-md-3">
+													<div class="form-group col-md-3">
 														<label>Total Freight Amount <?php echo "($INRSYM)" ?></label>
 
 														<?php
@@ -1992,7 +1988,7 @@ if (!empty($INRSYMBOL)) {
 														?>
 
 													</div>
-													<div class="col-md-3">
+													<div class="form-group col-md-3">
 														<label>Total Order Amount <?php echo "($INRSYM)" ?> </label>
 														<input type="hidden" name="preTotalOdervalue" value="<?php echo $totOrderSummaryAmt; ?>">
 														<?php
@@ -2002,8 +1998,8 @@ if (!empty($INRSYMBOL)) {
 													</div>
 												</div>
 
-												<div class="col-md-12">
-													<div class="col-md-12">
+												<div class="form-group col-md-12">
+													<div class="form-group col-md-12">
 														<label>Special Instructions </label> <?php
 																								$data = array('name' => 'txtSpcialInstruction', 'id' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'rows' => '8', 'class' => 'form-control');
 																								echo form_textarea($data);
@@ -2093,7 +2089,7 @@ if (!empty($INRSYMBOL)) {
 		<td align="left"><%=TotalValue%></td>
 
 		<td>
-			<a data-target='#EDITREVENUE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow('<%=index%>')" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+			<a data-target='#EDITREVENUE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow('<%=index%>')" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
 
 
 		</td>
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index b71eb2ca..bd260343 100644
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -139,34 +139,34 @@ if (!empty($getlogpodtl)) {
 }
 ?>
 <style>
-	#packagingcalmodel {
+	/* #packagingcalmodel {
 		margin-top: 200px;
 		z-index: 1080 !important;
-	}
+	} */
 
-	#freightcalmodel {
+	/* #freightcalmodel {
 		margin-top: 200px;
 		z-index: 1080 !important;
-	}
+	} */
 
-	#ExciseDutyCalModel {
+	/* #ExciseDutyCalModel {
 		margin-top: 200px;
 		z-index: 1080 !important;
-	}
+	} */
 
-	#VatCalModel {
+	/* #VatCalModel {
 		margin-top: 200px;
 		z-index: 1080 !important;
-	}
+	} */
 
-	#CSTCalModel {
+	/* #CSTCalModel {
 		margin-top: 200px;
 		z-index: 1080 !important;
-	}
+	} */
 
-	.modal {
+	/* .modal {
 		padding-right: 30% ! important;
-	}
+	} */
 </style>
 <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
 <script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
@@ -1834,31 +1834,10 @@ if (!empty($getlogpodtl)) {
 	}
 </script>
 <style>
-	.pagination {
-		margin: 0px ! important;
-	}
-
-	.box-body {
-		padding: 0px ! important;
-	}
-
 	.num {
 		text-align: right;
 	}
 
-	.header-container {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 25px;
-	}
-
-	.header-container h2 {
-		flex: 1;
-		text-align: center;
-		margin: 0;
-	}
-
 	.centered {
 		display: flex;
 		/* justify-content: center; */
@@ -1870,12 +1849,6 @@ if (!empty($getlogpodtl)) {
 	.centered input {
 		margin: 0 5px;
 	}
-
-	.mandatory {
-		color: red;
-		text-align: right;
-		background-color: white;
-	}
 </style>
 <div class="content-page">
 	<div class="content">
@@ -1885,12 +1858,12 @@ if (!empty($getlogpodtl)) {
 			<div class="row">
 				<div class="col-12">
 					<div class="page-title-box page-title-box-alt">
-							<?php if ($parentPO == '') { ?>
-								<h4><?= "Edit Revenue Purchase Order - $PONO "; ?></h4>
-							<?php } else { ?>
-								<h4><?= "Amended Revenue Purchase Order - $PONO "; ?></h4>
-							<?php } ?>
-							<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-cancel" id="back" value="Back">Back</a>
+						<?php if ($parentPO == '') { ?>
+							<h4><?= "Edit Revenue Purchase Order - $PONO "; ?></h4>
+						<?php } else { ?>
+							<h4><?= "Amended Revenue Purchase Order - $PONO "; ?></h4>
+						<?php } ?>
+						<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-cancel" id="back" value="Back">Back</a>
 					</div>
 				</div>
 			</div>
@@ -1900,2094 +1873,741 @@ if (!empty($getlogpodtl)) {
 				<div class="col-12">
 					<div class="card">
 						<div class="card-body">
-
 							<?php
 							$attributes = array('class' => 'form-label-left CreatePO ', 'name'  => 'CreatePO', 'id'  => 'CreatePO');
-							echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); 
+							echo form_open(base_url() . '/purchaseorder/addPO/', $attributes);
 							?>
+							<div class="container-fluid">
 
-			
-			<div class="container-fluid">
+								<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) :
 
-				<div class="row">
-					<div class="col-md-12">
-						<div class="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;
+											//$ReqType = $SID->ReqType;
+											endforeach;
+										}
+										echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
+										?>
+									</div>
+									<div class="form-group col-md-3">
+										<label>Purchase Order Type</label>
+										<div class="form-group">
 
-									$options[$SID->ReqNo] = $SID->ReqNo;
-								//$ReqType = $SID->ReqType;
-								endforeach;
-							}
-							echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
-							?>
-						</div>
-						<div class="col-md-3">
-							<label>Purchase Order Type</label>
-							<div class="form-group">
+											<?php
+											$data = array('name' => 'POType', 'value' => set_value('POType', REVENUE), '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);
 
-								<?php
-								$data = array('name' => 'POType', 'value' => set_value('POType', REVENUE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="col-md-3">
-							<label>Select Supplier<span class="badge mandatory">*</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="col-md-3">
-							<label>Supplier Address</label>
-							<div class="form-group">
-								<?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>
-				<div class="row">
-					<div class="col-md-12">
-						<div class="col-md-3">
-							<div id="div1" style="display:block;">
-
-								<b><u>Select Tax Range</u></b><br />
-								<div class="centered">
-
-									<?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;" . form_radio(array('name' => 'Range', 'value' => '0', 'checked' => ('0' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Local', 'onchange' => 'SetVatorCST();')); ?>
-
-									<?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array('name' => 'Range', 'value' => '1', 'checked' => ('1' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Inter_state', 'onchange' => 'SetVatorCST();')); ?>
-
-								</div>
-							</div>
-						</div>
-						<div class="col-md-3">
-							<b><u>Select Delivery By<span class="badge mandatory">*</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') . form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
-							</div>
-
-						</div>
-						<div class="col-md-3" id="Deliverydtdiv">
-							<label>Delivery Date<span class="badge mandatory">*</span></label>
-							<div class="form-group">
-								<?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="col-md-3" id="Schedulediv" style="display:none;">
-							<label>Schedule By<span class="badge mandatory">*</span></label>
-							<?php
-							$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverSchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
-							echo Form_textarea($data);
-							?>
-						</div>
-						<div class="col-md-3">
-							<label>Delivery Address</label>
-							<div class="form-group">
-								<?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>
-				<div class="row">
-					<div class="col-md-12">
-						<div class="col-md-3">
-							<label>Purchase Order Date</label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
-								echo form_input($data);
-								?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
-							</div>
-						</div>
-						<div class="col-md-3">
-
-							<label>Mode Of Shipment</label>
-							<div class="form-group">
-
-								<?php
-								$data = array('name' => 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $modeofshipment), 'id' => 'editmodeofshipment',  'class' => 'form-control');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="col-md-3">
-							<label>Contact Reference</label>
-							<div class="form-group">
-
-								<?php
-								$data = array('name' => 'editsupplierreference', 'value' => set_value('editsupplierreference', $supplierref), 'id' => 'editsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
-								echo form_input($data);
-								?>
-							</div>
-
-						</div>
-						<div class="col-md-3">
-							<label>Supplier's Offer No</label>
-							<div class="form-group">
-
-								<?php
-								$data = array('name' => 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $suppofferno), 'id' => 'editsupplierofferno',  'class' => 'form-control');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-md-12">
-						<div class="col-md-3">
-
-							<label>Our Reference(S)</label>
-							<div class="form-group">
-
-								<?php
-								$data = array('name' => 'editotherreference', 'value' => set_value('editotherreference', $otherref), 'id' => 'editotherreference',  'class' => 'form-control');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="col-md-3">
-							<label>Revenue Type Options<span class="badge mandatory">*</span></label>
-							<div class="form-group">
-
-								<?php
-								//$optionsWork = array("0"=>'Select Work Status');
-
-
-								if (!empty($PoTypeOptions)) {
-
-									foreach ($PoTypeOptions as $POpt) :
-
-										if ($revenuesubtype == $POpt->ConfigValue) {
-											$optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
+										if (!empty($Suplist)) {
+											foreach ($Suplist as $SID) :
+												$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
+											endforeach;
 										}
 
-									endforeach;
-									foreach ($PoTypeOptions as $POpt1) :
+										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 class="form-group">
+											<?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">
+										<div id="div1" style="display:block;">
 
-										if ($revenuesubtype != $POpt1->ConfigValue) {
-											$optionsPO[$POpt1->ConfigValue] =  $POpt1->ConfigValue;
+											<b><u>Select Tax Range</u></b><br />
+											<div class="centered">
+
+												<?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;" . form_radio(array('name' => 'Range', 'value' => '0', 'checked' => ('0' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Local', 'onchange' => 'SetVatorCST();')); ?>
+
+												<?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array('name' => 'Range', 'value' => '1', 'checked' => ('1' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Inter_state', 'onchange' => 'SetVatorCST();')); ?>
+
+											</div>
+										</div>
+									</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') . 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 class="form-group">
+											<?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', $DeliverSchedule), '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 class="form-group">
+											<?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 class="form-group">
+											<?php
+											$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											echo form_input($data);
+											?> <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 class="form-group">
+
+											<?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 class="form-group">
+
+											<?php
+											$data = array('name' => 'editsupplierreference', 'value' => set_value('editsupplierreference', $supplierref), '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 class="form-group">
+
+											<?php
+											$data = array('name' => 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $suppofferno), 'id' => 'editsupplierofferno',  'class' => 'form-control');
+											echo form_input($data);
+											?>
+										</div>
+									</div>
+								</div>
+								<div class="form-row">
+									<div class="form-group col-md-3">
+
+										<label>Our Reference(S)</label>
+										<div class="form-group">
+
+											<?php
+											$data = array('name' => 'editotherreference', 'value' => set_value('editotherreference', $otherref), 'id' => 'editotherreference',  'class' => 'form-control');
+											echo form_input($data);
+											?>
+										</div>
+									</div>
+									<div class="form-group col-md-3">
+										<label>Revenue Type Options<span class="text-danger">*</span></label>
+
+										<?php
+										//$optionsWork = array("0"=>'Select Work Status');
+
+
+										if (!empty($PoTypeOptions)) {
+
+											foreach ($PoTypeOptions as $POpt) :
+
+												if ($revenuesubtype == $POpt->ConfigValue) {
+													$optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
+												}
+
+											endforeach;
+											foreach ($PoTypeOptions as $POpt1) :
+
+												if ($revenuesubtype != $POpt1->ConfigValue) {
+													$optionsPO[$POpt1->ConfigValue] =  $POpt1->ConfigValue;
+												}
+
+											endforeach;
 										}
 
-									endforeach;
-								}
+										echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions" required="true" class="form-control"');
 
-								echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
-								?>
+										?>
 
-							</div>
-						</div>
-						<div class="col-md-3">
-							<label>Payment Terms<span class="badge mandatory">*</span></label>
-
-							<?php
-
-
-
-							if (!empty($Payment)) {
-
-								foreach ($Payment as $pay) :
-
-
-									$options6[$pay->PaymentID] =  $pay->PaymentTerms;
-
-								endforeach;
-							}
-							echo form_dropdown('PaymentTerms', $options6, set_value('PaymentTerms', $Terms), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2');
-							?>
-
-
-
-						</div>
-						<div class="col-md-3" id="otheroptiondiv" style="display:none;">
-							<label>Description of Payable Terms<span class="badge mandatory">*</span></label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-md-12">
-						<div class="col-md-3">
-							<label for="insurance">Insurance Options<span class="badge mandatory">*</span></label>
-							<?php
-							$optionsnew = array('1' => 'Yes', '0' => 'No');
-							echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus"', 'required="true"', 'class="form-control select2');
-							?>
-						</div>
-						<div class="col-md-3" id="InsuranceNumberdiv" style="display:block;">
-							<label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="col-md-3">
-							<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
-							<select id='BudgetType' name='BudgetType'>
-								<?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 class="col-md-3">
-						</div>
-					</div>
-				</div>
-
-
-				<!-- Modal for Excise Duty Calculation-->
-				<div class="modal fade" id="ExciseDutyCalModel" role="dialog">
-					<div class="modal-dialog">
-
-						<!-- Modal content-->
-						<div class="modal-content">
-							<div class="modal-header">
-								<button type="button" class="close" data-dismiss="modal">&times;</button>
-								<h4 class="modal-title">Excise Duty Calculation On</h4>
-							</div>
-							<div class="modal-body">
-								<form>
-									<div class="radio">
-										<label><input type="radio" name="optExcise" checked="checked" value="0" id="optExcise">From Basic Amount</label>
 									</div>
-									<div class="radio">
-										<label><input type="radio" name="optExcise" value="1" id="optExcise">Basic Amount - Discount Amount</label>
+									<div class="form-group col-md-3">
+										<label>Payment Terms<span class="text-danger">*</span></label>
+
+										<?php
+
+
+
+										if (!empty($Payment)) {
+
+											foreach ($Payment as $pay) :
+
+
+												$options6[$pay->PaymentID] =  $pay->PaymentTerms;
+
+											endforeach;
+										}
+										echo form_dropdown('PaymentTerms', $options6, set_value('PaymentTerms', $Terms), 'id="PaymentTerms"', 'required="true"', 'class="form-control"');
+										?>
+
+
+
 									</div>
-									<div class="radio">
-										<label><input type="radio" name="optExcise" value="2" id="optExcise">(Basic Amount - Discount Amount ) + Packing Cost</label>
+									<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
+										<label>Description of Payable Terms<span class="text-danger">*</span></label>
+										<div class="form-group">
+											<?php
+											$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+											echo form_input($data);
+											?>
+										</div>
 									</div>
-									<div class="radio">
-										<label><input type="radio" name="optExcise" value="3" id="optExcise">Basic Amount + Packing Cost</label>
-									</div>
-
-								</form>
-							</div>
-							<div class="modal-footer">
-								<a class="btn btn-success" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-								<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-							</div>
-						</div>
-
-					</div>
-				</div>
-
-
-				<!-- Modal for Vat Calculation -->
-				<div class="modal fade" id="VatCalModel" role="dialog">
-					<div class="modal-dialog">
-
-						<!-- Modal content-->
-						<div class="modal-content">
-							<div class="modal-header">
-								<button type="button" class="close" data-dismiss="modal">&times;</button>
-								<h4 class="modal-title">Vat Calculation On</h4>
-							</div>
-							<div class="modal-body">
-								<form>
-
-									<div class="radio">
-										<label><input type="radio" name="optVat" checked="checked" value="0" id="optVat">Basic Amount</label>
-									</div>
-									<div class="radio">
-										<label><input type="radio" name="optVat" value="1" id="optVat">Excise Duty</label>
-									</div>
-								</form>
-							</div>
-							<div class="modal-footer">
-								<a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-								<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-							</div>
-						</div>
-
-					</div>
-				</div>
-				<!-- Modal for CST Calculation -->
-				<div class="modal fade" id="CSTCalModel" role="dialog">
-					<div class="modal-dialog">
-
-						<!-- Modal for CST Calculation-->
-						<div class="modal-content">
-							<div class="modal-header">
-								<button type="button" class="close" data-dismiss="modal">&times;</button>
-								<h4 class="modal-title">CST Calculation On</h4>
-							</div>
-							<div class="modal-body">
-								<form>
-
-									<div class="radio">
-										<label><input type="radio" name="optCST" checked="checked" value="0" id="optCST">Basic Amount</label>
-									</div>
-									<div class="radio">
-										<label><input type="radio" name="optCST" value="1" id="optCST">Excise Duty</label>
-									</div>
-								</form>
-							</div>
-							<div class="modal-footer">
-								<a class="btn btn-success" ID="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-								<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-							</div>
-						</div>
-
-					</div>
-				</div>
-				<div class="container-fluid">
-
-					<div align="right">
-						<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-							<div class="col-md-12">
-								<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-									<div class="col-md-3 col-md-offset-7" align="right" style="padding:5px">
-										<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
-									</div>
-								<?php } else { ?>
-									<div class="col-md-3 col-md-offset-7" align="right" style="padding:5px">
-									</div>
-								<?php } ?>
-								<div class="col-md-1" align="right">
-									<!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> -->
-									<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd">Select Line Item</button> </a>
 								</div>
-							</div>
-						<?php } ?>
-					</div>
-
-					<!-- Model for revenue po -->
-					<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="overflow-y:scroll !important">
-						<div class="modal-dialog">
-							<!-- Modal content-->
-							<form>
-								<div class="modal-content" style="width:1070px;">
-									<div class="modal-header">
-										<center>
-											<h4>Select Revenue Purchase Order Line Item </h4>
-										</center>
+								<div class="form-row">
+									<div class="form-group col-md-3">
+										<label for="insurance">Insurance Options<span class="text-danger">*</span></label>
+										<?php
+										$optionsnew = array('1' => 'Yes', '0' => 'No');
+										echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus" required="true" class="form-control"');
+										?>
 									</div>
-									<div align="left">
-										<div>
-											<div class="col-md-12">
-												<div class="col-md-3">
-													<label>Req No<span class="badge mandatory">*</span></label>
-													<div>
-														<?php
-														$RL = array("0" => 'Select Req No');
-														if (!empty($RequistionDetails)) {
-															foreach ($RequistionDetails as $SID) :
-																$RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
-															endforeach;
-														}
-
-														echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo"', 'class="form-control"');
-														?>
-													</div>
-												</div>
-
-												<div class="col-md-3">
-													<label>Department Name</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  'class' => 'form-control', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-3">
-													<label>Cost Center Code</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-3">
-													<label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
-											<div class="col-md-12">
-												<div class="col-md-2">
-													<label>Item Code<span class="badge mandatory">*</span></label>
-													<div>
-														<?php
-														$options = array("0" => 'Item Code');
+									<div class="form-group col-md-3" id="InsuranceNumberdiv" style="display:block;">
+										<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
+										<div class="form-group">
+											<?php
+											$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), '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">
+											<?php if ($BudgetType == 'CAPITAL') {
+												$opt1 = 'CAPITAL';
+												$opt2 = 'REVENUE';
+											} else {
+												$opt1 = 'REVENUE';
+												$opt2 = 'CAPITAL';
+											} ?>
 
 
-														echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control"');
-														?>
-													</div>
-												</div>
-
-												<div class="col-md-2">
-													<label>Item Name</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>UOM</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-6" style="padding:0px;">
-													<div class="col-md-3">
-														<label>Quantity<span class="badge mandatory">*</span></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-3">
-														<label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-3">
-														<label>Per</label> <?php
-																			$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
-																			echo form_input($data); ?>
-													</div>
-													<div class="col-md-3">
-														<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-												</div>
-											</div>
-										</div><br />
-										<div class="col-md-12" style="padding:0px;">
-
-											<div class="col-md-12">
-											    <div class="col-md-4"></div>
-												<div class="col-md-4">
-													<label>Discount Type </label>
-													<div>
-														<?php
-														$options = array("0" => 'Select Discount Type');
-														//print_r(  $options);
-														if (!empty($TaxType)) {
-															foreach ($TaxType as $SID) :
-																$options[$SID->ConfigValue] =  $SID->ConfigValue;
-															endforeach;
-														}
-														echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType"', 'class="form-control"');
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>Discount Rate </label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();calculateDiscount(0);');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount'), 'id' => 'txtAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
-											<div class="col-md-12" style="text-align:left;">
-											    <div class="col-md-4"></div>
-												<div class="col-md-4">
-													<label>Packaging Type </label>
-													<div>
-														<?php
-														$options = array("0" => 'Select Packaging Type');
-														//print_r(  $options);
-														if (!empty($TaxType)) {
-															foreach ($TaxType as $SID) :
-																$options[$SID->ConfigValue] =  $SID->ConfigValue;
-															endforeach;
-														}
-														echo form_dropdown('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType"', 'class="form-control "');
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>Packaging Rate </label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging'), 'id' => 'txtAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
-											<div class="col-md-12">
-											    <div class="col-md-4"></div>
-												<div class="col-md-4">
-													<label>Freight Type </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('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight"', 'class="form-control "');
-														?>
-													</div>
-												</div>
-												<div class="col-md-2" id="TripsValue" style="display:none;">
-													<label>NO Of Trips</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>Freight Rate </label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>Freight Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
-											<div class="col-md-12">
-												<div class="col-md-8"></div>
-												<div class="col-md-2">
-													<label>CGST In %</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
+											<option value=<?php echo $opt1; ?>><?php echo $opt1; ?></option>
+											<option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
+										</select>
 
+									</div>
+									<div class="form-group col-md-3">
+									</div>
+								</div>
+								<div class="form-row">
+									<div align="right">
+										<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
 											
-											<div class="col-md-12" style="text-align:left;">
-												<div id="SGSTAddModel">
-													<div class="col-md-8"></div>
-													<div class="col-md-2">
-														<label>SGST In %</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-															echo form_input($data);
-															?>
-														</div>
+												<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+													<div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:5px">
+														<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
 													</div>
-													<div class="col-md-2">
-														<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0), 'id' => 'AfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
+												<?php } else { ?>
+													<div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:5px">
 													</div>
+												<?php } ?>
+												<div class="form-group" align="right">
+													<!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> -->
+													<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd">Select Line Item</button> </a>
 												</div>
-											</div>
-											<div class="col-md-12" style="text-align:left;">
-												<div id="IGSTAddModel" style="display:none;">
-													<div class="col-md-8"></div>
-													<div class="col-md-2">
-														<label>IGST In %</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>IGST Amt <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-												</div>
-											</div>
-
-											<div class="col-md-12">
-												<div class="col-md-8"></div>
-												<div class="col-md-4">
-													<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance'), 'id' => 'txtInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
-
-											<div class="col-md-12">
-												<div class="col-md-8"></div>
-
-												<div class="col-md-4 ">
-													<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-
-
-											</div>
-
-											<div class="col-md-12">
-												<div class="col-md-12">
-													<label><?php echo "Revenue Description"; ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'Add_Service_Description', 'value' => set_value('Add_Service_Description'), 'id' => 'Add_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
-														echo form_textarea($data);;
-														?>
-
-													</div>
-												</div>
-											</div>
-											<div class="col-md-12">
-												<div class="col-md-3 col-md-offset-9"><br />
-													<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
-													<a class="btn btn-success font AddRevenue" ID="AddRevenue">&nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
-												</div>
-											</div>
-
-
-										</div>
-
-										<br /><br />
-										<!-- footer for revenue po -->
-										<div class="modal-footer">
-
-										</div>
-									</div>
-
-								</div>
-							</form>
-						</div>
-					</div>
-
-					<br />
-					<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="overflow-y:scroll !important">
-						<div class="modal-dialog">
-							<!-- Modal content-->
-							<form>
-								<div class="modal-content" style="width:1070px;">
-									<div class="modal-header">
-										<center>
-											<h4>Edit Revenue Purchase Order Line Item </h4>
-										</center>
-									</div>
-									<div align="left">
-										<div>
-											<div class="col-md-12">
-												<div class="col-md-3">
-													<label>Req No<span class="badge mandatory">*</span></label>
-													<div>
-														<?php
-
-														$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-
-												<div class="col-md-3">
-													<label>Department Name</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-3">
-													<label>Cost Center Code</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-3">
-													<label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
-											<div class="col-md-12">
-												<div class="col-md-2">
-													<label>Item Code<span class="badge mandatory">*</span></label>
-													<div>
-														<?php
-														$options = array("0" => 'Item Code');
-
-
-														echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
-														?>
-													</div>
-												</div>
-
-												<div class="col-md-2">
-													<label>Item Name</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>UOM</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-6" style="padding: 0px;">
-													<div class="col-md-3">
-														<label>Quantity<span class="badge mandatory">*</span></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-3">
-														<label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-3">
-														<label>Per</label> <?php
-																			$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
-																			echo form_input($data); ?>
-													</div>
-													<div class="col-md-3">
-														<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-
-												</div>
-											</div>
-										</div><br />
-
-										<div class="col-md-12">
-											<div class="col-md-4"></div>
-											<div class="col-md-4">
-												<label>Discount Type </label>
-												<div>
-													<?php
-													$options = array("0" => 'Select Discount Type');
-													//print_r(  $options);
-
-													if (!empty($TaxType)) {
-														foreach ($TaxType as $SID) :
-
-
-															$options[$SID->ConfigValue] =  $SID->ConfigValue;
-														endforeach;
-													}
-
-													echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType"', 'class="form-control"');
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>Discount Rate </label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();calculateDiscount(1);', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>Discounted Amt <?php echo "($INRSYM)" ?> </label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-										<div class="col-md-12" style="text-align:left;">
-											<div class="col-md-4"></div>
-											<div class="col-md-4">
-												<label>Packaging Type </label>
-												<div>
-													<?php
-													$options = array("0" => 'Select Packaging Type');
-													//print_r(  $options);
-
-													if (!empty($TaxType)) {
-														foreach ($TaxType as $SID) :
-
-
-															$options[$SID->ConfigValue] =  $SID->ConfigValue;
-														endforeach;
-													}
-
-													echo form_dropdown('EditPackagingType', $options, set_value('EditPackagingType'), 'id="EditPackagingType"', 'class="form-control "');
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>Packaging Rate </label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtEditPackaging', 'value' => set_value('txtEditPackaging'), 'id' => 'txtEditPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>Packaging Amt <?php echo "($INRSYM)" ?> </label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-										<div class="col-md-12">
-											<div class="col-md-4"></div>
-											<div class="col-md-4">
-												<label>Freight Type </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('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight"', 'class="form-control "');
-													?>
-												</div>
-											</div>
-											<div class="col-md-2" id="EditTripsValue" style="display:none;">
-												<label>NO Of Trips</label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>Freight Rate </label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>Freight Amt <?php echo "($INRSYM)" ?></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-										<div class="col-md-12" id="SGSTEditModel">
-											    <div class="col-md-8"></div>
-												<div class="col-md-2">
-													<label>SGST In %</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
-											<div class="col-md-12" id="IGSTEditModel" style="display:none;">
-												<div class="col-md-8"></div>
-												<div class="col-md-2">
-													<label>IGST In %</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>IGST Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
-										<div class="col-md-12">
-											<div class="col-md-8"></div>
-											<div class="col-md-2">
-												<label>CGST In %</label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-										
-										<div class="col-md-12">
-											<div class="col-md-8"></div>
-											<div class="col-md-4">
-												<label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtEditInsurance', 'value' => set_value('txtEditInsurance'), 'id' => 'txtEditInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateEditTotalValue(1);', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-
-
-										</div>
-
-
-										<div class="col-md-12">
-											<div class="col-md-8"></div>
-											<div class="col-md-4">
-												<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-
-
-
-										</div>
-										<div class="col-md-12">
-											<div class="col-md-12">
-												<label><?php echo "Revenue Description"; ?></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
-													echo form_textarea($data);;
-													?>
-												</div>
-											</div>
-										</div>
-										<div class="col-md-3 col-md-offset-9"><br />
-											<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
-											<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
-
-										</div>
-
-									</div>
-									<br /><br />
-									<!-- footer for revenue po -->
-									<div class="modal-footer">
-
+										<?php } ?>
 									</div>
 								</div>
+								<div class="form-row">
+									<table id="revenueTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+										<thead style="background-color: #ddd;">
+											<tr>
+												<th>SNo</th>
+												<th>Requisition No</th>
+												<th>Item Code</th>
+												<th>Item Description</th>
+												<th>Quantity</th>
+												<th>UOM</th>
+												<th>Rate <?php echo "($INRSYM)" ?></th>
+												<th>Basic Amount <?php echo "($INRSYM)" ?></th>
+												<th>Tax Amount <?php echo "($INRSYM)" ?></th>
+												<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
+												<!-- <th>Actual Quantity</th>
+													<th>Received Quantity</th>
+													<th>Pending Quantity</th> -->
+												<th>Action</th>
+											</tr>
+										</thead>
+										<tbody id='RevenueAppend'>
+											<?php
+											if (!empty($POItem)) {
+												$index = 0;
 
-						</div>
-						</form>
-					</div>
-				</div>
-				</br>
-				<div id="VIEWREVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="overflow-y:scroll !important">
-					<div class="modal-dialog">
-						<!-- Modal content-->
-						<form>
-							<div class="modal-content" style="width:1070px;">
-								<div class="modal-header">
-									<center>
-										<h4>View Revenue Purchase Order Line Item </h4>
-									</center>
-								</div>
-								<div align="left">
+												foreach ($POItem as $record) {
+													$index = $index + 1;
+											?>
+													<tr id="<?php echo $index; ?>">
+														<td align="left"><?php echo $index; ?></td>
+														<td><?php echo $record->ReqNo ?></td>
+														<td><?php echo $record->MaterialCode ?></td>
+														<td><?php echo $record->MaterialName ?></td>
+														<td align="right"><?php echo $record->Quantity ?></td>
+														<td><?php echo $record->UOM ?></td>
+														<td align="right"><?php echo $record->Rate ?></td>
 
-									<div class="col-md-12">
-										<div class="col-md-3">
-											<label>Req No<span class="badge mandatory">*</span></label>
-											<div>
-												<?php
+														<td align="right"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>
 
-												$data = array('name' => 'ViewReqNo', 'value' => set_value('ViewReqNo'), 'id' => 'ViewReqNo',  'class' => 'form-control', 'readonly' => 'true');
-												echo form_input($data);
-												?>
-											</div>
-										</div>
-
-										<div class="col-md-3">
-											<label>Department Name</label>
-											<div class="form-group">
-												<?php
-												$data = array('name' => 'ViewdeptName', 'value' => set_value('ViewdeptName'), 'id' => 'ViewdeptName',  'class' => 'form-control', 'readonly' => 'true');
-												echo form_input($data);
-												?>
-											</div>
-										</div>
-										<div class="col-md-3">
-											<label>Cost Center Code</label>
-											<div class="form-group">
-												<?php
-												$data = array('name' => 'ViewCostCenter', 'value' => set_value('ViewCostCenter'), 'id' => 'ViewCostCenter',  'class' => 'form-control', 'readonly' => 'true');
-												echo form_input($data);
-												?>
-											</div>
-										</div>
-										<div class="col-md-3">
-											<label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
-											<div class="form-group">
-												<?php
-												$data = array('name' => 'ViewAvlBudAmt', 'value' => set_value('ViewAvlBudAmt'), 'id' => 'ViewAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-												echo form_input($data);
-												?>
-											</div>
-										</div>
-									</div>
-									<div class="col-md-12">
-										<div class="col-md-2">
-											<label>Item Code<span class="badge mandatory">*</span></label>
-											<div>
-
-												<?php
-												$data = array('name' => 'ViewMaterialCode', 'value' => set_value('ViewMaterialCode'), 'id' => 'ViewMaterialCode',  'class' => 'form-control num', 'readonly' => 'true');
-												echo form_input($data);
-												?>
-											</div>
-										</div>
-
-										<div class="col-md-2">
-											<label>Item Name</label>
-											<div class="form-group">
-												<?php
-												$data = array('name' => 'ViewItemName', 'value' => set_value('ViewItemName'), 'id' => 'ViewItemName',  'class' => 'form-control', 'readonly' => 'true');
-												echo form_input($data);
-												?>
-											</div>
-										</div>
-										<div class="col-md-2">
-											<label>UOM</label>
-											<div class="form-group">
-												<?php
-												$data = array('name' => 'ViewUOM', 'value' => set_value('ViewUOM'), 'id' => 'ViewUOM',  'class' => 'form-control', 'readonly' => 'true');
-												echo form_input($data);
-												?>
-											</div>
-										</div>
-										<div class="col-md-6" style="padding:0px;">
-											<div class="col-md-3">
-												<label>Quantity<span class="badge mandatory">*</span></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'ViewQuantity', 'value' => set_value('ViewQuantity'), 'id' => 'ViewQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'readonly' => 'true');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-3">
-												<label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-3">
-												<label>Per</label> <?php
-																	$data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer',  'class' => 'form-control', 'readonly' => 'true');
-																	echo form_input($data); ?>
-											</div>
-											<div class="col-md-3">
-												<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtViewBasicValue', 'value' => set_value('txtViewBasicValue'), 'id' => 'txtViewBasicValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-									</div>
-									<!-- --------------------------------------- -->
-
-									<!-- --------------------------------------- -->
-									<div class="col-md-12" style="padding:0px;">
-
-										<div class="col-md-12">
-											<div class="col-md-4"></div>
-											<div class="col-md-4">
-												<label>Discount Type </label>
-												<div>
-
-													<?php
-													$data = array('name' => 'ViewDiscountType', 'value' => set_value('ViewDiscountType'), 'id' => 'ViewDiscountType',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>Discount Rate </label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtViewDiscount', 'value' => set_value('txtViewDiscount'), 'id' => 'txtViewDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'readonly' => 'true');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label><?php echo "Discounted Amt In ($INRSYM)"; ?></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtViewAfterDiscount', 'value' => set_value('txtViewAfterDiscount'), 'id' => 'txtViewAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;', 'readonly' => 'true');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-
-										<div class="col-md-12" style="text-align:left;">
-											<div class="col-md-4"></div>
-											<div class="col-md-4">
-												<label>Packaging Type </label>
-												<div>
-
-													<?php
-													$data = array('name' => 'ViewPackagingType', 'value' => set_value('ViewPackagingType'), 'id' => 'ViewPackagingType',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>Packaging Rate </label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtViewPackaging', 'value' => set_value('txtViewPackaging'), 'id' => 'txtViewPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'readonly' => 'true');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label><?php echo "Packaging Amt ($INRSYM)"; ?> </label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtViewAfterPackaging', 'value' => set_value('txtViewAfterPackaging'), 'id' => 'txtViewAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-
-										<div class="col-md-12">
-											<div class="col-md-4"></div>
-											<div class="col-md-4">
-												<label>Freight Type </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 "');
-													?>
-												</div>
-											</div>
-											<div class="col-md-2" id="ViewTripsValue" style="display:none;">
-												<label>NO Of Trips</label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'ViewNOOfTrips', 'value' => set_value('ViewNOOfTrips'), 'id' => 'ViewNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(2);');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>Freight Rate </label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'onchange' => 'calculateFreight(2);');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label><?php echo "Freight Amt ($INRSYM)"; ?> </label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtViewAfterFreight', 'value' => set_value('txtViewAfterFreight'), 'id' => 'txtViewAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-
-										<div class="col-md-12">
-											<div class="col-md-8"></div>
-											<div class="col-md-2">
-												<label>CGST In %</label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'ViewCGST', 'value' => set_value('tViewCGST'), 'id' => 'ViewCGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateCST(0);', 'readonly' => 'true',);
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'ViewAfterCGST', 'value' => set_value('ViewAfterCGST'), 'id' => 'ViewAfterCGST',  'class' => 'form-control num', 'readonly' => 'true');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-
-										<div class="col-md-12" id="SGSTViewModel">
-											   <div class="col-md-8"></div>
-												<div class="col-md-2">
-													<label>SGST In %</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'ViewSGST', 'value' => set_value('ViewSGST'), 'id' => 'ViewSGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateGST(0);', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'ViewAfterSGST', 'value' => set_value('ViewAfterSGST'), 'id' => 'ViewAfterSGST',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-										</div>
-										<div class="col-md-12" id="IGSTViewModel" style="display:none;">
-												<div class="col-md-8"></div>
-												<div class="col-md-2">
-													<label>IGST In %</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'ViewIGST', 'value' => set_value('tViewIGST'), 'id' => 'ViewIGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(0);', 'readonly' => 'true',);
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>IGST Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'ViewAfterIGST', 'value' => set_value('ViewAfterIGST'), 'id' => 'ViewAfterIGST',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-										</div>
-
-										<div class="col-md-12">
-											<div class="col-md-8"></div>
-											<div class="col-md-4">
-												<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtViewInsurance', 'value' => set_value('txtViewInsurance'), 'id' => 'txtViewInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'readonly' => 'true');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-
-										<div class="col-md-12">
-											<div class="col-md-8"></div>
-											<div class="col-md-4"> <label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'txtViewTotalOrderValue', 'value' => set_value('txtViewTotalOrderValue'), 'id' => 'txtViewTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-										</div>
-										<div class="col-md-12">
-											<div class="col-md-12">
-												<label><?php echo "Revenue Description"; ?></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'View_Service_Description', 'value' => set_value('View_Service_Description'), 'id' => 'View_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100', 'readonly' => 'true');
-													echo form_textarea($data);
-													?>
-												</div>
-											</div>
-										</div>
-										<div class="col-md-3 col-md-offset-9"><br />
-
-											<a class="btn btn-success ViewRevenue" ID="ViewRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
-										</div>
-
-									</div>
-
-									<!-- footer for revenue po -->
-									<div class="modal-footer">
-
-									</div>
-								</div>
-
-							</div>
-						</form>
-					</div>
-				</div>
-
-				<div class="box-body">
-					<table id="revenueTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-						<thead style="background-color: #ddd;">
-							<tr>
-								<th>SNo</th>
-								<th>Requisition No</th>
-								<th>Item Code</th>
-								<th>Item Description</th>
-								<th>Quantity</th>
-								<th>UOM</th>
-								<th>Rate <?php echo "($INRSYM)" ?></th>
-								<th>Basic Amount <?php echo "($INRSYM)" ?></th>
-								<th>Tax Amount <?php echo "($INRSYM)" ?></th>
-								<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
-								<!-- <th>Actual Quantity</th>
-									<th>Received Quantity</th>
-									<th>Pending Quantity</th> -->
-								<th>Action</th>
-							</tr>
-						</thead>
-
-						<tbody id='RevenueAppend'>
-							<?php
-							if (!empty($POItem)) {
-								$index = 0;
-
-								foreach ($POItem as $record) {
-									$index = $index + 1;
-							?>
-									<tr id="<?php echo $index; ?>">
-										<td align="left"><?php echo $index; ?></td>
-										<td><?php echo $record->ReqNo ?></td>
-										<td><?php echo $record->MaterialCode ?></td>
-										<td><?php echo $record->MaterialName ?></td>
-										<td align="right"><?php echo $record->Quantity ?></td>
-										<td><?php echo $record->UOM ?></td>
-										<td align="right"><?php echo $record->Rate ?></td>
-
-										<td align="right"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>
-
-										<td align="right"><?php echo $record->Taxamount ?></td>
-										<td align="right"><?php echo $record->TotalValue ?></td>
-										<!-- <td align="right"><?php echo $record->Quantity ?></td>
+														<td align="right"><?php echo $record->Taxamount ?></td>
+														<td align="right"><?php echo $record->TotalValue ?></td>
+														<!-- <td align="right"><?php echo $record->Quantity ?></td>
 											<td align="right"><?php echo $record->ReceivedQuantity ?></td>
 											<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
-										<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 '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 '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 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo htmlentities($record->MaterialName); ?>" />
-										<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
-										<input align="right" 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 align="right" 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 align="right" type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'service_description' . $index ?>" id="<?php echo 'service_description' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
+														<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 '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 '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 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo htmlentities($record->MaterialName); ?>" />
+														<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
+														<input align="right" 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 align="right" 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 align="right" type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'service_description' . $index ?>" id="<?php echo 'service_description' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
 
-										<input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'RevenueCgst' . $index ?>" id="<?php echo 'RevenueCgst' . $index ?>" value="<?php echo $record->CGST; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'RevenueAfterCgst' . $index ?>" id="<?php echo 'RevenueAfterCgst' . $index ?>" value="<?php echo $record->AfterCGST; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'RevenueSgst' . $index ?>" id="<?php echo 'RevenueSgst' . $index ?>" value="<?php echo $record->SGST; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'RevenueAfterSgst' . $index ?>" id="<?php echo 'RevenueAfterSgst' . $index ?>" value="<?php echo $record->AfterSGST; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'RevenueIgst' . $index ?>" id="<?php echo 'RevenueIgst' . $index ?>" value="<?php echo $record->IGST; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'RevenueAfterIgst' . $index ?>" id="<?php echo 'RevenueAfterIgst' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'NoOfTrip' . $index ?>" id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
-										<input align="right" type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
-										<?php
+														<input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueCgst' . $index ?>" id="<?php echo 'RevenueCgst' . $index ?>" value="<?php echo $record->CGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueAfterCgst' . $index ?>" id="<?php echo 'RevenueAfterCgst' . $index ?>" value="<?php echo $record->AfterCGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueSgst' . $index ?>" id="<?php echo 'RevenueSgst' . $index ?>" value="<?php echo $record->SGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueAfterSgst' . $index ?>" id="<?php echo 'RevenueAfterSgst' . $index ?>" value="<?php echo $record->AfterSGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueIgst' . $index ?>" id="<?php echo 'RevenueIgst' . $index ?>" value="<?php echo $record->IGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueAfterIgst' . $index ?>" id="<?php echo 'RevenueAfterIgst' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'NoOfTrip' . $index ?>" id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
+														<?php
 
-										if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
-											<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+														if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
+															<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+															<?php
+														} else { ?>
+															<td> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
+
+														<?php
+														} ?>
+													</tr>
+												<?php
+
+
+													$totBasicAmt  = $totBasicAmt + $record->BasicValue;
+													$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
+													$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
+													$totCgst  = $totCgst + $record->AfterCGST;
+													$totSgst  = $totSgst + $record->AfterSGST;
+													$totIgst  = $totIgst + $record->AfterIGST;
+
+													$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
+													$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
+													$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
+												}
+												?>
 											<?php
-										} else { ?>
-											<td> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
 
-										<?php
-										} ?>
-									</tr>
-								<?php
-
-
-									$totBasicAmt  = $totBasicAmt + $record->BasicValue;
-									$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
-									$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
-									$totCgst  = $totCgst + $record->AfterCGST;
-									$totSgst  = $totSgst + $record->AfterSGST;
-									$totIgst  = $totIgst + $record->AfterIGST;
-
-									$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
-									$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
-									$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
-								}
-								?>
-							<?php
-
-							}
-							?>
-						</tbody>
-					</table>
-				</div>
-				<!-- /.box-body -->
-
-
-				<div class="row">
-					<div class="col-md-12">
-						<div class="col-md-3">
-							<label>Basic Amount <?php echo "($INRSYM)" ?></label>
-
-							<?php
-							$data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount', number_format($totBasicAmt, 2, '.', '')), 'id' => 'txtTotBasicAmount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-							echo form_input($data);
-							?>
-
-
-						</div>
-						<div class="col-md-3">
-							<label>Total Discount Amount <?php echo "($INRSYM)" ?></label>
-
-							<?php
-							$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($totDiscountAmt, 2, '.', '')), 'id' => 'txtTotalDiscount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="col-md-3" id="TotSCST">
-							<label>Total SGST Amount <?php echo "($INRSYM)" ?></label>
-
-							<?php
-							$data = array('name' => 'txtTotalSGST', 'value' => set_value('txtTotalSGST', number_format($totSgst, 2, '.', '')), 'id' => 'txtTotalSGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="col-md-3" id="TotICST" style="display:none;">
-							<label>Total IGST Amount <?php echo "($INRSYM)" ?> </label>
-
-							<?php
-							$data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST', number_format($totIgst, 2, '.', '')), 'id' => 'txtTotalIGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="col-md-3">
-							<label>Total CGST Amount <?php echo "($INRSYM)" ?> </label>
-
-							<?php
-							$data = array('name' => 'txtTotalCGST', 'value' => set_value('txtTotalCGST', number_format($totCgst, 2, '.', '')), 'id' => 'txtTotalCGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-							echo form_input($data);
-							?>
-
-						</div>
-					</div>
-					<div class="col-md-12">
-
-
-						<div class="col-md-3">
-							<label>Total Packaging Amount <?php echo "($INRSYM)" ?></label>
-
-							<?php
-							$data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing', number_format($totPackagingAmt, 2, '.', '')), 'id' => 'txtTotalPackaing',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="col-md-3">
-							<label>Total Insurance Amount <?php echo "($INRSYM)" ?></label>
-
-							<?php
-							$data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance', number_format($totInsuranceAmt, 2, '.', '')), 'id' => 'txtTotalInsurance',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-							echo form_input($data);
-							?>
-
-
-						</div>
-						<div class="col-md-3">
-							<label>Total Freight Amount <?php echo "($INRSYM)" ?></label>
-
-							<?php
-							$data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', number_format($totFreightAmt, 2, '.', '')), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="col-md-3">
-							<label>Total Order Amount <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($totOrderSummaryAmt, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-
-					<div class="col-md-12">
-						<div class="col-md-12">
-							<label>Special Instructions </label> <?php
-																	$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction',  'class' => 'form-control');
-																	echo form_textarea($data);
-																	?>
-							<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
-						</div>
-					</div>
-					<!--  -->
-
-					<div class="col-md-12" id="splpodiv" style="display:none;">
-						<div class="col-md-12"><label>Special po Table List</label>
-
-							<table id="table2" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
-								<thead style="background-color: #ddd;">
-									<tr>
-										<!--   <th>Bill No </th>  -->
-										<!-- <th>Materials</th>        -->
-										<th>Delivery Challan No</th>
-										<th>Delivery Challan Date</th>
-										<th>MaterialReceived Date </th>
-										<th>Vehicle No</th>
-										<th>Courier No</th>
-										<!--  <th>IGRNO</th> -->
-										<!--  <th>File</th> -->
-										<th>Action</th>
-									</tr>
-								</thead>
-								<tbody id="spl">
-									<?php
-									if (!empty($getdata)) {
-										foreach ($getdata as $row => $gd) {
-
-									?>
-											<tr id="lastvalue">
-
-												<td><?php echo $gd->DeliveryChellanOrInvoiceNo ?></td>
-												<td><?php $date = new DateTime($gd->DeliveryChellanDate);
-													echo $date->format('d-m-Y'); ?></td>
-												<td><?php $date = new DateTime($gd->MaterialRcvdDate);
-													echo $date->format('d-m-Y'); ?></td>
-												<td><?php echo $gd->VehicleNo ?></td>
-												<td><?php echo $gd->CourierNo ?></td>
-
-												<input type="hidden" id="igrno" value="<?= $gd->IGRNO ?>">
-												<input type="hidden" id="billnos<?= $row ?>" value="<?= isset($gd->BillNo) ? $gd->BillNo : "" ?>">
-												<input type="hidden" id="file<?= $row ?>" value="<?= isset($gd->FilePath) ? $gd->FilePath : "" ?>">
-												<input type="hidden" id="deliveryinvoiceno<?= $row ?>" value="<?= $gd->DeliveryChellanOrInvoiceNo ?>">
-												<input type="hidden" id="deliverydate<?= $row ?>" value="<?= $gd->DeliveryChellanDate ?>">
-												<input type="hidden" id="vehicleno<?= $row ?>" value="<?= $gd->VehicleNo ?>">
-												<input type="hidden" id="courierno<?= $row ?>" value="<?= $gd->CourierNo ?>">
-												<input type="hidden" id="MaterialRcvdDate<?= $row ?>" value="<?= $gd->MaterialRcvdDate ?>">
-
-												<td><span onclick="openmodel(<?= $row ?>);"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to Edit the Revenue SplPO details"></i></span>
-
-												</td>
-											</tr>
-									<?php
-										}
-									}
-									?>
-								</tbody>
-							</table>
-						</div>
-
-						<div class="col-md-12"><!-- <label>Special po Table List</label> -->
-							<p> </p>
-							<table id="table3" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
-								<div class="col-md-12" style="padding-bottom: 10px;">
-
-									<div class="col-md-offset-10 col-md-8">
-
-										<input type="button" class="btn btn-success" id="addmorebutton" value=" ADD FILES.."><br>
-
-									</div>
-
-									<div id="newdiv"></div>
-									<input type="hidden" name="hidecounter" id="hidecounter" value="0" />
-									<input type="hidden" name="hideconstant" id="hideconstant" value="0" />
-									<input type="hidden" name="hiddenIGRNO" id="hiddenIGRNO" value="<?php echo $IGRNO; ?>" />
-
-								</div>
-								<thead>
-									<tr>
-										<th>Bill No </th>
-
-										<th>File</th>
-										<th>Action</th>
-									</tr>
-								</thead>
-								<tbody id="spl">
-									<?php
-									if (!empty($billfile)) {
-
-										foreach ($billfile as $row => $gd) {
-											if (!empty($gd->BillNo)) {
-												$index = $row + 1;
-									?>
-												<tr id="lastvalue">
-													<td><?php echo $gd->BillNo ?></td>
-
-													<td><?php echo (!empty($gd->FilePath)) ? $gd->FilePath : "No File"; ?></td>
-													<!-- <input type="hidden" id="hiddenigrno" value="<?php $gd->IGRNO ?>"> -->
-													<input type="hidden" id="billnos<?= $index ?>" value="<?= $gd->BillNo ?>">
-													<input type="hidden" id="file<?= $index ?>" name='file' value="<?= $gd->FilePath ?>">
-
-
-
-
-
-
-
-
-
-
-													<td><span onclick="openbillmodel(<?php echo $index ?>);"><i class="fa fa-pencil" 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>
-					</div>
+											?>
+										</tbody>
+									</table>
+								</div>
+								<div class="form-row">
+									<div class="form-group col-md-3">
+										<label>Basic Amount <?php echo "($INRSYM)" ?></label>
 
-
-					<!--##################################################################   -->
-					<?php if (!empty($update)) { ?>
-						<div class="col-md-12" id="editpodiv">
-							<div class="col-md-12"><label>Editable POScreen</label>
-								<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
-									<thead style="background-color: #ddd;">
-										<tr>
-											<th>Sno</th>
-											<th>PONO</th>
-
-											<th>LineItemNo</th>
-											<th>Entity</th>
-											<th>OldValue</th>
-											<th>NewValue</th>
-											<th>UpdatedBy</th>
-											<th>UpdateOn</th>
-
-										</tr>
-									</thead>
-
-
-									<tbody>
 										<?php
-										if (!empty($getlogpodtl)) {
-
-											$inde = 0;
-											foreach ($getlogpodtl as $oldpo) {
-												$inde = $inde + 1;
+										$data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount', number_format($totBasicAmt, 2, '.', '')), 'id' => 'txtTotBasicAmount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+										echo form_input($data);
 										?>
-												<tr id="<?php echo $inde; ?>">
-
-													<td><?php echo $inde; ?></td>
-													<td><?php echo $oldpo->PONO ?></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>
+									</div>
+									<div class="form-group col-md-3">
+										<label>Total Discount Amount <?php echo "($INRSYM)" ?></label>
 
-													<td><?php $date = new DateTime($oldpo->UpdatedOn);
-														echo $date->format('d-m-Y'); ?></td>
+										<?php
+										$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($totDiscountAmt, 2, '.', '')), 'id' => 'txtTotalDiscount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+										echo form_input($data);
+										?>
+
+									</div>
+									<div class="form-group col-md-3" id="TotSCST">
+										<label>Total SGST Amount <?php echo "($INRSYM)" ?></label>
+
+										<?php
+										$data = array('name' => 'txtTotalSGST', 'value' => set_value('txtTotalSGST', number_format($totSgst, 2, '.', '')), 'id' => 'txtTotalSGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+										echo form_input($data);
+										?>
+
+									</div>
+									<div class="form-group col-md-3" id="TotICST" style="display:none;">
+										<label>Total IGST Amount <?php echo "($INRSYM)" ?> </label>
+
+										<?php
+										$data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST', number_format($totIgst, 2, '.', '')), 'id' => 'txtTotalIGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+										echo form_input($data);
+										?>
+
+									</div>
+									<div class="form-group col-md-3">
+										<label>Total CGST Amount <?php echo "($INRSYM)" ?> </label>
+
+										<?php
+										$data = array('name' => 'txtTotalCGST', 'value' => set_value('txtTotalCGST', number_format($totCgst, 2, '.', '')), 'id' => 'txtTotalCGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+										echo form_input($data);
+										?>
+
+									</div>
+								</div>
+								<div class="form-row">
+									<div class="form-group col-md-3">
+										<label>Total Packaging Amount <?php echo "($INRSYM)" ?></label>
+
+										<?php
+										$data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing', number_format($totPackagingAmt, 2, '.', '')), 'id' => 'txtTotalPackaing',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+										echo form_input($data);
+										?>
+
+									</div>
+									<div class="form-group col-md-3">
+										<label>Total Insurance Amount <?php echo "($INRSYM)" ?></label>
+
+										<?php
+										$data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance', number_format($totInsuranceAmt, 2, '.', '')), 'id' => 'txtTotalInsurance',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+										echo form_input($data);
+										?>
 
 
+									</div>
+									<div class="form-group col-md-3">
+										<label>Total Freight Amount <?php echo "($INRSYM)" ?></label>
+
+										<?php
+										$data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', number_format($totFreightAmt, 2, '.', '')), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+										echo form_input($data);
+										?>
+
+									</div>
+									<div class="form-group col-md-3">
+										<label>Total Order Amount <?php echo "($INRSYM)" ?></label>
+										<?php
+										$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($totOrderSummaryAmt, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<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');
+																				echo form_textarea($data);
+																				?>
+										<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
+									</div>
+								</div>
+								<div class="form-row" id="splpodiv" style="display:none;">
+									<div class="form-group col-md-12"><label>Special po Table List</label>
+
+										<table id="table2" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
+											<thead style="background-color: #ddd;">
+												<tr>
+													<!--   <th>Bill No </th>  -->
+													<!-- <th>Materials</th>        -->
+													<th>Delivery Challan No</th>
+													<th>Delivery Challan Date</th>
+													<th>MaterialReceived Date </th>
+													<th>Vehicle No</th>
+													<th>Courier No</th>
+													<!--  <th>IGRNO</th> -->
+													<!--  <th>File</th> -->
+													<th>Action</th>
 												</tr>
-										<?php
-											}
-										}
-										?>
-									</tbody>
-								<?php } else {
-							} ?>
-								</table>
-							</div>
-						</div>
-						<!-- Revenue Special PO Modal Starts Here -->
-						<div id="EditRevenueSplPOModel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel">
-							<div class="modal-dialog">
-								<?php
-								$date = isset($getdata[0]->DeliveryChellanDate) ? format_date($getdata[0]->DeliveryChellanDate, 0, 'd-m-Y') : null;
-								$mrcdate = isset($getdata[0]->MaterialRcvdDate) ? format_date($getdata[0]->MaterialRcvdDate, 0, 'd-m-Y') : null;
-								?>
+											</thead>
+											<tbody id="spl">
+												<?php
+												if (!empty($getdata)) {
+													foreach ($getdata as $row => $gd) {
 
-								<div class="modal-content" style="width:950px;">
-									<div class="modal-header">
-										<h4 class="modal-title">Update <?php echo isset($getdata[0]->BillNo) ? $getdata[0]->BillNo : "" ?> Bill Details</h4>
+												?>
+														<tr id="lastvalue">
+
+															<td><?php echo $gd->DeliveryChellanOrInvoiceNo ?></td>
+															<td><?php $date = new DateTime($gd->DeliveryChellanDate);
+																echo $date->format('d-m-Y'); ?></td>
+															<td><?php $date = new DateTime($gd->MaterialRcvdDate);
+																echo $date->format('d-m-Y'); ?></td>
+															<td><?php echo $gd->VehicleNo ?></td>
+															<td><?php echo $gd->CourierNo ?></td>
+
+															<input type="hidden" id="igrno" value="<?= $gd->IGRNO ?>">
+															<input type="hidden" id="billnos<?= $row ?>" value="<?= isset($gd->BillNo) ? $gd->BillNo : "" ?>">
+															<input type="hidden" id="file<?= $row ?>" value="<?= isset($gd->FilePath) ? $gd->FilePath : "" ?>">
+															<input type="hidden" id="deliveryinvoiceno<?= $row ?>" value="<?= $gd->DeliveryChellanOrInvoiceNo ?>">
+															<input type="hidden" id="deliverydate<?= $row ?>" value="<?= $gd->DeliveryChellanDate ?>">
+															<input type="hidden" id="vehicleno<?= $row ?>" value="<?= $gd->VehicleNo ?>">
+															<input type="hidden" id="courierno<?= $row ?>" value="<?= $gd->CourierNo ?>">
+															<input type="hidden" id="MaterialRcvdDate<?= $row ?>" value="<?= $gd->MaterialRcvdDate ?>">
+
+															<td><span onclick="openmodel(<?= $row ?>);"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to Edit the Revenue SplPO details"></i></span>
+
+															</td>
+														</tr>
+												<?php
+													}
+												}
+												?>
+											</tbody>
+										</table>
 									</div>
-									<form class="tagForm" id="tag-form" method="post" enctype="multipart/form-data">
-										<div class="modal-body" style="padding:0px;">
-											<div class="col-md-12">
-												<div class="col-md-4 pad"><strong>Delivery Challan /Inv No</strong>
-													<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" class="form-control" value="<?php echo isset($getdata[0]->DeliveryChellanOrInvoiceNo) ? $getdata[0]->DeliveryChellanOrInvoiceNo : null ?>" onkeypress="return isNumberKey(event)">
-												</div>
-												<div class="col-md-4 pad"><strong>Delivery Challan /Inv Date</strong>
 
-													<?php
-													$data = array('name' => 'InvDate', 'value' => set_value('InvDate', $date), 'id' => 'InvDate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => '');
-													echo form_input($data);
-													?>
-												</div>
-												<div class="col-md-4 pad"> <strong>Material Received Date</strong>
-													<?php
-													$data = array('name' => 'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate', $mrcdate), 'id' => 'MaterialRcvdDate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => '');
-													echo form_input($data);
-													?>
+									<div class="form-row"><!-- <label>Special po Table List</label> -->
+										<p> </p>
+										<table id="table3" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
+											<div class="form-row" style="padding-bottom: 10px;">
 
+												<div class="col-md-offset-10 col-md-8">
 
+													<input type="button" class="btn btn-success" id="addmorebutton" value=" ADD FILES.."><br>
 
 												</div>
+
+												<div id="newdiv"></div>
+												<input type="hidden" name="hidecounter" id="hidecounter" value="0" />
+												<input type="hidden" name="hideconstant" id="hideconstant" value="0" />
+												<input type="hidden" name="hiddenIGRNO" id="hiddenIGRNO" value="<?php echo $IGRNO; ?>" />
+
 											</div>
+											<thead>
+												<tr>
+													<th>Bill No </th>
 
-											<div class="col-md-12">
+													<th>File</th>
+													<th>Action</th>
+												</tr>
+											</thead>
+											<tbody id="spl">
+												<?php
+												if (!empty($billfile)) {
 
-												<div class="col-md-4 pad"><strong>Vehicle No</strong>
-													<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="<?php echo isset($getdata[0]->VehicleNo) ? $getdata[0]->VehicleNo : null; ?>">
-												</div>
-												<div class="col-md-4 pad"><strong>Courier No</strong>
-													<input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="<?php echo isset($getdata[0]->CourierNo) ? $getdata[0]->CourierNo : null; ?>">
-												</div>
-												<div class="col-md-4" id="QualityChecked"><strong>Is Quality Check Required</strong>
-													<div class="radio">
-														<label><input type="radio" name="Quality" checked="checked" value='0' id="Quality">Yes</label>
-													</div>
-													<div class="radio">
-														<label><input type="radio" name="Quality" id="Quality" value='1'>No</label>
-													</div>
-												</div>
-											</div>
+													foreach ($billfile as $row => $gd) {
+														if (!empty($gd->BillNo)) {
+															$index = $row + 1;
+												?>
+															<tr id="lastvalue">
+																<td><?php echo $gd->BillNo ?></td>
+
+																<td><?php echo (!empty($gd->FilePath)) ? $gd->FilePath : "No File"; ?></td>
+																<!-- <input type="hidden" id="hiddenigrno" value="<?php $gd->IGRNO ?>"> -->
+																<input type="hidden" id="billnos<?= $index ?>" value="<?= $gd->BillNo ?>">
+																<input type="hidden" id="file<?= $index ?>" name='file' value="<?= $gd->FilePath ?>">
 
 
-										</div><!-- /.modal body -->
-
-										<div class="modal-footer">
-											<div class="col-md-12 text-right">
-
-												<div class="col-md-4 col-md-offset-8">
-													<a class="btn btn-success" onclick="splupdate()">&nbsp;&nbsp;<span class="bold">Update</span>
-													</a>
-													<a class="btn btn-success" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
-												</div>
-											</div>
-										</div><!-- /.modal footer -->
-									</form>
-								</div><!-- /.modal content -->
-							</div><!-- /.modal dialog -->
-						</div><!-- /#filemodal -->
-						<!-- Revenue Special PO Modal Ends Here -->
-						<!-- Revenue bill Modal Starts Here -->
-						<div id="billModel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel">
-							<div class="modal-dialog">
 
 
-								<div class="modal-content" style="width:950px;">
-									<div class="modal-header">
-										<h4 class="modal-title">Update Bill Details</h4>
+
+
+
+
+
+
+																<td><span onclick="openbillmodel(<?php echo $index ?>);"><i class="fas fa-pencil-alt" 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>
-									<form class="tagForm" id="tag-form" method="post" enctype="multipart/form-data">
-										<div class="modal-body" style="padding:0px;">
-
-
-
-											<div class="col-md-12">
-												<div class="col-md-5">
-
-
-													<input type="file" size="20" input accept=".docx,.pdf,.doc.JPG,.PNG,.jpg" id="billimag" name="images" onChange="filecheck();" />
-													<label for="images">Select file <br /><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
-												</div>
-											</div>
-											<input type="hidden" name="hideoldfile" id="hideoldfile" class="form-control" readonly>
-											<input type="hidden" name="hidebillno" id="hidebillno" class="form-control" readonly>
-										</div><!-- /.modal body -->
-
-										<div class="modal-footer">
-											<div class="col-md-12 text-right">
-												<div class="col-md-4 col-md-offset-8">
-													<a class="btn btn-success" onclick="splpoupdate()">&nbsp;&nbsp;<span class="bold">Update</span>
-
-														<a class="btn btn-success" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
-												</div>
-											</div>
-										</div><!-- /.modal footer -->
-									</form>
-								</div><!-- /.modal content -->
-							</div><!-- /.modal dialog -->
-						</div><!-- /#filemodal -->
-						<!-- Revenue Special PO Modal Ends Here -->
-						<div class="row" style="padding: 2% 0%">
-							<div class="col-md-5 col-md-offset-7" align="right"><br />
-								<div>
-									<input type="file" name="POFile" id="POFile">
-									<?php if ($PrePOFile) { ?>
-										<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
-									<?php } ?>
-									<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
-								</div>
-								<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" value="<?php echo $index; ?>">
-								<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-								<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
-								<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
-								<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
-								<div class="btn-container" style="text-align: right;">
-								<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-									<a class="btn btn-cancel Save" 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-success 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-approved Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-								<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
-									<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&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>
-								<?php } ?>
 								</div>
+								<!--##################################################################   -->
+								<?php if (!empty($update)) { ?>
+									<div class="form-row" id="editpodiv">
+										<div class="form-row"><label>Editable POScreen</label>
+											<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
+												<thead style="background-color: #ddd;">
+													<tr>
+														<th>Sno</th>
+														<th>PONO</th>
+
+														<th>LineItemNo</th>
+														<th>Entity</th>
+														<th>OldValue</th>
+														<th>NewValue</th>
+														<th>UpdatedBy</th>
+														<th>UpdateOn</th>
+
+													</tr>
+												</thead>
+												<tbody>
+													<?php
+													if (!empty($getlogpodtl)) {
+
+														$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>
 
 
-
-							</div><br />
-						</div>
-
-						<div class="row">
-						  <div class="col-md-12">
-							<div class="col-md-6">
-
-								<label>Request On : </label><?php echo $Reqon; ?><br />
-								<?php if ($RequesterName != '' || $RequesterName != null) { ?>
-									<label>Request By : </label><?php echo $RequesterName; ?><br />
-								<?php } ?>
-								<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];
+																<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 {
-																	echo $StatusName;
-																}
-															} else {
-																echo "Status not provided";
-															}
-															?>
+																	$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>
+
+																<td><?php $date = new DateTime($oldpo->UpdatedOn);
+																	echo $date->format('d-m-Y'); ?></td>
+
+
+															</tr>
+													<?php
+														}
+													}
+													?>
+												</tbody>
+											</table>
+										</div>
+									</div>
+								<?php } else {
+								} ?>
+								<div class="form-row">
+									<div class="form-group col-md-12" align="right"><br />
+										<div>
+											<input type="file" name="POFile" id="POFile">
+											<?php if ($PrePOFile) { ?>
+												<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
+											<?php } ?>
+											<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+										</div>
+										<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" value="<?php echo $index; ?>">
+										<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+										<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+										<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
+										<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
+										<div class="btn-container" style="text-align: right;">
+											<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+												<a class="btn btn-cancel Save" 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-success 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-soft-primary waves-effect waves-light Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+											<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
+												<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&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>
+											<?php } ?>
+										</div>
+
+
+
+									</div><br />
+								</div>
+								<div class="form-row">
+										<div class="form-group col-md-12">
+
+											<label>Request On : </label><?php echo $Reqon; ?><br />
+											<?php if ($RequesterName != '' || $RequesterName != null) { ?>
+												<label>Request By : </label><?php echo $RequesterName; ?><br />
+											<?php } ?>
+											<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 $StatusName;
+																		}
+																	} else {
+																		echo "Status not provided";
+																	}
+																	?>
+										</div>
+								</div>
 							</div>
-						  </div>
-				        </div>
-				</div>
-			</div>
-
-		
-
 						</div> <!-- end card body-->
 					</div> <!-- end card -->
 				</div><!-- end col-->
@@ -3995,6 +2615,1241 @@ if (!empty($getlogpodtl)) {
 		</div> <!-- container -->
 	</div> <!-- content -->
 </div>
+<!-- Add Model for revenue po -->
+<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
+	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">×</button>
+			</div>
+			<form>
+				<div class="modal-body p-4">
+					<div class="form-row">
+						<div class="form-group col-md-3">
+							<label>Req No<span class="text-danger">*</span></label>
+							<div>
+								<?php
+								$RL = array("0" => 'Select Req No');
+								if (!empty($RequistionDetails)) {
+									foreach ($RequistionDetails as $SID) :
+										$RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
+									endforeach;
+								}
+
+								echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
+								?>
+							</div>
+						</div>
+
+						<div class="form-group col-md-3">
+							<label>Department Name</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-3">
+							<label>Cost Center Code</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-3">
+							<label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-2">
+							<label>Item Code<span class="text-danger">*</span></label>
+							<div>
+								<?php
+								$options = array("0" => 'Item Code');
+
+
+								echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control"');
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Item Name</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-1">
+							<label>UOM</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Quantity<span class="text-danger">*</span></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-1">
+							<label>Per</label> <?php
+												$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
+												echo form_input($data); ?>
+						</div>
+						<div class="form-group col-md-2">
+							<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-4"></div>
+						<div class="form-group col-md-4">
+							<label>Discount Type </label>
+							<div>
+								<?php
+								$options = array("0" => 'Select Discount Type');
+								//print_r(  $options);
+								if (!empty($TaxType)) {
+									foreach ($TaxType as $SID) :
+										$options[$SID->ConfigValue] =  $SID->ConfigValue;
+									endforeach;
+								}
+								echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType" class="form-control"');
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Discount Rate </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();calculateDiscount(0);');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount'), 'id' => 'txtAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row" style="text-align:left;">
+						<div class="form-group col-md-4"></div>
+						<div class="form-group col-md-4">
+							<label>Packaging Type </label>
+							<div>
+								<?php
+								$options = array("0" => 'Select Packaging Type');
+								//print_r(  $options);
+								if (!empty($TaxType)) {
+									foreach ($TaxType as $SID) :
+										$options[$SID->ConfigValue] =  $SID->ConfigValue;
+									endforeach;
+								}
+								echo form_dropdown('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType" class="form-control "');
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Packaging Rate </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging'), 'id' => 'txtAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-4"></div>
+						<div class="form-group col-md-4">
+							<label>Freight Type </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('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2" id="TripsValue" style="display:none;">
+							<label>NO Of Trips</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Freight Rate </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Freight Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-2">
+							<label>CGST In %</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row" id="SGSTAddModel">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-2">
+							<label>SGST In %</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>SGST Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0), 'id' => 'AfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row" style="text-align:left;">
+						<div id="IGSTAddModel" style="display:none;">
+							<div class="form-group col-md-8"></div>
+							<div class="form-group col-md-2">
+								<label>IGST In %</label>
+								<div class="form-group">
+									<?php
+									$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-group col-md-2">
+								<label>IGST Amt <?php echo "($INRSYM)" ?></label>
+								<div class="form-group">
+									<?php
+									$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-4">
+							<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance'), 'id' => 'txtInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-4">
+							<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
+								<?php
+								$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+						</div>
+
+
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-12">
+							<label><?php echo "Revenue Description"; ?></label>
+							<?php
+							$data = array('name' => 'Add_Service_Description', 'value' => set_value('Add_Service_Description'), 'id' => 'Add_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
+							echo form_textarea($data);;
+							?>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
+					<a class="btn btn-info waves-effect waves-light font AddRevenue" ID="AddRevenue">&nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
+				</div>
+			</form>
+		</div>
+	</div>
+</div><!-- /.modal -->
+
+<!-- Edit Model for revenue po -->
+<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
+	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">×</button>
+			</div>
+			<form>
+				<div class="modal-body p-4">
+
+
+					<div class="form-row">
+						<div class="form-group col-md-3">
+							<label>Req No<span class="text-danger">*</span></label>
+							<div>
+								<?php
+
+								$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+
+						<div class="form-group col-md-3">
+							<label>Department Name</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-3">
+							<label>Cost Center Code</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-3">
+							<label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-2">
+							<label>Item Code<span class="text-danger">*</span></label>
+							<div>
+								<?php
+								$options = array("0" => 'Item Code');
+
+
+								echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
+								?>
+							</div>
+						</div>
+
+						<div class="form-group col-md-2">
+							<label>Item Name</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-1">
+							<label>UOM</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+							<div class="form-group col-md-2">
+								<label>Quantity<span class="text-danger">*</span></label>
+								<div class="form-group">
+									<?php
+									$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-group col-md-2">
+								<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
+								<div class="form-group">
+									<?php
+									$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-group col-md-1">
+								<label>Per</label> <?php
+													$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
+													echo form_input($data); ?>
+							</div>
+							<div class="form-group col-md-2">
+								<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
+								<div class="form-group">
+									<?php
+									$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+					</div>
+
+
+					<div class="form-row">
+						<div class="form-group col-md-4"></div>
+						<div class="form-group col-md-4">
+							<label>Discount Type </label>
+							<div>
+								<?php
+								$options = array("0" => 'Select Discount Type');
+								//print_r(  $options);
+
+								if (!empty($TaxType)) {
+									foreach ($TaxType as $SID) :
+
+
+										$options[$SID->ConfigValue] =  $SID->ConfigValue;
+									endforeach;
+								}
+
+								echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"');
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Discount Rate </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();calculateDiscount(1);', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Discounted Amt <?php echo "($INRSYM)" ?> </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row" style="text-align:left;">
+						<div class="form-group col-md-4"></div>
+						<div class="form-group col-md-4">
+							<label>Packaging Type </label>
+							<div>
+								<?php
+								$options = array("0" => 'Select Packaging Type');
+								//print_r(  $options);
+
+								if (!empty($TaxType)) {
+									foreach ($TaxType as $SID) :
+
+
+										$options[$SID->ConfigValue] =  $SID->ConfigValue;
+									endforeach;
+								}
+
+								echo form_dropdown('EditPackagingType', $options, set_value('EditPackagingType'), 'id="EditPackagingType" class="form-control"');
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Packaging Rate </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtEditPackaging', 'value' => set_value('txtEditPackaging'), 'id' => 'txtEditPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Packaging Amt <?php echo "($INRSYM)" ?> </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-4"></div>
+						<div class="form-group col-md-4">
+							<label>Freight Type </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('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"');
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
+							<label>NO Of Trips</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Freight Rate </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Freight Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row" id="SGSTEditModel">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-2">
+							<label>SGST In %</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>SGST Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row" id="IGSTEditModel" style="display:none;">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-2">
+							<label>IGST In %</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>IGST Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-2">
+							<label>CGST In %</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-4">
+							<label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtEditInsurance', 'value' => set_value('txtEditInsurance'), 'id' => 'txtEditInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateEditTotalValue(1);', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+
+
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-4">
+							<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+
+
+
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-12">
+							<label><?php echo "Revenue Description"; ?></label>
+								<?php
+								$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
+								echo form_textarea($data);;
+								?>
+						</div>
+					</div>
+
+
+
+				</div>
+				<div class="modal-footer">
+					<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
+					<a class="btn btn-info waves-effect waves-light EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
+				</div>
+			</form>
+
+		</div>
+	</div>
+</div><!-- /.modal -->
+
+<!-- View Model for revenue po -->
+<div id="VIEWREVENUE" class="modal fade" tabindex="-1" role="dialog"
+	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">View Revenue Purchase Order Line Item</h4>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">×</button>
+			</div>
+			<form>
+				<div class="modal-body">
+					<div class="form-row">
+						<div class="form-group col-md-3">
+							<label>Req No<span class="text-danger">*</span></label>
+
+							<?php
+
+							$data = array('name' => 'ViewReqNo', 'value' => set_value('ViewReqNo'), 'id' => 'ViewReqNo',  'class' => 'form-control', 'readonly' => 'true');
+							echo form_input($data);
+							?>
+
+						</div>
+						<div class="form-group col-md-3">
+							<label>Department Name</label>
+
+							<?php
+							$data = array('name' => 'ViewdeptName', 'value' => set_value('ViewdeptName'), 'id' => 'ViewdeptName',  'class' => 'form-control', 'readonly' => 'true');
+							echo form_input($data);
+							?>
+
+						</div>
+						<div class="form-group col-md-3">
+							<label>Cost Center Code</label>
+
+							<?php
+							$data = array('name' => 'ViewCostCenter', 'value' => set_value('ViewCostCenter'), 'id' => 'ViewCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+							echo form_input($data);
+							?>
+
+						</div>
+						<div class="form-group col-md-3">
+							<label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
+
+							<?php
+							$data = array('name' => 'ViewAvlBudAmt', 'value' => set_value('ViewAvlBudAmt'), 'id' => 'ViewAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+							echo form_input($data);
+							?>
+
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-2">
+							<label>Item Code<span class="text-danger">*</span></label>
+							<div>
+
+								<?php
+								$data = array('name' => 'ViewMaterialCode', 'value' => set_value('ViewMaterialCode'), 'id' => 'ViewMaterialCode',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Item Name</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewItemName', 'value' => set_value('ViewItemName'), 'id' => 'ViewItemName',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-1">
+							<label>UOM</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewUOM', 'value' => set_value('ViewUOM'), 'id' => 'ViewUOM',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-1">
+							<label>Quantity<span class="text-danger">*</span></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewQuantity', 'value' => set_value('ViewQuantity'), 'id' => 'ViewQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Per</label> <?php
+												$data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer',  'class' => 'form-control', 'readonly' => 'true');
+												echo form_input($data); ?>
+						</div>
+						<div class="form-group col-md-2">
+							<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtViewBasicValue', 'value' => set_value('txtViewBasicValue'), 'id' => 'txtViewBasicValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-4"></div>
+						<div class="form-group col-md-4">
+							<label>Discount Type </label>
+							<div>
+
+								<?php
+								$data = array('name' => 'ViewDiscountType', 'value' => set_value('ViewDiscountType'), 'id' => 'ViewDiscountType',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Discount Rate </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtViewDiscount', 'value' => set_value('txtViewDiscount'), 'id' => 'txtViewDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label><?php echo "Discounted Amt In ($INRSYM)"; ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtViewAfterDiscount', 'value' => set_value('txtViewAfterDiscount'), 'id' => 'txtViewAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-4"></div>
+						<div class="form-group col-md-4">
+							<label>Packaging Type </label>
+							<div>
+
+								<?php
+								$data = array('name' => 'ViewPackagingType', 'value' => set_value('ViewPackagingType'), 'id' => 'ViewPackagingType',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Packaging Rate </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtViewPackaging', 'value' => set_value('txtViewPackaging'), 'id' => 'txtViewPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label><?php echo "Packaging Amt ($INRSYM)"; ?> </label>
+							<?php
+							$data = array('name' => 'txtViewAfterPackaging', 'value' => set_value('txtViewAfterPackaging'), 'id' => 'txtViewAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-4"></div>
+						<div class="form-group col-md-4">
+							<label>Freight Type </label>
+							<?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"');
+							?>
+						</div>
+						<div class="form-group col-md-2" id="ViewTripsValue" style="display:none;">
+							<label>NO Of Trips</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewNOOfTrips', 'value' => set_value('ViewNOOfTrips'), 'id' => 'ViewNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(2);');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Freight Rate </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'onchange' => 'calculateFreight(2);');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label><?php echo "Freight Amt ($INRSYM)"; ?> </label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtViewAfterFreight', 'value' => set_value('txtViewAfterFreight'), 'id' => 'txtViewAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-2">
+							<label>CGST In %</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewCGST', 'value' => set_value('tViewCGST'), 'id' => 'ViewCGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateCST(0);', 'readonly' => 'true',);
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewAfterCGST', 'value' => set_value('ViewAfterCGST'), 'id' => 'ViewAfterCGST',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row" id="SGSTViewModel">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-2">
+							<label>SGST In %</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewSGST', 'value' => set_value('ViewSGST'), 'id' => 'ViewSGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateGST(0);', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>SGST Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewAfterSGST', 'value' => set_value('ViewAfterSGST'), 'id' => 'ViewAfterSGST',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row" id="IGSTViewModel" style="display:none;">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-2">
+							<label>IGST In %</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewIGST', 'value' => set_value('tViewIGST'), 'id' => 'ViewIGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(0);', 'readonly' => 'true',);
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>IGST Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'ViewAfterIGST', 'value' => set_value('ViewAfterIGST'), '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"></div>
+						<div class="form-group col-md-4">
+							<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtViewInsurance', 'value' => set_value('txtViewInsurance'), 'id' => 'txtViewInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-4"> <label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtViewTotalOrderValue', 'value' => set_value('txtViewTotalOrderValue'), 'id' => 'txtViewTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+					<div class="form-row">
+						<div class="form-group col-md-12">
+							<label><?php echo "Revenue Description"; ?></label>
+							<?php
+							$data = array('name' => 'View_Service_Description', 'value' => set_value('View_Service_Description'), 'id' => 'View_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100', 'readonly' => 'true');
+							echo form_textarea($data);
+							?>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<a class="btn btn-success ViewRevenue" ID="ViewRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
+				</div>
+			</form>
+		</div>
+	</div>
+</div><!-- /.modal -->
+
+<!-- Modal for Excise Duty Calculation-->
+<div id="ExciseDutyCalModel" class="modal fade" tabindex="-1" role="dialog"
+	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">Excise Duty Calculation On</h4>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">×</button>
+			</div>
+
+			<form>
+				<div class="modal-body p-4">
+					<div class="radio">
+						<label><input type="radio" name="optExcise" checked="checked" value="0" id="optExcise">From Basic Amount</label>
+					</div>
+					<div class="radio">
+						<label><input type="radio" name="optExcise" value="1" id="optExcise">Basic Amount - Discount Amount</label>
+					</div>
+					<div class="radio">
+						<label><input type="radio" name="optExcise" value="2" id="optExcise">(Basic Amount - Discount Amount ) + Packing Cost</label>
+					</div>
+					<div class="radio">
+						<label><input type="radio" name="optExcise" value="3" id="optExcise">Basic Amount + Packing Cost</label>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<a class="btn btn-secondary waves-effect" ID="ExciseOption" onclick="SetExciseCalculation();">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+					<a class="btn btn-info waves-effect waves-light" data-dismiss="modal" value="Cancel">Cancel</a>
+				</div>
+
+			</form>
+
+		</div>
+	</div>
+</div><!-- /.modal -->
+
+<!-- Modal for Vat Calculation -->
+<div id="VatCalModel" class="modal fade" tabindex="-1" role="dialog"
+	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">Vat Calculation On</h4>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">×</button>
+			</div>
+			<form>
+				<div class="modal-body p-4">
+
+					<div class="radio">
+						<label><input type="radio" name="optVat" checked="checked" value="0" id="optVat">Basic Amount</label>
+					</div>
+					<div class="radio">
+						<label><input type="radio" name="optVat" value="1" id="optVat">Excise Duty</label>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<a class="btn btn-secondary waves-effect" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+					<a class="btn btn-info waves-effect waves-light" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				</div>
+			</form>
+
+		</div>
+	</div>
+</div><!-- /.modal -->
+
+<!-- Modal for CST Calculation -->
+<div id="CSTCalModel" class="modal fade" tabindex="-1" role="dialog"
+	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">CST Calculation On</h4>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">×</button>
+			</div>
+			<form>
+				<div class="modal-body p-4">
+
+					<div class="radio">
+						<label><input type="radio" name="optCST" checked="checked" value="0" id="optCST">Basic Amount</label>
+					</div>
+					<div class="radio">
+						<label><input type="radio" name="optCST" value="1" id="optCST">Excise Duty</label>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<a class="btn btn-secondary waves-effect" ID="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+					<a class="btn btn-info waves-effect waves-light" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				</div>
+			</form>
+
+		</div>
+	</div>
+</div><!-- /.modal -->
+<!-- Revenue Special PO Modal Starts Here -->
+<div id="EditRevenueSplPOModel" class="modal fade" tabindex="-1" role="dialog"
+	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">Update <?php echo isset($getdata[0]->BillNo) ? $getdata[0]->BillNo : "" ?> Bill Details</h4>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">×</button>
+			</div>
+			<?php
+			$date = isset($getdata[0]->DeliveryChellanDate) ? format_date($getdata[0]->DeliveryChellanDate, 0, 'd-m-Y') : null;
+			$mrcdate = isset($getdata[0]->MaterialRcvdDate) ? format_date($getdata[0]->MaterialRcvdDate, 0, 'd-m-Y') : null;
+			?>
+			<form class="tagForm" id="tag-form" method="post" enctype="multipart/form-data">
+				<div class="modal-body p-4">
+
+					<div class="form-row">
+						<div class="col-md-4 pad"><strong>Delivery Challan /Inv No</strong>
+							<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" class="form-control" value="<?php echo isset($getdata[0]->DeliveryChellanOrInvoiceNo) ? $getdata[0]->DeliveryChellanOrInvoiceNo : null ?>" onkeypress="return isNumberKey(event)">
+						</div>
+						<div class="col-md-4 pad"><strong>Delivery Challan /Inv Date</strong>
+
+							<?php
+							$data = array('name' => 'InvDate', 'value' => set_value('InvDate', $date), 'id' => 'InvDate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => '');
+							echo form_input($data);
+							?>
+						</div>
+						<div class="col-md-4 pad"> <strong>Material Received Date</strong>
+							<?php
+							$data = array('name' => 'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate', $mrcdate), 'id' => 'MaterialRcvdDate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => '');
+							echo form_input($data);
+							?>
+
+
+
+						</div>
+					</div>
+
+					<div class="form-row">
+
+						<div class="col-md-4 pad"><strong>Vehicle No</strong>
+							<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="<?php echo isset($getdata[0]->VehicleNo) ? $getdata[0]->VehicleNo : null; ?>">
+						</div>
+						<div class="col-md-4 pad"><strong>Courier No</strong>
+							<input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="<?php echo isset($getdata[0]->CourierNo) ? $getdata[0]->CourierNo : null; ?>">
+						</div>
+						<div class="form-group col-md-4" id="QualityChecked"><strong>Is Quality Check Required</strong>
+							<div class="radio">
+								<label><input type="radio" name="Quality" checked="checked" value='0' id="Quality">Yes</label>
+							</div>
+							<div class="radio">
+								<label><input type="radio" name="Quality" id="Quality" value='1'>No</label>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<a class="btn btn-secondary waves-effect" onclick="splupdate()">&nbsp;&nbsp;<span class="bold">Update</span>
+					</a>
+					<a class="btn btn-info waves-effect waves-light" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
+				</div>
+			</form>
+
+		</div>
+	</div>
+</div><!-- /.modal -->
+<!-- Revenue Special PO Modal Ends Here -->
+<!-- Revenue bill Modal Starts Here -->
+<div id="billModel" class="modal fade" tabindex="-1" role="dialog"
+	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title">Update Bill Details</h4>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">×</button>
+			</div>
+			<?php
+			$date = isset($getdata[0]->DeliveryChellanDate) ? format_date($getdata[0]->DeliveryChellanDate, 0, 'd-m-Y') : null;
+			$mrcdate = isset($getdata[0]->MaterialRcvdDate) ? format_date($getdata[0]->MaterialRcvdDate, 0, 'd-m-Y') : null;
+			?>
+			<form class="tagForm" id="tag-form" method="post" enctype="multipart/form-data">
+				<div class="modal-body p-4">
+
+					<div class="form-row">
+						<div class="form-group col-md-5">
+
+
+							<input type="file" size="20" input accept=".docx,.pdf,.doc.JPG,.PNG,.jpg" id="billimag" name="images" onChange="filecheck();" />
+							<label for="images">Select file <br /><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
+						</div>
+					</div>
+					<input type="hidden" name="hideoldfile" id="hideoldfile" class="form-control" readonly>
+					<input type="hidden" name="hidebillno" id="hidebillno" class="form-control" readonly>
+				</div>
+				<div class="modal-footer">
+					<a class="btn btn-secondary waves-effect" onclick="splpoupdate()">&nbsp;&nbsp;<span class="bold">Update</span>
+						<a class="btn btn-info waves-effect waves-light" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
+				</div>
+			</form>
+		</div>
+	</div>
+</div><!-- /.modal -->
+<!-- Revenue Special PO Modal Ends Here -->
 <script type="text/html" id="RevenueList">
 	<tr id="<%=index%>">
 		<td align="left"><%=index%></td>
@@ -4011,7 +3866,7 @@ if (!empty($getlogpodtl)) {
 		<td align="right"><%=ReceivedQuantity%></td>
 		<td align="right"><%=PendingQuantity%></td>
 		<td>
-			<a data-target='#EDITREVENUE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+			<a data-target='#EDITREVENUE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
 
 
 		</td>
@@ -5388,19 +5243,19 @@ if (!empty($getlogpodtl)) {
 			div.id = "divid";
 			div.className = "row";
 			//alert(counter);
-			div.innerHTML = '<div class="col-md-12">' +
-				// '<div class="col-md-3">'+
+			div.innerHTML = '<div class="form-row">' +
+				// '<div class="form-group col-md-3">'+
 				// '<label>File Name</label>'+
 				// '<input type="text" id="maint_filename'+counterConstant+'" name="filename'+counterConstant+'"  class="form-control" onkeypress="return false;" readonly/>'+
 				// '</div>'+
-				'<div class="col-md-3">' +
+				'<div class="form-group col-md-3">' +
 				'<label><br></label>' +
 				'<input type="file" name="browseFiles" id="images' + counter + '" onchange="Copyfilename(this.name); "><br>' +
 				'</div>' +
-				// '<div class="col-md-3">'
+				// '<div class="form-group col-md-3">'
 				// '<label><br><br></label>'+
 				// '<button class="btn btn-danger remove remove_this" id="removebtn'+counterConstant+'" onclick="removeRow(this.id)"><i class="fa fa-trash"></i> Remove</button></div>'+
-				'<div class="col-md-2">' +
+				'<div class="form-group col-md-2">' +
 				'<label><br><br></label>' +
 				'<button class="btn btn-success add add_this" id="addbtn" onclick="addRow()">ADD</button></div>' +
 				'</div>' +
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index be9b7434..84c3d250 100644
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -1,6 +1,7 @@
 <?php
 $insuranceStatus = array(
-	array("name" => "NO", "value" => "0"), array("name" => "YES", "value" => "1")
+	array("name" => "NO", "value" => "0"),
+	array("name" => "YES", "value" => "1")
 );
 $DeliverOption = '';
 $SupId = '';
@@ -675,13 +676,8 @@ foreach ($PaymentTerms as $TER) {
 	.centered input {
 		margin: 0 5px;
 	}
-
-	.mandatory {
-		color: red;
-		text-align: right;
-		background-color: white;
-	}
 </style>
+
 <div class="content-page">
 	<div class="content">
 		<!-- Start Content-->
@@ -702,883 +698,876 @@ foreach ($PaymentTerms as $TER) {
 					<div class="card">
 						<div class="card-body">
 
-								<?php
-								$attributes = array('class' => 'form-label-left ServicePO ', 'name'  => 'ServicePO', 'id'  => 'ServicePO', 'enctype' => 'multipart/form-data');
-								echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
+							<?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="container-fluid">
-									<div class="row">
-										<div class="col-md-12">
-											<div class="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;
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<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 class="form-group">
+
+											<?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');
+
+										?>
+
+									</div>
+									<div class="form-group col-md-3">
+										<label>Supplier Address</label>
+										<div class="form-group">
+											<?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>
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<div class="form-group col-md-3">
+										<label>Work Status<span class="text-danger">*</span></label>
+										<?php
+										if (!empty($WorkStatus)) {
+											//print_r($WorkStatus);
+											foreach ($WorkStatus as $WorkSID) :
+												if ($WrkStatus == $WorkSID->StatusCode) {
+
+													$optionsWork[$WorkSID->StatusCode] =  $WorkSID->StatusName;
 												}
-												echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"');
-												?>
-											</div>
-											<div class="col-md-3">
-												<label>Purchase Order Type</label>
-												<div class="form-group">
-
-													<?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="col-md-3">
-												<label>Select Supplier<span class="badge mandatory">*</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;
+											endforeach;
+											foreach ($WorkStatus as $SID) :
+												if ($WrkStatus != $SID->StatusName) {
+													$optionsWork[$SID->StatusCode] =  $SID->StatusName;
 												}
-
-												echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2');
-
-												?>
-
-											</div>
-											<div class="col-md-3">
-												<label>Supplier Address</label>
-												<div class="form-group">
-													<?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>
+											endforeach;
+										}
+										echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus"', 'required="true"', 'class="form-control select2');
+										?>
 									</div>
-									<div class="row">
-										<div class="col-md-12">
-											<div class="col-md-3">
-												<label>Work Status<span class="badge mandatory">*</span></label>
-												<?php
-												if (!empty($WorkStatus)) {
-													//print_r($WorkStatus);
-													foreach ($WorkStatus as $WorkSID) :
-														if ($WrkStatus == $WorkSID->StatusCode) {
-
-															$optionsWork[$WorkSID->StatusCode] =  $WorkSID->StatusName;
-														}
-													endforeach;
-													foreach ($WorkStatus as $SID) :
-														if ($WrkStatus != $SID->StatusName) {
-															$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="col-md-3">
-												<b><u>Select Delivery By<span class="badge mandatory">*</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="col-md-3" id="Deliverydtdiv">
-												<label>Delivery Date<span class="badge mandatory">*</span></label>
-												<?php if ($DeliverOption == 1) {
-													$Deliverydt = null;
-												} ?>
-												<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt ?>">
-												<div class="form-group">
-													<?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="col-md-3" id="Schedulediv" style="display:none;">
-												<label>Schedule By<span class="badge mandatory">*</span></label>
-												<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule ?>">
-												<?php
-												$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverSchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
-												echo Form_textarea($data);
-												?>
-
-											</div>
-											<div class="col-md-3">
-												<label>Delivery Address</label>
-												<div class="form-group">
-													<?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>
-									<div class="row">
-										<div class="col-md-12">
-											<div class="col-md-3">
-												<label>Purchase Order Date</label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-3">
-												<label>Mode Of Shipment</label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $ModeOfShipment), 'id' => 'addmodeofshipment',  'class' => 'form-control');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-3">
-												<label>Contact Reference</label>
-												<div class="form-group">
-
-													<?php
-													$data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $SupplierReference), 'id' => 'amendsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-3">
-												<label>Supplier's Offer No</label>
-												<div class="form-group">
-
-													<?php
-													$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $SuppliersOfferNo), 'id' => 'amendsupplierofferno',  'class' => 'form-control');
-													echo form_input($data);
-													?>
-												</div>
-
-											</div>
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-md-12">
-											<div class="col-md-3">
-												<label>Our Reference(S)</label>
-												<div class="form-group">
-
-													<?php
-													$data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $OtherReferences), 'id' => 'amendotherreference',  'class' => 'form-control');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-3">
-												<label>Service Type Options<span class="badge mandatory">*</span></label>
-												<div class="form-group">
-													<?php
-
-													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;
-													}
-
-													echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
-
-
-													?>
-												</div>
-											</div>
-											<div class="col-md-3">
-												<label>Payment Terms<span class="badge mandatory">*</span></label>
-												<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms ?>">
-												<?php
-												if (!empty($Payment)) {
-													//print_r($Payment);
-													foreach ($Payment as $pay2)
-
-														if ($Terms == $pay2->PaymentID) {
-												?>
-														<input type="hidden" id="beforePaymentTermsText" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms ?>">
-												<?php
-															$optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
-														}
-
-													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="col-md-3" id="otheroptiondiv" style="display:none;">
-												<label>Description of Payable Terms<span class="badge mandatory">*</span></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
-													echo form_input($data);
-													?>
-												</div>
-											</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="row">
-										<div class="col-md-12">
-											<div class="col-md-3">
-												<label>Insurance Options<span class="badge mandatory">*</span></label>
-												<div class="form-group">
-
-													<?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="col-md-3" id="insuranceTxtDiv" style="display:block;">
-												<label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
-												<div class="form-group">
-													<?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="col-md-3">
-												<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
-												<select id='BudgetType' name='BudgetType' 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 class="form-group col-md-3" id="Deliverydtdiv">
+										<label>Delivery Date<span class="text-danger">*</span></label>
+										<?php if ($DeliverOption == 1) {
+											$Deliverydt = null;
+										} ?>
+										<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt ?>">
+										<div class="form-group">
+											<?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>
+										<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule ?>">
+										<?php
+										$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverSchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+										echo Form_textarea($data);
+										?>
 
-									<div class="container-fluid">
-										<div style="padding-right:10px">
-											<div align="right">
-												<!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a> -->
-
-												<!-- Model for servicepo -->
-
-												<div class="modal fade" id="EDITSERVICE" role="dialog">
-													<div class="modal-dialog">
-														<!-- Modal content-->
-														<form>
-															<div class="modal-content" style="width:900px;">
-																<div class="modal-header">
-																	<center>
-																		<h4>Edit Service Purchase Order Item </h4>
-																	</center>
-																</div>
-																<div align="left">
-
-																	<div class="col-md-12">
-																		<div class="col-md-3">
-																			<label>Req No<span class="badge mandatory">*</span></label>
-																			<div>
-																				<?php
-
-																				$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-
-																			</div>
-																		</div>
-
-																		<div class="col-md-3">
-																			<label>Department Name</label>
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-																		<div class="col-md-3">
-																			<label>Cost Center Code</label>
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
-																				echo form_input($data);
-
-																				?>
-																			</div>
-																		</div>
-																		<div class="col-md-3">
-																			<label>Avail Budget Amount <?php echo $INRSYM ?></label>
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-																	</div>
-																	<div class="col-md-12">
-																		<div class="col-md-3">
-																			<label>Item Code<span class="badge mandatory">*</span></label>*</span></label>
-																			<div>
-																				<?php
-																				$options = array("0" => 'Item Code');
-																				//print_r(  $options);
-
-																				echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
-
-																				?>
-																			</div>
-																		</div>
-																		<div class="col-md-3">
-																			<label>Item Name</label>
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-
-
-
-
-																		<div class="col-md-3" id=EditotherDescription>
-																			<label>Item Description</label>
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'EditOtheritemDescription', 'value' => set_value('EditOtheritemDescription'), 'id' => 'EditOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-
-
-
-
-
-																		<div class="col-md-3">
-																			<label>UOM</label>
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-																		<div class="col-md-3">
-																			<label>Service Schedule Type</label>
-																			<div>
-																				<?php
-																				$data = array('name' => 'EditFrequency', 'value' => set_value('EditFrequency'), 'id' => 'EditFrequency',  'class' => 'form-control', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																				<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
-																			</div>
-																		</div>
-
-
-
-																	</div>
-																	<div class="col-md-12">
-
-																		<div class="col-md-3">
-																			<label>Quantity<span class="badge mandatory">*</span></label>*</span></label>
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-																		<div class="col-md-3">
-																			<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>*</span></label>
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-																		<div class="col-md-3">
-																			<label>Per</label> <?php
-																								$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer',  'class' => 'form-control');
-																								echo form_input($data); ?>
-																		</div>
-																		<div class="col-md-3">
-																			<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-
-																	</div>
-
-																	<div class="col-md-12">
-																		<div class="col-md-6" align="right">
-
-																			CGST In %
-																		</div>
-
-																		<div class="col-md-3">
-																			<div class="form-group">
-
-																				<?php
-																				$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'onkeypress' => 'return isNumberKey(event);',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()');
-																				echo form_input($data);
-																				?>
-																			</div>
-
-																		</div>
-																		<div class="col-md-3">
-																			<div class="form-group">
-
-																				<?php
-																				$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-
-																		</div>
-
-																	</div>
-																	<div class="col-md-12">
-																		<div class="col-md-6" align="right">
-
-																			SGST In %
-																		</div>
-
-																		<div class="col-md-3">
-																			<div class="form-group">
-
-																				<?php
-																				$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'SGSTchange()');
-																				echo form_input($data);
-																				?>
-																			</div>
-
-																		</div>
-																		<div class="col-md-3">
-																			<div class="form-group">
-
-																				<?php
-																				$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-
-																		</div>
-
-																	</div>
-
-																	<div class="col-md-12">
-																		<div class="col-md-6" align="right">
-
-																			IGST In %
-																		</div>
-
-																		<div class="col-md-3">
-																			<div class="form-group">
-
-																				<?php
-																				$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'IGSTchange()');
-																				echo form_input($data);
-																				?>
-																			</div>
-
-																		</div>
-																		<div class="col-md-3">
-																			<div class="form-group">
-
-																				<?php
-																				$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-
-																		</div>
-
-																	</div>
-																	<div class="col-md-12">
-																		<div class="col-md-5  col-md-offset-4" align="right">
-																			<label>Other Allowances <?php echo $INRSYM ?></label>
-																		</div>
-																		<div class="col-md-3">
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'otherallowance', 'value' => set_value('otherallowance'), 'id' => 'otherallowance', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'onchange' => 'EditRatechange()');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-																	</div>
-																	<div class="col-md-12">
-																		<div class="col-md-5  col-md-offset-4" align="right">
-																			<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
-																		</div>
-																		<div class="col-md-3">
-																			<div class="form-group">
-																				<?php
-																				$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-																	</div>
-																	<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
-																		<label>Service Description </label> <?php $data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-																											echo form_textarea($data);
-																											?> <input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction" value="<?php echo $ServiceMaterialDescription; ?>">
-																	</div>
-																	<br />
-
-																	<div class="modal-footer">
-																		<div class="col-md-12">
-																			<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-																			<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
-																		</div>
-																	</div>
-																</div>
-														</form>
-
-													</div>
-												</div>
-											</div>
-
+									</div>
+									<div class="form-group col-md-3">
+										<label>Delivery Address</label>
+										<div class="form-group">
+											<?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>
-										<br />
-										<div class="box-body" style="margin-top: -2%;">
-											<table id="ServiceTable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-												<thead>
-													<tr>
-														<th>SNo</th>
-														<th>Requisition No</th>
-														<th>Item Code</th>
-														<th>Item Name</th>
-														<th>Quantity</th>
-														<th>UOM</th>
-														<th>Rate<?php echo $INRSYM ?></th>
-														<th>Basic Amount<?php echo $INRSYM ?></th>
-														<th>Tax Amount<?php echo $INRSYM ?></th>
-														<th>Total Order Amount<?php echo $INRSYM ?></th>
-														<th>Actual Quantity</th>
-														<th>Received Quantity</th>
-														<th>Pending Quantity</th>
-														<th>Action</th>
-													</tr>
-												</thead>
-
-												<tbody id='ServiceAppend'>
-													<?php
-
-													if (!empty($POItem)) {
-														//print_r($POItem);
-
-
-														$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;
-															}
-
-													?>
-															<tr id="<?php echo $index; ?>">
-																<td align="left"><?php echo $index; ?></td>
-																<td><?php echo $record->ReqNo ?></td>
-																<td><?php echo $record->MaterialCode ?></td>
-																<td><?php echo $record->MaterialName ?></td>
-																<td align="right"><?php echo $record->Quantity ?></td>
-																<td><?php echo $record->UOM ?></td>
-																<td align="right"><?php echo $record->Rate ?></td>
-																<td align="right"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
-																<td align="right"><?php echo $record->Taxamount ?></td>
-																<td align="right"><?php echo $record->TotalValue ?></td>
-																<td align="right"><?php echo $record->Quantity ?></td>
-																<td align="right"><?php echo $record->ReceivedQuantity ?></td>
-																<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
-
-
-																<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->ReqNo; ?>" />
-
-																<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 '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 '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 '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 type="hidden" name="<?php echo 'beforequantity' . $index ?>" id="<?php echo 'beforequantity' . $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 type="hidden" name="<?php echo 'beforeitemRate' . $index ?>" id="<?php echo 'beforeitemRate' . $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 'beforeCgst' . $index ?>" id="<?php echo 'beforeCgst' . $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 'beforeCgstvalue' . $index ?>" id="<?php echo 'beforeCgstvalue' . $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 'beforeSgst' . $index ?>" id="<?php echo 'beforeSgst' . $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 'beforeSgstvalue' . $index ?>" id="<?php echo 'beforeSgstvalue' . $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 'beforeIgst' . $index ?>" id="<?php echo 'beforeIgst' . $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 'beforeIgstvalue' . $index ?>" id="<?php echo 'beforeIgstvalue' . $index ?>" value="<?php echo $record->After_IGST; ?>" />
-
-																<input type="hidden" name="<?php echo 'otherallowance' . $index ?>" id="<?php echo 'otherallowance' . $index ?>" value="<?php echo $record->otherallowance; ?>" />
-
-																<input type="hidden" name="<?php echo 'beforeotherallowance' . $index ?>" id="<?php echo 'beforeotherallowance' . $index ?>" value="<?php echo $record->otherallowance; ?>" />
-
-																<input type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
-
-																<input type="hidden" name="<?php echo 'servicematerialdescription' . $index ?>" id="<?php echo 'servicematerialdescription' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
-
-																<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 'FrequencyValue' . $index ?>" id="<?php echo 'FrequencyValue' . $index ?>" value="<?php echo $FrequencyNo; ?>" />
-
-
-																<input type="hidden" name="<?php echo 'OtherServiceDescription' . $index ?>" id="<?php echo 'OtherServiceDescription' . $index ?>" value="<?php echo $record->MaterialDescription; ?>" />
-
-
-																<?php
-
-																//if($PONOStatus == PO_DRAFT) 
-																//{
-																?>
-																<td> <a data-target='#EDITSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;<!-- </a> <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>-->
-																		<?php
-																		//} else {
-																		?>
-																		<!--	<td>   <a  	data-toggle="tooltip"  href="#"><i class="fa fa-eye" data-toggle="tooltip" 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;
-															$Totalotherallowance = $Totalotherallowance + $record->otherallowance;
-															$TotalSummary = $TotalSummary + $record->TotalValue;
-
-
-															$TotalBasicAmount = $TotalBasicAmount + ($record->BasicValue * $FrequencyNo);
-														}
-														?> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index; ?>">
-													<?php
-
-													}
-													?>
-												</tbody>
-											</table>
+									</div>
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<div class="form-group col-md-3">
+										<label>Purchase Order Date</label>
+										<div class="form-group">
+											<?php
+											$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											echo form_input($data);
+											?>
 										</div>
+									</div>
+									<div class="form-group col-md-3">
+										<label>Mode Of Shipment</label>
+										<div class="form-group">
+											<?php
+											$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $ModeOfShipment), 'id' => 'addmodeofshipment',  'class' => 'form-control');
+											echo form_input($data);
+											?>
+										</div>
+									</div>
+									<div class="form-group col-md-3">
+										<label>Contact Reference</label>
+										<div class="form-group">
 
+											<?php
+											$data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $SupplierReference), 'id' => 'amendsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
+											echo form_input($data);
+											?>
+										</div>
+									</div>
+									<div class="form-group col-md-3">
+										<label>Supplier's Offer No</label>
+										<div class="form-group">
 
-										<div class="row">
-											<div class="col-md-12" style="padding:0px;">
-
-												<div class="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="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="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="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="col-md-2">
-													<label>Other Allowances <?php echo $INRSYM ?> </label>
-													<?php
-													$data = array('name' => 'ToatalOtherAllowances', 'value' => set_value('ToatalOtherAllowances', number_format($Totalotherallowance, 2, '.', '')), 'id' => 'ToatalOtherAllowances',  'class' => 'form-control num', 'readonly' => 'true');
-													echo form_input($data);
-													?>
-
-												</div>
-												<div class="col-md-2">
-													<label>Total Order Value <?php echo $INRSYM ?> </label>
-													<input type="hidden" name="preTotalordervalue" value="<?php echo $TotalSummary; ?>">
-													<?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>
-											<!--start new fields 1 sep-->
-											<div class="col-md-12">
-												<label>Description Of Service<span class="badge mandatory">*</span></label>*</label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', $DescriptionOfPo), 'id' => 'amenddescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-													echo form_textarea($data);
-													?>
-												</div>
-											</div><!--end new fields 1 sep-->
-
-											<div class="col-md-12" style="padding:0px;">
-												<div class="col-md-12">
-													<label>Scope Of Work</label> <?php
-																					$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', $ServiceDescription), 'id' => 'ScopeofWork',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-																					echo form_textarea($data);
-																					?>
-												</div>
-
-											</div>
-											<div class="col-md-12">
-												<div class="row"><br />
-													<div align="right" style="padding-right:10px">
-														<div>
-															<input type="file" name="POFile" id="POFile">
-															<?php if ($PrePOFile) { ?>
-																<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
-															<?php } ?>
-															<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
-														</div>
-														<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
-														<input type="hidden" name="txtStatus" id="txtStatus" />
-														<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-														<input type="button" class="btn btn-cancel" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
-
-														<!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
-														<a class="btn btn-success Save" ID="Submit" onclick="Save()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-
-
-													</div><br />
-												</div>
-											</div>
-											<br />
-										</div><br />
-
-										<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
-										$Reqon = $Reqon->format('d-m-Y'); ?>
-										<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 $StatusName;
-																	}
-																} else {
-																	echo "Status not provided";
-																}
-																?>
+											<?php
+											$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $SuppliersOfferNo), 'id' => 'amendsupplierofferno',  'class' => 'form-control');
+											echo form_input($data);
+											?>
+										</div>
 
 									</div>
 								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<div class="form-group col-md-3">
+										<label>Our Reference(S)</label>
+										<div class="form-group">
+
+											<?php
+											$data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $OtherReferences), 'id' => 'amendotherreference',  'class' => 'form-control');
+											echo form_input($data);
+											?>
+										</div>
+									</div>
+									<div class="form-group col-md-3">
+										<label>Service Type Options<span class="text-danger">*</span></label>
+										<div class="form-group">
+											<?php
+
+											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;
+											}
+
+											echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
+
+
+											?>
+										</div>
+									</div>
+									<div class="form-group col-md-3">
+										<label>Payment Terms<span class="text-danger">*</span></label>
+										<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms ?>">
+										<?php
+										if (!empty($Payment)) {
+											//print_r($Payment);
+											foreach ($Payment as $pay2)
+
+												if ($Terms == $pay2->PaymentID) {
+										?>
+												<input type="hidden" id="beforePaymentTermsText" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms ?>">
+										<?php
+													$optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
+												}
+
+											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 class="form-group">
+											<?php
+											$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+											echo form_input($data);
+											?>
+										</div>
+									</div>
+
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<div class="form-group col-md-3">
+										<label>Insurance Options<span class="text-danger">*</span></label>
+										<div class="form-group">
+
+											<?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 class="form-group">
+											<?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' 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>
+
+							<div align="right">
+								<!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a> -->
+
+								<!-- Model for servicepo -->
+
+								<div class="modal fade" id="EDITSERVICE" role="dialog">
+									<div class="modal-dialog">
+										<!-- Modal content-->
+										<form>
+											<div class="modal-content" style="width:900px;">
+												<div class="modal-header">
+													<center>
+														<h4>Edit Service Purchase Order Item </h4>
+													</center>
+												</div>
+												<div align="left">
+
+													<div class="form-group col-md-12">
+														<div class="form-group col-md-3">
+															<label>Req No<span class="text-danger">*</span></label>
+															<div>
+																<?php
+
+																$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+
+															</div>
+														</div>
+
+														<div class="form-group col-md-3">
+															<label>Department Name</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+														<div class="form-group col-md-3">
+															<label>Cost Center Code</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+
+																?>
+															</div>
+														</div>
+														<div class="form-group col-md-3">
+															<label>Avail Budget Amount <?php echo $INRSYM ?></label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+													</div>
+													<div class="form-group col-md-12">
+														<div class="form-group col-md-3">
+															<label>Item Code<span class="text-danger">*</span></label>*</span></label>
+															<div>
+																<?php
+																$options = array("0" => 'Item Code');
+																//print_r(  $options);
+
+																echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
+
+																?>
+															</div>
+														</div>
+														<div class="form-group col-md-3">
+															<label>Item Name</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+
+
+
+
+														<div class="form-group col-md-3" id=EditotherDescription>
+															<label>Item Description</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditOtheritemDescription', 'value' => set_value('EditOtheritemDescription'), 'id' => 'EditOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+
+
+
+
+
+														<div class="form-group col-md-3">
+															<label>UOM</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+														<div class="form-group col-md-3">
+															<label>Service Schedule Type</label>
+															<div>
+																<?php
+																$data = array('name' => 'EditFrequency', 'value' => set_value('EditFrequency'), 'id' => 'EditFrequency',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+																<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
+															</div>
+														</div>
+
+
+
+													</div>
+													<div class="form-group col-md-12">
+
+														<div class="form-group col-md-3">
+															<label>Quantity<span class="text-danger">*</span></label>*</span></label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+														<div class="form-group col-md-3">
+															<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>*</span></label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+														<div class="form-group col-md-3">
+															<label>Per</label> <?php
+																				$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer',  'class' => 'form-control');
+																				echo form_input($data); ?>
+														</div>
+														<div class="form-group col-md-3">
+															<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+
+													</div>
+
+													<div class="form-group col-md-12">
+														<div class="form-group col-md-6" align="right">
+
+															CGST In %
+														</div>
+
+														<div class="form-group col-md-3">
+															<div class="form-group">
+
+																<?php
+																$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'onkeypress' => 'return isNumberKey(event);',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()');
+																echo form_input($data);
+																?>
+															</div>
+
+														</div>
+														<div class="form-group col-md-3">
+															<div class="form-group">
+
+																<?php
+																$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+
+														</div>
+
+													</div>
+													<div class="form-group col-md-12">
+														<div class="form-group col-md-6" align="right">
+
+															SGST In %
+														</div>
+
+														<div class="form-group col-md-3">
+															<div class="form-group">
+
+																<?php
+																$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'SGSTchange()');
+																echo form_input($data);
+																?>
+															</div>
+
+														</div>
+														<div class="form-group col-md-3">
+															<div class="form-group">
+
+																<?php
+																$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+
+														</div>
+
+													</div>
+
+													<div class="form-group col-md-12">
+														<div class="form-group col-md-6" align="right">
+
+															IGST In %
+														</div>
+
+														<div class="form-group col-md-3">
+															<div class="form-group">
+
+																<?php
+																$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'IGSTchange()');
+																echo form_input($data);
+																?>
+															</div>
+
+														</div>
+														<div class="form-group col-md-3">
+															<div class="form-group">
+
+																<?php
+																$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+
+														</div>
+
+													</div>
+													<div class="form-group col-md-12">
+														<div class="col-md-5  col-md-offset-4" align="right">
+															<label>Other Allowances <?php echo $INRSYM ?></label>
+														</div>
+														<div class="form-group col-md-3">
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'otherallowance', 'value' => set_value('otherallowance'), 'id' => 'otherallowance', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'onchange' => 'EditRatechange()');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+													</div>
+													<div class="form-group col-md-12">
+														<div class="col-md-5  col-md-offset-4" align="right">
+															<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
+														</div>
+														<div class="form-group col-md-3">
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+													</div>
+													<div class="form-group col-md-12" style="padding: 0px 30px 10px 30px;">
+														<label>Service Description </label> <?php $data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+																							echo form_textarea($data);
+																							?> <input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction" value="<?php echo $ServiceMaterialDescription; ?>">
+													</div>
+													<br />
+
+													<div class="modal-footer">
+														<div class="form-group col-md-12">
+															<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+															<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
+														</div>
+													</div>
+												</div>
+										</form>
+
+									</div>
+								</div>
+							</div>
+
+							<br />
+							<table id="ServiceTable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+								<thead>
+									<tr>
+										<th>SNo</th>
+										<th>Requisition No</th>
+										<th>Item Code</th>
+										<th>Item Name</th>
+										<th>Quantity</th>
+										<th>UOM</th>
+										<th>Rate<?php echo $INRSYM ?></th>
+										<th>Basic Amount<?php echo $INRSYM ?></th>
+										<th>Tax Amount<?php echo $INRSYM ?></th>
+										<th>Total Order Amount<?php echo $INRSYM ?></th>
+										<th>Actual Quantity</th>
+										<th>Received Quantity</th>
+										<th>Pending Quantity</th>
+										<th>Action</th>
+									</tr>
+								</thead>
+
+								<tbody id='ServiceAppend'>
+									<?php
+
+									if (!empty($POItem)) {
+										//print_r($POItem);
+
+
+										$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;
+											}
+
+									?>
+											<tr id="<?php echo $index; ?>">
+												<td align="left"><?php echo $index; ?></td>
+												<td><?php echo $record->ReqNo ?></td>
+												<td><?php echo $record->MaterialCode ?></td>
+												<td><?php echo $record->MaterialName ?></td>
+												<td align="right"><?php echo $record->Quantity ?></td>
+												<td><?php echo $record->UOM ?></td>
+												<td align="right"><?php echo $record->Rate ?></td>
+												<td align="right"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
+												<td align="right"><?php echo $record->Taxamount ?></td>
+												<td align="right"><?php echo $record->TotalValue ?></td>
+												<td align="right"><?php echo $record->Quantity ?></td>
+												<td align="right"><?php echo $record->ReceivedQuantity ?></td>
+												<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
+
+
+												<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->ReqNo; ?>" />
+
+												<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 '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 '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 '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 type="hidden" name="<?php echo 'beforequantity' . $index ?>" id="<?php echo 'beforequantity' . $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 type="hidden" name="<?php echo 'beforeitemRate' . $index ?>" id="<?php echo 'beforeitemRate' . $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 'beforeCgst' . $index ?>" id="<?php echo 'beforeCgst' . $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 'beforeCgstvalue' . $index ?>" id="<?php echo 'beforeCgstvalue' . $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 'beforeSgst' . $index ?>" id="<?php echo 'beforeSgst' . $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 'beforeSgstvalue' . $index ?>" id="<?php echo 'beforeSgstvalue' . $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 'beforeIgst' . $index ?>" id="<?php echo 'beforeIgst' . $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 'beforeIgstvalue' . $index ?>" id="<?php echo 'beforeIgstvalue' . $index ?>" value="<?php echo $record->After_IGST; ?>" />
+
+												<input type="hidden" name="<?php echo 'otherallowance' . $index ?>" id="<?php echo 'otherallowance' . $index ?>" value="<?php echo $record->otherallowance; ?>" />
+
+												<input type="hidden" name="<?php echo 'beforeotherallowance' . $index ?>" id="<?php echo 'beforeotherallowance' . $index ?>" value="<?php echo $record->otherallowance; ?>" />
+
+												<input type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
+
+												<input type="hidden" name="<?php echo 'servicematerialdescription' . $index ?>" id="<?php echo 'servicematerialdescription' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
+
+												<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 'FrequencyValue' . $index ?>" id="<?php echo 'FrequencyValue' . $index ?>" value="<?php echo $FrequencyNo; ?>" />
+
+
+												<input type="hidden" name="<?php echo 'OtherServiceDescription' . $index ?>" id="<?php echo 'OtherServiceDescription' . $index ?>" value="<?php echo $record->MaterialDescription; ?>" />
+
+
+												<?php
+
+												//if($PONOStatus == PO_DRAFT) 
+												//{
+												?>
+												<td> <a data-target='#EDITSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;<!-- </a> <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>-->
+														<?php
+														//} else {
+														?>
+														<!--	<td>   <a  	data-toggle="tooltip"  href="#"><i class="fa fa-eye" data-toggle="tooltip" 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;
+											$Totalotherallowance = $Totalotherallowance + $record->otherallowance;
+											$TotalSummary = $TotalSummary + $record->TotalValue;
+
+
+											$TotalBasicAmount = $TotalBasicAmount + ($record->BasicValue * $FrequencyNo);
+										}
+										?> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index; ?>">
+									<?php
+
+									}
+									?>
+								</tbody>
+							</table>
+
+
+							<div class="form-row">
+								<div class="form-group col-md-12" style="padding:0px;">
+
+									<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($Totalotherallowance, 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>
+										<input type="hidden" name="preTotalordervalue" value="<?php echo $TotalSummary; ?>">
+										<?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>
+								<!--start new fields 1 sep-->
+								<div class="form-group col-md-12">
+									<label>Description Of Service<span class="text-danger">*</span></label>*</label>
+									<div class="form-group">
+										<?php
+										$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', $DescriptionOfPo), 'id' => 'amenddescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+										echo form_textarea($data);
+										?>
+									</div>
+								</div><!--end new fields 1 sep-->
+
+								<div class="form-group col-md-12" style="padding:0px;">
+									<div class="form-group col-md-12">
+										<label>Scope Of Work</label> <?php
+																		$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', $ServiceDescription), 'id' => 'ScopeofWork',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+																		echo form_textarea($data);
+																		?>
+									</div>
+
+								</div>
+								<div class="form-group col-md-12">
+									<div class="form-row"><br />
+										<div align="right" style="padding-right:10px">
+											<div>
+												<input type="file" name="POFile" id="POFile">
+												<?php if ($PrePOFile) { ?>
+													<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
+												<?php } ?>
+												<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+											</div>
+											<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+											<input type="hidden" name="txtStatus" id="txtStatus" />
+											<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+											<input type="button" class="btn btn-cancel" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
+
+											<!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
+											<a class="btn btn-success Save" ID="Submit" onclick="Save()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+
+
+										</div><br />
+									</div>
+								</div>
+								<br />
+							</div><br />
+
+							<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
+							$Reqon = $Reqon->format('d-m-Y'); ?>
+							<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 $StatusName;
+														}
+													} else {
+														echo "Status not provided";
+													}
+													?>
+
+
+
 
-	
 						</div> <!-- end card body-->
 					</div> <!-- end card -->
 				</div><!-- end col-->
@@ -1605,7 +1594,7 @@ foreach ($PaymentTerms as $TER) {
 		<td align="left"><%=PendingQuantity%></td>
 
 		<td>
-			<a data-target='#EDITSERVICE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+			<a data-target='#EDITSERVICE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
 
 
 		</td>
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index ae6e6f6c..f8ecc7f1 100644
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -257,11 +257,6 @@ if (!empty($getlogpodtl)) {
         margin: 0 5px;
     }
 
-    .mandatory {
-        color: red;
-        text-align: right;
-        background-color: white;
-    }
 </style>
 
 <script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
@@ -408,14 +403,14 @@ if (!empty($getlogpodtl)) {
         <!-- <section class="content"> -->
 
         <div class="box">
-            <div class="col-md-12">
+            <div class="form-group col-md-12">
                 
                
             </div>
             <div class="container-fluid">
                 <div class="row">
-                    <div class="col-md-12">
-                        <div class="col-md-3">
+                    <div class="form-group col-md-12">
+                        <div class="form-group col-md-3">
                             <label>Requistion No</label>
                             <?php
 
@@ -433,7 +428,7 @@ if (!empty($getlogpodtl)) {
 
                             ?>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Purchase Order Type</label>
                             <div class="form-group">
 
@@ -443,8 +438,8 @@ if (!empty($getlogpodtl)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
-                            <label>Select Supplier<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-3">
+                            <label>Select Supplier<span class="text-danger">*</span></label>
 
                             <?php
                             $options = array("0" => 'Select Supplier');
@@ -463,7 +458,7 @@ if (!empty($getlogpodtl)) {
                             <input type="hidden" name="newsup" id="changeSup">
 
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Supplier Address</label>
                             <div class="form-group">
                                 <?php
@@ -479,9 +474,9 @@ if (!empty($getlogpodtl)) {
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-md-12">
-                        <div class="col-md-3">
-                            <label>Currency Type<span class="badge mandatory">*</span></label>
+                    <div class="form-group col-md-12">
+                        <div class="form-group col-md-3">
+                            <label>Currency Type<span class="text-danger">*</span></label>
                             <?php
                             if (!empty($Currency)) {
 
@@ -503,16 +498,16 @@ if (!empty($getlogpodtl)) {
 
                             ?>
                         </div>
-                        <div class="col-md-3">
-                            <b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
+                        <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('Dispatch instruction', 'Dispatch instruction') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "2", 'checked' => 'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;
                                 <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1")); ?>
                             </div>
                         </div>
-                        <div class="col-md-3" id="Schedulediv" style="display:none;">
-                            <label>Schedule By <span class="badge mandatory">*</span></label>
+                        <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', $DeliverySchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
@@ -520,8 +515,8 @@ if (!empty($getlogpodtl)) {
                             ?>
 
                         </div>
-                        <div class="col-md-3" id="Deliverydtdiv">
-                            <label>Dispatch Instruction<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-3" id="Deliverydtdiv">
+                            <label>Dispatch Instruction<span class="text-danger">*</span></label>
 
                             <?php
                             // $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
@@ -532,7 +527,7 @@ if (!empty($getlogpodtl)) {
                             ?>
 
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Delivery Address</label>
                             <div class="form-group">
                                 <?php
@@ -544,11 +539,11 @@ if (!empty($getlogpodtl)) {
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-md-12">
-                        <div class="col-md-3">
+                    <div class="form-group col-md-12">
+                        <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>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <label>Exchange Rate On</label>
                             <div class="form-group">
                                 <?php
@@ -557,10 +552,10 @@ if (!empty($getlogpodtl)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
+                        <div class="form-group col-md-3">
                             <!--  <label>Exchange Rate </label> -->
 
-                            <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="badge mandatory">*</span></label>
+                            <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="text-danger">*</span></label>
                             <div class="form-group">
                                 <?php
                                 $data = array('name' => 'ExchangeRate', 'value' => set_value('ExchangeRate', $ExchangeRate), 'id' => 'ExchangeRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()');
@@ -568,8 +563,8 @@ if (!empty($getlogpodtl)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-3">
-                            <label>Place of Origin<span class="badge mandatory">*</span></label>
+                        <div class="form-group col-md-3">
+                            <label>Place of Origin<span class="text-danger">*</span></label>
                             <div class=" form-group">
                                     <?php
                                     //  $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
@@ -582,8 +577,8 @@ if (!empty($getlogpodtl)) {
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-12">
-                    <div class="col-md-3">
+                <div class="form-group col-md-12">
+                    <div class="form-group col-md-3">
                         <label>Purchase Order Date</label>
                         <div class="form-group">
                             <?php
@@ -592,7 +587,7 @@ if (!empty($getlogpodtl)) {
                             ?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
                         </div>
                     </div>
-                    <div class="col-md-3">
+                    <div class="form-group col-md-3">
                         <label>Mode Of Shipment</label>
                         <div class="form-group">
 
@@ -602,7 +597,7 @@ if (!empty($getlogpodtl)) {
                             ?>
                         </div>
                     </div>
-                    <div class="col-md-3">
+                    <div class="form-group col-md-3">
                         <label>Contact Reference</label>
                         <div class="form-group">
 
@@ -612,7 +607,7 @@ if (!empty($getlogpodtl)) {
                             ?>
                         </div>
                     </div>
-                    <div class="col-md-3">
+                    <div class="form-group col-md-3">
                         <label>Supplier's Offer No</label>
                         <div class="form-group">
 
@@ -625,8 +620,8 @@ if (!empty($getlogpodtl)) {
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-12">
-                    <div class="col-md-3">
+                <div class="form-group col-md-12">
+                    <div class="form-group col-md-3">
                         <label>Our Reference(S)</label>
                         <div class="form-group">
 
@@ -636,8 +631,8 @@ if (!empty($getlogpodtl)) {
                             ?>
                         </div>
                     </div>
-                    <div class="col-md-3">
-                        <label for="payablefrom">Import Type Options<span class="badge mandatory">*</span></label>
+                    <div class="form-group col-md-3">
+                        <label for="payablefrom">Import Type Options<span class="text-danger">*</span></label>
                         <?php // $options2 = array("0"=>'Select Import Option');       
                         if (!empty($PoTypeOptions)) {
                             foreach ($PoTypeOptions as $payment) :
@@ -658,8 +653,8 @@ if (!empty($getlogpodtl)) {
 
                         echo form_dropdown('Importoption', $options2, set_value('Importoption'), 'id="Importoption"', 'class="form-control"');                                              ?>
                     </div>
-                    <div class="col-md-3">
-                        <label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
+                    <div class="form-group col-md-3">
+                        <label for="payablefrom">Payable Terms<span class="text-danger">*</span></label>
                         <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
                         <?php if (!empty($Payment)) {
                             foreach ($Payment as $pay2)
@@ -679,8 +674,8 @@ if (!empty($getlogpodtl)) {
                         echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2');                                                    ?>
 
                     </div>
-                    <div class="col-md-3" id="otheroptiondiv" style="display:none;">
-                        <label>Description of Payable Terms<span class="badge mandatory">*</span></label>
+                    <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
+                        <label>Description of Payable Terms<span class="text-danger">*</span></label>
                         <div class="form-group">
                             <?php
 
@@ -692,9 +687,9 @@ if (!empty($getlogpodtl)) {
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-12">
-                    <div class="col-md-3">
-                        <label for="payablefrom">Insurance Option<span class="badge mandatory">*</span></label>
+                <div class="form-group col-md-12">
+                    <div class="form-group col-md-3">
+                        <label for="payablefrom">Insurance Option<span class="text-danger">*</span></label>
                         <select id='Insurance' name='Insurance'>
                             <?php if ($Insurance == 1) {
                                 $opt1 = 'YES';
@@ -709,8 +704,8 @@ if (!empty($getlogpodtl)) {
                             <option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
                         </select>
                     </div>
-                    <div class="col-md-3" id="insurancenum" style="display:none;">
-                        <label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
+                    <div class="form-group col-md-3" id="insurancenum" style="display:none;">
+                        <label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
                         <div class="form-group">
                             <?php
 
@@ -719,8 +714,8 @@ if (!empty($getlogpodtl)) {
                             ?>
                         </div>
                     </div>
-                    <div class="col-md-3">
-                        <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
+                    <div class="form-group col-md-3">
+                        <label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
                         <select id='BudgetType' name='BudgetType'>
                             <?php if ($BudgetType == 'CAPITAL') {
                                 $opt1 = 'CAPITAL';
@@ -735,7 +730,7 @@ if (!empty($getlogpodtl)) {
                             <option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
                         </select>
                     </div>
-                    <div class="col-md-3">
+                    <div class="form-group col-md-3">
                     </div>
                 </div>
             </div>
@@ -743,11 +738,11 @@ if (!empty($getlogpodtl)) {
                 <table class="table table-bordered" style="border:1px solid #333">
                     <div align="right" style="padding-right:10px">
                         <div align="right">
-                            <div class="col-md-12">
+                            <div class="form-group col-md-12">
                                 <div class="col-md-3 col-md-offset-7" align="right" style="padding:10px">
                                     <!-- <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
                                 </div>
-                                <div class="col-md-1" align="right">
+                                <div class="form-group col-md-1" align="right">
                                     <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED) { ?>
                                         <a data-toggle="modal" data-target="#importpomodel" class="btn btn-success" data-dismiss="modal" onclick="myFunction();">Add Line Item </a>
                                     <?php } ?>
@@ -772,9 +767,9 @@ if (!empty($getlogpodtl)) {
                                             </div>
                                             <div align="left">
 
-                                                <div class="col-md-12">
-                                                    <div class="col-md-3">
-                                                        <label>Req No<span class="badge mandatory" style="color:red;text-align:right;background-color: #fff
+                                                <div class="form-group col-md-12">
+                                                    <div class="form-group col-md-3">
+                                                        <label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff
  ;">*</span></label>
                                                         <div>
                                                             <?php
@@ -793,7 +788,7 @@ if (!empty($getlogpodtl)) {
                                                         </div>
                                                     </div>
 
-                                                    <div class="col-md-3">
+                                                    <div class="form-group col-md-3">
                                                         <label>Department Name</label>
                                                         <div class="form-group">
                                                             <?php
@@ -803,7 +798,7 @@ if (!empty($getlogpodtl)) {
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-3">
+                                                    <div class="form-group col-md-3">
                                                         <label>Cost Center Code</label>
                                                         <div class="form-group">
                                                             <?php
@@ -817,7 +812,7 @@ if (!empty($getlogpodtl)) {
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-3" style="padding-right: 0px;">
+                                                    <div class="form-group col-md-3" style="padding-right: 0px;">
                                                         <label>Available Budget Amount (<?php echo $INR ?>)</label>
                                                         <div class="form-group">
                                                             <?php
@@ -827,9 +822,9 @@ if (!empty($getlogpodtl)) {
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-12">
-                                                    <div class="col-md-2">
-                                                        <label>Item Code<span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                                <div class="form-group col-md-12">
+                                                    <div class="form-group col-md-2">
+                                                        <label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
 
                                                         <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                         <div>
@@ -860,7 +855,7 @@ if (!empty($getlogpodtl)) {
 
                                                     </div>
 
-                                                    <div class="col-md-2">
+                                                    <div class="form-group col-md-2">
                                                         <label>Item Name</label>
                                                         <div class="form-group">
                                                             <?php
@@ -869,7 +864,7 @@ if (!empty($getlogpodtl)) {
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+                                                    <div class="form-group col-md-2">
                                                         <label>UOM</label>
                                                         <div class="form-group">
                                                             <?php
@@ -878,9 +873,9 @@ if (!empty($getlogpodtl)) {
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-6" style="padding:0px;">
-                                                        <div class="col-md-3">
-                                                            <label>Quantity<span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                                    <div class="form-group col-md-6" style="padding:0px;">
+                                                        <div class="form-group col-md-3">
+                                                            <label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),calculateFreight(0)');
@@ -889,11 +884,11 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-3">
+                                                        <div class="form-group col-md-3">
                                                             <!-- <label>Rate </label>
  -->
 
-                                                            <!--  <P id=labelRate> --> <label id=labelRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span> </label><!-- </P> -->
+                                                            <!--  <P id=labelRate> --> <label id=labelRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span> </label><!-- </P> -->
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),calculateFreight(0)');
@@ -901,12 +896,12 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-3">
+                                                        <div class="form-group col-md-3">
                                                             <label>Per</label> <?php
                                                                                 $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
                                                                                 echo form_input($data); ?>
                                                         </div>
-                                                        <div class="col-md-3" style="padding: 0px;">
+                                                        <div class="form-group col-md-3" style="padding: 0px;">
                                                             <!-- <label>Basic Amount </label>-->
                                                             <!-- <p id=labelBasicvalue><label><?php echo "Basic Value In $Currencycode ($Value)"; ?></label></p>
  -->
@@ -923,9 +918,9 @@ if (!empty($getlogpodtl)) {
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-12">
+                                                <div class="form-group col-md-12">
 
-                                                    <div class="col-md-3">
+                                                    <div class="form-group col-md-3">
 
                                                         <!--  Basic Price in US $ per Ton : -->
                                                         <!-- <p id=labelBasicpriceus><b><?php echo "Basic Value in $Currencycode ($Value)" ?></p> -->
@@ -940,7 +935,7 @@ if (!empty($getlogpodtl)) {
                                                         </div>
                                                     </div>
 
-                                                    <div class="col-md-3">
+                                                    <div class="form-group col-md-3">
 
                                                         <!-- Exchange Rate : -->
 
@@ -958,7 +953,7 @@ if (!empty($getlogpodtl)) {
 
                                                     </div>
 
-                                                    <div class="col-md-3">
+                                                    <div class="form-group col-md-3">
 
                                                         <!-- Basic value in INR : -->
                                                         <label id=labelBasicINR><?php echo "Basic value in ($INR)"; ?> </label>
@@ -971,19 +966,19 @@ if (!empty($getlogpodtl)) {
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <!--<div class="col-md-3">
+                                                    <!--<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 class="col-md-12" style="border:1px solid #000;padding:0px;">
+                                                    <div class="form-group col-md-12" style="border:1px solid #000;padding:0px;">
                                                         <br />
-                                                        <div class="col-md-6" style="padding:0px;">
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-4">
+                                                        <div class="form-group col-md-6" style="padding:0px;">
+                                                            <div class="form-group col-md-12">
+                                                                <div class="form-group col-md-4">
                                                                     <!-- Basic Price: -->
                                                                     <label><?php echo "Basic Price ($INR)"; ?></label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group" style="display:none;">
                                                                         <?php
                                                                         $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
@@ -991,7 +986,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1000,12 +995,12 @@ if (!empty($getlogpodtl)) {
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-4">
+                                                            <div class="form-group col-md-12">
+                                                                <div class="form-group col-md-4">
                                                                     <!--  Landing charge -->
                                                                     <label><?php echo "Landing Charge ($INR)"; ?></label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge', 0), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Calculateloadingcharge()');
@@ -1016,7 +1011,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1025,12 +1020,12 @@ if (!empty($getlogpodtl)) {
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-4">
+                                                            <div class="form-group col-md-12">
+                                                                <div class="form-group col-md-4">
                                                                     <!--   High seas sales charge -->
                                                                     <label><?php echo "Assessable Value (A)($INR)"; ?></label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group" style="display: none;">
                                                                         <?php
                                                                         $data = array('name' => 'Highseas ', 'value' => set_value('Highseas', 0), 'id' => 'Highseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateHighseassalescharge()');
@@ -1038,7 +1033,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1047,12 +1042,12 @@ if (!empty($getlogpodtl)) {
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-4">
+                                                            <div class="form-group col-md-12">
+                                                                <div class="form-group col-md-4">
                                                                     <!--  Custom duty : (a) -->
                                                                     <label><?php echo "Custom duty (B)($INR)"; ?></label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'Customduty', 'value' => set_value('Customduty', 0), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomduty()');
@@ -1060,7 +1055,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1072,12 +1067,12 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-4">
+                                                            <div class="form-group col-md-12">
+                                                                <div class="form-group col-md-4">
                                                                     <!-- Custom ED_cess : (e) -->
                                                                     <label><?php echo "Custom ED_cess (C)($INR)"; ?></label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess', 0), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomEdcess()');
@@ -1085,7 +1080,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1094,12 +1089,12 @@ if (!empty($getlogpodtl)) {
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-4">
+                                                            <div class="form-group col-md-12">
+                                                                <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="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess', 0), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomSHcess()');
@@ -1107,7 +1102,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1117,13 +1112,13 @@ if (!empty($getlogpodtl)) {
                                                                 </div>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-6" style="padding:0px;">
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-4">
+                                                        <div class="form-group col-md-6" style="padding:0px;">
+                                                            <div class="form-group col-md-12">
+                                                                <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="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group" style="display: none">
                                                                         <?php
                                                                         $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty', 0), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateaddlExciseDuty(),CalculateAvlModvat(),CalculateGrossExpense()');
@@ -1131,7 +1126,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1144,12 +1139,12 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-4">
+                                                            <div class="form-group col-md-12">
+                                                                <div class="form-group col-md-4">
                                                                     <!-- Additional Excise duty : (g) -->
                                                                     <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateIgst()');
@@ -1157,7 +1152,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1174,12 +1169,12 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-8">
+                                                            <div class="form-group col-md-12">
+                                                                <div class="form-group col-md-8">
                                                                     <!-- Gross duty payable -->
                                                                     <label><?php echo "Total Duty (G)($INR) (B+C+D+F)"; ?></label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateAvlModvat()');
@@ -1191,8 +1186,8 @@ if (!empty($getlogpodtl)) {
 
 
                                                             <!--Start of Adding of Frieght model-->
-                                                            <div class="col-md-12" style="padding:0px;">
-                                                                <div class="col-md-3">
+                                                            <div class="form-group col-md-12" style="padding:0px;">
+                                                                <div class="form-group col-md-3">
                                                                     <span>Freight Type </span>
                                                                     <div>
                                                                         <?php
@@ -1213,7 +1208,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-3" id="AddTripsValue" style="display:none;">
+                                                                <div class="form-group col-md-3" id="AddTripsValue" style="display:none;">
                                                                     <span>NO Of Trips</span>
                                                                     <div class="form-group">
                                                                         <?php
@@ -1222,7 +1217,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-3">
+                                                                <div class="form-group col-md-3">
                                                                     <span>Freight Rate </span>
                                                                     <div class="form-group">
                                                                         <?php
@@ -1232,7 +1227,7 @@ if (!empty($getlogpodtl)) {
                                                                     </div>
                                                                 </div>
 
-                                                                <div class="col-md-3" style="padding-left: 0px;">
+                                                                <div class="form-group col-md-3" style="padding-left: 0px;">
                                                                     <span>Freight Amt In <?php echo $INR; ?></span>
                                                                     <div class="form-group">
                                                                         <?php
@@ -1245,15 +1240,15 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                             <!--End of Adding of freight in edit model -->
 
-                                                            <div class="col-md-12">
+                                                            <div class="form-group col-md-12">
                                                                 <center> <label>Cost of the product Per UOM</label></center>
                                                                 <hr />
                                                             </div>
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-4">
+                                                            <div class="form-group col-md-12">
+                                                                <div class="form-group col-md-4">
                                                                     <label>Duty Impact</label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1261,7 +1256,7 @@ if (!empty($getlogpodtl)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-4" style="margin-top: -4.8%">
+                                                                <div class="form-group col-md-4" style="margin-top: -4.8%">
                                                                     <span>Quantity</span>
                                                                     <div class="form-group">
                                                                         <?php
@@ -1272,13 +1267,13 @@ if (!empty($getlogpodtl)) {
                                                                 </div>
 
                                                             </div>
-                                                            <div class="col-md-12">
+                                                            <div class="form-group col-md-12">
 
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <!--  Custom Duty Expenses -->
                                                                     <label><?php echo "Custom Duty Expenses($INR)/UOM"; ?></label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1288,12 +1283,12 @@ if (!empty($getlogpodtl)) {
                                                                 </div>
 
                                                             </div>
-                                                            <div class="col-md-12">
-                                                                <div class="col-md-4">
+                                                            <div class="form-group col-md-12">
+                                                                <div class="form-group col-md-4">
                                                                     <!-- RMC Including Customers -->
                                                                     <label><?php echo "Clearing Charges($INR)"; ?></label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
@@ -1306,11 +1301,11 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <!-- RMC Including Customers -->
                                                                     <label><?php echo "Nett per UOM($INR)"; ?></label>
                                                                 </div>
-                                                                <div class="col-md-4">
+                                                                <div class="form-group col-md-4">
                                                                     <div class="form-group">
                                                                         <?php
                                                                         $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1322,11 +1317,11 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                                <div class="col-md-4" style="display: none">
+                                                                <div class="form-group col-md-4" style="display: none">
                                                                     <!--  Total Amount: -->
                                                                     <label id=labelTotalAmount>Total Amount</label>
                                                                 </div>
-                                                                <div class="col-md-4" style="display: none">
+                                                                <div class="form-group col-md-4" style="display: none">
                                                                     <div class="form-group" style="display: none;">
                                                                         <?php
                                                                         $data = array('name' => 'TotalExp', 'value' => set_value('TotalExp'), 'id' => 'TotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1341,8 +1336,8 @@ if (!empty($getlogpodtl)) {
                                                         </div>
                                                     </div>
 
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-12">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-12">
                                                             <label>Import Description :</label>
                                                             <?php
                                                             $data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
@@ -1385,9 +1380,9 @@ if (!empty($getlogpodtl)) {
                                     </div>
                                     <div align="left">
 
-                                        <div class="col-md-12">
-                                            <div class="col-md-3">
-                                                <label>Req No<span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                        <div class="form-group col-md-12">
+                                            <div class="form-group col-md-3">
+                                                <label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                 <div>
                                                     <?php
 
@@ -1396,7 +1391,7 @@ if (!empty($getlogpodtl)) {
                                                 </div>
                                             </div>
 
-                                            <div class="col-md-3">
+                                            <div class="form-group col-md-3">
                                                 <label>Department Name</label>
                                                 <div class="form-group">
                                                     <?php
@@ -1405,7 +1400,7 @@ if (!empty($getlogpodtl)) {
                                                     ?>
                                                 </div>
                                             </div>
-                                            <div class="col-md-3">
+                                            <div class="form-group col-md-3">
                                                 <label>Cost Center Code</label>
                                                 <div class="form-group">
                                                     <?php
@@ -1419,7 +1414,7 @@ if (!empty($getlogpodtl)) {
                                                     ?>
                                                 </div>
                                             </div>
-                                            <div class="col-md-3" style="padding-right: 0px;">
+                                            <div class="form-group col-md-3" style="padding-right: 0px;">
                                                 <label>Available Budget Amount (<?php echo $INR ?>)</label>
                                                 <div class="form-group">
                                                     <?php
@@ -1429,9 +1424,9 @@ if (!empty($getlogpodtl)) {
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-12">
-                                            <div class="col-md-2">
-                                                <label>Item Code<span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                        <div class="form-group col-md-12">
+                                            <div class="form-group col-md-2">
+                                                <label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
 
                                                 <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                 <div>
@@ -1462,7 +1457,7 @@ if (!empty($getlogpodtl)) {
 
                                             </div>
 
-                                            <div class="col-md-2">
+                                            <div class="form-group col-md-2">
                                                 <label>Item Name</label>
                                                 <div class="form-group">
                                                     <?php
@@ -1471,7 +1466,7 @@ if (!empty($getlogpodtl)) {
                                                     ?>
                                                 </div>
                                             </div>
-                                            <div class="col-md-2">
+                                            <div class="form-group col-md-2">
                                                 <label>UOM</label>
                                                 <div class="form-group">
                                                     <?php
@@ -1480,9 +1475,9 @@ if (!empty($getlogpodtl)) {
                                                     ?>
                                                 </div>
                                             </div>
-                                            <div class="col-md-6" style="padding: 0px;">
-                                                <div class="col-md-3">
-                                                    <label>Quantity<span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                            <div class="form-group col-md-6" style="padding: 0px;">
+                                                <div class="form-group col-md-3">
+                                                    <label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck()');
@@ -1491,10 +1486,10 @@ if (!empty($getlogpodtl)) {
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="form-group col-md-3">
                                                     <!--  <label>Rate </label> -->
 
-                                                    <!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?> <span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                                    <!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?> <span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),validateEditExceedLimit()');
@@ -1502,12 +1497,12 @@ if (!empty($getlogpodtl)) {
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="form-group col-md-3">
                                                     <label>Per</label> <?php
                                                                         $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
                                                                         echo form_input($data); ?>
                                                 </div>
-                                                <div class="col-md-3" style="padding: 0px;">
+                                                <div class="form-group col-md-3" style="padding: 0px;">
                                                     <!-- <label><?php echo "Basic Value In"; ?></label>-->
                                                     <!-- <p id=label3> --><label id=label3><?php echo "Basic Value In $Currencycode ($Value)"; ?></label><!-- </p> -->
                                                     <div class="form-group">
@@ -1523,9 +1518,9 @@ if (!empty($getlogpodtl)) {
                                             </div>
 
                                         </div>
-                                        <div class="col-md-12">
+                                        <div class="form-group col-md-12">
 
-                                            <div class="col-md-3">
+                                            <div class="form-group col-md-3">
 
                                                 <!-- Basic Price in US $ per Ton : -->
 
@@ -1541,7 +1536,7 @@ if (!empty($getlogpodtl)) {
                                                 </div>
                                             </div>
 
-                                            <div class="col-md-3">
+                                            <div class="form-group col-md-3">
 
 
                                                 <!-- <label>Exchange Rate :</label>  -->
@@ -1556,7 +1551,7 @@ if (!empty($getlogpodtl)) {
 
                                             </div>
 
-                                            <div class="col-md-3">
+                                            <div class="form-group col-md-3">
 
                                                 <!--  Basic value in INR : -->
 
@@ -1569,19 +1564,19 @@ if (!empty($getlogpodtl)) {
                                                     ?>
                                                 </div>
                                             </div>
-                                            <!--<div class="col-md-3">
+                                            <!--<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 class="col-md-12" style="border:1px solid #000;padding:0px;">
+                                            <div class="form-group col-md-12" style="border:1px solid #000;padding:0px;">
                                                 <br />
-                                                <div class="col-md-6" style="padding:0px;">
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                <div class="form-group col-md-6" style="padding:0px;">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!-- Basic Price: -->
                                                             <label><?php echo "Basic Price  ($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group" style="display:none;">
                                                                 <?php
                                                                 $data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
@@ -1589,7 +1584,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1598,12 +1593,12 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!-- Landing charge -->
                                                             <label><?php echo "Landing Charge ($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
@@ -1614,7 +1609,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1623,12 +1618,12 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!--  High seas sales charge -->
                                                             <label><?php echo "Assessable Value (A) ($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group" style="display: none;">
                                                                 <?php
                                                                 $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
@@ -1636,7 +1631,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1645,12 +1640,12 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!-- Custom duty : (a) -->
                                                             <label><?php echo "Custom duty (B)($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
@@ -1658,7 +1653,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1670,12 +1665,12 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!-- Custom ED_cess : (e) -->
                                                             <label><?php echo "Custom ED_cess  (C)($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
@@ -1683,7 +1678,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1692,12 +1687,12 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <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="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
@@ -1705,7 +1700,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1715,15 +1710,15 @@ if (!empty($getlogpodtl)) {
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-6" style="padding:0px;">
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                <div class="form-group col-md-6" style="padding:0px;">
+                                                    <div class="form-group col-md-12">
+                                                        <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="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group" style="display: none;">
                                                                 <?php
                                                                 $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
@@ -1731,7 +1726,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1746,12 +1741,12 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!-- Additional Excise duty : (g) -->
                                                             <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditIgst ', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
@@ -1759,7 +1754,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1773,13 +1768,13 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-8">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-8">
                                                             <!-- Gross duty payable -->
 
                                                             <label><?php echo "Total Duty (G)($INR) (B+C+D+F)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
@@ -1791,8 +1786,8 @@ if (!empty($getlogpodtl)) {
 
 
                                                     <!--Start of Adding of Frieght model-->
-                                                    <div class="col-md-12" style="padding:0px;">
-                                                        <div class="col-md-3">
+                                                    <div class="form-group col-md-12" style="padding:0px;">
+                                                        <div class="form-group col-md-3">
                                                             <span>Freight Type </span>
                                                             <div>
                                                                 <?php
@@ -1813,7 +1808,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-3" id="EditTripsValue" style="display:block;">
+                                                        <div class="form-group col-md-3" id="EditTripsValue" style="display:block;">
                                                             <span>NO Of Trips</span>
                                                             <div class="form-group">
                                                                 <?php
@@ -1822,7 +1817,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-3">
+                                                        <div class="form-group col-md-3">
                                                             <span>Freight Rate </span>
                                                             <div class="form-group">
                                                                 <?php
@@ -1832,7 +1827,7 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                         </div>
 
-                                                        <div class="col-md-3" style="padding-left: 0px;">
+                                                        <div class="form-group col-md-3" style="padding-left: 0px;">
                                                             <span>Freight Amt <?php echo $INR; ?></span>
                                                             <div class="form-group">
                                                                 <?php
@@ -1845,15 +1840,15 @@ if (!empty($getlogpodtl)) {
                                                     </div>
                                                     <!--End of Adding of freight in edit model -->
 
-                                                    <div class="col-md-12">
+                                                    <div class="form-group col-md-12">
                                                         <center> <label>Cost of the product Per UOM</label></center>
                                                         <hr />
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <label>Duty Impact</label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1861,7 +1856,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4" style="margin-top: -4.8%">
+                                                        <div class="form-group col-md-4" style="margin-top: -4.8%">
                                                             <span>Quantity</span>
                                                             <div class="form-group">
                                                                 <?php
@@ -1872,13 +1867,13 @@ if (!empty($getlogpodtl)) {
                                                         </div>
 
                                                     </div>
-                                                    <div class="col-md-12">
+                                                    <div class="form-group col-md-12">
 
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <!-- Custom Duty Expenses -->
                                                             <label><?php echo "Custom Duty Expenses($INR) /UOM"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1888,12 +1883,12 @@ if (!empty($getlogpodtl)) {
                                                         </div>
 
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!-- RMC Including Customers -->
                                                             <label><?php echo "Clearing Charges ($INR)" ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
@@ -1906,11 +1901,11 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <!-- RMC Including Customers -->
                                                             <label><?php echo "Nett per UOM($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1925,11 +1920,11 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                        <div class="col-md-4" style="display:none;">
+                                                        <div class="form-group col-md-4" style="display:none;">
                                                             <!-- Total Amount: -->
                                                             <label id=labelEditTotalAmount>Total Amount</label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group" style="display:none;">
                                                                 <?php
                                                                 $data = array('name' => 'EditTotalExp', 'value' => set_value('EditTotalExp'), 'id' => 'EditTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -1945,8 +1940,8 @@ if (!empty($getlogpodtl)) {
                                             </div>
                                         </div>
 
-                                        <div class="col-md-12">
-                                            <div class="col-md-12">
+                                        <div class="form-group col-md-12">
+                                            <div class="form-group col-md-12">
                                                 <label>Import Description :</label>
                                                 <?php
                                                 $data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
@@ -1982,9 +1977,9 @@ if (!empty($getlogpodtl)) {
                                     </div>
                                     <div align="left">
 
-                                        <div class="col-md-12">
-                                            <div class="col-md-3">
-                                                <label>Req No<span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                        <div class="form-group col-md-12">
+                                            <div class="form-group col-md-3">
+                                                <label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                 <div>
                                                     <?php
 
@@ -1993,7 +1988,7 @@ if (!empty($getlogpodtl)) {
                                                 </div>
                                             </div>
 
-                                            <div class="col-md-3">
+                                            <div class="form-group col-md-3">
                                                 <label>Department Name</label>
                                                 <div class="form-group">
                                                     <?php
@@ -2002,7 +1997,7 @@ if (!empty($getlogpodtl)) {
                                                     ?>
                                                 </div>
                                             </div>
-                                            <div class="col-md-3">
+                                            <div class="form-group col-md-3">
                                                 <label>Cost Center Code</label>
                                                 <div class="form-group">
                                                     <?php
@@ -2016,7 +2011,7 @@ if (!empty($getlogpodtl)) {
                                                     ?>
                                                 </div>
                                             </div>
-                                            <div class="col-md-3" style="padding-right: 0px;">
+                                            <div class="form-group col-md-3" style="padding-right: 0px;">
                                                 <label>Available Budget Amount (<?php echo $INR ?>)</label>
                                                 <div class="form-group">
                                                     <?php
@@ -2026,9 +2021,9 @@ if (!empty($getlogpodtl)) {
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-12">
-                                            <div class="col-md-2">
-                                                <label>Item Code<span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                        <div class="form-group col-md-12">
+                                            <div class="form-group col-md-2">
+                                                <label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
 
                                                 <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                 <div>
@@ -2059,7 +2054,7 @@ if (!empty($getlogpodtl)) {
 
                                             </div>
 
-                                            <div class="col-md-2">
+                                            <div class="form-group col-md-2">
                                                 <label>Item Name</label>
                                                 <div class="form-group">
                                                     <?php
@@ -2068,7 +2063,7 @@ if (!empty($getlogpodtl)) {
                                                     ?>
                                                 </div>
                                             </div>
-                                            <div class="col-md-2">
+                                            <div class="form-group col-md-2">
                                                 <label>UOM</label>
                                                 <div class="form-group">
                                                     <?php
@@ -2077,9 +2072,9 @@ if (!empty($getlogpodtl)) {
                                                     ?>
                                                 </div>
                                             </div>
-                                            <div class="col-md-6" style="padding: 0px;">
-                                                <div class="col-md-3">
-                                                    <label>Quantity<span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                            <div class="form-group col-md-6" style="padding: 0px;">
+                                                <div class="form-group col-md-3">
+                                                    <label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'ViewQuantity', 'value' => set_value('ViewQuantity'), 'id' => 'ViewQuantity', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck()');
@@ -2088,10 +2083,10 @@ if (!empty($getlogpodtl)) {
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="form-group col-md-3">
                                                     <!--  <label>Rate </label> -->
 
-                                                    <!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span> </label>
+                                                    <!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span> </label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditRatechange()');
@@ -2099,12 +2094,12 @@ if (!empty($getlogpodtl)) {
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="form-group col-md-3">
                                                     <label>Per</label> <?php
                                                                         $data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'readonly' => true, 'class' => 'form-control');
                                                                         echo form_input($data); ?>
                                                 </div>
-                                                <div class="col-md-3" style="padding: 0px;">
+                                                <div class="form-group col-md-3" style="padding: 0px;">
                                                     <!-- <label><?php echo "Basic Value In"; ?></label>-->
                                                     <!--  <p id=label3> --><label id=label3><?php echo "Basic Value In $Currencycode ($Value)"; ?></label><!-- </p> -->
                                                     <div class="form-group">
@@ -2118,9 +2113,9 @@ if (!empty($getlogpodtl)) {
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-12">
+                                        <div class="form-group col-md-12">
 
-                                            <div class="col-md-3">
+                                            <div class="form-group col-md-3">
 
                                                 <!-- Basic Price in US $ per Ton : -->
 
@@ -2135,7 +2130,7 @@ if (!empty($getlogpodtl)) {
                                                 </div>
                                             </div>
 
-                                            <div class="col-md-3">
+                                            <div class="form-group col-md-3">
 
                                                 <!--  Exchange Rate : -->
 
@@ -2149,7 +2144,7 @@ if (!empty($getlogpodtl)) {
 
                                             </div>
 
-                                            <div class="col-md-3">
+                                            <div class="form-group col-md-3">
 
                                                 <!--  Basic value in INR : -->
 
@@ -2162,18 +2157,18 @@ if (!empty($getlogpodtl)) {
                                                     ?>
                                                 </div>
                                             </div>
-                                            <!--<div class="col-md-3">
+                                            <!--<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 class="col-md-12" style="border:1px solid #000;padding:0px;">
+                                            <div class="form-group col-md-12" style="border:1px solid #000;padding:0px;">
                                                 <br />
-                                                <div class="col-md-6" style="padding:0px;">
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                <div class="form-group col-md-6" style="padding:0px;">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             Basic Price (<?php echo $INR ?>)
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
@@ -2181,7 +2176,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewAfterBasicPriceTax', 'value' => set_value('ViewAfterBasicPriceTax'), 'id' => 'ViewAfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2190,12 +2185,12 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!--  Landing charge -->
                                                             <label><?php echo "Landing Charge ($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
@@ -2206,7 +2201,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'readonly' => true, 'class' => 'form-control num', 'readonly' => 'true');
@@ -2215,12 +2210,12 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!-- High seas sales charge -->
                                                             <label><?php echo "Assessable Value (A) ($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group" 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()');
@@ -2228,7 +2223,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewAfterAssessable', 'value' => set_value('ViewAfterAssessable'), 'id' => 'ViewAfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2237,12 +2232,12 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!-- Custom duty : (a) -->
                                                             <label><?php echo "Custom duty (B) ($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
@@ -2250,7 +2245,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewAfterCustomduty', 'value' => set_value('ViewAfterCustomduty'), 'id' => 'ViewAfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2262,12 +2257,12 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!--  Custom ED_cess : (e) -->
                                                             <label><?php echo "Custom ED_cess (C) ($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
@@ -2275,7 +2270,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2284,12 +2279,12 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <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="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
@@ -2297,7 +2292,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2307,13 +2302,13 @@ if (!empty($getlogpodtl)) {
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-6" style="padding:0px;">
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                <div class="form-group col-md-6" style="padding:0px;">
+                                                    <div class="form-group col-md-12">
+                                                        <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="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group" 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()');
@@ -2321,7 +2316,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewSubtotal', 'value' => set_value('ViewSubtotal'), 'id' => 'ViewSubtotal',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2334,12 +2329,12 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!-- Additional Excise duty : (g) -->
                                                             <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewIgst ', 'value' => set_value('ViewIgst', 0), 'id' => 'ViewIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'EditCalculateIgst()');
@@ -2347,7 +2342,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst', 0), 'id' => 'ViewAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2363,12 +2358,12 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-8">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-8">
                                                             <!-- Gross duty payable -->
                                                             <label><?php echo "Total Duty ($INR)   (B+C+D+F)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewGrossdutypayable ', 'value' => set_value('ViewGrossdutypayable'), 'id' => 'ViewGrossdutypayable',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);');
@@ -2380,8 +2375,8 @@ if (!empty($getlogpodtl)) {
 
 
                                                     <!--Start of Adding of Frieght model-->
-                                                    <div class="col-md-12" style="padding:0px;">
-                                                        <div class="col-md-3">
+                                                    <div class="form-group col-md-12" style="padding:0px;">
+                                                        <div class="form-group col-md-3">
                                                             <span>Freight Type </span>
                                                             <div>
                                                                 <?php
@@ -2402,7 +2397,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-3" id="ViewTripsValue" style="display:block;">
+                                                        <div class="form-group col-md-3" id="ViewTripsValue" style="display:block;">
                                                             <span>NO Of Trips</span>
                                                             <div class="form-group">
                                                                 <?php
@@ -2411,7 +2406,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-3">
+                                                        <div class="form-group col-md-3">
                                                             <span>Freight Rate </span>
                                                             <div class="form-group">
                                                                 <?php
@@ -2421,7 +2416,7 @@ if (!empty($getlogpodtl)) {
                                                             </div>
                                                         </div>
 
-                                                        <div class="col-md-3" style="padding-left: 0px;">
+                                                        <div class="form-group col-md-3" style="padding-left: 0px;">
                                                             <span>Freight Amt In <?php echo $INR; ?></span>
                                                             <div class="form-group">
                                                                 <?php
@@ -2435,15 +2430,15 @@ if (!empty($getlogpodtl)) {
                                                     <!--End of Adding of freight in edit model -->
 
 
-                                                    <div class="col-md-12">
+                                                    <div class="form-group col-md-12">
                                                         <center> <label>Cost of the product Per KG</label></center>
                                                         <hr />
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             Duty Impact
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -2451,7 +2446,7 @@ if (!empty($getlogpodtl)) {
                                                                 ?>
                                                             </div>
                                                         </div>
-                                                        <div class="col-md-4" style="margin-top: -4.8%">
+                                                        <div class="form-group col-md-4" style="margin-top: -4.8%">
                                                             <span>Quantity</span>
                                                             <div class="form-group">
                                                                 <?php
@@ -2462,13 +2457,13 @@ if (!empty($getlogpodtl)) {
                                                         </div>
 
                                                     </div>
-                                                    <div class="col-md-12">
+                                                    <div class="form-group col-md-12">
 
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <!--  Custom Duty Expenses -->
                                                             <label><?php echo "Custom Duty($INR) /UOM" ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -2478,12 +2473,12 @@ if (!empty($getlogpodtl)) {
                                                         </div>
 
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
+                                                    <div class="form-group col-md-12">
+                                                        <div class="form-group col-md-4">
                                                             <!-- RMC Including Customers -->
                                                             <label><?php echo "Clearing Charges ($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -2495,11 +2490,11 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <!-- RMC Including Customers -->
                                                             <label><?php echo "Nett per UOM($INR)"; ?></label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -2513,11 +2508,11 @@ if (!empty($getlogpodtl)) {
 
 
 
-                                                        <div class="col-md-4" style="display:none;">
+                                                        <div class="form-group col-md-4" style="display:none;">
                                                             <!-- Total Amount: -->
                                                             <label id=labelViewTotalAmount>Total Amount</label>
                                                         </div>
-                                                        <div class="col-md-4">
+                                                        <div class="form-group col-md-4">
                                                             <div class="form-group" style="display:none;">
                                                                 <?php
                                                                 $data = array('name' => 'ViewTotalExp', 'value' => set_value('ViewTotalExp'), 'id' => 'ViewTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -2533,8 +2528,8 @@ if (!empty($getlogpodtl)) {
                                             </div>
                                         </div>
 
-                                        <div class="col-md-12">
-                                            <div class="col-md-12">
+                                        <div class="form-group col-md-12">
+                                            <div class="form-group col-md-12">
                                                 <label>Import Description :</label>
                                                 <?php
                                                 $data = array('name' => 'viewtxtInstruction', 'value' => set_value('viewtxtInstruction'), 'id' => 'viewtxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
@@ -2719,7 +2714,7 @@ if (!empty($getlogpodtl)) {
                                     <?php
 
                                     if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED) { ?>
-                                        <td> <a data-target='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+                                        <td> <a data-target='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
                                         <?php
                                     } else { ?>
                                         <td> <a data-target='#viewimportmodal' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#viewimportmodal"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo; ?>Click here to view Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
@@ -2802,10 +2797,10 @@ if (!empty($getlogpodtl)) {
                 </table>
             </div>
 
-            <div class="col-md-12" style="border: 1px solid;">
+            <div class="form-group col-md-12" style="border: 1px solid;">
 
-                <div class="col-md-12">
-                    <div class="col-md-4">
+                <div class="form-group col-md-12">
+                    <div class="form-group col-md-4">
                         <label>Total Landing Charge <?php echo "($INR)" ?></label>
 
                         <?php
@@ -2814,7 +2809,7 @@ if (!empty($getlogpodtl)) {
                         ?>
                     </div>
 
-                    <div class="col-md-4">
+                    <div class="form-group col-md-4">
                         <label>Total Assessable Value <?php echo "($INR)" ?></label>
 
                         <?php
@@ -2824,7 +2819,7 @@ if (!empty($getlogpodtl)) {
                     </div>
 
 
-                    <div class="col-md-4">
+                    <div class="form-group col-md-4">
                         <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
 
                         <?php
@@ -2833,7 +2828,7 @@ if (!empty($getlogpodtl)) {
                         ?>
                     </div>
 
-                    <div class="col-md-4">
+                    <div class="form-group col-md-4">
                         <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
 
                         <?php
@@ -2842,7 +2837,7 @@ if (!empty($getlogpodtl)) {
                         ?>
                     </div>
 
-                    <div class="col-md-4">
+                    <div class="form-group col-md-4">
                         <label>Total IGST <?php echo "($INR)" ?></label>
 
                         <?php
@@ -2854,7 +2849,7 @@ if (!empty($getlogpodtl)) {
 
 
 
-                    <div class="col-md-4">
+                    <div class="form-group col-md-4">
                         <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
 
                         <?php
@@ -2863,7 +2858,7 @@ if (!empty($getlogpodtl)) {
                         ?>
                     </div>
 
-                    <div class="col-md-4">
+                    <div class="form-group col-md-4">
                         <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
 
                         <?php
@@ -2875,7 +2870,7 @@ if (!empty($getlogpodtl)) {
 
 
 
-                    <div class="col-md-4">
+                    <div class="form-group col-md-4">
                         <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
 
                         <?php
@@ -2889,7 +2884,7 @@ if (!empty($getlogpodtl)) {
 
 
 
-                    <div class="col-md-4">
+                    <div class="form-group col-md-4">
                         <label>Total Freight Value </label> <?php
                                                             $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', $totfreight), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'required' => 'true', 'readonly' => 'true', 'style' => 'text-align:right;');
                                                             echo form_input($data);
@@ -2899,7 +2894,7 @@ if (!empty($getlogpodtl)) {
 
 
 
-                    <div class="col-md-4">
+                    <div class="form-group col-md-4">
                         <label>Total Order Value <?php echo "($Value)" ?></label> <?php
                                                                                     $data = array('name' => 'txtToatlOrder', 'value' => set_value('txtToatlOrder', $totorder), 'id' => 'txtToatlOrder',  'class' => 'form-control', 'required' => 'true', 'readonly' => 'true', 'style' => 'text-align:right;');
                                                                                     echo form_input($data);
@@ -2912,8 +2907,8 @@ if (!empty($getlogpodtl)) {
 
                 <!--##################################################################   -->
                 <?php if (!empty($update)) { ?>
-                    <div class="col-md-12" id="editpodiv">
-                        <div class="col-md-12"><label>Editable POScreen</label>
+                    <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-hover table-bordered" style="background-color:#fff;font-size:12px;">
                                 <thead>
                                     <tr>
@@ -2987,8 +2982,8 @@ if (!empty($getlogpodtl)) {
                     </div>
 
 
-                    <div class="col-md-12">
-                        <div class="col-md-12">
+                    <div class="form-group col-md-12">
+                        <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);
@@ -3021,7 +3016,7 @@ if (!empty($getlogpodtl)) {
                                     <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-approved Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</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 { ?>
 
@@ -3032,7 +3027,7 @@ if (!empty($getlogpodtl)) {
                                 <?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-approved Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</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 } ?>
@@ -3103,7 +3098,7 @@ if (!empty($getlogpodtl)) {
     <td align="left"><%=TotalValue%></td> -->
 
         <td>
-            <a data-target='#editimportpomodel' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
+            <a data-target='#editimportpomodel' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
 
 
         </td>