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

THREE AMEND ISSUES FIXED

Browse Source
This commit is contained in:
velz2020 2017-08-24 13:50:52 +05:30
parent 91bc3f5536
commit aff85ea3ea
5 changed files with 95 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/capitalpopdf.php
View File

@ -137,7 +137,7 @@
</td> </td>
<td colspan="3" style="text-align: center;"><?php echo $SuplierName?><br /><?php echo $SuplierAddress ?> </td> <td colspan="3" style="text-align: center;"><?php echo $SuplierName?><br /><?php echo $SuplierAddress ?> </td>
<td colspan="1">DISPATCH INSTRUCTION / SCHEDULE BY: <?php echo $DeliveryDate.$DeliverySchedule;?><br /><br /></td> <td colspan="1">DISPATCH INSTRUCTION / SCHEDULE BY: <?php echo $DeliveryDate.$DeliverySchedule.$dispatch;?><br /><br /></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

26
application/views/editCapitalAmendPO.php
View File

@ -654,12 +654,12 @@ document.getElementById('dispatchinternational').style.display = 'block';
<td style="text-align:right"><?php echo $record->Quantity ?></td> <td style="text-align:right"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
<td style="text-align:right"><?php echo $record->Rate ?></td> <td style="text-align:right"><?php echo $record->Rate ?></td>
<td style="text-align:right"><?php echo $record->Rate * $record->Quantity ?></td> <td style="text-align:right"><?php echo number_format($record->Rate * $record->Quantity,2,'.',''); ?></td>
<td style="text-align:right"><?php if($CapitalRange=='1'){echo $record->ServiceTaxamount;}else if($CapitalRange=='0'){echo "0.0"; }?></td> <td style="text-align:right"><?php if($CapitalRange=='1'){echo $record->ServiceTaxamount;}else if($CapitalRange=='0'){echo "0.0"; }?></td>
<?php if($CapitalRange=='1'){?> <?php if($CapitalRange=='1'){?>
<td style="text-align:right"><?php echo (($record->Rate * $record->Quantity)+$record->ServiceTaxamount); ?></td> <td style="text-align:right"><?php echo (($record->Rate * $record->Quantity)+$record->ServiceTaxamount); ?></td>
<?php }else if($CapitalRange=='0'){?> <?php }else if($CapitalRange=='0'){?>
<td style="text-align:right"><?php echo (($record->Rate * $record->Quantity)); ?></td> <td style="text-align:right"><?php echo number_format(($record->Rate * $record->Quantity),2,'.',''); ?></td>
<?php }?> <?php }?>
<?php <?php
$row=array("materialCode"=>$record->MaterialCode,"ReqNo"=>$record->ReqNo); $row=array("materialCode"=>$record->MaterialCode,"ReqNo"=>$record->ReqNo);
@ -1103,15 +1103,15 @@ document.getElementById('dispatchinternational').style.display = 'block';
<div class="col-md-4" > <div class="col-md-4" >
Basic Price In<?php echo "($INR)"?> Basic Price In<?php echo "($INR)"?>
</div> </div>
<div class="col-md-4"> <!--<div class="col-md-4">
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditBasicPriceTax','value' => set_value('EditBasicPriceTax'),'id'=>'EditBasicPriceTax', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);'); $data = array('name' => 'EditBasicPriceTax','value' => set_value('EditBasicPriceTax'),'id'=>'EditBasicPriceTax', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>-->
<div class="col-md-4"> <div class="col-md-4 col-md-offset-4">
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditAfterBasicPriceTax','value' => set_value('EditAfterBasicPriceTax'),'id'=>'EditAfterBasicPriceTax', 'class' => 'form-control num' ,'readonly' => 'true'); $data = array('name' => 'EditAfterBasicPriceTax','value' => set_value('EditAfterBasicPriceTax'),'id'=>'EditAfterBasicPriceTax', 'class' => 'form-control num' ,'readonly' => 'true');
@ -1354,7 +1354,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<center> <label>Cost of the product Per KG</label></center> <center> <label>Cost of the product Per UOM</label></center>
<hr/> <hr/>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
@ -1668,7 +1668,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
<a class="btn btn-primary Save" ID="Submit" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Save" ID="Submit" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"> <input type="button" class="btn btn-primary" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
@ -1758,7 +1758,7 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
//$('#DOMdiv').hide(); //$('#DOMdiv').hide();
} }
$('#drpSupplier').change(function() { $('#Supplier').change(function() {
var id = $('#drpSupplier').val(); var id = $('#drpSupplier').val();
var supPaymentTerms=''; var supPaymentTerms='';
@ -3297,17 +3297,17 @@ basicamt=$('#Totalservicesummary').val();
cellval[2].innerHTML = materialName; cellval[2].innerHTML = materialName;
//alert(materialName); //alert(materialName);
cellval[3].innerHTML = quantity; cellval[3].innerHTML = parseFloat(quantity).toFixed(2);
//alert(quantity); //alert(quantity);
cellval[4].innerHTML =uom; cellval[4].innerHTML =uom;
//alert(uom); //alert(uom);
cellval[5].innerHTML =itemRate; cellval[5].innerHTML =parseFloat(itemRate).toFixed(2);
//alert(itemRate); //alert(itemRate);
cellval[6].innerHTML =basicval; cellval[6].innerHTML =parseFloat(basicval).toFixed(2);
//alert(basicval); //alert(basicval);
cellval[7].innerHTML =TotalTaxValue; cellval[7].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
//alert(TotalTaxValue); //alert(TotalTaxValue);
cellval[8].innerHTML =totalservicevalue; cellval[8].innerHTML =parseFloat(totalservicevalue).toFixed(2);
//alert(basicval); //alert(basicval);

38
application/views/editRevenueAmendPO.php
View File

@ -597,6 +597,7 @@ function calculatePackaging()
{ {
AfterFreight = <?php echo FREIGHT_LUMPSUM;?>; AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;
} }
else if(FreightType == '<?php echo PERUOM;?>') else if(FreightType == '<?php echo PERUOM;?>')
{ {
AfterFreight = <?php echo FREIGHT_PERUOM;?>; AfterFreight = <?php echo FREIGHT_PERUOM;?>;
@ -617,7 +618,14 @@ function calculatePackaging()
AfterFreight = AfterFreight * nooftrips; AfterFreight = AfterFreight * nooftrips;
} }
} }
} }
else
{
AfterFreight = $('#txtEditFreight').val();
}
var AfterFreightval = parseFloat(AfterFreight).toFixed(2); var AfterFreightval = parseFloat(AfterFreight).toFixed(2);
$('#txtEditAfterFreight').val(AfterFreightval); $('#txtEditAfterFreight').val(AfterFreightval);
@ -709,7 +717,7 @@ function validateEditExceedLimit()
var tot = parseFloat(totvalue).toFixed(2); var tot = parseFloat(totvalue).toFixed(2);
$('#txtEditTotalOrderValue').val(tot); $('#txtEditTotalOrderValue').val(tot);
validateEditExceedLimit(); // validateEditExceedLimit();
} }
function calculateEditTaxValue() function calculateEditTaxValue()
@ -830,7 +838,7 @@ function calculateEditTaxValue()
endforeach; endforeach;
} }
echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2'); echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2','disabled=disabled');
?> ?>
</div> </div>
@ -1141,7 +1149,7 @@ function calculateEditTaxValue()
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Cost Center Name</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control' ,'readonly' => 'true');
@ -1512,7 +1520,7 @@ function calculateEditTaxValue()
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
<td align="right"><?php echo $record->Rate ?></td> <td align="right"><?php echo $record->Rate ?></td>
<td align="right"><?php echo $record->BasicValue ?></td> <td align="right"><?php echo number_format($record->BasicValue,2,'.','') ?></td>
<td align="right"><?php echo $record->Taxamount ?></td> <td align="right"><?php echo $record->Taxamount ?></td>
<td align="right"><?php echo $record->TotalValue ?></td> <td align="right"><?php echo $record->TotalValue ?></td>
@ -1673,7 +1681,7 @@ function calculateEditTaxValue()
<label >Total Insurance Amount In INR </label> <label >Total Insurance Amount In INR </label>
<?php <?php
$data = array('name' => 'txtTotalInsurance','value' => set_value('txtTotalInsurance',$totInsuranceAmt),'id'=>'txtTotalInsurance', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); $data = array('name' => 'txtTotalInsurance','value' => set_value('txtTotalInsurance',number_format($totInsuranceAmt,2,'.','')),'id'=>'txtTotalInsurance', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
@ -1682,7 +1690,7 @@ function calculateEditTaxValue()
<label >Total Freight Amount In INR </label> <label >Total Freight Amount In INR </label>
<?php <?php
$data = array('name' => 'txtTotalFreight','value' => set_value('txtTotalFreight',$totFreightAmt),'id'=>'txtTotalFreight', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); $data = array('name' => 'txtTotalFreight','value' => set_value('txtTotalFreight',number_format($totFreightAmt,2,'.','')),'id'=>'txtTotalFreight', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
@ -1691,7 +1699,7 @@ function calculateEditTaxValue()
<label>Total Order Amount In INR </label> <label>Total Order Amount In INR </label>
<input type="hidden" name="preTotalOdervalue" value="<?php echo $totOrderSummaryAmt;?>"> <input type="hidden" name="preTotalOdervalue" value="<?php echo $totOrderSummaryAmt;?>">
<?php <?php
$data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',$totOrderSummaryAmt),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($totOrderSummaryAmt,2,'.','')),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1717,7 +1725,7 @@ function calculateEditTaxValue()
<!-- <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> --> <!-- <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"> <input type="button" class="btn btn-primary" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<!-- <input type="reset" class="btn btn-primary" value = "OK"> --> <!-- <input type="reset" class="btn btn-primary" value = "OK"> -->
@ -1789,7 +1797,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
$('#EditRate').val($('#itemRate'+userid).val()); $('#EditRate').val($('#itemRate'+userid).val());
$('#txtEditBasicValue').val(cellval[6].innerHTML); $('#txtEditBasicValue').val(parseFloat(cellval[6].innerHTML).toFixed(2));
RequistQuantity = $('#quantity'+userid).val(); RequistQuantity = $('#quantity'+userid).val();
$('#txtEditDiscount').val($('#DisVal'+userid).val()); $('#txtEditDiscount').val($('#DisVal'+userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val()); $('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
@ -1940,12 +1948,12 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
var cellval = tr.cells; var cellval = tr.cells;
cellval[2].innerHTML = editDescription; cellval[2].innerHTML = editDescription;
cellval[3].innerHTML = editQuantity; cellval[3].innerHTML = parseFloat(editQuantity).toFixed(2);
cellval[4].innerHTML =editUOM; cellval[4].innerHTML =editUOM;
cellval[5].innerHTML =itemRate; cellval[5].innerHTML =parseFloat(itemRate).toFixed(2);
cellval[6].innerHTML =basicval; cellval[6].innerHTML =parseFloat(basicval).toFixed(2);
cellval[7].innerHTML =TotalTaxValue; cellval[7].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
cellval[8].innerHTML =TotalOrderValue; cellval[8].innerHTML =parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode'+userid).val(editMaterialCode); $('#materialCode'+userid).val(editMaterialCode);
@ -2274,7 +2282,7 @@ $('#Scheduleby').change(function(){
"paging": false, "paging": false,
"lengthChange": false, "lengthChange": false,
"searching": false, "searching": false,
//"ordering": true, "ordering": false,
// "info": true, // "info": true,
"autoWidth": true "autoWidth": true

10
application/views/editServiceAmendPO.php
View File

@ -179,11 +179,11 @@ var AvilBudAmt = '';
$("#PODate").datepicker({ $("#PODate").datepicker({
minDate : d, minDate : d,
maxDate : 'now', maxDate : 'now',
dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
$("#Deliverydt").datepicker({ $("#Deliverydt").datepicker({
minDate : 'now', minDate : 'now',
dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
}); });
$('#drpSupplier').change(function() { $('#drpSupplier').change(function() {
@ -862,7 +862,7 @@ $(document).ready(function () {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Cost Center Name</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control' ,'readonly' => 'true');
@ -1296,7 +1296,7 @@ $(document).ready(function () {
<!-- <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> --> <!-- <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-primary Save" ID="Submit" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Save" ID="Submit" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"> <input type="button" class="btn btn-primary" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
</div><br/> </div><br/>
@ -1919,7 +1919,7 @@ $('#Scheduleby').change(function(){
$("#Deliverydt").datepicker({ $("#Deliverydt").datepicker({
minDate : 'now', minDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' dateFormat: 'mm-dd-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
}); });

52
application/views/revenuepopdf.php
View File

@ -286,6 +286,58 @@ $OrderValue = (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
</tbody> </tbody>
</table> </table>
<?php
$i=0;
if(!empty($POItem))
{
foreach($POItem as $x){
if($x->ParentPO != ''){
$i++;
}
}
}
if($i>0){
?>
<table style="border-collapse: collapse;font-size:12px;" cellpadding="0" cellspacing="0" border="1" width="100%">
<tbody>
<tr>
<td style="text-align: center;" colspan="3">
<p>Amended Details</p>
</td>
</tr>
<tr>
<td colspan="3">
<?php
if(!empty($POItem))
{
foreach($POItem as $v)
{
echo "<b>" . $v->AmendedDetails . "</b>";
break;
}
}?>
</td>
</tr>
<tr>
<td style="text-align: center;"><strong>Item Description</strong></td>
<td style="text-align: center;" rowspan="2"><strong>Previous Details</strong></td><td style="text-align: center;" rowspan="2" ><strong>Current Details</strong></td>
</tr>
<?php if(!empty($POItem))
{
foreach($POItem as $record)
{
echo $record->LineAmend ;
}
} ?>
</tbody>
</table>
<?php
}?>
&nbsp; &nbsp;
<p> <b>Payment Terms :</b> &nbsp;<?php echo $PaymentTerms ."&nbsp;&nbsp;".$PaymentOtherDescription;?> </p> <p> <b>Payment Terms :</b> &nbsp;<?php echo $PaymentTerms ."&nbsp;&nbsp;".$PaymentOtherDescription;?> </p>
<div> <b>Special Instruction:</b><br/><?php echo $ServiceDescription;?></div> <div> <b>Special Instruction:</b><br/><?php echo $ServiceDescription;?></div>