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

(-)a/C4/Circulation.pm (-1 / +2 lines)
Lines 1440-1446 sub AddReturn { Link Here
1440
    my $item = GetItem($itemnumber) or die "GetItem($itemnumber) failed";
1440
    my $item = GetItem($itemnumber) or die "GetItem($itemnumber) failed";
1441
        # full item data, but no borrowernumber or checkout info (no issue)
1441
        # full item data, but no borrowernumber or checkout info (no issue)
1442
        # we know GetItem should work because GetItemnumberFromBarcode worked
1442
        # we know GetItem should work because GetItemnumberFromBarcode worked
1443
    my $hbr = $item->{C4::Context->preference("HomeOrHoldingBranch")} || '';
1443
    my $hbr      = C4::Context->preference("HomeOrHoldingBranchReturn") || "homebranch";
1444
    $hbr = $item->{$hbr} || '';
1444
        # item must be from items table -- issues table has branchcode and issuingbranch, not homebranch nor holdingbranch
1445
        # item must be from items table -- issues table has branchcode and issuingbranch, not homebranch nor holdingbranch
1445
1446
1446
    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
(-)a/admin/systempreferences.pl (+1 lines)
Lines 193-198 $tabsysprefs{finesCalendar} = "Circulation"; Link Here
193
$tabsysprefs{previousIssuesDefaultSortOrder} = "Circulation";
193
$tabsysprefs{previousIssuesDefaultSortOrder} = "Circulation";
194
$tabsysprefs{todaysIssuesDefaultSortOrder}   = "Circulation";
194
$tabsysprefs{todaysIssuesDefaultSortOrder}   = "Circulation";
195
$tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
195
$tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
196
$tabsysprefs{HomeOrHoldingBranchReturn}      = "Circulation";
196
$tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
197
$tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
197
$tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
198
$tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
198
$tabsysprefs{AllowOnShelfHolds}              = "Circulation";
199
$tabsysprefs{AllowOnShelfHolds}              = "Circulation";
(-)a/circ/returns.pl (-1 / +2 lines)
Lines 208-213 if ($barcode) { Link Here
208
#
208
#
209
    ( $returned, $messages, $issueinformation, $borrower ) =
209
    ( $returned, $messages, $issueinformation, $borrower ) =
210
      AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode);     # do the return
210
      AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode);     # do the return
211
    my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn') or 'homebranch';
211
212
212
    # get biblio description
213
    # get biblio description
213
    my $biblio = GetBiblioFromItemNumber($itemnumber);
214
    my $biblio = GetBiblioFromItemNumber($itemnumber);
Lines 217-223 if ($barcode) { Link Here
217
    $template->param(
218
    $template->param(
218
        title            => $biblio->{'title'},
219
        title            => $biblio->{'title'},
219
        homebranch       => $biblio->{'homebranch'},
220
        homebranch       => $biblio->{'homebranch'},
220
        homebranchname   => GetBranchName( $biblio->{'homebranch'} ),
221
        homebranchname   => GetBranchName( $biblio->{$homeorholdingbranchreturn} ),
221
        author           => $biblio->{'author'},
222
        author           => $biblio->{'author'},
222
        itembarcode      => $biblio->{'barcode'},
223
        itembarcode      => $biblio->{'barcode'},
223
        itemtype         => $biblio->{'itemtype'},
224
        itemtype         => $biblio->{'itemtype'},
(-)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 174-179 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
174
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');
174
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('OpacRenewalAllowed',0,'Si activé, les utilisateurs peuvent renouveller leurs prêts directement depuis leur compte à l''OPAC',NULL,'YesNo');
175
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('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');
176
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('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');
177
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');
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');
178
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH','0','Si activé, le service OAI-PMH est disponible',NULL,'YesNo');
179
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH','0','Si activé, le service OAI-PMH est disponible',NULL,'YesNo');
179
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:archiveID','KOHA-OAI-TEST','Identification de l''archive OAI-PMH',NULL,'Free');
180
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 3701-3706 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
3701
    SetVersion ($DBversion);
3701
    SetVersion ($DBversion);
3702
}
3702
}
3703
3703
3704
$DBversion = "3.01.00.XXX";
3705
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3706
    my $value = $dbh->selectrow_array("SELECT value FROM systempreferences WHERE variable = 'HomeOrHoldingBranch'");
3707
    $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');");
3708
    print "Upgrade to $DBversion done (Add HomeOrHoldingBranchReturn system preference)\n";
3709
    SetVersion ($DBversion);
3710
}
3711
3712
3704
=item DropAllForeignKeys($table)
3713
=item DropAllForeignKeys($table)
3705
3714
3706
  Drop all foreign keys of the table $table
3715
  Drop all foreign keys of the table $table
(-)a/kohaversion.pl (-3 lines)
Lines 10-18 Link Here
10
use strict;
10
use strict;
11
11
12
sub kohaversion {
12
sub kohaversion {
13
14
    our $VERSION = '3.01.00.145';
13
    our $VERSION = '3.01.00.145';
15
16
    # version needs to be set this way
14
    # version needs to be set this way
17
    # so that it can be picked up by Makefile.PL
15
    # so that it can be picked up by Makefile.PL
18
    # during install
16
    # during install
19
- 

Return to bug 3536