SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

req date in import po pdf, zero value check in edit,amend import

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-21 12:45:12 +05:30
parent 368e53d43f
commit 1f60732d63
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/views/editImportAmendPO.php
View File

@ -2865,9 +2865,14 @@ function EditCalculateCtable()
$('#EditCustomDutyExpenses').val(0); $('#EditCustomDutyExpenses').val(0);
} }
else if (isFinite(txtcustomdutyexp))
{
$('#EditCustomDutyExpenses').val(txtpurchaserate.toFixed(2));
}
else else
{ {
$('#EditCustomDutyExpenses').val(txtcustomdutyexp.toFixed(2)); $('#EditCustomDutyExpenses').val(0);
} }
//$('#EditCustomDutyExpenses').val(txtcustomdutyexp); //$('#EditCustomDutyExpenses').val(txtcustomdutyexp);
@ -2879,8 +2884,14 @@ function EditCalculateCtable()
$('#EditRMCIncludingCustomers').val(0); $('#EditRMCIncludingCustomers').val(0);
} }
else if (isFinite(txtrmc))
{
$('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2));
}
else{ else{
$('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2)); $('#EditRMCIncludingCustomers').val(0);
} }

14
application/views/editimportpo.php
View File

@ -3955,9 +3955,14 @@ function EditCalculateCtable()
$('#EditCustomDutyExpenses').val(0); $('#EditCustomDutyExpenses').val(0);
} }
else if (isFinite(txtcustomdutyexp))
{
$('#EditCustomDutyExpenses').val(txtpurchaserate.toFixed(2));
}
else else
{ {
$('#EditCustomDutyExpenses').val(txtcustomdutyexp.toFixed(2)); $('#EditCustomDutyExpenses').val(0);
} }
//txtrmc=txtpurchaserate+txtcustomdutyexp; //txtrmc=txtpurchaserate+txtcustomdutyexp;
txtrmc=<?php echo RMC_CAL;?>; txtrmc=<?php echo RMC_CAL;?>;
@ -3967,8 +3972,13 @@ function EditCalculateCtable()
$('#EditRMCIncludingCustomers').val(0); $('#EditRMCIncludingCustomers').val(0);
} }
else if (isFinite(txtrmc))
{
$('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2));
}
else{ else{
$('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2)); $('#EditRMCIncludingCustomers').val(0);
} }
total=<?php echo CALCULATE_TOTAL;?>; total=<?php echo CALCULATE_TOTAL;?>;
$('#EditTotalExp').val(basicprice); $('#EditTotalExp').val(basicprice);

10
application/views/importpopdf.php
View File

@ -13,9 +13,9 @@
$DeliverySchedule=''; $DeliverySchedule='';
$ServiceDescription = ''; $ServiceDescription = '';
$ReqBy=''; $ReqBy='';
$PaymentTerms=''; $PaymentTerms='';
$advance=0; $advance=0;
$ReqDate='';
$index=0; $index=0;
if(!empty($CompanyDetails)) if(!empty($CompanyDetails))
@ -35,6 +35,8 @@
foreach ($POItem as $PO) foreach ($POItem as $PO)
{ {
$ReqNo=$PO->ReqNo; $ReqNo=$PO->ReqNo;
$Rdt=new DateTime($PO->ReqDate,new DateTimeZone('Asia/Kolkata'));
$ReqDate=$Rdt->format('d-m-Y');
$PONO = $PO->PONO; $PONO = $PO->PONO;
$postatus= $PO->Status; $postatus= $PO->Status;
$SuplierName = $PO->SupplierName; $SuplierName = $PO->SupplierName;
@ -178,7 +180,7 @@
<tr> <tr>
<td style="text-align: center;"><?php echo $ReqNo;?></td> <td style="text-align: center;"><?php echo $ReqNo;?></td>
<td style="text-align: center;">03/08/2017</td> <td style="text-align: center;"><?php echo $ReqDate;?></td>
<td style="text-align: center;"><?php echo $ReqBy;?></td> <td style="text-align: center;"><?php echo $ReqBy;?></td>
<td style="text-align: center;"><?php echo $DEPNAME?></td> <td style="text-align: center;"><?php echo $DEPNAME?></td>
<td style="text-align: center;"><?php echo $CostCenterCode?></td> <td style="text-align: center;"><?php echo $CostCenterCode?></td>