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

(-)a/C4/Circulation.pm (-3 / +5 lines)
Lines 1430-1435 sub AddReturn { Link Here
1430
            or die "Data inconsistency: barcode $barcode (itemnumber:$itemnumber) claims to be issued to non-existant borrowernumber '$issue->{borrowernumber}'\n"
1430
            or die "Data inconsistency: barcode $barcode (itemnumber:$itemnumber) claims to be issued to non-existant borrowernumber '$issue->{borrowernumber}'\n"
1431
                . Dumper($issue) . "\n";
1431
                . Dumper($issue) . "\n";
1432
    } else {
1432
    } else {
1433
1433
        $messages->{'NotIssued'} = $barcode;
1434
        $messages->{'NotIssued'} = $barcode;
1434
        # even though item is not on loan, it may still be transferred;  therefore, get current branch info
1435
        # even though item is not on loan, it may still be transferred;  therefore, get current branch info
1435
        $doreturn = 0;
1436
        $doreturn = 0;
Lines 1437-1447 sub AddReturn { Link Here
1437
    }
1438
    }
1438
1439
1439
    my $item = GetItem($itemnumber) or die "GetItem($itemnumber) failed";
1440
    my $item = GetItem($itemnumber) or die "GetItem($itemnumber) failed";
1441
    
1440
        # full item data, but no borrowernumber or checkout info (no issue)
1442
        # full item data, but no borrowernumber or checkout info (no issue)
1441
        # we know GetItem should work because GetItemnumberFromBarcode worked
1443
        # we know GetItem should work because GetItemnumberFromBarcode worked
1442
    my $hbr = $item->{C4::Context->preference("HomeOrHoldingBranch")} || '';
1444
    my $hbr      = C4::Context->preference("HomeOrHoldingBranchReturn") || "homebranch";
1443
        # item must be from items table -- issues table has branchcode and issuingbranch, not homebranch nor holdingbranch
1445
    $hbr         = $iteminformation->{$hbr};
1444
1446
    
1445
    my $borrowernumber = $borrower->{'borrowernumber'} || undef;    # we don't know if we had a borrower or not
1447
    my $borrowernumber = $borrower->{'borrowernumber'} || undef;    # we don't know if we had a borrower or not
1446
1448
1447
    # check if the book is in a permanent collection....
1449
    # check if the book is in a permanent collection....
