[Koha-patches] [PATCH] Fix for Bug 7113 - Standardize vendor id name in templates and scripts
Owen Leonard
oleonard at myacpl.org
Fri Oct 28 22:12:38 CEST 2011
---
acqui/basket.pl | 8 +++---
acqui/basketheader.pl | 4 +-
acqui/booksellers.pl | 14 +++++-----
acqui/finishreceive.pl | 4 +-
acqui/lateorders.pl | 10 ++++----
acqui/newordersuggestion.pl | 6 ++--
acqui/orderreceive.pl | 12 +++++-----
acqui/parcel.pl | 18 +++++++-------
acqui/parcels.pl | 10 ++++----
acqui/supplier.pl | 18 +++++++-------
.../prog/en/includes/acquisitions-toolbar.inc | 24 ++++++++++----------
.../prog/en/modules/acqui/addorderiso2709.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 +-
.../prog/en/modules/acqui/basketgroup.tt | 8 +++---
.../prog/en/modules/acqui/basketheader.tt | 2 +-
.../prog/en/modules/acqui/booksellers.tt | 8 +++---
.../prog/en/modules/acqui/histsearch.tt | 4 +-
.../prog/en/modules/acqui/lateorders.tt | 4 +-
.../prog/en/modules/acqui/neworderbiblio.tt | 2 +-
.../prog/en/modules/acqui/neworderempty.tt | 2 +-
.../prog/en/modules/acqui/newordersuggestion.tt | 6 ++--
.../prog/en/modules/acqui/orderreceive.tt | 6 ++--
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 24 ++++++++++----------
.../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 20 ++++++++--------
.../prog/en/modules/acqui/supplier.tt | 12 +++++-----
.../prog/en/modules/acqui/uncertainprice.tt | 4 +-
.../prog/en/modules/acqui/z3950_search.tt | 2 +-
27 files changed, 119 insertions(+), 119 deletions(-)
diff --git a/acqui/basket.pl b/acqui/basket.pl
index b836280..6726230 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -52,7 +52,7 @@ basket.pl
The basket number.
-=item supplierid
+=item booksellerid
the supplier this script have to display the basket.
@@ -64,7 +64,7 @@ the supplier this script have to display the basket.
my $query = new CGI;
my $basketno = $query->param('basketno');
-my $booksellerid = $query->param('supplierid');
+my $booksellerid = $query->param('booksellerid');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
@@ -80,7 +80,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
my $basket = GetBasket($basketno);
# FIXME : what about the "discount" percentage?
-# FIXME : the query->param('supplierid') below is probably useless. The bookseller is always known from the basket
+# FIXME : the query->param('booksellerid') below is probably useless. The bookseller is always known from the basket
# if no booksellerid in parameter, get it from basket
# warn "=>".$basket->{booksellerid};
$booksellerid = $basket->{booksellerid} unless $booksellerid;
@@ -162,7 +162,7 @@ if ( $op eq 'delete_confirm' ) {
basketgroupid => $basketgroupid } );
print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
} else {
- print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?supplierid=' . $booksellerid);
+ print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);
}
exit;
} else {
diff --git a/acqui/basketheader.pl b/acqui/basketheader.pl
index d204a4e..b33e4ef 100755
--- a/acqui/basketheader.pl
+++ b/acqui/basketheader.pl
@@ -33,9 +33,9 @@ notes to the supplier, local notes, and the contractnumber, which identifies the
=over 4
-=item supplierid
+=item booksellerid
-C<$supplierid> is the id of the supplier we add the basket to.
+C<$booksellerid> is the id of the supplier we add the basket to.
=item basketid
diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 2b16fe4..2cea6c5 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -41,7 +41,7 @@ C<$supplier> is the string with which we search for a supplier
=back
-=item id or supplierid
+=item id or booksellerid
The id of the supplier whose baskets we will display
@@ -74,11 +74,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
#parameters
my $supplier = $query->param('supplier');
-my $id = $query->param('id') || $query->param('supplierid');
+my $booksellerid = $query->param('booksellerid');
my @suppliers;
-if ($id) {
- push @suppliers, GetBookSellerFromId($id);
+if ($booksellerid) {
+ push @suppliers, GetBookSellerFromId($booksellerid);
} else {
@suppliers = GetBookSeller($supplier);
}
@@ -87,7 +87,7 @@ my $supplier_count = @suppliers;
if ( $supplier_count == 1 ) {
$template->param(
supplier_name => $suppliers[0]->{'name'},
- id => $suppliers[0]->{'id'}
+ booksellerid => $suppliers[0]->{'booksellerid'}
);
}
@@ -132,7 +132,7 @@ for my $vendor (@suppliers) {
push @{$loop_suppliers},
{ loop_basket => $loop_basket,
- supplierid => $vendor->{id},
+ booksellerid => $vendor->{id},
name => $vendor->{name},
active => $vendor->{active},
};
@@ -140,7 +140,7 @@ for my $vendor (@suppliers) {
}
$template->param(
loop_suppliers => $loop_suppliers,
- supplier => ( $id || $supplier ),
+ supplier => ( $booksellerid || $supplier ),
count => $supplier_count,
);
diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 71b13d6..417a872 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -48,7 +48,7 @@ my $datereceived=$input->param('datereceived');
my $replacement=$input->param('rrp');
my $gst=$input->param('gst');
my $freight=$input->param('freight');
-my $supplierid = $input->param('supplierid');
+my $booksellerid = $input->param('booksellerid');
my $cnt=0;
my $error_url_str;
my $ecost = $input->param('ecost');
@@ -114,4 +114,4 @@ if ($quantityrec > $origquantityrec ) {
$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");
+ print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&booksellerid=$booksellerid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 810f665..330c0db 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -29,7 +29,7 @@ given on input arg.
=over 4
-=item supplierid
+=item booksellerid
To know on which supplier this script have to display late order.
=item delay
@@ -64,7 +64,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
debug => 1,
});
-my $supplierid = $input->param('supplierid') || undef; # we don't want "" or 0
+my $booksellerid = $input->param('booksellerid') || undef; # we don't want "" or 0
my $delay = $input->param('delay');
my $branch = $input->param('branch');
my $op = $input->param('op');
@@ -79,14 +79,14 @@ unless ($delay =~ /^\d{1,3}$/) {
my %supplierlist = GetBooksellersWithLateOrders($delay);
my (@sloopy); # supplier loop
foreach (keys %supplierlist){
- push @sloopy, (($supplierid and $supplierid eq $_ ) ?
+ push @sloopy, (($booksellerid and $booksellerid eq $_ ) ?
{id=>$_, name=>$supplierlist{$_}, selected=>1} :
{id=>$_, name=>$supplierlist{$_}} ) ;
}
$template->param(SUPPLIER_LOOP => \@sloopy);
-$template->param(Supplier=>$supplierlist{$supplierid}) if ($supplierid);
+$template->param(Supplier=>$supplierlist{$booksellerid}) if ($booksellerid);
-my @lateorders = GetLateOrders($delay,$supplierid,$branch);
+my @lateorders = GetLateOrders($delay,$booksellerid,$branch);
my $total;
foreach (@lateorders){
diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl
index b65e4ea..f33d012 100755
--- a/acqui/newordersuggestion.pl
+++ b/acqui/newordersuggestion.pl
@@ -100,7 +100,7 @@ my $input = new CGI;
# getting the CGI params
my $basketno = $input->param('basketno');
-my $supplierid = $input->param('booksellerid');
+my $booksellerid = $input->param('booksellerid');
my $author = $input->param('author');
my $title = $input->param('title');
my $publishercode = $input->param('publishercode');
@@ -134,11 +134,11 @@ my $suggestions_loop =
title => $title,
publishercode => $publishercode,
STATUS => 'ACCEPTED'});
-my $vendor = GetBookSellerFromId($supplierid);
+my $vendor = GetBookSellerFromId($booksellerid);
$template->param(
suggestions_loop => $suggestions_loop,
basketno => $basketno,
- supplierid => $supplierid,
+ booksellerid => $booksellerid,
name => $vendor->{'name'},
"op_$op" => 1,
);
diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 98ba544..69f6428 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -34,7 +34,7 @@ It permit to write a new order as 'received'.
=over 4
-=item supplierid
+=item booksellerid
to know on what supplier this script has to display receive order.
@@ -79,7 +79,7 @@ use C4::Biblio;
my $input = new CGI;
my $dbh = C4::Context->dbh;
-my $supplierid = $input->param('supplierid');
+my $booksellerid = $input->param('booksellerid');
my $ordernumber = $input->param('ordernumber');
my $search = $input->param('receive');
my $invoice = $input->param('invoice');
@@ -89,7 +89,7 @@ my $datereceived = $input->param('datereceived');
$datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
-my $bookseller = GetBookSellerFromId($supplierid);
+my $bookseller = GetBookSellerFromId($booksellerid);
my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
my $results = SearchOrder($ordernumber,$search);
@@ -138,7 +138,7 @@ if ( $count == 1 ) {
biblionumber => @$results[0]->{'biblionumber'},
ordernumber => @$results[0]->{'ordernumber'},
biblioitemnumber => @$results[0]->{'biblioitemnumber'},
- supplierid => @$results[0]->{'booksellerid'},
+ booksellerid => @$results[0]->{'booksellerid'},
freight => $freight,
gst => $gst,
name => $bookseller->{'name'},
@@ -172,13 +172,13 @@ else {
$line{gst} = $gst;
$line{title} = @$results[$i]->{'title'};
$line{author} = @$results[$i]->{'author'};
- $line{supplierid} = $supplierid;
+ $line{booksellerid} = $booksellerid;
push @loop, \%line;
}
$template->param(
loop => \@loop,
- supplierid => $supplierid,
+ booksellerid => $booksellerid,
);
}
my $op = $input->param('op');
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index c256c60..e5e9b51 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -34,7 +34,7 @@ It allows to write an order as 'received' when he arrives.
=over 4
-=item supplierid
+=item booksellerid
To know the supplier this script has to show orders.
@@ -70,8 +70,8 @@ use C4::Dates qw/format_date format_date_in_iso/;
use JSON;
my $input=new CGI;
-my $supplierid=$input->param('supplierid');
-my $bookseller=GetBookSellerFromId($supplierid);
+my $booksellerid=$input->param('booksellerid');
+my $bookseller=GetBookSellerFromId($booksellerid);
my $invoice=$input->param('invoice') || '';
my $freight=$input->param('freight');
@@ -101,7 +101,7 @@ if($input->param('format') eq "json"){
my @datas;
my $search = $input->param('search') || '';
- my $supplier = $input->param('supplierid') || '';
+ my $supplier = $input->param('booksellerid') || '';
my $basketno = $input->param('basketno') || '';
my $orderno = $input->param('orderno') || '';
@@ -154,7 +154,7 @@ if( scalar(@rcv_err) ) {
}
my $cfstr = "%.2f"; # currency format string -- could get this from currency table.
-my @parcelitems = GetParcel($supplierid, $invoice, $datereceived->output('iso'));
+my @parcelitems = GetParcel($booksellerid, $invoice, $datereceived->output('iso'));
my $countlines = scalar @parcelitems;
my $totalprice = 0;
my $totalfreight = 0;
@@ -173,7 +173,7 @@ for (my $i = 0 ; $i < $countlines ; $i++) {
$line{invoice} = $invoice;
$line{gst} = $gst;
$line{total} = sprintf($cfstr, $total);
- $line{supplierid} = $supplierid;
+ $line{booksellerid} = $booksellerid;
push @loop_received, \%line;
$totalprice += $parcelitems[$i]->{'unitprice'};
$line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
@@ -189,7 +189,7 @@ for (my $i = 0 ; $i < $countlines ; $i++) {
$tototal += $total;
}
-my $pendingorders = GetPendingOrders($supplierid);
+my $pendingorders = GetPendingOrders($booksellerid);
my $countpendings = scalar @$pendingorders;
# pending orders totals
@@ -213,7 +213,7 @@ for (my $i = 0 ; $i < $countpendings ; $i++) {
$line{invoice} = $invoice;
$line{gst} = $gst;
$line{total} = $total;
- $line{supplierid} = $supplierid;
+ $line{booksellerid} = $booksellerid;
$ordergrandtotal += $line{ecost} * $line{quantity};
my $biblionumber = $line{'biblionumber'};
@@ -291,7 +291,7 @@ $template->param(
invoicedatereceived => $datereceived->output('iso'),
formatteddatereceived => $datereceived->output(),
name => $bookseller->{'name'},
- supplierid => $supplierid,
+ booksellerid => $booksellerid,
gst => $gst,
freight => $freight,
invoice => $invoice,
diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 915b1e8..173c0c8 100755
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -35,7 +35,7 @@ It allows to write an order/parcels as 'received' when he arrives.
=over 4
-=item supplierid
+=item booksellerid
To know the supplier this script has to show orders.
@@ -77,7 +77,7 @@ use C4::Acquisition;
use C4::Bookseller qw/ GetBookSellerFromId /;
my $input = CGI->new;
-my $supplierid = $input->param('supplierid');
+my $booksellerid = $input->param('booksellerid');
my $order = $input->param('orderby') || 'datereceived desc';
my $startfrom = $input->param('startfrom');
my $code = $input->param('filter');
@@ -96,8 +96,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
}
);
-my $bookseller = GetBookSellerFromId($supplierid);
-my @parcels = GetParcels( $supplierid, $order, $code, $datefrom, $dateto );
+my $bookseller = GetBookSellerFromId($booksellerid);
+my @parcels = GetParcels( $booksellerid, $order, $code, $datefrom, $dateto );
my $count_parcels = @parcels;
# multi page display gestion
@@ -136,7 +136,7 @@ $template->param(
name => $bookseller->{'name'},
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
datereceived_today => C4::Dates->new()->output(),
- supplierid => $supplierid,
+ booksellerid => $booksellerid,
GST => C4::Context->preference('gist'),
);
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 2a4078a..cff6a28 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -32,7 +32,7 @@ It allows to edit & save information about this bookseller.
=over 4
-=item supplierid
+=item booksellerid
To know the bookseller this script has to display details.
@@ -53,10 +53,10 @@ use C4::Bookseller qw( GetBookSellerFromId DelBookseller );
use C4::Budgets;
my $query = CGI->new;
-my $id = $query->param('supplierid');
+my $booksellerid = $query->param('booksellerid');
my $supplier = {};
-if ($id) {
- $supplier = GetBookSellerFromId($id);
+if ($booksellerid) {
+ $supplier = GetBookSellerFromId($booksellerid);
}
my $op = $query->param('op') || 'display';
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -77,7 +77,7 @@ $tax_rate *= 100;
#build array for currencies
if ( $op eq 'display' ) {
- my $contracts = GetContract( { booksellerid => $id } );
+ my $contracts = GetContract( { booksellerid => $booksellerid } );
for ( @{$contracts} ) {
$_->{contractstartdate} = format_date( $_->{contractstartdate} );
@@ -85,7 +85,7 @@ if ( $op eq 'display' ) {
}
$template->param(
- id => $id,
+ booksellerid => $booksellerid,
name => $supplier->{'name'},
postal => $supplier->{'postal'},
address1 => $supplier->{'address1'},
@@ -116,7 +116,7 @@ if ( $op eq 'display' ) {
contracts => $contracts,
);
} elsif ( $op eq 'delete' ) {
- DelBookseller($id);
+ DelBookseller($booksellerid);
print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl');
exit;
} else {
@@ -134,7 +134,7 @@ if ( $op eq 'display' ) {
my $gstrate = defined $supplier->{gstrate} ? $supplier->{gstrate} * 100 : '';
$template->param(
- id => $id,
+ booksellerid => $booksellerid,
name => $supplier->{'name'},
postal => $supplier->{'postal'},
address1 => $supplier->{'address1'},
@@ -153,7 +153,7 @@ if ( $op eq 'display' ) {
contnotes => $supplier->{'contnotes'},
notes => $supplier->{'notes'},
# set active ON by default for supplier add (id empty for add)
- active => $id ? $supplier->{'active'} : 1,
+ active => $booksellerid ? $supplier->{'active'} : 1,
gstreg => $supplier->{'gstreg'},
listincgst => $supplier->{'listincgst'},
invoiceincgst => $supplier->{'invoiceincgst'},
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
index f81b303..37cdf7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
@@ -22,18 +22,18 @@
var manageorders = [
[% IF ( CAN_user_acquisition_order_manage ) %]
- { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% id %]&op=add_form"},
- { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=[% id %]"},
- { text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% id %]"},
+ { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form"},
+ { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]"},
+ { text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]"},
[% END %]
- { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?supplierid=[% id %]" },
+ { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" },
[% IF ( basketno ) %]
- { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% id %]&basketno=[% basketno %]&owner=1"}
+ { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&owner=1"}
[% ELSE %]
- { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% id %]&owner=1"}
+ { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1"}
[% END %]
]
- [% IF ( id ) %]
+ [% IF ( booksellerid ) %]
[% IF ( basketcount ) %]
new YAHOO.widget.Button({type: "menu", label: _("Manage orders"), name: "manageorders", menu: manageorders, container: "toolbar-list"});
[% END %]
@@ -43,13 +43,13 @@
//]]>
</script>
<ul id="toolbar-list" class="toolbar">
- [% IF ( id ) %]
+ [% IF ( booksellerid ) %]
[% IF ( CAN_user_acquisition_vendors_manage ) %]
- <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% id %]&op=enter">Edit</a></li>
- <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% id %]">New Contract</a></li>
- <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% id %]">Contracts</a></li>
+ <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=enter">Edit</a></li>
+ <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">New Contract</a></li>
+ <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li>
[% UNLESS ( basketcount ) %]
- <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% id %]&op=add_form">New Basket</a></li>
+ <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form">New Basket</a></li>
[% END %]
[% END %]
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index dd864cf..72657eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -24,7 +24,7 @@
<body>
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Add orders from iso2709 file</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Add orders from iso2709 file</div>
<div id="doc3" class="yui-t2">
<div id="bd">
<div id="yui-main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 90ddacb..e430147 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -72,7 +72,7 @@
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> › [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for [% name %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for [% name %]</div>
<div id="doc3" class="yui-t2">
@@ -148,7 +148,7 @@
<h3>Basket deleted</h3>
<META HTTP-EQUIV=Refresh CONTENT="0; url=booksellers.pl">
[% ELSE %]
- <h1>[% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for <a href="supplier.pl?supplierid=[% booksellerid %]">[% name %]</a></h1>
+ <h1>[% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a></h1>
[% IF ( delete_confirm ) %]
<h2>
<span class="yui-button yui-link-button">
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 98eb90a..2f55fc6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -132,7 +132,7 @@ function submitForm(form) {
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a> › Basket Grouping</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › Basket Grouping</div>
<div id="doc" class="yui-t7">
@@ -152,11 +152,11 @@ function submitForm(form) {
function yuiToolbar() {
var booksellermenu = [
- { text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]" },
+ { text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]" },
{ text: _("Edit vendor"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]"},
]
var ordersbutton = [
- { text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=[% booksellerid %]" },
+ { text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]" },
{ text: _("Edit uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1" },
]
new YAHOO.widget.Button("newbasketgroup");
@@ -180,7 +180,7 @@ function submitForm(form) {
</script>
<a href="?op=add&booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
</div>
- <h1>Basket Grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a></h1>
+ <h1>Basket Grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a></h1>
</div>
[% IF ( grouping ) %]
<div id="bd">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
index 0228054..160c5f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
@@ -91,7 +91,7 @@ li.list2 {
<div id="breadcrumbs">
<a href="/cgi-bin/koha/mainpage.pl">Home</a> ›
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> ›
- <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a> ›
+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> ›
[% IF ( add_form ) %]
[% IF ( basketno ) %]Edit basket '[% basketname %]'
[% ELSE %]add a basket to [% booksellername %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index 842f75d..1616261 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -60,18 +60,18 @@
[% END %]
<td>[% IF ( CAN_user_acquisition_order_manage ) %]
[% IF ( loop_supplier.active ) %]
- <a href="basketheader.pl?booksellerid=[% loop_supplier.supplierid %]&op=add_form">New basket</a>
+ <a href="basketheader.pl?booksellerid=[% loop_supplier.booksellerid %]&op=add_form">New basket</a>
[% ELSE %]
Inactive
[% END %]
[% END %]
</td>
- <td> <a href="parcels.pl?supplierid=[% loop_supplier.supplierid %]">Receive shipment</a>
+ <td> <a href="parcels.pl?booksellerid=[% loop_supplier.booksellerid %]">Receive shipment</a>
</td>
[% IF ( loop_supplier.name ) %]
- <td><a href="supplier.pl?supplierid=[% loop_supplier.supplierid %]">[% loop_supplier.name %]</a></td>
+ <td><a href="supplier.pl?booksellerid=[% loop_supplier.booksellerid %]">[% loop_supplier.name %]</a></td>
[% ELSE %]
- <td><a href="supplier.pl?supplierid=[% loop_supplier.supplierid %]">NO NAME</a></td>
+ <td><a href="supplier.pl?booksellerid=[% loop_supplier.booksellerid %]">NO NAME</a></td>
[% END %]
<td> <table>
[% IF ( loop_supplier.loop_basket ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index 9321cf9..6e8ec75 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -78,14 +78,14 @@
<td>[% suggestions_loo.basketname %] (<a href="basket.pl?basketno=[% suggestions_loo.basketno %]">[% suggestions_loo.basketno %]</a>)</td>
<td>[% suggestions_loo.groupname %] (<a href="basketgroup.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.basketgroupid %]</a>)</td>
<td>[% IF ( suggestions_loo.invoicenumber ) %]
- <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% suggestions_loo.invoicenumber %]&supplierid=[% suggestions_loo.id %]&datereceived=[% suggestions_loo.datereceived %]">[% suggestions_loo.invoicenumber %]</a>
+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% suggestions_loo.invoicenumber %]&booksellerid=[% suggestions_loo.id %]&datereceived=[% suggestions_loo.datereceived %]">[% suggestions_loo.invoicenumber %]</a>
[% ELSE %]
[% END %]
</td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
<br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
- <td><a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
+ <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
<td>[% suggestions_loo.creationdate %]</td>
<td>[% suggestions_loo.datereceived %]</td>
<td>[% suggestions_loo.quantity %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 1e64e1f..e24ade0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -98,8 +98,8 @@
[% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay %]) must be a number between 0 and 999.</p>[% END %]
[% END %]
<ol><li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay %]" /> days ago</li>
- <li><label for="supplierid">Vendor:</label>
- <select id="supplierid" size="1" tabindex="" name="supplierid">
+ <li><label for="booksellerid">Vendor:</label>
+ <select id="booksellerid" size="1" tabindex="" name="booksellerid">
<option value=""/>
[% FOREACH SUPPLIER_LOO IN SUPPLIER_LOOP %]
[% IF ( SUPPLIER_LOO.selected ) %]<option value="[% SUPPLIER_LOO.id %]" selected="selected">[% SUPPLIER_LOO.name %]</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
index 385a9b2..c888ccb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
@@ -7,7 +7,7 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?=[% basketno %]">Basket [% basketno %]</a> › Search Existing Records</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?=[% basketno %]">Basket [% basketno %]</a> › Search Existing Records</div>
<div id="doc3" class="yui-t2">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 39e9ca2..63f9a55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -110,7 +110,7 @@ $(document).ready(function()
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</div>
<div id="doc3" class="yui-t2">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
index f6edc63..8629e1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
@@ -6,7 +6,7 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'suggestions-add-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Add order from a suggestion</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Add order from a suggestion</div>
<div id="doc3" class="yui-t2">
@@ -46,9 +46,9 @@
</td>
<td>
[% IF ( suggestions_loo.biblionumber ) %]
- <a href="neworderempty.pl?booksellerid=[% supplierid %]&basketno=[% basketno %]&suggestionid=[% suggestions_loo.suggestionid %]&biblio=[% suggestions_loo.biblionumber %]" class="button">Order</a>
+ <a href="neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&suggestionid=[% suggestions_loo.suggestionid %]&biblio=[% suggestions_loo.biblionumber %]" class="button">Order</a>
[% ELSE %]
- <a href="neworderempty.pl?booksellerid=[% supplierid %]&basketno=[% basketno %]&suggestionid=[% suggestions_loo.suggestionid %]" class="button">Order</a>
+ <a href="neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&suggestionid=[% suggestions_loo.suggestionid %]" class="button">Order</a>
[% END %]
</td>
</tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index 7147b19..d90f935 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -7,7 +7,7 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">[% name %]</a> › Receive items from : [% name %] [% IF ( invoice ) %][[% invoice %]][% END %] (order #[% ordernumber %])</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › Receive items from : [% name %] [% IF ( invoice ) %][[% invoice %]][% END %] (order #[% ordernumber %])</div>
<div id="doc3" class="yui-t2">
@@ -80,7 +80,7 @@
<input type="hidden" name="biblionumber" value="[% biblionumber %]" />
<input type="hidden" name="ordernumber" value="[% ordernumber %]" />
<input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
- <input type="hidden" name="supplierid" value="[% supplierid %]" />
+ <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
<input type="hidden" name="datereceived" value="[% datereceived_iso %]" />
<input type="hidden" name="freight" value="[% freight %]" />
<input type="hidden" name="gst" value="[% gst %]" />
@@ -133,7 +133,7 @@
</div>
</div><div class="yui-g"><fieldset class="action">
- <input type="button" value="Save" onclick="javascript:if(check_additem()) { this.form.submit(); } else { alert( _('Duplicate barcodes detected. Please correct the errors and resubmit.') ); return false };" /> <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?supplierid=[% supplierid %]&invoice=[% invoice %]&gst=[% gst %]&freight=[% freight %]">Cancel</a>
+ <input type="button" value="Save" onclick="javascript:if(check_additem()) { this.form.submit(); } else { alert( _('Duplicate barcodes detected. Please correct the errors and resubmit.') ); return false };" /> <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% booksellerid %]&invoice=[% invoice %]&gst=[% gst %]&freight=[% freight %]">Cancel</a>
</fieldset></div> </form>
[% ELSE %]
<div id="acqui_acquire_orderlist">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 45eb591..2e46693 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -106,8 +106,8 @@
+ '<td>' + order.ecost + '</td>'
+ '<td>' + order.ordertotal + '</td>'
+ '<td>'
- + '<a href="orderreceive.pl?ordernumber=' + order.ordernumber + '&datereceived=[% invoicedatereceived %]&invoice=[% invoice %]&gst=' + gst + '&freight=' + order.freight + '&supplierid=[% supplierid %]">Receive</a> /'
- + '<a href="parcel.pl?type=intra&ordernumber=' + order.ordernumber + '&biblionumber=' + order.biblionumber + '&action=cancelorder&supplierid=[% supplierid %]&datereceived=[% invoicedatereceived %]&invoice=[% invoice %]" onclick="return confirm(\'' + _('Are you sure you want to cancel this order?') + '\');">Cancel</a>'
+ + '<a href="orderreceive.pl?ordernumber=' + order.ordernumber + '&datereceived=[% invoicedatereceived %]&invoice=[% invoice %]&gst=' + gst + '&freight=' + order.freight + '&booksellerid=[% booksellerid %]">Receive</a> /'
+ + '<a href="parcel.pl?type=intra&ordernumber=' + order.ordernumber + '&biblionumber=' + order.biblionumber + '&action=cancelorder&booksellerid=[% booksellerid %]&datereceived=[% invoicedatereceived %]&invoice=[% invoice %]" onclick="return confirm(\'' + _('Are you sure you want to cancel this order?') + '\');">Cancel</a>'
+ '</td></tr>').appendTo("table#pendingt");
}
@@ -118,7 +118,7 @@
}catch(e){alert(e);}
}
}
- var transaction = YAHOO.util.Connect.asyncRequest('GET', '/cgi-bin/koha/acqui/parcel.pl?supplierid=[% supplierid %]&search='+summaryStatus+'&basketno='+basketStatus+'&orderno='+orderStatus+'&format=json', callback, null);
+ var transaction = YAHOO.util.Connect.asyncRequest('GET', '/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% booksellerid %]&search='+summaryStatus+'&basketno='+basketStatus+'&orderno='+orderStatus+'&format=json', callback, null);
return false;
}
@@ -235,7 +235,7 @@
<tr>
[% END %]
<td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
- <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&booksellerid=[% loop_order.supplierid %]">[% loop_order.ordernumber %]</a></td>
+ <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
<td class="summaryfilterclass">
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
[% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
@@ -247,7 +247,7 @@
<td>[% loop_order.ecost %]</td>
<td>[% loop_order.ordertotal %]</td>
<td>
- <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&datereceived=[% loop_order.invoicedatereceived %]&invoice=[% loop_order.invoice %]&gst=[% loop_order.gst %]&freight=[% loop_order.freight %]&supplierid=[% loop_order.supplierid %]">Receive</a>
+ <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&datereceived=[% loop_order.invoicedatereceived %]&invoice=[% loop_order.invoice %]&gst=[% loop_order.gst %]&freight=[% loop_order.freight %]&booksellerid=[% loop_order.booksellerid %]">Receive</a>
</td>
<td>
@@ -281,17 +281,17 @@
<div id="resultnumber">
<!-- Row of numbers corresponding to search result pages -->
[% IF ( displayprev ) %]
- <a href="parcel.pl?type=intra&supplierid=[% supplierid %]&startfrom=[% prevstartfrom %][% IF ( datereceived ) %]&datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber"><< Previous</a>
+ <a href="parcel.pl?type=intra&booksellerid=[% booksellerid %]&startfrom=[% prevstartfrom %][% IF ( datereceived ) %]&datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber"><< Previous</a>
[% END %]
[% FOREACH number IN numbers %]
[% IF ( number.highlight ) %]
<span class="current">[% number.number %]</span>
[% ELSE %]
- <a href="parcel.pl?type=intra&supplierid=[% supplierid %]&startfrom=[% number.startfrom %][% IF ( number.datereceived ) %]&datereceived=[% number.datereceived %][% END %][% IF ( number.invoice ) %]&invoice=[% number.invoice %][% END %][% IF ( number.resultsperpage ) %]&resultsperpage=[% number.resultsperpage %][% END %]#resultnumber">[% number.number %]</a>
+ <a href="parcel.pl?type=intra&booksellerid=[% booksellerid %]&startfrom=[% number.startfrom %][% IF ( number.datereceived ) %]&datereceived=[% number.datereceived %][% END %][% IF ( number.invoice ) %]&invoice=[% number.invoice %][% END %][% IF ( number.resultsperpage ) %]&resultsperpage=[% number.resultsperpage %][% END %]#resultnumber">[% number.number %]</a>
[% END %]
[% END %]
[% IF ( displaynext ) %]
- <a href="parcel.pl?type=intra&supplierid=[% supplierid %]&startfrom=[% nextstartfrom %][% IF ( datereceived ) %]&datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber">Next >></a>
+ <a href="parcel.pl?type=intra&booksellerid=[% booksellerid %]&startfrom=[% nextstartfrom %][% IF ( datereceived ) %]&datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber">Next >></a>
[% END %]
</div>
</div>
@@ -356,7 +356,7 @@
<tr>
[% END %]
<td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
- <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&booksellerid=[% supplierid %]">[% loop_receive.ordernumber %]</a></td>
+ <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
[% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
[% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %]
@@ -375,9 +375,9 @@
[% ELSE %]There are no received orders.[% END %]
</div>
-<!--<form action="/cgi-bin/koha/acqui/parcels.pl?supplierid=[% supplierid %]" method="post">-->
-<form action="parcels.pl?supplierid=[% supplierid %]" method="post">
- <input type="hidden" name="supplierid" value="[% supplierid %]" />
+<!--<form action="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" method="post">-->
+<form action="parcels.pl?booksellerid=[% booksellerid %]" method="post">
+ <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
<fieldset class="action">
<input type="submit" value="Finish receiving" />
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index a7d704d..fb937f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -7,7 +7,7 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">[% name %]</a> › Receive shipment from vendor [% name %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › Receive shipment from vendor [% name %]</div>
[% IF ( count ) %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
@@ -15,7 +15,7 @@
<div id="yui-main">
<div class="yui-b">
-<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">[% name %]</a></h1>
+<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a></h1>
[% IF ( count ) %]
<p> [% count %] shipments</p>
@@ -42,7 +42,7 @@
[% searchresult.number %]
</td>
<td>
- <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&supplierid=[% supplierid |url %]&datereceived=[% searchresult.raw_datereceived |url %][% IF ( searchresult.code ) %]&invoice=[% searchresult.code |url %][% END %]">
+ <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&booksellerid=[% booksellerid |url %]&datereceived=[% searchresult.raw_datereceived |url %][% IF ( searchresult.code ) %]&invoice=[% searchresult.code |url %][% END %]">
[% searchresult.datereceived %]</a>
</td>
<td>
@@ -64,17 +64,17 @@
<div id="resultnumber">
<!-- Row of numbers corresponding to search result pages -->
[% IF ( displayprev ) %]
- <a href="parcels.pl?supplierid=[% supplierid %]&startfrom=[% prevstartfrom %][% IF ( datefrom ) %]&datefrom=[% datefrom %][% END %][% IF ( dateto ) %]&dateto=[% dateto %][% END %][% IF ( code ) %]&filter=[% code %][% END %][% IF ( orderby ) %]&orderby=[% orderby %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]&type=intra"><< Previous</a>
+ <a href="parcels.pl?booksellerid=[% booksellerid %]&startfrom=[% prevstartfrom %][% IF ( datefrom ) %]&datefrom=[% datefrom %][% END %][% IF ( dateto ) %]&dateto=[% dateto %][% END %][% IF ( code ) %]&filter=[% code %][% END %][% IF ( orderby ) %]&orderby=[% orderby %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]&type=intra"><< Previous</a>
[% END %]
[% FOREACH number IN numbers %]
[% IF ( number.highlight ) %]
<span class="current">[% number.number %]</span>
[% ELSE %]
- <a href="parcels.pl?supplierid=[% number.supplierid %]&startfrom=[% number.startfrom %][% IF ( number.datefrom ) %]&datefrom=[% number.datefrom %][% END %][% IF ( number.dateto ) %]&dateto=[% number.dateto %][% END %][% IF ( number.code ) %]&filter=[% number.code %][% END %][% IF ( number.orderby ) %]&orderby=[% number.orderby %][% END %][% IF ( number.resultsperpage ) %]&resultsperpage=[% number.resultsperpage %][% END %]&type=intra">[% number.number %]</a>
+ <a href="parcels.pl?booksellerid=[% number.booksellerid %]&startfrom=[% number.startfrom %][% IF ( number.datefrom ) %]&datefrom=[% number.datefrom %][% END %][% IF ( number.dateto ) %]&dateto=[% number.dateto %][% END %][% IF ( number.code ) %]&filter=[% number.code %][% END %][% IF ( number.orderby ) %]&orderby=[% number.orderby %][% END %][% IF ( number.resultsperpage ) %]&resultsperpage=[% number.resultsperpage %][% END %]&type=intra">[% number.number %]</a>
[% END %]
[% END %]
[% IF ( displaynext ) %]
- <a href="parcels.pl?supplierid=[% supplierid %]&startfrom=[% nextstartfrom %][% IF ( datefrom ) %]&datefrom=[% datefrom %][% END %][% IF ( dateto ) %]&dateto=[% dateto %][% END %][% IF ( code ) %]&filter=[% code %][% END %][% IF ( orderby ) %]&orderby=[% orderby %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]&type=intra">Next >></a>
+ <a href="parcels.pl?booksellerid=[% booksellerid %]&startfrom=[% nextstartfrom %][% IF ( datefrom ) %]&datefrom=[% datefrom %][% END %][% IF ( dateto ) %]&dateto=[% dateto %][% END %][% IF ( code ) %]&filter=[% code %][% END %][% IF ( orderby ) %]&orderby=[% orderby %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]&type=intra">Next >></a>
[% END %]
</div>
</div>
@@ -86,7 +86,7 @@
<legend>Receive a new shipment</legend>
<ol> <li>
<label for="invoice">Vendor Invoice </label>
- <input type="hidden" name="supplierid" value="[% supplierid %]" />
+ <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
<input type="hidden" name="op" value="new" />
<input type="text" size="20" id="invoice" name="invoice" />
</li>
@@ -115,7 +115,7 @@
<div class="hint">[% INCLUDE 'date-format.inc' %]</div> </li>
</ol>
</fieldset>
- <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">Cancel</a></fieldset>
+ <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">Cancel</a></fieldset>
</form>
</div>
</div>
@@ -125,7 +125,7 @@
<fieldset class="brief">
<h4>Filter</h4>
<ol>
- <li> <input type="hidden" name="supplierid" value="[% supplierid %]" /></li>
+ <li> <input type="hidden" name="booksellerid" value="[% booksellerid %]" /></li>
<li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter %]" id="filter" /></li>
<li><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom %]" /><br />
<label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li>
@@ -142,7 +142,7 @@
<option value="100">100</option>
</select></li>
</ol>
- <fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?supplierid=[% supplierid %]">Clear</a></fieldset>
+ <fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]">Clear</a></fieldset>
</fieldset>
</form>[% END %]
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index 001bf0d..cfd32f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -5,7 +5,7 @@
//<![CDATA[
function confirm_deletion() {
if (confirm(_("Confirm deletion of this vendor ?"))) {
- window.location="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% id %]&op=delete";
+ window.location="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=delete";
}
}
function check(f) {
@@ -22,14 +22,14 @@ if (f.company.value == "") {
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › [% IF ( enter ) %][% IF ( id ) %] <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% id %]">[% name %]</a> › Update: [% name %][% ELSE %]Add vendor[% END %] [% ELSE %][% name %][% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › [% IF ( enter ) %][% IF ( booksellerid ) %] <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › Update: [% name %][% ELSE %]Add vendor[% END %] [% ELSE %][% name %][% END %]</div>
<div id="doc" class="yui-t7">
<div id="bd">
<div id="yui-main">
[% IF ( enter ) %]
- [% IF ( id ) %]
+ [% IF ( booksellerid ) %]
<h1>Update: [% name %]</h1>
[% ELSE %]
<h1>Add vendor</h1>
@@ -39,7 +39,7 @@ if (f.company.value == "") {
[% IF ( enter ) %]
<form action="updatesupplier.pl" name="updatesupplier" method="post">
<div class="yui-g">
- <input type="hidden" name="id" value="[% id %]" />
+ <input type="hidden" name="id" value="[% booksellerid %]" />
<fieldset class="rows">
<legend>Company details</legend>
<ol><li><label for="company" class="required">Name * </label>
@@ -138,8 +138,8 @@ if (f.company.value == "") {
<li><label for="notes">Notes</label>
<textarea cols="40" rows="4" id="notes" name="notes" >[% notes %]</textarea></li></ol>
</fieldset>
- <fieldset class="action"><input type="button" value="Save" onclick="check(this.form);" /> [% IF ( id ) %]
- <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% id %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
+ <fieldset class="action"><input type="button" value="Save" onclick="check(this.form);" /> [% IF ( booksellerid ) %]
+ <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
[% END %]Cancel</a></fieldset>
</div>
</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index 89ebfa8..613153c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -14,7 +14,7 @@ function check(form) {
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> ›<a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a> › Uncertain prices for vendor: [% booksellername %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> ›<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › Uncertain prices for vendor: [% booksellername %]</div>
<div id="doc" class="yui-t7">
<div id="bd">
@@ -22,7 +22,7 @@ function check(form) {
[% IF ( validate ) %]
<META HTTP-EQUIV=Refresh CONTENT="0; url=[% scriptname %]?booksellerid=[% booksellerid %]">
[% ELSE %]
- <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]&op=enter">(edit)</a></h1>
+ <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=enter">(edit)</a></h1>
<h2>Contact information</h2>
<p><strong>Address: </strong>
[% booksellerpostal %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index bbcb973..a9f631c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -63,7 +63,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Order from Z39.50 search</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Order from Z39.50 search</div>
<div id="doc3" class="yui-t7">
<div id="bd">
[% IF ( opsearch ) %]
--
1.7.3
More information about the Koha-patches
mailing list