diff --git a/application/config/constants.php b/application/config/constants.php
index 7835550e..810566da 100755
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -173,6 +173,9 @@ define('PURCHASE_RATE',                                    'txtbasicinrprice/txt
 define('CUSTOMDUTY_EXP',                                   'txtgrossexp/txtCtablequantity');
 define('RMC_CAL',                                          'txtpurchaserate+txtcustomdutyexp');
 define('CALCULATE_TOTAL',                                  '(txtrmc*quantity)+basicprice');
+/* Capital Po Calculations */
+define('Capital_Landing_Charge',                                            'basicPrice*(landCharge/100)');
+define('Capital_Highseas_Charge',                                            '(basicPrice+afterLandingCharge)*(highSeas/100)');
 
 
 
diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index f8ae07d0..9423ebe3 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -500,6 +500,15 @@ class purchaseorder extends BaseController
 				$DeliveryAddr = $this->input->post('DeliveryAddr');
 				$dt = $this->input->post('Deliverydt');
 				$Deliverydt = $this->getDateformat($dt);
+$DeliveryOption = $this->input->post('DateRange');
+        if($DeliveryOption==1){
+         $Deliverydt = '';
+        $DeliverySchedule = $this->input->post('Scheduleby');
+        }
+         else{
+         $Deliverydt = $this->getDateformat($dt);
+        $DeliverySchedule = '';
+        }
 				$POType = $this->input->post('POType');
 				$PoRange = $this->input->post('txtPoRange');
 				
@@ -516,7 +525,8 @@ class purchaseorder extends BaseController
 				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
 				$createddt =  $dt->format('Y-m-d H:i:s');
 				// PO Master
-				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
+								$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
+
 					
 					$POMaster  = $this->purchaseorder_model->addPOMaster($POList);
 					
@@ -1264,4 +1274,4 @@ public function importpoprint($PONO)
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php
index 8aa153ee..09d6ed91 100755
--- a/application/controllers/servicepurchaseorder.php
+++ b/application/controllers/servicepurchaseorder.php
@@ -69,6 +69,15 @@ class servicepurchaseorder extends BaseController
 				$DeliveryAddr = $this->input->post('DeliveryAddr');
 				$dt = $this->input->post('Deliverydt');
 				$Deliverydt = $this->getDateformat($dt);
+$DeliveryOption = $this->input->post('DateRange');
+        if($DeliveryOption==1){
+         $Deliverydt = '';
+        $DeliverySchedule = $this->input->post('Scheduleby');
+        }
+         else{
+         $Deliverydt = $this->getDateformat($dt);
+        $DeliverySchedule = '';
+        }
 				$POType = $this->input->post('POType');
 								
 				$SpcialInstruction = $this->input->post('txtSpcialInstruction');
@@ -84,7 +93,8 @@ class servicepurchaseorder extends BaseController
 				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
 				$createddt =  $dt->format('Y-m-d H:i:s');
 				// PO Master
-				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
+								$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,Delivery'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
+
 					
 					$POMaster  = $this->purchaseorder_model->addPOMaster($POList);
 					
@@ -279,4 +289,4 @@ class servicepurchaseorder extends BaseController
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/application/logs/log-2017-06-19.php b/application/logs/log-2017-06-19.php
new file mode 100644
index 00000000..e42e63d8
--- /dev/null
+++ b/application/logs/log-2017-06-19.php
@@ -0,0 +1,7 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
+
+ERROR - 2017-06-19 13:18:05 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 138
+ERROR - 2017-06-19 13:18:05 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 139
+ERROR - 2017-06-19 13:18:05 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 140
+ERROR - 2017-06-19 13:18:05 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 186
+ERROR - 2017-06-19 13:18:05 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 214
diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index f08e7c7b..144c788e 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -1,3 +1,30 @@
+<?php $ReqType =''; 
+$CompanyAddress = '';
+$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
+$CurrentDate =  $dt->format('Y-m-d');
+$MaxPoDate = '';
+$AvlAmount = 0;
+if(!empty($MaxPODate))
+{
+    foreach ($MaxPODate as $date)
+    {
+		$MaxPoDate = $date->PODate;		
+	}
+}
+if(!empty($CompanyDetails))
+{
+    foreach ($CompanyDetails as $Req)
+    {
+		$CompanyAddress = $Req->Address;
+	}
+}
+if(!empty($AvlBudAmt))
+{
+   
+		$AvlAmount = $AvlBudAmt;		
+	
+}
+?>
 <style>
             .modal
 {
@@ -90,12 +117,26 @@
 		<div class="col-md-12">
 				<label>Currency Type</label> 
                 <div class="form-group">                     
-					 <?php
-									$options = array("0"=>'Select Currency Type ');     
- 						
-									echo form_dropdown('currencytype', $options,set_value('currencytype'),'id="currencytype"' ,'class="form-control select2"' , 'required="true"' );
+					 
 
-									?>	
+
+ <?php
+                                $options = array("0"=>'Select Currency Type ');
+                                //print_r(  $options);
+
+                                if(!empty($Currency))
+                                {
+                      
+                                    foreach ($Currency as $Cur):
+
+                                        $options[$Cur->CurrencyCode] =  $Cur->CurrencyCode.' '.' - '.' '.$Cur->CurrencyName;
+
+                                    endforeach;
+                                }
+
+                                echo form_dropdown('currencytype', $options,set_value('currencytype'),'id="currencytype"','class="form-control select2"' , 'required="true"');
+
+                                ?>	
                      
                 </div>
 		</div>	
@@ -162,7 +203,7 @@
 				 <label>Delivery Address</label>
 					<div class="form-group">
 								<?php
-						 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr'),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40');
+						 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr',$CompanyAddress),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40');
 						echo Form_textarea($data);
 						?>   
 					</div>
@@ -171,7 +212,7 @@
 				<label>Purchase Order Date</label>
 						<div class="form-group">
 									<?php
