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

(-)a/C4/Auth.pm (-4 / +9 lines)
Lines 1118-1127 sub checkauth { Link Here
1118
                        my $desk = Koha::Desks->find($desk_id);
1118
                        my $desk = Koha::Desks->find($desk_id);
1119
                        $desk_name = $desk ? $desk->desk_name : '';
1119
                        $desk_name = $desk ? $desk->desk_name : '';
1120
                    }
1120
                    }
1121
                    if ( $query->param('register_id') ) {
1121
                    if ( C4::Context->preference('UseCashRegisters') ) {
1122
                        $register_id = $query->param('register_id');
1122
                        my $register =
1123
                        my $register = Koha::Cash::Registers->find($register_id);
1123
                          $query->param('register_id')
1124
                        $register_name = $register ? $register->name : '';
1124
                          ? Koha::Cash::Registers->find($query->param('register_id'))
1125
                          : Koha::Cash::Registers->search(
1126
                            { branch => $branchcode, branch_default => 1 },
1127
                            { rows   => 1 } )->single;
1128
                        $register_id   = $register->id   if ($register);
1129
                        $register_name = $register->name if ($register);
1125
                    }
1130
                    }
1126
                    my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search };
1131
                    my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search };
1127
                    if ( $type ne 'opac' and C4::Context->boolean_preference('AutoLocation') ) {
1132
                    if ( $type ne 'opac' and C4::Context->boolean_preference('AutoLocation') ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (-2 / +4 lines)
Lines 101-107 Link Here
101
    <p>
101
    <p>
102
        <label for="register_id">Cash register:</label>
102
        <label for="register_id">Cash register:</label>
103
        <select name="register_id" id="register_id" class="input" tabindex="4">
103
        <select name="register_id" id="register_id" class="input" tabindex="4">
104
            [% PROCESS options_for_registers registers => Registers.all() %]
104
            <option id="noregister" value="" selected="selected">Branch default</option>
105
            [% FOREACH r IN Registers.all() %]
106
            <option class="[% r.branch | html %] [% IF r.branch_default %]default[% END %]" value="[% r.id | html %]" disabled hidden>[% r.name | html %]</option>
107
            [% END %]
105
        </select>
108
        </select>
106
    </p>
109
    </p>
107
    [% END %]
110
    [% END %]
108
- 

Return to bug 24786