diff --git a/application/logs/log-2017-05-03.php b/application/logs/log-2017-05-03.php
new file mode 100644
index 00000000..1a31b00e
--- /dev/null
+++ b/application/logs/log-2017-05-03.php
@@ -0,0 +1,38 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
+
+ERROR - 2017-05-03 07:46:35 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 07:46:35 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 07:46:35 --> Unable to connect to the database
+ERROR - 2017-05-03 07:57:57 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 07:57:57 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 07:57:57 --> Unable to connect to the database
+ERROR - 2017-05-03 09:25:01 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 09:25:01 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 09:25:01 --> Unable to connect to the database
+ERROR - 2017-05-03 11:04:12 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 11:04:12 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 11:04:12 --> Unable to connect to the database
+ERROR - 2017-05-03 11:27:08 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 11:27:08 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 11:27:08 --> Unable to connect to the database
+ERROR - 2017-05-03 12:24:58 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 12:24:58 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 12:24:58 --> Unable to connect to the database
+ERROR - 2017-05-03 12:25:01 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 12:25:01 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 12:25:01 --> Unable to connect to the database
+ERROR - 2017-05-03 12:25:05 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 12:25:05 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 12:25:05 --> Unable to connect to the database
+ERROR - 2017-05-03 13:39:27 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: No such host is known.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 13:39:27 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: No such host is known.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 13:39:27 --> Unable to connect to the database
+ERROR - 2017-05-03 13:39:32 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: No such host is known.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 13:39:32 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: No such host is known.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 13:39:32 --> Unable to connect to the database
+ERROR - 2017-05-03 13:39:45 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 13:39:45 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: This is usually a temporary error during hostname resolution and means that the local server did not receive a response from an authoritative server.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 13:39:45 --> Unable to connect to the database
+ERROR - 2017-05-03 13:40:03 --> Severity: Warning  --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: No such host is known.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 13:40:03 --> Severity: Warning  --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: No such host is known.  C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77
+ERROR - 2017-05-03 13:40:03 --> Unable to connect to the database
diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php
index c7a3b676..dff73213 100644
--- a/application/views/alterpurchaseorder.php
+++ b/application/views/alterpurchaseorder.php
@@ -12,8 +12,7 @@ function selectpomodel() {
 }	
 </script>	       
 <div class="content-wrapper">
- 
-	 <section class="content">
+  
 	  <div class="col-md-12">
          <center><b><h2>Emergency Purchase Order</h2></b></center><div align="right"><a href="<?php echo base_url(); ?>purchaseorderform/alternatepoprint"><button type="button" class="btn btn-primary" >Print</button></a></div> </div>
          <div class="container-fluid">