-							 $data = array('name' => 'PODate','value' => set_value('PODate'),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+							 $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
 							echo form_input($data);
 							?>   
 						</div>
@@ -204,7 +245,7 @@
                             <label>Delivery Date</label>
                              
                                 <?php
-                                $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt'),'id'=>'Deliverydt',  'class' => 'form-control'  ,'required' => 'true');
+                                $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$CurrentDate),'id'=>'Deliverydt',  'class' => 'form-control'  ,'required' => 'true');
                                 echo form_input($data);
                                 ?>
                              
@@ -216,14 +257,41 @@
 	</div>	   
     </div>
          </div>
-	 
+		 <div class="col-md-12">
+		<div align="right">
+<a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a> 
+		</div>
+<br>
+  </div>
+	 <div class="box-body">
+              <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+                <thead style="background-color:#ddf">
+                <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 id='ImportAppend'>     
+    
+			</tbody>
+              </table>
+            </div>
           <div class="container-fluid">  
  	 <table class="table table-bordered" style="border:1px solid #333">
   <div align="right" style="padding-right:10px">
 <div align="right">
-  <a data-toggle="modal" data-target="#capitalpomodel" class="btn btn-primary" data-dismiss="modal" >Select Line Item </a>
+   
   
-     <div class="modal fade" id="capitalpomodel" role="dialog">
+     <div class="modal fade" id="CAPITAL" role="dialog">
                             <div class="modal-dialog">
                                 <!-- Modal content-->
                                 <form>
@@ -233,67 +301,84 @@
                                             <center><h4>Add Capital Purchase Order Item </h4></center>
                                         </div>
                                         <div align="left">
+                                            <div class="col-md-12">											 
+												<div class="col-md-12">
+													<div class="col-md-5">
+														<div class="col-md-6">
+															<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('Reqnumber', $RL,set_value('Reqnumber'),'id="Reqnumber"' ,'class="form-control select2 required"');
 
-                                            <div class="col-md-12">
-											<div class="col-md-12">
-                                                <div class="col-md-3">
-                                                    <label>Req No</label>
-                                                    <div>
-                                                        <?php
-                                                        $options = array("0"=>'Req No');
-                                                        echo form_dropdown('Reqnumber', $options,set_value('Reqnumber'),'id="Reqnumber"' ,'class="form-control select2 required"');
+										?>	
 
-                                                        ?>
-                                                    </div>
-                                                </div>
 
-                                                <div class="col-md-3">
-                                                    <label>Department Name</label>
-                                                    <div>
-                                                        <?php
-                                                        $data = array('name' => 'CapitalDepartmentName','value' => set_value('CapitalDepartmentName'),'id'=>'CapitalDepartmentName',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-3">
-                                                    <label>Cost Center Name</label>
-                                                    <div>
-                                                        <?php
-                                                        													
-														 $data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
 
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-3">
-                                                    <label>Available Budget Amount</label>
+															</div>
+														</div>
+														<div class="col-md-6">
+															<label>Department Name</label>
+																<div>
+																	<?php
+																	$data = array('name' => 'CapitalDepartmentName','value' => set_value('CapitalDepartmentName'),'id'=>'CapitalDepartmentName',  'class' => 'form-control' ,'readonly' => 'true');
+																	echo form_input($data);
+																	?>
+																</div>
+														</div>
+													</div>
+													<div class="col-md-5">
+														<div class="col-md-6">
+															<label>Cost Center Name</label>
+																<div>
+																	<?php
+																														
+																	 $data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+																	echo form_input($data);
+
+																	?>
+																</div>
+														</div>
+														<div class="col-md-6">
+															<label>Avail Bud Amount</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'CapitalbudAmt','value' => set_value('CapitalbudAmt'),'id'=>'CapitalbudAmt',  'class' => 'form-control' ,'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+													</div>
+													<div class="col-md-2">
+														<label> Exchange Rate</label> 
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'CapitalbudAmt','value' => set_value('CapitalbudAmt'),'id'=>'CapitalbudAmt',  'class' => 'form-control' ,'readonly' => 'true');
+                                                        $data = array('name' => 'ExchangeRtModal','value' => set_value('ExchangeRtModal'),'id'=>'ExchangeRtModal',  'class' => 'form-control' ,'readonly' => 'true');
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
-                                                </div>
+													</div>
 												</div>
                                             </div>
                                             <div class="col-md-12">
 											<div class="col-md-12">
                                                 <div class="col-md-2">
-                                                    <label>Item Code</label>
-                                                     
-                                                        <div>
-                                                        
+                                                    <label>Item Code</label>                                                     
+                                                        <div>                                                        
 														<?php
                                                         $options = array("0"=>'Item Code');
-
                                                         echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control select2"');
-
                                                         ?>
-                                                    </div> 
+														</div> 
                                                 </div>
-
                                                 <div class="col-md-2">
                                                     <label>Item Name</label>
                                                     <div class="form-group">
@@ -316,7 +401,7 @@
                                                     <label>Quantity</label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                        $data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();');
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
@@ -325,7 +410,7 @@
                                                     <label>Rate(in US $ /Ton)</label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' );
+                                                        $data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();' );
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
@@ -341,77 +426,59 @@
                                                 </div>
 												</div>
                                             </div>
-                                            <div class="col-md-12">
-												<div class="col-md-12" >
-                                               
-
-                                                <div class="col-md-3">
-
-                                                    Exchange Rate :
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-
-                                                </div>
-
-                                                
-												<div class="col-md-3">
-														 Service Tax @14% :
-					 
-					
-					 
-														 <div class="form-group">
+                                            <div class="col-md-12">											
+												<div class="col-md-12"  style="border:1px solid #000;padding:0px;">
+													<div class="col-md-5">
+														<div class="col-md-6">
+															Service Tax ( ST ) @ 14% :
+															 <div class="form-group">
 																			<?php
 																	 $data = array('name' => 'AfterServiceTax','value' => set_value('AfterServiceTax'),'id'=>'AfterServiceTax',  'class' => 'form-control' ,'placeholder' => 'After Service Tax','readonly' => 'true');
 																	echo form_input($data);
 																	?>   
