diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 8253f438..a147f83d 100644
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -10,6 +10,7 @@
     <link href="<?php echo base_url(); ?>assets/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
     <!-- Ionicons 2.0.0 -->
     <link href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css" />
+ 
     <!-- Theme style -->
     <link href="<?php echo base_url(); ?>assets/dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" />
     <!-- AdminLTE Skins. Choose a skin from the css/skins 
@@ -17,48 +18,46 @@
     <link href="<?php echo base_url(); ?>assets/dist/css/skins/_all-skins.min.css" rel="stylesheet" type="text/css" />
 	
 	<!-- daterange picker -->
-  <link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/daterangepicker/daterangepicker.css">
- 
+	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/daterangepicker/daterangepicker.css">
+	
+	<!-- date-range-picker -->
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js"></script>
+	<script src="<?php echo base_url(); ?>assets/plugins/daterangepicker/daterangepicker.js"></script>
  				
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery-1.12.4.js"></script>
 	<!-- jquery-1.12.4.min -->
     <script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery-1.12.4.min.js"></script>
     <script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery.jeditable.js"></script>
-   
-	<script type="text/javascript" src="<?php echo base_url();?>assets/js/plugins/dataTables/jquery.dataTables.js"></script>
-	
-<!-- DataTables -->
+    
+	<!-- DataTables -->
 	<script src="<?php echo base_url();?>assets/plugins/datatables/jquery.dataTables.min.js"></script>
-	<script src="<?php echo base_url();?>assets/plugins/datatables/dataTables.bootstrap.min.js"></script>	
+	<script src="<?php echo base_url();?>assets/plugins/datatables/dataTables.bootstrap.min.js"></script>
 			 
-		 
+	<!-- cdn fot data Table plugins-->	
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery.autocomplete.js"></script> 	 
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/underscore.js"></script> 	 	  
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery-ui-1.10.4.min.js"></script>
 	<script src="<?php echo base_url();?>assets/dist/jquery.loader.js"></script>
 	<link href="<?php echo base_url();?>assets/dist/jquery.loader.css" rel="stylesheet" type="text/css" />
+	
 	<!-- For Table Sorting -->	
-	<script type="text/javascript" src="<?php echo base_url();?>assets/js/tsort.min.js"></script> 	
-		<!-- For Searchable dropdown -->	
+	<script type="text/javascript" src="<?php echo base_url();?>assets/js/tsort.min.js"></script>
+ 	
+	<!-- For Searchable dropdown -->	
 	<script src="<?php echo base_url();?>assets/plugins/select2/select2.full.min.js"></script>
 	<script src="<?php echo base_url();?>assets/plugins/daterangepicker/moment.js"></script>
 	<script src="<?php echo base_url();?>assets/plugins/daterangepicker/moment.min.js"></script>
 	<script src="<?php echo base_url();?>assets/plugins/daterangepicker/daterangepicker.js"></script>
-	
 	 
-  	<script src="<?php echo base_url();?>assets/dist/sweetalert.min.js"></script>
-		
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url();?>dist/sweetalert.css">	   
-
 	<link href="<?php echo base_url();?>assets/css/default.css" rel="stylesheet" type="text/css" />	 	 
-	<link href="<?php echo base_url();?>assets/css/style.css" rel="stylesheet" type="text/css" />
+	<link href="<?php echo base_url();?>assets/css/style.css"   rel="stylesheet" type="text/css" />
 	<link href="<?php echo base_url();?>assets/css/animate.css" rel="stylesheet" type="text/css" />
 	<link href="<?php echo base_url();?>assets/css/style.min.css" rel="stylesheet" type="text/css" />
 	<link href="<?php echo base_url();?>assets/css/bootstrap.css" rel="stylesheet" type="text/css" />
 	<link href="<?php echo base_url();?>assets/css/component.css" rel="stylesheet" type="text/css" />
    
 	<link rel="stylesheet" href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css"  type="text/css"> 
-			 
+	
 	<!-- Bootstrap 3.3.4 -->
     <link href="<?php echo base_url(); ?>assets/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />    
     <!-- FontAwesome 4.3.0 -->
@@ -69,16 +68,16 @@
     <link href="<?php echo base_url(); ?>assets/dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" />
     <!-- AdminLTE Skins. Choose a skin from the css/skins 
          folder instead of downloading all of them to reduce the load. -->
