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

ALL PDF DRAFT STATUS AND ADVANCE AMOUNT ISSUE FIXED

Browse Source
This commit is contained in:
velz2020 2017-08-19 20:13:56 +05:30
parent 67fc3325ce
commit 742cbe12fa
7 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/amendmentpurchaseorder.php
View File

@ -860,6 +860,7 @@ function UpdateAmendServicePurchaseOrder()
$CapitalRange = '0';
$ExchangeRateOn = $this->input->post('ExchangeRateOn');
$ExchangeRateOn = $this->getDateformat($ExchangeRateOn);
$ExchangeRate=$this->input->post('ExchangeRt');
}
@ -1052,7 +1053,7 @@ function UpdateAmendServicePurchaseOrder()
//echo "Service";
//print_r($ServiceTax);
$ImportTaxList = array('LineItemNo'=>$LineItemNo, 'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem);
print_r($ImportTaxList);
//print_r($ImportTaxList);
//die();

8
application/controllers/purchaseorder.php
View File

@ -1020,7 +1020,7 @@ $AdvanceAmount=0.00;
$this->dompdf->load_html($php);
$this->dompdf->render();
$data['Attachment'] = FALSE;
$this->dompdf->stream("RevenuePOReport.pdf",$data,$php);
$this->dompdf->stream("RevenuePOReport".$PONO.".pdf",$data,$php);
}
@ -1086,7 +1086,7 @@ $AdvanceAmount=0.00;
$this->dompdf->load_html($php);
$this->dompdf->render();
$data['Attachment'] = FALSE;
$this->dompdf->stream("ServicePOReport.pdf",$data,$php);
$this->dompdf->stream("ServicePOReport".$PONO.".pdf",$data,$php);
}
@ -1214,7 +1214,7 @@ public function importpoprint($PONO)
$this->dompdf->load_html($php);
$this->dompdf->render();
$data['Attachment'] = FALSE;
$this->dompdf->stream("ImportPOReport.pdf",$data,$php);
$this->dompdf->stream("ImportPOReport".$PONO.".pdf",$data,$php);
}
@ -2360,7 +2360,7 @@ function addNewImportPurchaseOrder()
$this->dompdf->load_html($php);
$this->dompdf->render();
$data['Attachment'] = FALSE;
$this->dompdf->stream("CapitalPOReport.pdf",$data,$php);
$this->dompdf->stream("CapitalPOReport".$PONO.".pdf",$data,$php);
}

14
application/views/capitalpopdf.php
View File

@ -105,13 +105,13 @@
<div class="header">
<div style="text-align:right;">
<?php
if ($postatus == PO_RELEASED)
{}
else
{
echo '<div><b>DRAFT</b> </div>';
}
if ($postatus == PO_RELEASED || $postatus == PO_SERVICE_COMPLETED || $postatus == MRIR_APPROVED || $postatus == MRIR_REJECTED || $postatus == IGR_CREATED)
{ }
else
{
echo '<div><b>DRAFT</b> </div>';
}
?>
</div>

34
application/views/editCapitalAmendPO.php
View File

@ -261,7 +261,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
<script>
$(document).ready(function(){
$("#PaymentMethod").select2();
$("#EditReqnumber").select2();
//$("#EditReqnumber").select2();
$("#EditMaterialCode").select2();
//Initialize Select2 Elements
@ -280,6 +280,11 @@ document.getElementById('dispatchinternational').style.display = 'block';
minDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
$("#Exchangerateon").datepicker({
minDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
$('#Date').click(function () {
//for Date range selection
$('#Schedulediv').hide();
@ -297,6 +302,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
$('#deliverydateby').show();
$('#Deliverydtdiv').hide();
});
});
</script>
@ -853,13 +860,13 @@ document.getElementById('dispatchinternational').style.display = 'block';
<div>
<?php
$RL = array("0"=>'Select Req No');
if(!empty($RequistionDetails))
{
foreach ($RequistionDetails as $SID):
$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
endforeach;
}
// $RL = array("0"=>'Select Req No');
// if(!empty($RequistionDetails))
// {
// foreach ($RequistionDetails as $SID):
// $RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
// endforeach;
// }
$data = array('name' => 'EditReqnumber','value' => set_value('EditReqnumber'),'id'=>'EditReqnumber', 'class' => 'form-control select2' ,'readonly' => 'true');
@ -1729,15 +1736,7 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
$(function() {
$("#PODate").datepicker({
minDate : d,
maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
});
$("#Deliverydt").datepicker({
minDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
var capital=<?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
//alert(capital);
@ -2669,6 +2668,7 @@ $('#PurQuantity').val('');
var id= $('#Reqnumber'+userid).val();
$('#EditReqnumber').val($('#Reqnumber'+userid).val());
$('#EditCapitalDepartmentName').val($('#departmentName'+userid).val());
$("#EditCostCenter").val($('#CPCostCode'+userid).val());
$('#EditCapitalbudAmt').val($('#AvilBudget'+userid).val());

14
application/views/importpopdf.php
View File

@ -120,13 +120,13 @@
<div class="header">
<div style="text-align:right;">
<?php
if ($postatus == 'ST026')
{}
else
{
echo '<div><b>DRAFT</b> </div>';
}
if ($postatus == PO_RELEASED || $postatus == PO_SERVICE_COMPLETED || $postatus == MRIR_APPROVED || $postatus == MRIR_REJECTED || $postatus == IGR_CREATED)
{ }
else
{
echo '<div><b>DRAFT</b> </div>';
}
?>
</div>

14
application/views/revenuepopdf.php
View File

@ -108,13 +108,13 @@
<div class="header">
<div style="text-align:right;">
<?php
if ($postatus == 'ST026')
{}
else
{
echo '<div><b>DRAFT</b> </div>';
}
if ($postatus == PO_RELEASED || $postatus == PO_SERVICE_COMPLETED || $postatus == MRIR_APPROVED || $postatus == MRIR_REJECTED || $postatus == IGR_CREATED)
{ }
else
{
echo '<div><b>DRAFT</b> </div>';
}
?>
</div>

15
application/views/servicepopdf.php
View File

@ -104,14 +104,13 @@
<div class="header">
<div style="text-align:right;">
<?php
if ($postatus == 'ST026')
{}
else
{
echo '<div><b>DRAFT</b> </div>';
}
if ($postatus == PO_RELEASED || $postatus == PO_SERVICE_COMPLETED || $postatus == MRIR_APPROVED || $postatus == MRIR_REJECTED || $postatus == IGR_CREATED)
{ }
else
{
echo '<div><b>DRAFT</b> </div>';
}
?>
</div>
<div>&nbsp;</div>