-																</div>			  
-													</div>
-                                                </div>
-												<div class="col-md-12" >													
-													<div class="col-md-3">
-														Education cess @2% on service Tax : 
-														<div class="form-group">
-															<?php
-															 $data = array('name' => 'AfterEduCess','value' => set_value('AfterEduCess'),'id'=>'AfterEduCess',  'class' => 'form-control' ,'placeholder' => 'After Edu. cess','readonly' => 'true');
-															echo form_input($data);
-															?>   
+																</div>	
 														</div>
-													</div>
-													<div class="col-md-3">
-														Sec. & Higher Edu. cess @1 % on service Tax  :			  
-														<div class="form-group">
-																	<?php
-															 $data = array('name' => 'AfterSecHighTax','value' => set_value('AfterSecHighTax'),'id'=>'AfterSecHighTax',  'class' => 'form-control' ,'placeholder' => 'After High Edu. cess','readonly' => 'true');
-															echo form_input($data);
-															?>   
-														</div>
-													</div>
-													<div class="col-md-3">
-															Krishi Kalyan tax  @.5 % on Basic Amount:			  
+														<div class="col-md-6">
+															Education cess @2% on ST : 
 															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'AfterKrishiTax','value' => set_value('AfterKrishiTax'),'id'=>'AfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
+																<?php
+																 $data = array('name' => 'AfterEduCess','value' => set_value('AfterEduCess'),'id'=>'AfterEduCess',  'class' => 'form-control' ,'placeholder' => 'After Edu. cess','readonly' => 'true');
 																echo form_input($data);
 																?>   
 															</div>
+														</div>
 													</div>
