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

done capital po new changes

Browse Source
This commit is contained in:
gandhimathi 2017-09-21 19:32:45 +05:30
parent ca1a7290d9
commit 68467bddc5
4 changed files with 223 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
application/controllers/purchaseorder.php
View File

@ -2293,7 +2293,7 @@ function addNewImportPurchaseOrder()
//echo $BasicPriceinmton;
$CostCenter = $this->input->post('CPCostCode'.$i);
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$TotalOrderValue = $this->input->post('basicvalInINR'.$i);
$Cgst = $this->input->post('Cgst'.$i);
$Sgst = $this->input->post('Sgst'.$i);
$Igst = $this->input->post('Igst'.$i);
@ -2304,6 +2304,8 @@ function addNewImportPurchaseOrder()
$DiscountValue = $this->input->post('DisVal'.$i);
$AfterDiscount = $this->input->post('AfterDisVal'.$i);
$OtherAmt = $this->input->post('OtherAmt'.$i);
$TaxtotalOrderValue = $itemRate*$Quantity+$OtherAmt+$AfterCgst+$AfterSgst+$AfterIgst-$AfterDiscount;
$CapitalItemDescription = $this->input->post('CapitalItemDescrition'.$i);
$Per = $this->input->post('per'.$i);
$SkipInsert = "False";
@ -2338,7 +2340,7 @@ function addNewImportPurchaseOrder()
{
if($CapitalRange=='1')
{
$ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'discount'=>$DiscountType,'discountval'=>$DiscountValue,'Afterdiscountval'=>$AfterDiscount);
$ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TaxtotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'discount'=>$DiscountType,'discountval'=>$DiscountValue,'Afterdiscountval'=>$AfterDiscount);
$ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
@ -2366,7 +2368,7 @@ function addNewImportPurchaseOrder()
function EditCapitalPurchaseOrder()
{
$PONO =$this->input->post('txtPONO');
$POdt =$this->input->post('PODate');
$PODate = $this->getDateformat($POdt);
@ -2521,7 +2523,9 @@ function addNewImportPurchaseOrder()
//echo $BasicPriceinmton;
$CostCenter = $this->input->post('CPCostCode'.$i);
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$TotalOrderValue = $this->input->post('basicvalInINR'.$i);
$POLineItemNo = $this->input->post('LineItemNo'.$i);
$Cgst = $this->input->post('Cgst'.$i);
$Sgst = $this->input->post('Sgst'.$i);
@ -2534,7 +2538,10 @@ function addNewImportPurchaseOrder()
$DiscountType = $this->input->post('DisType'.$i);
$DiscountValue = $this->input->post('DisVal'.$i);
$AfterDiscount = $this->input->post('AfterDisVal'.$i);
$OtherAmt = $this->input->post('OtherAmt'.$i);
$TaxtotalOrderValue = $itemRate*$Quantity+$OtherAmt+$AfterCgst+$AfterSgst+$AfterIgst-$AfterDiscount;
$OtherAmt = $this->input->post('OtherAmt'.$i);
$CapitalItemDescription = $this->input->post('CapitalItemDescrition'.$i);
$Per = $this->input->post('per'.$i);
$FreightType = $this->input->post('FreightType'.$i);
@ -2575,7 +2582,7 @@ function addNewImportPurchaseOrder()
{
if($capitalType=='1')
{
$ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'discount'=>$DiscountType,'discountval'=>$DiscountValue,'Afterdiscountval'=>$AfterDiscount);
$ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TaxtotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'discount'=>$DiscountType,'discountval'=>$DiscountValue,'Afterdiscountval'=>$AfterDiscount);
$ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
}
@ -2600,7 +2607,7 @@ function addNewImportPurchaseOrder()
$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$LineItemNo,$POLineItemList);
if($capitalType=='1')
{
$ServiceTaxList = array('CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$CreateBy,'UpdatedOn'=>$createddt,'discount'=>$DiscountType,'discountval'=>$DiscountValue,'Afterdiscountval'=>$AfterDiscount);
$ServiceTaxList = array('CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TaxtotalOrderValue, 'UpdateBY'=>$CreateBy,'UpdatedOn'=>$createddt,'discount'=>$DiscountType,'discountval'=>$DiscountValue,'Afterdiscountval'=>$AfterDiscount);
$ServiceTax = $this->purchaseorder_model->updateServiceTax($LineItemNo,$ServiceTaxList);
}

7
application/views/alterpurchaseorder.php
View File

@ -5230,7 +5230,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div>
<!--start new fields 1 sep-->
<div class="col-md-12" id="emergdescofpo" style="display:none;">
<div class="col-md-12" id="emergdescofpoDiv" style="display:none;">
<label>Description Of Service<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</label>
<div class="form-group">
<?php
@ -5570,7 +5570,7 @@ function populateValueMainFormForDeleteItem(rowid)
$("#Deliveryby").show();
$("#selectdeliveryby").show();
$("#txtPoRange").show();
$("#emergdescofpo").hide();
$("#emergdescofpoDiv").hide();
$('#typeOptions').html('Revenue Type Options');
}
else if ( this.value == 'SERVICE') // Service po
@ -5584,7 +5584,7 @@ function populateValueMainFormForDeleteItem(rowid)
$('#DisplayScheduleDiv').show();
$('#EditDisplayScheduleDiv').show();
$("#txtPoRange").hide();
$("#emergdescofpo").show();
$("#emergdescofpoDiv").show();
$('#typeOptions').html('Service Type Options');
}
@ -7601,3 +7601,4 @@ $("#PaymentMethod").change(function() {
</script>

142
application/views/capitalpurchaseorder.php
View File

@ -1035,14 +1035,28 @@ function vaildateBeforeOpenModal()
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onkeypress'=>'return isNumberKey(event);');
$data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-5 col-md-offset-4" align="right">
<label>Total Amount <?php echo "($INR)"?></label>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'txtTotalOrderValue','value' => set_value('txtTotalOrderValue',0),'id'=>'txtTotalOrderValue', 'class' => 'form-control num' ,'placeholder' => 'Total Order Amount','onkeypress'=>'return isNumberKey(event);','readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
<div class="col-md-12" style="padding:1%;" ></div>
<div class="col-md-12" style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide">
<br/>
@ -1413,15 +1427,7 @@ function vaildateBeforeOpenModal()
</div>
<div class="col-md-6" style="display:none;" align="right"> <label>Total Amount :</label></div>
<div class="col-md-6" style="display:none;">
<div class="form-group">
<?php
$data = array('name' => 'txtTotalOrderValue','value' => set_value('txtTotalOrderValue'),'id'=>'txtTotalOrderValue', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
@ -1727,7 +1733,18 @@ function vaildateBeforeOpenModal()
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditOtherAllowances','value' => set_value('EditOtherAllowances'),'id'=>'EditOtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onkeypress'=>'return isNumberKey(event);');
$data = array('name' => 'EditOtherAllowances','value' => set_value('EditOtherAllowances'),'id'=>'EditOtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-5 col-md-offset-4" align="right">
<label>Total Amount <?php echo "($INR)"?></label>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EdittxtTotalOrderValue','value' => set_value('EdittxtTotalOrderValue'),'id'=>'EdittxtTotalOrderValue', 'class' => 'form-control num' ,'placeholder' => 'Total Order Amount','onkeypress'=>'return isNumberKey(event);','readonly' => 'true');
echo form_input($data);
?>
</div>
@ -2107,15 +2124,7 @@ function vaildateBeforeOpenModal()
</div>
<div class="col-md-6" align="right" style="display:none;"> <label>Total Amount :</label></div>
<div class="col-md-6" style="display:none;">
<div class="form-group">
<?php
$data = array('name' => 'EdittxtTotalOrderValue','value' => set_value('EdittxtTotalOrderValue'),'id'=>'EdittxtTotalOrderValue', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
@ -2161,7 +2170,16 @@ function vaildateBeforeOpenModal()
</table>
</div>
<div class="col-md-12" id="DOMdiv" style="border: 1px solid;padding:4px;">
<div class="col-md-3">
<label>Total Basic Amount <?php echo "($INR)"?> </label>
<?php
$data = array('name' => 'CapitalBasicOrder','value' => set_value('CapitalBasicOrder'),'id'=>'CapitalBasicOrder', 'class' => 'form-control num' ,'readonly' => 'true',);
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label >Total Discount Amount <?php echo "($INR)"?> </label>
<?php
@ -3295,7 +3313,7 @@ EditRatechange();
/* This is used add capital po line item */
$('.AddCapital').click(function(){
tinyMCE.triggerSave();
tinyMCE.triggerSave();
if(validateCapitalTax() && validateExceedLimit() && ExceedQuantityCheck())
{
var temp = index;
@ -3330,7 +3348,7 @@ tinyMCE.triggerSave();
var DisType = $("#DiscountType").val();
var DisVal = $("#txtDiscount").val();
var AfterDisVal = $("#txtAfterDiscount").val();
var AfterDisVal = parseFloat($("#txtAfterDiscount").val()== '' ? "0.00" : $('#txtAfterDiscount').val()).toFixed(2);
var landingCharge = $('#AfterLandingCharge').val();
var HighSeasSalesCharge = $('#AfterHighseas').val();
@ -3366,7 +3384,7 @@ var purchaseRate = $('#purchaserate').val();
var FreightVal = $("#txtFreight").val();
var AfterFreightVal = $("#txtAfterFreight").val();
var NoOfTrip = $("#NOOfTrips").val();
var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)).toFixed(2);
var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)).toFixed(2);
var TotalOrderValuePerkg = $("#txtTotalOrderValue").val();
@ -3395,7 +3413,7 @@ var purchaseRate = $('#purchaserate').val();
var template = jQuery("#CapitalList").html();
$('#capitalAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:basicval}));
$('#capitalAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:Total}));
//clearCapitalModalFields();
var theForm = $(".CapitalPO");
@ -3481,7 +3499,7 @@ var purchaseRate = $('#purchaserate').val();
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
basicAmountRate=parseFloat($('#txtTotalOrderValue').val());
}
if(basicAmountRate > avalbudAmt)
{
@ -3553,6 +3571,13 @@ var purchaseRate = $('#purchaserate').val();
function calculateTotalValue()
{
var BasicVal = $('#CPTotalAmount').val() == '' ? '0.00' : $('#CPTotalAmount').val();
var disRate = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
BasicVal = BasicVal-disRate;
var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val();
var ServiceTaxAmount = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val();
var EduCessTaxAmount = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val();
var SecHighTaxAmount = $('#AfterSecHighTax').val() == '' ? '0.00' : $('#AfterSecHighTax').val();
@ -3573,11 +3598,10 @@ var purchaseRate = $('#purchaserate').val();
var purchaseRate = $('#purchaserate').val() == '' ? '0.00' : $('#purchaserate').val();
var CustomDutyExpenses = $('#CustomDutyExpenses').val() == '' ? '0.00' : $('#CustomDutyExpenses').val();
var RMCIncludingCustomers = $('#RMCIncludingCustomers').val() == '' ? '0.00' : $('#RMCIncludingCustomers').val();
var totvalue = (parseFloat(BasicVal) + parseFloat(ServiceTaxAmount)+ parseFloat(EduCessTaxAmount)+ parseFloat(SecHighTaxAmount) + parseFloat(KrishiTaxAmount)+ parseFloat(SwachhTaxAmount));
//+parseFloat(landingCharge)+parseFloat(HighSeasSalesCharge)+parseFloat(CustomDuty)+parseFloat(ExciseDuty)+parseFloat(ExciseDutyEDCess)+parseFloat(ExciseDutySHCess)+parseFloat(CustomEDCess)+parseFloat(CustomSHCess)+parseFloat(AdditionalExciseDuty)+parseFloat(GrossDutyPayable)+parseFloat(AvailableModvat)+parseFloat(GrossExpensesDuetoCustom)+parseFloat(purchaseRate)+parseFloat(CustomDutyExpenses)+parseFloat(RMCIncludingCustomers)
var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2);
var tot = parseFloat(totvalue).toFixed(2);
//$('#txtTotalOrderValue').val(tot);
$('#txtTotalOrderValue').val(tot);
validateExceedLimit();
ExceedQuantityCheck();
@ -3660,6 +3684,7 @@ var purchaseRate = $('#purchaserate').val();
var TotGrossexpense = $('#txttotalgrossexpense').val() == '' ? '0.00' : $('#txttotalgrossexpense').val();
var TotalCapitalOrder = $('#CapitalToatlOrder').val() == '' ? '0.00' : $('#CapitalToatlOrder').val();
var TotalBasicOrder = $('#CapitalBasicOrder').val() == '' ? '0.00' : $('#CapitalBasicOrder').val();
$('#txtTotCgst').val((parseFloat(TotalCgst) + parseFloat(AfterCgst)).toFixed(2) );
$('#txtTotSgst').val((parseFloat(TotSgst) + parseFloat(AfterSgst)).toFixed(2) );
@ -3684,8 +3709,11 @@ var purchaseRate = $('#purchaserate').val();
$('#txtTotalDiscount').val((parseFloat(totDiscountAmt) + parseFloat(disRate)) .toFixed(2));
$('#txtTotalFreight').val((parseFloat(totFreightAmt) + parseFloat(Freight)).toFixed(2));
$('#txtToatlOrder').val((parseFloat(TotalOrderValueSummary) + parseFloat(totvalue)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(TotalCapitalOrder) + parseFloat(BasicVal)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(TotalCapitalOrder) + parseFloat(BasicVal) + parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2) );
$('#CapitalBasicOrder').val((parseFloat(TotalBasicOrder) + parseFloat(BasicVal) + parseFloat(disRate)).toFixed(2));
@ -3751,7 +3779,7 @@ $('#PurQuantity').val('');
$("#DiscountType").val('0');
$("#txtDiscount").val('');
$("#txtAfterDiscount").val('');
}
function addHidden(theForm, key, value) {
@ -3847,6 +3875,7 @@ function DeleteRow(rowid)
var CapitalToatlOrder=0;
var TotFreight =0;
var TotDiscount=0;
var TotBasicAmt =0;
for (var i = 1; i < rows; i++) {
if(deletedRow==i){
$('#AfterCgst'+i).val('');
@ -3902,7 +3931,7 @@ function DeleteRow(rowid)
var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
CapitalToatlOrderI = CapitalToatlOrderI-discountedRateValue;
var TotBasicAmtI=parseFloat(CapitalToatlOrderI) + parseFloat(discountedRateValue);
}
else if(deletedRow!=i){
@ -3932,7 +3961,8 @@ function DeleteRow(rowid)
var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
CapitalToatlOrderI=CapitalToatlOrderI-discountedRateValue;
var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
var TotBasicAmtI=parseFloat(CapitalToatlOrderI) + parseFloat(discountedRateValue);
var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
var TotDiscountI =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
}
@ -3961,8 +3991,8 @@ function DeleteRow(rowid)
TotGrossexpense = parseFloat(TotGrossexpense) + parseFloat(TotGrossexpenseI);
TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI);
CapitalToatlOrder=parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI);
CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI) + parseFloat(TotCgstI) + parseFloat(TotSgstI) + parseFloat(TotIgstI) + parseFloat(TotOtherI);
TotBasicAmt=parseFloat(TotBasicAmt) + parseFloat(TotBasicAmtI);
}
$('#txtTotalDiscount').val(parseFloat(TotDiscount).toFixed(2));
$('#txtTotalFreight').val(parseFloat(TotFreight).toFixed(2) );
@ -3984,6 +4014,7 @@ function DeleteRow(rowid)
$('#txttotalavlmodvat').val((parseFloat(TotAvlmodvat)).toFixed(2) );
$('#txttotalgrossexpense').val((parseFloat(TotGrossexpense)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) );
$('#CapitalBasicOrder').val((parseFloat(TotBasicAmt)).toFixed(2) );
$('#txtToatlOrder').val((parseFloat(TotalOrderValueSummary)).toFixed(2) );
@ -4049,7 +4080,7 @@ function DeleteRow(rowid)
$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val());
$('#EditRMCIncludingCustomers').val($('#RMCIncludingCustomers'+userid).val());
$('#EdittxtTotalOrderValue').val($('#PerKgExpense'+userid).val());
$('#EdittxtTotalOrderValue').val(cellval[9].innerHTML);
$('#EditCgst').val($('#Cgst'+userid).val());
$('#EditAfterCgst').val($('#AfterCgst'+userid).val());
$('#EditSgst').val($('#Sgst'+userid).val());
@ -4214,7 +4245,7 @@ var basicAmountRate = parseFloat($('#CapitalToatlOrder').val());
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
basicAmountRate=parseFloat($('#CapitalBasicOrder').val())-parseFloat($('#txtTotalDiscount').val());
}
if(validate())
{
@ -4463,7 +4494,7 @@ function clearAfterAddLineItemAdd(){
calculateTotalValue();
EditcalculateTotalValue();
// var res = ExceedBudget($('#TotalOrderValue').val(), $('#CapitalbudAmt').val());
//if(!res)
@ -4544,7 +4575,6 @@ function clearAfterAddLineItemAdd(){
var Igst = $("#EditIgst").val();
var AfterIgst = $("#EditAfterIgst").val();
var OtherAmt = parseFloat($("#EditOtherAllowances").val()== '' ? "0.00" : $('#EditOtherAllowances').val()).toFixed(2);
var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst));
var TotalTaxValue = EditcalculateTaxValue();
@ -4590,6 +4620,7 @@ function clearAfterAddLineItemAdd(){
var DisVal = $("#txtEditDiscount").val();
var AfterDisVal = $("#txtEditAfterDiscount").val();
var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)).toFixed(2);
@ -4670,7 +4701,7 @@ function clearAfterAddLineItemAdd(){
cellval[6].innerHTML =itemRate;
cellval[7].innerHTML =basicval;
cellval[8].innerHTML =TotalTaxValue;
cellval[9].innerHTML =basicval;
cellval[9].innerHTML =Total;
@ -4739,6 +4770,13 @@ function validateEditCapitalTax()
function EditcalculateTotalValue()
{
var BasicVal = $('#EditCPTotalAmount').val() == '' ? '0.00' : $('#EditCPTotalAmount').val();
var disRate = $('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val();
BasicVal = BasicVal-disRate;
var AfterCgst = $('#EditAfterCgst').val() == '' ? '0.00' : $('#EditAfterCgst').val();
var AfterSgst = $('#EditAfterSgst').val() == '' ? '0.00' : $('#EditAfterSgst').val();
var AfterIgst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val();
var OtherAmt = $('#EditOtherAllowances').val() == '' ? '0.00' : $('#EditOtherAllowances').val();
var ServiceTaxAmount = $('#EditAfterServiceTax').val() == '' ? '0.00' : $('#EditAfterServiceTax').val();
var EduCessTaxAmount = $('#EditAfterEduCess').val() == '' ? '0.00' : $('#EditAfterEduCess').val();
var SecHighTaxAmount = $('#EditAfterSecHighTax').val() == '' ? '0.00' : $('#EditAfterSecHighTax').val();
@ -4759,11 +4797,11 @@ function validateEditCapitalTax()
var purchaseRate = $('#Editpurchaserate').val() == '' ? '0.00' : $('#Editpurchaserate').val();
var CustomDutyExpenses = $('#EditCustomDutyExpenses').val() == '' ? '0.00' : $('#EditCustomDutyExpenses').val();
var RMCIncludingCustomers = $('#EditRMCIncludingCustomers').val() == '' ? '0.00' : $('#EditRMCIncludingCustomers').val();
var totvalue = (parseFloat(BasicVal) + parseFloat(ServiceTaxAmount)+ parseFloat(EduCessTaxAmount)+ parseFloat(SecHighTaxAmount) + parseFloat(KrishiTaxAmount)+ parseFloat(SwachhTaxAmount));
//+parseFloat(landingCharge)+parseFloat(HighSeasSalesCharge)+parseFloat(CustomDuty)+parseFloat(ExciseDuty)+parseFloat(ExciseDutyEDCess)+parseFloat(ExciseDutySHCess)+parseFloat(CustomEDCess)+parseFloat(CustomSHCess)+parseFloat(AdditionalExciseDuty)+parseFloat(GrossDutyPayable)+parseFloat(AvailableModvat)+parseFloat(GrossExpensesDuetoCustom)+parseFloat(purchaseRate)+parseFloat(CustomDutyExpenses)+parseFloat(RMCIncludingCustomers)
var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2);
var tot = parseFloat(totvalue).toFixed(2);
//$('#EdittxtTotalOrderValue').val(tot);
$('#EdittxtTotalOrderValue').val(tot);
validateEditExceedLimit();
EditExceedQuantityCheck();
@ -4809,7 +4847,7 @@ function validateEditCapitalTax()
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
basicAmountRate=parseFloat($('#EdittxtTotalOrderValue').val());
}
if(basicAmountRate > avalbudAmt)
{
@ -4855,7 +4893,8 @@ function validateEditCapitalTax()
var CapitalToatlOrder=0;
var TotFreight =0;
var TotDiscount=0;
var TotDiscount=0;
var TotBasicAmt =0;
for (var i = 1; i < rows; i++) {
var TotalOrderValueSummaryI = $('#ServiceTotalOrderValue'+i).val() == '' ? '0.00' : $('#ServiceTotalOrderValue'+i).val();
@ -4878,9 +4917,11 @@ function validateEditCapitalTax()
var TotAvlmodvatI = $('#AvailableModvat'+i).val() == '' ? '0.00' : $('#AvailableModvat'+i).val();
var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
var TotDiscountI =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
var CapitalToatlOrderI = $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
CapitalToatlOrderI = CapitalToatlOrderI - discountedRateValue;
var TotBasicAmtI=parseFloat(CapitalToatlOrderI) + parseFloat(discountedRateValue);
TotCgst = parseFloat(TotCgst) + parseFloat(TotalCgstI);
TotSgst = parseFloat(TotSgst) + parseFloat(TotalSgstI);
TotIgst = parseFloat(TotIgst) + parseFloat(TotalIgstI);
@ -4900,11 +4941,13 @@ function validateEditCapitalTax()
TotGrossexpense = parseFloat(TotGrossexpense) + parseFloat(TotGrossexpenseI);
TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI);
CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI);
TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI);
CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI) + parseFloat(TotalCgstI) + parseFloat(TotalSgstI) + parseFloat(TotalIgstI) + parseFloat(TotOtherI);
TotBasicAmt=parseFloat(TotBasicAmt) + parseFloat(TotBasicAmtI);
TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI);
TotDiscount =parseFloat(TotDiscount) + parseFloat(TotDiscountI);
}
$('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
@ -4923,6 +4966,7 @@ function validateEditCapitalTax()
$('#txttotalavlmodvat').val((parseFloat(TotAvlmodvat)).toFixed(2) );
$('#txttotalgrossexpense').val((parseFloat(TotGrossexpense)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) );
$('#CapitalBasicOrder').val((parseFloat(TotBasicAmt)).toFixed(2) );
$('#txtTotalDiscount').val(parseFloat(TotDiscount).toFixed(2));
@ -5089,6 +5133,7 @@ $("#PaymentMethod").change(function() {
$('#txtTotalDiscount').val('');
$('#txtTotalFreight').val('');
$('#CapitalBasicOrder').val('');
}
@ -5686,3 +5731,4 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){

161
application/views/editCapitalPo.php
View File

@ -68,6 +68,7 @@
$INR='';
$INRSYM='';
$ExitTotalOrderValue=0;
$ExitTotalBasicOrderValue=0;
$ExitExchangeRate='';
@ -875,6 +876,7 @@ $("#PaymentMethod").select2();
foreach($POItem as $record)
{
$index = $index + 1;
$ExitTotalBasicOrderValue=$ExitTotalBasicOrderValue+($record->Rate * $record->Quantity);
?>
<tr id="<?php echo $index ; ?>">
@ -887,11 +889,18 @@ $("#PaymentMethod").select2();
<td><?php echo $record->Rate ?></td>
<td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
<?php if($CapitalRange=='1'){ ?>
<td><?php echo $record->ServiceTaxamount;?></td> <?php } ?>
<td><?php echo $record->ServiceTaxamount;?></td>
<td><?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance - $record->Afterdiscountval, 2, '.', '') ?></td>
<?php } ?>
<?php if($CapitalRange=='0'){ ?>
<td><?php echo '0';?></td> <?php } ?>
<td><?php echo '0';?></td>
<td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
<?php } ?>
<td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
<td align="right"><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
@ -929,6 +938,7 @@ $("#PaymentMethod").select2();
<input align="right" type="hidden" name="<?php echo 'DisType'.$index ?>" id="<?php echo 'DisType'.$index ?>" value="<?php echo $record->discount ; ?>" />
<input align="right" type="hidden" name="<?php echo 'DisVal'.$index ?>" id="<?php echo 'DisVal'.$index ?>" value="<?php echo $record->discountval ; ?>" />
<input align="right" type="hidden" name="<?php echo 'AfterDisVal'.$index ?>" id="<?php echo 'AfterDisVal'.$index ?>" value="<?php echo $record->Afterdiscountval ; ?>" />
<input type="hidden" name="<?php echo 'basicvalInINR'.$index ?>" id="<?php echo 'basicvalInINR'.$index ?>" value="<?php echo $record->Rate * $record->Quantity + $record->After_CGST + $record->After_SGST + $record->After_IGST + $record->otherallowance - $record->Afterdiscountval ; ?>" />
<?php } ?>
<?php if($CapitalRange=='0'){ ?>
@ -1015,6 +1025,7 @@ $("#PaymentMethod").select2();
$TotalSummary = $TotalSummary+$record->ServiceTaxamount;
$TotalDiscountedAmt = $record->Afterdiscountval;
$ExitDiscountedAmt=$ExitDiscountedAmt+$record->Afterdiscountval;
$totalCapitalOrder = $totalCapitalOrder+$record->Rate * $record->Quantity + $record->After_CGST + $record->After_SGST + $record->After_IGST + $record->otherallowance - $TotalDiscountedAmt;
}
$TotalBasicAmount = $TotalBasicAmount+$record->BasicValue;
$ServiceDescription = $ServiceDescription;
@ -1035,12 +1046,12 @@ $("#PaymentMethod").select2();
$totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
$ExchangeRate=$record->ExchangeRate;
$totalCapitalOrder = $totalCapitalOrder+$record->Rate * $record->Quantity;
}
// $totorder=$totorder+$record->TotalOrderValue;
$totalCapitalOrder = $totalCapitalOrder+$record->Rate * $record->Quantity-$TotalDiscountedAmt;
@ -1347,6 +1358,20 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-5 col-md-offset-4" align="right">
<label>Total Amount <?php echo "($INR)"?></label>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'txtTotalOrderValue','value' => set_value('txtTotalOrderValue',0),'id'=>'txtTotalOrderValue', 'class' => 'form-control num' ,'placeholder' => 'Total Order Amount','onkeypress'=>'return isNumberKey(event);','readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div> </div>
@ -1722,15 +1747,7 @@ $("#PaymentMethod").select2();
</div>
<div class="col-md-6" align="right" style="display:none;"> <label>Total Amount :</label></div>
<div class="col-md-6" style="display:none;">
<div class="form-group">
<?php
$data = array('name' => 'txtTotalOrderValue','value' => set_value('txtTotalOrderValue'),'id'=>'txtTotalOrderValue', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
@ -2044,7 +2061,18 @@ $("#PaymentMethod").select2();
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditOtherAllowances','value' => set_value('EditOtherAllowances'),'id'=>'EditOtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onkeypress'=>'return isNumberKey(event);');
$data = array('name' => 'EditOtherAllowances','value' => set_value('EditOtherAllowances'),'id'=>'EditOtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-5 col-md-offset-4" align="right">
<label>Total Amount <?php echo "($INR)"?></label>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EdittxtTotalOrderValue','value' => set_value('EdittxtTotalOrderValue'),'id'=>'EdittxtTotalOrderValue', 'class' => 'form-control num' ,'placeholder' => 'Total Order Amount','onkeypress'=>'return isNumberKey(event);','readonly' => 'true');
echo form_input($data);
?>
</div>
@ -2422,15 +2450,7 @@ $("#PaymentMethod").select2();
</div>
<div class="col-md-6" align="right" style="display:none;"> <label>Total Order Amount :</label></div>
<div class="col-md-6" style="display:none;">
<div class="form-group">
<?php
$data = array('name' => 'EdittxtTotalOrderValue','value' => set_value('EdittxtTotalOrderValue'),'id'=>'EdittxtTotalOrderValue', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
@ -3157,6 +3177,14 @@ $("#PaymentMethod").select2();
</table>
</div><!-- Cloing div for container-fluid -->
<div class="col-md-12" style="border: 1px solid;" id="CAPdiv" >
<div class="col-md-3">
<label>Total Basic Amount <?php echo "($INR)"?> </label>
<?php
$data = array('name' => 'CapitalBasicOrder','value' => set_value('CapitalBasicOrder',number_format($ExitTotalBasicOrderValue, 2, '.', '')),'id'=>'CapitalBasicOrder', 'class' => 'form-control num' ,'readonly' => 'true',);
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label >Total Discount Amount <?php echo "($INR)"?> </label>
@ -4418,7 +4446,7 @@ var purchaseRate = $('#purchaserate').val();
var FreightVal = $("#txtFreight").val();
var AfterFreightVal = $("#txtAfterFreight").val();
var NoOfTrip = $("#NOOfTrips").val();
var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)).toFixed(2);
var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)).toFixed(2);
var TotalOrderValuePerkg = $("#txtTotalOrderValue").val();
@ -4447,7 +4475,7 @@ var purchaseRate = $('#purchaserate').val();
var template = jQuery("#CapitalList").html();
$('#capitalAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:basicval,ActualQuantity:quantity,ReceivedQuantity:0,PendingQuantity:quantity}));
$('#capitalAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:Total,ActualQuantity:quantity,ReceivedQuantity:0,PendingQuantity:quantity}));
var theForm = $(".CapitalPO");
@ -4532,7 +4560,7 @@ var purchaseRate = $('#purchaserate').val();
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
basicAmountRate=parseFloat($('#txtTotalOrderValue').val());
}
if(basicAmountRate > avalbudAmt)
{
@ -4604,6 +4632,13 @@ var purchaseRate = $('#purchaserate').val();
function calculateTotalValue()
{
var BasicVal = $('#CPTotalAmount').val() == '' ? '0.00' : $('#CPTotalAmount').val();
var disRate = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
BasicVal = BasicVal-disRate;
var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val();
var ServiceTaxAmount = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val();
var EduCessTaxAmount = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val();
var SecHighTaxAmount = $('#AfterSecHighTax').val() == '' ? '0.00' : $('#AfterSecHighTax').val();
@ -4624,11 +4659,10 @@ var purchaseRate = $('#purchaserate').val();
var purchaseRate = $('#purchaserate').val() == '' ? '0.00' : $('#purchaserate').val();
var CustomDutyExpenses = $('#CustomDutyExpenses').val() == '' ? '0.00' : $('#CustomDutyExpenses').val();
var RMCIncludingCustomers = $('#RMCIncludingCustomers').val() == '' ? '0.00' : $('#RMCIncludingCustomers').val();
var totvalue = (parseFloat(BasicVal) + parseFloat(ServiceTaxAmount)+ parseFloat(EduCessTaxAmount)+ parseFloat(SecHighTaxAmount) + parseFloat(KrishiTaxAmount)+ parseFloat(SwachhTaxAmount));
//+parseFloat(landingCharge)+parseFloat(HighSeasSalesCharge)+parseFloat(CustomDuty)+parseFloat(ExciseDuty)+parseFloat(ExciseDutyEDCess)+parseFloat(ExciseDutySHCess)+parseFloat(CustomEDCess)+parseFloat(CustomSHCess)+parseFloat(AdditionalExciseDuty)+parseFloat(GrossDutyPayable)+parseFloat(AvailableModvat)+parseFloat(GrossExpensesDuetoCustom)+parseFloat(purchaseRate)+parseFloat(CustomDutyExpenses)+parseFloat(RMCIncludingCustomers)
var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2);
var tot = parseFloat(totvalue).toFixed(2);
//$('#txtTotalOrderValue').val(tot);
$('#txtTotalOrderValue').val(tot);
validateExceedLimit();
ExceedQuantityCheck();
@ -4709,6 +4743,8 @@ var purchaseRate = $('#purchaserate').val();
var TotGrossexpense = $('#txttotalgrossexpense').val() == '' ? '0.00' : $('#txttotalgrossexpense').val();
var TotalCapitalOrder = $('#CapitalToatlOrder').val() == '' ? '0.00' : $('#CapitalToatlOrder').val();
var TotalBasicOrder = $('#CapitalBasicOrder').val() == '' ? '0.00' : $('#CapitalBasicOrder').val();
var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
var totDiscountAmt = $('#txtTotalDiscount').val() == '' ? '0.00' : $('#txtTotalDiscount').val();
var totFreightAmt = $('#txtTotalFreight').val() == '' ? '0.00' : $('#txtTotalFreight').val();
@ -4733,8 +4769,10 @@ var purchaseRate = $('#purchaserate').val();
$('#txtToatlOrder').val((parseFloat(TotalOrderValueSummary) + parseFloat(totvalue)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(TotalCapitalOrder) + parseFloat(BasicVal)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(TotalCapitalOrder) + parseFloat(BasicVal) + parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2) );
$('#CapitalBasicOrder').val((parseFloat(TotalBasicOrder) + parseFloat(BasicVal) + parseFloat(disRate)).toFixed(2));
@ -4965,6 +5003,7 @@ function DeleteRow(rowid)
var CapitalToatlOrder=0;
var TotFreight =0;
var TotDiscount=0;
var TotBasicAmt =0;
for (var i = 1; i < rows; i++) {
if(deletedRow==i){
$('#AfterCgst'+i).val('');
@ -5013,7 +5052,9 @@ function DeleteRow(rowid)
var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
CapitalToatlOrderI = CapitalToatlOrderI-discountedRateValue;
var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
var TotBasicAmtI=parseFloat(CapitalToatlOrderI) + parseFloat(discountedRateValue);
var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
var TotDiscountI =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
}
@ -5044,7 +5085,9 @@ function DeleteRow(rowid)
var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
CapitalToatlOrderI = CapitalToatlOrderI-discountedRateValue;
var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
var TotBasicAmtI=parseFloat(CapitalToatlOrderI) + parseFloat(discountedRateValue);
var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
var TotDiscountI =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
}
else{
@ -5070,7 +5113,8 @@ function DeleteRow(rowid)
TotGrossexpense = parseFloat(TotGrossexpense) + parseFloat(TotGrossexpenseI);
TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI);
CapitalToatlOrder=parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI);
CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI) + parseFloat(TotCgstI) + parseFloat(TotSgstI) + parseFloat(TotIgstI) + parseFloat(TotOtherI);
TotBasicAmt=parseFloat(TotBasicAmt) + parseFloat(TotBasicAmtI);
}
$('#txtTotalDiscount').val(parseFloat(TotDiscount).toFixed(2));
@ -5093,6 +5137,8 @@ function DeleteRow(rowid)
$('#txttotalavlmodvat').val((parseFloat(TotAvlmodvat)).toFixed(2) );
$('#txttotalgrossexpense').val((parseFloat(TotGrossexpense)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) );
$('#CapitalBasicOrder').val((parseFloat(TotBasicAmt)).toFixed(2) );
$('#txtToatlOrder').val((parseFloat(TotalOrderValueSummary)).toFixed(2) );
@ -5157,7 +5203,7 @@ function DeleteRow(rowid)
//$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val());
$('#EditRMCIncludingCustomers').val($('#RMCIncludingCustomers'+userid).val());
$('#EdittxtTotalOrderValue').val($('#PerKgExpense'+userid).val());
$('#EdittxtTotalOrderValue').val(cellval[9].innerHTML);
/* get % value */
@ -5438,7 +5484,7 @@ var basicAmountRate = parseFloat($('#CapitalToatlOrder').val());
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
basicAmountRate=parseFloat($('#CapitalBasicOrder').val())-parseFloat($('#txtTotalDiscount').val());
}
if(validate())
@ -5695,7 +5741,7 @@ function clearAfterAddLineItemAdd(){
//alert('Please Enter Landing Charge ')
}
calculateTotalValue();
EditcalculateTotalValue();
// var res = ExceedBudget($('#TotalOrderValue').val(), $('#CapitalbudAmt').val());
//if(!res)
@ -5777,8 +5823,7 @@ function clearAfterAddLineItemAdd(){
var Igst = $("#EditIgst").val();
var AfterIgst = $("#EditAfterIgst").val();
var OtherAmt = parseFloat($("#EditOtherAllowances").val()== '' ? "0.00" : $('#EditOtherAllowances').val()).toFixed(2);
var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst));
var TotalTaxValue = EditcalculateTaxValue();
var landingCharge = $('#EditAfterLandingCharge').val();
@ -5819,7 +5864,7 @@ function clearAfterAddLineItemAdd(){
var DisType = $("#EditDiscountType").val();
var DisVal = $("#txtEditDiscount").val();
var AfterDisVal = $("#txtEditAfterDiscount").val();
var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)-parseFloat(AfterDisVal)).toFixed(2);
@ -5899,7 +5944,7 @@ function clearAfterAddLineItemAdd(){
cellval[6].innerHTML =parseFloat(itemRate).toFixed(2);
cellval[7].innerHTML =parseFloat(basicval).toFixed(2);
cellval[8].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
cellval[9].innerHTML =parseFloat(basicval).toFixed(2);
cellval[9].innerHTML =parseFloat(Total).toFixed(2);
@ -5987,7 +6032,15 @@ function validateEditCapitalTax()
function EditcalculateTotalValue()
{
var BasicVal = $('#EditCPTotalAmount').val() == '' ? '0.00' : $('#EditCPTotalAmount').val();
var ServiceTaxAmount = $('#EditAfterServiceTax').val() == '' ? '0.00' : $('#EditAfterServiceTax').val();
var disRate = $('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val();
BasicVal = BasicVal-disRate;
var AfterCgst = $('#EditAfterCgst').val() == '' ? '0.00' : $('#EditAfterCgst').val();
var AfterSgst = $('#EditAfterSgst').val() == '' ? '0.00' : $('#EditAfterSgst').val();
var AfterIgst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val();
var OtherAmt = $('#EditOtherAllowances').val() == '' ? '0.00' : $('#EditOtherAllowances').val();
var ServiceTaxAmount = $('#EditAfterServiceTax').val() == '' ? '0.00' : $('#EditAfterServiceTax').val();
var EduCessTaxAmount = $('#EditAfterEduCess').val() == '' ? '0.00' : $('#EditAfterEduCess').val();
var SecHighTaxAmount = $('#EditAfterSecHighTax').val() == '' ? '0.00' : $('#EditAfterSecHighTax').val();
var KrishiTaxAmount = $('#EditAfterKrishiTax').val() == '' ? '0.00' : $('#EditAfterKrishiTax').val();
@ -6007,11 +6060,11 @@ function validateEditCapitalTax()
var purchaseRate = $('#Editpurchaserate').val() == '' ? '0.00' : $('#Editpurchaserate').val();
var CustomDutyExpenses = $('#EditCustomDutyExpenses').val() == '' ? '0.00' : $('#EditCustomDutyExpenses').val();
var RMCIncludingCustomers = $('#EditRMCIncludingCustomers').val() == '' ? '0.00' : $('#EditRMCIncludingCustomers').val();
var totvalue = (parseFloat(BasicVal) + parseFloat(ServiceTaxAmount)+ parseFloat(EduCessTaxAmount)+ parseFloat(SecHighTaxAmount) + parseFloat(KrishiTaxAmount)+ parseFloat(SwachhTaxAmount));
//+parseFloat(landingCharge)+parseFloat(HighSeasSalesCharge)+parseFloat(CustomDuty)+parseFloat(ExciseDuty)+parseFloat(ExciseDutyEDCess)+parseFloat(ExciseDutySHCess)+parseFloat(CustomEDCess)+parseFloat(CustomSHCess)+parseFloat(AdditionalExciseDuty)+parseFloat(GrossDutyPayable)+parseFloat(AvailableModvat)+parseFloat(GrossExpensesDuetoCustom)+parseFloat(purchaseRate)+parseFloat(CustomDutyExpenses)+parseFloat(RMCIncludingCustomers)
var totvalue = (parseFloat(BasicVal)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst) + parseFloat(OtherAmt)).toFixed(2);
var tot = parseFloat(totvalue).toFixed(2);
//$('#EdittxtTotalOrderValue').val(tot);
$('#EdittxtTotalOrderValue').val(tot);
validateEditExceedLimit();
EditExceedQuantityCheck();
@ -6055,7 +6108,7 @@ function validateEditCapitalTax()
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
basicAmountRate=parseFloat($('#EdittxtTotalOrderValue').val());
}
if(basicAmountRate > avalbudAmt)
{
@ -6102,6 +6155,7 @@ function validateEditCapitalTax()
var CapitalToatlOrder=0;
var TotFreight =0;
var TotDiscount=0;
var TotBasicAmt =0;
for (var i = 1; i < rows; i++) {
var TotalOrderValueSummaryI = $('#ServiceTotalOrderValue'+i).val() == '' ? '0.00' : $('#ServiceTotalOrderValue'+i).val();
@ -6127,7 +6181,9 @@ function validateEditCapitalTax()
var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
var CapitalToatlOrderI = $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
CapitalToatlOrderI = CapitalToatlOrderI - discountedRateValue;
var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
var TotBasicAmtI=parseFloat(CapitalToatlOrderI) + parseFloat(discountedRateValue);
var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
var TotDiscountI =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
TotCgst = parseFloat(TotCgst) + parseFloat(TotalCgstI);
TotSgst = parseFloat(TotSgst) + parseFloat(TotalSgstI);
@ -6147,7 +6203,10 @@ function validateEditCapitalTax()
TotGrossexpense = parseFloat(TotGrossexpense) + parseFloat(TotGrossexpenseI);
TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI);
CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI);
CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI) + parseFloat(TotalCgstI) + parseFloat(TotalSgstI) + parseFloat(TotalIgstI) + parseFloat(TotOtherI);
TotBasicAmt=parseFloat(TotBasicAmt) + parseFloat(TotBasicAmtI);
TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI);
TotDiscount =parseFloat(TotDiscount) + parseFloat(TotDiscountI);
}
@ -6168,7 +6227,8 @@ function validateEditCapitalTax()
$('#txttotalgrossduty').val((parseFloat(TotGrossduty)).toFixed(2) );
$('#txttotalavlmodvat').val((parseFloat(TotAvlmodvat)).toFixed(2) );
$('#txttotalgrossexpense').val((parseFloat(TotGrossexpense)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) );
$('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) );
$('#CapitalBasicOrder').val((parseFloat(TotBasicAmt)).toFixed(2) );
$('#txtTotalDiscount').val(parseFloat(TotDiscount).toFixed(2));
$('#txtTotalFreight').val(parseFloat(TotFreight).toFixed(2));
$('#txtToatlOrder').val((parseFloat(TotalOrderValueSummary)).toFixed(2) );
@ -7035,3 +7095,4 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){