From 5a4189c9cae2670cdb81e67056c0d8d3ff9e66cd Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 18 Sep 2014 14:05:16 +0200 Subject: [PATCH] Bug 11708: Remove the amount columns This should be managed in a specific bug. --- acqui/basketgroup.pl | 4 ---- .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 14 -------------- 2 files changed, 18 deletions(-) diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl index 0087d1d..1985fbe 100755 --- a/acqui/basketgroup.pl +++ b/acqui/basketgroup.pl @@ -414,18 +414,14 @@ if ( $op eq "add" ) { foreach my $basketgroup (@{ $bookseller->{basketgroups} }) { my $baskets = GetBasketsByBasketgroup($basketgroup->{id}); $basketgroup->{basketsqty} = 0; - $basketgroup->{ordered_amount} = 0.0; - $basketgroup->{charged_amount} = 0.0; my (@ordered_biblionumbers, @received_biblionumbers); foreach my $basket (@$baskets) { $basketgroup->{basketsqty} += 1; my @orders = GetOrders($basket->{basketno}); foreach my $order (@orders) { push @ordered_biblionumbers, $order->{biblionumber}; - $basketgroup->{ordered_amount} += $order->{ecost} * $order->{quantity}; if ($order->{datereceived}) { push @received_biblionumbers, $order->{biblionumber}; - $basketgroup->{charged_amount} += $order->{ecost} * $order->{quantity}; } } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index eec68d0..93254a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -126,8 +126,6 @@ function submitForm(form) { { type: "text" }, { type: "text" }, { type: "text" }, - null, - null, null ] }; @@ -360,8 +358,6 @@ function submitForm(form) { Search no. of ordered titles Search no. of received titles - - Name @@ -371,8 +367,6 @@ function submitForm(form) { No. of baskets No. of ordered titles No. of received titles - Amount ordered - Amount spent Action @@ -393,8 +387,6 @@ function submitForm(form) { [% basketgroup.basketsqty %] [% basketgroup.ordered_titles_count %] [% basketgroup.received_titles_count %] - [% basketgroup.ordered_amount %] - [% basketgroup.charged_amount %]
@@ -419,8 +411,6 @@ function submitForm(form) { Search no. of ordered titles Search no. of received titles - - Name @@ -431,8 +421,6 @@ function submitForm(form) { No. of baskets No. of ordered titles No. of received titles - Amount ordered - Amount spent Action @@ -454,8 +442,6 @@ function submitForm(form) { [% basketgroup.basketsqty %] [% basketgroup.ordered_titles_count %] [% basketgroup.received_titles_count %] - [% basketgroup.ordered_amount %] - [% basketgroup.charged_amount %]
-- 2.1.0