-													<div class="col-md-3">
-														Swachh Bharat tax @.5 % on Basic Amount:			  
+													<div class="col-md-5">
+														<div class="col-md-6">
+															Sec. & Higher Edu. cess @1 % on ST  :			  
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'AfterSecHighTax','value' => set_value('AfterSecHighTax'),'id'=>'AfterSecHighTax',  'class' => 'form-control' ,'placeholder' => 'After High Edu. cess','readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+														</div>
+														<div class="col-md-6">
+															Krishi Kalyan tax  @.5 % on Basic Account(BA):			  
+																<div class="form-group">
+																			<?php
+																	 $data = array('name' => 'AfterKrishiTax','value' => set_value('AfterKrishiTax'),'id'=>'AfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
+																	echo form_input($data);
+																	?>   
+																</div>
+														</div>
+													</div>
+													<div class="col-md-2">
+													 Swachh Bharat tax @.5 % on BA:			  
 														<div class="form-group">
 																	<?php
 															 $data = array('name' => 'AfterSwachhTax','value' => set_value('AfterSwachhTax'),'id'=>'AfterSwachhTax',  'class' => 'form-control' ,'placeholder' => 'After Swatchh Bhart Tax.','readonly' => 'true');
 															echo form_input($data);
 															?>   
-														</div>			 
+														</div>	
 													</div>
 												</div>
-
+												<div class="col-md-12" style="padding:1%;" ></div>
                                                 <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
                                                     <br/>
                                                     <div class="col-md-6" style="padding:0px;">
@@ -443,7 +510,7 @@
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'LandingCharge','value' => set_value('LandingCharge'),'id'=>'LandingCharge',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'LandingCharge','value' => set_value('LandingCharge'),'id'=>'LandingCharge',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange();');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -464,7 +531,7 @@
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'Highseas ','value' => set_value('Highseas'),'id'=>'Highseas',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'Highseas ','value' => set_value('Highseas'),'id'=>'Highseas',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' , 'onchange'=>'Ratechange();');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -748,48 +815,696 @@
    
    
    <br/>
-    	<div class="box-body" style="margin-top: -3%;">
-              <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-                <thead style="background-color:#ddf">
-                <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 id='ImportAppend'>     
-    
-			</tbody>
-              </table>
-            </div>
+    	
 	   
   </table>
-      <div class="col-md-3 col-md-offset-9">
-				
-					<div class="form-group">
-							<label>Total Order Value :</label>	<?php
-						 $data = array('name' => 'totalordervalue','value' => set_value('totalordervalue'),'id'=>'totalordervalue',  'class' => 'form-control' ,'required' => 'true');
-						echo form_input($data);
-						?>   
+       
+				<div class="col-md-12"  style="border: 1px solid;">			
+					<div class="col-md-4">
+						 Service Tax @14% :					  
+						 <div class="form-group">
+											<?php
+									 $data = array('name' => 'TotalAfterServiceTax','value' => set_value('TotalAfterServiceTax'),'id'=>'TotalAfterServiceTax',  'class' => 'form-control' ,'placeholder' => 'After Service Tax','readonly' => 'true');
+									echo form_input($data);
+									?>   
+								</div>			  
+					</div>			  
+					<div class="col-md-4">
+						Education cess @2% on service Tax : 
+						<div class="form-group">
+							<?php
+							 $data = array('name' => 'TotalAfterEduCess','value' => set_value('TotalAfterEduCess'),'id'=>'TotalAfterEduCess',  'class' => 'form-control' ,'placeholder' => 'After Edu. cess','readonly' => 'true');
+							echo form_input($data);
+							?>   
+						</div>
 					</div>
-			</div> 
- <div align="right" style="padding-right:10px">
-  <a class="btn btn-primary Save"  ID="Save" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
-<a class="btn btn-primary Submit"  ID="Submit" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-    <input type="reset" class="btn btn-primary" value="Reset">
+					<div class="col-md-4">
+						Sec. & Higher Edu. cess @1 % on service Tax  :			  
+						<div class="form-group">
+									<?php
+							 $data = array('name' => 'TotalAfterSecHighTax','value' => set_value('TotalAfterSecHighTax'),'id'=>'TotalAfterSecHighTax',  'class' => 'form-control' ,'placeholder' => 'After High Edu. cess','readonly' => 'true');
+							echo form_input($data);
+							?>   
+						</div>
+					</div>
+					<div class="col-md-4">
+							Krishi Kalyan tax  @.5 % on Basic Amount:			  
+							<div class="form-group">
+										<?php
+								 $data = array('name' => 'TotalAfterKrishiTax','value' => set_value('TotalAfterKrishiTax'),'id'=>'TotalAfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
+								echo form_input($data);
+								?>   
+							</div>
+					</div>
+					<div class="col-md-4">
+						Swachh Bharat tax @.5 % on Basic Amount:			  
+						<div class="form-group">
+									<?php
+							 $data = array('name' => 'TotalAfterSwachhTax','value' => set_value('TotalAfterSwachhTax'),'id'=>'TotalAfterSwachhTax',  'class' => 'form-control' ,'placeholder' => 'After Swatchh Bhart Tax.','readonly' => 'true');
+							echo form_input($data);
+							?>   
+						</div>			 
+					</div>
+				</div>
+					<div class="col-md-12" style="padding:1%;" ></div>
+		<div class="col-md-12" style="border: 1px solid;padding:1% 0%;">
+			 
+            <div class="col-md-4">
+              <label >Total Landing Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotallanding','value' => set_value('txttotallanding'),'id'=>'txttotallanding',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-4">
+              <label >Total High seas sales Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalhighseas','value' => set_value('txttotalhighseas'),'id'=>'txttotalhighseas',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-4">
+              <label >Total Custom Duty Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalcustom','value' => set_value('txttotalcustom'),'id'=>'txttotalcustom',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-4">
+              <label >Total Excise duty  Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalexcise','value' => set_value('txttotalexcise'),'id'=>'txttotalexcise',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-4">
+              <label >Total Excise duty ED_cess Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalexciseED','value' => set_value('txttotalexciseED'),'id'=>'txttotalexciseED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+
+            <div class="col-md-4">
+              <label >Total Excise duty S & H cess  Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalexciseSH','value' => set_value('txttotalexciseSH'),'id'=>'txttotalexciseSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-4">
+              <label >Total Custom ED_cess Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalcustomED','value' => set_value('txttotalcustomED'),'id'=>'txttotalcustomED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-4">
+              <label >Total Custom S & H cess Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalcustomSH','value' => set_value('txttotalcustomSH'),'id'=>'txttotalcustomSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-4">
+              <label >Total Additional Excise duty Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalAdditionalExciseduty','value' => set_value('txttotalAdditionalExciseduty'),'id'=>'txttotalAdditionalExciseduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+
+            <div class="col-md-4">
+              <label >Total Gross duty payable Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalgrossduty','value' => set_value('txttotalgrossduty'),'id'=>'txttotalgrossduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+             <div class="col-md-4">
+              <label >Total Available Modvat set-off on import Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalavlmodvat','value' => set_value('txttotalavlmodvat'),'id'=>'txttotalavlmodvat',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+
+            <div class="col-md-4">
+              <label >Total Gross expenses due to custom duty Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalgrossexpense','value' => set_value('txttotalgrossexpense'),'id'=>'txttotalgrossexpense',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+        
+
+           
+
+                    <div  class="col-md-4">
+                            <label>Total Order Value :</label>  <?php
+                         $data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder'),'id'=>'txtToatlOrder',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
+                        echo form_input($data);
+                        ?>   
+                    </div>
+                
+                      <div class="col-md-12">
+                            <label>Comments for 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 align="right" style="padding-right:10px">
+
+					<div class="col-md-3 col-md-offset-9"><br/>
+							<input type="hidden" name="txtPoRange" id="txtPoRange" /> 
+							<input type="hidden" name="isEdit" id="isEdit" value="0" /> 
+							<input type="hidden" name="txtStatus" id="txtStatus" /> 
+							<input type="hidden" name="txtRowCount" id="txtRowCount" />
+							<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />   
+							<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+							<a class="btn btn-primary Submit"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
+						<input type="reset" class="btn btn-primary" value="Reset">
+					  
+					  </div>
+            </div>  -->
+			
+         
+		</div>
+      
+		  
+	    <div align="right" style="padding:1% 0%;"> 
+				<a class="btn btn-primary Save"  ID="Save" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+				<a class="btn btn-primary Submit"  ID="Submit" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
+				<input type="reset" class="btn btn-primary" value="Reset">
     
-  </div>
+			</div>
          <br/>
 	 </div>
          </div>
     </section>   
 </div>
+ <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
+<script>
+var RequistQuantity = '';
+var AvilBudAmt = '';
+ var POMaxDate = '<?php echo $MaxPoDate;?>';
+  var d = new Date(POMaxDate);
+   var SelectedMaterialCode = [];
+ var CollIndex = 0;
+  var SelectedMaterialList = {
+    Mat: []
+};
+ $(function() {  
  
+ $("#PODate").datepicker({
+	minDate : d,
+	maxDate : 'now',
+	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+});
+ $("#Deliverydt").datepicker({
+	minDate : 'now',	
+	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
+});	  
+	
+$('#drpSupplier').change(function() {
+    
+ var id = $('#drpSupplier').val();
+
+ $("#SupAddress").val('');
+ 
+		if(id != '0')
+		{
+			var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
+
+	 			
+		$.each(y, function(idx, obj) {
+			if(obj.SupplierID === id)
+			{
+				$("#SupAddress").val(obj.Address);
+				
+			}
+			
+		});
+			
+		}
+		else
+		{
+			alert('Please select the SupplierID');
+			return false;
+		}
+  
+});	
+
+$('#Reqnumber').change(function() {
+var ExchangeRate='';
+    var ExchangeRate = $('#ExchangeRt').val();
+ var id = $('#Reqnumber').val();
+
+ $("#CapitalbudAmt").val('');
+$("#ExchangeRtModal").val(ExchangeRate);
+
+  $("#MaterialCode").empty();
+  $("#CapitalDepartmentName").val('');
+ $("#CPUOM").val('');
+$("#CPQuantity").val('');
+$("#CapitalItemName").val('');
+$("#CPTotalAmount").val('');
+$("#txtBasicValue").val('');
+ $("#CostCenter").val('');
+ clearTaxField();
+		if(id != '0')
+		{
+
+			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
+			
+			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+			var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
+			
+		// For Binding DepartmentName	           			
+		$.each(y, function(idx, obj) {
+			if(obj.ReqNo === id)
+			{
+				$("#CapitalDepartmentName").val(obj.DepartmentName);
+				$("#CostCenter").val(obj.CostCenterCode);
+				
+			}			
+		});
+		$("#CapitalbudAmt").val(AvlBudAmt);	
+			
+			
+		// For Binding Material list center for the selected Requistion Number	
+		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
+		var isAdded = "0";
+		 for(i=0;i<Material.length;i++)
+		{
+		$.each(Material[i], function(idx, obj) {
+			
+				if(obj.ReqNo === id )
+				{
+									   
+						$.each(SelectedMaterialList.Mat, function(idx1, el){															
+							if (id == el.ReqNo )
+							{
+															
+								if(el.materialCode == obj.MaterialCode)
+								{
+										isAdded  = "1";
+										return false;																		
+								}
+								else
+								{
+									isAdded  = "0";
+								}
+								
+							}
+					});
+					
+					 
+						if(isAdded  == "0")
+						{
+							
+							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+						}
+												
+				}
+			
+			
+		});
+		}
+		}
+		else
+		{
+			alert('Please select the Requisition Number');
+			return false;
+		}
+		id = '';
+  
+});	
+$('#MaterialCode').change(function() {
+    
+ var id = $('#MaterialCode').val();
+  $("#CapitalItemName").val('');
+$("#CPUOM").val('');
+$("#CPQuantity").val('');
+$("#CPTotalAmount").val('');
+ RequistQuantity = '';
+ clearTaxField();
+		if(id != '0')
+		{
+			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+			
+	 for(i=0;i<Material.length;i++)
+		{
+		$.each(Material[i], function(idx, obj) {
+			if(obj.MaterialCode === id)
+			{
+				$("#CapitalItemName").val(obj.MaterialName);
+				$("#CPUOM").val(obj.UOM);
+				$("#CPQuantity").val(obj.Quantity);
+				RequistQuantity	= 	obj.Quantity;		
+			}			
+		});			
+		}
+		}
+		else
+		{
+			alert('Please select the MaterialCode');
+			return false;
+		}
+  
+});
+
+
+$('#EditMaterialCode').change(function() {
+
+    
+ var id = $('#EditMaterialCode').val();
+ $("#EditItemName").val('');
+$("#EditUOM").val('');
+$("#EditQuantity").val('');
+$("#EditRate").val('');
+$("#txtEditBasicValue").val('');
+ RequistQuantity = '';
+ clearEditTaxField();
+		if(id != '0')
+		{
+			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+			
+	  for(i=0;i<Material.length;i++)
+		{
+		$.each(Material[i], function(idx, obj) {
+			if(obj.MaterialCode === id)
+			{
+				$("#EditItemName").val(obj.MaterialName);
+				$("#EditUOM").val(obj.UOM);
+				$("#EditQuantity").val(obj.Quantity);
+				RequistQuantity	= 	obj.Quantity;		
+			}			
+		});			
+		}
+		
+		}
+		else
+		{
+			alert('Please select the MaterialCode');
+			return false;
+		}
+  
+});
+
+
+});
+function clearTaxField()
+{
+	$('#CPTotalAmount').val('');
+	$('#AfterServiceTax').val('');
+	$('#AfterEduCess').val('');
+	$('#AfterSecHighTax').val('');
+	$('#AfterKrishiTax').val('');
+	$('#AfterSwachhTax').val('');
+	$('#BasicPriceTax ').val('');
+	$('#AfterBasicPriceTax').val('');
+	
+	$("#LandingCharge").val('');
+	$("#AfterLandingCharge").val('');
+	$("#Highseas").val('');
+$("#AfterHighseas").val('');
+$("#Customduty").val('');
+$("#AfterCustomduty").val('');
+$("#ExcisedutyTax").val('');
+$("#AfterExcisedutyTax").val('');
+$("#ExcisedutyEDcess").val('');
+$("#AfterExcisedutyEDcess").val('');
+$("#ExcisedutySHcess").val('');
+$("#AfterExcisedutySHcess").val('');
+$("#CustomEDcess").val('');
+$("#AfterCustomEDcess").val('');
+$("#CustomSHcess").val('');
+$("#AfterCustomSHcess").val('');
+$("#AdditionalExciseduty").val('');
+$("#AfterAdditionalExciseduty").val('');
+$("#Grossdutypayable").val('');
+$("#AvailableModvat").val('');
+$("#Grossexpenses").val('');
+$("#purchaserate").val('');
+$("#CustomDutyExpenses").val('');
+$("#RMCIncludingCustomers").val('');
+$("#PurQuantity").val('');
+
+	RequistQuantity	= 	'';	
+	
+}
+/*
+
+This function is used to validate all field
+
+*/
+function Ratechange(){
+	 
+		if($('#Reqnumber').val() == "0")
+		 {
+			 alert('Please select the Requisition Number');
+			 $('#ReqNo').focus();
+			 return false;
+		 }
+		 else if($('#MaterialCode').val() == "0")
+		 {
+			alert('Please select the Material Code');
+			$('#MaterialCode').focus();
+		   return false;
+		 }
+		 else if($('#CostCenter').val() == "0")
+		 {
+				alert('Please select the CostCenterCode');
+				$('#CostCenter').focus();
+			return false;
+		 }
+	 ExceedQuantityCheck();
+
+      if(ExceedQuantityCheck()){
+         
+	  
+	 if($('#CPQuantity').val() != '' && $('#CPRate').val() != ''  && $('#ExchangeRtModal').val() != '')
+	 {	 
+   
+      var txtQuantity = parseFloat( $('#CPQuantity').val());
+      var txtExchangeRate = parseFloat( $('#ExchangeRtModal').val());
+      var RatePerTon = parseFloat( $('#CPRate').val());
+	  //var txtUnitPrice = parseFloat($('#Rate').val());
+	  var Tot =  txtQuantity * txtExchangeRate * RatePerTon
+	  $('#CPTotalAmount').val(Tot);
+	  
+	 //Service Tax calculation
+	    	 
+        
+	$('#AfterServiceTax').val(calculateServiceTax($('#CPTotalAmount').val())); 	 
+	
+	 //Edu. cess @2% on service Tax
+	  $('#AfterEduCess').val( calculateEduess($('#AfterServiceTax').val()));
+	
+	 //Sec. & Higher Edu. cess @1 % on service Tax 
+	
+	$('#AfterSecHighTax').val(calculateHigherEdu($('#AfterServiceTax').val())); 
+	 //Krishi Kalyan tax 
+	
+	$('#AfterKrishiTax').val(calculateKrishiKalyantax($('#CPTotalAmount').val())); 
+	 //Swachh Bharat tax
+	
+	$('#AfterSwachhTax').val(calculateSwachhBharattax($('#CPTotalAmount').val()));
+    
+         // This is for import basic price
+       
+     $('#AfterBasicPriceTax').val(Math.round($('#CPTotalAmount').val()));
+
+      if($('#LandingCharge').val()!='' && $('#AfterBasicPriceTax').val()!=''){
+ $('#AfterLandingCharge').val(calculateLandingCharge($('#LandingCharge').val(),$('#AfterBasicPriceTax').val()));
+
+
+if($('#Highseas').val()!='' && $('#AfterLandingCharge').val()!=''){
+ $('#AfterHighseas').val(calculateHighseasCharge($('#AfterLandingCharge').val(),$('#AfterBasicPriceTax').val(),$('#Highseas').val()));
+
+      }
+
+
+       }
+else{
+alert('Please Enter Landing Charge ')
+} 
+
+ 
+
+      
+	 
+	 calculateTotalOrdervalue();
+	 
+	 var res = ExceedBudget($('#TotalOrderValue').val(), $('#CapitalbudAmt').val());
+      if(!res)
+	  {
+		 $('#CPRate').focus();
+		 return false;
+	  }
+	 }
+}
+else{
+clearTaxField();
+}
+	 
+}
+
+
+/* This function used to check quantity exceeding or not */
+
+function ExceedQuantityCheck()
+ {
+	var EnterQuantity =   $("#CPQuantity").val()== '' ? "0.00" :  parseFloat($("#CPQuantity").val());
+	var ReqQuantity = parseFloat(RequistQuantity);
+	//alert(ReqQuantity);
+	if(EnterQuantity > ReqQuantity)
+	{
+		 alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
+		
+		  $('#Quantity').focus();
+		 return false;
+	}
+	else {
+		return true;
+	}
+ } 
+/*
+This function is used to calculate tax
+*/
+function calculateServiceTax(varBasicValue)
+ {
+
+	
+		 var basicValue = parseFloat(varBasicValue);
+			 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_SERVICETAX_14PERCENT; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
+		 
+ }
+  function calculateEduess(varAfterServiceTax)
+ {
+		 var ServiceTaxAmount = parseFloat(varAfterServiceTax);
+			 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_EDUCESS_2PERCENT; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		 return TAXval;// $('#AfterEduCess').val(TAXval); 
+ }
+   function calculateHigherEdu(varAfterServiceTax)
+ {
+	     var ServiceTaxAmount = parseFloat(varAfterServiceTax);
+			 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_HIGHEREDUCESS_1PERCENT; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		  return TAXval;//$('#AfterSecHighTax').val(TAXval); 
+ }
+ function calculateKrishiKalyantax(varBasicValue)
+ {
+	     var basicValue = parseFloat(varBasicValue);
+			 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_KRISHIKALYAN; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		 return TAXval;//$('#AfterKrishiTax').val(TAXval); 
+ }
+ function calculateSwachhBharattax(varBasicValue)
+ {
+		var basicValue = parseFloat(varBasicValue);
+			 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_SWACHHBHARAT; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		return TAXval; //$('#AfterSwachhTax').val(TAXval); 
+ }
+ 
+ /*
+Calculate Landing charge
+ */
+
+ function calculateLandingCharge(landingCharge,basicValue){
+  var landCharge = parseFloat(landingCharge);
+  var basicPrice = parseFloat(basicValue);
+afterLandingCharge = <?php echo Capital_Landing_Charge; ?>;
+
+return parseFloat(afterLandingCharge).toFixed(2);
+
+
+}
+/*Calculate Highseas Charge*/
+function calculateHighseasCharge(AfterLanding,basicPrice,Highseas){
+var afterLandingCharge = AfterLanding;
+var basicPrice = basicPrice;
+var highSeas = Highseas;
+alert(afterLandingCharge);
+alert(basicPrice);
+alert(highSeas);
+var karthi = (afterLandingCharge+basicPrice) * (highSeas/100);
+alert(karthi);
+afterHighseasCharge = <?php echo Capital_Highseas_Charge; ?>;
+
+return parseFloat(afterHighseasCharge).toFixed(2);
+
+}
+	
+/*
+This is used to calculate Total order value
+*/
+function calculateTotalOrdervalue()
+ {
+	var basicValue = parseFloat($('#CPTotalAmount').val());
+	var ServiceTaxAmount = parseFloat($('#AfterServiceTax').val());
+	var EduCessTaxAmount = parseFloat($('#AfterEduCess').val());
+	var SecHighTaxAmount = parseFloat($('#AfterSecHighTax').val());
+	var KrishiTaxAmount = parseFloat($('#AfterKrishiTax').val());
+	var SwachhTaxAmount = parseFloat($('#AfterSwachhTax').val());
+
+	var TotAmt = basicValue + ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount;
+
+	$('#TotalOrderValue').val( parseFloat(TotAmt).toFixed(2));   
+		 
+ }
+</script>
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
old mode 100644
new mode 100755
diff --git a/application/views/importpo.php b/application/views/importpo.php
old mode 100644
new mode 100755
diff --git a/application/views/poapproval_view.php b/application/views/poapproval_view.php
old mode 100644
new mode 100755
diff --git a/application/views/porelease_view.php b/application/views/porelease_view.php
old mode 100644
new mode 100755
diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php
index 922306aa..02967482 100755
--- a/application/views/purchaseorder.php
+++ b/application/views/purchaseorder.php
@@ -1002,6 +1002,9 @@ function calculatePackaging(isEdit)
 						}
 						else
 						{
+
+			var discountValue = parseFloat($('#txtAfterDiscount').val());
+             var packageValue = parseFloat($('#txtAfterPackaging').val());
 							var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val()); 
 							vatValue = parseFloat($('#txtVat').val());
 							AfterVat = <?php echo VAT_ONEXICSEVALUE; ?>;
@@ -1012,8 +1015,12 @@ function calculatePackaging(isEdit)
 			 }
 			 else if(VatCalculation == 0 && $('#txtVat').val() != '')
 			 {
+var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val()); 
+
+			var discountValue = parseFloat($('#txtAfterDiscount').val());
+             var packageValue = parseFloat($('#txtAfterPackaging').val());
 					vatValue = parseFloat($('#txtVat').val());
