issues fixed

This commit is contained in:
venbatechnologies@gmail.com 2017-08-08 13:46:17 +05:30
parent a3f7bc8cd3
commit a808571038
2 changed files with 9 additions and 1 deletions

View File

@ -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));

View File

@ -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;