@@ -, +, @@
---
acqui/transferorder.pl | 5 +---
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 10 ++++++--
.../prog/en/modules/acqui/transferorder.tt | 26 +++++++++-----------
3 files changed, 20 insertions(+), 21 deletions(-)
--- a/acqui/transferorder.pl
+++ a/acqui/transferorder.pl
@@ -77,9 +77,7 @@ if( $basketno && $ordernumber) {
TransferOrder($ordernumber, $basketno);
- my $referrer = $input->param('referrer');
- print $input->redirect($referrer);
- exit;
+ $template->param(transferred => 1)
} elsif ( $bookselleridto && $ordernumber) {
# Show open baskets for this bookseller
my $order = GetOrder( $ordernumber );
@@ -138,7 +136,6 @@ $template->param(
booksellertoname => $booksellertoname,
ordernumber => $ordernumber,
basketno => $basketno,
- referrer => $input->param('referrer')
);
output_html_with_http_headers $input, $cookie, $template->output;
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -135,7 +135,7 @@
+ '
'
+ 'Receive'
+ ' '
- + 'Transfer'
+ + 'Transfer'
+ ' | | ').appendTo("table#pendingt");
}
@@ -177,6 +177,12 @@
}
}
+ function transfer_order_popup(ordernumber) {
+ var url = "/cgi-bin/koha/acqui/transferorder.pl?"
+ + "ordernumber=" + ordernumber
+ window.open(url, 'TransferOrder');
+ }
+
//]]>
@@ -284,7 +290,7 @@
Receive
- Transfer
+ Transfer
|
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
@@ -1,16 +1,16 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Transfer order
[% INCLUDE 'doc-head-close.inc' %]
+[% IF transferred %]
+
+[% END %]
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
-
-
@@ -32,7 +32,7 @@
[% basket.basketname %] (#[% basket.basketno %]) |
[% basket.createdby %] |
[% basket.creationdate %] |
- Choose
+ | Choose
[% END %]
@@ -59,7 +59,7 @@
[% IF ( ordersloo.isbn ) %] – [% ordersloo.isbn %][% END %]
[% IF ( ordersloo.publishercode ) %] Publisher :[% ordersloo.publishercode %][% END %]
|
- Transfer |
+ Transfer |
[% END %]
@@ -81,7 +81,7 @@
[% FOREACH bookseller IN booksellersloop %]
[% bookseller.name %] |
- Choose |
+ Choose |
[% END %]
@@ -98,7 +98,6 @@
[% END %]
-
- [% INCLUDE 'acquisitions-menu.inc' %]
-
[% INCLUDE 'intranet-bottom.inc' %]
--
|