From 7bb7fa2ff1f59a23cc1f0d0ca2cd8c0ccc223ea5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 26 Aug 2014 12:46:52 +0200 Subject: [PATCH] Bug 12839: aqbooksellers.gstreg is never used The aqbooksellers.gstreg is never used in the code. This patch does not remove the DB field but 3 useless occurrences in the neworderempty page. The both variable applygst and gstreg have never been took into account for prices calculation. Test plan: Verify there is no difference before and after the patch in the prices calculation. Signed-off-by: Paola Rossi Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d311722445f5d887e1054be2d1c99128f3b8207d) Signed-off-by: Chris Cormack --- acqui/neworderempty.pl | 1 - koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 1 - 3 files changed, 3 deletions(-) diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 256175a3fb..69a194ab6b 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -390,7 +390,6 @@ $template->param( rrp => $data->{'rrp'}, gst_values => \@gst_values, gstrate => $data->{gstrate} ? $data->{gstrate}+0.0 : $bookseller->{gstrate} ? $bookseller->{gstrate}+0.0 : 0, - gstreg => $bookseller->{'gstreg'}, listprice => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice), total => sprintf( "%.2f", ($data->{ecost} || 0) * ($data->{'quantity'} || 0) ), ecost => sprintf( "%.2f", $data->{ecost} || 0), diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js index 3bac18bc8a..ddd95bc9c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js @@ -178,7 +178,6 @@ function messenger(X,Y,etc){ // FIXME: unused? function updateCosts(){ var quantity = new Number($("#quantity").val()); var discount = new Number($("#discount").val()); - var applygst = new Number ($("#applygst").val()); var listprice = new Number($("#listprice").val()); var currcode = new String($("#currency").val()); var exchangerate = new Number($("#currency_rate_"+currcode).val()); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 21b48a8cf1..fcf15a0090 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -242,7 +242,6 @@ $(document).ready(function() - -- 2.39.5