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

(-)a/installer/data/mysql/de-DE/mandatory/sysprefs.sql (+1 lines)
Lines 283-285 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
283
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
283
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
284
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
284
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
285
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
285
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
286
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
Lines 283-285 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
283
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
283
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
284
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
284
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
285
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
285
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
286
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql (-1 / +2 lines)
Lines 284-287 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
284
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
284
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
285
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
285
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
286
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
286
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
287
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
287
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
288
INSERT INTO systempreferences (variable,value,explanation,options,type)   VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
(-)a/installer/data/mysql/it-IT/necessari/sysprefs.sql (-1 / +2 lines)
Lines 268-271 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
268
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
268
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
269
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
269
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
270
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
270
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
271
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
271
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
272
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
(-)a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql (-1 / +2 lines)
Lines 281-284 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
281
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
281
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
282
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
282
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
283
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
283
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
284
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
284
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
285
INSERT INTO systempreferences (variable,value,explanation,options,type)   VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
(-)a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql (-1 / +2 lines)
Lines 336-339 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
336
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
336
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
337
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
337
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
338
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
338
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
339
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
339
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
340
INSERT INTO systempreferences (variable,value,explanation,options,type)   VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
(-)a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql (-1 / +2 lines)
Lines 362-365 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
362
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
362
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
363
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
363
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
364
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
364
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
365
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
365
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
366
INSERT INTO systempreferences (variable,value,explanation,options,type)   VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+9 lines)
Lines 3970-3975 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
3970
    SetVersion ($DBversion);
3970
    SetVersion ($DBversion);
3971
}
3971
}
3972
3972
3973
$DBversion = "3.03.00.XXX";
3974
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3975
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo')");
3976
    print "Upgrade to $DBversion done (Add syspref to control if user can choose pickup branch for holds)\n";
3977
    SetVersion ($DBversion);
3978
}
3979
3980
3981
3973
=head1 FUNCTIONS
3982
=head1 FUNCTIONS
3974
3983
3975
=head2 DropAllForeignKeys($table)
3984
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+6 lines)
Lines 254-259 Circulation: Link Here
254
                  no: "Don't allow (with independent branches)"
254
                  no: "Don't allow (with independent branches)"
255
            - a user from one library to place a hold on an item from another library
255
            - a user from one library to place a hold on an item from another library
256
        -
256
        -
257
            - pref: OPACAllowUserToChooseBranch
258
              choices:
259
                  yes: Allow
260
                  no: "Don't allow"
261
            - a user to choose the branch to pick up a hold from.
262
        -
257
            - pref: ReservesNeedReturns
263
            - pref: ReservesNeedReturns
258
              choices:
264
              choices:
259
                  yes: "Don't automatically"
265
                  yes: "Don't automatically"
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl (-3 / +9 lines)
Lines 245-251 Link Here
245
                    <th id="place_on_hdr" style="display:none">Place On</th>
245
                    <th id="place_on_hdr" style="display:none">Place On</th>
246
                  <!-- /TMPL_IF -->
246
                  <!-- /TMPL_IF -->
247
                  <!-- TMPL_UNLESS NAME="singleBranchMode" -->
247
                  <!-- TMPL_UNLESS NAME="singleBranchMode" -->
248
                    <th>Pickup Location</th>
248
		    <!-- TMPL_IF NAME="choose_branch"-->
249
                        <th>Pickup Location</th>
250
		    <!-- /TMPL_IF -->
249
                  <!-- /TMPL_UNLESS -->
251
                  <!-- /TMPL_UNLESS -->
250
                </tr><!-- TMPL_ELSE --><tr><th colspan="5">Title</th></tr><!-- /TMPL_UNLESS -->
252
                </tr><!-- TMPL_ELSE --><tr><th colspan="5">Title</th></tr><!-- /TMPL_UNLESS -->
251
253
Lines 412-418 Link Here
412
                                        <!-- /TMPL_IF --><!-- /TMPL_IF -->
414
                                        <!-- /TMPL_IF --><!-- /TMPL_IF -->
413
415
414
                    <!-- TMPL_UNLESS NAME="singleBranchMode" -->
416
                    <!-- TMPL_UNLESS NAME="singleBranchMode" -->