-					AfterVat =  <?php echo VAT_ONBASICVALUE; ?>;
+					AfterVat =  <?php echo VAT_ONEXICSEVALUE; ?>;
 					var Vatval =  parseFloat(AfterVat).toFixed(2);
 		 
 					$('#txtAfterVat').val(Vatval); 
@@ -1109,7 +1116,9 @@ function calculatePackaging(isEdit)
 			 
 			 else
 			 {
-				 var basicValue = parseFloat($('#txtBasicValue').val());
+				var basicValue = parseFloat($('#txtBasicValue').val());
+				 var discountValue = parseFloat($('#txtAfterDiscount').val());
+             var               packageValue = parseFloat($('#txtAfterPackaging').val());
 				  var AfterCST = 0.0; 
 				  if(CSTCalculation != 0 && $('#txtCST').val() != '' )
 				{
@@ -1125,7 +1134,7 @@ function calculatePackaging(isEdit)
 						{
 							var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val()); 
 							var CSTValue= parseFloat($('#txtCST').val()); 
-							AfterCST = <?php echo CST_ONBASICVALUE; ?>;
+							AfterCST = <?php echo CST_ONEXICSEVALUE; ?>;
 							var Vatval =  parseFloat(AfterCST).toFixed(2);
 		 
 							$('#txtAfterCST').val(Vatval); 
@@ -1133,8 +1142,9 @@ function calculatePackaging(isEdit)
 			 }
 			 else if(CSTCalculation == 0 && $('#txtCST').val() != '')
 			 {
-					var CSTValue= parseFloat($('#txtCST').val()); 
-					AfterCST =  <?php echo CST_ONBASICVALUE; ?>;
+					var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val()); 
+							var CSTValue= parseFloat($('#txtCST').val()); 
+					AfterCST =  <?php echo CST_ONEXICSEVALUE; ?>;
 					var Vatval =  parseFloat(AfterCST).toFixed(2);
 		 
 					$('#txtAfterCST').val(Vatval); 
@@ -1430,6 +1440,9 @@ function calculatePackaging(isEdit)
 				else if(FreightType == '<?php echo PERTRIP;?>')
 				{		
 					AfterFreight = <?php echo FREIGHT_PERTRIP;?>;		  	  
+				}
+                            else {
+				AfterFreight = $("#txtFreight").val();
 				}	
 				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
 		 
@@ -1692,6 +1705,18 @@ function calculateEditTaxValue()
 	    //alert('tot:'+tot);		
 	return tot;
  } 
