fix for #407

diff --git a/acqui/modorders.pl b/acqui/modorders.pl
deleted file mode 100755 (executable)
index 925ba2a..0000000
--- a/acqui/modorders.pl
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/perl
-
-#script to add an order into the system
-#written 29/2/00 by chris@katipo.co.nz
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Output;
-use C4::Catalogue;
-use C4::Biblio;
-
-my $input = new CGI;
-my $basketno=$input->param('basketno');
-my $count=$input->param('number');
-for (my $i=0;$i<$count;$i++){
-       my  $bibnum=$input->param("bibnum$i");
-       my $ordnum=$input->param("ordnum$i");
-       my $quantity=$input->param("quantity$i");
-       if ($quantity == 0){
-               delorder($bibnum,$ordnum);
-       }
-}
-print $input->redirect("basket.pl?basket=$basketno");

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
index c3d2d0c..9f8db5c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
@@ -3,11 +3,7 @@
 <h1>Shopping Basket <TMPL_VAR name="basket"> for <a href=supplier.pl?id=<TMPL_VAR name="booksellerid">></a> <TMPL_VAR name="name"></h1><br />
 (Our Reference: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, authorised by: <TMPL_VAR name="loggedinusername">)<br />
 <CENTER>
-<!--<FORM ACTION="/cgi-bin/koha/search.pl" method=post>
-<b>Search ISBN, Title or Author:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
-</form> -->
 <p>
-<FORM ACTION="/cgi-bin/koha/acqui/modorders.pl" method=post name=orderform>
 <table border=0 cellspacing=0 cellpadding=5>
        <tr valign=top bgcolor="#ffdf61">
                <td width="5%"><b>Order</b></td>
@@ -25,12 +21,10 @@
                        <td><TMPL_VAR name="isbn"></td>
                        <td><a href="newbiblio.pl?ordnum=<TMPL_VAR name="ordernumber">&id=<TMPL_VAR name="booksellerid">&basket=<TMPL_VAR name="basket">"><TMPL_VAR name="title"></a></td>
                        <td><TMPL_VAR name="author"></td>
-                       <td><input type=text name=rrp<TMPL_VAR name="i"> size=6 value="<TMPL_VAR name="rrp">"></td>
-                       <td><input type=text name=eup<TMPL_VAR name="i"> size=6 value="<TMPL_VAR name="ecost">"></td>
-                       <td><input type=text name=quantity<TMPL_VAR name="i"> size=6 value="<TMPL_VAR name="quantity">" onchange='update(this.form)'></td>
-                       <td><input type=text name=total<TMPL_VAR name="i"> size=10 value=<TMPL_VAR name="line_total">></td>
-                       <input type=hidden name=ordnum<TMPL_VAR name="i"> value=<TMPL_VAR name="ordernumber">>
-                       <input type=hidden name=bibnum<TMPL_VAR name="i"> value=<TMPL_VAR name="biblionumber">>
+                       <td><TMPL_VAR name="rrp"></td>
+                       <td><TMPL_VAR name="ecost"></td>
+                       <td><TMPL_VAR name="quantity"></td>
+                       <td><TMPL_VAR name="line_total"></td>
                </tr>
        </TMPL_LOOP>
        <input type=hidden name=number value=<TMPL_VAR name="count">>
@@ -38,31 +32,18 @@
        <tr valign=top bgcolor=white>
                <td colspan=6 rowspan=3  bgcolor="#ffdf61">
                        <b>HELP</b><br>
-                       To cancel an order, just change the quantity to 0 and click "save changes".<br>
                        To change any of the catalogue or accounting information attached to an order,  click on the title.<br>
                </td>
                <td><b>SubTotal</b></td>
