From 36110e8fb5e6dae072277441505ef45e88707fcd Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 30 Aug 2024 10:37:33 +0000
Subject: [PATCH] Purchase Order 1 create

---
 app/Views/EditservicePurchaseorder.php |   40 +-
 app/Views/editRevenueAmendPO.php       | 2210 ++++++++++----------
 app/Views/editRevenuepurchaseorder.php |   10 +-
 app/Views/editServiceAmendPO.php       |    2 +-
 app/Views/purchaseorder.php            | 2557 ++++++++++++------------
 app/Views/servicePurchaseorder.php     | 1929 +++++++++---------
 6 files changed, 3302 insertions(+), 3446 deletions(-)

diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index 22ff4c48..a1ef9206 100644
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -1701,7 +1701,7 @@ if (!empty($getlogpodtl)) {
 
 							</div>
 							<div class="row">
-								<div class="form-group col-md-5 col-md-offset-4" align="right">
+								<div class="form-group col-md-9" align="right">
 									<label>Other Allowances <?php echo "($INRSYM)" ?></label>
 								</div>
 								<div class="form-group col-md-3">
@@ -1712,7 +1712,7 @@ if (!empty($getlogpodtl)) {
 								</div>
 							</div>
 							<div class="row">
-								<div class="form-group col-md-5 col-md-offset-4" align="right">
+								<div class="form-group col-md-9" align="right">
 									<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
 								</div>
 								<div class="form-group col-md-3">
@@ -1723,13 +1723,13 @@ if (!empty($getlogpodtl)) {
 								</div>
 							</div>
 							<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);
-																										?>
-							</div>
-
+								<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);
+									?>
+								</div>
 							</div>
 						</div>
 						<div class="modal-footer">
@@ -1839,7 +1839,7 @@ if (!empty($getlogpodtl)) {
 										$options = array("0" => 'Item Code');
 										//print_r(  $options);
 
-										echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
+										echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
 
 										?>
 									</div>
@@ -1993,7 +1993,7 @@ if (!empty($getlogpodtl)) {
 								</div>
 							</div>
 							<div class="form-row">
-								<div class="form-group col-md-5  col-md-offset-4" align="right">
+								<div class="form-group col-md-9" align="right">
 									<label>Other Allowances <?php echo "($INRSYM)" ?></label>
 								</div>
 								<div class="form-group col-md-3">	
@@ -2004,7 +2004,7 @@ if (!empty($getlogpodtl)) {
 								</div>
 							</div>
 							<div class="form-row">
-								<div class="form-group col-md-5  col-md-offset-4" align="right">
+								<div class="form-group col-md-9" align="right">
 									<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
 								</div>
 								<div class="form-group col-md-3">
@@ -2015,10 +2015,14 @@ if (!empty($getlogpodtl)) {
 								</div>
 							</div>
 							<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');
+								<div class="form-group col-md-12">
+									<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="">
+																										?> 
+										<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
+									</div>
 							</div>
 							<br />
 						</div>
@@ -2113,7 +2117,7 @@ if (!empty($getlogpodtl)) {
 
 
 
-							<div class="form-group col-md-3" id="ViewotherDescription">
+							<div class="form-group col-md-3" style="display: none;" id="ViewotherDescription">
 								<label>Item Name</label>
 								<div>
 									<?php
@@ -2269,7 +2273,7 @@ if (!empty($getlogpodtl)) {
 
 						</div>
 						<div class="form-row">
-							<div class="form-group col-md-5  col-md-offset-4" align="right">
+							<div class="form-group col-md-9" align="right">
 								<label>Other Allowances <?php echo "($INRSYM)" ?></label>
 							</div>
 							<div class="form-group col-md-3">
@@ -2282,7 +2286,7 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 						<div class="form-row">
-							<div class="form-group col-md-5  col-md-offset-4" align="right">
+							<div class="form-group col-md-9" align="right">
 								<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
 							</div>
 							<div class="form-group col-md-3">
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index b2564cd6..0537acf9 100644
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -126,36 +126,6 @@ if (!empty($INRSYMBOL)) {
 }
 
 ?>
-<style>
-	#packagingcalmodel {
-		margin-top: 200px;
-		z-index: 1080 !important;
-	}
-
-	#freightmodel {
-		margin-top: 200px;
-		z-index: 1080 !important;
-	}
-
-	#ExciseDutyCalModel {
-		margin-top: 200px;
-		z-index: 1080 !important;
-	}
-
-	#VatCalModel {
-		margin-top: 200px;
-		z-index: 1080 !important;
-	}
-
-	#CSTCalModel {
-		margin-top: 200px;
-		z-index: 1080 !important;
-	}
-
-	.modal {
-		padding-right: 30% ! important;
-	}
-</style>
 <!-- Latest compiled and minified CSS -->
 
 <script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
@@ -928,8 +898,6 @@ if (!empty($INRSYMBOL)) {
 	.centered input {
 		margin: 0 5px;
 	}
-
-
 </style>
 
 <div class="content-page">
@@ -950,1123 +918,555 @@ if (!empty($INRSYMBOL)) {
 				<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);
+							?>
+
+							<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;
+											//$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>
+										<?php
+										$data = array('name' => 'POType', 'value' => set_value('POType', REVENUE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+									</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', 'disabled=disabled', 'readonly=readonly');
+
+										?>
+									</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-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", "id" => "Local", "value" => "0", 'checked' => ('0' == $taxrange) ? TRUE : FALSE, 'onchange' => 'SetVatorCST();')); ?>&nbsp;&nbsp;
+											<?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", "id" => "Inter_state", "value" => "1", 'checked' => ('1' == $taxrange) ? TRUE : FALSE, '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 />
+									<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="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="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;">
+									<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule; ?>">
+									<label>Schedule By<span class="text-danger">*</span></label>
 									<?php
-									$attributes = array('class' => 'form-label-left CreatePO ', 'name'  => 'CreatePO', 'id'  => 'CreatePO');
-									echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); 
+									$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', 'readonly' => 'true');
+										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>
+									<?php
+									$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</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', 'readonly' => 'readonly');
+										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', $supplierref), 'id' => 'amendsupplierreference',  'class' => 'form-control', 'readonly' => 'readonly', 'maxlength' => '40');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Supplier's Offer No</label>
+									<div class="form-group">
+
+										<?php
+										$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $suppofferno), 'id' => 'amendsupplierofferno',  'class' => 'form-control', 'readonly' => 'readonly');
+										echo form_input($data);
+										?>
+									</div>
+
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Other Reference(S)</label>
+									<div class="form-group">
+
+										<?php
+										$data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $otherref), 'id' => 'amendotherreference',  'class' => 'form-control', 'readonly' => 'readonly');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Revenue Type Options<span class="text-danger">*</span></label>
+									<div class="form-group">
+
+										<?php
+
+										//$optionsWork = array("0"=>'Select Work Status');     
+
+
+										if (!empty($PoTypeOptions)) {
+											foreach ($PoTypeOptions as $POpt) :
+
+
+												$optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
+
+											endforeach;
+										}
+
+										echo form_dropdown('PoTypeOptions', $optionsPO, $revenuesubtype, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control');
+
+
+										?>
+									</div>
+
+
+
+								</div>
+								<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)
+
+											if ($Terms == $pay2->PaymentID) {
+												//echo "$Terms";
+												//echo "$pay2->PaymentTerms";
+
+									?>
+											<input type="hidden" 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 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;
-														//$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">
-
-														<?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);
-
-													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', 'disabled=disabled', 'readonly=readonly');
-
-													?>
-												</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="row">
-											<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">
-															<?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", "id" => "Local", "value" => "0", 'checked' => ('0' == $taxrange) ? TRUE : FALSE, 'onchange' => 'SetVatorCST();')); ?>&nbsp;&nbsp;
-															<?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", "id" => "Inter_state", "value" => "1", 'checked' => ('1' == $taxrange) ? TRUE : FALSE, '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 />
-													<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="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="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;">
-													<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule; ?>">
-													<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', 'readonly' => 'true');
-														echo Form_textarea($data);
-														?> <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress; ?>">
-													</div>
-												</div>
-											</div>
-										</div>
-										<div class="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;', 'readonly' => 'true');
-														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', 'readonly' => 'readonly');
-														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', $supplierref), 'id' => 'amendsupplierreference',  'class' => 'form-control', 'readonly' => 'readonly', 'maxlength' => '40');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="form-group col-md-3">
-													<label>Supplier's Offer No</label>
-													<div class="form-group">
-
-														<?php
-														$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $suppofferno), 'id' => 'amendsupplierofferno',  'class' => 'form-control', 'readonly' => 'readonly');
-														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>Other Reference(S)</label>
-													<div class="form-group">
-
-														<?php
-														$data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $otherref), 'id' => 'amendotherreference',  'class' => 'form-control', 'readonly' => 'readonly');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="form-group col-md-3">
-													<label>Revenue Type Options<span class="text-danger">*</span></label>
-													<div class="form-group">
-
-														<?php
-
-														//$optionsWork = array("0"=>'Select Work Status');     
-
-
-														if (!empty($PoTypeOptions)) {
-															foreach ($PoTypeOptions as $POpt) :
-
-
-																$optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
-
-															endforeach;
-														}
-
-														echo form_dropdown('PoTypeOptions', $optionsPO, $revenuesubtype, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control');
-
-
-														?>
-													</div>
-
-
-
-												</div>
-												<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)
-
-															if ($Terms == $pay2->PaymentID) {
-																//echo "$Terms";
-																//echo "$pay2->PaymentTerms";
-
-													?>
-															<input type="hidden" 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="row">
-											<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="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'>
-														<?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>
-
-										<!-- 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">
-														<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="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-													</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">
-														<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="optfreight" checked="checked" value='0' id="optFreight"> Basic Amount</label>
-															</div>
-															<div class="radio">
-																<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="PackagingOption" 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">
-														<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>
-															<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>
-
-														</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="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">
-														<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-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 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-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>
-										<div class="container-fluid">
-
-
-											<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:1055px;">
-															<div class="modal-header">
-																<center>
-																	<h4>Edit Revenue Purchase Order Line Item </h4>
-																</center>
-															</div>
-															<div align="left">
-																<div>
-																	<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>Avl Bud Amt</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-2">
-																			<label>Item Code<span class="text-danger">*</span></label>
-																			<div>
-																				<?php
-
-																				$data = array('name' => 'EditMaterialCode', 'value' => set_value('EditMaterialCode'), 'id' => 'EditMaterialCode',  'class' => 'form-control', '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' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
-																				echo form_input($data);
-																				?>
-																			</div>
-																		</div>
-																		<div class="form-group 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="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;');
-																					echo form_input($data);
-																					?>
-
-																				</div>
-																			</div>
-																			<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;');
-																					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" style="padding-left: 0px;">
-																				<label>Basic Amt <?php echo "($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="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
-																			$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' => 'calculateDiscount();', '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="col-md-12 ">
-																	<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();');
-																			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' => 'calculateFreight();', '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-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
-																			$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' => 'calculatePackaging();', '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-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
-																			$data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;');
-																			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' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-																			echo form_input($data);
-																			?>
-																		</div>
-																	</div>
-																</div>
-																<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
-																			$data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat',  'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;');
-																			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' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat',  'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;');
-																			echo form_input($data);
-																			?>
-																		</div>
-
-																	</div>
-																</div>
-																<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
-																			$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
-																			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' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax',  '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-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-group col-md-12">
-
-																	<div class="col-md-4 col-md-offset-8">
-																		<label>Total Order Amt <?php echo "($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-group 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>
-															<hr />
-															<div class="row">
-																<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>
-																	</div>
-																</div>
-															</div>
-														</div>
-														<br /><br />
-														<!-- footer for revenue po -->
-														<div class="modal-footer">
-
-														</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 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>Action</th>
-														</tr>
-													</thead>
-
-													<tbody id='RevenueAppend'>
-														<?php
-														if (!empty($POItem)) {
-															$index = 0;
-
-															foreach ($POItem as $record) {
-																//print_r($POItem);
-																$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->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>
-																	<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 'AvlAmount' . $index ?>" id="<?php echo 'AvlAmount' . $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 'quantity' . $index ?>" id="<?php echo 'quantity' . $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 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
-																	<input 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 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeDisType' . $index ?>" id="<?php echo 'beforeDisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
-																	<input type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeDisVal' . $index ?>" id="<?php echo 'beforeDisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
-																	<input type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeAfterDisVal' . $index ?>" id="<?php echo 'beforeAfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
-																	<input type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
-																	<input type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
-																	<input type="hidden" name="<?php echo 'beforePackType' . $index ?>" id="<?php echo 'beforePackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
-																	<input type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
-																	<input type="hidden" name="<?php echo 'beforePackVal' . $index ?>" id="<?php echo 'beforePackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
-																	<input type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeAfterPackVal' . $index ?>" id="<?php echo 'beforeAfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
-																	<input type="hidden" name="<?php echo 'VatOption' . $index ?>" id="<?php echo 'VatOption' . $index ?>" value="<?php echo isset($record->VatCalulatedOn) ? $record->VatCalulatedOn : ''; ?>" />
-																	<input type="hidden" name="<?php echo 'VatVal' . $index ?>" id="<?php echo 'VatVal' . $index ?>" value="<?php echo $record->SGST; ?>" /> <!-- SGST-->
-																	<input type="hidden" name="<?php echo 'beforeVatVal' . $index ?>" id="<?php echo 'beforeVatVal' . $index ?>" value="<?php echo $record->SGST; ?>" /><!-- SGST-->
-																	<input type="hidden" name="<?php echo 'AfterVatVal' . $index ?>" id="<?php echo 'AfterVatVal' . $index ?>" value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
-																	<input type="hidden" name="<?php echo 'beforeAfterVatVal' . $index ?>" id="<?php echo 'beforeAfterVatVal' . $index ?>" value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
-																	<input type="hidden" name="<?php echo 'GSTVal' . $index ?>" id="<?php echo 'GSTVal' . $index ?>" value="<?php echo $record->CGST; ?>" /><!-- CGST-->
-																	<input type="hidden" name="<?php echo 'beforeGSTVal' . $index ?>" id="<?php echo 'beforeGSTVal' . $index ?>" value="<?php echo $record->CGST; ?>" /><!-- CGST-->
-																	<input type="hidden" name="<?php echo 'AfterGSTVal' . $index ?>" id="<?php echo 'AfterGSTVal' . $index ?>" value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
-																	<input type="hidden" name="<?php echo 'beforeAfterGSTVal' . $index ?>" id="<?php echo 'beforeAfterGSTVal' . $index ?>" value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
-																	<input type="hidden" name="<?php echo 'OtherTaxVal' . $index ?>" id="<?php echo 'OtherTaxVal' . $index ?>" value="<?php echo $record->IGST; ?>" /><!-- IGST-->
-																	<input type="hidden" name="<?php echo 'beforeOtherTaxVal' . $index ?>" id="<?php echo 'beforeOtherTaxVal' . $index ?>" value="<?php echo $record->IGST; ?>" /><!-- IGST-->
-																	<input type="hidden" name="<?php echo 'AfterOtherTaxVal' . $index ?>" id="<?php echo 'AfterOtherTaxVal' . $index ?>" value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
-																	<input type="hidden" name="<?php echo 'beforeAfterOtherTaxVal' . $index ?>" id="<?php echo 'beforeAfterOtherTaxVal' . $index ?>" value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
-																	<!-- <input type="hidden" name="<?php echo 'FreightOption' . $index ?>" id="<?php echo 'FreightOption' . $index ?>" value="<?php echo isset($record->FreightCalulatedOn) ? $record->FreightCalulatedOn : ''; ?>" /> -->
-																	<input type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeFreightType' . $index ?>" id="<?php echo 'beforeFreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
-																	<input type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeFreightVal' . $index ?>" id="<?php echo 'beforeFreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-																	<input type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeAfterFreightVal' . $index ?>" id="<?php echo 'before-AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-																	<input type="hidden" name="<?php echo 'Nooftrips' . $index ?>" id="<?php echo 'Nooftrips' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeNooftrips' . $index ?>" id="<?php echo 'beforeNooftrips' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-																	<input type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
-																	<input type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeInsval' . $index ?>" id="<?php echo 'beforeInsval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
-																	<input type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeqty' . $index ?>" id="<?php echo 'beforeqty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
-																	<input type="hidden" name="<?php echo 'beforeitemRate' . $index ?>" id="<?php echo 'beforeitemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-
-
-
-																	<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="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>
-																</tr>
-															<?php
-
-
-																$totBasicAmt  = $totBasicAmt + $record->BasicValue;
-																$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
-																$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
-																$totExciseAmt  = isset($record->AfterExciseDuty) ? $totExciseAmt + $record->AfterExciseDuty : "";
-																$totVATAmt  = $totVATAmt + $record->AfterSGST;
-																//$totCSTAmt  = $totCSTAmt + $record->AfterCST;
-																$totGSTAmt  = $totGSTAmt + $record->AfterCGST;
-
-																$totOtherTaxAmt   = $totOtherTaxAmt + $record->AfterIGST;
-																$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
-																$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
-																$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
-															}
-															?>
-														<?php
-															$RowCount =   $index;
-														}
-														?>
-													</tbody>
-												</table>
-											</div>
-											<!-- /.box-body -->
-											<br>
-											<div class="row">
-												<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' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount', number_format($totBasicAmt, 2, '.', '')), 'id' => 'txtTotBasicAmount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-														echo form_input($data);
-														?>
-
-
-													</div>
-													<div class="form-group 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 num', 'readonly' => 'true', 'style' => 'text-align:right;');
-														echo form_input($data);
-														?>
-
-													</div>
-													<div class="form-group col-md-3" id="SGSTShow">
-														<label>Total SGST Amount <?php echo "($INRSYM)" ?></label>
-
-														<?php
-														$data = array('name' => 'txtTotalVat', 'value' => set_value('txtTotalVat', number_format($totVATAmt, 2, '.', '')), 'id' => 'txtTotalVat',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-														echo form_input($data);
-														?>
-
-													</div>
-													<div class="form-group col-md-3" id="IGSTShow" style="display:none;">
-														<label>Total IGST Amount In INR </label>
-
-														<?php
-														$data = array('name' => 'txtTotalOtherTaxes', 'value' => set_value('txtTotalOtherTaxes', number_format($totOtherTaxAmt, 2, '.', '')), 'id' => 'txtTotalOtherTaxes',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-														echo form_input($data);
-														?>
-
-													</div>
-													<div class="form-group col-md-3" id="CGSTshow">
-														<label>Total CGST Amount <?php echo "($INRSYM)" ?> </label>
-
-														<?php
-														$data = array('name' => 'txtTotalGST', 'value' => set_value('txtTotalGST', number_format($totGSTAmt, 2, '.', '')), 'id' => 'txtTotalGST', 'readonly' => 'true',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(0);');
-														echo form_input($data);
-														?>
-
-													</div>
-
-												</div>
-												<div class="form-group col-md-12">
-
-
-													<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 num', '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 num', '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 num', '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>
-														<input type="hidden" name="preTotalOdervalue" value="<?php echo $totOrderSummaryAmt; ?>">
-														<?php
-														$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($totOrderSummaryAmt, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-														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', 'id' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'rows' => '8', 'class' => 'form-control');
-																								echo form_textarea($data);
-																								?>
-														<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value=" ">
-													</div>
-												</div>
-												<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>
-														<div class="btn-container" style="text-align: right;">
-															<input type="button" class="btn btn-cancel" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
-															<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 $RowCount; ?>" />
-															<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-															<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
-
-															<!-- <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(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-
-															<!-- <input type="reset" class="btn btn-success" value = "OK">  -->
-														</div>
-
-
-													</div>
-												</div>
-
-
-
-
-
-											</div>
-										</div>
-										<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
-										$Reqon = $Reqon->format('d-m-Y'); ?>
-										<label>Request On :</label><?php echo $Reqon; ?><br>
-										<?php if ($RequesterName != '' || $RequesterName != null) { ?>
-											<label>Request By : </label><?php echo $RequesterName; ?>
-										<?php } ?><br />
-										<label>Status : </label><?php
-																$statusMappings = [
-																	'PO APPROVED' => 'AWAITING APPROVE',
-																	'AWAITING RELEASE' => 'AWAITING APPROVE',
-																	'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-																	'PO RELEASED' => 'PO APPROVED',
-																];
-
-																if (isset($POStatus) && !empty($POStatus)) {
-																	if (isset($statusMappings[$POStatus])) {
-																		echo $statusMappings[$POStatus];
-																	} else {
-																		echo $POStatus;
-																	}
-																} else {
-																	echo "Status not provided";
-																}
-																?>
+								</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="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="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'>
+											<?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 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 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>Action</th>
+										</tr>
+									</thead>
+
+									<tbody id='RevenueAppend'>
+										<?php
+										if (!empty($POItem)) {
+											$index = 0;
+
+											foreach ($POItem as $record) {
+												//print_r($POItem);
+												$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->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>
+													<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 'AvlAmount' . $index ?>" id="<?php echo 'AvlAmount' . $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 'quantity' . $index ?>" id="<?php echo 'quantity' . $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 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
+													<input 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 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
+													<input type="hidden" name="<?php echo 'beforeDisType' . $index ?>" id="<?php echo 'beforeDisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
+													<input type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
+													<input type="hidden" name="<?php echo 'beforeDisVal' . $index ?>" id="<?php echo 'beforeDisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
+													<input type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
+													<input type="hidden" name="<?php echo 'beforeAfterDisVal' . $index ?>" id="<?php echo 'beforeAfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
+													<input type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
+													<input type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
+													<input type="hidden" name="<?php echo 'beforePackType' . $index ?>" id="<?php echo 'beforePackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
+													<input type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
+													<input type="hidden" name="<?php echo 'beforePackVal' . $index ?>" id="<?php echo 'beforePackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
+													<input type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
+													<input type="hidden" name="<?php echo 'beforeAfterPackVal' . $index ?>" id="<?php echo 'beforeAfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
+													<input type="hidden" name="<?php echo 'VatOption' . $index ?>" id="<?php echo 'VatOption' . $index ?>" value="<?php echo isset($record->VatCalulatedOn) ? $record->VatCalulatedOn : ''; ?>" />
+													<input type="hidden" name="<?php echo 'VatVal' . $index ?>" id="<?php echo 'VatVal' . $index ?>" value="<?php echo $record->SGST; ?>" /> <!-- SGST-->
+													<input type="hidden" name="<?php echo 'beforeVatVal' . $index ?>" id="<?php echo 'beforeVatVal' . $index ?>" value="<?php echo $record->SGST; ?>" /><!-- SGST-->
+													<input type="hidden" name="<?php echo 'AfterVatVal' . $index ?>" id="<?php echo 'AfterVatVal' . $index ?>" value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
+													<input type="hidden" name="<?php echo 'beforeAfterVatVal' . $index ?>" id="<?php echo 'beforeAfterVatVal' . $index ?>" value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
+													<input type="hidden" name="<?php echo 'GSTVal' . $index ?>" id="<?php echo 'GSTVal' . $index ?>" value="<?php echo $record->CGST; ?>" /><!-- CGST-->
+													<input type="hidden" name="<?php echo 'beforeGSTVal' . $index ?>" id="<?php echo 'beforeGSTVal' . $index ?>" value="<?php echo $record->CGST; ?>" /><!-- CGST-->
+													<input type="hidden" name="<?php echo 'AfterGSTVal' . $index ?>" id="<?php echo 'AfterGSTVal' . $index ?>" value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
+													<input type="hidden" name="<?php echo 'beforeAfterGSTVal' . $index ?>" id="<?php echo 'beforeAfterGSTVal' . $index ?>" value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
+													<input type="hidden" name="<?php echo 'OtherTaxVal' . $index ?>" id="<?php echo 'OtherTaxVal' . $index ?>" value="<?php echo $record->IGST; ?>" /><!-- IGST-->
+													<input type="hidden" name="<?php echo 'beforeOtherTaxVal' . $index ?>" id="<?php echo 'beforeOtherTaxVal' . $index ?>" value="<?php echo $record->IGST; ?>" /><!-- IGST-->
+													<input type="hidden" name="<?php echo 'AfterOtherTaxVal' . $index ?>" id="<?php echo 'AfterOtherTaxVal' . $index ?>" value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
+													<input type="hidden" name="<?php echo 'beforeAfterOtherTaxVal' . $index ?>" id="<?php echo 'beforeAfterOtherTaxVal' . $index ?>" value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
+													<!-- <input type="hidden" name="<?php echo 'FreightOption' . $index ?>" id="<?php echo 'FreightOption' . $index ?>" value="<?php echo isset($record->FreightCalulatedOn) ? $record->FreightCalulatedOn : ''; ?>" /> -->
+													<input type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
+													<input type="hidden" name="<?php echo 'beforeFreightType' . $index ?>" id="<?php echo 'beforeFreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
+													<input type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
+													<input type="hidden" name="<?php echo 'beforeFreightVal' . $index ?>" id="<?php echo 'beforeFreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
+													<input type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
+													<input type="hidden" name="<?php echo 'beforeAfterFreightVal' . $index ?>" id="<?php echo 'before-AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
+													<input type="hidden" name="<?php echo 'Nooftrips' . $index ?>" id="<?php echo 'Nooftrips' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
+													<input type="hidden" name="<?php echo 'beforeNooftrips' . $index ?>" id="<?php echo 'beforeNooftrips' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
+													<input type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
+													<input type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
+													<input type="hidden" name="<?php echo 'beforeInsval' . $index ?>" id="<?php echo 'beforeInsval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
+													<input type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
+													<input type="hidden" name="<?php echo 'beforeqty' . $index ?>" id="<?php echo 'beforeqty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+													<input type="hidden" name="<?php echo 'beforeitemRate' . $index ?>" id="<?php echo 'beforeitemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+
+
+
+													<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="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>
+												</tr>
+											<?php
+
+
+												$totBasicAmt  = $totBasicAmt + $record->BasicValue;
+												$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
+												$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
+												$totExciseAmt  = isset($record->AfterExciseDuty) ? $totExciseAmt + $record->AfterExciseDuty : "";
+												$totVATAmt  = $totVATAmt + $record->AfterSGST;
+												//$totCSTAmt  = $totCSTAmt + $record->AfterCST;
+												$totGSTAmt  = $totGSTAmt + $record->AfterCGST;
+
+												$totOtherTaxAmt   = $totOtherTaxAmt + $record->AfterIGST;
+												$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
+												$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
+												$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
+											}
+											?>
+										<?php
+											$RowCount =   $index;
+										}
+										?>
+									</tbody>
+								</table>
+							</div>
+							<br>
+							<div class="form-row">
+								<div class="form-group 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 num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+
+								</div>
+								<div class="form-group 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 num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3" id="SGSTShow">
+									<label>Total SGST Amount <?php echo "($INRSYM)" ?></label>
+
+									<?php
+									$data = array('name' => 'txtTotalVat', 'value' => set_value('txtTotalVat', number_format($totVATAmt, 2, '.', '')), 'id' => 'txtTotalVat',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3" id="IGSTShow" style="display:none;">
+									<label>Total IGST Amount In INR </label>
+
+									<?php
+									$data = array('name' => 'txtTotalOtherTaxes', 'value' => set_value('txtTotalOtherTaxes', number_format($totOtherTaxAmt, 2, '.', '')), 'id' => 'txtTotalOtherTaxes',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3" id="CGSTshow">
+									<label>Total CGST Amount <?php echo "($INRSYM)" ?> </label>
+
+									<?php
+									$data = array('name' => 'txtTotalGST', 'value' => set_value('txtTotalGST', number_format($totGSTAmt, 2, '.', '')), 'id' => 'txtTotalGST', 'readonly' => 'true',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(0);');
+									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 num', '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 num', '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 num', '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>
+									<input type="hidden" name="preTotalOdervalue" value="<?php echo $totOrderSummaryAmt; ?>">
+									<?php
+									$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($totOrderSummaryAmt, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary',  '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-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);
+																			?>
+									<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value=" ">
+								</div>
+							</div>
+							<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>
+									<div class="btn-container" style="text-align: right;">
+										<input type="button" class="btn btn-cancel" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
+										<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 $RowCount; ?>" />
+										<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+										<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+
+										<!-- <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(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+
+										<!-- <input type="reset" class="btn btn-success" value = "OK">  -->
+									</div>
+
+
+								</div>
+							</div>
+							<div class="form-row">
+								<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
+								$Reqon = $Reqon->format('d-m-Y'); ?>
+								<label>Request On :</label><?php echo $Reqon; ?><br>
+								<?php if ($RequesterName != '' || $RequesterName != null) { ?>
+									<label>Request By : </label><?php echo $RequesterName; ?>
+								<?php } ?><br />
+								<label>Status : </label><?php
+														$statusMappings = [
+															'PO APPROVED' => 'AWAITING APPROVE',
+															'AWAITING RELEASE' => 'AWAITING APPROVE',
+															'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+															'PO RELEASED' => 'PO APPROVED',
+														];
+
+														if (isset($POStatus) && !empty($POStatus)) {
+															if (isset($statusMappings[$POStatus])) {
+																echo $statusMappings[$POStatus];
+															} else {
+																echo $POStatus;
+															}
+														} else {
+															echo "Status not provided";
+														}
+														?>
+							</div>
+
 						</div> <!-- end card body-->
 					</div> <!-- end card -->
 				</div><!-- end col-->
@@ -2074,6 +1474,526 @@ if (!empty($INRSYMBOL)) {
 		</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 modal-lg">
+		<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>
+					<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="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+			</div>
+		</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 modal-lg">
+		<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>
+					</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-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 -->
+<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>
+
+						<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</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
+
+									$data = array('name' => 'EditMaterialCode', 'value' => set_value('EditMaterialCode'), 'id' => 'EditMaterialCode',  'class' => 'form-control', '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' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-group 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="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;');
+										echo form_input($data);
+										?>
+
+									</div>
+								</div>
+								<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;');
+										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" style="padding-left: 0px;">
+									<label>Basic Amt <?php echo "($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 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' => 'calculateDiscount();', '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">
+							<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();');
+									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' => 'calculateFreight();', '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" 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' => 'calculatePackaging();', '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" 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
+									$data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;');
+									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' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+						</div>
+						<div class="form-row" 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
+									$data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat',  'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;');
+									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' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat',  'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+
+							</div>
+						</div>
+						<div class="form-row" 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
+									$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
+									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' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax',  '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-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="col-md-4 col-md-offset-8">
+								<label>Total Order Amt <?php echo "($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">
+
+							<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>
+				<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 -->
+<div id="freightmodel" 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">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>
+					</div>
+					<div class="radio">
+						<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-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				<a class="btn btn-info waves-effect waves-light" ID="PackagingOption" 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 modal-lg">
+		<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>
+					<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>
+
+				</form>
+			</div>
+			<div class="modal-footer">
+				<a class="btn btn-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				<a class="btn btn-info waves-effect waves-ligh" 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 modal-lg">
+		<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>
+					</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-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 -->
 
 <script type="text/html" id="RevenueList">
 	<tr id="<%=index%>">
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index bd260343..43e1549a 100644
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -3652,7 +3652,7 @@ if (!empty($getlogpodtl)) {
 <!-- 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-dialog modal-lg">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Excise Duty Calculation On</h4>
@@ -3689,7 +3689,7 @@ if (!empty($getlogpodtl)) {
 <!-- 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-dialog modal-lg">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Vat Calculation On</h4>
@@ -3719,7 +3719,7 @@ if (!empty($getlogpodtl)) {
 <!-- 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-dialog modal-lg">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">CST Calculation On</h4>
@@ -3748,7 +3748,7 @@ if (!empty($getlogpodtl)) {
 <!-- 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-dialog modal-lg">
 		<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>
@@ -3816,7 +3816,7 @@ if (!empty($getlogpodtl)) {
 <!-- 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-dialog modal-lg">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Update Bill Details</h4>
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index 84c3d250..544ce695 100644
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -1002,7 +1002,7 @@ foreach ($PaymentTerms as $TER) {
 								<!-- Model for servicepo -->
 
 								<div class="modal fade" id="EDITSERVICE" role="dialog">
-									<div class="modal-dialog">
+									<div class="modal-dialog modal-lg">
 										<!-- Modal content-->
 										<form>
 											<div class="modal-content" style="width:900px;">
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index d7b2a4f9..d84483ec 100644
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -86,8 +86,8 @@ if (!empty($INRSYMBOL)) {
 <script>
 	$(document).ready(function() {
 		$("#PaymentTerms").select2();
-		
-		
+
+
 		clearTotalItemValues();
 		if ($("#insurance").val() == 1) {
 
@@ -1759,1359 +1759,1314 @@ if (!empty($INRSYMBOL)) {
 		background-color: white;
 	}
 </style>
-<div class="content-wrapper">
-	<?php
-	$attributes = array('class' => 'form-label-left CreatePO ', 'name'  => 'CreatePO', 'id'  => 'CreatePO', 'enctype' => 'multipart/form-data');
-
-	echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
-	<section class="content">
-		<div class="box">
-			<div id="content"></div>
-			<div class="header-container">
-				<h2>Revenue Purchase Order</h2>
-				<a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a>
+<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">
+						<h4><?= "Revenue Purchase Order"; ?></h4>
+						<a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a>
+					</div>
+				</div>
 			</div>
-			<div class="container-fluid">
-				<div class="row">
-					<div class="col-md-12">
-						<div class="col-md-3">
-							<label>Requistion No</label>
+			<!-- end page title -->
+			<!-- Form row -->
+			<div class="row">
+				<div class="col-12">
+					<div class="card">
+						<div class="card-body">
 							<?php
-							$options = array("0" => 'Selected Requisition Numbers');
-							if (!empty($ReqList)) {
-								foreach ($ReqList as $SID) :
-									$options[$SID->ReqNo] = $SID->ReqNo . "-" . $SID->ReqBy;
-									$ReqType = $SID->ReqType;
-								endforeach;
-							}
-							echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
-							?>
-						</div>
+							$attributes = array('class' => 'form-label-left CreatePO ', 'name'  => 'CreatePO', 'id'  => 'CreatePO', 'enctype' => 'multipart/form-data');
+							echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
+
+
+
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Requistion No</label>
+									<?php
+									$options = array("0" => 'Selected Requisition Numbers');
+									if (!empty($ReqList)) {
+										foreach ($ReqList as $SID) :
+											$options[$SID->ReqNo] = $SID->ReqNo . "-" . $SID->ReqBy;
+											$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>
+										<?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="form-group 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'), 'id="drpSupplier" required="true" class="form-control select2"');
+
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Supplier Address</label>
+									<div>
+										<?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 class="form-row">
+								<div class="form-group 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;" . form_radio(array(
+												"name" => "Range",
+												"id" => "Local",
+												"value" => "0",
+												'checked' => 'checked',
+												'onchange' => 'SetVatorCST();'
+											));
+											?> &nbsp;&nbsp;&nbsp;&nbsp;
+											<?php
+											echo form_label('Inter state', 'Inter_state') . "&nbsp;" . form_radio(array(
+												"name" => "Range",
+												"id" => "Inter_state",
+												"value" => "1",
+												'onchange' => 'SetVatorCST();'
+											));
+											?>
+										</div>
+									</div>
+								</div>
+								<div class="form-group 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;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "0", "checked" => "checked")); ?>&nbsp;&nbsp;&nbsp;&nbsp;
+										<?php echo form_label('Schedule', 'Schedule') . "&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1")); ?>
+									</div>
+								</div>
+								<div class="form-group col-md-3" id="Deliverydtdiv">
+									<label>Delivery Date<span class="badge mandatory">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $CurrentDate), '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="badge mandatory">*</span></label>
+									<?php
+									$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+									echo Form_textarea($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Delivery Address</label>
+									<div>
+										<?php
+										$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $CompanyAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
+										echo Form_textarea($data);
+										?>
+									</div>
+								</div>
+							</div>
+
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Purchase Order Date</label>
+									<div>
+										<?php
+										$data = array('name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), '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>
+
+										<?php
+										$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment'), 'id' => 'addmodeofshipment',  'class' => 'form-control');
+										echo form_input($data);
+										?>
+									</div>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Contact Reference</label>
+									<div>
+
+										<?php
+										$data = array('name' => 'addsupplierreference', 'value' => set_value('addsupplierreference'), 'id' => 'addsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Supplier's Offer No</label>
+									<div>
+
+										<?php
+										$data = array('name' => 'addsupplierofferno', 'value' => set_value('addsupplierofferno'), 'id' => 'addsupplierofferno',  '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>
+
+										<?php
+										$data = array('name' => 'addotherreference', 'value' => set_value('addotherreference'), 'id' => 'addotherreference',  'class' => 'form-control');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Revenue Type Options</label>
+									<div>
+
+										<?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>
+								<div class="form-group col-md-3">
+									<label for="payablefrom">Payable Terms</label>
+									<?php
+									if (!empty($Payment)) {
+										$options6 = array("0" => 'Select Payment Terms ');
+										foreach ($Payment as $pay) :
+											$options6[$pay->PaymentID] =  $pay->PaymentTerms;
+										endforeach;
+									}
+									echo form_dropdown('PaymentTerms', $options6, 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="badge mandatory">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+							</div>
+
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label for="insurance">Insurance Options</label>
+									<div>
+										<?php
+										$optionsnew = array('1' => 'Yes', '0' => 'No');
+										echo form_dropdown('insurance', $optionsnew, set_value('insurance'), 'id="insurance" required="true" class="form-control select2"');
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3" id="InsuranceNumberdiv" style="display:block;">
+									<label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('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>
+									<?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-12 text-right">
+									<!-- <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
+									<a data-toggle="modal"><button type="submit" onclick="openModal();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
+								</div>
+							</div>
+
+							<!-- Table -->
+							<div class="form-row">
+								<div class="table-responsive">
+									<table id="revenueTax" class="table table-striped table-hover mb-0" style="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 "($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='RevenueAppend'></tbody>
+									</table>
+								</div>
+							</div>
+							</br>
+							<!-- /.table -->
+
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Basic Amount <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount'), 'id' => 'txtTotBasicAmount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Total Discount Amount <?php echo "($INRSYM)" ?> </label>
+
+									<?php
+									$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount'), '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'), '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'), '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'), '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'), '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'), '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'), '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'), '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'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '8');
+									echo Form_textarea($data);
+									?>
+									<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-4 col-md-offset-8"><br />
+									<input type="file" name="POFile" id="POFile"><br>
+									<input type="hidden" name="txtPoRange" id="txtPoRange" />
+									<input type="hidden" name="isEdit" id="isEdit" value="0" />
+									<input type="hidden" name="txtStatus" id="txtStatus" />
+									<input type="hidden" name="txtRowCount" id="txtRowCount" />
+									<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+									<input type="hidden" name="Budget" id="Budget" />
+									<div class="btn-container" style="text-align: right;">
+										<a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+										<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+										<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+									</div>
+								</div><br />
+							</div>
+						</div> <!-- end card body-->
+					</div> <!-- end card -->
+				</div><!-- end col-->
+			</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 modal-lg">
+		<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>
+					<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-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				<a class="btn btn-info waves-effect waves-light" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+			</div>
+		</div>
+	</div>
+</div><!-- /.modal -->
+<!-- Modal for freight Calculation-->
+<div id="freightcalmodel" 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">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>
+					</div>
+					<div class="radio">
+						<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-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				<a class="btn btn-info waves-effect waves-light" 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 modal-lg">
+		<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>
+					<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>
+
+				</form>
+			</div>
+			<div class="modal-footer">
+				<a class="btn btn-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				<a class="btn btn-info waves-effect waves-light" 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 modal-lg">
+		<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>
+					</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-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				<a class="btn btn-info waves-effect waves-light" 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 id="CSTCalModel" 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">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>
+					</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-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>
+		</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 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="col-md-3">
-							<label>Purchase Order Type</label>
+							<label>Req No<span class="text-danger" 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('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' => 'POType', 'value' => set_value('POType', $ReqType), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
+								$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>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'), 'id="drpSupplier"', 'required="true"', 'class="form-control select2');
-
-							?>
-						</div>
-						<div class="col-md-3">
-							<label>Supplier Address</label>
+							<label>Cost Center Code</label>
 							<div class="form-group">
 								<?php
-								$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
-								echo Form_textarea($data);
+
+								$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>
-				<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">
+					<div class="form-row">
+						<div class="col-md-2">
+							<label>Item Code<span class="text-danger" 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"');
+
+								?>
+							</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>Qty<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+								<div class="form-group">
 									<?php
-									echo form_label('Local', 'Local') . "&nbsp;" . form_radio(array(
-										"name" => "Range",
-										"id" => "Local",
-										"value" => "0",
-										'checked' => 'checked',
-										'onchange' => 'SetVatorCST();'
-									));
-									?> &nbsp;&nbsp;&nbsp;&nbsp;
+									$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="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+								<!-- <label>Rate</label> -->
+								<div class="form-group">
 									<?php
-									echo form_label('Inter state', 'Inter_state') . "&nbsp;" . form_radio(array(
-										"name" => "Range",
-										"id" => "Inter_state",
-										"value" => "1",
-										'onchange' => 'SetVatorCST();'
-									));
+									$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>
+								<!-- <label>Basic Amount</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="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;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "0", "checked" => "checked")); ?>&nbsp;&nbsp;&nbsp;&nbsp;
-								<?php echo form_label('Schedule', 'Schedule') . "&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1")); ?>
-							</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', $CurrentDate), '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'), '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', $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 class="col-md-3">
-							<label>Purchase Order Date</label>
-							<div class="form-group">
+					<div class="form-row" style="padding:0px;">
+						<div class="form-group col-md-4"></div>
+						<div class="form-group col-md-4">
+							<label>Discount Type </label>
+							<div>
 								<?php
-								$data = array('name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), '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">
+								$options = array("0" => 'Select Discount Type');
+								//print_r(  $options);
 
-								<?php
-								$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment'), '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' => 'addsupplierreference', 'value' => set_value('addsupplierreference'), 'id' => 'addsupplierreference',  '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' => 'addsupplierofferno', 'value' => set_value('addsupplierofferno'), 'id' => 'addsupplierofferno',  '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' => 'addotherreference', 'value' => set_value('addotherreference'), 'id' => 'addotherreference',  'class' => 'form-control');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="col-md-3">
-							<label>Revenue Type Options</label>
-							<div class="form-group">
-
-								<?php
-
-								$optionsPO = array("0" => 'Select');
+								if (!empty($TaxType)) {
+									foreach ($TaxType as $SID) :
 
 
-								if (!empty($PoTypeOptions)) {
-									foreach ($PoTypeOptions as $POpt) :
-
-
-										$optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
+										$options[$SID->ConfigValue] =  $SID->ConfigValue;
 
 									endforeach;
 								}
 
-								echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
-
+								echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType"', 'class="form-control"');
 
 								?>
 							</div>
 						</div>
-						<div class="col-md-3">
-							<label for="payablefrom">Payable Terms</label>
-							<?php
-							if (!empty($Payment)) {
-								$options6 = array("0" => 'Select Payment Terms ');
-								foreach ($Payment as $pay) :
-									$options6[$pay->PaymentID] =  $pay->PaymentTerms;
-								endforeach;
-							}
-							echo form_dropdown('PaymentTerms', $options6, 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-2">
+							<label>Discount Rate </label>
 							<div class="form-group">
 								<?php
-								$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+								$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>
+							<?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-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>
+							<?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 class="form-group col-md-2">
+							<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
+							<?php
+							$data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging', 0.00), 'id' => 'txtAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true');
+							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>
+							<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>
+							<?php
+							$data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight', 0.00), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+							echo form_input($data);
+							?>
+						</div>
+
+					</div>
+
+
+					<!-- cgst -->
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-2">
+							<label>CGST In %</label>
+							<?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 class="form-group col-md-2">
+							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+							<?php
+							$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0.00), 'id' => 'AfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+
+					<!-- sgst -->
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div id="SGSTAddModel">
+							<div class="form-group col-md-2">
+								<label>SGST In %</label>
+								<?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 class="form-group col-md-2">
+								<label>SGST Amt <?php echo "($INRSYM)" ?></label>
+								<?php
+								$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0.00), 'id' => 'AfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div id="IGSTAddModel" style="display:none;">
+							<div class="form-group col-md-2">
+								<label>IGST In %</label>
+								<?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 class="form-group col-md-2">
+								<label>IGST Amt <?php echo "($INRSYM)" ?></label>
+								<?php
+								$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0.00), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => '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</label>
-							<div class="form-group">
-								<?php
-								$optionsnew = array('1' => 'Yes', '0' => 'No');
-								echo form_dropdown('insurance', $optionsnew, set_value('insurance'), 'id="insurance"', 'required="true"', 'class="form-control select2');
-								?>
-							</div>
-						</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'), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="col-md-3">
-							<label for="BudgetType">Budget Type</label>
+
+					<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>
 							<?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>
-
-				<div class="btn-container">
-					<div class="row">
-						<div class="col text-right">
-							<!-- <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
-							<a data-toggle="modal"><button type="submit" onclick="openModal();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
-						</div>
-					</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">
-								<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="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-							</div>
-						</div>
-
-					</div>
-				</div>
-				<!-- Modal for freight Calculation-->
-				<div id="freightcalmodel" 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="optFreight" checked="checked" value='0' id="optFreight"> Basic Amount</label>
-									</div>
-									<div class="radio">
-										<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">
-								<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>
-									<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>
-
-								</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="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">
-								<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-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 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>
-
-
-						
-						<!-- 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>
-										<div align="left">
-											<div>
-												<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>
-															<?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" 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"');
-
-															?>
-														</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>Qty<span class="badge mandatory" 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' => 'change()');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-														<div class="col-md-3">
-															<label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory" style="color:red;text-align:right;background-color: #fff;">*</span></label>
-															<!-- <label>Rate</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>
-															<!-- <label>Basic Amount</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>
-											<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', 0.00), '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', 0.00), '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', 0.00), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-
-												</div>
-
-
-												<!-- cgst -->
-												<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.00), 'id' => 'AfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-												</div>
-
-												<!-- sgst -->
-												<div class="col-md-12">
-													<div class="col-md-8"></div>
-													<div id="SGSTAddModel">
-														<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>
-														</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.00), 'id' => 'AfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-													</div>
-													<div id="IGSTAddModel" style="display:none;">
-														<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.00), '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', 0.00), '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', 0.00), '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' => 'Service_Description', 'value' => set_value('Service_Description'), 'id' => '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>
-
-						<!-- Edit Model for revenue po -->
-						<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" style="color:red;text-align:right;background-color: #fff;">*</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', '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" style="color:red;text-align:right;background-color: #fff;">*</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" 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', '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" 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', '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', 'readonly' => 'true', 'style' => 'text-align:right;');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-													</div>
-												</div>
-											</div>
-											<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();', '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">
-											    <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.00), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-
-											</div>
-											
-											<div class="col-md-12" style="text-align:left;">
-												<div 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.00), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-												</div>
-											</div>
-											<div class="col-md-12" style="text-align:left;">
-												<div 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.00), 'id' => 'EditAfterIgst',  '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 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">
-													<div class="form-group">
-														<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
-														<?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">
-												<label><?php echo "Reveneue 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 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 EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
-
-												</div>
-
-											</div>
-										</div>
-										<br />
-										<!-- footer for revenue po -->
-										<div class="modal-footer">
-
-										</div>
-									</div>
-
-							</div>
-							</form>
-						</div>
-					    </br>
-
-						<!-- Table box-body -->
-						<div class="box-body">
-						 <div class="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>Action</th>
-									</tr>
-								</thead>
-
-								<tbody id='RevenueAppend'></tbody>
-							</table>
-						 </div>
-						</div>
-						</br>
-						<!-- /.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'), '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'), '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'), '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'), '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'), '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'), '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'), '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'), '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'), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+							$data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance', 0.00), 'id' => 'txtInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
 							echo form_input($data);
 							?>
 						</div>
 					</div>
-					<div class="col-md-12">
-						<div class="col-md-12">
-							<label>Special Instructions </label>
+
+					<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' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '8');
-							echo Form_textarea($data);
+							$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue', 0.00), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
+							echo form_input($data);
 							?>
-							<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
 						</div>
 					</div>
+					<div class="form-row">
+						<div class="form-group col-md-12">
+							<label><?php echo "Revenue Description"; ?></label>
+							<?php
+							$data = array('name' => 'Service_Description', 'value' => set_value('Service_Description'), 'id' => 'Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
+							echo form_textarea($data);;
+							?>
+						</div>
+					</div>
+
+
 				</div>
-				<div class="row" style="padding: 2% 0%">
-						<div class="col-md-4 col-md-offset-8"><br />
-							<input type="file" name="POFile" id="POFile"><br>
-							<input type="hidden" name="txtPoRange" id="txtPoRange" />
-							<input type="hidden" name="isEdit" id="isEdit" value="0" />
-							<input type="hidden" name="txtStatus" id="txtStatus" />
-							<input type="hidden" name="txtRowCount" id="txtRowCount" />
-							<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-							<input type="hidden" name="Budget" id="Budget" />
-							<div class="btn-container" style="text-align: right;">
-								<a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-								<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-								<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-							</div>
-						</div><br />
-				</div>
-					
-			</div>
+				<br /><br />
+
+
 		</div>
-	</section>
+		<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" style="color:red;text-align:right;background-color: #fff;">*</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', '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" style="color:red;text-align:right;background-color: #fff;">*</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-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="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', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-group col-md-3">
+								<label><?php echo "Rate  ($INRSYM)" ?><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', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<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="form-group 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', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<div class="form-row">
+						<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="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();', '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="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="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="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="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">
+						<div class="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.00), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+
+					</div>
+
+					<div class="form-row" style="text-align:left;">
+						<div id="SGSTEditModel">
+							<div class="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.00), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="form-row" style="text-align:left;">
+						<div id="IGSTEditModel" style="display:none;">
+							<div class="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.00), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<div class="form-row">
+						<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="form-row">
+						<div class="col-md-8"></div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
+								<?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 "Reveneue 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 -->
+
+
+
+
 
 <script type="text/html" id="RevenueList">
 	<tr id="<%=index%>">
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php
index edb0f790..e44d5362 100644
--- a/app/Views/servicePurchaseorder.php
+++ b/app/Views/servicePurchaseorder.php
@@ -567,10 +567,6 @@ if (!empty($INRSYMBOL)) {
 	});
 </script>
 <style>
-	.modal {
-		padding-right: 25% ! important;
-	}
-
 	.dataTables_paginate {
 		margin-top: -5%;
 	}
@@ -583,19 +579,6 @@ if (!empty($INRSYMBOL)) {
 		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; */
@@ -607,972 +590,966 @@ if (!empty($INRSYMBOL)) {
 	.centered input {
 		margin: 0 5px;
 	}
-
-	.mandatory {
-		color: red;
-		text-align: right;
-		background-color: white;
-	}
 </style>
-<div class="content-wrapper">
-	<?php
-	$attributes = array('class' => 'form-label-left ServicePO ', 'name'  => 'ServicePO', 'id'  => 'ServicePO', 'enctype' => 'multipart/form-data');
-	echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
-
-	<section class="content">
-		<div class="box">
-			<div id="content"></div><!-- content div closed here -->
-			<div class="header-container">
-				<h2>Service Purchase Order</h2>
-				<a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a>
-			</div> <!-- header-container div closed here -->
-			<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) :
-
-									// print_r($SID->ReqNo);
-									$options[$SID->ReqNo] = $SID->ReqNo . "-" . $SID->ReqBy;
-									$ReqType = $SID->ReqType;
-								endforeach;
-							}
-							echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"');
-
-							?>
-
-						</div> <!-- 1.1. col-md-3 div closed here -->
-						<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> <!-- 1.2. col-md-3 div closed here -->
-						<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'), 'id="drpSupplier"', 'required="true"', 'class="form-control select2');
-
-							?>
-
-						</div> <!-- 1.3. col-md-3 div closed here -->
-						<div class="col-md-3">
-							<label>Supplier Address</label>
-							<div class="form-group">
-								<?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> <!-- 1.4. col-md-3 div closed here -->
-					</div> <!-- 1. col-md-12 div closed here -->
-				</div> <!-- 1. row div closed here -->
-				<div class="row">
-					<div class="col-md-12">
-						<div class="col-md-3">
-							<label>Work Status<span class="badge mandatory">*</span></label>
-							<?php
-
-							$optionsWork = array("0" => 'Select Work Status');
-							//print_r(  $options);
-
-							if (!empty($WorkStatus)) {
-								foreach ($WorkStatus as $WID) :
-
-
-									$optionsWork[$WID->StatusCode] =  $WID->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", "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 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', $CurrentDate), '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'), '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', $CompanyAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => '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">
+						<h4><?= "Service Purchase Order"; ?></h4>
+						<a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a>
 					</div>
-				</div><!-- 2. row div closed here -->
-				<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', $CurrentDate), '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'), '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' => 'addsupplierreference', 'value' => set_value('addsupplierreference'), 'id' => 'addsupplierreference',  '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' => 'addsupplierofferno', 'value' => set_value('addsupplierofferno'), 'id' => 'addsupplierofferno',  'class' => 'form-control');
-								echo form_input($data);
-								?>
-							</div>
-
-						</div>
-					</div>
-				</div><!-- 3. row div closed here -->
-				<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' => 'addotherreference', 'value' => set_value('addotherreference'), 'id' => 'addotherreference',  '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
-								//$optionsWork = array("0"=>'Select Work Status');     
-								$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>
-						<div class="col-md-3">
-							<label>Payment Terms<span class="badge mandatory">*</span></label>
-							<?php
-							if (!empty($Payment)) {
-								$options6 = array("0" => 'Select Payment Terms ');
-								foreach ($Payment as $pay) :
-									$options6[$pay->PaymentID] =  $pay->PaymentTerms;
-								endforeach;
-							}
-
-							echo form_dropdown('PaymentTerms', $options6, 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>
-				</div><!-- 4. row div closed here -->
-				<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>
-				</div><!-- 5. row div closed here -->
-				<div class="col-md-12">
-					<div class="row">
-						<div class="btn-container" style="text-align: right; ">
-							<a data-toggle="modal"><button type="submit" onclick="openModal();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
-						</div>
-					</div><!-- 6. row div closed here -->
 				</div>
-				<div class="container-fluid">
-					<table class="table table-bordered" style="border:1px solid #333" id="ServiceTable">
-
-						<div class="modal fade" id="SERVICE" role="dialog">
-							<div class="modal-dialog">
-								<form>
-									<div class="modal-content" style="width:900px;">
-										<div class="modal-header">
-											<center>
-												<h4>Add Service Purchase Order Item </h4>
-											</center>
-										</div><!-- SERVICE modal-header closed here -->
-										<div align="left">
-											<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>Avail Budget Amount <?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><!-- SERVICE.1 closed here -->
-											<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('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control"');
-
-														?>
-													</div>
-												</div>
-												<div class="col-md-3">
-													<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-3" id="otherdescription">
-													<label>Item Description</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'OtheritemDescription', 'value' => set_value('OtheritemDescription'), 'id' => 'OtheritemDescription',  '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' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-3">
-													<label>Service Schedule Type</label>
-													<div>
-														<?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>
-												</div>
-
-
-											</div><!-- SERVICE.2 closed here -->
-											<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' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
-														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' => 'Ratechange()');
-														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 Amount ($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><!-- SERVICE.3 closed here -->
-											<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' => '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'), 'id' => 'AfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-
-												</div>
-
-											</div><!-- SERVICE.4 closed here -->
-											<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' => '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'), 'id' => 'AfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-
-												</div>
-
-											</div><!-- SERVICE.5 closed here -->
-											<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' => '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'), 'id' => 'AfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-
-												</div>
-
-											</div><!-- SERVICE.6 closed here -->
-											<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' => '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><!-- SERVICE.7 closed here -->
-											<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' => 'TotalOrderValue', 'value' => set_value('TotalOrderValue'), 'id' => 'TotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div><!-- SERVICE.8 closed here -->
-
-
-											<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
-												<label>Service Description </label>
-
-
-												<?php
-												$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-												echo form_textarea($data); ?>
-
-											</div><!-- SERVICE modal-footer closed here -->
-
-
-											<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><!-- SERVICE modal-footer closed here -->
-										</div><!-- SERVICE left closed here -->
-									</div><!-- SERVICE modal-content closed here -->
-								</form><!-- SERVICE form closed here -->
-							</div><!-- SERVICE modal-dialog closed here -->
-						</div><!-- SERVICE modal closed here -->
-
-						<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">
-											<!--  <button type="button" class="close" data-dismiss="modal">&times;</button> -->
-											<center>
-												<h4>Edit Service Purchase Order Item </h4>
-											</center>
-										</div><!-- EDITSERVICE modal-header closed here -->
-										<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><!-- EDITSERVICE.1.1 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.1.2 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.1.3 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.1.4 col-md-3 closed here -->
-											</div><!-- EDITSERVICE.1 col-md-12 closed here -->
-											<div class="col-md-12">
-												<div class="col-md-3">
-													<label>Item Code<span class="badge mandatory" #fff ;">*</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><!-- EDITSERVICE.2.1 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.2.2 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.2.3 col-md-3 closed here -->
-												<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 num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div><!-- EDITSERVICE.2.4 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.2.5 col-md-3 closed here -->
-											</div><!-- EDITSERVICE.2 col-md-12 closed here -->
-											<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><!-- EDITSERVICE.3.1 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.3.2 col-md-3 closed here -->
-												<div class="col-md-3">
-													<label>Per</label><!--date should be come-->
-													<?php
-													$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
-													echo form_input($data); ?>
-												</div><!-- EDITSERVICE.3.3 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.3.4 col-md-3 closed here -->
-											</div><!-- EDITSERVICE.3 col-md-12 closed here -->
-
-											<div class="col-md-12">
-												<div class="col-md-6" align="right">
-													CGST In %
-												</div><!-- EDITSERVICE.4.1 col-md-6 closed here -->
-												<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><!-- EDITSERVICE.4.2 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.4.3 col-md-3 closed here -->
-											</div><!-- EDITSERVICE.4 col-md-12 closed here -->
-											<div class="col-md-12">
-												<div class="col-md-6" align="right">
-													SGST In %
-												</div><!-- EDITSERVICE.5.1 col-md-6 closed here -->
-
-												<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><!-- EDITSERVICE.5.2 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.5.3 col-md-3 closed here -->
-
-											</div><!-- EDITSERVICE.5 col-md-12 closed here -->
-
-											<div class="col-md-12">
-												<div class="col-md-6" align="right">
-
-													IGST In %
-												</div><!-- EDITSERVICE.6.1 col-md-6 closed here -->
-
-												<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><!-- EDITSERVICE.6.2 col-md-3 closed here -->
-												<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><!-- EDITSERVICE.6.3 col-md-3 closed here -->
-
-											</div><!-- EDITSERVICE.6 col-md-12 closed here -->
-											<div class="col-md-12">
-												<div class="col-md-5 col-md-offset-4" align="right">
-													<label>Other Allowances <?php echo "($INRSYM)" ?></label>
-												</div><!-- EDITSERVICE.7.1 col-md-5 col-md-offset-4 closed here -->
-												<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', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-														echo form_input($data);
-														?>
-													</div>
-												</div><!-- EDITSERVICE.7.2 col-md-3 closed here -->
-											</div><!-- EDITSERVICE.7 col-md-12 closed here -->
-											<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', 'placeholder' => 'Total value', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div><!-- EDITSERVICE.8 col-md-12 closed here -->
-
-											<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
-												<label>Service Description </label>
-												<?php
-												$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-												echo form_textarea($data); ?>
-											</div><!-- EDITSERVICE.9 col-md-12 closed here -->
-
-											<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><!-- EDITSERVICE modal-footer closed here -->
-										</div><!-- EDITSERVICE left closed here -->
-									</div><!-- EDITSERVICE modal-content closed here -->
-								</form><!-- EDITSERVICE form closed here -->
-							</div><!-- EDITSERVICE modal-dialog closed here -->
-						</div><!-- EDITSERVICE modal closed here -->
-
-					</table><!-- ServiceTable table closed here -->
-				</div><!-- container-fluid div closed here -->
-
-				<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 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>Action</th>
-							</tr>
-						</thead>
-						<tbody id='ServiceAppend'>
-						</tbody>
-					</table><!-- serviceTax table closed here -->
-				</div><!-- box-body div closed here -->
-
-
-				<div class="row">
-					<div class="col-md-12" style="padding: 0px;">
-
-						<div class="col-md-2">
-							<label>Basic Amount <?php echo "($INRSYM)" ?></label>
+			</div>
+			<!-- end page title -->
+			<!-- Form row -->
+			<div class="row">
+				<div class="col-12">
+					<div class="card">
+						<div class="card-body">
 							<?php
-							$data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount'), 'id' => 'txtTotBasicAmount',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div><!-- 7.1.1 col-md-2  div closed here -->
-						<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><!-- 7.1.2 col-md-2  div closed here -->
-						<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><!-- 7.1.3 col-md-2  div closed here -->
-						<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><!-- 7.1.4 col-md-2  div closed here -->
-						<div class="col-md-2">
-							<label>Other Allowances <?php echo "($INRSYM)" ?> </label>
-							<?php
-							$data = array('name' => 'TotalOtherAllowances', 'value' => set_value('TotalOtherAllowances'), 'id' => 'TotalOtherAllowances',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
+							$attributes = array('class' => 'form-label-left ServicePO ', 'name'  => 'ServicePO', 'id'  => 'ServicePO', 'enctype' => 'multipart/form-data');
+							echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
 
-						</div><!-- 7.1.5 col-md-2  div closed here -->
-						<div class="col-md-2">
-							<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><!-- 7.1.6 col-md-2  div closed here -->
-					</div><!-- 7.1 col-md-12  div closed here -->
-					<div class="col-md-12">
-						<label>Description Of Service<span class="badge mandatory">*</label>
-						<div class="form-group">
-							<?php
-							$data = array('name' => 'descofpo', 'value' => set_value('descofpo'), 'id' => 'descofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-							echo form_textarea($data);
-							?>
-						</div><!-- 7.2 form-group  div closed here -->
-					</div><!-- 7.2 col-md-12  div closed here -->
-					<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' => '10', 'cols' => '40');
-															echo form_textarea($data); ?>
-						</div><!-- 7.3.1 col-md-12  div closed here -->
-					</div><!-- 7.3 col-md-12  div closed here -->
-					<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="Budget" id="Budget" />
-								<div class="btn-container" style="text-align: right;">
+							<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) :
+
+											// print_r($SID->ReqNo);
+											$options[$SID->ReqNo] = $SID->ReqNo . "-" . $SID->ReqBy;
+											$ReqType = $SID->ReqType;
+										endforeach;
+									}
+									echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"');
+
+									?>
+
+								</div> <!-- 1.1. col-md-3 div closed here -->
+								<div class="form-group col-md-3">
+									<label>Purchase Order Type</label>
+									<div>
+
+										<?php
+										$data = array('name' => 'POType', 'value' => set_value('POType', SERVICE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div> <!-- 1.2. col-md-3 div closed here -->
+								<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'), 'id="drpSupplier" required="true" class="form-control select2');
+
+									?>
+
+								</div> <!-- 1.3. col-md-3 div closed here -->
+								<div class="form-group col-md-3">
+									<label>Supplier Address</label>
+									<div>
+										<?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> <!-- 1.4. col-md-3 div closed here -->
+							</div> <!-- 1. form-row div closed here -->
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Work Status<span class="text-danger">*</span></label>
+									<?php
+
+									$optionsWork = array("0" => 'Select Work Status');
+									//print_r(  $options);
+
+									if (!empty($WorkStatus)) {
+										foreach ($WorkStatus as $WID) :
+
+
+											$optionsWork[$WID->StatusCode] =  $WID->StatusName;
+
+										endforeach;
+									}
+
+									echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus" required="true" class="form-control select2');
+
+
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
+									<div class="centered">
+										<?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "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 class="form-group col-md-3" id="Deliverydtdiv">
+									<label>Delivery Date<span class="text-danger">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $CurrentDate), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3" id="Schedulediv" style="display:none;">
+									<label>Schedule By<span class="text-danger">*</span></label>
+									<?php
+									$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+									echo Form_textarea($data);
+									?>
+
+								</div>
+
+								<div class="form-group col-md-3">
+									<label>Delivery Address</label>
+									<div>
+										<?php
+										$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $CompanyAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
+										echo Form_textarea($data);
+										?>
+									</div>
+								</div>
+							</div> <!-- 2. form-row div closed here -->
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Purchase Order Date</label>
+									<div>
+										<?php
+										$data = array('name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), '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>
+
+										<?php
+										$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment'), 'id' => 'addmodeofshipment',  'class' => 'form-control');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Contact Reference</label>
+									<div>
+
+										<?php
+										$data = array('name' => 'addsupplierreference', 'value' => set_value('addsupplierreference'), 'id' => 'addsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Supplier's Offer No</label>
+									<div>
+
+										<?php
+										$data = array('name' => 'addsupplierofferno', 'value' => set_value('addsupplierofferno'), 'id' => 'addsupplierofferno',  'class' => 'form-control');
+										echo form_input($data);
+										?>
+									</div>
+
+								</div>
+							</div> <!-- 3. form-row div closed here -->
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Our Reference(S)</label>
+									<div>
+
+										<?php
+										$data = array('name' => 'addotherreference', 'value' => set_value('addotherreference'), 'id' => 'addotherreference',  '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>
+										<?php
+										//$optionsWork = array("0"=>'Select Work Status');     
+										$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>
+								<div class="form-group col-md-3">
+									<label>Payment Terms<span class="text-danger">*</span></label>
+									<?php
+									if (!empty($Payment)) {
+										$options6 = array("0" => 'Select Payment Terms ');
+										foreach ($Payment as $pay) :
+											$options6[$pay->PaymentID] =  $pay->PaymentTerms;
+										endforeach;
+									}
+
+									echo form_dropdown('PaymentTerms', $options6, set_value('PaymentTerms'), 'id="PaymentTerms" required="true" class="form-control select2');
+
+									?>
+								</div>
+								<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
+
+									<label>Description of Payable Terms<span class="text-danger">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+
+								</div>
+							</div> <!-- 4. form-row div closed here -->
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Insurance Options<span class="text-danger">*</span></label>
+									<div>
+
+										<?php
+
+										if (!empty($insuranceStatus)) {
+											foreach ($insuranceStatus as $INS) :
+
+
+												$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="form-group col-md-3" id="insuranceTxtDiv" style="display:block;">
+									<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber'), '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>
+									<?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><!-- 5. form-row div closed here -->
+							<div class="form-row">
+								<div class="form-group col-md-12 text-right">
+									<a data-toggle="modal"><button type="submit" onclick="openModal();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
+								</div>
+							</div> <!-- 5. form-row div closed here -->
+							<div class="form-row">
+								<div class="btn-container" style="text-align: right; ">
+								</div>
+							</div><!-- 6. form-row div closed here -->
+							<div class="form-row">
+								<div class="table-responsive">
+									<table id="serviceTax" class="table table-striped table-hover mb-0" style="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>Action</th>
+											</tr>
+										</thead>
+										<tbody id='ServiceAppend'>
+										</tbody>
+									</table><!-- serviceTax table closed here -->
+								</div>
+							</div><!-- 7. form-row div closed here -->
+							<div class="form-row" 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><!-- 7.1.1 col-md-2  div closed here -->
+								<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><!-- 7.1.2 col-md-2  div closed here -->
+								<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><!-- 7.1.3 col-md-2  div closed here -->
+								<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><!-- 7.1.4 col-md-2  div closed here -->
+								<div class="form-group col-md-2">
+									<label>Other Allowances <?php echo "($INRSYM)" ?> </label>
+									<?php
+									$data = array('name' => 'TotalOtherAllowances', 'value' => set_value('TotalOtherAllowances'), 'id' => 'TotalOtherAllowances',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+
+								</div><!-- 7.1.5 col-md-2  div closed here -->
+								<div class="form-group col-md-2">
+									<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><!--  col-md-2  div closed here -->
+							</div><!-- 8 form-row  div closed here -->
+							<div class="form-row">
+							<div class="form-group col-md-12">
+								<label>Description Of Service<span class="text-danger">*</label>
+								
+									<?php
+									$data = array('name' => 'descofpo', 'value' => set_value('descofpo'), 'id' => 'descofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+									echo form_textarea($data);
+									?>
+								</div><!--   div closed here -->
+							</div><!-- 9 form-row  div closed here -->
+							<div class="form-row" style="padding:0px;">
+								<div class="form-group col-md-12">
+									<label>Scope Of Work</label> <?php
+																	$data = array('name' => 'ScopeOfWork', 'value' => set_value('ScopeOfWork'), 'id' => 'ScopeOfWork',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+																	echo form_textarea($data); ?>
+								</div><!--   div closed here -->
+							</div><!-- 10 form-row  div closed here -->
+							<div class="form-row">
+								<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="Budget" id="Budget" />
+										<div class="btn-container" style="text-align: right;">
+
+											<a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+											<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+											<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+										</div><!-- 7.4 btn-container  div closed here -->
+									</div><br /><!-- 7.4 right  div closed here -->
+								</div><!-- 7.4 row  div closed here -->
+							</div><!-- 11 form-row  div closed here -->
+						</div> <!-- end card body-->
+					</div> <!-- end card -->
+				</div><!-- end col-->
+			</div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
+<div id="SERVICE" 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">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="form-row">
+						<div class="form-group 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="form-group col-md-3">
+							<label>Department Name</label>
+							<div>
+								<?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>
+								<?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>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
+							<div>
+								<?php
+								$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div><!-- SERVICE.1 closed here -->
+					<div class="form-row">
+						<div class="form-group 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('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control"');
+
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-3">
+							<label>Item Name</label>
+							<div>
+								<?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-3" id="otherdescription">
+							<label>Item Description</label>
+							<div>
+								<?php
+								$data = array('name' => 'OtheritemDescription', 'value' => set_value('OtheritemDescription'), 'id' => 'OtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+
+
+
+						<div class="form-group col-md-3">
+							<label>UOM</label>
+							<div>
+								<?php
+								$data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control num', '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' => '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>
+						</div>
+
+
+					</div><!-- SERVICE.2 closed here -->
+					<div class="form-row">
+
+						<div class="form-group col-md-3">
+							<label>Quantity<span class="badge mandatory">*</span></label>
+							<div>
+								<?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>
+						<div class="form-group col-md-3">
+							<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
+							<div>
+								<?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>
+
+						<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="form-group col-md-3">
+							<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
+							<div>
+								<?php
+								$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+
+
+					</div><!-- SERVICE.3 closed here -->
+					<div class="form-row">
+						<div class="form-group col-md-6" align="right">
+
+							CGST In %
+						</div>
+
+						<div class="form-group col-md-3">
+							<div>
+
+								<?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>
+
+								<?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>
+
+					</div><!-- SERVICE.4 closed here -->
+					<div class="form-row">
+						<div class="form-group col-md-6" align="right">
+
+							SGST In %
+						</div>
+
+						<div class="form-group col-md-3">
+							<div>
+
+								<?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>
+
+								<?php
+								$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst'), 'id' => 'AfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+
+						</div>
+
+					</div><!-- SERVICE.5 closed here -->
+					<div class="form-row">
+						<div class="form-group col-md-6" align="right">
+
+							IGST In %
+						</div>
+
+						<div class="form-group col-md-3">
+							<div>
+
+								<?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>
+
+								<?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><!-- SERVICE.6 closed here -->
+					<div class="form-row">
+						<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>
+								<?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><!-- SERVICE.7 closed here -->
+					<div class="form-row">
+						<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>
+								<?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><!-- SERVICE.8 closed here -->
+
+
+					<div class="form-row">
+						<label>Service Description </label>
+
+
+						<?php
+						$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+						echo form_textarea($data); ?>
+
+					</div><!-- SERVICE  -->
+
+				</div>
+				<div class="modal-footer">
+					<div class="form-row">
+						<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>
+						<a class="btn btn-info waves-effect waves-light font AddService" ID="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
+					</div>
+				</div><!-- SERVICE modal-footer closed here -->
+		</div>
+		</form><!-- SERVICE form closed here -->
+
+	</div>
+</div>
+</div><!-- /.modal -->
+<div id="EDITSERVICE" 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 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="form-row">
+						<div class="form-group 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><!-- EDITSERVICE.1.1 col-md-3 closed here -->
+						<div class="form-group col-md-3">
+							<label>Department Name</label>
+							<div>
+								<?php
+								$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div><!-- EDITSERVICE.1.2 col-md-3 closed here -->
+						<div class="form-group col-md-3">
+							<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><!-- EDITSERVICE.1.3 col-md-3 closed here -->
+						<div class="form-group col-md-3">
+							<label>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
+							<div>
+								<?php
+								$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div><!-- EDITSERVICE.1.4 col-md-3 closed here -->
+					</div><!-- EDITSERVICE.1 form-row closed here -->
+					<div class="form-row">
+						<div class="form-group col-md-3">
+							<label>Item Code<span class="badge mandatory" #fff ;">*</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><!-- EDITSERVICE.2.1 col-md-3 closed here -->
+						<div class="form-group col-md-3">
+							<label>Item Name</label>
+							<div>
+								<?php
+								$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div><!-- EDITSERVICE.2.2 col-md-3 closed here -->
+						<div class="form-group col-md-3" id=EditotherDescription>
+							<label>Item Description</label>
+							<div>
+								<?php
+								$data = array('name' => 'EditOtheritemDescription', 'value' => set_value('EditOtheritemDescription'), 'id' => 'EditOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div><!-- EDITSERVICE.2.3 col-md-3 closed here -->
+						<div class="form-group col-md-3">
+							<label>UOM</label>
+							<div>
+								<?php
+								$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div><!-- EDITSERVICE.2.4 col-md-3 closed here -->
+						<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><!-- EDITSERVICE.2.5 col-md-3 closed here -->
+					</div><!-- EDITSERVICE.2 form-row closed here -->
+					<div class="form-row">
+						<div class="form-group col-md-3">
+							<label>Quantity<span class="badge mandatory">*</span></label>
+							<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><!-- EDITSERVICE.3.1 col-md-3 closed here -->
+						<div class="form-group col-md-3">
+							<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
+							<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><!-- EDITSERVICE.3.2 col-md-3 closed here -->
+						<div class="form-group col-md-3">
+							<label>Per</label><!--date should be come-->
+							<?php
+							$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
+							echo form_input($data); ?>
+						</div><!-- EDITSERVICE.3.3 col-md-3 closed here -->
+						<div class="form-group col-md-3">
+							<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
+							<div>
+								<?php
+								$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div><!-- EDITSERVICE.3.4 col-md-3 closed here -->
+					</div><!-- EDITSERVICE.3 form-row closed here -->
+
+					<div class="form-row">
+						<div class="form-group col-md-6" align="right">
+							CGST In %
+						</div><!-- EDITSERVICE.4.1 col-md-6 closed here -->
+						<div class="form-group col-md-3">
+							<div>
+
+								<?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><!-- EDITSERVICE.4.2 col-md-3 closed here -->
+						<div class="form-group col-md-3">
+							<div>
+
+								<?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><!-- EDITSERVICE.4.3 col-md-3 closed here -->
+					</div><!-- EDITSERVICE.4 form-row closed here -->
+					<div class="form-row">
+						<div class="form-group col-md-6" align="right">
+							SGST In %
+						</div><!-- EDITSERVICE.5.1 col-md-6 closed here -->
+
+						<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);');
+								echo form_input($data);
+								?>
+							</div>
+
+						</div><!-- EDITSERVICE.5.2 col-md-3 closed here -->
+						<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');
+								echo form_input($data);
+								?>
+							</div>
+
+						</div><!-- EDITSERVICE.5.3 col-md-3 closed here -->
+
+					</div><!-- EDITSERVICE.5 form-row closed here -->
+
+					<div class="form-row">
+						<div class="form-group col-md-6" align="right">
+
+							IGST In %
+						</div><!-- EDITSERVICE.6.1 col-md-6 closed here -->
+
+						<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);');
+								echo form_input($data);
+								?>
+							</div>
+
+						</div><!-- EDITSERVICE.6.2 col-md-3 closed here -->
+						<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');
+								echo form_input($data);
+								?>
+							</div>
+
+						</div><!-- EDITSERVICE.6.3 col-md-3 closed here -->
+
+					</div><!-- EDITSERVICE.6 form-row closed here -->
+					<div class="form-row">
+						<div class="col-md-5 col-md-offset-4" align="right">
+							<label>Other Allowances <?php echo "($INRSYM)" ?></label>
+						</div><!-- EDITSERVICE.7.1 col-md-5 col-md-offset-4 closed here -->
+						<div class="form-group col-md-3">
+							<div>
+								<?php
+								$data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+								echo form_input($data);
+								?>
+							</div>
+						</div><!-- EDITSERVICE.7.2 col-md-3 closed here -->
+					</div><!-- EDITSERVICE.7 form-row closed here -->
+					<div class="form-row">
+						<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>
+								<?php
+								$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div><!-- EDITSERVICE.8 form-row closed here -->
+
+					<div class="form-row" style="padding: 0px 30px 10px 30px;">
+						<label>Service Description </label>
+						<?php
+						$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+						echo form_textarea($data); ?>
+					</div><!-- EDITSERVICE.9 form-row closed here -->
+
+				</div>
+				<div class="modal-footer">
+					<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><!-- EDITSERVICE modal-footer closed here -->
+			</form><!-- EDITSERVICE form closed here -->
+
+		</div>
+	</div>
+</div><!-- /.modal -->
+
 
-									<a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-									<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-									<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-								</div><!-- 7.4 btn-container  div closed here -->
-							</div><br/><!-- 7.4 right  div closed here -->
-						</div><!-- 7.4 row  div closed here -->
-					</div><!-- 7.4 col-md-12  div closed here -->
-				</div><!-- 7. row div closed here -->
-			</div> <!-- container-fluid div closed here -->
-		</div> <!-- box div closed here -->
-	</section> <!-- content section closed here -->
-</div> <!-- content-wrapper div closed here -->
 <script type="text/html" id="ServiceList">
 	<tr id="<%=index%>">
 		<td align="left"><%=index%></td>