From 1fd98b2aca231f569b48cdc65f4f8aad4093f6ab Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 1 Nov 2017 17:42:50 +0530 Subject: [PATCH] import,capital issue fix --- application/controllers/purchaseorder.php | 3 +- application/models/purchaseorder_model.php | 2 +- application/views/editCapitalPo.php | 188 +++++++++++++++------ application/views/editimportpo.php | 10 +- application/views/importpo.php | 2 +- 5 files changed, 148 insertions(+), 57 deletions(-) diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 9639ba40..9c8c7df8 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -2942,7 +2942,8 @@ $point=0; '18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty', '30' => 'thirty', '40' => 'forty', '50' => 'fifty', '60' => 'sixty', '70' => 'seventy', - '80' => 'eighty', '90' => 'ninety'); + '80' => 'eighty', '90' => 'ninety','06'=>'Zero Six','01'=>'Zero One','02'=>'Zero Two' + ,'03'=>'Zero Three','04'=>'Zero Four','05'=>'Zero Five','07'=>'Zero Seven','08'=>'Zero Eight','09'=>'Zero Nine'); $words1 = array('2' => 'twenty', '3' => 'thirty', '4' => 'fourty', '5' => 'fifty', '6' => 'sixty', '7' => 'seventy', diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index b871bdfe..bab2fbbf 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -1642,7 +1642,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode else if($CapitalRange==0){ $taxQuery ='SELECT group_concat(pl.MaterialCode ORDER BY pl.MaterialCode ASC) as Itemcode, SUM(it.`AfterFreightValue`) AS TotalFreight,it.FreightValue,it.AfterFreightValue, - SUM(it.`AfterIGST`) AS TotalIGST FROM T_Import_Tax it + SUM(it.`IGST`) AS TotalIGST FROM T_Import_Tax it join T_PurchaseOrder_LineItem pl on pl.LineItemNo=it.LineItemNo join T_PurchaseOrder_Master pm on pm.PONO=pl.PONO where pm.POType=? and pm.PONO=? diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php index 1f0dcc5f..e106fc5b 100755 --- a/application/views/editCapitalPo.php +++ b/application/views/editCapitalPo.php @@ -3528,7 +3528,7 @@ $("#PaymentMethod").select2();
- +   Update Capital @@ -6668,23 +6668,62 @@ var Freight=parseFloat($('#txtAfterFreightlocview').val() == '' ? '0.00' : $('#t }); - $('.ViewCapital').click(function(){ - var tr= document.getElementById(userid); - var cellval = tr.cells; +$('.ViewCapital').click(function() +{ + + var tr= document.getElementById(userid); + var cellval = tr.cells; - var FreightType = $("#drpViewFreight").val(); - var FreightVal = $("#txtViewFreight").val(); - var AfterFreightVal = $("#txtViewAfterFreight").val(); - var NoOfTrip = $("#ViewNOOfTrips").val(); - $('#FreightType'+userid).val(FreightType); - $('#FreightVal'+userid).val(FreightVal); - $('#NoOfTrip'+userid).val(NoOfTrip); - - - $('#AfterFreightVal'+userid).val(AfterFreightVal); - populateValueMainFormForViewCapitalTax(); + var FreightType = $("#drpViewFreight").val(); + var FreightVal = $("#txtViewFreight").val(); + var AfterFreightVal = $("#txtViewAfterFreight").val(); + var NoOfTrip = $("#ViewNOOfTrips").val(); + + $('#FreightType'+userid).val(FreightType); + $('#FreightVal'+userid).val(FreightVal); + $('#NoOfTrip'+userid).val(NoOfTrip); + $('#AfterFreightVal'+userid).val(AfterFreightVal); + + + + var Freightloc=$("#drpFreightviewloc").val(); + var Nostriploc=$("#NOOfTripslocview").val(); + var freightvalloc=$("#txtFreightlocview").val(); + var AfterFreightloc=$("#txtAfterFreightlocview").val(); + + var cgst=$("#ViewCgst").val(); + var AfterCgst=$("#ViewAfterCgst").val(); + var sgst=$("#ViewSgst").val(); + var AfterSgst=$("#ViewAfterSgst").val(); + var igst=$("#ViewIgst").val(); + var afterIgst=$("#ViewAfterIgst").val(); + var allowance=$("#ViewOtherAllowances").val(); + + var basicval = $("#ViewCPTotalAmount").val(); + +//console.log(basicval); + + $('#Cgst'+userid).val(cgst); + $('#AfterCgst'+userid).val(AfterCgst); + $('#Sgst'+userid).val(sgst); + $('#AfterSgst'+userid).val(AfterSgst); + $('#Igst'+userid).val(igst); + $('#AfterIgst'+userid).val(afterIgst); + + + $('#Ftype'+userid).val(Freightloc); + $('#NoTrip'+userid).val(Nostriploc); + $('#Fvalue'+userid).val(freightvalloc); + $('#Afvalue'+userid).val(AfterFreightloc); + + + + populateValueMainFormForViewCapitalTax(); + + + +}); - }); function validateEditCapitalTax() { @@ -7007,46 +7046,97 @@ $('#txttotalSubtotal').val((parseFloat(TotalSubtotal)).toFixed(2)); $('#txttotalIgst').val((parseFloat(TotalIgst)).toFixed(2)); } - - function populateValueMainFormForViewCapitalTax() - { +function populateValueMainFormForViewCapitalTax() +{ - var rows = document.getElementById('serviceTax').rows.length; - var TotalOrderValueSummary = 0; + var rows = document.getElementById('serviceTax').rows.length; + var capital=; - var TotCgst = 0; - var TotSgst = 0; - var TotIgst = 0; - var TotOther = 0; + var TotalOrderValueSummary = 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 TotCgst = 0; + var TotSgst = 0; + var TotIgst = 0; + var TotOther = 0; - var TotGrossexpense = 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 CapitalToatlOrder=0; - var TotFreight =0; - var TotDiscount=0; - for (var i = 1; i < rows; i++) { + var TotGrossexpense = 0; + + var CapitalToatlOrder=0; + var TotFreight =0; + var TotDiscount=0; + var TotaFreight =0; + + + for (var i = 1; i < rows; i++) + { - var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val(); - - TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI); - - } +var TotFreightI = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val(); + + TotFreight = parseFloat(TotFreight) + parseFloat(TotFreightI); + +var TotalCgstI = $('#AfterCgst'+i).val() == '' ? '0.00' : $('#AfterCgst'+i).val(); + +var TotalSgstI = $('#AfterSgst'+i).val() == '' ? '0.00' : $('#AfterSgst'+i).val(); + +var TotalIgstI = $('#AfterIgst'+i).val() == '' ? '0.00' : $('#AfterIgst'+i).val(); + +var TotOtherI = $('#OtherAmt'+i).val() == '' ? '0.00' : $('#OtherAmt'+i).val(); + +var TotalFreight = $('#Afvalue'+i).val() == '' ? '0.00' : $('#Afvalue'+i).val(); + +var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val(); + +//console.log(discountedRateValue); + +TotCgst = parseFloat(TotCgst) + parseFloat(TotalCgstI); +TotSgst = parseFloat(TotSgst) + parseFloat(TotalSgstI); +TotIgst = parseFloat(TotIgst) + parseFloat(TotalIgstI); +TotaFreight=parseFloat(TotaFreight)+parseFloat(TotalFreight); + + + +} + + $('#txtTotalFreight').val(parseFloat(TotFreight).toFixed(2)); + + $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) ); + $('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) ); + $('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) ); + $('#TotalFreight').val(parseFloat(TotaFreight).toFixed(2) ); + + var basicval=parseFloat($('#CapitalBasicOrder').val()); + var totdiscount=parseFloat($('#txtTotalDiscount').val()); + var totcgstt=parseFloat($('#txtTotCgst').val()); + var totsgstt=parseFloat($('#txtTotSgst').val()); + var totigstt=parseFloat($('#txtTotIgst').val()); + var totfreightt=parseFloat($('#TotalFreight').val()); + var otherallowance=parseFloat($('#TotalOtherAllowances').val()); + var totorder=parseFloat(basicval)+parseFloat(totcgstt)+parseFloat(totsgstt)+parseFloat(totigstt)+parseFloat(totfreightt)+parseFloat(otherallowance)-parseFloat(totdiscount); + + // console.log(totorder); + + if(capital==1) + { + $('#CapitalToatlOrder').val(parseFloat(totorder).toFixed(2) ); + } + + + + +} - $('#txtTotalFreight').val(parseFloat(TotFreight).toFixed(2)); - - } var DisplayCurrencySymbol=''; var ViewCurrencySymbol=''; var currency = ; diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index c1962ead..549f8dac 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -2750,9 +2750,9 @@ echo form_textarea($data); - - - + + @@ -2762,8 +2762,8 @@ echo form_textarea($data); - - + diff --git a/application/views/importpo.php b/application/views/importpo.php index c0b0481a..ffa20256 100755 --- a/application/views/importpo.php +++ b/application/views/importpo.php @@ -3379,7 +3379,7 @@ function calculateFreight(isEdit) var FreightType =$("#drpFreight").val(); if(FreightType == "0") { - alert('Please select Freight Type'); + //alert('Please select Freight Type'); $('#txtFreight').val(''); $("#drpFreight").focus(); }