View | Details | Raw Unified | Return to bug 5349
Collapse All | Expand All

(-)a/acqui/transferorder.pl (-4 / +1 lines)
Lines 77-85 if( $basketno && $ordernumber) { Link Here
77
77
78
    TransferOrder($ordernumber, $basketno);
78
    TransferOrder($ordernumber, $basketno);
79
79
80
    my $referrer = $input->param('referrer');
80
    $template->param(transferred => 1)
81
    print $input->redirect($referrer);
82
    exit;
83
} elsif ( $bookselleridto && $ordernumber) {
81
} elsif ( $bookselleridto && $ordernumber) {
84
    # Show open baskets for this bookseller
82
    # Show open baskets for this bookseller
85
    my $order = GetOrder( $ordernumber );
83
    my $order = GetOrder( $ordernumber );
Lines 138-144 $template->param( Link Here
138
    booksellertoname    => $booksellertoname,
136
    booksellertoname    => $booksellertoname,
139
    ordernumber         => $ordernumber,
137
    ordernumber         => $ordernumber,
140
    basketno            => $basketno,
138
    basketno            => $basketno,
141
    referrer            => $input->param('referrer')
142
);
139
);
143
140
144
output_html_with_http_headers $input, $cookie, $template->output;
141
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +8 lines)
Lines 109-115 Link Here
109
                       + '<td>'
109
                       + '<td>'
110
                       + '<a href="orderreceive.pl?ordernumber=' + order.ordernumber + '&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]&amp;gst=' + gst + '&amp;freight=' + order.freight + '&amp;booksellerid=[% booksellerid %]">Receive</a>'
110
                       + '<a href="orderreceive.pl?ordernumber=' + order.ordernumber + '&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]&amp;gst=' + gst + '&amp;freight=' + order.freight + '&amp;booksellerid=[% booksellerid %]">Receive</a>'
111
                       + '<br />'
111
                       + '<br />'
112
                       + '<a href="/cgi-bin/koha/acqui/transferorder.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=[% "/cgi-bin/koha/acqui/parcel.pl?booksellerid=$booksellerid&datereceived=$invoicedatereceived&invoice=$invoice" | uri %]">Transfer</a>'
112
                       + '<a href="#" onclick="transfer_order_popup(' + order.ordernumber + '); return false;">Transfer</a>'
113
                       + '</td><td></td></tr>').appendTo("table#pendingt");
113
                       + '</td><td></td></tr>').appendTo("table#pendingt");
114
				}
114
				}
115
115
Lines 151-156 Link Here
151
                    }
151
                    }
152
            }
152
            }
153
153
154
            function transfer_order_popup(ordernumber) {
155
                var url = "/cgi-bin/koha/acqui/transferorder.pl?"
156
                    + "ordernumber=" + ordernumber
157
                window.open(url, 'TransferOrder');
158
            }
159
154
//]]>
160
//]]>
155
</script>
161
</script>
156
162
Lines 262-268 Link Here
262
				<td>
268
				<td>
263
                              <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]&amp;gst=[% loop_order.gst %]&amp;freight=[% loop_order.freight %]&amp;booksellerid=[% loop_order.booksellerid %]">Receive</a>
269
                              <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]&amp;gst=[% loop_order.gst %]&amp;freight=[% loop_order.freight %]&amp;booksellerid=[% loop_order.booksellerid %]">Receive</a>
264
                    <br />
270
                    <br />
265
                    <a href="/cgi-bin/koha/acqui/transferorder.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=[% "/cgi-bin/koha/acqui/parcel.pl?booksellerid=$booksellerid&datereceived=$invoicedatereceived&invoice=$invoice" | uri %]">Transfer</a>
271
                    <a href="#" onclick="transfer_order_popup([% loop_order.ordernumber %]); return false;">Transfer</a>
266
				    
272
				    
267
				</td>
273
				</td>
268
				<td>
274
				<td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt (-16 / +11 lines)
Lines 1-16 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisitions &rsaquo; Transfer order</title>
2
<title>Koha &rsaquo; Acquisitions &rsaquo; Transfer order</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% IF transferred %]
5
    <script type="text/javascript">
6
    //<![CDATA[
7
        opener.location.reload();
8
        window.close();
9
    //]]>
10
    </script>
11
[% END %]
4
</head>
12
</head>
5
<body>
13
<body>
6
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'acquisitions-search.inc' %]
8
9
<div id="breadcrumbs">
10
    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