-               <td>$<input type=text name=subtotal size=10 value=<TMPL_VAR name="sub_total">></td>
+               <td>$<TMPL_VAR name="sub_total"></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td><b>GST</b></td>
-               <td>$<input type=text name=gst size=10 value=<TMPL_VAR name="gist">></td>
+               <td>$<TMPL_VAR name="gist"></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td><b>TOTAL</b></td>
-               <td>$<input type=text name=grandtotal size=10 value=<TMPL_VAR name="grand_total">></td>
-       </tr>
-       <tr valign=top bgcolor=white>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td colspan=3>
-                       <input type=submit class="button" value="Save Changes" name=submit align=right>
-                       </form>
-               </td>
+               <td>$<TMPL_VAR name="grand_total"></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td colspan=9>

diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl
index 9693221..991d0dd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl
@@ -3,11 +3,7 @@
 <FONT SIZE=6><em>Panier <TMPL_VAR name="basket"> for <a href=supplier.pl?id=<TMPL_VAR name="booksellerid">></a> <TMPL_VAR name="name"></em></FONT><br />
 (Référence: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, passée par : <TMPL_VAR name="authorisedby">)<br />
 <CENTER>
-<!--<FORM ACTION="/cgi-bin/koha/search.pl" method=post>
-<b>Search ISBN, Title or Author:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
-</form> -->
 <p>
-<FORM ACTION="/cgi-bin/koha/acqui/modorders.pl" method=post name=orderform>
 <table border=0 cellspacing=0 cellpadding=5>
        <tr valign=top bgcolor="#ffdf61">
                <td width="5%"><b>N° cmde</b></td>
@@ -25,12 +21,10 @@
                        <td><TMPL_VAR name="isbn"></td>
                        <td><a href="newbiblio.pl?ordnum=<TMPL_VAR name="ordernumber">&id=<TMPL_VAR name="booksellerid">&basket=<TMPL_VAR name="basket">"><TMPL_VAR name="title"></a></td>
                        <td><TMPL_VAR name="author"></td>
-                       <td><input type=text name=rrp<TMPL_VAR name="i"> size=6 value="<TMPL_VAR name="rrp">"></td>
-                       <td><input type=text name=eup<TMPL_VAR name="i"> size=6 value="<TMPL_VAR name="ecost">"></td>
-                       <td><input type=text name=quantity<TMPL_VAR name="i"> size=6 value="<TMPL_VAR name="quantity">" onchange='update(this.form)'></td>
-                       <td><input type=text name=total<TMPL_VAR name="i"> size=10 value=<TMPL_VAR name="line_total">></td>
-                       <input type=hidden name=ordnum<TMPL_VAR name="i"> value=<TMPL_VAR name="ordernumber">>
-                       <input type=hidden name=bibnum<TMPL_VAR name="i"> value=<TMPL_VAR name="biblionumber">>
+                       <td><TMPL_VAR name="rrp">"></td>
+                       <td><TMPL_VAR name="ecost">"></td>
+                       <td><TMPL_VAR name="quantity"></td>
+                       <td><TMPL_VAR name="line_total"></td>
                </tr>
        </TMPL_LOOP>
        <input type=hidden name=number value=<TMPL_VAR name="count">>
@@ -38,7 +32,6 @@
        <tr valign=top bgcolor=white>
                <td colspan=6 rowspan=3  bgcolor="#ffdf61">
                        <b>AIDE</b><br>
-                       Pour annuler une commande, mettre la quantité à 0 et cliquer sur "enregistrer"<br/>
                        Pour changer un élément de cataloguage ou de comptabilité attaché à une commande, cliquer sur le titre<br>
                </td>
                <td><b>Sous-Total</b></td>
@@ -53,18 +46,6 @@
                <td>?<input type=text name=grandtotal size=10 value=<TMPL_VAR name="grand_total">></td>
        </tr>
        <tr valign=top bgcolor=white>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td colspan=3>
-                       <input type=image  name=submit src=<TMPL_VAR name="themelang">/images/save-changes.gif border=0 width=187 height=42 align=right>
-                       </form>
-               </td>
-       </tr>
-       <tr valign=top bgcolor=white>
                <td colspan=9>
                        <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
                                <input type=hidden name=id value="<TMPL_VAR name="id">">