From 119d6f02f5ff3af4c54e57b12ee8a0409617b8a9 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 13 Jul 2017 10:23:29 +0530
Subject: [PATCH] service description

---
 application/controllers/purchaseorder.php |  6 ++--
 application/views/editimportpo.php        | 42 +++++++++++++++++++++--
 application/views/importpopdf.php         |  6 ++--
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 4b26b53a..c04fe188 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -1056,7 +1056,7 @@ public function importpoprint($PONO)
 				$Currencycode='';
             $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
             $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO);
-           // print_r( $data['POItem']);
+           //print_r( $data['POItem']);
             foreach ($data['POItem'] as $Reqdby) 
             {
                 $Requester=$Reqdby->Requestedby;
@@ -1137,7 +1137,7 @@ public function importpoprint($PONO)
 
 
             // Add header to pdf
-         $this->load->view('includes/pdffooter');
+        //s $this->load->view('includes/pdffooter');
             
             // Get output html
           $php = $this->output->get_output();
@@ -1150,7 +1150,7 @@ public function importpoprint($PONO)
             $this->dompdf->load_html($php);
             $this->dompdf->render();
             $data['Attachment'] = FALSE;
-           $this->dompdf->stream("ImportPOReport.pdf",$data,$php); 
+           //$this->dompdf->stream("ImportPOReport.pdf",$data,$php); 
           
 }
 
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 304ba9f5..705b1c83 100644
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -2564,13 +2564,25 @@ if($PONOStatus == PO_RELEASED)
 <script type="text/html" id="ImportList">
 <tr  id="<%=index%>">
 <td align="left"><%=index%></td>
+ <td align="left"><%=ReqNo%></td>
+ <td align="left"><%=MaterialCode%></td>
+ 
+  <td align="left"><%=Description%></td>
+  <td align="left"><%=Quantity%></td> 
+  <td align="left"><%=UOM%></td>
+   <td align="left"><%=Rate%></td>
+    <td align="left"><%=BasicAmount%></td>
+    <td align="left"><%=ReceivedQty%></td>
+    <td align="left"><%=RejectedQty%></td>
+    <td align="left"><%=PendingQty%></td>
+<!-- <td align="left"><%=index%></td>
  <td align="left"><%=ReqNo%></td>
  
   <td align="left"><%=ItemName%></td>
   <td align="left"><%=Quantity%></td> 
   <td align="left"><%=UOM%></td>
    <td align="left"><%=Rate%></td>
-    <td align="left"><%=BasicAmount%></td>
+    <td align="left"><%=BasicAmount%></td> -->
     <!-- <td align="left"><%=Taxvalue%></td>
     <td align="left"><%=TotalValue%></td> -->
     
@@ -2927,6 +2939,29 @@ function Ratechange(){
       var txtUnitPrice = parseFloat($('#Rate').val());
       var Tot =  txtQuantity * txtUnitPrice
       $('#txtBasicValue').val(Tot);
+
+
+      $('#imBasicPrice').val(Math.round(Tot));
+
+
+      var txtbasics=parseFloat($('#imBasicPrice').val());
+       var txtexchangerate=parseFloat($('#ExchangeRate').val());
+       $('#ExchangeRt').val(txtexchangerate);
+       var txtINRvalue=txtbasics*txtexchangerate;
+       $('#INRBasicvalues').val(txtINRvalue)
+       $('#INRBasicvalue').val(Math.round(txtINRvalue));
+       $('#BasicPriceTax').val(txtINRvalue);
+       //txtINR = Math.ceil(txtINR*10)/10;
+       txtINR = Math.round(txtINRvalue);
+       //alert(txtINR);BasicPriceTax
+       
+      $('#AfterBasicPriceTax').val(txtINR);
+      $('#imBasicPrice').val(txtbasics);
+      $('#ExchangeRt').val(txtexchangerate);
+      $('#EditAfterBasicPriceTax').val(txtINR);
+      $('#EditimBasicPrice').val(txtbasics);
+      $('#EditExchangeRt').val(txtexchangerate);
+      $('#EditINRBasicvalue').val(txtINRvalue);
      }
 }
 
@@ -3799,6 +3834,9 @@ $('.AddImport').click(function()
     var purate=$("#purchaserate").val();
     var CustomDutyExpense=$("#CustomDutyExpenses").val();
     var RMCIncluderate=$("#RMCIncludingCustomers").val();
+    var receivedqty='';
+    var rejectedqty='';
+    var pendingqty='';
     $('#MaterialCode option[value='+materialCode+']').remove();
     
     
@@ -3819,7 +3857,7 @@ $('.AddImport').click(function()
                
   //alert('in');
    var template = jQuery("#ImportList").html();
-   $('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,ItemName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp}));
+   $('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,Description:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp,ReceivedQty:receivedqty,RejectedQty:rejectedqty,PendingQty:pendingqty}));
    //alert(JSON.strigify(BasicAmt));
 
     
diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php
index 519fe41e..dccb03f3 100755
--- a/application/views/importpopdf.php
+++ b/application/views/importpopdf.php
@@ -126,7 +126,7 @@
 		 
 		  
 		<table style="border-collapse: collapse;font-size:12px;"  cellpadding="0" cellspacing="0" border="1" width="100%">
-			  <tr><th>Payment Terms</th><th>Payable At</th><th>Payment Days</th><th>Delivery Date</th><th>PO Date</th></tr>
+			  <!-- <tr><th>Payment Terms</th><th>Payable At</th><th>Payment Days</th><th>Delivery Date</th><th>PO Date</th></tr> -->
 			  <tr><td><?php echo $PaymentTerms;?></td><td><?php echo $PayableAT;?></td><td><?php echo $PaymentDays;?></td><td><?php echo $DeliveryDate;?></td><td><?php echo $Podt?></td></tr>
 		</table> 
 		  <br/>
@@ -359,7 +359,9 @@
 					<td>Requisted Department :<br/><?php echo $DEPNAME?></td>
 					<td>Cost center :<br/><?php echo $CostCenterCode?></td>
 				</tr>			 
-			</table>			  		 
+			</table>
+			<p>
+		<div align="Left"> <b>Service Description:</b><br/><br/><?php echo $ServiceDescription;?></div></p>			  		 
 </div>	
 	
  
\ No newline at end of file