From a8085710387ecb24f3c61d66b73fe7b3a9e70536 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 8 Aug 2017 13:46:17 +0530 Subject: [PATCH] issues fixed --- application/views/editimportpo.php | 2 +- application/views/mrirservicepopdf.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index f6bc454b..1d4e4f20 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -4086,7 +4086,7 @@ $('.AddImport').click(function() //alert('in'); var template = jQuery("#ImportList").html(); - $('#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})); + $('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,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/mrirservicepopdf.php b/application/views/mrirservicepopdf.php index a037092a..f519f3d1 100755 --- a/application/views/mrirservicepopdf.php +++ b/application/views/mrirservicepopdf.php @@ -67,7 +67,15 @@ $dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata')); $Podt = $dt->format('d-m-Y'); $dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata')); + if($PO->DeliveryOption=='1'){ + $DeliveryDate = ''; + $DeliverySchedule = $PO->DeliverySchedule; + } + else{ + $dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata')); $DeliveryDate = $dtDe->format('d-m-Y'); + $DeliverySchedule = ''; + } $ServiceDescription =$PO->ServiceDescription; if($PO->PaymentID!='PT08'){ $PaymentTerms = $PO->PaymentTerms;