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

(-)a/C4/Circulation.pm (-1 / +2 lines)
Lines 1400-1406 sub AddReturn { Link Here
1400
        $iteminformation->{'itemlost'} = $curr_iteminfo->{'itemlost'};
1400
        $iteminformation->{'itemlost'} = $curr_iteminfo->{'itemlost'};
1401
        
1401
        
1402
        # check if the book is in a permanent collection....
1402
        # check if the book is in a permanent collection....
1403
        my $hbr      = $iteminformation->{C4::Context->preference("HomeOrHoldingBranch")};
1403
        my $hbr      = C4::Context->preference("HomeOrHoldingBranchReturn") || "homebranch";
1404
        $hbr         = $iteminformation->{$hbr};
1404
        my $branches = GetBranches();
1405
        my $branches = GetBranches();
1405
		# FIXME -- This 'PE' attribute is largely undocumented.  afaict, there's no user interface that reflects this functionality.
1406
		# FIXME -- This 'PE' attribute is largely undocumented.  afaict, there's no user interface that reflects this functionality.
1406
        if ( $hbr && $branches->{$hbr}->{'PE'} ) {
1407
        if ( $hbr && $branches->{$hbr}->{'PE'} ) {
(-)a/admin/systempreferences.pl (+1 lines)
Lines 150-155 $tabsysprefs{finesCalendar} = "Circulation"; Link Here
150
$tabsysprefs{previousIssuesDefaultSortOrder} = "Circulation";
150
$tabsysprefs{previousIssuesDefaultSortOrder} = "Circulation";
151
$tabsysprefs{todaysIssuesDefaultSortOrder}   = "Circulation";
151
$tabsysprefs{todaysIssuesDefaultSortOrder}   = "Circulation";
152
$tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
152
$tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
153
$tabsysprefs{HomeOrHoldingBranchReturn}      = "Circulation";
153
$tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
154
$tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
154
$tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
155
$tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
155
$tabsysprefs{AllowOnShelfHolds}              = "Circulation";
156
$tabsysprefs{AllowOnShelfHolds}              = "Circulation";
(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
Lines 167-172 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
167
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');
167
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');
168
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('PatronsPerPage','20','Number of Patrons Per Page displayed by default','20','Integer');
168
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('PatronsPerPage','20','Number of Patrons Per Page displayed by default','20','Integer');
169
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');
169
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');
170
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');
170
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHighlightedWords','1','If Set, then queried words are higlighted in OPAC','','YesNo');
171
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHighlightedWords','1','If Set, then queried words are higlighted in OPAC','','YesNo');
171
172
172
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH','0','if ON, OAI-PMH server is enabled',NULL,'YesNo');
173
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 167-172 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
167
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACBaseURL',NULL,'Specify the Base URL of the OPAC, e.g., opac.mylibrary.com, the http:// will be added automatically by Koha.',NULL,'Free');
167
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACBaseURL',NULL,'Specify the Base URL of the OPAC, e.g., opac.mylibrary.com, the http:// will be added automatically by Koha.',NULL,'Free');
168
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');
168
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');
169
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');
169
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');
170
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');
170
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');
171
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');
171
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH','0','Si activé, le service OAI-PMH est disponible',NULL,'YesNo');
172
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH','0','Si activé, le service OAI-PMH est disponible',NULL,'YesNo');
172
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:archiveID','KOHA-OAI-TEST','Identification de l''archive OAI-PMH',NULL,'Free');
173
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/updatedatabase30.pl (-1 / +8 lines)
Lines 672-677 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
672
    SetVersion ($DBversion);
672
    SetVersion ($DBversion);
673
}
673
}
674
674
675
$DBversion = "3.00.05.002";
676
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
677
    my $value = $dbh->selectrow_array("SELECT value FROM systempreferences WHERE variable = 'HomeOrHoldingBranch'");
678
    $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');");
679
    print "Upgrade to $DBversion done (Add HomeOrHoldingBranchReturn system preference)\n";
680
    SetVersion ($DBversion);
681
}
682
675
=item DropAllForeignKeys($table)
683
=item DropAllForeignKeys($table)
676
684
677
  Drop all foreign keys of the table $table
685
  Drop all foreign keys of the table $table
678
- 

Return to bug 3536