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

(-)a/acqui/transferorder.pl (+4 lines)
Lines 49-56 my $op = $input->param('op'); Link Here
49
my $query           = $input->param('query');
49
my $query           = $input->param('query');
50
50
51
my $order = GetOrder($ordernumber);
51
my $order = GetOrder($ordernumber);
52
my $basketfromname = '';
52
if($order) {
53
if($order) {
53
    my $basket = GetBasket($order->{basketno});
54
    my $basket = GetBasket($order->{basketno});
55
    $basketfromname = $basket->{basketname};
54
    $bookselleridfrom = $basket->{booksellerid} if $basket;
56
    $bookselleridfrom = $basket->{booksellerid} if $basket;
55
}
57
}
56
58
Lines 65-70 if($booksellerto){ Link Here
65
    $booksellertoname = $booksellerto->{name};
67
    $booksellertoname = $booksellerto->{name};
66
}
68
}
67
69
70
68
if( $basketno && $ordernumber) {
71
if( $basketno && $ordernumber) {
69
    # Transfer order and exit
72
    # Transfer order and exit
70
    my $order = GetOrder( $ordernumber );
73
    my $order = GetOrder( $ordernumber );
Lines 132-137 $template->param( Link Here
132
    booksellertoname    => $booksellertoname,
135
    booksellertoname    => $booksellertoname,
133
    ordernumber         => $ordernumber,
136
    ordernumber         => $ordernumber,
134
    basketno            => $basketno,
137
    basketno            => $basketno,
138
    basketfromname      => $basketfromname,
135
);
139
);
136
140
137
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/transferorder.tt (-2 / +20 lines)
Lines 12-17 Link Here
12
    //]]>
12
    //]]>
13
    </script>
13
    </script>
14
[% END %]
14
[% END %]
15
16
[% IF ( bookselleridfrom ) %]
17
    <script type="text/javascript">
18
    //<![CDATA[
19
        function confirmtransfer() {
20
            return confirm( _("Transfer order to this basket?") );
21
        }
22
    //]]>
23
    </script>
24
[% END %]
25
26
15
</head>
27
</head>
16
<body id="acq_transferorder" class="acq">
28
<body id="acq_transferorder" class="acq">
17
29
Lines 20-25 Link Here
20
    <div class="yui-g">
32
    <div class="yui-g">
21
        [% IF ( bookselleridfrom ) %]
33
        [% IF ( bookselleridfrom ) %]
22
            <h3>Search for a vendor to transfer to</h3>
34
            <h3>Search for a vendor to transfer to</h3>
35
              <div class="transferinfo">
36
                <ul>
37
                  <li><span class="label">From vendor: </span>[% booksellerfromname %]</li>
38
                  <li><span class="label">Basket: </span>[% basketfromname %]</li>
39
                  <li><span class="label">Order: </span>[% ordernumber %]</li>
40
                </ol>
41
              </div>
23
        [% ELSE %]
42
        [% ELSE %]
24
            <h3>Search for a vendor to transfer from</h3>
43
            <h3>Search for a vendor to transfer from</h3>
25
        [% END %]
44
        [% END %]
Lines 53-59 Link Here
53
                            <td>[% basket.basketname %] (#[% basket.basketno %])</td>
72
                            <td>[% basket.basketname %] (#[% basket.basketno %])</td>
54
                            <td>[% basket.createdby %]</td>
73
                            <td>[% basket.createdby %]</td>
55
                            <td>[% basket.creationdate %]</td>
74
                            <td>[% basket.creationdate %]</td>
56
                            <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>
75
                            <td><a href="transferorder.pl?basketno=[% basket.basketno %]&ordernumber=[% ordernumber %]" onclick="return confirmtransfer();">Choose</a>
57
                          </tr>
76
                          </tr>
58
                        [% END %]
77
                        [% END %]
59
                    </tbody>
78
                    </tbody>
60
- 

Return to bug 15117