From 6db9e9bbd73d4335fa2f95502e8830d880fd1ddb Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 8 Aug 2017 11:28:39 +0530
Subject: [PATCH] import

---
 application/models/purchaseorder_model.php | 2 +-
 application/views/Amendedimportpopdf.php   | 2 +-
 application/views/editImportAmendPO.php    | 8 ++++----
 application/views/editimportpo.php         | 2 +-
 application/views/importpopdf.php          | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index 18615f1e..0c6dd912 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -738,7 +738,7 @@ function GetImportPurchaseOrderDetailsForPDF($PONO = '')
 
 		$subQuery='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName,Import_DispatchDetails,
 Mat.UOM,Quantity,ReqMas.Requestedby,Rate,ROUND((RMCIncludingCustomersPerKG*Quantity),2)as  Taxamount 	,
-ProductPrice,Tax.*,LineItem.CostCenterCode ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,AdvanceAmount, Pay.PaymentTerms as Pay
+ProductPrice,Tax.*,LineItem.CostCenterCode ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,AdvanceAmount, Pay.PaymentTerms as Pay,ROUND((Quantity *Rate),2 ) as BasicValue
 FROM T_PurchaseOrder_LineItem LineItem 
 join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo
 join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
diff --git a/application/views/Amendedimportpopdf.php b/application/views/Amendedimportpopdf.php
index 0fa3cdb6..db25aa48 100755
--- a/application/views/Amendedimportpopdf.php
+++ b/application/views/Amendedimportpopdf.php
@@ -146,7 +146,7 @@
 </tr>
 <tr>
 <td>PO DATE :&nbsp;<?php echo $Podt?></td>
-<td>DELIVERY DATE / SCHEDULE BY :&nbsp;<?php echo $DeliveryDate.$DeliverySchedule;?></td>
+<td> DISPATCH INSTRUCTION/SCHEDULE BY :&nbsp;<?php echo $DeliveryDate.$DeliverySchedule;?></td>
 <td>PLACE OF ORIGIN:&nbsp; <?php echo $PlaceofOrigin;?></td>
 </tr>
 </tbody>
diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index de5f1a3b..1c7d0df0 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -1342,7 +1342,7 @@ if(!empty($RequistionDetails))
 
 
 
-<input type="hidden" name="<?php echo 'ProductPrice'.$index ?>" id="<?php echo 'ProductPrice'.$index ?>" value="<?php echo $record->ProductPrice ; ?>" />
+<input type="hidden" name="<?php echo 'ProductPrice'.$index ?>" id="<?php echo 'ProductPrice'.$index ?>" value="<?php echo $record->BasicValue ; ?>" />
 <input type="hidden" name="<?php echo 'beforeProductPrice'.$index ?>" id="<?php echo 'beforeProductPrice'.$index ?>" value="<?php echo $record->ProductPrice ; ?>" />
 
 
@@ -3109,7 +3109,7 @@ $('.EditImport').click(function(){
    var TotalExp=$('#EdittxtBasicValue').val();
 //alert(itemRate);
 
-//console.log(TotalExp);
+///console.log(TotalExp);
 
    var tr= document.getElementById(userid);
    var cellval = tr.cells; 
@@ -3257,8 +3257,8 @@ var Grossexpenses=$('#Grossexpensesduetocustomduty'+rowid).val()==''?'0.00':$('#
 //var Totalvalue=$('#TotalValue'+rowid).val()==''?'0.00':$('#TotalValue'+rowid).val();
 
 var Total= $('#ProductPrice'+rowid).val() == '' ? '0.00' : $('#ProductPrice'+rowid).val();
-// console.log(rowid);
-// console.log(Total);
+console.log(rowid);
+console.log(Total);
 //var RMC=$('#RMCIncludingCustomers'+rowid).val()==''?'0.00':$('#RMCIncludingCustomers'+rowid).val();
 
 //console.log(Totalvalue);
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 76b85f68..f6bc454b 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -2465,7 +2465,7 @@ if($PONOStatus == PO_RELEASED)
                                 $totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
                                 $ExchangeRate=$record->ExchangeRate;
                                 //$totorder=$totorder+$record->ProductPrice;
-                                $totorder=$totorder+$record->ProductPrice;
+                                $totorder=$totorder+$record->BasicValue;
                                 //$ServiceDescription=$record->ServiceDescription;
 
                                  //alert($totorder);
diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php
index a78d0190..a53bdd0a 100755
--- a/application/views/importpopdf.php
+++ b/application/views/importpopdf.php
@@ -151,7 +151,7 @@
 </tr>
 <tr>
 <td>PO DATE :&nbsp;&nbsp;<?php echo $Podt?></td>
-<td>DELIVERY DATE / SCHEDULE BY :&nbsp;&nbsp;<?php echo $Import_DispatchDetails.$DeliverySchedule;?></td>
+<td>DISPATCH INSTRUCTION/ SCHEDULE BY :&nbsp;&nbsp;<?php echo $Import_DispatchDetails.$DeliverySchedule;?></td>
 <td>PLACE OF ORIGIN:&nbsp;&nbsp;<?php echo $Placeoforigin; ?></td>
 </tr>
 </tbody>
@@ -263,7 +263,7 @@
 									$CustomDutyExpensesPerKG = $CustomDutyExpensesPerKG+$record->CustomDutyExpensesPerKG ;
 									$RMCIncludingCustomersPerKG = $RMCIncludingCustomersPerKG+$record->RMCIncludingCustomersPerKG ;
 									$AfterExciseDutySHCess= $AfterExciseDutySHCess+$record->AfterExciseDutySHCess ;
-									$TotalOrderValue = $TotalOrderValue+$record->ProductPrice;
+									$TotalOrderValue = $TotalOrderValue+$record->BasicValue;
 								}
 								}
 								
@@ -281,7 +281,7 @@
 		<table  style="border-collapse: collapse;" cellpadding="0" cellspacing="0" border="1" width="100%">
         <tbody>
         <tr>
-        <td style="text-align: center;" ><strong>Total Amount In Words</strong><br /><br /><em><?php echo $TotalAmountInWords." "."Only.";?></em></td>
+        <td style="text-align: center;" ><strong>Total Amount In Words</strong><br /><br /><em><?php echo $TotalAmountInWords." ";?></em></td>
         <td style="text-align: center;" ><strong>Total Amount In <?php echo "$CurrencyCode ($CurrencyName)" ;?>   <?php echo  $TotalOrderValue;?> </strong></td>
         </tr>