diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php
index a3032202..7e8d4a19 100644
--- a/application/views/purchaseorder.php
+++ b/application/views/purchaseorder.php
@@ -2,6 +2,17 @@
             .table-bordered>thead>tr>th, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>tbody>tr>td, .table-bordered>tfoot>tr>td {border: 1px solid #333;}
             </style>
 			      <script>
+				  $(function() {
+    $( ".datePicker" ).datepicker({ dateFormat: 'dd/mm/yy' });
+
+    //Initialize Select2 Elements
+    $(".select2").select2();
+	
+	
+
+
+	
+});
 function myFunction() {
      
      var input = document.getElementById('input').value;
@@ -21,45 +32,30 @@ function myFunction() {
 	 <div>
          <center><b><h2>Purchase Order</h2></b></center>
          <div class="container-fluid">
-		<!--<div class="row">
-              <div class="col-lg-3">       
-				<select name="cars"  id="input">
-				  <option value="1">Revenue po model</option>
-				  <option value="2">Service po model</option>
-				  <option value="3">Import po model</option>   
-				</select>                                   
-              </div>         
-			</div>-->
+		
 	 <div class="row">
 	   <div class="col-md-12">
 	   <div class="row">
-	   <div class="col-md-4">
+	   <div class="col-md-3">
 	   	<label>Requistion No</label>
 					<div>
 						 <?php
-						$options = array("0"=>'Requistion No');     
-						//print_r(  $options);
-						
-						if(!empty($POType))
-						{
-						foreach ($SupplierName as $SID):
-						  
-					   
-						  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-						endforeach;
-						}										
+						$options = array("-1"=>'Selected Requistion No');     
+										
+						  $options["0"] =  'REQ00001';
+							$options["1"] =  'REQ00002';
+							$options["2"] =  'REQ00003';								
 			
-						echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' , 'required="true"' ,'multiple="true"');
+						echo form_dropdown('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"' ,'multiple="true"');
 
 						?>						 
 					</div>
 	   </div>
-	   <div class="col-md-4">
+	   <div class="col-md-3">
 	   <label>Purchase Order Date</label>
 					<div class="form-group">
 								<?php
-						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+						 $data = array('name' => 'PODate','value' => set_value('PODate'),'id'=>'PODate',  'class' => 'form-control datePicker' ,'required' => 'true');
 						echo form_input($data);
 						?>   
 					</div>
@@ -67,8 +63,9 @@ function myFunction() {
 	   <div class="col-md-4">
 	   <label>Purchase Order Type</label>
 					<!--<div class="form-group">
+					
 								<?php
-						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+						 $data = array('name' => 'POType','value' => set_value('POType'),'id'=>'POType',  'class' => 'form-control' ,'required' => 'true');
 						echo form_input($data);
 						?>   
 					</div>-->
@@ -76,10 +73,12 @@ function myFunction() {
 						<option value="0">Select Po</option>
 							  <option value="1">Revenue po</option>
 							  <option value="2">Service po</option>
-							  <option value="3">Import po</option>						   
+							  <option value="3">Import po</option>		
+								<option value="3">Capital po</option>							  
 						</select>
 	   </div>
 	   </div>
+	     <div class="row">
 	   <div class="col-md-3">
 	   	<label>Supplier</label>
 					<div >
@@ -87,9 +86,9 @@ function myFunction() {
 						$options = array("0"=>'Supplier');     
 						//print_r(  $options);
 						
-						if(!empty($POType))
+						if(!empty($Suplist))
 						{
-						foreach ($SupplierName as $SID):
+						foreach ($Suplist as $SID):
 						  
 					   
 						  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
@@ -97,7 +96,7 @@ function myFunction() {
 						endforeach;
 						}										
 			
-						echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"'  ,'required="true"');
+						echo form_dropdown('SupplierID', $options,set_value('SupplierID'),'id="SupplierID"'  ,'required="true"');
 
 						?>						 
 					</div>
@@ -107,25 +106,25 @@ function myFunction() {
 	   <label>Address</label>
 					<div class="form-group">
 								<?php
-						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+						 $data = array('name' => 'Address','value' => set_value('Address'),'id'=>'Address',  'class' => 'form-control' ,'readonly' => 'true');
 						echo form_input($data);
 						?>   
 					</div>
 	   </div>
-	   <div class="col-md-3">
+	   <div class="col-md-4">
 	   <label>Delivery Address</label>
 					<div class="form-group">
 								<?php
-						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+						 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr'),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true');
 						echo form_input($data);
 						?>   
 					</div>
 	   </div>
-	   <div class="col-md-3">
+	   <div class="col-md-2">
 	   <label>Delivery Date</label>
 					<div class="form-group">
 								<?php
-						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+						 $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt'),'id'=>'Deliverydt',  'class' => 'form-control datePicker' ,'required' => 'true');
 						echo form_input($data);
 						?>   
 					</div>
@@ -149,7 +148,7 @@ function myFunction() {
 		  <div class="modal-content" style="width:900px;">
 			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
 			  <button type="button" class="close" data-dismiss="modal">&times;</button>
-			  <center><h4>Add Item </h4></center>				
+			  <center><h4>Add Revenue Purchase Order Item </h4></center>				
 			</div>
 			<div align="left"> 
 			 
@@ -158,20 +157,12 @@ function myFunction() {
 						 <label>Req No</label>
 									<div >
 										 <?php
-										$options = array("0"=>'Req No');     
-										//print_r(  $options);
-										
-										if(!empty($POType))
-										{
-										foreach ($SupplierName as $SID):
-										  
-									   
-										  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-										endforeach;
-										}										
+											$options = array("0"=>'Req No');     
+											$options["0"] =  'REQ00001';
+											$options["1"] =  'REQ00002';
+											$options["2"] =  'REQ00003';	
 							
-										echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
+										echo form_dropdown('ReqNo', $options,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control required"','required="true"');
 
 										?>						 
 									</div>
@@ -181,7 +172,7 @@ function myFunction() {
 						   <label>Department Name</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'deptName','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -190,16 +181,16 @@ function myFunction() {
 						   <label>Cost Center Name</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'CostName','value' => set_value('CostName'),'id'=>'CostName',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
 						 </div>
-						  <div class="col-md-3">
-						   <label>Available Budget Amount</label>
+						  <div class="col-md-2">
+						   <label>Avl Bud Amt</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -213,12 +204,12 @@ function myFunction() {
 										$options = array("0"=>'Item Code');     
 										//print_r(  $options);
 										
-										if(!empty($POType))
+										if(!empty($MaterialList))
 										{
-										foreach ($SupplierName as $SID):
+										foreach ($MaterialList as $SID):
 										  
 									   
-										  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
+										  $options[$SID->MaterialCode] =  $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
 
 										endforeach;
 										}										
@@ -233,7 +224,7 @@ function myFunction() {
 						  <label>Item Name</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
+										 $data = array('name' => 'ItemName','value' => set_value('ItemName'),'id'=>'ItemName',  'class' => 'form-control'  ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -242,7 +233,7 @@ function myFunction() {
 						  <label>UOM</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -257,276 +248,345 @@ function myFunction() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Rate Per unit</label>
+						  <label>Rate/unit</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
+										 $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control' ,'required' => 'true' );
 										echo form_input($data);
 										?>   
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Total Amount</label>
+						  <label>Tot Amount</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
+										 $data = array('name' => 'TotAmt','value' => set_value('TotAmt'),'id'=>'TotAmt',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
 						 </div>
 		 </div>
-		 <div class="col-md-12">
-							 <div class="col-md-6">
-							 <div class="col-md-3">
-							  <label>Discount </label>
+		
+		 	<div class="row">
+			 <div class="col-md-12">
+			 						<div class="col-md-2">
+							  <label>Discount Type </label>
 										<div>
 											 <?php
 											$options = array("0"=>'Discount');     
 											//print_r(  $options);
 											
-											if(!empty($POType))
+											if(!empty($TaxType))
 											{
-											foreach ($SupplierName as $SID):
+											foreach ($TaxType as $SID):
 											  
 										   
-											  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
+											  $options[$SID->ConfigValue] =  $SID->ConfigValue;
 
 											endforeach;
 											}										
 								
-											echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
+											echo form_dropdown('TaxType', $options,set_value('TaxType'),'id="TaxType"' ,'class="form-control required"');
 
 											?>						 
 										</div>
-										 <label>Packaging</label>
-										<div>
-											 <?php
-											$options = array("0"=>'Packaging');     
-											//print_r(  $options);
-											
-											if(!empty($POType))
-											{
-											foreach ($SupplierName as $SID):
-											  
-										   
-											  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-											endforeach;
-											}										
-								
-											echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
-
-											?>						 
-										</div>
-										 <label>Freight</label>
-										<div>
-											 <?php
-											$options = array("0"=>'Freight');     
-											//print_r(  $options);
-											
-											if(!empty($POType))
-											{
-											foreach ($SupplierName as $SID):
-											  
-										   
-											  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-											endforeach;
-											}										
-								
-											echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
-
-											?>						 
-										</div>
-							 </div>
-							 <div class="col-md-9">
-							 <label>Value</label>
-							  <div class="col-md-12">
-							   <div class="col-md-6">
-										<div class="form-group">
+			 </div>
+			 <div class="col-md-2">
+							  <label>Discount Value </label>
+							  <div class="form-group">
 													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
 											echo form_input($data);
 											?>   
 										</div> 
-										</div>
-										 <div class="col-md-6">
-										<div class="form-group">
+			</div>
+			 <div class="col-md-2">
+							  <label>After Discount </label>
+							  <div class="form-group">
 													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
 											echo form_input($data);
 											?>   
-										</div>
-										</div>
-							 </div>	
-						<div class="col-md-12">	
-						<div class="col-md-6">	 
-										<div class="form-group">
+										</div> 
+			</div>
+			 <div class="col-md-2"> &nbsp;
+			 </div>
+			 <div class="col-md-2">
+							  <label>Excise Duty in %	</label>
+							  <div class="form-group">
 													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
 											echo form_input($data);
 											?>   
-										</div>
-										</div>
-										 <div class="col-md-6">
-										<div class="form-group">
+										</div> 
+			</div>
+			 <div class="col-md-2">
+							  <label>After Excise Duty </label>
+							  <div class="form-group">
 													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
 											echo form_input($data);
 											?>   
+										</div> 
+			</div>
+			</div> 
+			</div>
+			<div class="row">
+			 <div class="col-md-12">
+			 						<div class="col-md-2">
+							  <label>Packaging Type </label>
+										<div>
+											 <?php
+											$options = array("0"=>'Discount');     
+											//print_r(  $options);
+											
+											if(!empty($TaxType))
+											{
+											foreach ($TaxType as $SID):
+											  
+										   
+											  $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+											endforeach;
+											}										
+								
+											echo form_dropdown('TaxType', $options,set_value('TaxType'),'id="TaxType"' ,'class="form-control required"');
+
+											?>						 
 										</div>
-										</div>
-						</div>
-						<div class="col-md-12">		
-						 <div class="col-md-6">			
-										<div class="form-group">
+			 </div>
+			 <div class="col-md-2">
+							  <label>Packaging Value </label>
+							  <div class="form-group">
 													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
 											echo form_input($data);
 											?>   
-										</div>
-										</div>
-										 <div class="col-md-6">
-										<div class="form-group">
+										</div> 
+			</div>
+			 <div class="col-md-2">
+							  <label>After Packaging </label>
+							  <div class="form-group">
 													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
 											echo form_input($data);
 											?>   
+										</div> 
+			</div> <div class="col-md-2"> &nbsp;
+			 </div>
+			 <div class="col-md-2">
+							  <label>Vat in %</label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			 <div class="col-md-2">
+							  <label>After Vat </label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			</div> 
+			</div>
+			<div class="row">
+			 <div class="col-md-12">
+			 						<div class="col-md-2">
+							  <label>Freight Type </label>
+										<div>
+											 <?php
+											$options = array("0"=>'Discount');     
+											//print_r(  $options);
+											
+											if(!empty($TaxType))
+											{
+											foreach ($TaxType as $SID):
+											  
+										   
+											  $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+											endforeach;
+											}										
+								
+											echo form_dropdown('TaxType', $options,set_value('TaxType'),'id="TaxType"' ,'class="form-control required"');
+
+											?>						 
 										</div>
-										</div>
-										</div>
-							 </div>
-							  
-							 </div>
-							  
-							 <div class="col-md-6">
-							 <div class="col-md-12">
-							  <div class="col-md-12">
-								<div class="col-md-4">
-								<label>Excise Duty</label>
-								</div>
-							 <div class="col-md-4">	
+			 </div>
+			 <div class="col-md-2">
+							  <label>Freight Value </label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			 <div class="col-md-2">
+							  <label>After Freight </label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div> <div class="col-md-2"> &nbsp;
+			 </div>
+			 <div class="col-md-2">
+							  <label>GST in %</label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			 <div class="col-md-2">
+							  <label>After GST </label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			</div> 
+			</div>
+			<div class="row">
+			 <div class="col-md-12">
+			 						<div class="col-md-2">
+							  &nbsp;
+			 </div>
+			 <div class="col-md-2">
+						 &nbsp;	 
+			</div>
+			 <div class="col-md-2">
+						 &nbsp;	 
+			</div> <div class="col-md-2"> &nbsp;
+			 </div>
+			 <div class="col-md-2">
+							  <label>GST in %</label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			 <div class="col-md-2">
+							  <label>After GST </label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			</div> 
+			</div>
+			<div class="row">
+			 <div class="col-md-12">
+			 						<div class="col-md-2">
+							  &nbsp;
+			 </div>
+			 <div class="col-md-2">
+						 &nbsp;	 
+			</div>
+			 <div class="col-md-2">
+						 &nbsp;	 
+			</div> <div class="col-md-2"> &nbsp;
+			 </div>
+			 <div class="col-md-2">
+							  <label>CST in %</label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			 <div class="col-md-2">
+							  <label>After CST </label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			</div> 
+			</div>
+			<div class="row">
+			 <div class="col-md-12">
+			 						<div class="col-md-2">
+							  &nbsp;
+			 </div>
+			 <div class="col-md-2">
+						 &nbsp;	 
+			</div>
+			 <div class="col-md-2">
+						 &nbsp;	 
+			</div> <div class="col-md-2"> &nbsp;
+			 </div> 	
+			 <div class="col-md-2">
+							  <label>Other  Taxes in %</label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			 <div class="col-md-2">
+							  <label>After Other Taxes </label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
+											echo form_input($data);
+											?>  
+										</div> 
+										
+			</div>
+			
+			</div> 
+			</div>
+		<div class="row">
+			 <div class="col-md-12">
+			 						<div class="col-md-2">
+							  &nbsp;
+			 </div>
+			 <div class="col-md-2">
+						 &nbsp;	 
+			</div>
+			 <div class="col-md-2">
+						 &nbsp;	 
+			</div>
+			 <div class="col-md-2">
+						&nbsp;	 	 
+			</div> <div class="col-md-2"> &nbsp;
+			 </div>
+			 <div class="col-md-2">
+							  <label>Total Order value </label>
+							  <div class="form-group">
+													<?php
+											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			</div> 
+			</div>
 							 
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-										</div>
-										 <div class="col-md-4">
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true' );
-											echo form_input($data);
-											?>   
-										</div>
-										</div>
-										</div>
-										<div class="col-md-12">
-									<div class="col-md-4">
-									<label>VAT</label> 
-									</div>										
-								 <div class="col-md-4">	
-								  
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-										</div>
-										 <div class="col-md-4">
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-										</div>
-										</div>
-										<div class="col-md-12">
-										<div class="col-md-4">
-									<label>GST</label> 
-									</div>
-								 <div class="col-md-4">	
-								 
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-										</div>
-										 <div class="col-md-4">
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-										</div>
-										</div>
-										<div class="col-md-12">
-								<div class="col-md-4">
-								<label>CST</label>
-								</div>
-							 <div class="col-md-4">	
 							 
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-										</div>
-										 <div class="col-md-4">
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-										</div>
-										</div>
-											<div class="col-md-12">
-										<div class="col-md-4">
-									<label>Other Taxes</label>
-									</div>											
-								 <div class="col-md-4">	
-								 
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-										</div>
-										 <div class="col-md-4">
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-										</div>
-										 
-							 </div>
-							 </div>
-							 <div class="col-md-8 col-md-offset-4">
-							 <label>Total Order value</label>
-							 <div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 </div>
 		 
 		 </div>
 		 
-			</div>
+		
 			<div class="modal-footer">
 			 <button type="button" class="btn btn-default" value="submit">Add</button>
 			 <button type="button" class="btn btn-default" value="submit" data-dismiss="modal">Cancel</button>
@@ -546,7 +606,7 @@ function myFunction() {
 		  <div class="modal-content" style="width:900px;">
 			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
 			  <button type="button" class="close" data-dismiss="modal">&times;</button>
-			  <center><h4>Add Item </h4></center>				
+			  <center><h4>Add Service PO Item </h4></center>				
 			</div>
 			<div align="left"> 
 			 
@@ -558,16 +618,10 @@ function myFunction() {
 										$options = array("0"=>'Req No');     
 										//print_r(  $options);
 										
-										if(!empty($POType))
-										{
-										foreach ($SupplierName as $SID):
-										  
-									   
-										  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-										endforeach;
-										}										
-							
+										$options = array("0"=>'Req No');     
+											$options["0"] =  'REQ00001';
+											$options["1"] =  'REQ00002';
+											$options["2"] =  'REQ00003';	
 										echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
 
 										?>						 
@@ -610,12 +664,12 @@ function myFunction() {
 										$options = array("0"=>'Item Code');     
 										//print_r(  $options);
 										
-										if(!empty($POType))
+										if(!empty($MaterialList))
 										{
-										foreach ($SupplierName as $SID):
+										foreach ($MaterialList as $SID):
 										  
 									   
-										  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
+										  $options[$SID->MaterialCode] =  $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
 
 										endforeach;
 										}										
@@ -630,7 +684,7 @@ function myFunction() {
 						  <label>Item Name</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -639,7 +693,7 @@ function myFunction() {
 						  <label>UOM</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -657,7 +711,7 @@ function myFunction() {
 						  <label>Rate Per unit</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' );
 										echo form_input($data);
 										?>   
 									</div>
@@ -666,7 +720,7 @@ function myFunction() {
 						  <label>Total Amount</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -674,7 +728,7 @@ function myFunction() {
 		 </div>
 		 <div class="col-md-12">
 				<div class="col-md-12">
-					<div class="col-md-4">
+					<div class="col-md-4" align="right">
 							 
 			 Service Tax @12% :
 					</div>	
@@ -690,7 +744,7 @@ function myFunction() {
 					<div class="col-md-4">
 							 <div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'After  Service Tax','required' => 'true' ,'readonly' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'After  Service Tax','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -699,8 +753,8 @@ function myFunction() {
 		 
 				</div>		 
 		    <div class="col-md-12">
-					<div class="col-md-4">
-						Edu. cess @2% on service Tax 	 
+					<div class="col-md-4" align="right">
+						Edu. cess @2% on service Tax 	: 
 			 
 					</div>	
 					<div class="col-md-4">
@@ -715,7 +769,7 @@ function myFunction() {
 					<div class="col-md-4">
 							 <div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'After Edu.','required' => 'true','readonly' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'After Edu.','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -725,8 +779,58 @@ function myFunction() {
 		 </div>
 		 <div class="col-md-12">
 						 
-		 <div class="col-md-4">
-							Sec. & Higher Edu. cess @1 % on service Tax 
+		 <div class="col-md-4" align="right">
+							Sec. & Higher Edu. cess @1 % on service Tax  :
+			 
+					</div>	
+					<div class="col-md-4">
+							<div class="form-group">
+												<?php
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										echo form_input($data);
+										?>   
+									</div> 
+			 
+					</div>	
+					<div class="col-md-4">
+							 <div class="form-group">
+												<?php
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'After High Edu.','required' => 'true','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>
+		 </div>
+		  <div class="col-md-12">
+						 
+		 <div class="col-md-4" align="right">
+							Krishi Kalyan tax  :
+			 
+					</div>	
+					<div class="col-md-4">
+							<div class="form-group">
+												<?php
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										echo form_input($data);
+										?>   
+									</div> 
+			 
+					</div>	
+					<div class="col-md-4">
+							 <div class="form-group">
+												<?php
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'After High Edu.','required' => 'true','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>
+		 </div>
+		  <div class="col-md-12">
+						 
+		 <div class="col-md-4" align="right">
+							Swachh Bharat tax  :
 			 
 					</div>	
 					<div class="col-md-4">
@@ -749,8 +853,8 @@ function myFunction() {
 					</div>
 		 </div>
 		 <div class="col-md-12">
-					<div class="col-md-4">
-							Other Taxes 
+					<div class="col-md-4" align="right">
+							Other Taxes :
 			 
 					</div>	
 					<div class="col-md-4">
@@ -765,7 +869,7 @@ function myFunction() {
 					<div class="col-md-4">
 							<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'After Other Taxes','required' => 'true' ,'readonly' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'After Other Taxes','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div> 
@@ -773,11 +877,11 @@ function myFunction() {
 					</div>	 
 		 
 		 </div>
-		 <div class="col-md-6 col-md-offset-6">
+		 <div class="col-md-6 col-md-offset-6" >
 							 <label>Total Order value</label>
 							 <div class="form-group">
 													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'Total value','required' => 'true' ,'readonly' => 'true');
+											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'Total value','readonly' => 'true');
 											echo form_input($data);
 											?>   
 										</div>
@@ -806,7 +910,7 @@ function myFunction() {
 		  <div class="modal-content" style="width:900px;">
 			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
 			  <button type="button" class="close" data-dismiss="modal">&times;</button>
-			  <center><h4>Add Item </h4></center>				
+			  <center><h4>Add Import PO Item </h4></center>				
 			</div>
 			<div align="left"> 
 			 
@@ -818,15 +922,10 @@ function myFunction() {
 										$options = array("0"=>'Req No');     
 										//print_r(  $options);
 										
-										if(!empty($POType))
-										{
-										foreach ($SupplierName as $SID):
-										  
-									   
-										  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-										endforeach;
-										}										
+										$options = array("0"=>'Req No');     
+											$options["0"] =  'REQ00001';
+											$options["1"] =  'REQ00002';
+											$options["2"] =  'REQ00003';									
 							
 										echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
 
@@ -838,7 +937,7 @@ function myFunction() {
 						   <label>Department Name</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -847,7 +946,7 @@ function myFunction() {
 						   <label>Cost Center Name</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -856,7 +955,7 @@ function myFunction() {
 						   <label>Available Budget Amount</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -870,15 +969,15 @@ function myFunction() {
 										$options = array("0"=>'Item Code');     
 										//print_r(  $options);
 										
-										if(!empty($POType))
+										if(!empty($MaterialList))
 										{
-										foreach ($SupplierName as $SID):
+										foreach ($MaterialList as $SID):
 										  
 									   
-										  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
+										  $options[$SID->MaterialCode] =  $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
 
 										endforeach;
-										}										
+										}									
 							
 										echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
 
@@ -890,7 +989,7 @@ function myFunction() {
 						  <label>Item Name</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
+										 $data = array('name' => 'ImItemname','value' => set_value('ImItemname'),'id'=>'ImItemname',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -899,7 +998,7 @@ function myFunction() {
 						  <label>UOM</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'ImUOM','value' => set_value('ImUOM'),'id'=>'ImUOM',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -908,25 +1007,25 @@ function myFunction() {
 						  <label>Quantity</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'imQuantity','value' => set_value('imQuantity'),'id'=>'imQuantity',  'class' => 'form-control' ,'required' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Rate Per unit</label>
+						  <label>Rate/unit</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
+										 $data = array('name' => 'imRate','value' => set_value('imRate'),'id'=>'imRate',  'class' => 'form-control' ,'required' => 'true' );
 										echo form_input($data);
 										?>   
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Total Amount</label>
+						  <label>Total Amt	</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
+										 $data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -934,11 +1033,11 @@ function myFunction() {
 		 </div>
 		 <div class="col-md-12">
 			 
-				<div class="col-md-4">
-						<div class="col-md-6">
+				<div class="col-md-3">
+						
 						Basic Price in US $ per Ton :						 
-						</div>
-						<div class="col-md-6">
+						
+						
 							<div class="form-group">
 												<?php
 										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder '=>'basic price','required' => 'true');
@@ -946,12 +1045,12 @@ function myFunction() {
 										?>   
 									</div>						 
 						</div>				 
-				</div>
-				<div class="col-md-4">
-					<div class="col-md-6">			 
+				
+				<div class="col-md-3">
+							 
 					 Exchange Rate :
-					</div>
-					<div class="col-md-6">
+					
+					
 						<div class="form-group">
 												<?php
 										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
@@ -960,23 +1059,27 @@ function myFunction() {
 									</div>
 					 
 					</div>				 
-				</div>
-				<div class="col-md-4">
-					<div class="col-md-6">
+				
+				<div class="col-md-3">
+					
 						Basic value in INR :
 					 
-					</div>
-					<div class="col-md-6">
+					
+					
 						<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
-					 
-					</div>		 				 
-				 <a href="http://www.xe.com/" target="_blank">Click to know currency value</a>				 
+									</div>
+					<div class="col-md-3">
+					
+						
+						 				 
+				 <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>				 
 		 </div>
+		 	
 		 <div class="col-md-12"  style="border:1px solid #000;">
 		 <br/>
 		    <div class="col-md-6">
@@ -1315,59 +1418,214 @@ function myFunction() {
    <br/>
     <thead style="background-color:#fff">
       <tr>
-	   <th><input type="checkbox" name="name1" />&nbsp;</th>
+	   <th>SNo</th>
         <th>Requisition No</th>
         <th>Item Name</th>
         <th>Quantity</th>
         <th>UOM</th>
 		<th>Rate</th>
-        <th>Tax %</th>
-        <th>Total</th>
+        <th>Tax Amount</th>
+        <th>Total Amount</th>
+		<th>Action</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-	  <td><input type="checkbox" name="name2" />&nbsp;</td>
-        <td>1</td>
-        <td>001</td>
+	  <td>1</td>
+        <td>REQ0001</td>
         <td>Waste Sand</td>
+        <td>100</td>
 		<td>Ton</td>
-        <td>100</td>
-		<td>High</td>
-        <td>No Change</td>
+        <td>50.00</td>
+		<td>250.00</td>
+        <td>50250.00</td>
+		<td> <a href="#"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
+						  <a href="#"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a></td>
       </tr>
       <tr>
-	  <td><input type="checkbox" name="name2" />&nbsp;</td>
-        <td>2</td>
-        <td>002</td>
-        <td>Resin</td>
-		<td>Litre</td>
-        <td>50</td>
-		<td>High</td>
-        <td>Change</td>
-      </tr>
-      <tr>
-	  <td><input type="checkbox" name="name2" />&nbsp;</td>
-        <td>3</td>
-        <td>003</td>
-        <td>Resin</td>
-		<td>Litre</td>
+	 <td>2</td>
+        <td>REQ0002</td>
+        <td>Waste Sand</td>
         <td>100</td>
-		<td>High</td>
-        <td>Change</td>
-      </tr>
+		<td>Ton</td>
+        <td>50.00</td>
+		<td>250.00</td>
+        <td>50250.00</td>
+		<td> <a href="#"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
+						  <a href="#"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a></td> </tr>
+       <tr>
+	 <td>3</td>
+        <td>REQ0003</td>
+        <td>Waste Sand</td>
+        <td>100</td>
+		<td>Ton</td>
+        <td>50.00</td>
+		<td>250.00</td>
+        <td>50250.00</td>
+		<td> <a href="#"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
+						  <a href="#"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a></td> </tr>
     </tbody>
 	   
   </table>
-      <div class="col-md-3 col-md-offset-9">
-				
-					<div class="form-group">
-							<label>Total Order Value :</label>	<?php
+ <div class="row">
+	   <div class="col-md-12">
+  <div class="col-md-6"> <label >&nbsp;</label></div>
+  
+    <div class="col-md-3" align="right"> <label >Sub Total Amount  :</label></div>
+      <div class="col-md-3">			
+					
+							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
 						echo form_input($data);
 						?>   
-					</div>
+					
 			</div> 
+			</div> 
+			</div><br>
+			<div class="row">
+	   <div class="col-md-12">
+  <div class="col-md-6"> <label >&nbsp;</label></div>
+  
+    <div class="col-md-3" align="right"> <label >Total CST   :</label></div>
+      <div class="col-md-3">			
+					
+							<?php
+						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>   
+					
+			</div> 
+			</div> 
+			</div>
+			<br>
+			<div class="row">
+	   <div class="col-md-12">
+  <div class="col-md-6"> <label >&nbsp;</label></div>
+  
+    <div class="col-md-3" align="right"> <label >Total Excise Duty   :</label></div>
+      <div class="col-md-3">			
+					
+							<?php
+						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>   
+					
+			</div> 
+			</div> 
+			</div>
+			<br>
+			<div class="row">
+	   <div class="col-md-12">
+  <div class="col-md-6"> <label >&nbsp;</label></div>
+  
+    <div class="col-md-3" align="right"> <label >Total Vat   :</label></div>
+      <div class="col-md-3">			
+					
+							<?php
+						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>   
+					
+			</div> 
+			</div> 
+			</div>
+			<br>
+			<div class="row">
+	   <div class="col-md-12">
+  <div class="col-md-6"> <label >&nbsp;</label></div>
+  
+    <div class="col-md-3" align="right"> <label >Total GST   :</label></div>
+      <div class="col-md-3">			
+					
+							<?php
+						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>   
+					
+			</div> 
+			</div> 
+			</div>
+			<br>
+			<div class="row">
+	   <div class="col-md-12">
+  <div class="col-md-6"> <label >&nbsp;</label></div>
+  
+    <div class="col-md-3" align="right"> <label >Total Discount   :</label></div>
+      <div class="col-md-3">			
+					
+							<?php
+						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>   
+					
+			</div> 
+			</div> 
+			</div>
+			<br>
+			<div class="row">
+	   <div class="col-md-12">
+  <div class="col-md-6"> <label >&nbsp;</label></div>
+  
+    <div class="col-md-3" align="right"> <label >Total Packaging   :</label></div>
+      <div class="col-md-3">			
+					
+							<?php
+						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>   
+					
+			</div> 
+			</div> 
+			</div>
+			<br>
+			<div class="row">
+	   <div class="col-md-12">
+  <div class="col-md-6"> <label >&nbsp;</label></div>
+  
+    <div class="col-md-3" align="right"> <label >Total Freight   :</label></div>
+      <div class="col-md-3">			
+					
+							<?php
+						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>   
+					
+			</div> 
+			</div> 
+			</div>
+			<br>
+			<div class="row">
+	   <div class="col-md-12">
+  <div class="col-md-6"> <label >&nbsp;</label></div>
+  
+    <div class="col-md-3" align="right"> <label >Other Taxes   :</label></div>
+      <div class="col-md-3">			
+					
+							<?php
+						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>   
+					
+			</div> 
+			</div> 
+			</div>
+			<br>
+			<div class="row">
+	   <div class="col-md-12">
+  <div class="col-md-6"> <label >&nbsp;</label></div>
+  
+    <div class="col-md-3" align="right"> <label >Total Order Value   :</label></div>
+      <div class="col-md-3">			
+					
+							<?php
+						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>   
+					
+			</div> 
+			</div> 
+			</div>
+<br>			
  <div align="right" style="padding-right:10px">
   <button type="button" class="btn btn-primary">Save</button>
   <button type="button" class="btn btn-primary">Cancel</button>
diff --git a/application/views/requisitionlist.php b/application/views/requisitionlist.php
index c04626ae..113de6ff 100644
--- a/application/views/requisitionlist.php
+++ b/application/views/requisitionlist.php
@@ -3,7 +3,10 @@
 			
             </style>
 <div class="content-wrapper">
-    
+      <?php
+                      $attributes = array('class' => 'form-label-left RequisitionList ','name'  => 'RequisitionList','id'  => 'RequisitionList','method'  => 'post','role'  => 'form'  );
+                        
+                        echo form_open($this->config->base_url().'purchaseorderform/purchaseorder',$attributes); ?>
  
 	 <section class="content">
 	  
@@ -64,7 +67,7 @@
 		<label>From Date</label>
 					<div class="form-group">
 								<?php
-						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+						 $data = array('name' => 'FromDate','value' => set_value('FromDate'),'id'=>'FromDate',  'class' => 'form-control' );
 						echo form_input($data);
 						?>   
 					</div>
@@ -73,7 +76,7 @@
 		<label>To Date</label>
 					<div class="form-group">
 								<?php
-						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+						 $data = array('name' => 'ToDate','value' => set_value('ToDate'),'id'=>'ToDate',  'class' => 'form-control' );
 						echo form_input($data);
 						?>   
 					</div>
@@ -104,50 +107,52 @@
 			 
 			<div class="col-md-12">
 						 <div class="col-md-3">
-						 <label>Request Type</label>
+						 <label>Req Type</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'RequestType','value' => set_value('RequestType'),'id'=>'RequestType',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
 								</div>
 						 
 						  <div class="col-md-3">
-						   <label>Request By</label>
+						   <label>Req By</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'RequestedBy','value' => set_value('RequestedBy'),'id'=>'RequestedBy',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
 						 </div>
 						 <div class="col-md-3">
-						   <label>Department Name</label>
+						   <label>Dep Name</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => '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">
+						 <div class="col-md-3">
 						   <label>Desigination</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'Desigination','value' => set_value('Desigination'),'id'=>'Desigination',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
 						 </div>
+						 
 						  
 		 </div>
 		<div class="col-md-12">
+		 
 						 <div class="col-md-3">
-						 <label>Requisition Date</label>
+						 <label>Req Dt</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'RequisitionDt','value' => set_value('RequisitionDt'),'id'=>'RequisitionDt',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -157,16 +162,16 @@
 						   <label>Cost Center Name</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'CostCenterName','value' => set_value('CostCenterName'),'id'=>'CostCenterName',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
 						 </div>
 						  <div class="col-md-3">
-						   <label>Available Budget Amount</label>
+						   <label>Avl Budget Amt</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'AvailableBudment','value' => set_value('AvailableBudment'),'id'=>'AvailableBudment',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -175,7 +180,7 @@
 						   <label>Status</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
+										 $data = array('name' => 'Status','value' => set_value('Status'),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -246,7 +251,7 @@
 		
     <thead style="background-color:#fff">
       <tr>
-	    <th><input type="checkbox" name="name1" />&nbsp;</th>
+	    <th>Select</th>
          <th>Requisition Number</th>
          <th>Requisition Date</th>
          <th>Status</th>
@@ -256,22 +261,22 @@
     </thead>
     <tbody>
       <tr>
-	  <td><input type="checkbox" name="name2" />&nbsp;</td>
-        <td><a data-toggle="modal" data-target="#myModal">1</a></td>
+	  <td><input type="checkbox" name="chk1" id="chk1"/>&nbsp;</td>
+        <td><a data-toggle="modal" data-target="#myModal"><u>REQ000001</u></a></td>
         <td>2/3/2017</td>
         <td>Pending</td>
 		 
       </tr>
       <tr>
-	  <td><input type="checkbox" name="name2" />&nbsp;</td>
-        <td><a data-toggle="modal" data-target="#myModal">2</a></td>
+	  <td><input type="checkbox" name="chk2" id="chk2" />&nbsp;</td>
+        <td><a data-toggle="modal" data-target="#myModal"><u>REQ000001</u></a></td>
         <td>5/4/2017</td>
         <td>Pending</td>
 		 
       </tr>
       <tr>
-	  <td><input type="checkbox" name="name2" />&nbsp;</td>
-        <td><a data-toggle="modal" data-target="#myModal">3</a></td>
+	  <td><input type="checkbox" name="chk3" id="chk3"/>&nbsp;</td>
+        <td><a data-toggle="modal" data-target="#myModal"><u>REQ000001</u></a></td>
         <td>9/4/2017</td>
         <td>Pending</td>
 		 
@@ -282,7 +287,7 @@
          
          
  <div align="right" style="padding-right:10px">
-  <button type="button" class="btn btn-primary">Create PO</button>
+  <input type="submit" class="btn btn-primary" value="Create PO" >
  
     
   </div>
@@ -291,4 +296,37 @@
          </div>
          
         </section>
-</div>
\ No newline at end of file
+</div>
+<script>
+var baseurl = "<?php print base_url(); ?>";
+ $(".RequisitionList").submit(function(e) {
+  
+  
+		e.preventDefault();
+		
+		var id = '';
+		 var chk1 = $('#chk1').val();
+		  var chk2 = $('#chk2').val();
+		   var chk3 = $('#chk3').val();
+		  if( $('#chk1').is(":checked"))
+		  {
+			 id = ''; 
+		  }
+		  else if($('#chk2').is(":checked"))
+		  {
+			   id = ''; 
+		  }
+		  else if($('#chk3').is(":checked"))
+		  {
+			   id = ''; 
+		  }
+		  // alert(chk1);
+		   // alert(chk2);
+			// alert(chk3);
+
+				window.location =	baseurl +'purchaseorderform/purchaseorder';
+				
+			
+		 });
+		 </script>
+		  
\ No newline at end of file