+ $(document).ready(function () {
+                $('#Date').click(function () {
+                    //for Date range selection
+                    $('#Schedulediv').hide();
+                    $('#Deliverydtdiv').show();
+                });
+                $('#Schedule').click(function () {
+                    //for schedule range selection
+                    $('#Deliverydtdiv').hide();
+                    $('#Schedulediv').show();
+                });
+            });
 </script>
 <style>
 .content {
@@ -1721,6 +1746,7 @@ body {
 	<div class="row">
 		<div class="col-md-12">
 		<div class="col-md-3">
+			<div class="col-md-12">
 			<label>Requistion No</label>
 						<?php							 
 							  $options = array("0"=>'Selected Requisition Numbers'); 
@@ -1733,7 +1759,17 @@ body {
 						endforeach;
 						}							 
 							echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' ,'required="true"' , 'height="400px"' );
-							?>						 
+							?>	
+			</div>
+			<div class="col-md-12">
+			<label>Purchase Order Date</label>
+				<div class="form-group">
+							<?php
+					 $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+					echo form_input($data);
+					?>   
+				</div>
+			</div> 							
 		</div>
 		<div class="col-md-9">
 			<div class="row">
@@ -1759,32 +1795,41 @@ body {
 				</div>
 				<div class="col-md-4">
 					 <label>Purchase Order Type</label>
-						<div class="form-group">
-						
-									<?php
+						<div class="form-group">						
+							<?php
 							 $data = array('name' => 'POType','value' => set_value('POType',$ReqType),'id'=>'POType',  'class' => 'form-control' ,'readonly' => 'true');
 							echo form_input($data);
 							?>   
 						</div>
 				</div>
-				<div class="col-md-4">					
+				<div class="col-md-2" style="padding: 0px;">					
 					 	
 						<div id="div1" style="display:block;">
 							<b><u>Select Tax Range</u></b><br/> 
 							<tr>
 							<td>
-							<?php echo form_label('Local', 'Local') ."&nbsp;&nbsp;". form_radio(array("name"=>"Range","id"=>"Local","value"=>"0", 'checked'=>'checked','onchange'=>'SetVatorCST();')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-							<td><?php echo form_label('Inter state', 'Inter state') ."&nbsp;&nbsp;". form_radio(array("name"=>"Range","id"=>"Inter_state","value"=>"1", 'onchange'=>'SetVatorCST();')); ?> 										
+							<?php echo form_label('Local', 'Local') ."&nbsp;". form_radio(array("name"=>"Range","id"=>"Local","value"=>"0", 'checked'=>'checked','onchange'=>'SetVatorCST();')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+							<td><?php echo form_label('Inter state', 'Inter state') ."&nbsp;". form_radio(array("name"=>"Range","id"=>"Inter_state","value"=>"1", 'onchange'=>'SetVatorCST();')); ?> 										
 							</td> 
 							</tr>
 						</div>
 						<div id="div2" style="display:none;">    
 						</div>
 						<div id="div4" style="display:none;">
-						</div>
-					 
-							
+						</div>		
 				</div>
+					<div class="col-md-2" style="padding:0px;">
+
+                            <b><u>Select Delivery By</u></b><br/>
+                            <tr>
+                                <td>
+                                    <?php echo form_label('Date', 'Date') ."&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>set_radio('DateRange', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+                                <td>
+                                    <?php echo form_label('Schedule', 'Schedule') ."&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?>
+
+                                </td>
+                            </tr>
+                        </div>
 			</div>
 			<div class="row">
 				<div class="col-md-4">
@@ -1805,25 +1850,22 @@ body {
 						?>   
 					</div>
 				</div>
-				<div class="col-md-2">
-					 <label>PO Date</label>
-						<div class="form-group">
-									<?php
-							 $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
-							echo form_input($data);
-							?>   
-						</div>
-					</div> 
-					<div class="col-md-2">
+				<div class="col-md-4" id="Deliverydtdiv" style="padding:0%;">
 					 <label>Delivery Date</label>		
 						<div class="form-group">
 								<?php
 						 $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$CurrentDate),'id'=>'Deliverydt',  'class' => 'form-control' ,'required' => 'true','onkeypress'=>'return false;');
 						echo form_input($data);
-						?>   
-					
+						?>   					
 						</div>
-					</div> 
+				</div> 
+				<div class="col-md-4" id="Schedulediv" style="display:none;padding:0%;">
+					<label >Schedule </label>                                 
+					<?php
+					$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
+					echo Form_textarea($data);
+					?>
+                </div>	 
 				
 			</div>
 		</div>
@@ -3641,4 +3683,19 @@ $('#txtStatus').val(stat);
 	   
     }); 
   });
