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

(-)a/C4/Circulation.pm (-2 / +4 lines)
Lines 896-903 sub CanBookBeIssued { Link Here
896
    if ( C4::Context->preference("IndependentBranches") ) {
896
    if ( C4::Context->preference("IndependentBranches") ) {
897
        my $userenv = C4::Context->userenv;
897
        my $userenv = C4::Context->userenv;
898
        if ( ($userenv) && ( $userenv->{flags} % 2 != 1 ) ) {
898
        if ( ($userenv) && ( $userenv->{flags} % 2 != 1 ) ) {
899
            $issuingimpossible{ITEMNOTSAMEBRANCH} = 1
899
            if ( $item->{C4::Context->preference("HomeOrHoldingBranch")} ne $userenv->{branch} ){
900
              if ( $item->{C4::Context->preference("HomeOrHoldingBranch")} ne $userenv->{branch} );
900
                $issuingimpossible{ITEMNOTSAMEBRANCH} = 1;
901
                $issuingimpossible{'itemhomebranch'} = $item->{C4::Context->preference("HomeOrHoldingBranch")};
902
            }
901
            $needsconfirmation{BORRNOTSAMEBRANCH} = GetBranchName( $borrower->{'branchcode'} )
903
            $needsconfirmation{BORRNOTSAMEBRANCH} = GetBranchName( $borrower->{'branchcode'} )
902
              if ( $borrower->{'branchcode'} ne $userenv->{branch} );
904
              if ( $borrower->{'branchcode'} ne $userenv->{branch} );
903
        }
905
        }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 1-3 Link Here
1
[% USE KohaBranchName %]
1
[% USE KohaDates %]
2
[% USE KohaDates %]
2
[% IF ( export_remove_fields OR export_with_csv_profile ) %]
3
[% IF ( export_remove_fields OR export_with_csv_profile ) %]
3
   [% SET exports_enabled = 1 %]
4
   [% SET exports_enabled = 1 %]
Lines 546-552 function validate1(date) { Link Here
546
        [% END %]
547
        [% END %]
547
548
548
        [% IF ( ITEMNOTSAMEBRANCH ) %]
549
        [% IF ( ITEMNOTSAMEBRANCH ) %]
549
            <li>This item belongs to [% itemhomebranch %] and cannot be issued from this location.</li>
550
            <li>This item belongs to [% itemhomebranch | $KohaBranchName %] and cannot be checked out from this location.</li>
550
        [% END %]
551
        [% END %]
551
552
552
        [% IF ( USERBLOCKEDREMAINING ) %]
553
        [% IF ( USERBLOCKEDREMAINING ) %]
553
- 

Return to bug 10081