-    <link href="<?php echo base_url(); ?>assets/dist/css/skins/_all-skins.min.css" rel="stylesheet" type="text/css" />
-	    <!-- Searchable dropdown -->
-	 <link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/select2/select2.min.css">
-
-	 <!-- fullCalendar 2.2.5 -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js"></script>
-<script src="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.js"></script>
-<!-- fullCalendar 2.2.5-->
-  <link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.css">
-  <link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.print.css" media="print">
+		 
+	<!-- Searchable dropdown -->
+	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/select2/select2.min.css">
+	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/daterangepicker/daterangepicker.css">
+	<!-- fullCalendar 2.2.5 -->
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js"></script>
+	<script src="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.js"></script>
+	<!-- fullCalendar 2.2.5-->
+	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.css">
+	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.print.css" media="print">
     <style>
     	.error{
     		color:red;
@@ -148,10 +147,9 @@
                 <i class="fa fa-dashboard"></i> <span>Dashboard</span> 
               </a>
             </li>
-				<?php   if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE )
-						{  
-						
-						
+				<?php  
+						 if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE )
+						{ 
 						?>
 				
 			<li class="treeview">		      
@@ -240,7 +238,6 @@
 				</ul>  
 			</li>	
  <?php
-						
 							}
 										
 							?>			
@@ -272,6 +269,7 @@
 									<span>Approve Requisition </span>
 								  </a>
 								</li>
+								
 								<?Php 
 								} ?>
 								<?Php  
@@ -282,7 +280,7 @@
 								<li class="treeview">
 								  <a href="<?php echo base_url(); ?>CreatePO">
 									<i class="fa fa-users"></i>
-									<span>Purchase Order Requisition</span>
+									<span>Purchase Order From Requisition</span>
 								  </a>
 								</li>
 								<?Php } ?>
@@ -294,7 +292,7 @@
 					?>
 					
 			<?php
-						if($DEPCode == FINANCE)
+						if($DEPCode == FINANCE || $role == ROLE_MANAGER)
 						{
 						?>
 						 
diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php
index 3efa4d7d..308e5892 100644
--- a/application/views/purchaseorder.php
+++ b/application/views/purchaseorder.php
@@ -1,7 +1,7 @@
 
 <?php $ReqType =''; ?>
 <style>
-            .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;}
+            
 			#packagingcalmodel {
 	margin-top:200px;
 	z-index: 1080 !important;
@@ -18,7 +18,10 @@
 	margin-top:200px;
 	z-index: 1080 !important;
 }	
-
+.modal
+{
+	padding-right:30% ! important;
+}
 
             </style>
 			<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
@@ -907,7 +910,7 @@ calculateTotalValue();
 	   <label>Address</label>
 					<div class="form-group">
 								<?php
-						 $data = array('name' => 'SupAddress','value' => set_value('SupAddress'),'id'=>'SupAddress',  'class' => 'form-control' ,'readonly' => 'true',"height" => "10px");
+						 $data = array('name' => 'SupAddress','value' => set_value('SupAddress'),'id'=>'SupAddress',  'class' => 'form-control' ,'readonly' => 'true' ,'rows' => '3', 'cols' => '40');
 						echo Form_textarea($data);
 						?>   
 					</div>
@@ -916,7 +919,7 @@ calculateTotalValue();
 	   <label>Delivery Address</label>
 					<div class="form-group">
 								<?php
-						 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr'),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true');
+						 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr'),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
 						echo Form_textarea($data);
 						?>   
 					</div>
@@ -1034,7 +1037,7 @@ calculateTotalValue();
   <div class="modal fade" id="CSTCalModel" role="dialog">
     <div class="modal-dialog">
     
-      <!-- Modal content-->
+      <!-- Modal for CST Calculation-->
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal">&times;</button>
@@ -1065,405 +1068,401 @@ calculateTotalValue();
 <div align="right">
   <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Add Line Item</button> </a> 
  
-  
-  <!-- model for revenue po -->
-    <div  id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  </div> 
+     <div  id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog">
 	   <!-- Modal content-->
 	 <form>
-		  <div class="modal-content" style="width:900px;">
+		  <div class="modal-content" style="width:1000px;">
 			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
 			  <button type="button" class="close" data-dismiss="modal">&times;</button>
 			  <center><h4>Select Revenue Purchase Order Line Item </h4></center>				
 			</div>
-			<div align="left"> 
-			 
-			<div class="col-md-12">
-						 <div class="col-md-3">
-						 <label>Req No</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 align="left"> 
+				<div>
+					<div class="col-md-12" >
+							 <div class="col-md-3">
+							 <label>Req No</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>
-						 
-						  <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 Name</label>
-									<div class="form-group">
-												<?php
-						$options = array("0"=>'Select Cost Center');  													
-			
-						echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
+							 
+							  <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 Name</label>
+										<div class="form-group">
+													<?php
+							$options = array("0"=>'Select Cost Center');  													
+				
+							echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
 
