Change in API : ordnum becomes ordernumber

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index eeb25e5..ff7a6c0 100644 (file)
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -867,7 +867,7 @@ C<$order> are fields from the biblio, biblioitems, aqorders tables of the Koha d
 =cut
 
 sub GetOrder {
-    my ($ordnum) = @_;
+    my ($ordernumber) = @_;
     my $dbh      = C4::Context->dbh;
     my $query = "
         SELECT biblioitems.*, biblio.*, aqorders.*
@@ -878,7 +878,7 @@ sub GetOrder {
 
     ";
     my $sth= $dbh->prepare($query);
-    $sth->execute($ordnum);
+    $sth->execute($ordernumber);
     my $data = $sth->fetchrow_hashref;
     $sth->finish;
     return $data;
@@ -901,7 +901,7 @@ table of the Koha database.
 =item $hashref->{'basketno'} is the basketno foreign key in aqorders, it is mandatory
 
 
-=item $hashref->{'ordnum'} is a "minimum order number." 
+=item $hashref->{'ordernumber'} is a "minimum order number." 
 
 =item $hashref->{'budgetdate'} is effectively ignored.
   If it's undef (anything false) or the string 'now', the current day is used.
@@ -940,8 +940,8 @@ sub NewOrder {
     }
     $orderinfo->{'entrydate'} ||= C4::Dates->new()->output("iso");
 
-       my $ordnum=InsertInTable("aqorders",$orderinfo);
-    return ( $orderinfo->{'basketno'}, $ordnum );
+       my $ordernumber=InsertInTable("aqorders",$orderinfo);
+    return ( $orderinfo->{'basketno'}, $ordernumber );
 }
 
 
@@ -960,7 +960,7 @@ sub NewOrder {
 =cut
 
 sub NewOrderItem {
-    #my ($biblioitemnumber,$ordnum, $biblionumber) = @_;
+    #my ($biblioitemnumber,$ordernumber, $biblionumber) = @_;
     my ($itemnumber, $ordernumber)  = @_;
     my $dbh = C4::Context->dbh;
     my $query = qq|
@@ -1068,7 +1068,7 @@ sub ModOrderItem {
 
 =over 4
 
-&ModOrderBiblioitemNumber($biblioitemnumber,$ordnum, $biblionumber);
+&ModOrderBiblioitemNumber($biblioitemnumber,$ordernumber, $biblionumber);
 
 Modifies the biblioitemnumber for an existing order.
 Updates the order with order number C<$ordernum> and biblionumber C<$biblionumber>.
@@ -1079,7 +1079,7 @@ Updates the order with order number C<$ordernum> and biblionumber C<$biblionumbe
 
 #FIXME: is this used at all?
 sub ModOrderBiblioitemNumber {
-    my ($biblioitemnumber,$ordnum, $biblionumber) = @_;
+    my ($biblioitemnumber,$ordernumber, $biblionumber) = @_;
     my $dbh = C4::Context->dbh;
     my $query = "
       UPDATE aqorders
@@ -1087,7 +1087,7 @@ sub ModOrderBiblioitemNumber {
       WHERE  ordernumber = ?
       AND biblionumber =  ?";
     my $sth = $dbh->prepare($query);
-    $sth->execute( $biblioitemnumber, $ordnum, $biblionumber );
+    $sth->execute( $biblioitemnumber, $ordernumber, $biblionumber );
 }
 
 #------------------------------------------------------------#
@@ -1117,7 +1117,7 @@ C<$ordernumber>.
 
 sub ModReceiveOrder {
     my (
-        $biblionumber,    $ordnum,  $quantrec, $user, $cost,
+        $biblionumber,    $ordernumber,  $quantrec, $user, $cost,
         $invoiceno, $freight, $rrp, $budget_id, $datereceived
       )
       = @_;
@@ -1135,7 +1135,7 @@ sub ModReceiveOrder {
         SELECT * FROM   aqorders  
            WHERE           biblionumber=? AND aqorders.ordernumber=?");
 
-    $sth->execute($biblionumber,$ordnum);
+    $sth->execute($biblionumber,$ordernumber);
     my $order = $sth->fetchrow_hashref();
     $sth->finish();
 
@@ -1151,7 +1151,7 @@ sub ModReceiveOrder {
                 , quantityreceived=?
             WHERE biblionumber=? AND ordernumber=?");
 
-        $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$quantrec,$biblionumber,$ordnum);
+        $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$quantrec,$biblionumber,$ordernumber);
         $sth->finish;
 
         # create a new order for the remaining items, and set its bookfund.
@@ -1164,7 +1164,7 @@ sub ModReceiveOrder {
                                                        set quantityreceived=?,datereceived=?,booksellerinvoicenumber=?,
                                                                unitprice=?,freight=?,rrp=?
                             where biblionumber=? and ordernumber=?");
-        $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$biblionumber,$ordnum);
+        $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$biblionumber,$ordernumber);
         $sth->finish;
     }
     return $datereceived;
@@ -1260,7 +1260,7 @@ cancelled.
 =cut
 
 sub DelOrder {
-    my ( $bibnum, $ordnum ) = @_;
+    my ( $bibnum, $ordernumber ) = @_;
     my $dbh = C4::Context->dbh;
     my $query = "
         UPDATE aqorders
@@ -1268,7 +1268,7 @@ sub DelOrder {
         WHERE  biblionumber=? AND ordernumber=?
     ";
     my $sth = $dbh->prepare($query);
-    $sth->execute( $bibnum, $ordnum );
+    $sth->execute( $bibnum, $ordernumber );
     $sth->finish;
 }
 

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 38ece55..ebb1351 100755 (executable)
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -42,7 +42,7 @@ All of the cgi parameters below are related to the new order.
 
 =over 4
 
-=item C<ordnum>
+=item C<ordernumber>
 the number of this new order.
 
 =item C<basketno>
@@ -148,7 +148,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 # get CGI parameters
 my $orderinfo                                  = $input->Vars;
 $orderinfo->{'list_price'}    ||=  0;
-#my $ordnum        = $input->param('ordnum');
+#my $ordernumber        = $input->param('ordernumber');
 #my $basketno      = $input->param('basketno');
 #my $booksellerid  = $input->param('booksellerid');
 #my $existing      = $input->param('existing');    # existing biblio, (not basket or order)
@@ -210,12 +210,12 @@ if ( $orderinfo->{quantity} ne '0' ) {
                $orderinfo->{biblionumber}=$biblionumber;
     }
 
-    # if we already have $ordnum, then it's an ordermodif
-    if ($$orderinfo{ordnum}) {
+    # if we already have $ordernumber, then it's an ordermodif
+    if ($$orderinfo{ordernumber}) {
         ModOrder( $orderinfo);
     }
     else { # else, it's a new line
-        @$orderinfo{qw(basketno ordnum )} = NewOrder($orderinfo);
+        @$orderinfo{qw(basketno ordernumber )} = NewOrder($orderinfo);
     }
 
     # now, add items if applicable
@@ -254,7 +254,7 @@ if ( $orderinfo->{quantity} ne '0' ) {
                                     'ITEM');
             my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
             my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$$orderinfo{biblionumber});
-            NewOrderItem($itemnumber, $$orderinfo{ordnum});
+            NewOrderItem($itemnumber, $$orderinfo{ordernumber});
 
         }
     }
@@ -263,7 +263,7 @@ if ( $orderinfo->{quantity} ne '0' ) {
 
 else { # qty=0, delete the line
     my $biblionumber = $input->param('biblionumber');
-    DelOrder( $biblionumber, $$orderinfo{ordnum} );
+    DelOrder( $biblionumber, $$orderinfo{ordernumber} );
 }
 my $basketno=$$orderinfo{basketno};
 my $booksellerid=$$orderinfo{booksellerid};

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index baf3d00..3c05ca0 100755 (executable)
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -55,7 +55,7 @@ my $booksellerid  = $input->param('booksellerid');
 $template->param(scriptname => "/cgi-bin/koha/acqui/addorderiso2709.pl",
                 booksellerid => $booksellerid,
                 );
-my $ordnum;
+my $ordernumber;
 
 if ($cgiparams->{'import_batch_id'} && $op eq ""){
     $op = "batch_details";
@@ -174,7 +174,7 @@ if ($op eq ""){
             # remove uncertainprice flag if we have found a price in the MARC record
             $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
             my $basketno;
-            ( $basketno, $ordnum ) = NewOrder(\%orderinfo);
+            ( $basketno, $ordernumber ) = NewOrder(\%orderinfo);
 
             # now, add items if applicable
             # parse all items sent by the form, and create an item just for the import_record_id we are dealing with
@@ -228,7 +228,7 @@ if ($op eq ""){
                                                 $item->{'indicator'});
                         my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
                         my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
-                        NewOrderItem( $itemnumber, $ordnum);
+                        NewOrderItem( $itemnumber, $ordernumber);
                 }
             }
         }
@@ -295,7 +295,7 @@ sub import_biblios_list {
             match_score => $#$match > -1 ? $match->[0]->{'score'} : 0,
 #             itemtypes => \@itemtypes,
         );
-#         if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordnum) {
+#         if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
 #             # prepare empty item form
 #             my $cell = PrepareItemrecordDisplay();
 #             my @itemloop;

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index fe67cfc..52962a1 100755 (executable)
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -38,7 +38,7 @@ my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired, '
 my $user=$input->remote_user;
 my $biblionumber = $input->param('biblionumber');
 my $biblioitemnumber=$input->param('biblioitemnumber');
-my $ordnum=$input->param('ordnum');
+my $ordernumber=$input->param('ordernumber');
 my $origquantityrec=$input->param('origquantityrec');
 my $quantityrec=$input->param('quantityrec');
 my $quantity=$input->param('quantity');
@@ -61,7 +61,7 @@ my %tplorder = ( 'quantity'                  =>     $input->param('quantity') ||
                              'ecost'                      =>      $input->param('ecost') || '',
                              'unitprice'                =>      $input->param('cost') || '',
                      );
-my $order = GetOrder($ordnum);
+my $order = GetOrder($ordernumber);
 if ( any { $order->{$_} ne $tplorder{$_} } qw(quantity quantityreceived notes rrp ecost unitprice) ) {
     $order->{quantity} = $tplorder{quantity} if $tplorder{quantity};
     $order->{quantityreceived} = $tplorder{quantityreceived} if $tplorder{quantityreceived};
@@ -111,7 +111,7 @@ if ($quantityrec > $origquantityrec ) {
     
     # save the quantity received.
        if( $quantityrec > 0 ) {
-       $datereceived = ModReceiveOrder($biblionumber,$ordnum, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
+       $datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
        }
 }
     print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 8dcc300..4c92e79 100755 (executable)
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -45,7 +45,7 @@ the author of this new record.
 =item publication year
 the publication year of this new record.
 
-=item ordnum
+=item ordernumber
 the number of this order.
 
 =item biblio
@@ -97,7 +97,7 @@ my $title           = $input->param('title');
 my $author          = $input->param('author');
 my $publicationyear = $input->param('publicationyear');
 my $bookseller      = GetBookSellerFromId($booksellerid);      # FIXME: else ERROR!
-my $ordnum          = $input->param('ordnum') || '';
+my $ordernumber          = $input->param('ordernumber') || '';
 my $biblionumber    = $input->param('biblionumber');
 my $basketno        = $input->param('basketno');
 my $suggestionid    = $input->param('suggestionid');
@@ -126,7 +126,7 @@ my $contract = &GetContract($basket->{contractnumber});
 #simple parameters reading (all in one :-)
 my $params = $input->Vars;
 my $listprice; # the price, that can be in MARC record if we have one
-if ( $ordnum eq '' and defined $params->{'breedingid'}){
+if ( $ordernumber eq '' and defined $params->{'breedingid'}){
 #we want to import from the breeding reservoir (from a z3950 search)
     my ($marcrecord, $encoding) = MARCfindbreeding($params->{'breedingid'});
     die("Could not find the selected record in the reservoir, bailing") unless $marcrecord;
@@ -168,10 +168,10 @@ if ( $ordnum eq '' and defined $params->{'breedingid'}){
 
 my $cur = GetCurrency();
 
-if ( $ordnum eq '' ) {    # create order
+if ( $ordernumber eq '' ) {    # create order
     $new = 'yes';
 
-    #  $ordnum=newordernum;
+    #  $ordernumber=newordernum;
     if ( $biblionumber && !$suggestionid ) {
         $data = GetBiblioData($biblionumber);
     }
@@ -183,7 +183,7 @@ if ( $ordnum eq '' ) {    # create order
     }
 }
 else {    #modify order
-    $data   = GetOrder($ordnum);
+    $data   = GetOrder($ordernumber);
     $biblionumber = $data->{'biblionumber'};
     $budget_id = $data->{'budget_id'};
 
@@ -290,7 +290,7 @@ if ($CGIsort2) {
     $template->param( sort2 => $data->{'sort2'} );
 }
 
-if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordnum) {
+if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
     # prepare empty item form
     my $cell = PrepareItemrecordDisplay('','','','ACQ');
 #     warn "==> ".Data::Dumper::Dumper($cell);
@@ -313,7 +313,7 @@ $template->param(
 
 $template->param(
     existing         => $biblionumber,
-    ordnum           => $ordnum,
+    ordernumber           => $ordernumber,
     # basket informations
     basketno             => $basketno,
     basketname           => $basket->{'basketname'},

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index 3dd2d9e..14d9bd7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -240,10 +240,10 @@
                         <!-- TMPL_IF name="active" -->
                             <!-- TMPL_UNLESS name="closedate" -->
                             <td>
-                                <a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">Modify</a>
+                                <a href="neworderempty.pl?ordernumber=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">Modify</a>
                             </td>
                             <td>
-                            <a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;quantity=0&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a>
+                            <a href="addorder.pl?ordernumber=<!-- TMPL_VAR NAME="ordernumber" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;quantity=0&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a>
                             </td>
                             <!-- /TMPL_UNLESS -->
                         <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 87e93da..2a7734a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Acquisitions &rsaquo; Shopping Basket <!-- TMPL_VAR NAME="basketno" --> &rsaquo; <!-- TMPL_IF name="ordnum" -->Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)<!-- TMPL_ELSE -->New order<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; Shopping Basket <!-- TMPL_VAR NAME="basketno" --> &rsaquo; <!-- TMPL_IF name="ordernumber" -->Modify order details (line #<!-- TMPL_VAR NAME="ordernumber" -->)<!-- TMPL_ELSE -->New order<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/acq.js"></script>
@@ -54,12 +54,12 @@ ff.submit();
 </head>
 <body onload="calcNeworderTotal()">
 
-<div  name="<!-- TMPL_VAR NAME="ordnum" -->" >
+<div  name="<!-- TMPL_VAR NAME="ordernumber" -->" >
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">Shopping Basket <!-- TMPL_VAR NAME="basketno" --></a> &rsaquo; <!-- TMPL_IF name="ordnum" -->Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)<!-- TMPL_ELSE -->New order<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">Shopping Basket <!-- TMPL_VAR NAME="basketno" --></a> &rsaquo; <!-- TMPL_IF name="ordernumber" -->Modify order details (line #<!-- TMPL_VAR NAME="ordernumber" -->)<!-- TMPL_ELSE -->New order<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
 
@@ -68,8 +68,8 @@ ff.submit();
     <div class="yui-b">
 
 <h1>
-    <!-- TMPL_IF name="ordnum" -->
-        Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)
+    <!-- TMPL_IF name="ordernumber" -->
+        Modify order details (line #<!-- TMPL_VAR NAME="ordernumber" -->)
     <!-- TMPL_ELSE -->
         New order
     <!-- /TMPL_IF -->
@@ -120,7 +120,7 @@ ff.submit();
         <!-- TMPL_UNLESS name="existing" -->
         <input type="hidden" name="existing" value="no" />
         <!-- /TMPL_UNLESS -->
-        <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordnum" -->" />
+        <input type="hidden" name="ordernumber" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
         <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
         <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
         <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
@@ -298,10 +298,10 @@ ff.submit();
             <li>
                 <!-- TMPL_IF name="close" -->
             <label for="GST">Budgeted GST: </label>
-                <input type="text" id="" size="20" name="GST" value="" id="GST" readonly="readonly" />
+                <input type="text" id="" size="20" name="gst" value="" id="GST" readonly="readonly" />
                 <!-- TMPL_ELSE -->
                 <label for="GST">Budgeted GST: </label>
-                <input type="text" size="20" name="GST" id="GST" value="" />
+                <input type="text" size="20" name="gst" id="GST" value="" />
                 <!--/TMPL_IF-->
             </li>
             <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
index f3a03e6..62d712d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
@@ -75,7 +75,7 @@
     </fieldset>
     <!-- /TMPL_IF --> <!-- items -->
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-    <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
+    <input type="hidden" name="ordernumber" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
     <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
     <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
     <input type="hidden" name="datereceived" value="<!-- TMPL_VAR NAME="datereceived_iso" -->" />

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
index 13e25c5..7c940fc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -228,7 +228,7 @@
             <tr>
         <!-- /TMPL_UNLESS -->
                 <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="basketno" --></a></td>
-                <td class="orderfilterclass"><a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="ordernumber" --></a></td>
+                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="ordernumber" --></a></td>
                 <td class="summaryfilterclass">
                   <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html"--></a>
                 <!-- TMPL_IF NAME="author" --> / <!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
@@ -297,7 +297,7 @@
             <tr>
         <!-- /TMPL_UNLESS -->
                 <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="basketno" --></a></td>
-                <td><a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="ordernumber" --></a></td>
+                <td><a href="neworderempty.pl?ordernumber=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="ordernumber" --></a></td>
                 <td><a href="/cgi-bin/koha/catalogue/detail.pl?amp;biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
                 <!-- TMPL_IF NAME="author" --> / <!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
                 <!-- TMPL_IF NAME="isbn" --> - <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tmpl
index d9ad59c..86f635e 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tmpl
@@ -84,7 +84,7 @@ function check(form) {
         </td>
            <td>
                <!-- TMPL_VAR name="bibtitle" --> / <!-- TMPL_VAR name="bibauthor" --> <br /> <!-- TMPL_VAR name="bibpublishercode" -->, <!-- TMPL_VAR name="bibpublicationyear" --><br /><!-- TMPL_VAR name="bibisbn" --><br />
-               <a href="neworderempty.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->">
+               <a href="neworderempty.pl?ordernumber=<!-- TMPL_VAR name="ordernumber" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->">
                    edit
                </a>
            </td>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index 0e74f17..e61444d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -59,6 +59,7 @@ function popup(subscriptionid) {
                        <ul>
                        <!-- TMPL_IF NAME="NOTEXPIRED" --> <li>The subscription has not expired yet</li> <!-- /TMPL_IF --> 
                        <!-- TMPL_IF NAME="LINKEDISSUES" --> <li>The subscription has linked issues</li> <!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="LINKEDITEMS" --> <li>The subscription has linked items<br /> Those items won't be deleted</li> <!-- /TMPL_IF -->
                        </ul>
                        <form method="post" action="/cgi-bin/koha/serials/subscription-detail.pl">
                        <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" />

diff --git a/labels/spinelabel-print.pl b/labels/spinelabel-print.pl
index d3a33cc..7076a08 100755 (executable)
--- a/labels/spinelabel-print.pl
+++ b/labels/spinelabel-print.pl
@@ -62,14 +62,14 @@ while ( my ( $key, $value ) = each(%$item) ) {
     $value = '' unless defined $value;
     my @characters = split( //, $value );
     my $charnum    = 1;
-    my $wordnum    = 1;
+    my $wordernumber    = 1;
     my $i          = 1;
     foreach my $char (@characters) {
         if ( $char ne ' ' ) {
-            $data->{$key} .= "<span class='character word$wordnum character$charnum' id='$key$i'>$char</span>";
+            $data->{$key} .= "<span class='character word$wordernumber character$charnum' id='$key$i'>$char</span>";
         } else {
             $data->{$key} .= "<span class='space character$charnum' id='$key$i'>$char</span>";
-            $wordnum++;
+            $wordernumber++;
             $charnum = 1;
         }
         $charnum++;

diff --git a/t/lib/KohaTest/Acquisition.pm b/t/lib/KohaTest/Acquisition.pm
index 330f5f1..eca0b16 100644 (file)
--- a/t/lib/KohaTest/Acquisition.pm
+++ b/t/lib/KohaTest/Acquisition.pm
@@ -71,7 +71,7 @@ sub create_new_basket {
     $self->add_biblios( add_items => 1 );
     ok( scalar @{$self->{'biblios'}} > 0, 'we have added at least one biblio' );
 
-    my ( $basketno, $ordnum ) = NewOrder( undef, # $basketno,
+    my ( $basketno, $ordernumber ) = NewOrder( undef, # $basketno,
                                           $self->{'biblios'}[0], # $bibnum,
                                           undef, # $title,
                                           1, # $quantity,
@@ -93,16 +93,16 @@ sub create_new_basket {
                                           undef, # $purchaseorder
                                      );
     ok( $basketno, "my basket number is $basketno" );
-    ok( $ordnum,   "my order number is $ordnum" );
+    ok( $ordernumber,   "my order number is $ordernumber" );
     
-    my $order = GetOrder( $ordnum );
-    is( $order->{'ordernumber'}, $ordnum, 'got the right order' )
+    my $order = GetOrder( $ordernumber );
+    is( $order->{'ordernumber'}, $ordernumber, 'got the right order' )
       or diag( Data::Dumper->Dump( [ $order ], [ 'order' ] ) );
     
     is( $order->{'budgetdate'}, $today, "the budget date is $today" );
 
     # XXX should I stuff these in $self?
-    return ( $basketno, $ordnum );
+    return ( $basketno, $ordernumber );
     
 }
 

diff --git a/t/lib/KohaTest/Acquisition/GetHistory.pm b/t/lib/KohaTest/Acquisition/GetHistory.pm
index be5e6be..8c7c475 100644 (file)
--- a/t/lib/KohaTest/Acquisition/GetHistory.pm
+++ b/t/lib/KohaTest/Acquisition/GetHistory.pm
@@ -41,9 +41,9 @@ sub no_history : Test( 4 ) {
 sub one_order : Test( 50 ) {
     my $self = shift;
     
-    my ( $basketno, $ordnum ) = $self->create_new_basket();
+    my ( $basketno, $ordernumber ) = $self->create_new_basket();
     ok( $basketno, "basketno is $basketno" );
-    ok( $ordnum, "ordnum is $ordnum" );
+    ok( $ordernumber, "ordernumber is $ordernumber" );
 
     # No arguments fetches no history.
     {

diff --git a/t/lib/KohaTest/Acquisition/GetParcel.pm b/t/lib/KohaTest/Acquisition/GetParcel.pm
index ec6d87a..c26e5f2 100644 (file)
--- a/t/lib/KohaTest/Acquisition/GetParcel.pm
+++ b/t/lib/KohaTest/Acquisition/GetParcel.pm
@@ -39,12 +39,12 @@ sub one_parcel : Test( 17 ) {
                          localtime->year() + 1900,
                          localtime->mon() + 1,
                          localtime->mday() );
-    my ( $basketno, $ordnum ) = $self->create_new_basket();
+    my ( $basketno, $ordernumber ) = $self->create_new_basket();
     
     ok( $basketno, "my basket number is $basketno" );
-    ok( $ordnum,   "my order number is $ordnum" );
+    ok( $ordernumber,   "my order number is $ordernumber" );
     my $datereceived = ModReceiveOrder( $self->{'biblios'}[0],             # biblionumber
-                                        $ordnum,       # $ordnum,
+                                        $ordernumber,       # $ordernumber,
                                         undef,         # $quantrec,
                                         undef,         # $user,
                                         undef,         # $cost,

diff --git a/t/lib/KohaTest/Acquisition/GetParcels.pm b/t/lib/KohaTest/Acquisition/GetParcels.pm
index 82b6101..fd3ad0f 100644 (file)
--- a/t/lib/KohaTest/Acquisition/GetParcels.pm
+++ b/t/lib/KohaTest/Acquisition/GetParcels.pm
@@ -269,10 +269,10 @@ sub create_order {
                               localtime->mon() + 1,
                               localtime->mday() ) unless exists $param{'date'};
 
-    my ( $basketno, $ordnum ) = $self->create_new_basket( %param );
+    my ( $basketno, $ordernumber ) = $self->create_new_basket( %param );
 
     my $datereceived = ModReceiveOrder( $self->{'biblios'}[0],             # biblionumber
-                                        $ordnum,       # $ordnum,
+                                        $ordernumber,       # $ordernumber,
                                         undef,         # $quantrec,
                                         undef,         # $user,
                                         undef,         # $cost,

diff --git a/t/lib/KohaTest/Acquisition/GetPendingOrders.pm b/t/lib/KohaTest/Acquisition/GetPendingOrders.pm
index d6361ff..cf4bb15 100644 (file)
--- a/t/lib/KohaTest/Acquisition/GetPendingOrders.pm
+++ b/t/lib/KohaTest/Acquisition/GetPendingOrders.pm
@@ -31,10 +31,10 @@ we make an order, then see if it shows up in the pending orders
 sub one_new_order : Test( 49 ) {
     my $self = shift;
 
-    my ( $basketno, $ordnum ) = $self->create_new_basket();
+    my ( $basketno, $ordernumber ) = $self->create_new_basket();
 
     ok( $basketno, "basketno is $basketno" );
-    ok( $ordnum, "ordnum is $ordnum" );
+    ok( $ordernumber, "ordernumber is $ordernumber" );
     
     my $orders = GetPendingOrders( $self->{'booksellerid'} );
     is( scalar @$orders, 1, 'we successfully entered one order.' );

diff --git a/t/lib/KohaTest/Acquisition/NewOrder.pm b/t/lib/KohaTest/Acquisition/NewOrder.pm
index e309b4c..972cde2 100644 (file)
--- a/t/lib/KohaTest/Acquisition/NewOrder.pm
+++ b/t/lib/KohaTest/Acquisition/NewOrder.pm
@@ -25,7 +25,7 @@ sub new_order_no_budget : Test( 4 ) {
                          localtime->year() + 1900,
                          localtime->mon() + 1,
                          localtime->mday() );
-    my ( $basketno, $ordnum ) = NewOrder( undef, # $basketno,
+    my ( $basketno, $ordernumber ) = NewOrder( undef, # $basketno,
                                           1, # $bibnum,
                                           undef, # $title,
                                           undef, # $quantity,
@@ -48,10 +48,10 @@ sub new_order_no_budget : Test( 4 ) {
                                                                                  undef, # $branchcode
                                      );
     ok( $basketno, "my basket number is $basketno" );
-    ok( $ordnum,   "my order number is $ordnum" );
+    ok( $ordernumber,   "my order number is $ordernumber" );
 
-    my $order = GetOrder( $ordnum );
-    is( $order->{'ordernumber'}, $ordnum, 'got the right order' )
+    my $order = GetOrder( $ordernumber );
+    is( $order->{'ordernumber'}, $ordernumber, 'got the right order' )
       or diag( Data::Dumper->Dump( [ $order ], [ 'order' ] ) );
     
     is( $order->{'budgetdate'}, $today, "the budget date is $today" );
@@ -73,7 +73,7 @@ sub new_order_set_budget : Test( 4 ) {
                          localtime->year() + 1900,
                          localtime->mon() + 1,
                          localtime->mday() );
-    my ( $basketno, $ordnum ) = NewOrder( undef, # $basketno,
+    my ( $basketno, $ordernumber ) = NewOrder( undef, # $basketno,
                                           1, # $bibnum,
                                           undef, # $title,
                                           undef, # $quantity,
@@ -96,10 +96,10 @@ sub new_order_set_budget : Test( 4 ) {
                                                                                  undef, # $branchcode
                                      );
     ok( $basketno, "my basket number is $basketno" );
-    ok( $ordnum,   "my order number is $ordnum" );
+    ok( $ordernumber,   "my order number is $ordernumber" );
 
-    my $order = GetOrder( $ordnum );
-    is( $order->{'ordernumber'}, $ordnum, 'got the right order' )
+    my $order = GetOrder( $ordernumber );
+    is( $order->{'ordernumber'}, $ordernumber, 'got the right order' )
       or diag( Data::Dumper->Dump( [ $order ], [ 'order' ] ) );
     
     like( $order->{'budgetdate'}, qr(^2\d\d\d-07-01$), "the budget date ($order->{'budgetdate'}) is a July 1st." );