415
                      <!-- TMPL_IF NAME="holdable" --><td>
417
                        <!-- TMPL_IF NAME="holdable" -->
418
			    <!-- TMPL_IF NAME="choose_branch" -->
419
			                   <td>
416
                                              <select name="branch" id="branch_<!-- TMPL_VAR NAME="biblionumber" -->"
420
                                              <select name="branch" id="branch_<!-- TMPL_VAR NAME="biblionumber" -->"
417
                                                <!-- TMPL_UNLESS NAME="holdable" -->disabled="disabled"<!-- /TMPL_UNLESS --> >
421
                                                <!-- TMPL_UNLESS NAME="holdable" -->disabled="disabled"<!-- /TMPL_UNLESS --> >
418
                                                <!-- TMPL_LOOP NAME="branchChoicesLoop" -->
422
                                                <!-- TMPL_LOOP NAME="branchChoicesLoop" -->
Lines 423-429 Link Here
423
                                                  <!-- /TMPL_IF -->
427
                                                  <!-- /TMPL_IF -->
424
                                                <!-- /TMPL_LOOP -->
428
                                                <!-- /TMPL_LOOP -->
425
                                              </select>
429
                                              </select>
426
                                            </td><!-- /TMPL_IF -->
430
                                           </td>
431
			    <!-- /TMPL_IF -->
432
		        <!-- /TMPL_IF -->
427
                    <!-- /TMPL_UNLESS -->
433
                    <!-- /TMPL_UNLESS -->
428
                  </tr>
434
                  </tr>
429
435
(-)a/kohaversion.pl (-1 / +1 lines)
Lines 16-22 the kohaversion is divided in 4 parts : Link Here
16
use strict;
16
use strict;
17
17
18
sub kohaversion {
18
sub kohaversion {
19
    our $VERSION = '3.03.00.015';
19
    our $VERSION = '3.03.00.XXX';
20
    # version needs to be set this way
20
    # version needs to be set this way
21
    # so that it can be picked up by Makefile.PL
21
    # so that it can be picked up by Makefile.PL
22
    # during install
22
    # during install
(-)a/opac/opac-reserve.pl (-3 / +7 lines)
Lines 88-94 if (($#biblionumbers < 0) && (! $query->param('place_reserve'))) { Link Here
88
}
88
}
89
89
90
# pass the pickup branch along....
90
# pass the pickup branch along....
91
my $branch = $query->param('branch') || C4::Context->userenv->{branch} || '' ;
91
my $branch = $query->param('branch') || $borr->{'branchcode'} || C4::Context->userenv->{branch} || '' ;
92
($branches->{$branch}) or $branch = "";     # Confirm branch is real
92
($branches->{$branch}) or $branch = "";     # Confirm branch is real
93
$template->param( branch => $branch );
93
$template->param( branch => $branch );
94
94
Lines 96-101 $template->param( branch => $branch ); Link Here
96
my $CGIbranchloop = GetBranchesLoop($branch);
96
my $CGIbranchloop = GetBranchesLoop($branch);
97
$template->param( CGIbranch => $CGIbranchloop );
97
$template->param( CGIbranch => $CGIbranchloop );
98
98
99
# Is the person allowed to choose their branch
100
my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0;
101
102
$template->param( choose_branch => $OPACChooseBranch);
103
99
#
104
#
100
#
105
#
101
# Build hashes of the requested biblio(item)s and items.
106
# Build hashes of the requested biblio(item)s and items.
Lines 175-181 if ( $query->param('place_reserve') ) { Link Here
175
        my $branch    = shift(@selectedItems); # i.e., branch code, not name
180
        my $branch    = shift(@selectedItems); # i.e., branch code, not name
176
181
177
        my $singleBranchMode = $template->param('singleBranchMode');
182
        my $singleBranchMode = $template->param('singleBranchMode');
178
        if ($singleBranchMode) {
183
        if ($singleBranchMode || ! $OPACChooseBranch) { # single branch mode or disabled user choosing
179
            $branch = $borr->{'branchcode'};
184
            $branch = $borr->{'branchcode'};
180
        }
185
        }
181
186
182
- 

Return to bug 5669