-						?>		
-									</div>
-						 </div>
-						  <div class="col-md-2">
-						   <label>Avl Bud Amt</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt',  '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</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>Avl Bud Amt</label>
+										<div class="form-group">
+													<?php
+											 $data = array('name' => 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt',  '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</label>
+										<div  >
+											 <?php
+											$options = array("0"=>'Item Code');     
+																	
+								
+											echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
 
-										?>						 
-									</div>
-					   </div>
+											?>						 
+										</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-2">
-						  <label>Quantity</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>Rate</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()' );
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>Basic Amount</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue',  '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>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">
+							 <div class="col-md-2">
+							  <label>Item Name</label>
+										<div class="form-group">
 													<?php
-											 $data = array('name' => 'txtDiscount','value' => set_value('txtDiscount'),'id'=>'txtDiscount',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'calculateDiscount();');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>
-			 <div class="col-md-2">
-							  <label>After Discount </label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtAfterDiscount','value' => set_value('txtAfterDiscount'),'id'=>'txtAfterDiscount',  'class' => 'form-control' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>
-			<div id="Vat" >
-			 <div class="col-md-2 col-md-offset-2"  >
-							  <label>Vat in %</label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtVat','value' => set_value('txtVat'),'id'=>'txtVat',  'class' => 'form-control','onchange'=>'calculateVat();' );
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>
-			 <div class="col-md-2" >
-							  <label>Vat Rate </label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtAfterVat','value' => set_value('txtAfterVat'),'id'=>'txtAfterVat',  'class' => 'form-control' ,'readonly' => 'true','onkeypress'=>'return isNumberKey(event);');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>
-			 </div>
-			  <div style="display:none;"  id="CST">
-			  <div class="col-md-2 col-md-offset-2" >
-							  <label>CST in %</label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtCST','value' => set_value('txtCST'),'id'=>'txtCST',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateCST();');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>
-			 <div class="col-md-2" >
-							  <label>CST Rate</label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtAfterCST','value' => set_value('txtAfterCST'),'id'=>'txtAfterCST',  'class' => 'form-control' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>
-			</div>
-			</div> 
-			</div>
-			<div class="row">
-			 <div class="col-md-12" style="text-align:left;">
-			 						<div class="col-md-2">
-							  <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' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculatePackaging();');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>
-			 <div class="col-md-2">
-							  <label>After Packaging </label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtAfterPackaging','value' => set_value('txtAfterPackaging'),'id'=>'txtAfterPackaging',  'class' => 'form-control' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>  
-			<div class="col-md-2 col-md-offset-2">
-							  <label>GST in %</label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtGST','value' => set_value('txtGST'),'id'=>'txtGST',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST();');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>
-			 <div class="col-md-2">
-							  <label>GST Rate</label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtAfterGST','value' => set_value('txtAfterGST'),'id'=>'txtAfterGST',  '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 col-md-offset-2">
-							  <label>Excise Duty in %	</label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtExciseDuty','value' => set_value('txtExciseDuty'),'id'=>'txtExciseDuty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateExcise();');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>
-			 <div class="col-md-2">
-							  <label> Excise Duty Rate</label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtAfterExciseDuty','value' => set_value('txtAfterExciseDuty'),'id'=>'txtAfterExciseDuty',  'class' => 'form-control' ,'readonly' => 'true');
+											 $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 col-md-offset-4">
-							  <label> Insurance if Any</label>
-							  <div class="form-group">
+							 </div>
+							 <div class="col-md-2">
+							  <label>UOM</label>
+										<div class="form-group">
 													<?php
-											 $data = array('name' => 'txtInsurance','value' => set_value('txtInsurance'),'id'=>'txtInsurance',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateTotalValue();');
+											 $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control' ,'readonly' => 'true');
 											echo form_input($data);
 											?>   
 										</div>
-			</div>
-			</div>
-			</div>
-			</div>
-			<div class="row">
-			<div class="col-md-12"  >
-			<div class="col-md-2 col-md-offset-2">
-							  <label>Other  Taxes in %</label>
-							  <div class="form-group">
+							 </div>
+							 <div class="col-md-2">
+							  <label>Quantity</label>
+										<div class="form-group">
 													<?php
-											 $data = array('name' => 'txtOtherTax','value' => set_value('txtOtherTax'),'id'=>'txtOtherTax',  'class' => 'form-control','onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateOtherTaxes();');
+											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
 											echo form_input($data);
 											?>   
-										</div> 
-			</div>
-			 <div class="col-md-2">
-							  <label>Other Taxes Rate</label>
-							  <div class="form-group">
+										</div>
+							 </div>
+							 <div class="col-md-2">
+							  <label>Rate</label>
+										<div class="form-group">
 													<?php
-											 $data = array('name' => 'txtAfterOtherTax','value' => set_value('txtAfterOtherTax'),'id'=>'txtAfterOtherTax',  'class' => 'form-control' ,'readonly' => 'true');
+											 $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()' );
 											echo form_input($data);
-											?>  
-										</div> 
+											?>   
+										</div>
+							 </div>
+							 <div class="col-md-2">
+							  <label>Basic Amount</label>
+										<div class="form-group">
+													<?php
+											 $data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue',  'class' => 'form-control' ,'readonly' => 'true');
+											echo form_input($data);
+											?>   
+										</div>
+							 </div>
+				</div>
+
+				</div>
+<br/>				
+				<div class="col-md-12" style="border : 1px solid">		 	 
+				<div class="row">		
+					<div class="col-md-6">
+							<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;
+													}										
 										
