diff --git a/application/logs/log-2017-08-11.php b/application/logs/log-2017-08-11.php
new file mode 100644
index 00000000..26b99d33
Binary files /dev/null and b/application/logs/log-2017-08-11.php differ
diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php
index 68fbc346..3f146757 100755
--- a/application/views/EditservicePurchaseorder.php
+++ b/application/views/EditservicePurchaseorder.php
@@ -1944,40 +1944,10 @@ $(document).ready(function () {
 								</div> 
 						   
 						</div>
-						 <div class="col-md-12" style="padding:2%;">
-						   <div class="col-md-8">
-						   <div class="row">
-							<div class="col-md-2"><label>Request On</label></div>
-							<div class="col-md-4">
-																  
-								  <?php
-									 $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true','readonly' => 'true');
-										echo form_input($data);
-									?>   
-							</div>
-							</div><br/>
-							 <div class="row">
-							 <div class="col-md-2"><label>Request By</label></div>
-							<div class="col-md-4"> 							  
-								  <?php
-									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy', $RequesterName),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
-									echo form_input($data);
-									?> 
-							</div>
-							</div><br/>
-							  
-							 <div class="row"><div class="col-md-2"><label>Status</label></div>
-							<div class="col-md-4"> 							  
-								 <?php
-								  
-                                     $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-								?>
-							</div><br/>
-						</div>
-						</div>
-</div>
-
+						 
+<label>Request On : </label><?php echo $Reqon;?><br/>
+<label>Request By : </label><?php echo $RequesterName;?><br/>
+<label>Status : </label><?php echo $StatusName;?>
 					 </div> 
 					
 						</div>
diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php
index 15fcbe8d..47a88740 100755
--- a/application/views/alterpurchaseorder.php
+++ b/application/views/alterpurchaseorder.php
@@ -57,6 +57,9 @@ if(!empty($INRSYMBOL))
 	.nopad {
 		padding:0px;
 	}
+	.select2 {
+		width:100% ! important;
+	}
 </style>
 <script src="<?php echo base_url()?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
 
@@ -1869,10 +1872,15 @@ function SetExciseCalculationCancel()
 	
 	$("#PaymentMethod").select2();
 	
-        //Initialize Select2 Elements
+        //Initialize Select2 Elements  
         $("#purpose").select2();
         $("#DepartmentName").select2();
         $("#CostCenterName").select2();
+		
+        $("#EditMaterialCode").select2();
+        $("#EditRevenueMaterialCode").select2();
+        $("#MaterialCode").select2();
+        $("#ServiceMaterialCode").select2();
     });
     function DeleteRevenueRow(rowid)
 {
@@ -2302,8 +2310,7 @@ function populateValueMainFormForDeleteItem(rowid)
 												</div>
 </div>
 </div>
-
-					<div class="row">
+ 
 						<div class="col-md-12">
 						  <legend>Payment Details</legend>
 						  <!-- Text input-->
@@ -2334,7 +2341,7 @@ function populateValueMainFormForDeleteItem(rowid)
                             ?>   
                         </div>
                 </div></div>
-					</div>
+					 
 				</div>
 				<div class="col-md-12">
 					<div  class="col-md-1 col-md-offset-10" align="right" >
@@ -2638,7 +2645,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                         </div>
                                     </div>
                                     <div class="col-md-2">
-                                        <label><?php echo "Rate In ($INRSYM)";?></label>
+                                        <label><?php echo "Rate  ($INRSYM)";?></label>
                                         <div class="form-group">
                                             <?php
                                             $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
@@ -2877,7 +2884,7 @@ function populateValueMainFormForDeleteItem(rowid)
 																</div>
 													 </div>
 													 <div class="col-md-2">
-													  <label><?php echo "Rate In ($INRSYM)";?></label>
+													  <label><?php echo "Rate  ($INRSYM)";?></label>
 																<div class="form-group">
 																			<?php
 																	 $data = array('name' => 'EditRevenueRate','value' => set_value('EditRate'),'id'=>'EditRevenueRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;' );
@@ -2886,7 +2893,7 @@ function populateValueMainFormForDeleteItem(rowid)
 																</div>
 													 </div>
 													 <div class="col-md-2">
-													  <label><?php echo "Basic Amt In ($INRSYM)";?></label>
+													  <label><?php echo "Basic Amt  ($INRSYM)";?></label>
 																<div class="form-group">
 																			<?php
 																	 $data = array('name' => 'txtEditRevenueBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditRevenueBasicValue',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -3108,7 +3115,7 @@ function populateValueMainFormForDeleteItem(rowid)
 												
 												<div class="col-md-4">  
 													<div class="form-group">
-													<label><?php echo "Total Order Amt In ($INRSYM)";?></label>
+													<label><?php echo "Total Order Amt  ($INRSYM)";?></label>
 																	<?php
 															 $data = array('name' => 'txtEditRevenueTotalOrderValue','value' => set_value('txtEditTotalOrderValue'),'id'=>'txtEditRevenueTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
 															echo form_input($data);
@@ -3116,7 +3123,7 @@ function populateValueMainFormForDeleteItem(rowid)
 													</div> 
 												</div>
 												<div class="col-md-2"><br/>
-													<a class="btn btn-primary EditRevenue"  ID="EditRevenue"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>											 				 
+													<a class="btn btn-primary EditRevenue"  ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>											 				 
 												</div>
 												<div class="col-md-2"><br/>													 
 												<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>					 
@@ -3194,7 +3201,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                         </div>
                                                     </div>
                                                     <div class="col-md-2">
-                                                        <label><?php echo "Rate In ($INRSYM)";?></label>
+                                                        <label><?php echo "Rate  ($INRSYM)";?></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()' );
@@ -3203,7 +3210,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                         </div>
                                                     </div>
                                                     <div class="col-md-2">
-                                                        <label><?php echo "Basic Amt In ($INRSYM)";?></label>
+                                                        <label><?php echo "Basic Amt  ($INRSYM)";?></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3429,7 +3436,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                     <div class="col-md-12" >
 														
                                                         <div class="col-md-4 ">
-														 <label><?php echo "Total Order Amt In ($INRSYM)";?></label>
+														 <label><?php echo "Total Order Amt  ($INRSYM)";?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtTotalOrderValue','value' => set_value('txtTotalOrderValue'),'id'=>'txtTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3438,7 +3445,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2 "><br/>
-                                                            <a class="btn btn-primary font AddRevenue"  ID="AddRevenue"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
+                                                            <a class="btn btn-primary font AddRevenue"  ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
                                                         </div>
 														<div class="col-md-2 "><br/>                                                             
                                                             <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
@@ -3594,7 +3601,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                     </div>
                                                 </div>
                                                 <div class="col-md-2">
-                                                    <label><?php echo "Rate In ($INRSYM)";?></label>
+                                                    <label><?php echo "Rate  ($INRSYM)";?></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'ServiceRate','value' => set_value('ServiceRate'),'id'=>'ServiceRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()');
@@ -3738,7 +3745,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                         
                                         <div class="modal-footer">
 									 <div class="col-md-12">
-                                            <a class="btn btn-primary font AddService"  ID="AddService"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>
+                                            <a class="btn btn-primary font AddService"  ID="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
                                             <a class="btn btn-primary" data-dismiss="modal" value="Cancel">Cancel</a>
 										</div>
                                         </div>
@@ -3855,7 +3862,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                     </div>
                                                 </div>
                                                 <div class="col-md-2">
-                                                    <label><?php echo "Rate In ($INRSYM)";?> </label>
+                                                    <label><?php echo "Rate  ($INRSYM)";?> </label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'imRate','value' => set_value('imRate'),'id'=>'imRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' );
@@ -4241,7 +4248,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font AddImport"  ID="AddImport"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Import</span></a>
+                                            <a class="btn btn-info font AddImport"  ID="AddImport"  > &nbsp;&nbsp;<span class="bold">Add Import</span></a>
                                             <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                         </div>
@@ -4314,7 +4321,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                     </div>
                                                 </div>
                                                 <div class="col-md-2">
-                                                    <label><?php echo "Rate In ($INRSYM)";?> </label>
+                                                    <label><?php echo "Rate  ($INRSYM)";?> </label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'imRate','value' => set_value('imRate'),'id'=>'imRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' );
@@ -4700,7 +4707,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font AddImport"  ID="AddImport"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Capital</span></a>
+                                            <a class="btn btn-info font AddImport"  ID="AddImport"  > &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
                                             <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                         </div>
diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php
index ce176157..cfbbc8f7 100755
--- a/application/views/editCapitalAmendPO.php
+++ b/application/views/editCapitalAmendPO.php
@@ -145,7 +145,7 @@ if(!empty($AvlBudAmt))
 }
 ?>
     <style>
-                .modal
+      .modal
     {
             padding-right:25% ! important;
     }
@@ -162,7 +162,9 @@ if(!empty($AvlBudAmt))
     .num {
   text-align:right;
 }
-
+.content-wrapper {
+	min-height:600px ! important;
+}
     </style>
 	<script src="<?php echo base_url()  ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
 <script type="text/javascript">
@@ -1424,7 +1426,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
 
 
                                             <div class="modal-footer">
-                                                <a class="btn btn-primary font EditCapital"  ID="UpdateCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
+                                                <a class="btn btn-primary font EditCapital"  ID="UpdateCapital"  > &nbsp;&nbsp;<span class="bold">Update Capital</span></a>
                                                 <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                             </div>
@@ -1474,7 +1476,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
 									
 							</div>
               <div class="col-md-12">
-              <div class="col-md-6" style="padding: 0px;">
+              <div class="col-md-3" style="padding: 0px;">
               <label >Total Order Value  In INR </label>    
               <input type="hidden" name="preServiceTotalorderValue" value="<?php echo $totalCapitalOrder?>">  
                 <?php
@@ -1640,50 +1642,15 @@ document.getElementById('dispatchinternational').style.display = 'block';
 					
 				</div>
 					<div class="col-md-12">
-                                <label>Special Instructions :</label>  <?php
+                                <label>Special Instructions </label>  <?php
                              $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$scopeofwork),'id'=>'txtSpcialInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
                             echo form_textarea($data);
                             ?>   
                           </div>
