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

(-)a/circ/branchtransfers.pl (-42 / +50 lines)
Lines 118-130 if ($barcode) { Link Here
118
        my %item;
118
        my %item;
119
        my $frbranchcd =  C4::Context->userenv->{'branch'};
119
        my $frbranchcd =  C4::Context->userenv->{'branch'};
120
#         if ( not($found) ) {
120
#         if ( not($found) ) {
121
        $item{'biblionumber'} = $iteminformation->{'biblionumber'};
121
        $item{'biblionumber'}          = $iteminformation->{'biblionumber'};
122
        $item{'title'}        = $iteminformation->{'title'};
122
        $item{'itemnumber'}            = $iteminformation->{'itemnumber'};
123
        $item{'author'}       = $iteminformation->{'author'};
123
        $item{'title'}                 = $iteminformation->{'title'};
124
        $item{'itemtype'}     = $iteminformation->{'itemtype'};
124
        $item{'author'}                = $iteminformation->{'author'};
125
        $item{'ccode'}        = $iteminformation->{'ccode'};
125
        $item{'itemtype'}              = $iteminformation->{'itemtype'};
126
        $item{'frbrname'}     = $branches->{$frbranchcd}->{'branchname'};
126
        $item{'ccode'}                 = $iteminformation->{'ccode'};
127
        $item{'tobrname'}     = $branches->{$tobranchcd}->{'branchname'};
127
        $item{'itemcallnumber'}        = $iteminformation->{'itemcallnumber'};
128
        $item{'location'}              = GetKohaAuthorisedValueLib("LOC",$iteminformation->{'location'});
129
        $item{'frbrname'}              = $branches->{$frbranchcd}->{'branchname'};
130
        $item{'tobrname'}              = $branches->{$tobranchcd}->{'branchname'};
128
#         }
131
#         }
129
        $item{counter}  = 0;
132
        $item{counter}  = 0;
130
        $item{barcode}  = $barcode;
133
        $item{barcode}  = $barcode;
Lines 148-160 foreach ( $query->param ) { Link Here
148
    $item{frombrcd} = $frbcd;
151
    $item{frombrcd} = $frbcd;
149
    $item{tobrcd}   = $tobcd;
152
    $item{tobrcd}   = $tobcd;
150
    my ($iteminformation) = GetBiblioFromItemNumber( GetItemnumberFromBarcode($bc) );
153
    my ($iteminformation) = GetBiblioFromItemNumber( GetItemnumberFromBarcode($bc) );
151
    $item{'biblionumber'} = $iteminformation->{'biblionumber'};
154
    $item{'biblionumber'}          = $iteminformation->{'biblionumber'};
152
    $item{'title'}        = $iteminformation->{'title'};
155
    $item{'itemnumber'}            = $iteminformation->{'itemnumber'};
153
    $item{'author'}       = $iteminformation->{'author'};
156
    $item{'title'}                 = $iteminformation->{'title'};
154
    $item{'itemtype'}     = $iteminformation->{'itemtype'};
157
    $item{'author'}                = $iteminformation->{'author'};
155
    $item{'ccode'}        = $iteminformation->{'ccode'};
158
    $item{'itemtype'}              = $iteminformation->{'itemtype'};
156
    $item{'frbrname'}     = $branches->{$frbcd}->{'branchname'};
159
    $item{'ccode'}                 = $iteminformation->{'ccode'};
157
    $item{'tobrname'}     = $branches->{$tobcd}->{'branchname'};
160
    $item{'itemcallnumber'}        = $iteminformation->{'itemcallnumber'};
161
    $item{'location'}              = GetKohaAuthorisedValueLib("LOC",$iteminformation->{'location'});
162
    $item{'frbrname'}              = $branches->{$frbcd}->{'branchname'};
163
    $item{'tobrname'}              = $branches->{$tobcd}->{'branchname'};
158
    push( @trsfitemloop, \%item );
164
    push( @trsfitemloop, \%item );
159
}
165
}
160
166
Lines 187-221 if ( $codeType eq 'itemtype' ) { Link Here
187
193
188
my @errmsgloop;
194
my @errmsgloop;
189
foreach my $code ( keys %$messages ) {
195
foreach my $code ( keys %$messages ) {
190
    my %err;
196
    if ( $code ne 'WasTransfered' ) {
191
    if ( $code eq 'BadBarcode' ) {
197
        my %err;
192
        $err{msg}        = $messages->{'BadBarcode'};
198
        if ( $code eq 'BadBarcode' ) {
193
        $err{errbadcode} = 1;
199
            $err{msg}        = $messages->{'BadBarcode'};
200
            $err{errbadcode} = 1;
201
        }
202
        elsif ( $code eq "NotAllowed" ) {
203
            warn "NotAllowed: $messages->{'NotAllowed'} to  " . $branches->{ $messages->{'NotAllowed'} }->{'branchname'};
204
            # Do we really want a error log message here? --atz
205
            $err{errnotallowed} =  1;
206
            my ( $tbr, $typecode ) = split( /::/,  $messages->{'NotAllowed'} );
207
            $err{tbr}      = $branches->{ $tbr }->{'branchname'};
208
            $err{code}     = $typecode;
209
            $err{codeType} = $codeTypeDescription;
210
        }
211
        elsif ( $code eq 'IsPermanent' ) {
212
            $err{errispermanent} = 1;
213
            $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
214
        }
215
        elsif ( $code eq 'WasReturned' ) {
216
            $err{errwasreturned} = 1;
217
            $err{borrowernumber} = $messages->{'WasReturned'};
218
            my $borrower = GetMember('borrowernumber'=>$messages->{'WasReturned'});
219
            $err{title}      = $borrower->{'title'};
220
            $err{firstname}  = $borrower->{'firstname'};
221
            $err{surname}    = $borrower->{'surname'};
222
            $err{cardnumber} = $borrower->{'cardnumber'};
223
        }
224
        $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
225
        push( @errmsgloop, \%err );
194
    }
226
    }
195
    elsif ( $code eq "NotAllowed" ) {
196
        warn "NotAllowed: $messages->{'NotAllowed'} to  " . $branches->{ $messages->{'NotAllowed'} }->{'branchname'};
197
        # Do we really want a error log message here? --atz
198
        $err{errnotallowed} =  1;
199
        my ( $tbr, $typecode ) = split( /::/,  $messages->{'NotAllowed'} );
200
        $err{tbr}      = $branches->{ $tbr }->{'branchname'};
201
        $err{code}     = $typecode;
202
        $err{codeType} = $codeTypeDescription; 
203
    }
204
    elsif ( $code eq 'IsPermanent' ) {
205
        $err{errispermanent} = 1;
206
        $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
207
    }
208
    elsif ( $code eq 'WasReturned' ) {
209
        $err{errwasreturned} = 1;
210
		$err{borrowernumber} = $messages->{'WasReturned'};
211
		my $borrower = GetMember('borrowernumber'=>$messages->{'WasReturned'});
212
		$err{title}      = $borrower->{'title'};
213
		$err{firstname}  = $borrower->{'firstname'};
214
		$err{surname}    = $borrower->{'surname'};
215
		$err{cardnumber} = $borrower->{'cardnumber'};
216
    }
217
    $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
218
    push( @errmsgloop, \%err );
219
}
227
}
220
228
221
# use Data::Dumper;
229
# use Data::Dumper;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-45 / +53 lines)
Lines 86-93 Link Here
86
    </table></div>
86
    </table></div>
87
87
88
[% ELSE %]
88
[% ELSE %]
89
<div class="yui-ge">
89
                    [% IF ( reqmessage ) %]
90
   <div class="yui-u first">     
90
                     <div class="dialog message">
91
                        <ul>
92
                         [% IF ( cancelled ) %]
93
                             <li>Reserve cancelled</li>
94
                         [% END %]
95
                         [% IF ( setwaiting ) %]
96
                             <li>Item should now be waiting at library: [% reqbrchname %]</li>
97
                         [% END %]
98
                         </ul>
99
                    </div>
100
                     [% END %]
101
102
                     [% IF ( errmsgloop ) %]
103
                        <div class="dialog message">
104
                            <ul>
105
                             [% FOREACH errmsgloo IN errmsgloop %]
106
                              [% IF ( errmsgloo.errbadcode ) %]
107
                                  <li>No Item with barcode: [% errmsgloo.msg %]</li>
108
                              [% END %]
109
                              [% IF ( errmsgloo.errispermanent ) %]
110
                                  <li>Please return item to home library: [% errmsgloo.msg %]</li>
111
                              [% END %]
112
                              [% IF ( errmsgloo.errnotallowed ) %]
113
                                  <li>You cannot transfer items of [% errmsgloo.codeType %] <b>[% errmsgloo.code %]</b> to <b>[% errmsgloo.tbr %]</b></li>
114
                              [% END %]
115
                              [% IF ( errmsgloo.errdesteqholding ) %]
116
                                  <li>Item is already at destination library.</li>
117
                              [% END %]
118
                              [% IF ( errmsgloo.errwasreturned ) %]
119
                                  <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.borrowernumber %]">