-</script>
\ No newline at end of file
+// this function is used to clear data changing schedule option
+$('#Scheduleby').change(function(){
+        
+             $("#Deliverydt").datepicker({
+            minDate : 'now',
+            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
+        });
+                
+            });
+            $('#Deliverydt').change(function(){
+
+            
+           $('#Scheduleby').val('');
+                
+            });
+</script>
diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php
index f17e4d3f..5c16d2a4 100755
--- a/application/views/servicePurchaseorder.php
+++ b/application/views/servicePurchaseorder.php
@@ -514,6 +514,18 @@ function clearEditTaxField()
 	RequistQuantity	= 	'';	
 	
 }
+$(document).ready(function () {
+                $('#Date').click(function () {
+                    //for Date range selection
+                    $('#Schedulediv').hide();
+                    $('#Deliverydtdiv').show();
+                });
+                $('#Schedule').click(function () {
+                    //for schedule range selection
+                    $('#Deliverydtdiv').hide();
+                    $('#Schedulediv').show();
+                });
+            });
 </script>
 <style>
 .modal
@@ -544,6 +556,7 @@ function clearEditTaxField()
 	<div class="row">
 	<div class="col-md-12">
 	<div class="col-md-3">
+	<div class="col-md-12">
 	<label>Requistion No</label>
 						 
 						