11
    &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
12
    &rsaquo; Transfer order
13
</div>
14
14
15
<div id="doc3" class="yui-t2">
15
<div id="doc3" class="yui-t2">
16
<div id="bd">
16
<div id="bd">
Lines 32-38 Link Here
32
                            <td>[% basket.basketname %] (#[% basket.basketno %])</td>
32
                            <td>[% basket.basketname %] (#[% basket.basketno %])</td>
33
                            <td>[% basket.createdby %]</td>
33
                            <td>[% basket.createdby %]</td>
34
                            <td>[% basket.creationdate %]</td>
34
                            <td>[% basket.creationdate %]</td>
35
                            <td><a href="transferorder.pl?basketno=[% basket.basketno %]&ordernumber=[% ordernumber %][% IF (referrer) %]&referrer=[% referrer | uri %][% END %]" onclick="return confirm('Do you want to transfer order [% ordernumber %] from basket [% basketfromname %] ([% booksellerfromname %]) to basket [% basket.basketname %] ([% booksellertoname %]) ?');">Choose</a>
35
                            <td><a href="transferorder.pl?basketno=[% basket.basketno %]&ordernumber=[% ordernumber %]" onclick="return confirm('Do you want to transfer order [% ordernumber %] from basket [% basketfromname %] ([% booksellerfromname %]) to basket [% basket.basketname %] ([% booksellertoname %]) ?');">Choose</a>
36
                          </tr>
36
                          </tr>
37
                        [% END %]
37
                        [% END %]
38
                    </tbody>
38
                    </tbody>
Lines 59-65 Link Here
59
                            [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn %][% END %]
59
                            [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn %][% END %]
60
                            [% IF ( ordersloo.publishercode ) %]<br />Publisher :[% ordersloo.publishercode %][% END %]
60
                            [% IF ( ordersloo.publishercode ) %]<br />Publisher :[% ordersloo.publishercode %][% END %]
61
                        </td>
61
                        </td>
62
                        <td><a href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %][% IF (referrer) %]&referrer=[% referrer | uri %][% END %]">Transfer</a></td>
62
                        <td><a href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td>
63
                      </tr>
63
                      </tr>
64
                    [% END %]
64
                    [% END %]
65
                </tbody>
65
                </tbody>
Lines 81-87 Link Here
81
                        [% FOREACH bookseller IN booksellersloop %]
81
                        [% FOREACH bookseller IN booksellersloop %]
82
                          <tr>
82
                          <tr>
83
                            <td>[% bookseller.name %]</td>
83
                            <td>[% bookseller.name %]</td>
84
                            <td><a href="transferorder.pl?[% IF (bookselleridfrom) %]bookselleridto[% ELSE %]bookselleridfrom[% END %]=[% bookseller.id %][% IF (ordernumber) %]&ordernumber=[% ordernumber %][% END %][% IF (referrer) %]&referrer=[% referrer | uri %][% END %]">Choose</a></td>
84
                            <td><a href="transferorder.pl?[% IF (bookselleridfrom) %]bookselleridto[% ELSE %]bookselleridfrom[% END %]=[% bookseller.id %][% IF (ordernumber) %]&ordernumber=[% ordernumber %][% END %]">Choose</a></td>
85
                          </tr>
85
                          </tr>
86
                        [% END %]
86
                        [% END %]
87
                    </tbody>
87
                    </tbody>
Lines 98-104 Link Here
98
            [% END %]
98
            [% END %]
99
            <form method="get" action="transferorder.pl">
99
            <form method="get" action="transferorder.pl">
100
                <input type="hidden" name="op" value="do_search" />
100
                <input type="hidden" name="op" value="do_search" />
101
                <input type="hidden" name="referrer" value="[% referrer %]" />
102
                [% IF ( ordernumber ) %]
101
                [% IF ( ordernumber ) %]
103
                    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
102
                    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
104
                [% END %]
103
                [% END %]
Lines 113-121 Link Here
113
    </div>
112
    </div>
114
</div>
113
</div>
115
114
116
<div class="yui-b">
117
    [% INCLUDE 'acquisitions-menu.inc' %]
118
</div>
119
</div>
115
</div>
120
</div>
116
</div>
121
[% INCLUDE 'intranet-bottom.inc' %]
117
[% INCLUDE 'intranet-bottom.inc' %]
122
- 

Return to bug 5349