From 5a4189c9cae2670cdb81e67056c0d8d3ff9e66cd Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
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) {
                                                 <th>Search no. of ordered titles</th>
                                                 <th>Search no. of received titles</th>
                                                 <th></th>
-                                                <th></th>
-                                                <th></th>
                                             </tr>
                                             <tr>
                                                 <th>Name</th>
@@ -371,8 +367,6 @@ function submitForm(form) {
                                                 <th>No. of baskets</th>
                                                 <th>No. of ordered titles</th>
                                                 <th>No. of received titles</th>
-                                                <th>Amount ordered</th>
-                                                <th>Amount spent</th>
                                                 <th>Action</th>
                                             </tr>
                                         </thead>
@@ -393,8 +387,6 @@ function submitForm(form) {
                                                         <td>[% basketgroup.basketsqty %]</td>
                                                         <td>[% basketgroup.ordered_titles_count %]</td>
                                                         <td>[% basketgroup.received_titles_count %]</td>
-                                                        <td>[% basketgroup.ordered_amount %]</td>
-                                                        <td>[% basketgroup.charged_amount %]</td>
                                                         <td>
                                                             <input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
                                                             <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
@@ -419,8 +411,6 @@ function submitForm(form) {
                                                 <th>Search no. of ordered titles</th>
                                                 <th>Search no. of received titles</th>
                                                 <th></th>
-                                                <th></th>
-                                                <th></th>
                                             </tr>
                                             <tr>
                                                 <th>Name</th>
@@ -431,8 +421,6 @@ function submitForm(form) {
                                                 <th>No. of baskets</th>
                                                 <th>No. of ordered titles</th>
                                                 <th>No. of received titles</th>
-                                                <th>Amount ordered</th>
-                                                <th>Amount spent</th>
                                                 <th>Action</th>
                                             </tr>
                                         </thead>
@@ -454,8 +442,6 @@ function submitForm(form) {
                                                         <td>[% basketgroup.basketsqty %]</td>
                                                         <td>[% basketgroup.ordered_titles_count %]</td>
                                                         <td>[% basketgroup.received_titles_count %]</td>
-                                                        <td>[% basketgroup.ordered_amount %]</td>
-                                                        <td>[% basketgroup.charged_amount %]</td>
                                                         <td>
                                                             <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
                                                             <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
-- 
2.1.0