120
                                  [% errmsgloo.firstname %] [% errmsgloo.surname %]
121
                                  ([% errmsgloo.cardnumber %])</a> and has been returned.</li>
122
                              [% END %]
123
                          [% END %]
124
                          </ul>
125
                            </div>
126
                        [% END %]
127
128
<div id="branchtransfers">
91
    <form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
129
    <form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
92
        <fieldset class="brief">
130
        <fieldset class="brief">
93
            <legend>Transfer</legend>
131
            <legend>Transfer</legend>
Lines 119-176 Link Here
119
            <input type="hidden" name="tb-[% trsfitemloo.counter %]" value="[% trsfitemloo.tobrcd %]" />
157
            <input type="hidden" name="tb-[% trsfitemloo.counter %]" value="[% trsfitemloo.tobrcd %]" />
120
        [% END %]
158
        [% END %]
121
    </form></div>
159
    </form></div>
122
 
160
</div>
123
	 <div class="yui-u"><h4>Messages</h4>
161
124
		<ul>
125
                [% IF ( reqmessage ) %]
126
                    [% IF ( cancelled ) %]
127
                        <li>Reserve Cancelled</li>
128
                    [% END %]
129
                    [% IF ( setwaiting ) %]
130
                        <li>Item should now be waiting at library: [% reqbrchname %]</li>
