From 99bc81ee5638bff29da89909efb361c632c2bff9 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 3 Aug 2017 12:38:58 +0530
Subject: [PATCH] import,amendment import,advance

---
 application/controllers/amendmentpurchaseorder.php | 4 ++--
 application/controllers/purchaseorder.php          | 4 ++--
 application/models/purchaseorder_model.php         | 3 ++-
 application/views/Amendedimportpopdf.php           | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index 087feaaf..7a84dfa4 100755
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -1460,7 +1460,7 @@ function CreateAmendPOPrint()
                        
                         $totalAmt=sprintf("%.2f", $TotalOrderValue);
                     
-                       // $data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal);
+                  $data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal);
                            
 
                           $this->load->View("Amendedimportpopdf", $data);
@@ -1480,7 +1480,7 @@ function CreateAmendPOPrint()
          $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/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 87293b62..6feb9855 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -168,8 +168,8 @@ class purchaseorder extends BaseController
 			foreach ($FiscalYear as $Fy)
 			{
 				$FYStart =$Fy->StartYear;
-				//$FYEnd =$Fy->EndYear;
-        $FYEnd=$FYStart+1;
+				$FYEnd =$Fy->EndYear;
+        //$FYEnd=$FYStart+1;
 			}
 				
 			}
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index 30387810..95dc3d7c 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -1509,7 +1509,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
 
      function getadvancePONO($Status='')
     {
-        $this->db->select ('Mast.PONO,POType,Mast.CreatedDate,Mast.ReleasedOn,Mast.TotalOrderValue,Mast.SupplierID,DeliveryDate,DeliverySchedule,DeliveryOption,Mast.PaymentTerms,LineItem.ReqNo,Requestedby,Departmentcode,DepartmentName,LineItem.CostCenterCode,SupDet.SupplierName,Import_DispatchDetails,CurrencyType,AdvancePercentage,AdvanceAmount,POAdv.Remarks');
+        $this->db->select ('Mast.PONO,POType,Mast.CreatedDate,Mast.ReleasedOn,Mast.TotalOrderValue,Mast.SupplierID,DeliveryDate,DeliverySchedule,DeliveryOption,Mast.PaymentTerms as Paycode,Payterm.PaymentTerms,LineItem.ReqNo,Requestedby,Departmentcode,DepartmentName,LineItem.CostCenterCode,SupDet.SupplierName,Import_DispatchDetails,CurrencyType,AdvancePercentage,AdvanceAmount,POAdv.Remarks');
         $this->db->from('T_PurchaseOrder_Master Mast');
         $this->db->join('T_PurchaseOrder_LineItem LineItem','Mast.PONO=LineItem.PONO');
         $this->db->join('T_Requestion_Master ReqMa','LineItem.ReqNo=ReqMa.ReqNo');
@@ -1517,6 +1517,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
         $this->db->join('T_DepartmentDetails DepDet','EmpDet.Departmentcode=DepDet.DEPCode');
         $this->db->join('T_SupplierDetailsN SupDet','Mast.SupplierID=SupDet.SupplierID');
         $this->db->join('T_PurchaseOrder_AdvanceRequest POAdv','Mast.PONO=POAdv.PONO','left');
+        $this->db->join('T_PaymentTerms Payterm','Mast.PaymentTerms=Payterm.PaymentID');
         $this->db->where('Mast.Status',$Status);
         $query = $this->db->get();
         //print_r($this->db->last_query());
diff --git a/application/views/Amendedimportpopdf.php b/application/views/Amendedimportpopdf.php
index 3a907364..5903e4b8 100755
--- a/application/views/Amendedimportpopdf.php
+++ b/application/views/Amendedimportpopdf.php
@@ -53,8 +53,8 @@
 		     $TotalOrderValue1=$PO->TotalOrderValue;
 		      
 		     $PaymentTerms = $PO->PaymentTerms;
-             $PaymentDays=$PO->PaymentDays;
-             $PayableAT=$PO->PayableAT;
+             //$PaymentDays=$PO->PaymentDays;
+             //$PayableAT=$PO->PayableAT;
              $PlaceofOrigin=$PO->Import_PlaceofOrgin;
 	        }
         }