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

import po fixes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-10 13:47:02 +05:30
parent b14d9e3684
commit 454cdd22ee
3 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/config/constants.php
View File

@ -237,5 +237,7 @@ define('SERVICETAX_SGST', '((Sgst/100
define('SERVICETAX_IGST', '((Igst/100) * basicValue)');
/* End of file constants.php */
/* Location: ./application/config/constants.php */

71
application/views/editimportpo.php
View File

@ -848,7 +848,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'LandingCharge','value' => set_value('LandingCharge'),'id'=>'LandingCharge', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Calculateloadingcharge()');
$data = array('name' => 'LandingCharge','value' => set_value('LandingCharge',0),'id'=>'LandingCharge', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Calculateloadingcharge()');
echo form_input($data);
@ -873,7 +873,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'Highseas ','value' => set_value('Highseas'),'id'=>'Highseas', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateHighseassalescharge()');
$data = array('name' => 'Highseas ','value' => set_value('Highseas',0),'id'=>'Highseas', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateHighseassalescharge()');
echo form_input($data);
?>
</div>
@ -895,7 +895,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'Customduty','value' => set_value('Customduty'),'id'=>'Customduty', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCustomduty()');
$data = array('name' => 'Customduty','value' => set_value('Customduty',0),'id'=>'Customduty', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCustomduty()');
echo form_input($data);
?>
</div>
@ -917,7 +917,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'ExcisedutyTax','value' => set_value('ExcisedutyTax'),'id'=>'ExcisedutyTax', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateExciseDuty()');
$data = array('name' => 'ExcisedutyTax','value' => set_value('ExcisedutyTax',0),'id'=>'ExcisedutyTax', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateExciseDuty()');
echo form_input($data);
?>
</div>
@ -939,7 +939,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'ExcisedutyEDcess','value' => set_value('ExcisedutyEDcess'),'id'=>'ExcisedutyEDcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateExciseED1()');
$data = array('name' => 'ExcisedutyEDcess','value' => set_value('ExcisedutyEDcess',0),'id'=>'ExcisedutyEDcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateExciseED1()');
echo form_input($data);
?>
</div>
@ -962,7 +962,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'ExcisedutySHcess','value' => set_value('ExcisedutySHcess'),'id'=>'ExcisedutySHcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateexciseSHcess()');
$data = array('name' => 'ExcisedutySHcess','value' => set_value('ExcisedutySHcess',0),'id'=>'ExcisedutySHcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateexciseSHcess()');
echo form_input($data);
?>
</div>
@ -984,7 +984,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'CustomEDcess','value' => set_value('CustomEDcess'),'id'=>'CustomEDcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCustomEdcess()');
$data = array('name' => 'CustomEDcess','value' => set_value('CustomEDcess',0),'id'=>'CustomEDcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCustomEdcess()');
echo form_input($data);
?>
</div>
@ -1006,7 +1006,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'CustomSHcess','value' => set_value('CustomSHcess'),'id'=>'CustomSHcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCustomSHcess()');
$data = array('name' => 'CustomSHcess','value' => set_value('CustomSHcess',0),'id'=>'CustomSHcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCustomSHcess()');
echo form_input($data);
?>
</div>
@ -1030,7 +1030,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'AdditionalExciseduty ','value' => set_value('AdditionalExciseduty'),'id'=>'AdditionalExciseduty', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateaddlExciseDuty(),CalculateAvlModvat(),CalculateGrossExpense()');
$data = array('name' => 'AdditionalExciseduty ','value' => set_value('AdditionalExciseduty',0),'id'=>'AdditionalExciseduty', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateaddlExciseDuty(),CalculateAvlModvat(),CalculateGrossExpense()');
echo form_input($data);
?>
</div>
@ -2433,6 +2433,10 @@ if($PONOStatus == PO_RELEASED)
<input type="hidden" name="<?php echo 'ExchangeRate'.$index ?>" id="<?php echo 'ExchangeRate'.$index ?>" value="<?php echo $record->ExchangeRate; ?>" />
<input type="hidden" name="<?php echo 'AfterCustomEDcess'.$index ?>" id="<?php echo 'AfterCustomEDcess'.$index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
<input type="hidden" name="<?php echo 'CustomEDcess'.$index ?>" id="<?php echo 'CustomEDcess'.$index ?>" value="<?php echo $record->CustomEdCess; ?>" />
<?php
@ -4065,7 +4069,7 @@ $('.AddImport').click(function()
var receivedqty='';
var rejectedqty='';
var pendingqty='';
//console.log(AfterCustomED);
//console.log(CustomED);
$('#MaterialCode option[value='+materialCode+']').remove();
@ -4086,7 +4090,7 @@ $('.AddImport').click(function()
//alert('in');
var template = jQuery("#ImportList").html();
$('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,Description:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp,ReceivedQty:receivedqty,RejectedQty:rejectedqty,PendingQty:pendingqty}));
$('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,Description:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp,ReceivedQty:receivedqty,RejectedQty:rejectedqty,PendingQty:pendingqty}));
//alert(JSON.strigify(BasicAmt));
@ -4138,8 +4142,11 @@ $('.AddImport').click(function()
addHidden(theForm,"RMCIncludingCustomersPerKG"+temp,RMCIncluderate);
addHidden(theForm,"AvailableModvat"+temp,Avlmodvat);
addHidden(theForm,"TotalValue"+temp,totalexp);
addHidden(theForm,"ProductPrice"+temp,BasicAmt);
addHidden(theForm,"BasicPriceInMTon"+temp,Basicpriceinus);
addHidden(theForm,"BasicINRValue"+temp,AfterBasicPrice);
//var a=parseFloat($('#CustomEDcess').val());
//var a=parseFloat($('#AfterCustomEDcess').val());
//console.log(a);
@ -4400,10 +4407,10 @@ $('#txttot').val((parseFloat(TotalOrder)+parseFloat(totalexp)).toFixed(2));
function clearTaxField()
{
//$('#AfterBasicPriceTax').val('');
$('#ReqNo').val('');
$('#deptName').val('');
$('#CostCenter').val('');
$('#AvlBudAmt').val('');
//$('#ReqNo').val('');
//$('#deptName').val('');
//$('#CostCenter').val('');
//$('#AvlBudAmt').val('');
$('#MaterialCode').val('');
$('#ItemName').val('');
$('#UOM').val('');
@ -4417,24 +4424,24 @@ function clearTaxField()
$('#AfterBasicPriceTax').val('');
$('#TotalExp').val('');
$('#AfterLandingCharge').val('');
$('#LandingCharge').val('');
$('#LandingCharge').val(0);
$('#AfterHighseas').val('');
$('#Highseas').val('');
$('#Highseas').val(0);
$('#AfterCustomduty').val('');
$('#Customduty').val('');
$('#Customduty').val(0);
$('#AfterExcisedutyTax').val('');
$('#ExcisedutyTax').val('');
$('#ExcisedutyTax').val(0);
$('#AfterExcisedutyEDcess').val('');
$('#ExcisedutyEDcess').val('');
$('#ExcisedutyEDcess').val(0);
$('#AfterExcisedutySHcess').val('');
$('#ExcisedutySHcess').val('');
$('#ExcisedutySHcess').val(0);
$('#AfterCustomEDcess').val('');
$('#CustomEDcess').val('');
$('#CustomEDcess').val(0);
$('#AfterCustomSHcess').val('')
$('#CustomSHcess').val('');
$('#CustomSHcess').val(0);
$('#AfterCustomSHcess').val('');
$('#AfterAdditionalExciseduty').val('');
$('#AdditionalExciseduty').val('');
$('#AdditionalExciseduty').val(0);
$('#Grossdutypayable').val('');
$('#AvailableModvat').val('');
$('#Grossexpenses').val('');
@ -4474,6 +4481,8 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) {
$('#EdittxtBasicValue').val($('#ProductPrice'+userid).val());
$('#EditBasicPrice').val($("#BasicINRValue"+userid).val());
$('#EditimBasicPrice').val($("#BasicPriceInMTon"+userid).val());
$('#EditLandingCharge').val($("#LandingCharge"+userid).val());
$('#EditAfterLandingCharge').val($("#AfterLandingCharge"+userid).val());
$('#EditHighseas').val($("#HighSeasSalesCharge"+userid).val());
@ -4487,10 +4496,11 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) {
$('#EditExcisedutySHcess').val($("#ExciseDutySHCess"+userid).val());
$('#EditAfterExcisedutySHcess').val($("#AfterExciseDutySHCess"+userid).val());
$('#EditCustomEDcess').val($("#CustomEdCess"+userid).val());
//var x=parseFloat($('#EditCustomEDcess').val());
//console.log(x);
$('#EditAfterCustomEDcess').val($("#AfterCustomEdCess"+userid).val());
$('#EditCustomEDcess').val($("#CustomEDcess"+userid).val());
// $('#EditCustomEDcess').val($("#CustomEdCess"+userid).val());
//var x=parseFloat($('#CustomEDcess'+userid).val());
//console.log(x);AfterCustomEDcess
$('#EditAfterCustomEDcess').val($("#AfterCustomEDcess"+userid).val());
$('#EditCustomSHcess').val($("#CustomSHCess"+userid).val());
$('#EditAfterCustomSHcess').val($("#AfterCustomSHCess"+userid).val());
$('#EditAdditionalExciseduty').val($("#AddlExciseDuty"+userid).val());
@ -4815,8 +4825,7 @@ function populateValueMainFormForDeleteItem(rowid)
var TotalOrderValue=$('#txtToatlOrder').val();
//console.log(TotalCustomED);
//die();
var AfterLandingCharge= $('#AfterLandingCharge'+rowid).val() == '' ? '0.00' : $('#AfterLandingCharge'+rowid).val();
var AfterHighseas=$('#AfterHighSeasSalesCharge'+rowid).val()==''?'0.00':$('#AfterHighSeasSalesCharge'+rowid).val();
var AfterCustomduty=$('#AfterCustomDuty'+rowid).val()==''?'0.00':$('#AfterCustomDuty'+rowid).val();

2
application/views/poapproval_view.php
View File

@ -74,7 +74,7 @@ if(empty($Status))
echo $CreatedDate;
?></td>
<td><?php echo $record->StatusName ?></td>
<td><?php if($record->StatusCode == PO_APPROVER_ONHOLD or or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED ){ ?>
<td><?php if($record->StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED ){ ?>
<select name="selectId" id="selectId" title="Select Your Option" onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index ; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');">
<option value="-1" >Select Option</option>