131
                    [% END %]
132
                [% END %]
133
                [% FOREACH errmsgloo IN errmsgloop %]
134
                    [% IF ( errmsgloo.errbadcode ) %]
135
                        <li>No Item with barcode: [% errmsgloo.msg %]</li>
136
                    [% END %]
137
                    [% IF ( errmsgloo.errispermanent ) %]
138
                        <li>Please return item to home library: [% errmsgloo.msg %]</li>
139
                    [% END %]
140
                    [% IF ( errmsgloo.errnotallowed ) %]
141
                        <li>You cannot transfer items of [% errmsgloo.codeType %] <b>[% errmsgloo.code %]</b> to <b>[% errmsgloo.tbr %]</b></li>
142
                    [% END %]
143
                    [% IF ( errmsgloo.errdesteqholding ) %]
144
                        <li>Item is already at destination library.</li>
145
                    [% END %]
146
                    [% IF ( errmsgloo.errwasreturned ) %]
147
                        <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.borrowernumber %]">
148
[% errmsgloo.firstname %] [% errmsgloo.surname %]
149
([% errmsgloo.cardnumber %])</a> and has been returned.</li>
150
                    [% END %]
151
                [% END %]
152
        </ul>
153
    </div><!-- /yui-u -->
154
</div><!-- /yui-ge -->
155
	 
156
    [% IF ( trsfitemloop ) %]
162
    [% IF ( trsfitemloop ) %]
157
        <div class="yui-g">
163
        <div class="yui-g">
158
		<table>
164
		<table>
159
            <caption>Transferred Items</caption>
165
            <caption>Transferred Items</caption>
160
            <tr>
166
            <tr>
161
                <th>Bar Code</th>
162
                <th>Title</th>
167
                <th>Title</th>
168
                <th>Author</th>
169
                <th>Barcode</th>
170
                <th>Shelving location</th>
171
                <th>Call number</th>
172
                <th>Type</th>
163
                <th>To</th>
173
                <th>To</th>
164
            </tr>
174
            </tr>
165
            [% FOREACH trsfitemloo IN trsfitemloop %]
175
            [% FOREACH trsfitemloo IN trsfitemloop %]
166
                <tr>
176
                <tr>
167
                    <td>
177
                    <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber %]">[% trsfitemloo.title |html %]</a></td>
168
                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber %]">[% trsfitemloo.barcode %]</a>
178
                    <td>[% trsfitemloo.author %]</td>
169
                    </td>
179
                    <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% trsfitemloo.biblionumber %]&amp;itemnumber=[% trsfitemloo.itemnumber %]#item[% trsfitemloo.itemnumber %]">[% trsfitemloo.barcode %]</a></td>
170
                    <td>
180
                    <td>[% trsfitemloo.location %]</td>
171
                        <p>[% trsfitemloo.title |html %] ([% trsfitemloo.author %])</p>
181
                    <td>[% trsfitemloo.itemcallnumber %]</td>
172
                        <p>[% trsfitemloo.ccode %]</p>
182
                    <td>[% trsfitemloo.ccode %]</td>
173
                    </td>
174
                    <td>[% trsfitemloo.tobrname %]</td>
183
                    <td>[% trsfitemloo.tobrname %]</td>
175
                </tr>
184
                </tr>
176
            [% END %]
185
            [% END %]
177
- 

Return to bug 7123