Attachment 31753 Details for Bug 11708 – Bug 11708: Remove the amount columns

[patch] Bug 11708: Remove the amount columns

0006-Bug-11708-Remove-the-amount-columns.patch (text/plain), 6.97 KB, created by Paola Rossi on 2014-09-19 16:32:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paola Rossi

Created: 2014-09-19 16:32:27 UTC

Size: 6.97 KB

patch

obsolete

>From cb8115973a9b50c376dcf0c47522f277ecf2c66c 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 6/6] Bug 11708: Remove the amount columns
>
>This should be managed in a specific bug.
>
>Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
>---
> 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>
>-- 
>1.7.10.4
>

Actions: View | Diff | Splinter Review

Attachments on bug 11708: 25115 | 25116 | 25117 | 26003 | 26004 | 26006 | 28868 | 28869 | 28870 | 28871 | 28872 | 31305 | 31306 | 31307 | 31308 | 31309 | 31530 | 31531 | 31532 | 31533 | 31534 | 31535 | 31536 | 31537 | 31538 | 31539 | 31540 | 31541 | 31542 | 31543 | 31544 | 31702 | 31703 | 31704 | 31705 | 31748 | 31749 | 31750 | 31751 | 31752 | 31753 | 32909 | 32910 | 32911 | 32912 | 32913 | 32914 | 33308 | 33309 | 33310 | 33311 | 33312 | 33313 | 34936 | 34937 | 34938 | 34939 | 34940 | 34941 | 34977 | 35748 | 35749 | 35750 | 35751 | 35752 | 35753 | 35754 | 35755 | 35756 | 35971 | 35972 | 35973 | 35974 | 35975 | 35976 | 35977 | 35978 | 35979 | 40260 | 40261 | 40262 | 40263 | 40264 | 40265 | 40266 | 40267 | 40268 | 40272 | 48992 | 48993 | 48994 | 48995 | 48996 | 52417 | 52418 | 52419 | 52420 | 52421 | 55277 | 55278 | 55279 | 58770 | 58771 | 58772 | 58773 | 58774 | 58775 | 58776 | 58777 | 58778 | 59301 | 59302 | 59303 | 59304 | 59305 | 59306 | 59307 | 59308 | 59309 | 61018 | 61019 | 61020 | 61021 | 61022 | 61023 | 61024 | 61025 | 61026 | 71260 | 71261 | 71262 | 71263 | 71264 | 71265 | 71266 | 71267 | 71268 | 72069 | 72070 | 72071 | 72072 | 72073 | 72074 | 72075 | 72076 | 72077 | 72691 | 72692 | 72693 | 72694 | 72695 | 72696 | 72697 | 72698 | 72699 | 74213 | 74214 | 74215 | 74216 | 74217 | 74218 | 74219 | 74220 | 74221 | 74222 | 74302 | 74303 | 74304 | 74305 | 74306 | 74307 | 74308 | 74309 | 74310 | 74311 | 74349 | 74350 | 74351 | 74352 | 74353 | 74354 | 74355 | 74356 | 74357 | 74358 | 75003 | 75004 | 75908 | 75909 | 78662 | 78663 | 78664 | 80697 | 80698 | 80699 | 80700 | 80979 | 80980 | 80981 | 80982 | 85786 | 85787 | 91285 | 91286 | 92378 | 92379 | 92380 | 92381 | 92382 | 93460 | 93461 | 93462 | 93463 | 93464 | 93482 | 93483 | 93484 | 93485 | 93487 | 104928 | 104929 | 104930 | 104931 | 104932 | 104933 | 104934 | 104935