diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php index de5f688f..46b18d84 100755 --- a/application/views/editCapitalAmendPO.php +++ b/application/views/editCapitalAmendPO.php @@ -2,7 +2,9 @@ $insuranceStatus = array( array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1") ); - $requestedBy=$requestedBy[0]->FirstName; + + $requestedBy=$requestedBy[0]->FirstName; + // $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); // $CurrentDate = $dt->format('Y-m-d'); $res_arr_values = array(); @@ -113,8 +115,10 @@ if(!empty($POMaster)) $pdt = new DateTime($Req->PODate); $PODate = $pdt->format('d-m-Y'); $DeliverOption = $Req->DeliveryOption; + //echo $DeliverOption; $DeliverSchedule = $Req->DeliverySchedule; + //echo $DeliverSchedule; // $Deliverydt=$Req->DeliveryDate; if(!empty($Req->DeliveryDate)) { @@ -287,7 +291,7 @@ window.onload = function() document.getElementById('dispatchinternational').style.display = 'none'; document.getElementById('placeoforgin').style.display = 'none'; document.getElementById('datedomestic').style.display = 'block'; - document.getElementById('deliverydateby').style.display = 'none'; + //document.getElementById('deliverydateby').style.display = 'none'; capitalType='Domestic'; @@ -531,7 +535,7 @@ document.getElementById('dispatchinternational').style.display = 'block'; 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); + $data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverSchedule),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); echo Form_textarea($data); ?> @@ -3142,12 +3146,12 @@ var capitalrange=; var basicamt=0; //alert(ExchangeRate+"-"+AvlBudAmt+"-"+capitalrange); if(capitalrange == 0){//international -basicamt=($('#CapitalToatlOrder').val() * ExchangeRate); -alert(basicamt); +//basicamt=($('#CapitalToatlOrder').val() * ExchangeRate); +//alert(basicamt); } else if(capitalrange == 1){//domestic -basicamt=$('#txtTotalBasic').val() - $('#txtTotalDiscount').val(); -alert(basicamt); +//basicamt=$('#txtTotalBasic').val() - $('#txtTotalDiscount').val(); +//alert(basicamt); } if(validate()) @@ -3187,7 +3191,7 @@ alert(basicamt); data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&PaymentDate="+PaymentDate, type:"POST", - //url:"amendmentpurchaseorder/EditAmendCapitalPurchaseOrder", + url:"amendmentpurchaseorder/EditAmendCapitalPurchaseOrder", success:function(data) { if(data) diff --git a/application/views/payslipgenerateprint.php b/application/views/payslipgenerateprint.php index f80fff32..ed316f5d 100755 --- a/application/views/payslipgenerateprint.php +++ b/application/views/payslipgenerateprint.php @@ -304,5 +304,5 @@ if($RecCount > 0)
+ \ No newline at end of file