From 5a8a78cfc6ceea5adf909f7d3a7c6021460ef029 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 24 Aug 2017 18:08:17 +0530 Subject: [PATCH] import label change --- application/views/editImportAmendPO.php | 3 ++- application/views/editimportpo.php | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php index cbcff9b5..ca289552 100755 --- a/application/views/editImportAmendPO.php +++ b/application/views/editImportAmendPO.php @@ -3048,6 +3048,7 @@ $('#editimportpomodel').on("shown.bs.modal", function(e) { console.log(c); $('#EditINRBasicvalue').val(c); + $('#EditAfterBasicPriceTax').val(c); $('#EditLandingCharge').val($("#LandingCharge"+userid).val()); $('#EditAfterLandingCharge').val($("#AfterLandingCharge"+userid).val()); $('#EditHighseas').val($("#HighSeasSalesCharge"+userid).val()); @@ -3073,7 +3074,7 @@ $('#editimportpomodel').on("shown.bs.modal", function(e) { $('#Editpurchaserate').val($("#purchaseratePerKG"+userid).val()); $('#EditCustomDutyExpenses').val($("#CustomDutyExpensesPerKG"+userid).val()); $('#EditRMCIncludingCustomers').val($("#RMCIncludingCustomersPerKG"+userid).val()); - $('#EditAfterBasicPriceTax').val($("#BasicINRValue"+userid).val()); + //$('#EditAfterBasicPriceTax').val($("#BasicINRValue"+userid).val()); $('#EditAvailableModvat').val($("#AvailableModvat"+userid).val()); $('#EditTotalExp').val($("#TotalValue"+userid).val()); //$('#EditINRBasicvalue').val($("#BasicINRValue"+userid).val()); diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index f4ef1ff6..f1989a85 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -2269,7 +2269,7 @@ if($PONOStatus == PO_RELEASED) ?> -
+ @@ -4311,6 +4311,7 @@ $("#viewimportmodal").on("shown.bs.modal", function(e) { // console.log(c); $('#ViewINRBasicvalue').val(c); + $('#ViewAfterBasicPriceTax').val(c); $('#ViewLandingCharge').val($("#LandingCharge"+userid).val()); $('#ViewAfterLandingCharge').val($("#AfterLandingCharge"+userid).val()); @@ -4338,7 +4339,7 @@ $("#viewimportmodal").on("shown.bs.modal", function(e) { $('#Viewpurchaserate').val($("#purchaseratePerKG"+userid).val()); $('#ViewCustomDutyExpenses').val($("#CustomDutyExpensesPerKG"+userid).val()); $('#ViewRMCIncludingCustomers').val($("#RMCIncludingCustomersPerKG"+userid).val()); - $('#ViewAfterBasicPriceTax').val($("#BasicINRValue"+userid).val()); + //$('#ViewAfterBasicPriceTax').val($("#BasicINRValue"+userid).val()); $('#ViewAvailableModvat').val($("#AvailableModvat"+userid).val()); $('#ViewTotalExp').val($("#TotalValue"+userid).val()); // $('#ViewINRBasicvalue').val($("#BasicINRValue"+userid).val()); @@ -4658,7 +4659,7 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) { var c=a*b; // console.log(c); $('#EditINRBasicvalue').val(c); - + $('#EditAfterBasicPriceTax').val(c); // var a=parseFloat($('#BasicINRValue'+userid).val()); // console.log(a); @@ -4690,7 +4691,7 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) { $('#Editpurchaserate').val($("#purchaseratePerKG"+userid).val()); $('#EditCustomDutyExpenses').val($("#CustomDutyExpensesPerKG"+userid).val()); $('#EditRMCIncludingCustomers').val($("#RMCIncludingCustomersPerKG"+userid).val()); - $('#EditAfterBasicPriceTax').val($("#BasicINRValue"+userid).val()); + //$('#EditAfterBasicPriceTax').val($("#BasicINRValue"+userid).val()); $('#EditAvailableModvat').val($("#AvailableModvat"+userid).val()); $('#EditTotalExp').val($("#TotalValue"+userid).val()); //$('#EditINRBasicvalue').val($("#BasicINRValue"+userid).val());