diff --git a/application/logs/log-2017-09-12.php b/application/logs/log-2017-09-12.php
old mode 100644
new mode 100755
diff --git a/application/logs/log-2017-09-15.php b/application/logs/log-2017-09-15.php
new file mode 100644
index 00000000..fc752a17
--- /dev/null
+++ b/application/logs/log-2017-09-15.php
@@ -0,0 +1,3 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
+
+ERROR - 2017-09-15 08:49:21 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/15sept222/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
diff --git a/application/third_party/dompdf/lib/fonts/log.htm b/application/third_party/dompdf/lib/fonts/log.htm
index 8930316d..5a77fe78 100755
--- a/application/third_party/dompdf/lib/fonts/log.htm
+++ b/application/third_party/dompdf/lib/fonts/log.htm
@@ -1 +1 @@
-<span style='color: #900'>6,144 KB</span>    <span style='color: #090'>743.6862 ms</span><br />
\ No newline at end of file
+<span style='color: #900'>4,096 KB</span>    <span style='color: #090'>237.1471 ms</span><br />
\ No newline at end of file
diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php
index 87f5076a..348b6ace 100755
--- a/application/views/EditservicePurchaseorder.php
+++ b/application/views/EditservicePurchaseorder.php
@@ -913,7 +913,7 @@ $(document).ready(function () {
 	<div class="row">
 	<div class="col-md-12">	
 	<div class="col-md-3">
-	<div class="col-md-12" style="padding: 0px;">
+	<div class="col-md-6" style="padding: 0px;">
 	 
 
 	  <label>Service Type Options</label>
@@ -949,10 +949,7 @@ $(document).ready(function () {
 
 
 	</div> 
-	</div>
-	<div class="col-md-9" style="padding:0px;">
-	<div class="col-md-4" style="padding:0px;" >
-	<div class="col-md-12">
+		<div class="col-md-6" style="padding-right:0px;">
  <label>Insurance Options</label>
 						<div class="form-group">
 						
@@ -989,8 +986,10 @@ $(document).ready(function () {
 
 	</div>
 	</div>
+	<div class="col-md-9" style="padding:0px;">
+	 
 	<div class="col-md-4" id="insuranceTxtDiv"  style="display:block;">
-                     <label>Insurance No<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
+                     <label>Insurance<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
                        <div class="form-group">                        
                            <?php
                             $data = array('name' => 'insuranceNo','value' => set_value('insuranceNo',$InsuranceNo),'id'=>'insuranceNo',  'class' => 'form-control' ,'required' => 'true');
@@ -998,16 +997,8 @@ $(document).ready(function () {
                            ?>  
                        </div>
                </div>
-	 
-	</div> 
-	</div>
-	</div><!--End new fields 1 sep-->
-
-
-
-							<div class="col-md-12" style="padding:0px;">
-								 
-								<div class="col-md-3">
+              	<div class="col-md-4" style="padding:0px;" >
+	             <div class="col-md-12">
 			    <label>Payment Terms</label> 
 				  
                                             <?php
@@ -1043,7 +1034,8 @@ $(document).ready(function () {
                                     
 
                                                     </div>
-                                                    <div class="col-md-3" id="otheroptiondiv" style="display:none;">
+                                                    </div>
+                                                    <div class="col-md-4" id="otheroptiondiv" style="display:none;padding-left:0px;">
                      <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
                        <div class="form-group">                        
                            <?php
@@ -1051,9 +1043,14 @@ $(document).ready(function () {
                            echo form_input($data);
                            ?>  
                        </div>
-               </div>	
-								 
-							</div>
+               </div>
+	 
+	</div> 
+	</div>
+	</div><!--End new fields 1 sep-->
+
+
+ 
 						</div>
 						</div>	
 							<div class="container-fluid">   	 
diff --git a/application/views/capitalpopdf.php b/application/views/capitalpopdf.php
index aee12506..f4bc0446 100755
--- a/application/views/capitalpopdf.php
+++ b/application/views/capitalpopdf.php
@@ -133,8 +133,8 @@
 ?>
 
 <style>
-	@page { margin: 280px 25px 210px 25px; }
-	.header { position: fixed; left: 0px; top: -280px; right: 0px; height: 500px;text-align: center; }
+	@page { margin: 294px 25px 210px 25px; }
+	.header { position: fixed; left: 0px; top: -294px; right: 0px; height: 500px;text-align: center; }
 	.footer { position: fixed; bottom: 10px;}
 	.pagenum:before { content: counter(page); }
 </style>
@@ -170,8 +170,7 @@
 		<td style="text-align: right;">
 		<p>For SIDDHARTH INDUSTRIES</p>
 		<p>&nbsp;</p>
-		<p>&nbsp;</p>
-		<p>&nbsp;</p>
+		<p>&nbsp;</p> 
 		<p>Authorised signatory</p>
 		</td>
 		</tr>
@@ -200,13 +199,13 @@
 				<td style= "text-align: center;" colspan="12"><center> <span style="font-size:24px;">PURCHASE ORDER </span></center></td>
 			</tr>
 			<tr>
-				  <td style="width:1px;" rowspan="2"><center><img width="100" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11JREFUeNrsnT9IHEEYxWfFw8rgpUhlo5URi2gTbIUUSrq1ui4oRLRIY9JIKrGKTQrBgJLuuutEi4CtSSOpPIuATdIEcid2YpN9C3sc8c6bf7uZmX0P7k7ultm7337zzXxvZjGaiaIfQoiqoHTUHk6eniSPUbLQUmUoebojB23dDZGBmQiQAAmQAAmQIkACJEACpAiweA3bbvDV5mb6+iKOxfTc3MDjf15dicbBQfr3591d7wBGM1H0J3l9bNLI84UFsby6mkIzFWACJMCafJ9PJyfSx29vbHQuoqJaxl34zc5O+mVtwIPi5EIcXV52IjnoLvx+by/9wXkIF8aHbq0dgYi4vOB1Q7QV2c4BXM4Z3r+RGBTAR9VqmqhVBoZnIyOdx9taTXqQGJ+YUDqXFwBV4WGU69aXRkNsr69LtyEzHfIKIKJCVl9PT3u+/63P+6bnC64SuWm3jdsYn5xkKcdamCJAAiwjQJcHAC8ATs/OBg1Qy0y4ub6WPhb1cuPwUFycn9/77OPWlvXzeQGw2QPGQ9o/PhZrS0v3IPpooFrpwgChYniidq6fnTnvrBSaA3Uc3A/1uvPuSmEA0f0uFLsyBKcZDjaisvSj8DsFW6pbcHPQpV12WQoBCHhri4taEOGwhJAXjeeBgFebn1eyp0LKi1Ym0rCsXieRqLk06HVetFqJwHmWnRz3yotHzabT9n0hpRxGZ0SjjpGKCEQkxgUtWDlbCyMfIi/qTHMgrDf7srCem5mQDS5YQNKRD2vCuQLMhCVM3bwIiK4PLIUYqrp5EXPFeGWFALO8CEdGddId7NYOHWFQUa1cUO4Fty78/fZW6tFrjx7gqfqAT0PbmWAqVCwq+bDUOxMeyokh6L8B1J1kE2BgIkACJMDyAbSx56/cACV3CoyOjfX9rNSrcrI7E/qVYYCnYhKY3LXkJECVOdx+Us51m6Nwm7HVQyUCf4UGEJuFZPMgIhC+XlYfw21WWQ/GxXJ50q09iBS1MSjYW73ww3SXMVXOobsk4MU80GQZc5DQbl5tOzWRRpS8nJqy1tUAzWZ7ecvKDdfdggWfTV0GbdnA4JB1UdhbHjo0LesAS6YWa2GaCQRIgARIESABEiABUgRIgARYRoAVYtBWBfcL/xb8hwS6av8VYADVjF2M5sTWJAAAAABJRU5ErkJggg==" width="80" /></center></td>
+				  <td style="width:1px;background-color: #2c0101;" rowspan="2"><center><img width="100" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11JREFUeNrsnT9IHEEYxWfFw8rgpUhlo5URi2gTbIUUSrq1ui4oRLRIY9JIKrGKTQrBgJLuuutEi4CtSSOpPIuATdIEcid2YpN9C3sc8c6bf7uZmX0P7k7ultm7337zzXxvZjGaiaIfQoiqoHTUHk6eniSPUbLQUmUoebojB23dDZGBmQiQAAmQAAmQIkACJEACpAiweA3bbvDV5mb6+iKOxfTc3MDjf15dicbBQfr3591d7wBGM1H0J3l9bNLI84UFsby6mkIzFWACJMCafJ9PJyfSx29vbHQuoqJaxl34zc5O+mVtwIPi5EIcXV52IjnoLvx+by/9wXkIF8aHbq0dgYi4vOB1Q7QV2c4BXM4Z3r+RGBTAR9VqmqhVBoZnIyOdx9taTXqQGJ+YUDqXFwBV4WGU69aXRkNsr69LtyEzHfIKIKJCVl9PT3u+/63P+6bnC64SuWm3jdsYn5xkKcdamCJAAiwjQJcHAC8ATs/OBg1Qy0y4ub6WPhb1cuPwUFycn9/77OPWlvXzeQGw2QPGQ9o/PhZrS0v3IPpooFrpwgChYniidq6fnTnvrBSaA3Uc3A/1uvPuSmEA0f0uFLsyBKcZDjaisvSj8DsFW6pbcHPQpV12WQoBCHhri4taEOGwhJAXjeeBgFebn1eyp0LKi1Ym0rCsXieRqLk06HVetFqJwHmWnRz3yotHzabT9n0hpRxGZ0SjjpGKCEQkxgUtWDlbCyMfIi/qTHMgrDf7srCem5mQDS5YQNKRD2vCuQLMhCVM3bwIiK4PLIUYqrp5EXPFeGWFALO8CEdGddId7NYOHWFQUa1cUO4Fty78/fZW6tFrjx7gqfqAT0PbmWAqVCwq+bDUOxMeyokh6L8B1J1kE2BgIkACJMDyAbSx56/cACV3CoyOjfX9rNSrcrI7E/qVYYCnYhKY3LXkJECVOdx+Us51m6Nwm7HVQyUCf4UGEJuFZPMgIhC+XlYfw21WWQ/GxXJ50q09iBS1MSjYW73ww3SXMVXOobsk4MU80GQZc5DQbl5tOzWRRpS8nJqy1tUAzWZ7ecvKDdfdggWfTV0GbdnA4JB1UdhbHjo0LesAS6YWa2GaCQRIgARIESABEiABUgRIgARYRoAVYtBWBfcL/xb8hwS6av8VYADVjF2M5sTWJAAAAABJRU5ErkJggg==" width="80" /></center></td>
 				<td style="text-align: left;" colspan="5" rowspan="2">
 				<span><strong style="font-size:16px;"> <?php echo $CompanyName; ?> </strong></span><br>
 				<span><?php echo $CompanyAddress; ?></span><br><br>
 				<span><strong>web: </strong><?php  echo $companyWebsit; ?></a> </span>
 				 
-				<span><strong>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PAN:</strong><?php echo $companyPan; ?> </span><br>
+				<span><strong>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PAN:</strong><?php echo $companyPan; ?> </span><br>
 				
 				<span><strong>Email: </strong><?php echo $companyEmail; ?> </span>
 				<span><strong>&nbsp;&nbsp;GSTIN: </strong><?php echo $companyGst; ?></span>
@@ -227,7 +226,7 @@
 				</td>
 				<td colspan="3"><strong>Our Reference : </strong><br> <?php echo $supRef; ?> </td> </tr>
 			<tr>
-				<td colspan="4" rowspan="2"><u><strong style="font-size:16px;">Shipped From:</strong></u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Vendor code: <?php echo $supplierVendor; ?> <!--data will come--><br /><?php echo $SuplierName?><br/><?php  echo $SuplierAddress ?> <br/><br /><strong>Email ID:</strong><?php echo $supplierEmail; ?> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>PAN:</strong> <?php echo $supplierPan; ?> <br ><strong>Contact :</strong><?php echo $supplierContact; ?> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>GSTIN:</strong><?php echo $supplierGst; ?> </td>
+				<td colspan="4" rowspan="2"><u><strong style="font-size:16px;">Shipped From:</strong></u><br /><?php echo $SuplierName?><br/><?php  echo $SuplierAddress ?> <br/><br /><strong>Email :</strong><?php echo $supplierEmail; ?><br><strong> Vendor code:</strong> <?php echo $supplierVendor; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>PAN:</strong> <?php echo $supplierPan; ?> <br ><strong>Contact :</strong><?php echo $supplierContact; ?> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>GSTIN:</strong><?php echo $supplierGst; ?> </td>
 				
 				<td rowspan="2" colspan="2"><u><strong style="font-size:16px;">Shipped To:</strong></u><br /><?php echo $CompanyAddress; ?><br> <strong>State code:</strong><?php echo $CompanyStateCode; ?></td><!--data should be come-->
 				<td colspan="6"><strong>Delivery</strong> :<br><?php echo $DeliveryDate.$DeliverySchedule;?></td>
@@ -259,15 +258,15 @@
 		<p>Please arrange to deliver the materials listed below as per schedule to our works</p>
 <table style="border-collapse: collapse; height: 36px; width: 100.3%;" border="1" cellspacing="0" cellpadding="0">
 		<tbody>
-		<tr>
-		<td style="text-align: center;"><strong>&nbsp;SNo</strong></td>
-		<td style="text-align: center;"><strong>ITEM CODE</strong></td>
-		<td style="text-align: center;"><strong>&nbsp;ITEM DESCRIPTION</strong></td> 
-		<td style="text-align: center;"><strong>HSN</strong></td>
-		<td style="text-align: center;">&nbsp;<strong>UOM</strong></td>
-		<td style="text-align: center;"><strong>&nbsp;QTY</strong></td>
-		<td style="text-align: center;">&nbsp;<strong>RATE Rs</strong></td>
-		<td style="text-align: center;">&nbsp;<strong>PER</strong></td>
+		<tr style="text-align: center;">
+		<td><strong>&nbsp;SNo</strong></td>
+		<td><strong>ITEM CODE</strong></td>
+		<td><strong>&nbsp;ITEM DESCRIPTION</strong></td> 
+		<td><strong>HSN</strong></td>
+		<td>&nbsp;<strong>UOM</strong></td>
+		<td><strong>&nbsp;QTY</strong></td>
+		<td>&nbsp;<strong>RATE Rs</strong></td>
+		<td>&nbsp;<strong>PER</strong></td>
 		</tr>
 		<?php
 								   if(!empty($POItem))
@@ -284,15 +283,23 @@
 
 							   ?>
 			 
-						<tr style="line-height: 1em;text-align: center;">
-						<td><?php echo $index ; ?></td>
-						<td style="text-align: left;"><?php echo $record->MaterialCode;?></td>
-						<td style="text-align: left;"><?php echo $record->MaterialName ; ?></td>
-						<td><?php if(!empty($record->HSNCODE)){echo $record->HSNCODE;}else {echo "NIL";}?></td>
-						<td><?php echo $record->UOM; ?></td>
-						<td><?php echo $record->Quantity ; ?></td>
-						<td><?php echo $record->Rate ; ?></td>
-						<td><?php echo $record->Per ; ?></td><!--per data should be come-->
+						<tr style="line-height: 1.9em;text-align: center;border: none;">
+						<td style="border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $index ; ?></td>
+						<td style="text-align: left;border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->MaterialCode;?></td>
+						<td style="text-align: left;border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->MaterialName ; ?></td>
+						<td style="border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php if(!empty($record->HSNCODE)){echo $record->HSNCODE;}else {echo "NIL";}?></td>
+						<td style="border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->UOM; ?></td>
+						<td style="border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->Quantity ; ?></td>
+						<td style="border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->Rate ; ?></td>
+						<td style="border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->Per ; ?></td><!--per data should be come-->
 						</tr>
 						<?php
 
@@ -445,7 +452,7 @@
 		<td style="text-align: center;"><strong>Total IGST Amount in RS</strong></td>
 		<td style="text-align: center;"><strong>Others in Rs</strong></td>
 		<td style="text-align: center;"><strong>Total Tax Amount in Rs</strong></td>
-		<td style="text-align: center;"><strong>Order value in Rs</strong></td>
+		<td style="text-align: center;"><strong>Order Value in Rs</strong></td>
 		</tr>
 		<tr style="text-align: right;">
                 <td><?php echo $TotalOrderValue; ?></td><!--data should be come-->
diff --git a/application/views/editdepartment.php b/application/views/editdepartment.php
old mode 100644
new mode 100755
diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php
index 78c334c0..db09d57d 100755
--- a/application/views/servicePurchaseorder.php
+++ b/application/views/servicePurchaseorder.php
@@ -829,7 +829,7 @@ function clearEditTaxField()
 	<div class="row">
 	<div class="col-md-12">	
 	<div class="col-md-3">
-	<div class="col-md-12" style="padding: 0px;">
+	<div class="col-md-6" style="padding: 0px;">
 	 
 
 	  <label>Service Type Options</label>
@@ -855,14 +855,8 @@ function clearEditTaxField()
 
 						?> 
 						</div>
-
-
-
-	</div> 
-	</div>
-	<div class="col-md-9" style="padding:0px;">
-	<div class="col-md-4" style="padding:0px;" >
-	<div class="col-md-12">
+ </div> 
+		<div class="col-md-6" style="padding-right:0px;">
  <label>Insurance Options</label>
 						<div class="form-group">
 						
@@ -889,23 +883,21 @@ function clearEditTaxField()
 
 	</div>
 	</div>
+	<div class="col-md-9" style="padding:0px;">
 	<div class="col-md-4" id="insuranceTxtDiv"  style="display:block;">
-                     <label>Insurance No<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
+	 
+                     <label>Insurance<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
                        <div class="form-group">                        
                            <?php
                             $data = array('name' => 'insuranceNo','value' => set_value('insuranceNo'),'id'=>'insuranceNo',  'class' => 'form-control' ,'required' => 'true');
                            echo form_input($data);
                            ?>  
                        </div>
+                        
                </div>
+	<div class="col-md-4" style="padding:0px;" >
+	<div class="col-md-12">
 	 
-	</div> 
-	</div>
-	</div><!--End new fields 1 sep-->
-
-
-	<div class="col-md-12" style="padding: 0px;">
-		   <div class="col-md-3">
 			    <label>Payment Terms</label> 
 				  
                         <?php
@@ -928,12 +920,11 @@ function clearEditTaxField()
                                                     echo form_dropdown('PaymentTerms', $options6,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');
 
                                                     ?>
-              
-
-                                    
-
-            </div>
-		<div class="col-md-3" id="otheroptiondiv" style="display:none;">
+                    </div>
+                    </div>
+	
+               <div class="col-md-4" id="otheroptiondiv" style="display:none;padding-left: 0px;">
+                
                      <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
                        <div class="form-group">                        
                            <?php
@@ -941,7 +932,18 @@ function clearEditTaxField()
                            echo form_input($data);
                            ?>  
                        </div>
-               </div>	
+
+               </div>
+
+	 
+	</div> 
+	</div>
+	</div><!--End new fields 1 sep-->
+
+
+	<div class="col-md-12" style="padding: 0px;">
+		   
+			
         
 			 
 	</div>
diff --git a/application/views/servicepopdf.php b/application/views/servicepopdf.php
index b3b613b9..6fb7922b 100755
--- a/application/views/servicepopdf.php
+++ b/application/views/servicepopdf.php
@@ -127,8 +127,8 @@
 		
          ?>
 <style>
-	@page { margin: 280px 25px 210px 25px; }
-	.header { position: fixed; left: 0px; top: -280px; right: 0px; height: 500px;text-align: center; }
+	@page { margin: 294px 25px 210px 25px; }
+	.header { position: fixed; left: 0px; top: -294px; right: 0px; height: 500px;text-align: center; }
 	.footer { position: fixed; bottom: 10px;}
 	.pagenum:before { content: counter(page); }
 </style>
@@ -197,7 +197,7 @@
 				<span><?php echo $CompanyAddress; ?></span><br><br>
 				<span><strong>web: </strong><?php  echo $companyWebsit; ?></a> </span>
 				 
-				<span><strong>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PAN:</strong> <?php echo $companyPan; ?></span><br>
+				<span><strong>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PAN:</strong> <?php echo $companyPan; ?></span><br>
 				
 				<span><strong>Email: </strong><?php echo $companyEmail; ?> </span>
 				<span><strong>&nbsp;&nbsp;GSTIN: </strong><?php echo $companyGst; ?></span>
@@ -218,7 +218,7 @@
 				</td>
 				<td colspan="3"><strong>Our Reference : </strong><br> <?php echo $supRef; ?></td> </tr>
 			<tr>
-				<td colspan="4" rowspan="2"><u><strong style="font-size:16px;">Shipped From:</strong></u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Vendor code: <?php echo $supplierVendor; ?><br /><?php echo $SuplierName?><br/><?php  echo $SuplierAddress ?> <br/><br /><strong>Email ID:</strong><?php echo $supplierEmail; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>PAN:</strong><?php echo $supplierPan; ?><br ><strong>Contact :</strong><?php echo $supplierContact; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>GSTIN:</strong><?php echo $supplierGst; ?></td>
+				<td colspan="4" rowspan="2"><u><strong style="font-size:16px;">Shipped From:</strong></u><br /><?php echo $SuplierName?><br/><?php  echo $SuplierAddress ?> <br/><br /><strong>Email :</strong><?php echo $supplierEmail; ?><br><strong>Vendor code:</strong> <?php echo $supplierVendor; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;<strong>PAN:</strong><?php echo $supplierPan; ?><br ><strong>Contact :</strong><?php echo $supplierContact; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>GSTIN:</strong><?php echo $supplierGst; ?></td>
 				
 				<td rowspan="2" colspan="2"><u><strong style="font-size:16px;">Shipped To:</strong></u><br /><?php echo $CompanyAddress;?><br> <strong>State code:</strong><?php echo $CompanyStateCode;?> </td> 
 				<td colspan="6"><strong>Delivery</strong> :<br><?php echo $DeliveryDate.$DeliverySchedule;?></td>
@@ -258,7 +258,13 @@
 		<td style="text-align: center;"><strong>RATE Rs</strong></td>
 		<td style="text-align: center;"><strong>PER</strong></td>
 		</tr>
-		<tr><td></td><td> <strong><?php echo $serviceDescription; ?></strong></td><td></td><td></td><td></td><td></td></tr>
+		<tr style="border: none;"><td style="border-right: solid 1px ;
+ border-left: solid 1px ;"></td><td style="border-right: solid 1px ;
+ border-left: solid 1px ;"> <strong><?php echo $serviceDescription; ?></strong></td><td style="border-right: solid 1px ;
+ border-left: solid 1px ;"></td><td style="border-right: solid 1px ;
+ border-left: solid 1px ;"></td><td style="border-right: solid 1px ;
+ border-left: solid 1px ;"></td><td style="border-right: solid 1px ;
+ border-left: solid 1px ;"></td></tr>
 			 <?php
 									if(!empty($POItem))
 									{
@@ -277,13 +283,19 @@
 											$BasicAmount = $BasicAmount + ($record->BasicValue * $record->NumberOfService);
 											}
 									?>
-						<tr style="line-height: 1em;">
-						<td style="text-align: center;"><?php echo $index ; ?></td>
-						<td><?php echo $record->ServiceMaterialDescription ; ?></td>
-						<td style="text-align: center;"><?php echo $record->UOM ; ?></td>
-						<td style="text-align: center;"><?php echo $record->Quantity ; ?>&nbsp;</td>
-						<td style="text-align: center;"><?php echo $record->Rate  ; ?>&nbsp;</td>
-						<td style="text-align: center;"><?php echo $record->Per; ?></td> 
+						<tr style="line-height: 1em;border: none;"">
+						<td style="text-align: center;border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $index ; ?></td>
+						<td style="border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->ServiceMaterialDescription ; ?></td>
+						<td style="text-align: center;border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->UOM ; ?></td>
+						<td style="text-align: center;border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->Quantity ; ?>&nbsp;</td>
+						<td style="text-align: center;border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->Rate  ; ?>&nbsp;</td>
+						<td style="text-align: center;border-right: solid 1px ;
+                         border-left: solid 1px ;"><?php echo $record->Per; ?></td> 
 						</tr>
 						<?php
 										$SubTotalAmount  = $SubTotalAmount + $TotalAmount;
@@ -392,21 +404,21 @@
 		<td colspan="4"  rowspan="3" width="50%">
 		<span><strong>Payment terms :</strong><br><?php echo $PaymentTerms ."&nbsp;&nbsp;".$PaymentOtherDescription;?></span>		 
 		</td>
-		<td style="text-align: center;"><strong>Total Amount Rs</strong></td>
+		<td style="text-align: center;"><strong>Total Amount in Rs</strong></td>
 		<td style="text-align: center;"><strong>Total CGST Amount in Rs</strong></td>
 		<td style="text-align: center;"><strong>Total SGST Amount in Rs</strong></td>
 		<td style="text-align: center;"><strong>Total IGST Amount in Rs</strong></td>
-		<td style="text-align: center;"><strong>Others Rs</strong></td>
-		<td style="text-align: center;"><strong>Total Tax Rs</strong></td>
-		<td style="text-align: center;"><strong>Order value Rs</strong></td>
+		<td style="text-align: center;"><strong>Others in Rs</strong></td>
+		<td style="text-align: center;"><strong>Total Tax in Rs</strong></td>
+		<td style="text-align: center;"><strong>Order value in Rs</strong></td>
 		</tr>
-		<tr>
-		<td style="text-align: right;"><?php echo number_format(($BasicAmount),2,'.','')?>&nbsp;</td>
-		<td style="text-align: right;"><?php echo number_format(($AfterCGST),2,'.','')?>&nbsp;</td> 
-		<td style="text-align: right;"><?php echo number_format(($AfterSGST),2,'.','')?>&nbsp;</td> 
-		<td style="text-align: right;"><?php echo number_format(($AfterIGST),2,'.','')?>&nbsp;</td>
-		<td style="text-align: center;"><?php echo number_format(($otherallowances),2,'.','')?>&nbsp;</td>
-		<td style="text-align: right;"><?php echo number_format(($AfterCGST+$AfterSGST+$AfterIGST),2,'.','')?>&nbsp;</td>
+		<tr style="text-align: right;">
+		<td><?php echo number_format(($BasicAmount),2,'.','')?>&nbsp;</td>
+		<td><?php echo number_format(($AfterCGST),2,'.','')?>&nbsp;</td> 
+		<td><?php echo number_format(($AfterSGST),2,'.','')?>&nbsp;</td> 
+		<td><?php echo number_format(($AfterIGST),2,'.','')?>&nbsp;</td>
+		<td><?php echo number_format(($otherallowances),2,'.','')?>&nbsp;</td>
+		<td><?php echo number_format(($AfterCGST+$AfterSGST+$AfterIGST),2,'.','')?>&nbsp;</td>
 		<td style="text-align: right;"><?php echo number_format(($BasicAmount+$AfterCGST+$AfterSGST+$AfterIGST+$otherallowances),2,'.','')?>&nbsp;</td>
 		</tr>
 		<tr>