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

(-)a/circ/returns.pl (-5 / +5 lines)
Lines 217-223 if ($dotransfer){ Link Here
217
# An item has been returned to a branch other than the homebranch, and the librarian has chosen to initiate a transfer
217
# An item has been returned to a branch other than the homebranch, and the librarian has chosen to initiate a transfer
218
    my $transferitem = $query->param('transferitem');
218
    my $transferitem = $query->param('transferitem');
219
    my $tobranch     = $query->param('tobranch');
219
    my $tobranch     = $query->param('tobranch');
220
    ModItemTransfer($transferitem, $userenv_branch, $tobranch); 
220
    ModItemTransfer($transferitem, $userenv_branch, $tobranch);
221
}
221
}
222
222
223
if ($canceltransfer){
223
if ($canceltransfer){
Lines 276-282 if ($barcode) { Link Here
276
        itembarcode      => $biblio->{'barcode'},
276
        itembarcode      => $biblio->{'barcode'},
277
        itemtype         => $biblio->{'itemtype'},
277
        itemtype         => $biblio->{'itemtype'},
278
        ccode            => $biblio->{'ccode'},
278
        ccode            => $biblio->{'ccode'},
279
        itembiblionumber => $biblio->{'biblionumber'},    
279
        itembiblionumber => $biblio->{'biblionumber'},
280
        borrower         => $borrower,
280
        borrower         => $borrower,
281
        additional_materials => $biblio->{'materials'},
281
        additional_materials => $biblio->{'materials'},
282
    );
282
    );
Lines 305-311 if ($barcode) { Link Here
305
                $template->param( fineborrowernumber => $borrower->{'borrowernumber'} );
305
                $template->param( fineborrowernumber => $borrower->{'borrowernumber'} );
306
            }
306
            }
307
        }
307
        }
308
        
308
309
        if (C4::Context->preference("WaitingNotifyAtCheckin") ) {
309
        if (C4::Context->preference("WaitingNotifyAtCheckin") ) {
310
            #Check for waiting holds
310
            #Check for waiting holds
311
            my @reserves = GetReservesFromBorrowernumber($borrower->{'borrowernumber'});
311
            my @reserves = GetReservesFromBorrowernumber($borrower->{'borrowernumber'});
Lines 314-320 if ($barcode) { Link Here
314
                if ( $num_res->{'found'} eq 'W' && $num_res->{'branchcode'} eq $userenv_branch) {
314
                if ( $num_res->{'found'} eq 'W' && $num_res->{'branchcode'} eq $userenv_branch) {
315
                    $waiting_holds++;
315
                    $waiting_holds++;
316
                }
316
                }
317
            } 
317
            }
318
            if ($waiting_holds > 0) {
318
            if ($waiting_holds > 0) {
319
                $template->param(
319
                $template->param(
320
                    waiting_holds       => $waiting_holds,
320
                    waiting_holds       => $waiting_holds,
Lines 600-606 $template->param( Link Here
600
    BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"),
600
    BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"),
601
);
601
);
602
602
603
my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
603
$itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
604
if ( $itemnumber ) {
604
if ( $itemnumber ) {
605
   my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
605
   my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
606
    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
606
    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
(-)a/installer/data/mysql/updatedatabase.pl (-4 / +4 lines)
Lines 3417-3426 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
3417
$DBversion = '3.01.00.108';
3417
$DBversion = '3.01.00.108';
3418
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3418
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3419
	$dbh->do(qq{
3419
	$dbh->do(qq{
3420
	ALTER TABLE `export_format` ADD `csv_separator` VARCHAR( 2 ) NOT NULL AFTER `marcfields` ,
3420
    ALTER TABLE `export_format` ADD `csv_separator` VARCHAR( 2 ) NOT NULL AFTER `marcfields` ,
3421
	ADD `field_separator` VARCHAR( 2 ) NOT NULL AFTER `csv_separator` ,
3421
    ADD `field_separator` VARCHAR( 2 ) NOT NULL AFTER `csv_separator` ,
3422
	ADD `subfield_separator` VARCHAR( 2 ) NOT NULL AFTER `field_separator`
3422
    ADD `subfield_separator` VARCHAR( 2 ) NOT NULL AFTER `field_separator`
3423
	});
3423
    });
3424
	print "Upgrade to $DBversion done (added separators for csv export)\n";
3424
	print "Upgrade to $DBversion done (added separators for csv export)\n";
3425
    SetVersion ($DBversion);
3425
    SetVersion ($DBversion);
3426
}
3426
}
(-)a/rotating_collections/addItems.pl (-1 / +1 lines)
Lines 30-36 my $query = new CGI; Link Here
30
30
31
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
31
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
32
    {
32
    {
33
        template_name   => "rotating_collections/addItems.tmpl",
33
        template_name   => "rotating_collections/addItems.tt",
34
        query           => $query,
34
        query           => $query,
35
        type            => "intranet",
35
        type            => "intranet",
36
        authnotrequired => 0,
36
        authnotrequired => 0,
(-)a/rotating_collections/editCollections.pl (-1 / +1 lines)
Lines 30-36 my $query = new CGI; Link Here
30
30
31
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
31
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
32
    {
32
    {
33
        template_name   => "rotating_collections/editCollections.tmpl",
33
        template_name   => "rotating_collections/editCollections.tt",
34
        query           => $query,
34
        query           => $query,
35
        type            => "intranet",
35
        type            => "intranet",
36
        authnotrequired => 0,
36
        authnotrequired => 0,
(-)a/rotating_collections/rotatingCollections.pl (-1 / +1 lines)
Lines 29-35 my $query = new CGI; Link Here
29
29
30
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
30
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
31
    {
31
    {
32
        template_name   => "rotating_collections/rotatingCollections.tmpl",
32
        template_name   => "rotating_collections/rotatingCollections.tt",
33
        query           => $query,
33
        query           => $query,
34
        type            => "intranet",
34
        type            => "intranet",
35
        authnotrequired => 0,
35
        authnotrequired => 0,
(-)a/rotating_collections/transferCollection.pl (-2 / +1 lines)
Lines 33-39 my $toBranch = $query->param('toBranch'); Link Here
33
33
34
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
34
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
35
    {
35
    {
36
        template_name   => "rotating_collections/transferCollection.tmpl",
36
        template_name   => "rotating_collections/transferCollection.tt",
37
        query           => $query,
37
        query           => $query,
38
        type            => "intranet",
38
        type            => "intranet",
39
        authnotrequired => 0,
39
        authnotrequired => 0,
40
- 

Return to bug 8836