SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import,amendment import,advance

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-03 12:38:58 +05:30
parent 0d9d042a34
commit 99bc81ee56
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/amendmentpurchaseorder.php
View File

@ -1460,7 +1460,7 @@ function CreateAmendPOPrint()
$totalAmt=sprintf("%.2f", $TotalOrderValue); $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); $this->load->View("Amendedimportpopdf", $data);
@ -1480,7 +1480,7 @@ function CreateAmendPOPrint()
$this->dompdf->load_html($php); $this->dompdf->load_html($php);
$this->dompdf->render(); $this->dompdf->render();
$data['Attachment'] = FALSE; $data['Attachment'] = FALSE;
$this->dompdf->stream("ImportPOReport.pdf",$data,$php); //$this->dompdf->stream("ImportPOReport.pdf",$data,$php);
} }

4
application/controllers/purchaseorder.php
View File

@ -168,8 +168,8 @@ class purchaseorder extends BaseController
foreach ($FiscalYear as $Fy) foreach ($FiscalYear as $Fy)
{ {
$FYStart =$Fy->StartYear; $FYStart =$Fy->StartYear;
//$FYEnd =$Fy->EndYear; $FYEnd =$Fy->EndYear;
$FYEnd=$FYStart+1; //$FYEnd=$FYStart+1;
} }
} }

3
application/models/purchaseorder_model.php
View File

@ -1509,7 +1509,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
function getadvancePONO($Status='') 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->from('T_PurchaseOrder_Master Mast');
$this->db->join('T_PurchaseOrder_LineItem LineItem','Mast.PONO=LineItem.PONO'); $this->db->join('T_PurchaseOrder_LineItem LineItem','Mast.PONO=LineItem.PONO');
$this->db->join('T_Requestion_Master ReqMa','LineItem.ReqNo=ReqMa.ReqNo'); $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_DepartmentDetails DepDet','EmpDet.Departmentcode=DepDet.DEPCode');
$this->db->join('T_SupplierDetailsN SupDet','Mast.SupplierID=SupDet.SupplierID'); $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_PurchaseOrder_AdvanceRequest POAdv','Mast.PONO=POAdv.PONO','left');
$this->db->join('T_PaymentTerms Payterm','Mast.PaymentTerms=Payterm.PaymentID');
$this->db->where('Mast.Status',$Status); $this->db->where('Mast.Status',$Status);
$query = $this->db->get(); $query = $this->db->get();
//print_r($this->db->last_query()); //print_r($this->db->last_query());

4
application/views/Amendedimportpopdf.php
View File

@ -53,8 +53,8 @@
$TotalOrderValue1=$PO->TotalOrderValue; $TotalOrderValue1=$PO->TotalOrderValue;
$PaymentTerms = $PO->PaymentTerms; $PaymentTerms = $PO->PaymentTerms;
$PaymentDays=$PO->PaymentDays; //$PaymentDays=$PO->PaymentDays;
$PayableAT=$PO->PayableAT; //$PayableAT=$PO->PayableAT;
$PlaceofOrigin=$PO->Import_PlaceofOrgin; $PlaceofOrigin=$PO->Import_PlaceofOrgin;
} }
} }