diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 86e6e993..bf63e13b 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -243,15 +243,15 @@ function purchaseorderListing($forwhat='') } //get available budget for capital - function GetAvailableCapitalBudgetAmount($CostCode,$Year,$BudgetType) + function GetAvailableCapitalBudgetAmount($CostCode,$Year,$BudgetType) { - $subQuery ='select BudgetAmount, (select ifnull(sum(IF(POMaster.ExchangeRate>0,Quantity*Rate*POMaster.ExchangeRate,POMaster.TotalOrderValue)),0) as Totalvalue from + $subQuery ='select BudgetAmount, (select ifnull(sum(IF(POMaster.ExchangeRate>0,Quantity*Rate*POMaster.ExchangeRate,Quantity*Rate-tax.Afterdiscountval)),0) as Totalvalue from T_PurchaseOrder_LineItem Item join T_Requestion_Master mast - on mast.ReqNo = Item.ReqNo join T_PurchaseOrder_Master POMaster on POMaster.PONO=Item.PONO where Item.CostCenterCode=? and mast.ReqType=? and POMaster.status not in (?))as Totalvalue + on mast.ReqNo = Item.ReqNo join T_PurchaseOrder_Master POMaster on POMaster.PONO=Item.PONO left join T_Service_Tax tax on tax.LineItemNo=Item.LineItemNo where Item.CostCenterCode=? and mast.ReqType=? and POMaster.status not in (?))as Totalvalue from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and BudgetYear = ? and BudgetType =?'; - + $query = $this->db->query($subQuery,array($CostCode,$BudgetType,PO_AMENDED,$CostCode,$Year,$BudgetType)); return $query->result_array(); diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php index 46d06526..7c7a2c62 100755 --- a/application/views/capitalpurchaseorder.php +++ b/application/views/capitalpurchaseorder.php @@ -918,7 +918,7 @@ function vaildateBeforeOpenModal()
- +
'txtAfterDiscount','value' => set_value('txtAfterDiscount',0.00),'id'=>'txtAfterDiscount', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -1327,7 +1327,7 @@ function vaildateBeforeOpenModal()
- Freight Amt In INR + Freight Amt
'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -1610,7 +1610,7 @@ function vaildateBeforeOpenModal()
- +
'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2020,7 +2020,7 @@ function vaildateBeforeOpenModal()
- Freight Amt In INR + Freight Amt
'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -2144,9 +2144,18 @@ function vaildateBeforeOpenModal()
-
+
+
+ + + 'txtTotalDiscount','value' => set_value('txtTotalDiscount'),'id'=>'txtTotalDiscount', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
- + 'txtTotCgst','value' => set_value('txtTotCgst'),'id'=>'txtTotCgst', 'class' => 'form-control num' ,'readonly' => 'true'); echo form_input($data); @@ -2155,21 +2164,21 @@ function vaildateBeforeOpenModal()
- + 'txtTotSgst','value' => set_value('txtTotSgst'),'id'=>'txtTotSgst', 'class' => 'form-control num' ,'readonly' => 'true'); echo form_input($data); ?>
- + 'txtTotIgst','value' => set_value('txtTotIgst'),'id'=>'txtTotIgst', 'class' => 'form-control num' ,'readonly' => 'true'); echo form_input($data); ?>
- + 'TotalOtherAllowances','value' => set_value('TotalOtherAllowances'),'id'=>'TotalOtherAllowances', 'class' => 'form-control num' ,'readonly' => 'true'); echo form_input($data); @@ -2292,12 +2301,21 @@ function vaildateBeforeOpenModal() echo form_input($data); ?>
+
+ + + 'txtTotalFreight','value' => set_value('txtTotalFreight'),'id'=>'txtTotalFreight', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
- + 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder'),'id'=>'CapitalToatlOrder', 'class' => 'form-control num' ,'readonly' => 'true',); @@ -3505,12 +3523,12 @@ var purchaseRate = $('#purchaserate').val(); $('#CPRate').focus(); return false; } - else if($('#ItemDescription').val() == '') + /* else if($('#ItemDescription').val() == '') { alert('Please Enter the Capital Description'); $('#ItemDescription').focus(); return false; - } + } */ else { return true; @@ -3644,7 +3662,11 @@ var purchaseRate = $('#purchaserate').val(); $('#txttotalgrossduty').val((parseFloat(TotGrossduty) + parseFloat(GrossDutyPayable)).toFixed(2) ); $('#txttotalavlmodvat').val((parseFloat(TotAvlmodvat) + parseFloat(AvailableModvat)).toFixed(2) ); $('#txttotalgrossexpense').val((parseFloat(TotGrossexpense) + parseFloat(GrossExpensesDuetoCustom)).toFixed(2) ); - + var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val(); + var totDiscountAmt = $('#txtTotalDiscount').val() == '' ? '0.00' : $('#txtTotalDiscount').val(); + var totFreightAmt = $('#txtTotalFreight').val() == '' ? '0.00' : $('#txtTotalFreight').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) ); @@ -3807,7 +3829,8 @@ function DeleteRow(rowid) var TotGrossexpense = 0; var CapitalToatlOrder=0; - + var TotFreight =0; + var TotDiscount=0; for (var i = 1; i < rows; i++) { if(deletedRow==i){ $('#AfterCgst'+i).val(''); @@ -3830,7 +3853,8 @@ function DeleteRow(rowid) $('#AvailableModvat'+i).val(''); $('#GrossExpensesDuetoCustom'+i).val(''); $('#basicval'+i).val(''); - + $('#AfterFreightVal'+i).val(''); + $('#AfterDisVal'+i).val(''); $('#ServiceTotalOrderValue'+i).val(''); @@ -3857,10 +3881,12 @@ function DeleteRow(rowid) var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val(); var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val(); - + var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val(); + var TotDiscountI =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val(); var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val(); CapitalToatlOrderI = CapitalToatlOrderI-discountedRateValue; + } else if(deletedRow!=i){ @@ -3890,11 +3916,15 @@ 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 TotDiscountI =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val(); + } else{ } - + TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI); + TotDiscount =parseFloat(TotDiscount) + parseFloat(TotDiscountI); TotCgst = parseFloat(TotCgst) + parseFloat(TotCgstI); TotSgst = parseFloat(TotSgst) + parseFloat(TotSgstI); TotIgst = parseFloat(TotIgst) + parseFloat(TotIgstI); @@ -3918,7 +3948,8 @@ function DeleteRow(rowid) CapitalToatlOrder=parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI); } - + $('#txtTotalDiscount').val(parseFloat(TotDiscount).toFixed(2)); + $('#txtTotalFreight').val(parseFloat(TotFreight).toFixed(2) ); $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) ); $('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) ); $('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) ); @@ -4557,7 +4588,7 @@ function clearAfterAddLineItemAdd(){ $('#per'+userid).val(editPer); $('#quantity'+userid).val(quantity); $('#rateInUs'+userid).val(itemRate); - + $('#itemRate'+userid).val(itemRate); $('#basicval'+userid).val(basicval); $('#basicvalInINR'+userid).val(basicvalInINR); @@ -4677,12 +4708,12 @@ function validateEditCapitalTax() $('#EditCPRate').focus(); return false; } - else if($('#EditItemDescription').val() == '') + /* else if($('#EditItemDescription').val() == '') { alert('Please Enter the Capital Description'); $('#EditItemDescription').focus(); return false; - } + } */ else { return true; @@ -4807,7 +4838,8 @@ function validateEditCapitalTax() var TotGrossexpense = 0; var CapitalToatlOrder=0; - + var TotFreight =0; + var TotDiscount=0; for (var i = 1; i < rows; i++) { var TotalOrderValueSummaryI = $('#ServiceTotalOrderValue'+i).val() == '' ? '0.00' : $('#ServiceTotalOrderValue'+i).val(); @@ -4828,7 +4860,8 @@ function validateEditCapitalTax() var TotAdditionalExcisedutyI = $('#AdditionalExciseDuty'+i).val() == '' ? '0.00' : $('#AdditionalExciseDuty'+i).val(); var TotGrossdutyI = $('#GrossDutyPayable'+i).val() == '' ? '0.00' : $('#GrossDutyPayable'+i).val(); 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; @@ -4852,7 +4885,8 @@ function validateEditCapitalTax() TotGrossexpense = parseFloat(TotGrossexpense) + parseFloat(TotGrossexpenseI); TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI); CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI); - + TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI); + TotDiscount =parseFloat(TotDiscount) + parseFloat(TotDiscountI); } $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) ); @@ -4874,8 +4908,9 @@ function validateEditCapitalTax() $('#txttotalgrossexpense').val((parseFloat(TotGrossexpense)).toFixed(2) ); $('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) ); - $('#txtToatlOrder').val((parseFloat(TotalOrderValueSummary)).toFixed(2) ); - + + $('#txtTotalDiscount').val(parseFloat(TotDiscount).toFixed(2)); + $('#txtTotalFreight').val(parseFloat(TotFreight).toFixed(2) ); } $("#CurrencySymbol").val(''); var DisplayCurrencySymbol=''; @@ -4895,6 +4930,7 @@ $('#TotalAmount').html('Basic value in' + " "+obj.FontCode2000); $('#EditTotalAmount').html('Basic value in' + " "+obj.FontCode2000); DisplayCurrencySymbol=obj.FontCode2000; $("p").html(obj.FontCode2000); +$('#lbl_international').html('Total Order Value (' + ""+obj.FontCode2000+')'); } @@ -4928,6 +4964,8 @@ function SetCapitalPo() $('#datedomestic').hide(); $('#dispatchinternational').show(); + + } else { @@ -5032,6 +5070,9 @@ $("#PaymentMethod").change(function() { $('#txtToatlOrder').val(0); $('#CapitalToatlOrder').val(0); + + $('#txtTotalDiscount').val(''); + $('#txtTotalFreight').val(''); } diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php index 9c10074a..02509ed2 100755 --- a/application/views/editCapitalAmendPO.php +++ b/application/views/editCapitalAmendPO.php @@ -1260,7 +1260,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
- +
'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -1683,7 +1683,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
- Freight Amt In INR + Freight Amt
'AmendtxtAfterFreight','value' => set_value('AmendtxtAfterFreight'),'id'=>'AmendtxtAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -1802,14 +1802,14 @@ document.getElementById('dispatchinternational').style.display = 'block';
- + 'txtTotalDiscount','value' => set_value('txtTotalDiscount',number_format($TotalDiscountedAmt, 2, '.', '')),'id'=>'txtTotalDiscount', 'class' => 'form-control num' ,'readonly' => 'true'); echo form_input($data); ?>
- + 'txtTotCgst','value' => set_value('txtTotCgst',number_format($TotalCGST, 2, '.', '')),'id'=>'txtTotCgst', 'class' => 'form-control num' ,'readonly' => 'true'); echo form_input($data); @@ -1818,7 +1818,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
- + 'txtTotSgst','value' => set_value('txtTotSgst' ,number_format($TotalSGST, 2, '.', '')),'id'=>'txtTotSgst', 'class' => 'form-control num' ,'readonly' => 'true'); echo form_input($data); @@ -1835,7 +1835,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
- + 'TotalOtherAllowances','value' => set_value('TotalOtherAllowances',number_format($Totalotherallowances, 2, '.', '')),'id'=>'TotalOtherAllowances', 'class' => 'form-control num' ,'readonly' => 'true'); echo form_input($data); @@ -1843,7 +1843,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
- + 'Totalservicesummary','value' => set_value('Totalservicesummary',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'Totalservicesummary', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -1861,7 +1861,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
- + 'txttotalfrieght','value' => set_value('txttotalfrieght',$TotalFrieght),'id'=>'txttotalfrieght', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2002,7 +2002,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
-->
- + 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'CapitalToatlOrder', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -3979,7 +3979,7 @@ $('#TotalAmount').html('Basic Value in' + " "+DisplayCurrencySymbol); $('#EditTotalAmount').html('Basic Value in' + " "+DisplayCurrencySymbol); //$('#ViewTotalAmount').html('Basic Value in' + " "+ViewCurrencySymbol); // $('#ViewRateIn').html('Rate(in' + " "+ViewCurrencySymbol + '/'+DisplayUOM+')'); - +$('#lbl_international').html('Total Order Value (' + ""+DisplayCurrencySymbol+')'); } diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php index 6f80958a..20e23a15 100755 --- a/application/views/editCapitalPo.php +++ b/application/views/editCapitalPo.php @@ -53,6 +53,8 @@ $totordervalue=0; $ExchangeRate=0; $totorder=0; + $totDis=0; + $totFreight=0; $ExchangeRate=''; $PaymentTerms=''; $PaymentDays=''; @@ -866,6 +868,8 @@ $("#PaymentMethod").select2(); $index = 0; $totalCapitalOrder=0; $TotalDiscountedAmt=0; + $TotalFreightAmt=0; + $ExitDiscountedAmt=0; foreach($POItem as $record) { $index = $index + 1; @@ -1008,6 +1012,7 @@ $("#PaymentMethod").select2(); $OtherAmt = $OtherAmt + $record->otherallowance; $TotalSummary = $TotalSummary+$record->ServiceTaxamount; $TotalDiscountedAmt = $record->Afterdiscountval; + $ExitDiscountedAmt=$ExitDiscountedAmt+$record->Afterdiscountval; } $TotalBasicAmount = $TotalBasicAmount+$record->BasicValue; $ServiceDescription = $ServiceDescription; @@ -1024,11 +1029,11 @@ $("#PaymentMethod").select2(); $totaddtnlexcise= $totaddtnlexcise + $record->AfterAddlExciseDuty; $totgrossduty = $totgrossduty + $record->Grossdutypayable; $totavlmodvat = $totavlmodvat +$record->AvailableModvat; - + $TotalFreightAmt = $TotalFreightAmt+$record->AfterFreightValue; $totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty; $ExchangeRate=$record->ExchangeRate; - + } @@ -3149,7 +3154,16 @@ $("#PaymentMethod").select2();
-
+
+
+ + + 'txtTotalDiscount','value' => set_value('txtTotalDiscount',number_format($ExitDiscountedAmt, 2, '.', '')),'id'=>'txtTotalDiscount', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
- +
+ + + 'txtTotalFreight','value' => set_value('txtTotalFreight',number_format($TotalFreightAmt, 2, '.', '')),'id'=>'txtTotalFreight', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
- + 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'CapitalToatlOrder', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -4535,12 +4557,12 @@ var purchaseRate = $('#purchaserate').val(); $('#CPRate').focus(); return false; } - else if($('#ItemDescription').val() == '') + /* else if($('#ItemDescription').val() == '') { alert('Please Enter the Capital Description'); $('#ItemDescription').focus(); return false; - } + } */ else { return true; @@ -4654,7 +4676,11 @@ var purchaseRate = $('#purchaserate').val(); var TotGrossexpense = $('#txttotalgrossexpense').val() == '' ? '0.00' : $('#txttotalgrossexpense').val(); var TotalCapitalOrder = $('#CapitalToatlOrder').val() == '' ? '0.00' : $('#CapitalToatlOrder').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(); + $('#txtTotalDiscount').val((parseFloat(totDiscountAmt) + parseFloat(disRate)) .toFixed(2)); + $('#txtTotalFreight').val((parseFloat(totFreightAmt) + parseFloat(Freight)).toFixed(2)); $('#txtTotCgst').val((parseFloat(TotalCgst) + parseFloat(AfterCgst)).toFixed(2) ); $('#txtTotSgst').val((parseFloat(TotSgst) + parseFloat(AfterSgst)).toFixed(2) ); $('#txtTotIgst').val((parseFloat(TotalIgst) + parseFloat(AfterIgst)).toFixed(2) ); @@ -4904,7 +4930,8 @@ function DeleteRow(rowid) var TotGrossexpense = 0; var CapitalToatlOrder=0; - + var TotFreight =0; + var TotDiscount=0; for (var i = 1; i < rows; i++) { if(deletedRow==i){ $('#AfterCgst'+i).val(''); @@ -4953,6 +4980,8 @@ 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 TotDiscountI =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val(); } else if(deletedRow!=i){ @@ -4981,12 +5010,15 @@ 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; + CapitalToatlOrderI = CapitalToatlOrderI-discountedRateValue; + var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val(); + var TotDiscountI =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val(); } else{ } - + TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI); + TotDiscount =parseFloat(TotDiscount) + parseFloat(TotDiscountI); TotCgst = parseFloat(TotCgst) + parseFloat(TotCgstI); TotSgst = parseFloat(TotSgst) + parseFloat(TotSgstI); TotIgst = parseFloat(TotIgst) + parseFloat(TotIgstI); @@ -5008,7 +5040,8 @@ function DeleteRow(rowid) CapitalToatlOrder=parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI); } - + $('#txtTotalDiscount').val(parseFloat(TotDiscount).toFixed(2)); + $('#txtTotalFreight').val(parseFloat(TotFreight).toFixed(2) ); $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) ); $('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) ); $('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) ); @@ -5858,7 +5891,7 @@ function clearAfterAddLineItemAdd(){ $('#AfterFreightVal'+userid).val(AfterFreightVal); - + populateValueMainFormForViewCapitalTax(); }); function validateEditCapitalTax() @@ -5906,12 +5939,12 @@ function validateEditCapitalTax() $('#EditCPRate').focus(); return false; } - else if($('#EditItemDescription').val() == '') + /* else if($('#EditItemDescription').val() == '') { alert('Please Enter the Capital Description'); $('#EditItemDescription').focus(); return false; - } + } */ else { return true; @@ -6034,7 +6067,8 @@ function validateEditCapitalTax() var TotGrossexpense = 0; var CapitalToatlOrder=0; - + var TotFreight =0; + var TotDiscount=0; for (var i = 1; i < rows; i++) { var TotalOrderValueSummaryI = $('#ServiceTotalOrderValue'+i).val() == '' ? '0.00' : $('#ServiceTotalOrderValue'+i).val(); @@ -6060,6 +6094,8 @@ 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 TotDiscountI =$('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val(); TotCgst = parseFloat(TotCgst) + parseFloat(TotalCgstI); TotSgst = parseFloat(TotSgst) + parseFloat(TotalSgstI); TotIgst = parseFloat(TotIgst) + parseFloat(TotalIgstI); @@ -6079,7 +6115,8 @@ function validateEditCapitalTax() TotGrossexpense = parseFloat(TotGrossexpense) + parseFloat(TotGrossexpenseI); TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI); CapitalToatlOrder = parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI); - + TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI); + TotDiscount =parseFloat(TotDiscount) + parseFloat(TotDiscountI); } $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) ); @@ -6099,10 +6136,51 @@ function validateEditCapitalTax() $('#txttotalavlmodvat').val((parseFloat(TotAvlmodvat)).toFixed(2) ); $('#txttotalgrossexpense').val((parseFloat(TotGrossexpense)).toFixed(2) ); $('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) ); - + $('#txtTotalDiscount').val(parseFloat(TotDiscount).toFixed(2)); + $('#txtTotalFreight').val(parseFloat(TotFreight).toFixed(2)); $('#txtToatlOrder').val((parseFloat(TotalOrderValueSummary)).toFixed(2) ); } + + function populateValueMainFormForViewCapitalTax() + { + + var rows = document.getElementById('serviceTax').rows.length; + var TotalOrderValueSummary = 0; + + var TotCgst = 0; + var TotSgst = 0; + var TotIgst = 0; + var TotOther = 0; + + var TotLanding = 0; + var TotHighseas = 0; + var TotCustom = 0; + var TotExcise = 0; + var TotExciseED = 0; + var TotExciseSH = 0; + var TotCustomED = 0; + var TotCustomSH = 0; + var TotAdditionalExciseduty = 0; + var TotGrossduty = 0; + var TotAvlmodvat = 0; + + var TotGrossexpense = 0; + + var CapitalToatlOrder=0; + var TotFreight =0; + var TotDiscount=0; + for (var i = 1; i < rows; i++) { + + var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val(); + + TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI); + + } + + $('#txtTotalFreight').val(parseFloat(TotFreight).toFixed(2)); + + } var DisplayCurrencySymbol=''; var ViewCurrencySymbol=''; var currency = ; @@ -6119,6 +6197,7 @@ $('#RateIn').html('Rate(in' + " "+obj.FontCode2000 + '/'+DisplayUOM+')'); $('#EditRateIn').html('Rate(in' + " "+obj.FontCode2000 + '/'+DisplayUOM+')'); $('#TotalAmount').html('Basic Value in' + " "+DisplayCurrencySymbol); $('#EditTotalAmount').html('Basic Value in' + " "+DisplayCurrencySymbol); +$('#lbl_international').html('Total Order Value (' + ""+DisplayCurrencySymbol+')'); //$('#ViewTotalAmount').html('Basic Value in' + " "+ViewCurrencySymbol); // $('#ViewRateIn').html('Rate(in' + " "+ViewCurrencySymbol + '/'+DisplayUOM+')'); @@ -6140,7 +6219,7 @@ $('#RateIn').html('Rate(in' + " "+obj.FontCode2000 + '/Ton)'); $('#EditRateIn').html('Rate(in' + " "+obj.FontCode2000 + '/Ton)'); $('#TotalAmount').html('Basic Value in' + " "+DisplayCurrencySymbol); $('#EditTotalAmount').html('Basic Value in' + " "+DisplayCurrencySymbol); - + $('#lbl_international').html('Total Order Value (' + ""+obj.FontCode2000+')'); @@ -6913,3 +6992,4 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){ +