@@ -561,7 +574,17 @@ function clearEditTaxField()
 						}	
 							echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
 
-							?>						 
+							?>
+	</div>
+	<div class="col-md-12">
+		<label>Purchase Order Date</label>
+						<div class="form-group">
+									<?php
+							 $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+							echo form_input($data);
+							?>   
+						</div>
+	</div>							
 						 
 	</div>
 	<div class="col-md-9">
@@ -621,15 +644,17 @@ function clearEditTaxField()
 		</div>
 		<div class="col-md-4">
 			<div class="col-md-12">
-				<label>Purchase Order Date</label>
-						<div class="form-group">
-									<?php
-							 $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
-							echo form_input($data);
-							?>   
-						</div>
+				 <b><u>Select Delivery By</u></b><br/>
+                            <tr>
+                                <td>
+                                    <?php echo form_label('Date', 'Date') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>set_radio('DateRange', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+                                <td>
+                                    <?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?>
+
+                                </td>
+                            </tr>
 			</div>
-			<div class="col-md-12">
+			<div class="col-md-12" id="Deliverydtdiv"><br/>
 				<label>Delivery Date</label>
 					<div class="form-group">
 								<?php
@@ -638,6 +663,14 @@ function clearEditTaxField()
 						?>   
 					</div>
 			</div>
+			<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
+					<label >Schedule :</label>					 
+					<?php
+					$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
+					echo Form_textarea($data);
+					?>
+
+            </div>
 		</div>
 		
 	</div>
@@ -1802,6 +1835,21 @@ function validateServiceTax()
 	}
 		
  }
+// this function is used to clear data changing schedule option
+$('#Scheduleby').change(function(){
+        
+             $("#Deliverydt").datepicker({
+            minDate : 'now',
+            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
+        });
+                
+            });
+            $('#Deliverydt').change(function(){
+
+            
+           $('#Scheduleby').val('');
+                
+            });
 //
 </script>
 <script>
@@ -1874,5 +1922,7 @@ $('#txtStatus').val(stat);
     }); 
   });
 
+
+
 </script>