-
-		 /
-
- <div class="col-md-12">
-     <div class="col-md-8"><br/>
-     <div class="row">
-              <div class="col-md-2"><label>Request On</label></div>
-              <div class="col-md-4">
-                                  
-                  <?php
-                       $data = array('name' => 'Requeston','value' => set_value('Requeston',$UpdatedOn),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;','readonly' => 'true');
-                      echo form_input($data);
-                      ?>   
-              </div>
-              </div><br/>
-               <div class="row">
-               <div class="col-md-2"><label>Request By</label></div>
-              <div class="col-md-4">                
-                  <?php
-                   $data = array('name' => 'RequestBy','value' => set_value('RequestBy', $requestedBy),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
-                  echo form_input($data);
-                  ?> 
-              </div>
-              </div><br/>
-                
-               <div class="row"><div class="col-md-2"><label>Status</label></div>
-              <div class="col-md-4">                
-                 <?php
-                  
-                                     $data = array('name' => 'Status','value' => set_value('Status',$PoStatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-                ?>
-              </div><br/>
-            </div>
-            </div>
-</div>
+ 
 
       
-		<div align="right" style="padding:1% 0%;"> 
+		<div class="row" align="right" style="padding:3%;"> 
                                         
 				<input type="hidden" name="txtPoRange" id="txtPoRange" /> 
 				<input type="hidden" name="isEdit" id="isEdit" value="0" /> 
@@ -1699,6 +1666,10 @@ document.getElementById('dispatchinternational').style.display = 'block';
     
 
 		</div>
+		<label>Request On :</label><?php echo $UpdatedOn;?><br/>
+				<label>Request By :</label><?php echo $requestedBy;?><br/>
+				<label>Status :</label><?php echo $PoStatusName;?>
+        
              <br/>
 			 
              </div>
@@ -2912,7 +2883,7 @@ basicamt=$('#Totalservicesummary').val();
 				return false;
                     }
 					
-				else if(parseInt(AvlBudAmt) < parseInt(basicamt) {
+				else if(parseInt(AvlBudAmt) < parseInt(basicamt)) {
                  alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
                        
                         return false;
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index ce4cd36f..94999e4f 100644
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -149,6 +149,9 @@ if(!empty($AvlBudAmt))
 		.num{
 		text-align:right;
 		}
+		.content-wrapper {
+			min-height:600px ! important;
+		}
     </style>
 	<script src="<?php echo base_url()  ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
 <script type="text/javascript">
@@ -1379,7 +1382,7 @@ $("#PaymentMethod").select2();
 
 
                                             <div class="modal-footer">
-                                                <a class="btn btn-primary font AddCapital"  ID="AddCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Capital</span></a>
+                                                <a class="btn btn-primary font AddCapital"  ID="AddCapital"  > &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
                                                 <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                             </div>
@@ -1967,7 +1970,7 @@ $("#PaymentMethod").select2();
 
 
                                             <div class="modal-footer">
-                                                <a class="btn btn-primary font EditCapital"  ID="UpdateCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
+                                                <a class="btn btn-primary font EditCapital"  ID="UpdateCapital"  >&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
                                                 <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                             </div>
@@ -2599,7 +2602,7 @@ $("#PaymentMethod").select2();
                                     </div>
     </div>
 
-    <div class="col-md-12" style="padding:1%;" ></div>
+   
     <div class="col-md-12" style="border: 1px solid;padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
 
                 <div class="col-md-4">
@@ -2713,82 +2716,32 @@ $("#PaymentMethod").select2();
                             ?>                      
                 </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="txtRowCount1" />
-                                                            <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 class="col-md-12" style="border: 1px solid;padding:1% 0%;">
-<div class="col-md-4">
-                  <label >Total Order Value<?php echo "($INR)"?>  </label> 
+			<div class="col-md-12" style="border: 1px solid;padding:1% 1%;">
+			<div class="col-md-3">
+							  <label >Total Order Value<?php echo "($INR)"?>  </label> 
 
-                                <?php
-                             $data = array('name' => 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'CapitalToatlOrder',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
-                            echo form_input($data);
-                            ?>                      
-                </div>
-</div>
+											<?php
+										 $data = array('name' => 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'CapitalToatlOrder',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+										echo form_input($data);
+										?>                      
+							</div>
+			</div>
 
- <div class="col-md-12">
-                                <label>Special Instructions :</label>  <?php
+				<div class="col-md-12">
+                                <label>Special Instructions </label>  <?php
                              $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
                             echo form_textarea($data);
                             ?>   
                           </div>
 	 
-				    <div class="col-md-12">
-	   <div class="col-md-8">
-	   <div class="row" style="padding-top:1%;">
-							<div class="col-md-2"><label>Request On</label></div>
-							<div class="col-md-4">
-																  
-								  <?php
-											 $data = array('name' => 'Requeston','value' => set_value('Requeston',$UpdatedOn),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;','readonly' => 'true','readonly' => 'true');
-											echo form_input($data);
-											?>   
-							</div>
-							</div><br/>
-							 <div class="row">
-							 <div class="col-md-2"><label>Request By</label></div>
-							<div class="col-md-4"> 							  
-								  <?php
-									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy', $requestedBy),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true','readonly' => 'true');
-									echo form_input($data);
-									?> 
-							</div>
-							</div><br/>
-							  
-							 <div class="row"><div class="col-md-2"><label>Status</label></div>
-							<div class="col-md-4"> 							  
-								 <?php
-								  
-                                     $data = array('name' => 'Status','value' => set_value('Status',$PoStatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-								?>
-							</div><br/>
-						</div>
-						</div>
-</div>
+		 
+
 				 
-		<div align="right" style="padding:1% 0%;"> 
+		<div align="right" style="padding:3% 2%;"> 
                                         
 				<input type="hidden" name="txtPoRange" id="txtPoRange" /> 
 				<input type="hidden" name="isEdit" id="isEdit" value="0" /> 
@@ -2798,15 +2751,18 @@ $("#PaymentMethod").select2();
 					  
 				  <?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED  ) { 
 				  if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?>  
-	<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?> 
-	<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-    <input type="reset" class="btn btn-primary" value="Reset"/>
-    <?php }else {?>
-      <a class="btn btn-primary"  ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>  <?php } ?>
+				<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?> 
+				<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
+				<input type="reset" class="btn btn-primary" value="Reset"/>
+				<?php }else {?>
+				  <a class="btn btn-primary"  ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>  <?php } ?>
 
 		</div>
-             <br/>
-			 
+             
+				<label>Request On :</label><?php echo $UpdatedOn;?><br/>
+				<label>Request By :</label><?php echo $requestedBy;?><br/>
+				<label>Status :</label><?php echo $PoStatusName;?>
+        
              </div>
 			 
 			
diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index a215f51b..39819bad 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -52,13 +52,15 @@ if(!empty($MaxPODate))
 }
 
 
+ 
 $INR='';
+$INRSYM='';
 if(!empty($INRSYMBOL))
 { 
    foreach ($INRSYMBOL as $INR) 
    {  
-    $INR=$INR->Currency_Code;
-     // $INR=$INR->FontCode2000;
+    $INRSYM=$INR->Currency_Code;
+    $INR=$INR->FontCode2000;
    }
 }
 //echo $INR;
@@ -435,7 +437,7 @@ if(!empty($RequistionDetails))
         <div class="col-md-4">
         <div class="col-md-12">
 
-                            <b><u>Select Delivery By</u>
+                            <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'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> -->
@@ -449,7 +451,7 @@ if(!empty($RequistionDetails))
                             </tr>
                         </div>
             
-                <div class="col-md-12" id="Schedulediv" style="display:none;"> 
+                <div class="col-md-12" id="Schedulediv" style="display:none;"> <br/>
                        <!--  <label >Schedule </label>
                          
                         <?php
@@ -465,7 +467,7 @@ if(!empty($RequistionDetails))
                         ?>
 
                 </div>
-                <div class="col-md-12" id="Deliverydtdiv"> 
+                <div class="col-md-12" id="Deliverydtdiv"> <br/>
                            <!--  <label>Delivery Date</label>
                              
                                 <?php
@@ -1153,7 +1155,7 @@ if(!empty($RequistionDetails))
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font EditImport"  ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                                            <a class="btn btn-info font EditImport"  ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
                                             <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
@@ -1524,7 +1526,7 @@ if(!empty($RequistionDetails))
 
        <div class="col-md-12">
             <div class="col-md-4">
-              <label >Total Landing Charge  :</label> 
+              <label >Total Landing Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotallanding','value' => set_value('txttotallanding',$TotalLanding),'id'=>'txttotallanding',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1533,7 +1535,7 @@ if(!empty($RequistionDetails))
             </div>
 
             <div class="col-md-4">
-              <label >Total High seas sales Charge  :</label> 
+              <label >Total High seas sales Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalhighseas','value' => set_value('txttotalhighseas',$tothighseas),'id'=>'txttotalhighseas',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1542,7 +1544,7 @@ if(!empty($RequistionDetails))
             </div>
 
             <div class="col-md-4">
-              <label >Total Custom Duty Charge  :</label> 
+              <label >Total Custom Duty Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalcustom','value' => set_value('txttotalcustom',$totcustom),'id'=>'txttotalcustom',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1551,7 +1553,7 @@ if(!empty($RequistionDetails))
             </div>
 
             <div class="col-md-4">
-              <label >Total Excise duty  Charge  :</label> 
+              <label >Total Excise duty  Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalexcise','value' => set_value('txttotalexcise',$totexciseduty),'id'=>'txttotalexcise',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1560,7 +1562,7 @@ if(!empty($RequistionDetails))
             </div>
 
             <div class="col-md-4">
-              <label >Total Excise duty ED_cess Charge  :</label> 
+              <label >Total Excise duty ED_cess Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalexciseED','value' => set_value('txttotalexciseED', $totexcisedutyED),'id'=>'txttotalexciseED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1570,7 +1572,7 @@ if(!empty($RequistionDetails))
 
 
             <div class="col-md-4">
-              <label >Total Excise duty S & H cess  Charge  :</label> 
+              <label >Total Excise duty S & H cess  Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalexciseSH','value' => set_value('txttotalexciseSH',$totexciseSH),'id'=>'txttotalexciseSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1579,7 +1581,7 @@ if(!empty($RequistionDetails))
             </div>
 
             <div class="col-md-4">
-              <label >Total Custom ED_cess Charge  :</label> 
+              <label >Total Custom ED_cess Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalcustomED','value' => set_value('txttotalcustomED',$totcustomED),'id'=>'txttotalcustomED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1588,7 +1590,7 @@ if(!empty($RequistionDetails))
             </div>
 
             <div class="col-md-4">
-              <label >Total Custom S & H cess Charge  :</label> 
+              <label >Total Custom S & H cess Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalcustomSH','value' => set_value('txttotalcustomSH',$totcustomSH),'id'=>'txttotalcustomSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1597,7 +1599,7 @@ if(!empty($RequistionDetails))
             </div>
 
             <div class="col-md-4">
-              <label >Total Additional Excise duty Charge  :</label> 
+              <label >Total Additional Excise duty Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalAdditionalExciseduty','value' => set_value('txttotalAdditionalExciseduty',$totaddtnlexcise),'id'=>'txttotalAdditionalExciseduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1607,7 +1609,7 @@ if(!empty($RequistionDetails))
 
 
             <div class="col-md-4">
-              <label >Total Gross duty payable Charge  :</label> 
+              <label >Total Gross duty payable Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalgrossduty','value' => set_value('txttotalgrossduty',$totgrossduty),'id'=>'txttotalgrossduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1616,7 +1618,7 @@ if(!empty($RequistionDetails))
             </div>
 
              <div class="col-md-4">
-              <label >Total Available Modvat set-off on import Charge  :</label> 
+              <label >Total Available Modvat set-off on import Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalavlmodvat','value' => set_value('txttotalavlmodvat',$totavlmodvat),'id'=>'txttotalavlmodvat',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1626,7 +1628,7 @@ if(!empty($RequistionDetails))
 
 
             <div class="col-md-4">
-              <label >Total Gross expenses due to custom duty Charge  :</label> 
+              <label >Total Gross expenses due to custom duty Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalgrossexpense','value' => set_value('txttotalgrossexpense',$totgrossexpense),'id'=>'txttotalgrossexpense',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1638,7 +1640,7 @@ if(!empty($RequistionDetails))
            
 
                     <div  class="col-md-4">
-                             <label>Total Order Value :</label>  <?php
+                             <label>Total Order Value  <?php echo "($Value)"?></label>  <?php
                          $data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder',$totorder),'id'=>'txtToatlOrder',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;');
                        echo form_input($data);
                         ?>   
@@ -1651,7 +1653,7 @@ if(!empty($RequistionDetails))
 
                     <div class="col-md-12">
                       <div class="col-md-12">
-                            <label>Special Instructions :</label>  <?php
+                            <label>Special Instructions </label>  <?php
                          $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
                         echo form_textarea($data);
                         ?>   
@@ -1679,47 +1681,16 @@ if(!empty($RequistionDetails))
     <input type="reset" class="btn btn-primary" value="Reset">
     <?php //}else {?>
       <!-- <input type="reset" class="btn btn-primary" value = "OK">  <?php //} ?>-->
-  
+  <br/>
   </div>
-         <br/>
+         
      </div>
             </div> 
-        <div class="col-md-12">
-         <div class="col-md-12">
-                            <div class="col-md-4">
-                                <span>Request On</span>                                  
-                                  <?php
-                                             $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;' ,'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>   
-                            </div>
-                            </div>
-                             <div class="col-md-12">
-                            <div class="col-md-4">
-                                <span>Request By</span>                                  
-                                  <?php
-                                     $data = array('name' => 'RequestBy','value' => set_value('RequestBy',$RequesterName),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?> 
-                            </div>
-                            </div>
-                             <div class="col-md-12">
-                            <div class="col-md-4">
-                                <span>Status</span>                                  
-                                 <?php
-                                    // $options = array("0"=>$PONOStatus);     
-                                    // echo form_dropdown('Status', $options,set_value('Status',$POStatus),'id="Status"'  ,'required="true"' ,'class="form-control select2')
-
-                                     $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-                                ?>
-                            </div>
-                            </div>
-                            <br/>
-                            <br>
-
-                        
-                </div>
+       
+				<label>Request On :</label><?php echo $Reqon;?><br/>
+				<label>Request By :</label><?php echo $RequesterName;?><br/>
+				<label>Status :</label><?php echo $StatusName;?>
+        
          </div>
 		 </div>
 
diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php
index 29b10198..01ba2903 100644
--- a/application/views/editRevenueAmendPO.php
+++ b/application/views/editRevenueAmendPO.php
@@ -1477,7 +1477,7 @@ function calculateEditTaxValue()
 	</div>	  
 	</div>	   
 	              
-            <div class="box-body"  >
+            <div class="box-body">
               <table id="revenueTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
                 <thead style="background-color:#ddf">
                 <tr>
@@ -1604,7 +1604,7 @@ function calculateEditTaxValue()
             </div>
             <!-- /.box-body -->
      
-	 </div>  
+	  
 
   
  <div class="row" style="border:1px solid;">	 
@@ -1726,44 +1726,15 @@ function calculateEditTaxValue()
 	   </div> 
 	   </div>
  
-						
-		<div class="col-md-12">
-					   <div class="col-md-8">
-					   <div class="row">
-							<div class="col-md-2"><label>Request On</label></div>
-							<div class="col-md-4">
-																  
-								  <?php
-												$Reqon=new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));				
-												$Reqon=$Reqon->format('Y-m-d');
-											 $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true','readonly' => 'true');
-											echo form_input($data);
-											?>   
-							</div>
-							</div><br/>
-							 <div class="row">
-							 <div class="col-md-2"><label>Request By</label></div>
-							<div class="col-md-4"> 							  
-								  <?php
-									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy', $Requestedby),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
-									echo form_input($data);
-									?> 
-							</div>
-							</div><br/>
-							  
-							 <div class="row"><div class="col-md-2"><label>Status</label></div>
-							<div class="col-md-4"> 							  
-								  <?php
-								  
-                                     $data = array('name' => 'Status','value' => set_value('Status',$POStatus),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-								?>
-							</div><br/>
-						</div>
-						</div>
-		</div>
+		 
+		
+        
  
+	</div>
 </div>
+<label>Request On :</label><?php echo $Reqon;?><br/>
+				<label>Request By :</label><?php echo $Requestedby;?><br/>
+				<label>Status :</label><?php echo $POStatus;?>
  
          </div></div></section>
        
diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php
index 1691e8e2..5b4442b7 100644
--- a/application/views/editRevenuepurchaseorder.php
+++ b/application/views/editRevenuepurchaseorder.php
@@ -3525,39 +3525,10 @@ function calculateEditTaxValue()
    
 	   </div><br/>
 	   </div>
-	   <div class="col-md-12">
-	   <div class="col-md-8">
-	   <div class="row">
-							<div class="col-md-2"><label>Request On</label></div>
-							<div class="col-md-4">
-																  
-								  <?php
-											 $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;','readonly' => 'true');
-											echo form_input($data);
-											?>   
-							</div>
-							</div><br/>
-							 <div class="row">
-							 <div class="col-md-2"><label>Request By</label></div>
-							<div class="col-md-4"> 							  
-								  <?php
-									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy', $RequesterName),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
-									echo form_input($data);
-									?> 
-							</div>
-							</div><br/>
-							  
-							 <div class="row"><div class="col-md-2"><label>Status</label></div>
-							<div class="col-md-4"> 							  
-								 <?php
-								  
-                                     $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-								?>
-							</div><br/>
-						</div>
-						</div>
-</div>
+ 
+<label>Request On : </label><?php echo $Reqon;?><br/>
+<label>Request By : </label><?php echo $RequesterName;?><br/>
+<label>Status : </label><?php echo $StatusName;?>
 </div>
          </div>
        
diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php
index 05c6f270..1fbdd40f 100755
--- a/application/views/editServiceAmendPO.php
+++ b/application/views/editServiceAmendPO.php
@@ -753,7 +753,7 @@ $(document).ready(function () {
 										</div>
 								</div>
 								<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
-										<label >Schedule :</label>
+										<label >Schedule By</label>
 										<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule?>">
 										<?php
 										$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverSchedule),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
@@ -1304,39 +1304,12 @@ $(document).ready(function () {
 						</div>
 						<br/>
 					 </div><br/> 
-					<div class="col-md-12">
-					   <div class="col-md-8">
-					   <div class="row">
-							<div class="col-md-2"><label>Request On</label></div>
-							<div class="col-md-4">
-																  
-								  <?php
-											 $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true','readonly' => 'true');
-											echo form_input($data);
-											?>   
-							</div>
-							</div><br/>
-							 <div class="row">
-							 <div class="col-md-2"><label>Request By</label></div>
-							<div class="col-md-4"> 							  
-								  <?php
-									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy', $RequesterName),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
-									echo form_input($data);
-									?> 
-							</div>
-							</div><br/>
-							  
-							 <div class="row"><div class="col-md-2"><label>Status</label></div>
-							<div class="col-md-4"> 							  
-								  <?php
-								  
-                                     $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-								?>
-							</div><br/>
-						</div>
-						</div>
-		</div>
+			 
+		
+		<label>Request On :</label><?php echo $Reqon;?><br/>
+				<label>Request By :</label><?php echo $RequesterName;?><br/>
+				<label>Status :</label><?php echo $StatusName;?>
+        
 					 </div>
 					</div>
 
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 4c590dc8..81e44b49 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -272,7 +272,7 @@ if(!empty($RequistionDetails))
 			   <?php } ?>
 			</div>
 			<!--<div class="col-md-1"><br/>		
-			 <a class="btn btn-info" href="<?php echo base_url(); ?>purchaseorder/CreateimportPOPrint" target="_blank">Print</a>			
+			 <a class="btn btn-primary" href="<?php echo base_url(); ?>purchaseorder/CreateimportPOPrint" target="_blank">Print</a>			
 			</div> -->
 		</div>
          <div class="container-fluid">
@@ -613,7 +613,7 @@ if($PONOStatus == PO_RELEASED)
                             <div class="modal-dialog">
                                 <!-- Modal content-->
                                 <form>
-                                    <div class="modal-content" style="width:900px;">
+                                    <div class="modal-content" style="width:950px;font-size:12px;">
                                         <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
                                             
                                             <center><h4>Add Import Purchase Order Item </h4></center>
@@ -821,7 +821,7 @@ if($PONOStatus == PO_RELEASED)
                                                         <div class="col-md-12">
                                                             <div class="col-md-4" >
                                                                 <!-- Basic Price: -->
-                                                <label><?php echo "Basic Price In ($INR)";?></label>                
+                                                <label><?php echo "Basic Price  ($INR)";?></label>                
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display:none;">
@@ -1167,10 +1167,10 @@ if($PONOStatus == PO_RELEASED)
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font AddImport"  ID="AddImport" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Import</span></a>
+                                            <a class="btn btn-primary font AddImport"  ID="AddImport" > &nbsp;&nbsp;<span class="bold">Add Import</span></a>
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
-                                            <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+                                            <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                         </div>
                                     </div>
@@ -1381,7 +1381,7 @@ if($PONOStatus == PO_RELEASED)
                                                         <div class="col-md-12">
                                                             <div class="col-md-4" >
                                                                 <!-- Basic Price: -->
-                                                  <label><?php echo "Basic Price In ($INR)";?></label>              
+                                                  <label><?php echo "Basic Price  ($INR)";?></label>              
                                                             </div>
                                                             <div class="col-md-4">
                                                                 <div class="form-group" style="display:none;">
@@ -1731,17 +1731,16 @@ if($PONOStatus == PO_RELEASED)
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font EditImport"  ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                                            <a class="btn btn-primary font EditImport"  ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
-                                            <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+                                            <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
-                                        </div>
-                                    </div>
-                                </form>
-
-                            </div>
-                        </div> 
+									    </div>
+						</div>
+					</form>
+             </div>
+       </div> 
 
                         <!-- view model body -->
      <div  id="viewimportmodal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -2283,17 +2282,17 @@ if($PONOStatus == PO_RELEASED)
 
                                         </div>
                                         <div class="modal-footer">
-                                            <!-- <a class="btn btn-info font EditImport"  ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> -->
+                                            <!-- <a class="btn btn-primary font EditImport"  ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> -->
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
-                                            <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+                                            <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                         </div>
                                     </div>
                                 </form>
 
                             </div>
-                        </div>        
+             </div>        
   </div>
  
 
@@ -2515,7 +2514,7 @@ if($PONOStatus == PO_RELEASED)
 
        <div class="col-md-12">
             <div class="col-md-4">
-              <label >Total Landing Charge :<?php echo "($INR)"?></label> 
+              <label >Total Landing Charge  <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotallanding','value' => set_value('txttotallanding',$TotalLanding),'id'=>'txttotallanding',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2524,7 +2523,7 @@ if($PONOStatus == PO_RELEASED)
             </div>
 
             <div class="col-md-4">
-              <label >Total High seas sales Charge:<?php echo "($INR)"?></label> 
+              <label >Total High seas sales Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalhighseas','value' => set_value('txttotalhighseas',$tothighseas),'id'=>'txttotalhighseas',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2533,7 +2532,7 @@ if($PONOStatus == PO_RELEASED)
             </div>
 
             <div class="col-md-4">
-              <label >Total Custom Duty Charge:<?php echo "($INR)"?></label> 
+              <label >Total Custom Duty Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalcustom','value' => set_value('txttotalcustom',$totcustom),'id'=>'txttotalcustom',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2542,7 +2541,7 @@ if($PONOStatus == PO_RELEASED)
             </div>
 
             <div class="col-md-4">
-              <label >Total Excise duty  Charge:<?php echo "($INR)"?></label> 
+              <label >Total Excise duty  Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalexcise','value' => set_value('txttotalexcise',$totexciseduty),'id'=>'txttotalexcise',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2551,7 +2550,7 @@ if($PONOStatus == PO_RELEASED)
             </div>
 
             <div class="col-md-4">
-              <label >Total Excise duty ED_cess Charge:<?php echo "($INR)"?></label> 
+              <label >Total Excise duty ED_cess Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalexciseED','value' => set_value('txttotalexciseED', $totexcisedutyED),'id'=>'txttotalexciseED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2561,7 +2560,7 @@ if($PONOStatus == PO_RELEASED)
 
 
             <div class="col-md-4">
-              <label >Total Excise duty S & H cess  Charge:<?php echo "($INR)"?></label> 
+              <label >Total Excise duty S & H cess  Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalexciseSH','value' => set_value('txttotalexciseSH',$totexciseSH),'id'=>'txttotalexciseSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2570,7 +2569,7 @@ if($PONOStatus == PO_RELEASED)
             </div>
 
             <div class="col-md-4">
-              <label >Total Custom ED_cess Charge:<?php echo "($INR)"?></label> 
+              <label >Total Custom ED_cess Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalcustomED','value' => set_value('txttotalcustomED',$totcustomED),'id'=>'txttotalcustomED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2579,7 +2578,7 @@ if($PONOStatus == PO_RELEASED)
             </div>
 
             <div class="col-md-4">
-              <label >Total Custom S & H cess Charge:<?php echo "($INR)"?></label> 
+              <label >Total Custom S & H cess Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalcustomSH','value' => set_value('txttotalcustomSH',$totcustomSH),'id'=>'txttotalcustomSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2588,7 +2587,7 @@ if($PONOStatus == PO_RELEASED)
             </div>
 
             <div class="col-md-4">
-              <label >Total Additional Excise duty Charge:<?php echo "($INR)"?></label> 
+              <label >Total Additional Excise duty Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalAdditionalExciseduty','value' => set_value('txttotalAdditionalExciseduty',$totaddtnlexcise),'id'=>'txttotalAdditionalExciseduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2598,7 +2597,7 @@ if($PONOStatus == PO_RELEASED)
 
 
             <div class="col-md-4">
-              <label >Total Gross duty payable Charge:<?php echo "($INR)"?></label> 
+              <label >Total Gross duty payable Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalgrossduty','value' => set_value('txttotalgrossduty',$totgrossduty),'id'=>'txttotalgrossduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2607,7 +2606,7 @@ if($PONOStatus == PO_RELEASED)
             </div>
 
              <div class="col-md-4">
-              <label >Total Available Modvat set-off on import Charge:<?php echo "($INR)"?></label> 
+              <label >Total Available Modvat set-off on import Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalavlmodvat','value' => set_value('txttotalavlmodvat',$totavlmodvat),'id'=>'txttotalavlmodvat',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2617,7 +2616,7 @@ if($PONOStatus == PO_RELEASED)
 
 
             <div class="col-md-4">
-              <label >Total Gross expenses due to custom duty Charge:<?php echo "($INR)"?></label> 
+              <label >Total Gross expenses due to custom duty Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalgrossexpense','value' => set_value('txttotalgrossexpense',$totgrossexpense),'id'=>'txttotalgrossexpense',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2629,7 +2628,7 @@ if($PONOStatus == PO_RELEASED)
            
 
                     <div  class="col-md-4">
-                             <label>Total Order Value:<?php echo "($Value)"?></label> <?php
+                             <label>Total Order Value <?php echo "($Value)"?></label> <?php
                          $data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder',$totorder),'id'=>'txtToatlOrder',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;');
                        echo form_input($data);
                         ?>   
@@ -2637,12 +2636,12 @@ if($PONOStatus == PO_RELEASED)
 
         <!-- <input type="text" name="txttot" id="txtPONO"  value=<?php echo "$totalhidden";?>>  -->
             </div> 
-                <input type="hidden" name="txttot" id="txttot"  value=<?php echo $totalhidden;?>
+                <input type="hidden" name="txttot" id="txttot"  value="">
                     
 
                     <div class="col-md-12">
                       <div class="col-md-12">
-                            <label>Special Instructions :</label>  <?php
+                            <label>Special Instructions  </label>  <?php
                          $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
                         echo form_textarea($data);
                         ?>   
@@ -2673,32 +2672,10 @@ if($PONOStatus == PO_RELEASED)
   </div>
          <br/>
      </div>
-	   <div class="col-md-12">
-                            <div class="col-md-4">
-                                <span>Request On</span>                                  
-                                  <?php
-                                             $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
-                                            echo form_input($data);
-                                            ?>   
-                            </div>
-                            <div class="col-md-4">
-                                <span>Request By</span>                                  
-                                  <?php
-                                     $data = array('name' => 'RequestBy','value' => set_value('RequestBy',$RequesterName),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true');
-                                    echo form_input($data);
-                                    ?> 
-                            </div>
-                            <div class="col-md-4">
-                                <span>Status</span>                                  
-                                 <?php
-                                    // $options = array("0"=>$PONOStatus);     
-                                    // echo form_dropdown('Status', $options,set_value('Status',$POStatus),'id="Status"'  ,'required="true"' ,'class="form-control select2')
-
-                                     $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-                                ?>
-                            </div><br/>
-                </div>
+ 
+		<label>Request On :</label><?php echo $Reqon;?><br/>
+		<label>Request By :</label><?php echo $RequesterName;?><br/>
+		<label>Status :</label><?php echo $StatusName;?>
             </div> 
       
          </div>
@@ -3116,6 +3093,7 @@ function Ratechange(){
       $('#EditimBasicPrice').val(txtbasics);
       $('#EditExchangeRt').val(txtexchangerate);
       $('#EditINRBasicvalue').val(txtINRvalue);
+	   Calculateloadingcharge();
      }
 }
 
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 56a49a62..7b6b6a27 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -1019,7 +1019,7 @@ function vaildateBeforeOpenModal()
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font AddImport"  ID="AddImport" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Import</span></a>
+                                            <a class="btn btn-info font AddImport"  ID="AddImport" > &nbsp;&nbsp;<span class="bold">Add Import</span></a>
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
                                             <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
@@ -1578,7 +1578,7 @@ function vaildateBeforeOpenModal()
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font EditImport"  ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                                            <a class="btn btn-info font EditImport"  ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
                                             <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
@@ -3395,10 +3395,10 @@ $('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(
 function clearTaxField()
 {
     //$('#AfterBasicPriceTax').val('');
-    $('#ReqNo').val('');
-    $('#deptName').val('');
-    $('#CostCenter').val('');
-    $('#AvlBudAmt').val('');
+   // $('#ReqNo').val('');
+    //$('#deptName').val('');
+    //$('#CostCenter').val('');
+    //$('#AvlBudAmt').val('');
     $('#MaterialCode').val('');
     $('#ItemName').val('');
     $('#UOM').val('');
diff --git a/application/views/mrirrevenuepopdf.php b/application/views/mrirrevenuepopdf.php
index b49e3766..383df565 100755
--- a/application/views/mrirrevenuepopdf.php
+++ b/application/views/mrirrevenuepopdf.php
@@ -11,14 +11,11 @@
 		$DeliveryDate ='';
 		$postatus='';
 		$ServiceDescription = '';
-        $PaymentTerms = '';
-        $PaymentDays='';
-        $PayableAT='';
-        $DeliverySchedule='';
-        $ReqDate='';
-        $AdvanceAmount=0.00;
-
-
+                   $PaymentTerms = '';
+                 $PaymentDays='';
+                $PayableAT='';
+                $DeliverySchedule='';
+                $AdvanceAmount=0.00;
 	if(!empty($CompanyDetails))
 		{
     foreach ($CompanyDetails as $CO)
@@ -33,12 +30,12 @@
  
     foreach ($POItem as $PO)
     {
-		$PONO = $PO->PONO;
-		$postatus= $PO->Status;
-		$SuplierName = $PO->SupplierName;
+		 $PONO = $PO->PONO;
+		  $postatus= $PO->Status;
+		 $SuplierName = $PO->SupplierName;
 		$SuplierAddress = $PO->Address;
 		$DeliveryAddress = $PO->DeliveryAddress;
-		$postatus= $PO->Status;
+		 $postatus= $PO->Status;
 		$dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata'));				
 		$Podt =  $dt->format('d-m-Y');
                 if($PO->DeliveryOption=='1'){
@@ -53,7 +50,12 @@
 		
                
 		$ServiceDescription =$PO->ServiceDescription;
-        $PaymentTerms = $PO->PaymentTerms;
+              if($PO->PaymentID!='PT08'){
+                $PaymentTerms = $PO->PaymentTerms;
+                    }
+                else{
+                 $PaymentTerms = $PO->PaymentTerms . ' ( '.$PO->PaymentOtherDescription.' ) ';
+                    }
         $AdvanceAmount=$PO->AdvanceAmount;
                
 		
@@ -150,7 +152,7 @@
 				?>
 			<tr>
 			<td style="text-align: center;"><?php echo $ReqDetails['RequistionNo']; ?></td>
-			<td style="text-align: center;"><?php echo $ReqDetails['ReqDate'];?></td><!--Requistion Date code should come from DB-->
+			<td style="text-align: center;"><?php echo $ReqDetails['ReqDate']; ?></td>
 			<td style="text-align: center;"><?php echo $ReqDetails['RequestedName']; ?></td>
 			<td style="text-align: center;"><?php echo $ReqDetails['RequestedDept']; ?></td>
 			<td style="text-align: center;"><?php echo $ReqDetails['CostCenterCode']; ?></td>
@@ -164,7 +166,7 @@
 </table>
 <p>&nbsp;</p>
  
-<table style="border-collapse: collapse;" border="0" width="100%" cellspacing="0" cellpadding="0">
+<table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
 <tbody>
 <tr bgcolor="#8c8c8c" color="#fff">
 			<td style="text-align: center;">#</td>
@@ -193,9 +195,9 @@
 							?>
 		<tr  style="line-height: 1.5em;">
 		<td style="text-align: center;"><?php echo $index ; ?></td>
-		<td style="text-align: center;">001</td>
+		<td style="text-align: center;"><?php echo $record->MaterialCode ; ?></td>
 		<td style="text-align: center;"><?php echo $record->MaterialName ; ?></td>
-		<td style="text-align: center;"><?php echo $record->HSNCODE;?></td><!--HSN code should come from DB-->
+		<td style="text-align: center;"><?php echo $record->HSNCODE ; ?>
 		<td style="text-align: center;"><?php echo $record->UOM ; ?></td>
 		<td align="right"><?php echo $record->Quantity ; ?></td>
 		
@@ -206,7 +208,7 @@
 								
 		 <?php
 		 						
-								$SubTotalAmount  = $SubTotalAmount + $record->BasicValue;
+								$SubTotalAmount  = $SubTotalAmount + $record->BasicValue-$record->AfterDiscount;
 								 $TotalTax = $TotalTax+$record->Taxamount;
 								$OrderValue = $SubTotalAmount + $TotalTax;
 								
@@ -221,71 +223,12 @@
 </tbody>
 </table>
 
-<!--<table style="border-collapse: collapse;" border="0" width="100%" cellspacing="0" cellpadding="0">
-<tbody>
-<tr bgcolor="#8c8c8c" color="#fff">
-			<td>#</td>
-			 
-                <td>Discount In INR</td>
-		<td>SGST In INR</td>
-		<td>CGST In INR</td>
-		<td>IGST In INR</td>
-		<td>Packaging In INR</td>		 
-		<td>Insurance In INR</td>
-		<td>Freight In INR</td>
-		<td>Total Amount In INR</td>
-</tr>
-<?php
-							if(!empty($POItem))
-							{
-
-								 $index = 0;
-								 $TotalAmount = 0;
-								 $OrderValue = 0;
-								  $TotalTax = 0;
-                                                                  $SubTotalAmount = 0;
-								foreach($POItem as $record)
-								{
-									$index = $index + 1;
-									$TotalAmount = $record->BasicValue+$record->Taxamount;
-							?>
-		<tr  style="line-height: 1.5em;">
-		<td><?php echo $index ; ?></td>
-		 
-                 <td align="right"><?php echo $record->AfterDiscount;?></td>
-                <td align="right"><?php echo $record->AfterSGST  ; ?></td>
-                <td align="right"><?php echo $record->AfterCGST ; ?></td>
-		
-		
-		<td align="right"><?php echo $record->AfterIGST  ; ?></td>
-		<td align="right"><?php echo $record->AfterPackagingValue;?></td>
-                <td align="right"><?php echo $record->AfterFreightValue;?></td>
-                <td align="right"><?php echo $record->Insurance;?></td>
-		<td align="right"><?php echo  number_format($TotalAmount, 2, '.', '')  ; ?></td>
-		</tr>
-								
-		 <?php
-		 						
-								$SubTotalAmount  = $SubTotalAmount + $record->BasicValue;
-								 $TotalTax = $TotalTax+$record->Taxamount;
-								$OrderValue = $SubTotalAmount + $TotalTax;
-								
-								}
-							
-								
-									
-							}
-							
-							?>
-
-</tbody>
-</table>-->
-<p>&nbsp;</p>
 <p>&nbsp;</p>
 
+
 <table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
 <tbody>
-<tr>
+<tr style="line-height: 1.5em;">
 <td style="text-align: center;" rowspan="2"><strong>HSN Code</strong><br /><br /></td>
 <td style="text-align: center;" colspan="2"><strong>Discount In INR</strong><br /><br /></td>
 <td style="text-align: center;" colspan="2"><strong>SGST</strong>&nbsp;<br /><br /></td>
@@ -294,56 +237,58 @@
 <td style="text-align: center;" colspan="2"><strong>Packaging In INR</strong>&nbsp;&nbsp;</td>
 <td style="text-align: center;" rowspan="2"><strong>Insurance In INR</strong>&nbsp;&nbsp;</td>
 <td style="text-align: center;" colspan="2">&nbsp;&nbsp;<strong>Freight In INR&nbsp;</strong></td>
+<td style="text-align: center;" rowspan="2"><strong>Tax Amt In INR</strong><br /></td>
 <td style="text-align: center;" rowspan="2"><strong>&nbsp;Total Amount In INR</strong>&nbsp;</td>
 </tr>
-<tr style="line-height: 1.5em;">
-<td style="text-align: center;"><strong>IN%</strong></td>
+<tr style="line-height: 2.5em;">
+<td style="text-align: center;"><strong>Type</strong></td>
 <td style="text-align: center;"><strong>Amt</strong></td>
-<td style="text-align: center;"><strong>IN%</strong></td>
+<td style="text-align: center;"><strong>Type</strong></td>
 <td style="text-align: center;"><strong>Amt</strong></td>
-<td style="text-align: center;"><strong>IN%</strong></td>
+<td style="text-align: center;"><strong>Type</strong></td>
 <td style="text-align: center;"><strong>Amt</strong></td>
-<td style="text-align: center;"><strong>IN%</strong></td>
+<td style="text-align: center;"><strong>Type</strong></td>
 <td style="text-align: center;"><strong>Amt</strong></td>
-<td style="text-align: center;"><strong>IN%</strong></td>
+<td style="text-align: center;"><strong>Type</strong></td>
 <td style="text-align: center;"><strong>Amt</strong></td>
-<td style="text-align: center;"><strong>IN%</strong></td>
+<td style="text-align: center;"><strong>Type</strong></td>
 <td style="text-align: center;"><strong>Amt</strong></td>
 </tr>
+ <?php if(!empty($POItem)) {
+
+        foreach($POItem as $record1)
+        {
+
+
+        ?>
 <tr style="line-height: 1.5em;">
-<td style="text-align: right;">000666</td>
-<td style="text-align: right;">5%</td>
-<td style="text-align: right;">25</td>
-<td style="text-align: right;">5%</td>
-<td style="text-align: right;">25</td>
-<td style="text-align: right;">5%</td>
-<td style="text-align: right;">25</td>
-<td style="text-align: right;">5%</td>
-<td style="text-align: right;">25</td>
-<td style="text-align: right;">5%</td>
-<td style="text-align: right;">25</td>
-<td style="text-align: right;">&nbsp;</td>
-<td style="text-align: right;">5%</td>
-<td style="text-align: right;">25</td>
-<td style="text-align: right;">150</td>
-</tr>
-<tr style="line-height: 1.5em;">
-<td style="text-align: right;">000666</td>
-<td style="text-align: right;">&nbsp;</td>
-<td style="text-align: right;">20</td>
-<td style="text-align: right;">&nbsp;</td>
-<td style="text-align: right;">30</td>
-<td style="text-align: right;">&nbsp;</td>
-<td style="text-align: right;">50</td>
-<td style="text-align: right;">&nbsp;</td>
-<td style="text-align: right;">60</td>
-<td style="text-align: right;">&nbsp;</td>
-<td style="text-align: right;">500</td>
-<td style="text-align: right;">&nbsp;</td>
-<td style="text-align: right;">&nbsp;</td>
-<td style="text-align: right;">5000</td>
-<td style="text-align: right;">10000</td>
+<td style="text-align: right;"><?php echo $record1->HSNCODE ; ?></td>
+<td style="text-align: right;"><?php echo $record1->DiscountType.'-'.$record1->DiscountValue; ?></td>
+<td style="text-align: right;"><?php echo number_format($record1->AfterDiscount, 2, '.', ''); ?></td>
+<td style="text-align: right;"><?php echo $record1->SGST ; ?></td>
+<td style="text-align: right;"><?php echo number_format($record1->AfterSGST, 2, '.', ''); ?></td>
+<td style="text-align: right;"><?php echo $record1->CGST ; ?></td>
+<td style="text-align: right;"><?php echo number_format($record1->AfterCGST, 2, '.', ''); ?></td>
+<td style="text-align: right;"><?php echo $record1->IGST ; ?></td>
+<td style="text-align: right;"><?php echo number_format($record1->AfterIGST, 2, '.', ''); ?></td>
+<td style="text-align: right;"><?php echo $record1->PackagingType.'-'. $record1->PackagingValue ; ?></td>
+<td style="text-align: right;"><?php echo number_format($record1->AfterPackagingValue, 2, '.', ''); ?></td>
+<td style="text-align: right;"><?php echo number_format($record1->Insurance, 2, '.', ''); ?></td>
+<?php if($record1->FreightType=='PER TRIP'){ ?>
+<td style="text-align: right;"><?php echo $record1->FreightType.'('.$record1->NoOfTrip.')-'. $record1->FreightValue;?></td>
+<?php }  ?>
+<?php if($record1->FreightType!='PER TRIP'){ ?>
+<td style="text-align: right;"><?php echo $record1->FreightType.'-'. $record1->FreightValue;?></td>
+<?php }  ?>
+
+<td style="text-align: right;"><?php echo number_format($record1->AfterFreightValue, 2, '.', ''); ?></td>
+<td style="text-align: right;"><?php echo number_format($record1->Taxamount, 2, '.', ''); ?></td>
+<td style="text-align: right;"><?php echo number_format(($record1->BasicValue+$record1->Taxamount-$record1->AfterDiscount), 2, '.', ''); ?></td>
 </tr>
+            <?php  }
+                               }
+									
+				?>
 </tbody>
 </table>
 <p>&nbsp;</p>
@@ -395,6 +340,7 @@
 
 </tr>
 
+
 <tr>
 
 <td style="text-align: right;"><strong>Balance amount needs to pay &nbsp;</strong></td>
diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php
index 1e7e6e89..eb87e516 100755
--- a/application/views/servicePurchaseorder.php
+++ b/application/views/servicePurchaseorder.php
@@ -1017,7 +1017,7 @@ function clearEditTaxField()
 			   <br/>
 			<div class="modal-footer">
 			<div class="col-md-12">
-			<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>
+			<a class="btn btn-primary font AddService"  ID="AddService" > &nbsp;&nbsp;<span class="bold">Add Service</span></a>
 			<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 			</div>
 			</div>