-			</div>
-			 <div class="col-md-4 col-md-offset-2">
-							  <label>Total Order Rate </label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtTotalOrderValue','value' => set_value('txtTotalOrderValue'),'id'=>'txtTotalOrderValue',  '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"=>'Select Freight Type');     
-											//print_r(  $options);
-											
-											if(!empty($FreightType))
-											{
-											foreach ($FreightType as $SID):
-											  
-										   
-											  $options[$SID->ConfigValue] =  $SID->ConfigValue;
+													echo form_dropdown('DiscountType', $options,set_value('DiscountType'),'id="DiscountType"' ,'class="form-control"');
 
-											endforeach;
-											}										
-								
-											echo form_dropdown('drpFreight', $options,set_value('drpFreight'),'id="drpFreight"' ,'class="form-control "');
+													?>						 
+												</div>
+								</div>
+								 <div class="col-md-4">
+												  <label>Discount Rate </label>
+												  <div class="form-group">
+																		<?php
+																 $data = array('name' => 'txtDiscount','value' => set_value('txtDiscount'),'id'=>'txtDiscount',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'calculateDiscount();');
+																echo form_input($data);
+																?>   
+															</div> 
+								</div>
+								 <div class="col-md-4">
+												  <label>After Discount </label>
+												  <div class="form-group">
+																		<?php
+																 $data = array('name' => 'txtAfterDiscount','value' => set_value('txtAfterDiscount'),'id'=>'txtAfterDiscount',  'class' => 'form-control' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div> 
+								</div>
+					 </div>
+					 <div class="col-md-6">
+						<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;
 
-											?>						 
-										</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' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight();');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>
-			 <div class="col-md-2">
-							  <label>After Freight </label>
-							  <div class="form-group">
-													<?php
-											 $data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div> 
-			</div>  
-			
-			<div class="col-md-6">
-			<div class="modal-footer" style="border-top:2px solid #9e9e9e">
-			<a class="btn btn-info font AddRevenue"  ID="AddRevenue"  style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
-			<a class="btn btn-info" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-			
-			
-          
-			</div>
-			</div>
-			</div> 
-			</div>
-			 
- 		 
+													endforeach;
+													}										
+										
+													echo form_dropdown('PackagingType', $options,set_value('PackagingType'),'id="PackagingType"' ,'class="form-control "');
+
+													?>						 
+												</div>
+						</div>
+						 <div class="col-md-4">
+										  <label>Packaging Rate </label>
+										  <div class="form-group">
+																<?php
+														 $data = array('name' => 'txtPackaging','value' => set_value('txtPackaging'),'id'=>'txtPackaging',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculatePackaging();');
+														echo form_input($data);
+														?>   
+													</div> 
+						</div>
+						<div class="col-md-4">
+										  <label>After Packaging </label>
+										  <div class="form-group">
+																<?php
+														 $data = array('name' => 'txtAfterPackaging','value' => set_value('txtAfterPackaging'),'id'=>'txtAfterPackaging',  'class' => 'form-control' ,'readonly' => 'true');
+														echo form_input($data);
+														?>   
+													</div> 
+						</div>  
+					 </div>
+				</div>
+				<div class="row">		
+					<div class="col-md-4">
+						<div class="col-md-6">
+									  <label>Excise Duty in %	</label>
+									  <div class="form-group">
+															<?php
+													 $data = array('name' => 'txtExciseDuty','value' => set_value('txtExciseDuty'),'id'=>'txtExciseDuty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateExcise();');
+													echo form_input($data);
+													?>   
+												</div> 
+					</div>
+					 <div class="col-md-6">
+									  <label> Excise Duty Rate</label>
+									  <div class="form-group">
+															<?php
+													 $data = array('name' => 'txtAfterExciseDuty','value' => set_value('txtAfterExciseDuty'),'id'=>'txtAfterExciseDuty',  'class' => 'form-control' ,'readonly' => 'true');
+													echo form_input($data);
+													?>   
+												</div>
+					</div>
+					 </div>
+					 <div class="col-md-4" id="Vat">
+						<div class="col-md-6"  >
+									  <label>Vat in %</label>
+									  <div class="form-group">
+															<?php
+													 $data = array('name' => 'txtVat','value' => set_value('txtVat'),'id'=>'txtVat',  'class' => 'form-control','onchange'=>'calculateVat();' );
+													echo form_input($data);
+													?>   
+												</div> 
+					</div>
+					 <div class="col-md-6" >
+									  <label>Vat Rate </label>
+									  <div class="form-group">
+															<?php
+													 $data = array('name' => 'txtAfterVat','value' => set_value('txtAfterVat'),'id'=>'txtAfterVat',  'class' => 'form-control' ,'readonly' => 'true','onkeypress'=>'return isNumberKey(event);');
+													echo form_input($data);
+													?>   
+												</div> 
+					</div>
+					 </div>
+					 <div class="col-md-4" style="display:none;"  id="CST">
+						<div class="col-md-6" >
+									  <label>CST in %</label>
+									  <div class="form-group">
+															<?php
+													 $data = array('name' => 'txtCST','value' => set_value('txtCST'),'id'=>'txtCST',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateCST();');
+													echo form_input($data);
+													?>   
+												</div> 
+						</div>
+						 <div class="col-md-6" >
+										  <label>CST Rate</label>
+										  <div class="form-group">
+																<?php
+														 $data = array('name' => 'txtAfterCST','value' => set_value('txtAfterCST'),'id'=>'txtAfterCST',  'class' => 'form-control' ,'readonly' => 'true');
+														echo form_input($data);
+														?>   
+													</div> 
+						</div>
+					 </div>
+					<div class="col-md-4">
+						<div class="col-md-6">
+									  <label>GST in %</label>
+									  <div class="form-group">
+															<?php
+													 $data = array('name' => 'txtGST','value' => set_value('txtGST'),'id'=>'txtGST',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST();');
+													echo form_input($data);
+													?>   
+												</div> 
+						</div>
+						 <div class="col-md-6">
+										  <label>GST Rate</label>
+										  <div class="form-group">
+																<?php
+														 $data = array('name' => 'txtAfterGST','value' => set_value('txtAfterGST'),'id'=>'txtAfterGST',  'class' => 'form-control' ,'readonly' => 'true');
+														echo form_input($data);
+														?>   
+													</div> 
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-md-6">
+						<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-4">
+										  <label>Freight Rate </label>
+										  <div class="form-group">
+																<?php
+														 $data = array('name' => 'txtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight();');
+														echo form_input($data);
+														?>   
+													</div> 
+						</div>
+						<div class="col-md-4">
+										  <label>After Freight </label>
+										  <div class="form-group">
+																<?php
+														 $data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control' ,'readonly' => 'true');
+														echo form_input($data);
+														?>   
+													</div> 
+						</div>  
+					</div>
+					<div class="col-md-4">
+						<div class="col-md-6">
+									  <label>Other  Taxes in %</label>
+									  <div class="form-group">
+															<?php
+													 $data = array('name' => 'txtOtherTax','value' => set_value('txtOtherTax'),'id'=>'txtOtherTax',  'class' => 'form-control','onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateOtherTaxes();');
+													echo form_input($data);
+													?>   
+												</div> 
+						</div>
+						<div class="col-md-6">
+										  <label>Other Taxes Rate</label>
+										  <div class="form-group">
+																<?php
+														 $data = array('name' => 'txtAfterOtherTax','value' => set_value('txtAfterOtherTax'),'id'=>'txtAfterOtherTax',  'class' => 'form-control' ,'readonly' => 'true');
+														echo form_input($data);
+														?>  
+													</div> 											
+						</div>
+					</div>
+					<div class="col-md-2">				 
+						  <label> Insurance if Any</label>
+						  <div class="form-group">
+												<?php
+										 $data = array('name' => 'txtInsurance','value' => set_value('txtInsurance'),'id'=>'txtInsurance',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateTotalValue();');
+										echo form_input($data);
+										?>   
+							</div>			 
+					</div>
+				</div>				
+				<div class="row">
+					<div class="col-md-4 col-md-offset-8">
+									  <label>Total Order Rate </label>
+									  <div class="form-group">
+															<?php
+													 $data = array('name' => 'txtTotalOrderValue','value' => set_value('txtTotalOrderValue'),'id'=>'txtTotalOrderValue',  'class' => 'form-control' ,'readonly' => 'true');
+													echo form_input($data);
+													?>   
+												</div> 
+					</div>
+				</div>
+				
+				</div>
+				<br/><br/>
+				<div class="modal-footer">
+					<div class="col-md-4 col-md-offset-8">
+					 
+					<a class="btn btn-info font AddRevenue"  ID="AddRevenue"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
+					<a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+					 
+					</div>
+		</div>
+				</div>
+ 		  
 		 </div>
-		  
-		  </div>
-		 </form>
-			 
-		  </div>
+		 </form>			 
+	</div>	  
 	</div>	
-	
+	 
 <!-- Model for servicepo -->
     <div class="modal fade" id="SERVICE" role="dialog">
 		<div class="modal-dialog">
@@ -1757,6 +1756,7 @@ calculateTotalValue();
 		 </div>
 		 
 			</div>
+			<br/>
 			<div class="modal-footer">
 			<a class="btn btn-info font AddService"  ID="AddService"  style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>
 			<a class="btn btn-info" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
@@ -2270,222 +2270,226 @@ calculateTotalValue();
 			 
 		  </div>
 	</div>	
-  </div>
-</div>
+   
+ 
    
    
    <br/>
-    <thead style="background-color:#fff">
-      <tr>
-	   <th>SNo</th>
-        <th>Requisition No</th>
-        <th>Item Name</th>
-        <th>Quantity</th>
-        <th>UOM</th>
-		<th>Rate</th>
-        <th>Basic Amount</th>
-		 <th>Tax Amount</th>
-        <th>Total Order Amount</th>
-		<th>Action</th>
-      </tr>
-    </thead>
+     
+	               
+            <div class="box-body">
+              <table id="example2" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px">
+                <thead>
+                <tr>
+					<th>SNo</th>
+					<th>Requisition No</th>
+					<th>Item Name</th>
+					<th>Quantity</th>
+					<th>UOM</th>
+					<th>Rate</th>
+					<th>Basic Amount</th>
+					 <th>Tax Amount</th>
+					<th>Total Order Amount</th>
+					<th>Action</th>
+                </tr>
+                </thead>				
+                <tbody>
+				<!--- Sample static data -->
+				<tr>
+					<td>1</td>
+					 <td>Req0004</td>
+					  <td>Sand</td>
+					  <td>100</td>
+					  <td>kgs</td>
+					  <td>100</td>
+					  <td>10000</td>
+					  <td>1000</td>
+					  <td>11000</td>
+					  <td>Edit</td>
+					  
+				</tr>
+				<tr>
+					<td>2</td>
+					 <td>Req0008</td>
+					  <td>Sand</td>
+					  <td>150</td>
+					  <td>kgs</td>
+					  <td>100</td>
+					  <td>15000</td>
+					  <td>1000</td>
+					  <td>16000</td>
+					  <td>Edit</td>
+					   
+				</tr>
+				<tr>
+					<td>3</td>
+					 <td>Req0016</td>
+					  <td>Resin</td>
+					  <td>100</td>
+					  <td>liter</td>
+					  <td>100</td>
+					  <td>10000</td>
+					  <td>500</td>
+					  <td>10500</td>
+					  <td>Edit</td>
+				</tr>
+				<!--- /Sample static data -->
+                </tbody>
+                <tfoot>
+                <tr>
+                  <th>SNo</th>
+					<th>Requisition No</th>
+					<th>Item Name</th>
+					<th>Quantity</th>
+					<th>UOM</th>
+					<th>Rate</th>
+					<th>Basic Amount</th>
+					 <th>Tax Amount</th>
+					<th>Total Order Amount</th>
+					<th>Action</th>
+                </tr>
+                </tfoot>
+              </table>
+            </div>
+            <!-- /.box-body -->
+         
+
+      
     <tbody id='RevenueAppend'>
       
     
     </tbody>
-	   
+	 </div>  
   </table>
- <div class="row">
-	   <div class="col-md-12">
-  <div class="col-md-6"> 
-  <div class="form-group">
-							<label>Comments Of Special Instructions :</label>	<?php
-						 $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction',  'class' => 'form-control' );
-						echo form_textarea($data);
-						?>   
-					</div></div>
-   <div class="col-md-6">
-   <div class="row">
-	   <div class="col-md-12">
-    <div class="col-md-6" align="right"> <label >Basic Amount  :</label></div>
-      <div class="col-md-6">			
-					
+ <div class="row">	 
+	<div class="col-md-12"  style="border : 1px solid ">
+	<br/>
+		<div class="col-md-6">
+			<div class="row">
+				<div class="col-md-6"> <label >Basic Amount  :</label></div>
+				<div class="col-md-6">								
 							<?php
 						 $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount'),'id'=>'txtTotBasicAmount',  'class' => 'form-control'  ,'readonly' => 'true');
 						echo form_input($data);
 						?>   
 					
+				</div>			
 			</div> 
-			  </div>
-			  </div>
-			 <br>
-			 <div class="row">
-	   <div class="col-md-12">
-  
-  
-    <div class="col-md-6" align="right"> <label >Total Discount   :</label></div>
-      <div class="col-md-6">			
-					
-							<?php
-						 $data = array('name' => 'txtTotalDiscount','value' => set_value('txtTotalDiscount'),'id'=>'txtTotalDiscount',  'class' => 'form-control'   ,'readonly' => 'true');
-						echo form_input($data);
-						?>   
-					
-			</div> 
-			</div> 
-			</div>
-			<br>
-			<div class="row">
-	   <div class="col-md-12"  id="TotVat"  > 
-  
-    <div class="col-md-6" align="right"> <label >Total Vat   :</label></div>
-      <div class="col-md-6">			
-					
+			<br/>
+			<div class="row" id="TotVat">
+				<div class="col-md-6"> <label >Total Vat   :</label></div>
+				<div class="col-md-6">								
 							<?php
 						 $data = array('name' => 'txtTotalVat','value' => set_value('txtTotalVat'),'id'=>'txtTotalVat',  'class' => 'form-control' ,'readonly' => 'true');
 						echo form_input($data);
-						?>   
-					
-			</div> 
-			</div> 		
-		</div>
-		<div class="row">
-	   <div class="col-md-12" id="TotCST" style="display:none;" >
-   
-  
-    <div class="col-md-6" align="right"> <label >Total CST   :</label></div>
-      <div class="col-md-6">			
-					
+						?>   					
+				</div> 
+			</div><br/>
+			<div class="row" id="TotCST" style="display:none;">
+				<div class="col-md-6"> <label >Total CST   :</label></div>
+				<div class="col-md-6">								
 							<?php
 						 $data = array('name' => 'txtTotCST','value' => set_value('txtTotCST'),'id'=>'txtTotCST',  'class' => 'form-control' ,'readonly' => 'true');
 						echo form_input($data);
-						?>   
-					
-			</div> 
-			</div> 
-			</div>
-			<br>
+						?>   					
+				</div> 
+			</div>			 
 			<div class="row">
-	   <div class="col-md-12">
-  
-  
-    <div class="col-md-6" align="right"> <label >Total Packaging   :</label></div>
-      <div class="col-md-6">			
-					
-							<?php
-						 $data = array('name' => 'txtTotalPackaing','value' => set_value('txtTotalPackaing'),'id'=>'txtTotalPackaing',  'class' => 'form-control'  ,'readonly' => 'true');
-						echo form_input($data);
-						?>   
-					
-			</div> 
-			</div> 
-			</div>
-			
-			<br>
-			<div class="row">
-	   <div class="col-md-12">
-  
-  
-    <div class="col-md-6" align="right"> <label >Total Excise Duty   :</label></div>
-      <div class="col-md-6">			
-					
+				<div class="col-md-6"> <label >Total Excise Duty   :</label></div>
+				<div class="col-md-6">								
 							<?php
 						 $data = array('name' => 'txtTotExciseDuty','value' => set_value('txtTotExciseDuty'),'id'=>'txtTotExciseDuty',  'class' => 'form-control'   ,'readonly' => 'true');
 						echo form_input($data);
-						?>   
-					
-			</div> 
-			</div> 
-			</div>
-			<br>
-			
+						?>   					
+				</div>
+			</div><br/>
 			<div class="row">
-	   <div class="col-md-12">
-  
-  
-    <div class="col-md-6" align="right"> <label >Total GST   :</label></div>
-      <div class="col-md-6">			
-					
-							<?php
-						 $data = array('name' => 'txtTotalGST','value' => set_value('txtTotalGST'),'id'=>'txtTotalGST',  'class' => 'form-control' ,'readonly' => 'true');
-						echo form_input($data);
-						?>   
-					
-			</div> 
-			</div> 
-			</div>
-			<br>
-			
-			
-			
-			<div class="row">
-	   <div class="col-md-12">
-  
-  
-    <div class="col-md-6" align="right"> <label >Other Taxes   :</label></div>
-      <div class="col-md-6">			
-					
+				<div class="col-md-6"> <label >Other Taxes   :</label></div>
+				<div class="col-md-6">								
 							<?php
 						 $data = array('name' => 'txtTotalOtherTaxes','value' => set_value('txtTotalOtherTaxes'),'id'=>'txtTotalOtherTaxes',  'class' => 'form-control','readonly' => 'true');
 						echo form_input($data);
-						?>   
-					
-			</div> 
-			</div> 
-			</div>
-			<br>
-			
+						?>   					
+				</div> 
+			</div><br/>
 			<div class="row">
-	   <div class="col-md-12">
-   
-  
-    <div class="col-md-6" align="right"> <label >Total Insurance   :</label></div>
-      <div class="col-md-6">			
-					
+				<div class="col-md-12">
+				<div class="form-group">
+							<label>Comments Of Special Instructions :</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>
+		<div class="col-md-6">
+			<div class="row">
+				<div class="col-md-6"> <label >Total Discount   :</label></div>
+				<div class="col-md-6">								
+							<?php
+						 $data = array('name' => 'txtTotalDiscount','value' => set_value('txtTotalDiscount'),'id'=>'txtTotalDiscount',  'class' => 'form-control'   ,'readonly' => 'true');
+						echo form_input($data);
+						?>   					
+				</div> 
+			</div><br/>
+			<div class="row">
+				<div class="col-md-6"> <label >Total Packaging   :</label></div>
+				<div class="col-md-6">								
+							<?php
+						 $data = array('name' => 'txtTotalPackaing','value' => set_value('txtTotalPackaing'),'id'=>'txtTotalPackaing',  'class' => 'form-control'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>   				
+				</div> 
+			</div><br/>
+			<div class="row">
+				<div class="col-md-6"> <label >Total GST   :</label></div>
+				<div class="col-md-6">								
+							<?php
+						 $data = array('name' => 'txtTotalGST','value' => set_value('txtTotalGST'),'id'=>'txtTotalGST',  'class' => 'form-control' ,'readonly' => 'true');
+						echo form_input($data);
+						?>   					
+				</div> 
+			</div><br/>
+			<div class="row">
+				<div class="col-md-6"> <label >Total Insurance   :</label></div>
+				<div class="col-md-6">								
 							<?php
 						 $data = array('name' => 'txtTotalInsurance','value' => set_value('txtTotalInsurance'),'id'=>'txtTotalInsurance',  'class' => 'form-control' ,'readonly' => 'true');
 						echo form_input($data);
-						?>   
-					
-			</div> 
-			</div> 
-			</div>
-			<br>
+						?>   					
+				</div> 
+			</div><br/>
 			<div class="row">
-	   <div class="col-md-12">
-   
-  
-    <div class="col-md-6" align="right"> <label >Total Freight   :</label></div>
-      <div class="col-md-6">			
-					
+				<div class="col-md-6"> <label >Total Freight   :</label></div>
+				<div class="col-md-6">								
 							<?php
 						 $data = array('name' => 'txtTotalFreight','value' => set_value('txtTotalFreight'),'id'=>'txtTotalFreight',  'class' => 'form-control' ,'readonly' => 'true');
 						echo form_input($data);
-						?>   
-					
-			</div> 
-			</div> 
-			</div>
-			<br>
-			<br>
+						?>   					
+				</div> 
+			</div><br/>
 			<div class="row">
-	   <div class="col-md-12">
-   
-  
-    <div class="col-md-6" align="right"> <label >Total Order Value   :</label></div>
-      <div class="col-md-6">			
-					
+			<div class="col-md-6"> <label >Revenue Tax  :</label></div>
+				<div class="col-md-6">								
+							<?php
+						 $data = array('name' => 'revenueTax','value' => set_value('revenueTax'),'id'=>'revenueTax',  'class' => 'form-control');
+						echo form_input($data);
+						?>   					
+				</div>
+			</div><br/>
+			<div class="row">
+				<div class="col-md-6"> <label >Total Order Value   :</label></div>
+				<div class="col-md-6">								
 							<?php
 						 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary'),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control'  ,'readonly' => 'true');
 						echo form_input($data);
-						?>   
-					
-			</div> 
-			</div> 
-			</div>
-			<br/>
-			<div class="row">
-	   <div class="col-md-4 col-md-offset-8">
+						?>   					
+				</div> 
+			</div><br/>
+		</div>
+		<div class="row">
+	   <div class="col-md-3 col-md-offset-9">
 	   <input type="hidden" name="txtPoRange" id="txtPoRange" /> 
 	  <input type="hidden" name="txtStatus" id="txtStatus" /> 
     <input type="hidden" name="txtRowCount" id="txtRowCount" />
@@ -2498,12 +2502,9 @@ calculateTotalValue();
    
 	   </div><br/>
 	   </div>
-			</div>
-			</div>
-<br/>			
- 
-         <br/>
-	 </div>
+	   <br/>
+	</div> 
+</div>
          </div>
        
 </div>
@@ -2776,5 +2777,15 @@ $('#txtStatus').val('<?php echo PO_DRAFT;?>');
 }
 }
 
-
+ $(function () {
+    $("#example1").DataTable();
+    $('#example2').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+    });
+  });
 </script>
\ No newline at end of file