@@ -166,9 +165,7 @@ function selectpomodel() {
 <div align="right">
   <a data-toggle="modal" ><button type="submit"  onclick="selectpomodel();" class="btn btn-primary" id="lineitem" >Add Line Item</button> </a>  
  
-  
-  
-  <!-- model for revenue po -->
+   <!-- model for revenue po -->
     <div class="modal fade" id="model1s" role="dialog">
 		<div class="modal-dialog">
 	   <!-- Modal content-->
@@ -176,7 +173,7 @@ function selectpomodel() {
 		  <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 Revenvue Purchase Order Item </h4></center>				
+			  <center><h4>Add Revenue Purchase Order Item </h4></center>				
 			</div>
 			<div align="left"> 
 			 
@@ -185,20 +182,12 @@ function selectpomodel() {
 						 <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>
@@ -208,7 +197,7 @@ function selectpomodel() {
 						   <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>
@@ -217,16 +206,16 @@ function selectpomodel() {
 						   <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>
@@ -240,12 +229,12 @@ function selectpomodel() {
 										$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;
 										}										
@@ -260,7 +249,7 @@ function selectpomodel() {
 						  <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>
@@ -269,7 +258,7 @@ function selectpomodel() {
 						  <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>
@@ -284,286 +273,287 @@ function selectpomodel() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Rate Per unit</label>
+						  <label>Rate</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>Basic 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>
+		 	<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 Rate </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">
-													<?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-6">	 
-										<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-6">
-										<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-6">			
-										<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-6">
-										<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="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 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">
+			 <div class="col-md-2">
+							  <label>After Discount </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 col-md-offset-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>Vat Rate </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>
+			<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"=>'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 class="col-md-2">
+							  <label>Packaging Rate </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 Packaging </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 col-md-offset-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>GST Rate</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 col-md-offset-2">
+							  <label>Excise Duty 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> Excise Duty Rate</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 col-md-offset-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>CST Rate</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 col-md-offset-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>Other Taxes Rate</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-4 col-md-offset-2">
+							  <label>Total Order Rate </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 class="col-md-2">
+							  <label>Freight Rate </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-6">
+			<div class="modal-footer" style="border-top:2px solid #9e9e9e">
 			 <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>
 			  <button type="reset" class="btn btn-default" value="reset">Reset</button>
 			</div>
+			</div>
+			</div> 
+			</div>
+			 
+ 		 
+		 </div>
+		  
 		  </div>
 		 </form>
 			 
 		  </div>
-	</div>	
+	</div>		
 	
 <!-- Model for servicepo -->
     <div class="modal fade" id="model2s" role="dialog">
@@ -681,7 +671,7 @@ function selectpomodel() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Rate Per unit</label>
+						  <label>Rate </label>
 									<div class="form-group">
 												<?php
 										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
@@ -690,7 +680,7 @@ function selectpomodel() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Total Amount</label>
+						  <label>Basic Amount</label>
 									<div class="form-group">
 												<?php
 										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
@@ -941,7 +931,7 @@ function selectpomodel() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Rate Per unit</label>
+						  <label>Rate</label>
 									<div class="form-group">
 												<?php
 										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
@@ -950,7 +940,7 @@ function selectpomodel() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Total Amount</label>
+						  <label>Basic Amount</label>
 									<div class="form-group">
 												<?php
 										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
@@ -959,26 +949,24 @@ function selectpomodel() {
 									</div>
 						 </div>
 		 </div>
-		 <div class="col-md-12">
+		 <div class="col-md-12" >
 			 
 				<div class="col-md-4">
-						<div class="col-md-6">
+						 
 						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');
 										echo form_input($data);
 										?>   
 									</div>						 
-						</div>				 
+						 				 
 				</div>
 				<div class="col-md-4">
-					<div class="col-md-6">			 
+					 		 
 					 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');
@@ -986,14 +974,13 @@ function selectpomodel() {
 										?>   
 									</div>
 					 
-					</div>				 
+					 				 
 				</div>
 				<div class="col-md-4">
-					<div class="col-md-6">
-						Basic value in INR :
 					 
-					</div>
-					<div class="col-md-6">
+						Basic value in INR :
+				 
+					 
 						<div class="form-group">
 												<?php
 										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
@@ -1001,12 +988,12 @@ function selectpomodel() {
 										?>   
 									</div>
 					 
-					</div>		 				 
-				 <a href="http://www.xe.com/" target="_blank">Click to know currency value</a>				 
+					 		 				 
+				 <a href="http://www.xe.com/" target="_blank"><u>Click here to check Today's Foreign Exchange value</u></a>				 
 		 </div>
-		 <div class="col-md-12"  style="border:1px solid #000;">
+		 <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
 		 <br/>
-		    <div class="col-md-6">
+		    <div class="col-md-6" style="padding:0px;">
 				<div class="col-md-12">
 					<div class="col-md-4">
 					Basic Price:
@@ -1197,7 +1184,7 @@ function selectpomodel() {
 					</div>
 				</div>
 			</div>
-			<div class="col-md-6">
+			<div class="col-md-6" style="padding:0px;">
 			  <div class="col-md-12">
 				<div class="col-md-4">
 				Additional Excise duty : (g)
@@ -1277,7 +1264,7 @@ function selectpomodel() {
 										?>   
 									</div>
 				</div>
-				<div class="col-md-4">
+				<div class="col-md-4" style="margin-top: -4.8%">
 				<span>Quantity</span>
 				<div class="form-group">
 												<?php
@@ -1901,16 +1888,16 @@ function selectpomodel() {
     </tbody>
 	   
   </table>
-  <div class="col-md-4">
+  <div class="col-md-6">
 				
 					<div class="form-group">
 							<label>Comments Of Special Instructions :</label>	<?php
 						 $data = array('name' => 'Comments','value' => set_value('Comments'),'id'=>'Comments',  'class' => 'form-control' ,'required' => 'true');
-						echo form_input($data);
+						echo form_textarea($data);
 						?>   
 					</div>
 			</div>
-      <div class="col-md-3 col-md-offset-5">
+      <div class="col-md-3 col-md-offset-3">
 				
 					<div class="form-group">
 							<label>Total Order Value :</label>	<?php
diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php
index 665b6e4f..836beba7 100644
--- a/application/views/purchaseorder.php
+++ b/application/views/purchaseorder.php
@@ -30,54 +30,136 @@ function myFunction() {
 	 <section class="content">
 	  
 	 <div>
-         <center><b><h2>Purchase Order</h2></b></center>
+         <center><b><h2>Purchase Order</h2></b></center></div>
          <div class="container-fluid">
 		
 	 <div class="row">
 	   <div class="col-md-12">
-	   <div class="row">
-	   <div class="col-md-3">
-	   	<label>Requistion No</label>
-					<div>
-						 <?php
-						$options = array("-1"=>'Selected Requistion No');     
-										
-						  $options["0"] =  'REQ00001';
-							$options["1"] =  'REQ00002';
-							$options["2"] =  'REQ00003';								
-			
-						echo form_dropdown('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"' ,'multiple="true"');
+		<div class="row">
+		   <div class="col-md-3">
+			<label>Requistion No</label>
+						<div>
+							 <?php
+								 
+											
+							  $options["0"] =  'REQ00001';
+								$options["1"] =  'REQ00002';
+								$options["2"] =  'REQ00003';	
+								
+				
+							echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
+
+							?>						 
+						</div>
+		   </div>
+		   <div class="col-md-3">
+		   <label>Purchase Order Date</label>
+						<div class="form-group">
+									<?php
+							 $data = array('name' => 'PODate','value' => set_value('PODate'),'id'=>'PODate',  'class' => 'form-control datePicker' ,'required' => 'true');
+							echo form_input($data);
+							?>   
+						</div>
+		   </div>
+		   <div class="col-md-4">
+		   <label>Purchase Order Type</label>
+						<!--<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'POType','value' => set_value('POType'),'id'=>'POType',  'class' => 'form-control' ,'required' => 'true');
+							echo form_input($data);
+							?>   
+						</div>-->
+						<!-- IT IS NOT GOING TO BE A DROPDOWN , BUT NOW KEPT AS DROPDOWN FOR WORK-->
+							<select name="name" id="input" onchange="showDiv('div',this)" class="form-control" >
+							 
+								  <option value="1">Revenue po</option>
+								  <option value="2">Service po</option>
+								  <option value="3">Import po</option>		
+									<option value="4">Capital po</option>							  
+							</select>
+							
+			<div id="div3" style="display:none;">
+				<div class="col-md-4">
+				<label>Currency Type</label>
+									<div class="form-group">
+												<?php
+										 $data = array('name' => 'PODate','value' => set_value('PODate'),'id'=>'PODate',  'class' => 'form-control datePicker' ,'required' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+				</div>
+				<div class="col-md-4">
+				<label>Exchange Rate</label>
+									<div class="form-group">
+												<?php
+										 $data = array('name' => 'PODate','value' => set_value('PODate'),'id'=>'PODate',  'class' => 'form-control datePicker' ,'required' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+				</div>
+				 <div class="col-md-4">
+				<a href="http://www.xe.com/" target="_blank"><u>Click here to check Today's Foreign Exchange value</u></a>	
+				</div> 
+			</div>
+		   </div>
+	  
+			<div class="col-md-2">	
+				<div id="div1" style="display:block;">
+					<b>Select Range</b><br> 
+					<tr>
+					<td>
+					<?php echo form_label('Local', 'Local') . form_radio(array("name"=>"Range","id"=>"Local","value"=>"Local", 'checked'=>set_radio('Range', 'Local', TRUE))); ?>
+					<br><?php echo form_label('Inter state', 'Inter state') . form_radio(array("name"=>"Range","id"=>"Inter_state","value"=>"Inter_state", 'checked'=>set_radio('Range', 'Inter_state', FALSE))); ?>
+					</td> 
+					</tr>
+				</div>
+				<div id="div2" style="display:none;">    
+				</div>
+				<div id="div4" style="display:none;">
+				</div>
+			</div>
+				<!-- Script for displaying range and curreny exchange rate based on po type-->
+					 <script>
+					function showDiv(prefix,chooser) 
+					{
+							for(var i=0;i<chooser.options.length;i++) 
+							{
+								var div = document.getElementById(prefix+chooser.options[i].value);
+								div.style.display = 'none';
+							}
+
+							var selectedOption = (chooser.options[chooser.selectedIndex].value);
+
+							if(selectedOption == "1")
+							{
+								displayDiv(prefix,"1");
+							}
+							if(selectedOption == "2")
+							{
+								displayDiv(prefix,"2");
+							}
+							if(selectedOption == "3")
+							{
+								displayDiv(prefix,"3");
+							}
+							if(selectedOption == "4")
+							{
+								displayDiv(prefix,"4");
+							}
+					}
+
+					function displayDiv(prefix,suffix) 
+					{
+							var div = document.getElementById(prefix+suffix);
+							div.style.display = 'block';
+					}
+				</script>
+		</div>
+	 
+
+
 
-						?>						 
-					</div>
-	   </div>
-	   <div class="col-md-3">
-	   <label>Purchase Order Date</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'PODate','value' => set_value('PODate'),'id'=>'PODate',  'class' => 'form-control datePicker' ,'required' => 'true');
-						echo form_input($data);
-						?>   
-					</div>
-	   </div>
-	   <div class="col-md-4">
-	   <label>Purchase Order Type</label>
-					<!--<div class="form-group">
-					
-								<?php
-						 $data = array('name' => 'POType','value' => set_value('POType'),'id'=>'POType',  'class' => 'form-control' ,'required' => 'true');
-						echo form_input($data);
-						?>   
-					</div>-->
-						<select name="cars"  id="input">
-						<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">Capital po</option>							  
-						</select>
-	   </div>
-	   </div>
 	     <div class="row">
 	   <div class="col-md-3">
 	   	<label>Supplier</label>
@@ -248,7 +330,7 @@ function myFunction() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Rate/unit</label>
+						  <label>Rate</label>
 									<div class="form-group">
 												<?php
 										 $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control' ,'required' => 'true' );
@@ -257,7 +339,7 @@ function myFunction() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Tot Amount</label>
+						  <label>Basic Amount</label>
 									<div class="form-group">
 												<?php
 										 $data = array('name' => 'TotAmt','value' => set_value('TotAmt'),'id'=>'TotAmt',  'class' => 'form-control' ,'readonly' => 'true');
@@ -266,7 +348,7 @@ function myFunction() {
 									</div>
 						 </div>
 		 </div>
-		
+		<div>
 		 	<div class="row">
 			 <div class="col-md-12">
 			 						<div class="col-md-2">
@@ -292,7 +374,7 @@ function myFunction() {
 										</div>
 			 </div>
 			 <div class="col-md-2">
-							  <label>Discount Value </label>
+							  <label>Discount Rate </label>
 							  <div class="form-group">
 													<?php
 											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
@@ -309,10 +391,8 @@ function myFunction() {
 											?>   
 										</div> 
 			</div>
-			 <div class="col-md-2"> &nbsp;
-			 </div>
-			 <div class="col-md-2">
-							  <label>Excise Duty in %	</label>
+			 <div class="col-md-2 col-md-offset-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');
@@ -321,7 +401,7 @@ function myFunction() {
 										</div> 
 			</div>
 			 <div class="col-md-2">
-							  <label>After Excise Duty </label>
+							  <label>Vat Rate </label>
 							  <div class="form-group">
 													<?php
 											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
@@ -329,10 +409,13 @@ function myFunction() {
 											?>   
 										</div> 
 			</div>
+			 
+			  
+			</div>
 			</div> 
 			</div>
 			<div class="row">
-			 <div class="col-md-12">
+			 <div class="col-md-12" style="text-align:left;">
 			 						<div class="col-md-2">
 							  <label>Packaging Type </label>
 										<div>
@@ -356,7 +439,7 @@ function myFunction() {
 										</div>
 			 </div>
 			 <div class="col-md-2">
-							  <label>Packaging Value </label>
+							  <label>Packaging Rate </label>
 							  <div class="form-group">
 													<?php
 											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
@@ -372,10 +455,9 @@ function myFunction() {
 											echo form_input($data);
 											?>   
 										</div> 
-			</div> <div class="col-md-2"> &nbsp;
-			 </div>
-			 <div class="col-md-2">
-							  <label>Vat in %</label>
+			</div>  
+			<div class="col-md-2 col-md-offset-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');
@@ -384,7 +466,7 @@ function myFunction() {
 										</div> 
 			</div>
 			 <div class="col-md-2">
-							  <label>After Vat </label>
+							  <label>GST Rate</label>
 							  <div class="form-group">
 													<?php
 											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'readonly' => 'true');
@@ -392,10 +474,84 @@ function myFunction() {
 											?>   
 										</div> 
 			</div>
+			
 			</div> 
 			</div>
 			<div class="row">
-			 <div class="col-md-12">
+			<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' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
+											echo form_input($data);
+											?>   
+										</div> 
+			</div>
+			 <div class="col-md-2">
+							  <label> Excise Duty Rate</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 col-md-offset-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>CST Rate</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 col-md-offset-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>Other Taxes Rate</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-4 col-md-offset-2">
+							  <label>Total Order Rate </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>
@@ -419,7 +575,7 @@ function myFunction() {
 										</div>
 			 </div>
 			 <div class="col-md-2">
-							  <label>Freight Value </label>
+							  <label>Freight Rate </label>
 							  <div class="form-group">
 													<?php
 											 $data = array('name' => 'DiscountValue','value' => set_value('DiscountValue'),'id'=>'DiscountValue',  'class' => 'form-control' ,'required' => 'true');
@@ -435,163 +591,21 @@ function myFunction() {
 											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>
-		<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>
-		 
-		
-			<div class="modal-footer">
+			<div class="col-md-6">
+			<div class="modal-footer" style="border-top:2px solid #9e9e9e">
 			 <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>
 			  <button type="reset" class="btn btn-default" value="reset">Reset</button>
 			</div>
+			</div>
+			</div> 
+			</div>
+			 
+ 		 
+		 </div>
+		  
 		  </div>
 		 </form>
 			 
@@ -708,7 +722,7 @@ function myFunction() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Rate Per unit</label>
+						  <label>Rate</label>
 									<div class="form-group">
 												<?php
 										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true' );
@@ -717,7 +731,7 @@ function myFunction() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Total Amount</label>
+						  <label>Basic Amount</label>
 									<div class="form-group">
 												<?php
 										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
@@ -1013,7 +1027,7 @@ function myFunction() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Rate/unit</label>
+						  <label>Rate </label>
 									<div class="form-group">
 												<?php
 										 $data = array('name' => 'imRate','value' => set_value('imRate'),'id'=>'imRate',  'class' => 'form-control' ,'required' => 'true' );
@@ -1022,7 +1036,7 @@ function myFunction() {
 									</div>
 						 </div>
 						 <div class="col-md-2">
-						  <label>Total Amt	</label>
+						  <label>Basic Amount	</label>
 									<div class="form-group">
 												<?php
 										 $data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
@@ -1073,18 +1087,15 @@ function myFunction() {
 										?>   
 									</div>
 									</div>
-					<div class="col-md-3">
-					
-						
-						 				 
+					<!--<div class="col-md-3">						 				 
 				 <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>				 
-		 </div>
+		 </div>-->
 		 	
-		 <div class="col-md-12"  style="border:1px solid #000;">
+		 <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
 		 <br/>
-		    <div class="col-md-6">
+		    <div class="col-md-6" style="padding:0px;">
 				<div class="col-md-12">
-					<div class="col-md-4">
+					<div class="col-md-4" >
 					Basic Price:
 					</div>
 					<div class="col-md-4">
@@ -1273,7 +1284,7 @@ function myFunction() {
 					</div>
 				</div>
 			</div>
-			<div class="col-md-6">
+			<div class="col-md-6" style="padding:0px;">
 			  <div class="col-md-12">
 				<div class="col-md-4">
 				Additional Excise duty : (g)
@@ -1353,7 +1364,7 @@ function myFunction() {
 										?>   
 									</div>
 				</div>
-				<div class="col-md-4">
+				<div class="col-md-4"  style="margin-top: -4.8%">
 				<span>Quantity</span>
 				<div class="form-group">
 												<?php
@@ -1440,7 +1451,8 @@ function myFunction() {
 		<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>
+						  <a href="#"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a>
+						  <a href="#"><span class="glyphicon glyphicon-trash"></span></a></td>
       </tr>
       <tr>
 	 <td>2</td>
@@ -1452,7 +1464,8 @@ function myFunction() {
 		<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>
+						  <a href="#"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a>
+						  <a href="#"><span class="glyphicon glyphicon-trash"></span></a></td> </tr>
        <tr>
 	 <td>3</td>
         <td>REQ0003</td>
@@ -1463,16 +1476,25 @@ function myFunction() {
 		<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>
+						  <a href="#"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a>
+						   <a href="#"><span class="glyphicon glyphicon-trash"></span></a></td> </tr>
     </tbody>
 	   
   </table>
  <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">			
+  <div class="col-md-6"> 
+  <div class="form-group">
+							<label>Comments Of Special Instructions :</label>	<?php
+						 $data = array('name' => 'Comments','value' => set_value('Comments'),'id'=>'Comments',  'class' => 'form-control' ,'required' => 'true');
+						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 >Sub Total Amount  :</label></div>
+      <div class="col-md-6">			
 					
 							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
@@ -1480,14 +1502,15 @@ function myFunction() {
 						?>   
 					
 			</div> 
-			</div> 
-			</div><br>
+			  </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">			
+    <div class="col-md-6" align="right"> <label >Total CST   :</label></div>
+      <div class="col-md-6">			
 					
 							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
@@ -1500,10 +1523,10 @@ function myFunction() {
 			<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">			
+  
+    <div class="col-md-6" align="right"> <label >Total Excise Duty   :</label></div>
+      <div class="col-md-6">			
 					
 							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
@@ -1516,10 +1539,10 @@ function myFunction() {
 			<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">			
+  
+    <div class="col-md-6" align="right"> <label >Total Vat   :</label></div>
+      <div class="col-md-6">			
 					
 							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
@@ -1532,10 +1555,10 @@ function myFunction() {
 			<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">			
+  
+    <div class="col-md-6" align="right"> <label >Total GST   :</label></div>
+      <div class="col-md-6">			
 					
 							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
@@ -1548,10 +1571,10 @@ function myFunction() {
 			<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">			
+  
+    <div class="col-md-6" align="right"> <label >Total Discount   :</label></div>
+      <div class="col-md-6">			
 					
 							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
@@ -1564,10 +1587,10 @@ function myFunction() {
 			<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">			
+  
+    <div class="col-md-6" align="right"> <label >Total Packaging   :</label></div>
+      <div class="col-md-6">			
 					
 							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
@@ -1580,10 +1603,10 @@ function myFunction() {
 			<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">			
+    <div class="col-md-6" align="right"> <label >Total Freight   :</label></div>
+      <div class="col-md-6">			
 					
 							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
@@ -1596,10 +1619,10 @@ function myFunction() {
 			<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">			
+  
+    <div class="col-md-6" align="right"> <label >Other Taxes   :</label></div>
+      <div class="col-md-6">			
 					
 							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
@@ -1612,10 +1635,10 @@ function myFunction() {
 			<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">			
+    <div class="col-md-6" align="right"> <label >Total Order Value   :</label></div>
+      <div class="col-md-6">			
 					
 							<?php
 						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true'  ,'readonly' => 'true');
@@ -1625,12 +1648,20 @@ function myFunction() {
 			</div> 
 			</div> 
 			</div>
-<br>			
- <div align="right" style="padding-right:10px">
+			<br/>
+			<div class="row">
+	   <div class="col-md-4 col-md-offset-8">
+	    
   <button type="button" class="btn btn-primary">Save</button>
   <button type="button" class="btn btn-primary">Cancel</button>
     
-  </div>
+   
+	   </div><br/>
+	   </div>
+			</div>
+			</div>
+<br/>			
+ 
          <br/>
 	 </div>
          </div>