From de3a40ad3a220ac2ca287ace96b1f5053d2f5e4e Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 27 Sep 2017 11:47:29 +0530 Subject: [PATCH] advance request issue for capital po --- application/models/purchaseorder_model.php | 2 +- application/views/advancerequest.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 15378f34..366023e7 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -1548,7 +1548,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 as Paycode,Payterm.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,Mast.CapitalRange'); $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'); diff --git a/application/views/advancerequest.php b/application/views/advancerequest.php index d0a46256..00707189 100755 --- a/application/views/advancerequest.php +++ b/application/views/advancerequest.php @@ -241,6 +241,11 @@ var PONUM=$('#PurchaseOrderNumber').val(); var currency=obj.CurrencyType; + + if(obj.CapitalRange==1) + { + currency='INR'; + } var deloption=obj.DeliveryOption;