(-)a/admin/systempreferences.pl (+1 lines)
Lines 161-166 $tabsysprefs{finesCalendar} = "Circulation"; Link Here
161
$tabsysprefs{previousIssuesDefaultSortOrder} = "Circulation";
161
$tabsysprefs{previousIssuesDefaultSortOrder} = "Circulation";
162
$tabsysprefs{todaysIssuesDefaultSortOrder}   = "Circulation";
162
$tabsysprefs{todaysIssuesDefaultSortOrder}   = "Circulation";
163
$tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
163
$tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
164
$tabsysprefs{HomeOrHoldingBranchReturn}      = "Circulation";
164
$tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
165
$tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
165
$tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
166
$tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
166
$tabsysprefs{AllowOnShelfHolds}              = "Circulation";
167
$tabsysprefs{AllowOnShelfHolds}              = "Circulation";
(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
Lines 175-180 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
175
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacRenewalAllowed',0,'If ON, users can renew their issues directly from their OPAC account',NULL,'YesNo');
175
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacRenewalAllowed',0,'If ON, users can renew their issues directly from their OPAC account',NULL,'YesNo');
176
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('PatronsPerPage','20','Number of Patrons Per Page displayed by default','20','Integer');
176
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('PatronsPerPage','20','Number of Patrons Per Page displayed by default','20','Integer');
177
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('HomeOrHoldingBranch','holdingbranch','Used by Circulation to determine which branch of an item to check with independent branches on, and by search to determine which branch to choose for availability ','holdingbranch|homebranch','Choice');
177
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('HomeOrHoldingBranch','holdingbranch','Used by Circulation to determine which branch of an item to check with independent branches on, and by search to determine which branch to choose for availability ','holdingbranch|homebranch','Choice');
178
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('HomeOrHoldingBranchReturn','homebranch','Used by Circulation to determine which branch of an item to check checking-in items','holdingbranch|homebranch','Choice');
178
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHighlightedWords','1','If Set, then queried words are higlighted in OPAC','','YesNo');
179
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHighlightedWords','1','If Set, then queried words are higlighted in OPAC','','YesNo');
179
180
180
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH','0','if ON, OAI-PMH server is enabled',NULL,'YesNo');
181
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH','0','if ON, OAI-PMH server is enabled',NULL,'YesNo');
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql (+1 lines)
Lines 175-180 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
175
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACBaseURL',NULL,'Définit l''adresse de base de l''OPAC, par exemple :opac.mylibrary.com, le http:// sera automatiquement ajouté par Koha',NULL,'Free');
175
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACBaseURL',NULL,'Définit l''adresse de base de l''OPAC, par exemple :opac.mylibrary.com, le http:// sera automatiquement ajouté par Koha',NULL,'Free');
176
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacRenewalAllowed',0,'Si activé, les utilisateurs peuvent renouveller leurs prêts directement depuis leur compte à l''OPAC',NULL,'YesNo');
176
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacRenewalAllowed',0,'Si activé, les utilisateurs peuvent renouveller leurs prêts directement depuis leur compte à l''OPAC',NULL,'YesNo');
177
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('HomeOrHoldingBranch','holdingbranch','Détermine si l''on utilise le site propriétaire ou le site dépositaire dans les opérations de circulation ou d''affichage de la disponibilité','holdingbranch|homebranch','Choice');
177
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('HomeOrHoldingBranch','holdingbranch','Détermine si l''on utilise le site propriétaire ou le site dépositaire dans les opérations de circulation ou d''affichage de la disponibilité','holdingbranch|homebranch','Choice');
178
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('HomeOrHoldingBranchReturn','holdingbranch','Détermine si l''on utilise le site propriétaire ou le site dépositaire dans les opérations de retour','holdingbranch|homebranch','Choice');
178
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHighlightedWords','0','Si activé, les mots recherchés dans la notices sont affichés dans l''OPAC','','YesNo');
179
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHighlightedWords','0','Si activé, les mots recherchés dans la notices sont affichés dans l''OPAC','','YesNo');
179
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH','0','Si activé, le service OAI-PMH est disponible',NULL,'YesNo');
180
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH','0','Si activé, le service OAI-PMH est disponible',NULL,'YesNo');
180
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:archiveID','KOHA-OAI-TEST','Identification de l''archive OAI-PMH',NULL,'Free');
181
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:archiveID','KOHA-OAI-TEST','Identification de l''archive OAI-PMH',NULL,'Free');
(-)a/installer/data/mysql/updatedatabase.pl (+9 lines)
Lines 3291-3296 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
3291
    SetVersion ($DBversion);
3291
    SetVersion ($DBversion);
3292
}
3292
}
3293
3293
3294
$DBversion = "3.01.00.101";
3295
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3296
    my $value = $dbh->selectrow_array("SELECT value FROM systempreferences WHERE variable = 'HomeOrHoldingBranch'");
3297
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HomeOrHoldingBranchReturn','$value','Used by Circulation to determine which branch of an item to check checking-in items','holdingbranch|homebranch','Choice');");
3298
    print "Upgrade to $DBversion done (Add HomeOrHoldingBranchReturn system preference)\n";
3299
    SetVersion ($DBversion);
3300
}
3301
3302
3294
=item DropAllForeignKeys($table)
3303
=item DropAllForeignKeys($table)
3295
3304
3296
  Drop all foreign keys of the table $table
3305
  Drop all foreign keys of the table $table
(-)a/kohaversion.pl (-2 / +1 lines)
Lines 10-16 Link Here
10
use strict;
10
use strict;
11
11
12
sub kohaversion {
12
sub kohaversion {
13
    our $VERSION = '3.01.00.100';
13
    our $VERSION = '3.01.00.101';
14
    # version needs to be set this way
14
    # version needs to be set this way
15
    # so that it can be picked up by Makefile.PL
15
    # so that it can be picked up by Makefile.PL
16
    # during install
16
    # during install
17
- 

Return to bug 3536