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

(-)a/C4/Members.pm (-4 / +1 lines)
Lines 250-259 sub Search { Link Here
250
		}
250
		}
251
    }
251
    }
252
252
253
    # $showallbranches was not used at the time SearchMember() was mainstreamed into Search().
253
    if ( C4::Context->preference("IndependantBranches") && C4::Context->preference("IndependantBranchesCirculation") ) {
254
    # Mentioning for the reference
255
256
    if ( C4::Context->preference("IndependantBranches") ) { # && !$showallbranches){
257
        if ( my $userenv = C4::Context->userenv ) {
254
        if ( my $userenv = C4::Context->userenv ) {
258
            my $branch =  $userenv->{'branch'};
255
            my $branch =  $userenv->{'branch'};
259
            if ( ($userenv->{flags} % 2 !=1) &&
256
            if ( ($userenv->{flags} % 2 !=1) &&
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 386-388 INSERT INTO systempreferences (variable,value,explanation,type) VALUES('OPACdidy Link Here
386
INSERT INTO systempreferences (variable,value,explanation,type) VALUES('INTRAdidyoumean',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free');
386
INSERT INTO systempreferences (variable,value,explanation,type) VALUES('INTRAdidyoumean',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free');
387
INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('BlockReturnOfWithdrawnItems', '1', '0', 'If enabled, items that are marked as withdrawn cannot be returned.', 'YesNo');
387
INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('BlockReturnOfWithdrawnItems', '1', '0', 'If enabled, items that are marked as withdrawn cannot be returned.', 'YesNo');
388
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer');
388
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer');
389
INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('IndependantBranchesCirculation', '1', NULL, 'If enabled, and IndependantBranches is also enabled, this preference will prevent a librarian from issuing items to another libraries patrons.', 'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (-1 / +7 lines)
Lines 5971-5977 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5971
    SetVersion($DBversion);
5971
    SetVersion($DBversion);
5972
}
5972
}
5973
5973
5974
5975
$DBversion = "3.09.00.057";
5974
$DBversion = "3.09.00.057";
5976
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5975
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5977
    $dbh->do("ALTER TABLE aqbasket ADD deliveryplace VARCHAR(10) default NULL AFTER basketgroupid;");
5976
    $dbh->do("ALTER TABLE aqbasket ADD deliveryplace VARCHAR(10) default NULL AFTER basketgroupid;");
Lines 6011-6016 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
6011
    SetVersion ($DBversion);
6010
    SetVersion ($DBversion);
6012
}
6011
}
6013
6012
6013
$DBversion ="3.09.00.XXX";
6014
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6015
    $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('IndependantBranchesCirculation', '1', NULL, 'If enabled, and IndependantBranches is also enabled, this preference will prevent a librarian from issuing items to another libraries patrons.', 'YesNo')");
6016
    print "Upgrade to $DBversion done (Add system preference IndependantBranchesCirculation)\n";
6017
    SetVersion($DBversion);
6018
}
6019
6014
=head1 FUNCTIONS
6020
=head1 FUNCTIONS
6015
6021
6016
=head2 TableExists($table)
6022
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (-1 / +7 lines)
Lines 77-82 Administration: Link Here
77
                  yes: Prevent
77
                  yes: Prevent
78
                  no: "Don't prevent"
78
                  no: "Don't prevent"
79
            - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries.
79
            - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries.
80
        -
81
            - pref: IndependantBranchesCirculation
82
              default: 0
83
              choices:
84
                  yes: Prevent
85
                  no: "Don't prevent"
86
            - staff (but not superlibrarians) from viewing and issuing items to patrons belonging to other libraries. This setting is ignored unless IndependantBranches is set to "Prevent".
80
    CAS Authentication:
87
    CAS Authentication:
81
        -
88
        -
82
            - pref: casAuthentication
89
            - pref: casAuthentication
83
- 

Return to bug 8839