SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import bug fix

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-07-24 14:24:40 +05:30
parent e42d77d257
commit 01272c76f3
3 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/purchaseorder.php
View File

@ -339,7 +339,8 @@ class purchaseorder extends BaseController
$data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO); $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO); // $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
$data['PaymentTerms']=$this->purchaseorder_model->getPaymentTermsDetails();
//$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019'); //$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
$data['WorkStatus']=$this->purchaseorder_model->getStatus(7); $data['WorkStatus']=$this->purchaseorder_model->getStatus(7);

36
application/views/editimportpo.php
View File

@ -107,6 +107,7 @@ $ExchangeRateCalculatedon='';
$StatusName=''; $StatusName='';
$Import_DispatchDetails=''; $Import_DispatchDetails='';
$Import_PlaceofOrgin=''; $Import_PlaceofOrgin='';
$DeliveryOption='';
if(!empty($POMaster)) if(!empty($POMaster))
{ {
@ -139,10 +140,11 @@ if(!empty($POMaster))
$Import_DispatchDetails=$Req->Import_DispatchDetails; $Import_DispatchDetails=$Req->Import_DispatchDetails;
$Import_PlaceofOrgin=$Req->Import_PlaceofOrgin; $Import_PlaceofOrgin=$Req->Import_PlaceofOrgin;
$PaymentTerms=$Req->PaymentTerms; $PaymentTerms=$Req->PaymentTerms;
$DeliveryOption=$Req->DeliveryOption;
} }
} }
//echo $ServiceDescription; //echo $DeliveryOption;
//echo $StatusName; //echo $PaymentTerms;
if(!empty($RequistionDetails)) if(!empty($RequistionDetails))
@ -534,7 +536,7 @@ body {
foreach ($PaymentTerms as $Pay): foreach ($PaymentTerms as $Pay):
if($PaymentTerms==$Pay->PaymentTerms){ if($PaymentTerms==$Pay->PaymentTerms){
$options1[$Pay->PaymentTerms] = $Pay->PaymentTerms; $options1[$Pay->PaymentTerms] = $Pay->PaymentTerms;
} }
@ -543,7 +545,7 @@ body {
foreach ($PaymentTerms as $Pay): foreach ($PaymentTerms as $Pay):
if($PaymentTerms!=$Pay->PaymentTerms){ if($PaymentTerms!=$Pay->PaymentTerms){
$options1[$Pay->PaymentTerms] = $Pay->PaymentTerms; $options1[$Pay->PaymentTerms] = $Pay->PaymentTerms;
} }
@ -2464,8 +2466,8 @@ if($PONOStatus == PO_RELEASED)
$totcustomSH = $totcustomSH + $record->AfterCustomSHCess; $totcustomSH = $totcustomSH + $record->AfterCustomSHCess;
$totaddtnlexcise= $totaddtnlexcise + $record->AfterAddlExciseDuty; $totaddtnlexcise= $totaddtnlexcise + $record->AfterAddlExciseDuty;
$totgrossduty = $totgrossduty + $record->Grossdutypayable; $totgrossduty = $totgrossduty + $record->Grossdutypayable;
$totavlmodvat = $totavlmodvat +$record->AvailableModvat; // $totavlmodvat = $totavlmodvat +$record->AvailableModvat;
$totgrossduty=$totgrossduty+$record->Grossdutypayable; //$totgrossduty=$totgrossduty+$record->Grossdutypayable;
$totavlmodvat=$totavlmodvat+$record->AvailableModvat; $totavlmodvat=$totavlmodvat+$record->AvailableModvat;
$totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty; $totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
$ExchangeRate=$record->ExchangeRate; $ExchangeRate=$record->ExchangeRate;
@ -2776,6 +2778,19 @@ var NilType = '<?php echo NILTYPE;?>';
}; };
var delivery=<?php echo json_encode($DeliveryOption,JSON_PRETTY_PRINT)?>;
if(delivery==1)
{
document.getElementById("Schedule").checked = true;
$('#Deliverydtdiv').hide();
$('#Schedulediv').show();
}
else
{
document.getElementById("Date").checked = true;
$('#Deliverydtdiv').show();
$('#Schedulediv').hide();
}
// var paymentday=<?php echo json_encode($PaymentDays,JSON_PRETTY_PRINT)?> // var paymentday=<?php echo json_encode($PaymentDays,JSON_PRETTY_PRINT)?>
// if (paymentday=="After") // if (paymentday=="After")
// { // {
@ -4577,6 +4592,8 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck())
var RMC=$("#EditRMCIncludingCustomers").val(); var RMC=$("#EditRMCIncludingCustomers").val();
var TotalExp=$('#EdittxtBasicValue').val(); var TotalExp=$('#EdittxtBasicValue').val();
//alert(itemRate); //alert(itemRate);
//console.log(GrossDuty);
var tr= document.getElementById(userid); var tr= document.getElementById(userid);
var cellval = tr.cells; var cellval = tr.cells;
@ -4844,6 +4861,9 @@ TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat(totalExp);
function Save(status) function Save(status)
{ {
//alert(); //alert();
@ -4937,10 +4957,12 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
$.each(Detail, function (index, value) $.each(Detail, function (index, value)
{ {
$("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
$("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
} ); } );

9
application/views/importpopdf.php
View File

@ -58,10 +58,11 @@
$Import_DispatchDetails=$PO->Import_DispatchDetails; $Import_DispatchDetails=$PO->Import_DispatchDetails;
// $PaymentDays=$PO->PaymentDays; // $PaymentDays=$PO->PaymentDays;
// $PayableAT=$PO->PayableAT; // $PayableAT=$PO->PayableAT;
$DeliverySchedule=$PO->DeliverySchedule;
} }
} }
//echo $DeliverySchedule;
if(!empty($Requestername)) if(!empty($Requestername))
{ {
@ -230,7 +231,9 @@
<td align="right"><?php echo number_format(($record->Rate),2) ; ?></td> <td align="right"><?php echo number_format(($record->Rate),2) ; ?></td>
<td align="right"><?php $BasicValue=($record->Quantity*$record->Rate); <td align="right"><?php $BasicValue=($record->Quantity*$record->Rate);
echo number_format($BasicValue,2) ; ?></td> echo number_format($BasicValue,2) ; ?></td>
<td align="right"><?php echo number_format(($record->TotalOrderValue),2); ?></td> <!-- <td align="right"><?php echo number_format(($record->TotalOrderValue),2); ?></td> -->
<td align="right"><?php $BasicValue=($record->Quantity*$record->Rate);
echo number_format($BasicValue,2) ; ?></td>
</tr> </tr>
@ -252,7 +255,7 @@
$CustomDutyExpensesPerKG = $CustomDutyExpensesPerKG+$record->CustomDutyExpensesPerKG ; $CustomDutyExpensesPerKG = $CustomDutyExpensesPerKG+$record->CustomDutyExpensesPerKG ;
$RMCIncludingCustomersPerKG = $RMCIncludingCustomersPerKG+$record->RMCIncludingCustomersPerKG ; $RMCIncludingCustomersPerKG = $RMCIncludingCustomersPerKG+$record->RMCIncludingCustomersPerKG ;
$AfterExciseDutySHCess= $AfterExciseDutySHCess+$record->AfterExciseDutySHCess ; $AfterExciseDutySHCess= $AfterExciseDutySHCess+$record->AfterExciseDutySHCess ;
$TotalOrderValue = $TotalOrderValue+$record->BasicPriceInMTon; $TotalOrderValue = $TotalOrderValue+$record->ProductPrice;
} }
} }