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

(-)a/C4/Circulation.pm (-5 / +11 lines)
Lines 1188-1196 AddIssue does the following things : Link Here
1188
=cut
1188
=cut
1189
1189
1190
sub AddIssue {
1190
sub AddIssue {
1191
    my ( $borrower, $barcode, $datedue, $cancelreserve, $issuedate, $sipmode, $auto_renew ) = @_;
1191
    my ( $borrower, $barcode, $datedue, $cancelreserve, $issuedate, $sipmode, $params ) = @_;
1192
    my $inhouse_use = $params->{inhouse_use};
1193
    my $auto_renew = $params->{auto_renew};
1192
    my $dbh = C4::Context->dbh;
1194
    my $dbh = C4::Context->dbh;
1193
	my $barcodecheck=CheckValidBarcode($barcode);
1195
    my $barcodecheck=CheckValidBarcode($barcode);
1196
    $inhouse_use = ( $inhouse_use ? 1 : 0 );
1197
1194
    if ($datedue && ref $datedue ne 'DateTime') {
1198
    if ($datedue && ref $datedue ne 'DateTime') {
1195
        $datedue = dt_from_string($datedue);
1199
        $datedue = dt_from_string($datedue);
1196
    }
1200
    }
Lines 1264-1271 sub AddIssue { Link Here
1264
        my $sth =
1268
        my $sth =
1265
          $dbh->prepare(
1269
          $dbh->prepare(
1266
                "INSERT INTO issues
1270
                "INSERT INTO issues
1267
                    (borrowernumber, itemnumber,issuedate, date_due, branchcode, auto_renew)
1271
                    (borrowernumber, itemnumber,issuedate, date_due, branchcode, inhouse_use, auto_renew)
1268
                VALUES (?,?,?,?,?,?)"
1272
                VALUES (?,?,?,?,?,?,?)"
1269
          );
1273
          );
1270
        unless ($datedue) {
1274
        unless ($datedue) {
1271
            my $itype = ( C4::Context->preference('item-level_itypes') ) ? $biblio->{'itype'} : $biblio->{'itemtype'};
1275
            my $itype = ( C4::Context->preference('item-level_itypes') ) ? $biblio->{'itype'} : $biblio->{'itemtype'};
Lines 1273-1284 sub AddIssue { Link Here
1273
1277
1274
        }
1278
        }
1275
        $datedue->truncate( to => 'minute');
1279
        $datedue->truncate( to => 'minute');
1280
1276
        $sth->execute(
1281
        $sth->execute(
1277
            $borrower->{'borrowernumber'},      # borrowernumber
1282
            $borrower->{'borrowernumber'},      # borrowernumber
1278
            $item->{'itemnumber'},              # itemnumber
1283
            $item->{'itemnumber'},              # itemnumber
1279
            $issuedate->strftime('%Y-%m-%d %H:%M:00'), # issuedate
1284
            $issuedate->strftime('%Y-%m-%d %H:%M:00'), # issuedate
1280
            $datedue->strftime('%Y-%m-%d %H:%M:00'),   # date_due
1285
            $datedue->strftime('%Y-%m-%d %H:%M:00'),   # date_due
1281
            C4::Context->userenv->{'branch'},   # branchcode
1286
            C4::Context->userenv->{'branch'},   # branchcode
1287
            $inhouse_use,
1282
            $auto_renew ? 1 : 0                 # automatic renewal
1288
            $auto_renew ? 1 : 0                 # automatic renewal
1283
        );
1289
        );
1284
        if ( C4::Context->preference('ReturnToShelvingCart') ) { ## ReturnToShelvingCart is on, anything issued should be taken off the cart.
1290
        if ( C4::Context->preference('ReturnToShelvingCart') ) { ## ReturnToShelvingCart is on, anything issued should be taken off the cart.
Lines 1320-1326 sub AddIssue { Link Here
1320
        # Record the fact that this book was issued.
1326
        # Record the fact that this book was issued.
1321
        &UpdateStats({
1327
        &UpdateStats({
1322
                      branch => C4::Context->userenv->{'branch'},
1328
                      branch => C4::Context->userenv->{'branch'},
1323
                      type => 'issue',
1329
                      type => ( $inhouse_use ? 'inhouse_use' : 'issue' ),
1324
                      amount => $charge,
1330
                      amount => $charge,
1325
                      other => ($sipmode ? "SIP-$sipmode" : ''),
1331
                      other => ($sipmode ? "SIP-$sipmode" : ''),
1326
                      itemnumber => $item->{'itemnumber'},
1332
                      itemnumber => $item->{'itemnumber'},
(-)a/C4/Items.pm (+6 lines)
Lines 1299-1304 sub GetItemsInfo { Link Here
1299
           holding.branchname,
1299
           holding.branchname,
1300
           holding.opac_info as holding_branch_opac_info,
1300
           holding.opac_info as holding_branch_opac_info,
1301
           home.opac_info as home_branch_opac_info
1301
           home.opac_info as home_branch_opac_info
1302
    ";
1303
    $query .= ", issues.inhouse_use"
1304
        if C4::Context->preference("In-House Use");
1305
    $query .= "
1302
     FROM items
1306
     FROM items
1303
     LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode
1307
     LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode
1304
     LEFT JOIN branches AS home ON items.homebranch=home.branchcode
1308
     LEFT JOIN branches AS home ON items.homebranch=home.branchcode
Lines 1306-1311 sub GetItemsInfo { Link Here
1306
     LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber
1310
     LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber
1307
     LEFT JOIN itemtypes   ON   itemtypes.itemtype         = "
1311
     LEFT JOIN itemtypes   ON   itemtypes.itemtype         = "
1308
     . (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype');
1312
     . (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype');
1313
    $query .= " LEFT JOIN issues ON issues.itemnumber = items.itemnumber"
1314
        if C4::Context->preference("In-House Use");
1309
    $query .= " WHERE items.biblionumber = ? ORDER BY home.branchname, items.enumchron, LPAD( items.copynumber, 8, '0' ), items.dateaccessioned DESC" ;
1315
    $query .= " WHERE items.biblionumber = ? ORDER BY home.branchname, items.enumchron, LPAD( items.copynumber, 8, '0' ), items.dateaccessioned DESC" ;
1310
    my $sth = $dbh->prepare($query);
1316
    my $sth = $dbh->prepare($query);
1311
    $sth->execute($biblionumber);
1317
    $sth->execute($biblionumber);
(-)a/C4/Stats.pm (-1 / +1 lines)
Lines 87-93 sub UpdateStats { Link Here
87
    return () if ! defined $params;
87
    return () if ! defined $params;
88
# change these arrays if new types of transaction or new parameters are allowed
88
# change these arrays if new types of transaction or new parameters are allowed
89
    my @allowed_keys = qw (type branch amount other itemnumber itemtype borrowernumber accountno ccode);
89
    my @allowed_keys = qw (type branch amount other itemnumber itemtype borrowernumber accountno ccode);
90
    my @allowed_circulation_types = qw (renew issue localuse return);
90
    my @allowed_circulation_types = qw (renew issue localuse return inhouse_use);
91
    my @allowed_accounts_types = qw (writeoff payment);
91
    my @allowed_accounts_types = qw (writeoff payment);
92
    my @circulation_mandatory_keys = qw (type branch borrowernumber itemnumber ccode itemtype);
92
    my @circulation_mandatory_keys = qw (type branch borrowernumber itemnumber ccode itemtype);
93
    my @accounts_mandatory_keys = qw (type branch borrowernumber amount);
93
    my @accounts_mandatory_keys = qw (type branch borrowernumber amount);
(-)a/circ/circulation.pl (-9 / +18 lines)
Lines 25-30 Link Here
25
use strict;
25
use strict;
26
use warnings;
26
use warnings;
27
use CGI;
27
use CGI;
28
use DateTime;
29
use DateTime::Duration;
28
use C4::Output;
30
use C4::Output;
29
use C4::Print;
31
use C4::Print;
30
use C4::Auth qw/:DEFAULT get_session/;
32
use C4::Auth qw/:DEFAULT get_session/;
Lines 320-332 if ($barcode) { Link Here
320
        }
322
        }
321
    }
323
    }
322
324
323
    delete $question->{'DEBT'} if ($debt_confirmed);
325
    unless( $query->param('inhouse_use') and C4::Context->preference("In-House Use Force") ) {
324
    foreach my $impossible ( keys %$error ) {
326
        delete $question->{'DEBT'} if ($debt_confirmed);
325
        $template->param(
327
        foreach my $impossible ( keys %$error ) {
326
            $impossible => $$error{$impossible},
328
            $template->param(
327
            IMPOSSIBLE  => 1
329
                $impossible => $$error{$impossible},
328
        );
330
                IMPOSSIBLE  => 1
329
        $blocker = 1;
331
            );
332
            $blocker = 1;
333
        }
330
    }
334
    }
331
    if( !$blocker ){
335
    if( !$blocker ){
332
        my $confirm_required = 0;
336
        my $confirm_required = 0;
Lines 342-354 if ($barcode) { Link Here
342
                    $needsconfirmation => $$question{$needsconfirmation},
346
                    $needsconfirmation => $$question{$needsconfirmation},
343
                    getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
347
                    getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
344
                    getBarcodeMessageIteminfo => $getmessageiteminfo->{'barcode'},
348
                    getBarcodeMessageIteminfo => $getmessageiteminfo->{'barcode'},
345
                    NEEDSCONFIRMATION  => 1
349
                    NEEDSCONFIRMATION  => 1,
350
                    inhouse_use => $query->param('inhouse_use'),
346
                );
351
                );
347
                $confirm_required = 1;
352
                $confirm_required = 1;
348
            }
353
            }
349
        }
354
        }
350
        unless($confirm_required) {
355
        unless($confirm_required) {
351
            AddIssue( $borrower, $barcode, $datedue, $cancelreserve, undef, undef, $session->param('auto_renew') );
356
            my $inhouse_use = $query->param('inhouse_use');
357
            AddIssue( $borrower, $barcode, $datedue, $cancelreserve, undef, undef, { inhouse_use => $inhouse_use, auto_renew => $session->param('auto_renew') } );
352
            $session->clear('auto_renew');
358
            $session->clear('auto_renew');
353
            $inprocess = 1;
359
            $inprocess = 1;
354
        }
360
        }
Lines 579-584 $template->param( Link Here
579
    export_with_csv_profile   => C4::Context->preference("ExportWithCsvProfile"),
585
    export_with_csv_profile   => C4::Context->preference("ExportWithCsvProfile"),
580
    canned_bor_notes_loop     => $canned_notes,
586
    canned_bor_notes_loop     => $canned_notes,
581
    debarments                => GetDebarments({ borrowernumber => $borrowernumber }),
587
    debarments                => GetDebarments({ borrowernumber => $borrowernumber }),
588
    todaysdate                => dt_from_string()->set(hour => 23)->set(minute => 59),
589
    inhouse_use_feature       => C4::Context->preference("In-House Use"),
590
    inhouse_use_forced        => C4::Context->preference("In-House Use Force"),
582
);
591
);
583
592
584
output_html_with_http_headers $query, $cookie, $template->output;
593
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/installer/data/mysql/kohastructure.sql (+2 lines)
Lines 1128-1133 CREATE TABLE `issues` ( -- information related to check outs or issues Link Here
1128
  `auto_renew` BOOLEAN default FALSE, -- automatic renewal
1128
  `auto_renew` BOOLEAN default FALSE, -- automatic renewal
1129
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
1129
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
1130
  `issuedate` datetime default NULL, -- date the item was checked out or issued
1130
  `issuedate` datetime default NULL, -- date the item was checked out or issued
1131
  `inhouse_use` int(1) NOT NULL default 0, -- in house use flag
1131
  KEY `issuesborridx` (`borrowernumber`),
1132
  KEY `issuesborridx` (`borrowernumber`),
1132
  KEY `itemnumber_idx` (`itemnumber`),
1133
  KEY `itemnumber_idx` (`itemnumber`),
1133
  KEY `branchcode_idx` (`branchcode`),
1134
  KEY `branchcode_idx` (`branchcode`),
Lines 1601-1606 CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r Link Here
1601
  `auto_renew` BOOLEAN default FALSE, -- automatic renewal
1602
  `auto_renew` BOOLEAN default FALSE, -- automatic renewal
1602
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
1603
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
1603
  `issuedate` datetime default NULL, -- date the item was checked out or issued
1604
  `issuedate` datetime default NULL, -- date the item was checked out or issued
1605
  `inhouse_use` int(1) NOT NULL default 0, -- in house use flag
1604
  KEY `old_issuesborridx` (`borrowernumber`),
1606
  KEY `old_issuesborridx` (`borrowernumber`),
1605
  KEY `old_issuesitemidx` (`itemnumber`),
1607
  KEY `old_issuesitemidx` (`itemnumber`),
1606
  KEY `branchcode_idx` (`branchcode`),
1608
  KEY `branchcode_idx` (`branchcode`),
(-)a/installer/data/mysql/sysprefs.sql (+2 lines)
Lines 147-152 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
147
('ImageLimit','5','','Limit images stored in the database by the Patron Card image manager to this number.','Integer'),
147
('ImageLimit','5','','Limit images stored in the database by the Patron Card image manager to this number.','Integer'),
148
('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'),
148
('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'),
149
('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
149
('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
150
('In-House use','0','','Enable/Disable the in-house use feature','YesNo'),
151
('In-House use Force','0','','Enable/Disable the in-house for all cases (Even if a user is debarred, etc.)','YesNo'),
150
('InProcessingToShelvingCart','0','','If set, when any item with a location code of PROC is \'checked in\', it\'s location code will be changed to CART.','YesNo'),
152
('InProcessingToShelvingCart','0','','If set, when any item with a location code of PROC is \'checked in\', it\'s location code will be changed to CART.','YesNo'),
151
('INTRAdidyoumean',NULL,NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
153
('INTRAdidyoumean',NULL,NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
152
('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
154
('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
(-)a/installer/data/mysql/updatedatabase.pl (+22 lines)
Lines 8949-8954 if ( CheckVersion($DBversion) ) { Link Here
8949
        ADD COLUMN cancellationreason TEXT DEFAULT NULL AFTER datecancellationprinted
8949
        ADD COLUMN cancellationreason TEXT DEFAULT NULL AFTER datecancellationprinted
8950
    ");
8950
    ");
8951
    print "Upgrade to $DBversion done (Bug 7162: Add aqorders.cancellationreason)\n";
8951
    print "Upgrade to $DBversion done (Bug 7162: Add aqorders.cancellationreason)\n";
8952
    SetVersion ($DBversion);
8953
}
8954
8955
$DBversion = "3.17.00.XXX";
8956
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
8957
    $dbh->do(q{
8958
        INSERT IGNORE INTO systempreferences
8959
            (variable,value,explanation,options,type)
8960
            VALUES('In-House use','0','Enable/Disable the in-house use feature','','YesNo');
8961
    });
8962
    $dbh->do(q{
8963
        INSERT IGNORE INTO systempreferences
8964
            (variable,value,explanation,options,type)
8965
            VALUES('In-House use Force','0','Enable/Disable the in-house for all cases (Even if a user is debarred, etc.)','','YesNo');
8966
    });
8967
    $dbh->do(q{
8968
        ALTER TABLE issues ADD COLUMN inhouse_use INT(1) NOT NULL DEFAULT 0 AFTER issuedate;
8969
    });
8970
    $dbh->do(q{
8971
        ALTER TABLE old_issues ADD COLUMN inhouse_use INT(1) NOT NULL DEFAULT 0 AFTER issuedate;
8972
    });
8973
    print "Upgrade to $DBversion done (Bug 10860: Add new system preference In-House use + fields [old_]issues.inhouse_use)\n";
8952
    SetVersion($DBversion);
8974
    SetVersion($DBversion);
8953
}
8975
}
8954
8976
(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (+14 lines)
Lines 2714-2716 span.browse-button { Link Here
2714
#i18nMenu .dropdown-menu a:focus {
2714
#i18nMenu .dropdown-menu a:focus {
2715
    color : #FFF;
2715
    color : #FFF;
2716
}
2716
}
2717
2718
.inhouse_use-select {
2719
    font-size : 85%;
2720
    font-weight: normal;
2721
    padding-top : .3em;
2722
}
2723
#circ_circulation_issue .inhouse_use-select label,
2724
.inhouse_use-select label {
2725
    font-size : inherit;
2726
    font-weight: normal;
2727
}
2728
span.inhouse_use {
2729
    color: red;
2730
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (+1 lines)
Lines 26-30 Link Here
26
    var NOT_TRANSFERRED_YET = _("Item hasn't been transferred yet from %s");
26
    var NOT_TRANSFERRED_YET = _("Item hasn't been transferred yet from %s");
27
    var NO = _("No");
27
    var NO = _("No");
28
    var YES = _("Yes");
28
    var YES = _("Yes");
29
    var INHOUSE_USE = _("In-house use");
29
//]]>
30
//]]>
30
</script>
31
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (-4 / +15 lines)
Lines 215-220 $(document).ready(function() { Link Here
215
                            title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>"
215
                            title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>"
216
                        }
216
                        }
217
217
218
                        var inhouse_use = '';
219
                        if ( oObj.inhouse_use == 1 ) {
220
                            inhouse_use += " <span class='inhouse_use'>(" + INHOUSE_USE + ")</span>";
221
                        }
222
218
                        title += " "
223
                        title += " "
219
                              + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
224
                              + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
220
                              + oObj.biblionumber
225
                              + oObj.biblionumber
Lines 224-230 $(document).ready(function() { Link Here
224
                              + oObj.itemnumber
229
                              + oObj.itemnumber
225
                              + "'>"
230
                              + "'>"
226
                              + oObj.barcode
231
                              + oObj.barcode
227
                              + "</a>";
232
                              + "</a>"
233
                              + inhouse_use;
228
234
229
                        return title;
235
                        return title;
230
                    }
236
                    }
Lines 305-311 $(document).ready(function() { Link Here
305
                                +  "<input type='checkbox' class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
311
                                +  "<input type='checkbox' class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
306
                                +  "</span>";
312
                                +  "</span>";
307
313
308
                        if ( oObj.renewals_remaining ) {
314
                        if ( oObj.renewals_remaining && inhouse_use == 0 ) {
309
                            content += "<span class='renewals'>("
315
                            content += "<span class='renewals'>("
310
                                    + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
316
                                    + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
311
                                    + ")</span>";
317
                                    + ")</span>";
Lines 313-319 $(document).ready(function() { Link Here
313
319
314
                        content += "</span>";
320
                        content += "</span>";
315
321
316
317
                        return content;
322
                        return content;
318
                    }
323
                    }
319
                },
324
                },
Lines 437-442 $(document).ready(function() { Link Here
437
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>"
442
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>"
438
                            }
443
                            }
439
444
445
                            var inhouse_use = '';
446
                            if ( oObj.inhouse_use == 1 ) {
447
                                inhouse_use += " <span class='inhouse_use'>("+INHOUSE_USE+")</span>";
448
                            }
449
440
                            title += " "
450
                            title += " "
441
                                  + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
451
                                  + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
442
                                  + oObj.biblionumber
452
                                  + oObj.biblionumber
Lines 446-452 $(document).ready(function() { Link Here
446
                                  + oObj.itemnumber
456
                                  + oObj.itemnumber
447
                                  + "'>"
457
                                  + "'>"
448
                                  + oObj.barcode
458
                                  + oObj.barcode
449
                                  + "</a>";
459
                                  + "</a>"
460
                                  + inhouse_use;
450
461
451
                            return title;
462
                            return title;
452
                        }
463
                        }
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js (+4 lines)
Lines 46-51 $(document).ready(function() { Link Here
46
        return false;
46
        return false;
47
    });
47
    });
48
48
49
    toggle_inhouse_use();
50
    $("#inhouse_use").click(function(){
51
        toggle_inhouse_use();
52
    });
49
});
53
});
50
54
51
function export_checkouts(format) {
55
function export_checkouts(format) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+12 lines)
Lines 383-388 Circulation: Link Here
383
            - This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value
383
            - This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value
384
            - "it will be updated to the right-hand value. E.g. '-1: 0' will cause an item that was set to 'Ordered' to now be available for loan."
384
            - "it will be updated to the right-hand value. E.g. '-1: 0' will cause an item that was set to 'Ordered' to now be available for loan."
385
            - Each pair of values should be on a separate line.
385
            - Each pair of values should be on a separate line.
386
        -
387
            - pref: In-House use
388
              choices:
389
                  yes: Enable
390
                  no: Disable
391
            - the in-house use feature.
392
        -
393
            - pref: In-House use Force
394
              choices:
395
                  yes: Enable
396
                  no: Disable
397
            - the in-house for all cases (Even if a user is debarred, etc.).
386
    Holds Policy:
398
    Holds Policy:
387
        -
399
        -
388
            - pref: AllowHoldPolicyOverride
400
            - pref: AllowHoldPolicyOverride
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (+8 lines)
Lines 586-594 function verify_images() { Link Here
586
                    <td class="status">
586
                    <td class="status">
587
587
588
                        [% IF ( item.datedue ) %]
588
                        [% IF ( item.datedue ) %]
589
                          [% IF inhouse_use %]
590
                            <span>Currently in local use
591
                          [% ELSE %]
589
                            <span class="datedue">Checked out
592
                            <span class="datedue">Checked out
593
                          [% END %]
590
                                [% UNLESS ( item.NOTSAMEBRANCH ) %]
594
                                [% UNLESS ( item.NOTSAMEBRANCH ) %]
595
                                  [% IF inhouse_use %]
596
                                    by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber %]">
597
                                  [% ELSE %]
591
                                    to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber %]">
598
                                    to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber %]">
599
                                  [% END %]
592
                                        [% IF ( item.hidepatronname ) %]
600
                                        [% IF ( item.hidepatronname ) %]
593
                                            [% item.cardnumber %]
601
                                            [% item.cardnumber %]
594
                                        [% ELSE %]
602
                                        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-10 / +45 lines)
Lines 55-60 $(document).ready(function() { Link Here
55
        });
55
        });
56
    [% END %]
56
    [% END %]
57
});
57
});
58
59
// In-house use
60
function toggle_inhouse_use(){
61
    if ( $("#inhouse_use").attr('checked') ) {
62
        $("#duedatespec").val("[% todaysdate | $KohaDates with_hours => 1%]")
63
        $("#duedatespec").datetimepicker('destroy');
64
    } else {
65
        $("#duedatespec").datetimepicker({
66
            onClose: function(dateText, inst) { $("#barcode").focus(); },
67
            hour: 23,
68
            minute: 59
69
        });
70
    }
71
}
72
58
//]]>
73
//]]>
59
</script>
74
</script>
60
</head>
75
</head>
Lines 287-292 $(document).ready(function() { Link Here
287
    [% ELSE %]
302
    [% ELSE %]
288
    <input type="submit" class="approve" value="Yes, check out (Y)" accesskey="y" />
303
    <input type="submit" class="approve" value="Yes, check out (Y)" accesskey="y" />
289
    [% END %]
304
    [% END %]
305
    <input type="hidden" name="inhouse_use" value="[% inhouse_use %]" />
290
</form>
306
</form>
291
[% END %]
307
[% END %]
292
308
Lines 469-475 No patron matched <span class="ex">[% message %]</span> Link Here
469
485
470
[% IF ( borrowernumber ) %]
486
[% IF ( borrowernumber ) %]
471
<div class="yui-g">
487
<div class="yui-g">
472
[% UNLESS ( noissues ) %]
488
[% IF !noissues || inhouse_use_forced %]
473
[% IF ( flagged ) %]
489
[% IF ( flagged ) %]
474
<div class="yui-u first">
490
<div class="yui-u first">
475
[% ELSE %]
491
[% ELSE %]
Lines 516-521 No patron matched <span class="ex">[% message %]</span> Link Here
516
[% END %]
532
[% END %]
517
          <button class="btn btn-small action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button>
533
          <button class="btn btn-small action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button>
518
</div>[% END %]
534
</div>[% END %]
535
536
      [% IF inhouse_use_feature %]
537
        <div class="inhouse_use-select">
538
          [% IF noissues %]
539
            <input type="checkbox" id="inhouse_use" name="inhouse_use_forced" checked="checked" disabled="disabled" /> <label for="inhouse_use">In-house use</label>
540
            <input type="hidden" name="inhouse_use" checked="checked" value="1" />
541
          [% ELSE %]
542
            <input type="checkbox" id="inhouse_use" name="inhouse_use" /> <label for="inhouse_use">In-house use</label>
543
          [% END %]
544
        </div>
545
      [% END %]
546
519
          <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
547
          <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
520
          <input type="hidden" name="branch" value="[% branch %]" />
548
          <input type="hidden" name="branch" value="[% branch %]" />
521
          <input type="hidden" name="printer" value="[% printer %]" />
549
          <input type="hidden" name="printer" value="[% printer %]" />
Lines 530-546 No patron matched <span class="ex">[% message %]</span> Link Here
530
558
531
[% IF ( noissues ) %]<div>[% ELSE %]<div class="yui-u">[% END %]
559
[% IF ( noissues ) %]<div>[% ELSE %]<div class="yui-u">[% END %]
532
560
533
    [% IF ( flagged ) %]
561
    [% IF flagged %]
534
		[% IF ( noissues ) %]
562
      [% IF NOT noissues || ( noissues && inhouse_use_forced ) %]
535
		<h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
536
        <div id="circmessages" class="circmessage warning">
537
		[% ELSE %]
538
        <div id="circmessages" class="circmessage attention">
563
        <div id="circmessages" class="circmessage attention">
539
		[% END %]
564
      [% ELSE %]
565
        <h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
566
        <div id="circmessages" class="circmessage warning">
567
      [% END %]
568
      <h3>
569
        [% IF noissues %]
570
          Cannot check out!
571
          [% IF inhouse_use_forced %]
572
            <span style="color:red;">Only in-house use is allowed</span>
573
          [% END %]
574
        [% ELSE %]
575
          Attention:
576
        [% END %]
577
      </h3>
540
578
541
		<h3>[% IF ( noissues ) %]
542
		        Cannot check out!
543
		[% ELSE %]Attention:[% END %]</h3>
544
		<ul>
579
		<ul>
545
580
546
			[% IF ( warndeparture ) %]
581
			[% IF ( warndeparture ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-50 / +77 lines)
Lines 8-14 Link Here
8
//<![CDATA[
8
//<![CDATA[
9
9
10
 $(document).ready(function() {
10
 $(document).ready(function() {
11
    $("#table_readingrec").dataTable($.extend(true, {}, dataTablesDefaults, {
11
    var table = $("#table_readingrec").dataTable($.extend(true, {}, dataTablesDefaults, {
12
        "sPaginationType": "four_button",
12
        "sPaginationType": "four_button",
13
        "aaSorting": [],
13
        "aaSorting": [],
14
        "aoColumnDefs": [
14
        "aoColumnDefs": [
Lines 16-21 Link Here
16
            { "sType": "title-string", "aTargets" : [ "title-string" ] }
16
            { "sType": "title-string", "aTargets" : [ "title-string" ] }
17
        ]
17
        ]
18
    }));
18
    }));
19
    var tabs = $("#tabs").tabs({
20
        select: function(e, ui) {
21
            var id = $(ui.tab).attr("id");
22
            if ( id == "tab_checkout" ) {
23
                table.fnFilter("checkout", 0);
24
            } else if ( id == "tab_inhouse_use" ) {
25
                table.fnFilter("inhouse_use", 0);
26
            } else { // all
27
                table.fnFilter('', 0);
28
            }
29
        }
30
    });
19
 });
31
 });
20
//]]>
32
//]]>
21
</script>
33
</script>
Lines 42-105 Link Here
42
<form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
54
<form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
43
55
44
56
45
<table id="table_readingrec">
57
<div id="tabs" class="toptabs">
46
<thead>
58
  <ul>
47
    <tr>
59
    <li><a href="#readingrec" id="tab_all">All</a></li>
48
    <th class="title-string">Date</th>
60
    <li><a href="#readingrec" id="tab_checkout">Checkouts</a></li>
49
    <th class="anti-the">Title</th>
61
    <li><a href="#readingrec" id="tab_inhouse_use">In-house use</a></li>
50
	<th>Author</th>
62
  </ul>
51
    <th>Call no.</th>
63
  <div id="readingrec" style="overflow:hidden">
52
	<th>Barcode</th>
64
    <table id="table_readingrec">
53
    <th>Number of renewals</th>
65
      <thead>
54
    <th class="title-string">Checked out on</th>
66
        <th style="display:none;">Type</th>
55
	<th>Checked out from</th>
67
        <th class="title-string">Date</th>
56
    <th class="title-string">Date due</th>
68
        <th class="anti-the">Title</th>
57
    <th class="title-string">Return date</th>
69
        <th>Author</th>
58
    </tr>
70
        <th>Call no.</th>
59
</thead>
71
        <th>Barcode</th>
60
<tbody>
72
        <th>Number of renewals</th>
61
[% FOREACH issue IN loop_reading %]
73
        <th class="title-string">Checked out on</th>
62
    [% IF  issue.returndate  %]<tr>[% ELSE %]<tr class="onissue">[% END %]
74
        <th>Checked out from</th>
63
        <td>
75
        <th class="title-string">Date due</th>
76
        <th class="title-string">Return date</th>
77
      </thead>
78
      <tbody>
79
      [% FOREACH issue IN loop_reading %]
80
        [% IF  issue.returndate  %]<tr>[% ELSE %]<tr class="onissue">[% END %]
81
          <td style="display:none;">
82
            [% IF issue.inhouse_use %]
83
              inhouse_use
84
            [% ELSE %]
85
              checkout
86
            [% END %]
87
          </td>
88
          <td>
64
            <span title="[% issue.issuestimestamp %]">[% issue.issuestimestamp | $KohaDates %]</span>
89
            <span title="[% issue.issuestimestamp %]">[% issue.issuestimestamp | $KohaDates %]</span>
65
        </td>
90
          </td>
66
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber %]">[% issue.title |html %]</a></td>
91
          <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber %]">[% issue.title |html %]</a></td>
67
92
68
        <td>[% issue.author %]</td>
93
          <td>[% issue.author %]</td>
69
94
70
        <td>
95
          <td>
71
            [% IF issue.classification %]
96
            [% IF issue.classification %]
72
                [% issue.classification %]
97
                [% issue.classification %]
73
            [% ELSE %]
98
            [% ELSE %]
74
                [% issue.itemcallnumber %]
99
                [% issue.itemcallnumber %]
75
            [% END %]
100
            [% END %]
76
       </td>
101
          </td>
77
78
        <td>[% issue.barcode %]</td>
79
102
80
            <td>
103
          <td>[% issue.barcode %]</td>
81
        [% issue.renewals %]</td>
104
          <td>[% issue.renewals %]</td>
82
            <td>
105
          <td>
83
                <span title="[% issue.issuedate %]">[% issue.issuedate | $KohaDates %]</span></td>
106
            <span title="[% issue.issuedate %]">[% issue.issuedate | $KohaDates %]</span></td>
84
            <td>
107
          </td>
85
        [% issue.issuingbranch %]</td>
108
          <td>[% issue.issuedate | $KohaDates %]</td>
86
			<td>[% IF issue.date_due %]
109
          <td>[% issue.issuingbranch %]</td>
87
                    <span title="[% issue.date_due %]">[% issue.date_due | $KohaDates %]</span>
110
          <td>
88
                [% ELSE %]
111
            [% IF issue.date_due %]
89
                    <span title="0000-00-00"></span>
112
                <span title="[% issue.date_due %]">[% issue.date_due | $KohaDates %]</span>
90
                [% END %]
113
            [% ELSE %]
91
            </td>
114
                <span title="0000-00-00"></span>
92
            <td>
115
            [% END %]
93
                [% IF  issue.returndate %]
116
          </td>
94
                    <span title="[% issue.returndate %]">[% issue.returndate | $KohaDates %]</span>
117
          <td>
95
                [% ELSE %]
118
            [% IF  issue.returndate %]
96
                    <span title="Checked Out"><small>Checked out</small></span>
119
              <span title="[% issue.returndate %]">[% issue.returndate | $KohaDates %]</span>
97
                [% END %]
120
            [% ELSE %]
98
            </td>
121
              <span title="Checked Out"><small>Checked Out</small></span>
99
</tr>
122
            [% END %]
100
[% END %]
123
          </td>
101
</tbody>
124
        </tr>
102
</table>
125
      [% END %]
126
      </tbody>
127
    </table>
128
  </div>
129
</div>
103
[% END %]
130
[% END %]
104
</div>
131
</div>
105
</div>
132
</div>
(-)a/koha-tmpl/opac-tmpl/bootstrap/css/datatables.css (-100 / +94 lines)
Lines 3-25 input.search_init { Link Here
3
}
3
}
4
.sorting_asc {
4
.sorting_asc {
5
    padding-right: 19px;
5
    padding-right: 19px;
6
    background: url("../../img/asc.gif") no-repeat scroll right center #EEEEEE;
6
    background: url("../../images/asc.gif") no-repeat scroll right center #EEEEEE;
7
}
7
}
8
.sorting_desc {
8
.sorting_desc {
9
    padding-right: 19px;
9
    padding-right: 19px;
10
    background: url("../../img/desc.gif") no-repeat scroll right center #EEEEEE;
10
    background: url("../../images/desc.gif") no-repeat scroll right center #EEEEEE;
11
}
11
}
12
.sorting {
12
.sorting {
13
    padding-right: 19px;
13
    padding-right: 19px;
14
    background: url("../../img/ascdesc.gif") no-repeat scroll right center #EEEEEE;
14
    background: url("../../images/ascdesc.gif") no-repeat scroll right center #EEEEEE;
15
}
15
}
16
.sorting_asc_disabled {
16
.sorting_asc_disabled {
17
    padding-right: 19px;
17
    padding-right: 19px;
18
    background: url("../../img/datatables/sort_asc_disabled.png") no-repeat scroll right center #EEEEEE;
18
    background: url("../../images/datatables/sort_asc_disabled.png") no-repeat scroll right center #EEEEEE;
19
}
19
}
20
.sorting_desc_disabled {
20
.sorting_desc_disabled {
21
    padding-right: 19px;
21
    padding-right: 19px;
22
    background: url("../../img/datatables/sort_desc_disabled.png") no-repeat scroll right center #EEEEEE;
22
    background: url("../../images/datatables/sort_desc_disabled.png") no-repeat scroll right center #EEEEEE;
23
}
23
}
24
.sorting_disabled {
24
.sorting_disabled {
25
    padding-right: 19px;
25
    padding-right: 19px;
Lines 64-75 div.dataTables_filter { Link Here
64
}
64
}
65
div.dataTables_paginate {
65
div.dataTables_paginate {
66
    background-color : #F4F4F4;
66
    background-color : #F4F4F4;
67
    font-size: 110%;
68
    padding : 0;
67
    padding : 0;
69
}
68
}
70
69
71
.paging_full_numbers span.paginate_button,
70
.paging_full_numbers a.paginate_button,
72
.paging_full_numbers span.paginate_active {
71
.paging_full_numbers a.paginate_active {
73
    border-right : 1px solid #AAA;
72
    border-right : 1px solid #AAA;
74
    border-left : 1px solid #FFF;
73
    border-left : 1px solid #FFF;
75
    display : block;
74
    display : block;
Lines 79-126 div.dataTables_paginate { Link Here
79
    cursor: pointer;
78
    cursor: pointer;
80
}
79
}
81
80
82
.paging_full_numbers span.paginate_button {
81
.paging_full_numbers a.paginate_button {
83
    color : #0000CC;
82
    color : #0000CC;
84
}
83
}
85
.paging_full_numbers span.paginate_button.first {
84
.paging_full_numbers a.paginate_button.first {
86
    background-image : url('../../img/first.png');
85
    background-image : url('../../images/first.png');
87
    background-repeat: no-repeat;
86
    background-repeat: no-repeat;
88
    background-position : 2px center;
87
    background-position : 1% center;
89
    padding-left : 2em;
88
    padding-left : 2em;
90
}
89
}
91
.paging_full_numbers span.paginate_button.previous {
90
.paging_full_numbers a.paginate_button.previous {
92
    background-image : url('../../img/prev.png');
91
    background-image : url('../../images/prev.png');
93
    background-repeat: no-repeat;
92
    background-repeat: no-repeat;
94
    background-position : 2px center;
93
    background-position : 1% center;
95
    padding-left : 2em;
94
    padding-left : 2em;
96
}
95
}
97
.paging_full_numbers span.paginate_button.next {
96
.paging_full_numbers a.paginate_button.next {
98
    background-image : url('../../img/next.png');
97
    background-image : url('../../images/next.png');
99
    background-repeat: no-repeat;
98
    background-repeat: no-repeat;
100
    background-position : right center;
99
    background-position : 96% center;
101
    padding-right : 2em;
100
    padding-right : 2em;
102
}
101
}
103
.paging_full_numbers span.paginate_button.last {
102
.paging_full_numbers a.paginate_button.last {
104
    background-image : url('../../img/last.png');
103
    background-image : url('../../images/last.png');
105
    background-repeat: no-repeat;
104
    background-repeat: no-repeat;
106
    background-position : right center;
105
    background-position : 96% center;
107
    border-right : 1px solid #686868;
106
    border-right : 1px solid #686868;
108
    padding-right : 2em;
107
    padding-right : 2em;
109
}
108
}
110
div.bottom.pager .paging_full_numbers span.paginate_button.last {
109
div.bottom.pager .paging_full_numbers a.paginate_button.last {
111
    border-right-width : 0;
110
    border-right-width : 0;
112
}
111
}
113
.paging_full_numbers span.paginate_active {
112
.paging_full_numbers a.paginate_active {
114
    background-color : #FFFFEA;
113
    background-color : #FFFFEA;
115
    color : #000;
114
    color : #000;
116
    font-weight: bold;
115
    font-weight: bold;
117
}
116
}
118
117
119
.paging_full_numbers span.paginate_button:hover {
118
.paging_full_numbers a.paginate_button:hover {
120
    background-color: #FFC;
119
    background-color: #FFC;
121
}
120
}
122
121
123
.paging_full_numbers span.paginate_button.paginate_button_disabled {
122
.paging_full_numbers a.paginate_button.paginate_button_disabled {
124
    color : #666;
123
    color : #666;
125
}
124
}
126
125
Lines 131-137 div.dataTables_paginate.paging_four_button { Link Here
131
    background-color : transparent;
130
    background-color : transparent;
132
    border-right : 1px solid #686868;
131
    border-right : 1px solid #686868;
133
    border-left : 1px solid #FFF;
132
    border-left : 1px solid #FFF;
134
    line-height : 1.8em;
133
    line-height : 2.5em;
135
}
134
}
136
.paginate_disabled_first,
135
.paginate_disabled_first,
137
.paginate_enabled_first,
136
.paginate_enabled_first,
Lines 141-195 div.dataTables_paginate.paging_four_button { Link Here
141
.paginate_enabled_next,
140
.paginate_enabled_next,
142
.paginate_disabled_last,
141
.paginate_disabled_last,
143
.paginate_enabled_last {
142
.paginate_enabled_last {
144
    float: left;
143
    cursor: pointer;
145
    height: 16px;
144
    *cursor: hand;
146
    margin: .5em;
145
    padding: .1em 0;
147
    width: 16px;
146
}
147
148
.paginate_disabled_previous,
149
.paginate_enabled_previous,
150
.paginate_disabled_next,
151
.paginate_enabled_next {
152
    color: #111 !important;
153
}
154
155
.paginate_disabled_previous,
156
.paginate_enabled_previous {
157
    padding-left: 23px;
148
}
158
}
159
.paginate_disabled_next,
160
.paginate_enabled_next,
161
.paginate_disabled_last,
162
.paginate_enabled_last {
163
    padding-right: 23px;
164
    margin-left: 10px;
165
    margin-right : .3em;
166
}
167
168
.paging_four_button .paginate_disabled_first,
169
.paging_four_button .paginate_disabled_previous,
170
.paging_four_button .paginate_enabled_first,
171
.paging_four_button .paginate_enabled_previous  {
172
    margin-left : .3em;
173
}
174
149
.paginate_disabled_first {
175
.paginate_disabled_first {
150
    background-image: url("../../img/first-disabled.png");
176
    background: transparent url("../../images/first-disabled.png") no-repeat 3px top;
151
}
177
}
152
.paginate_enabled_first {
178
.paginate_enabled_first {
153
    background-image: url("../../img/first.png");
179
    background: transparent url("../../images/first.png") no-repeat 3px top;
154
    cursor: pointer;
180
    cursor: pointer;
155
}
181
}
156
.paginate_disabled_previous {
182
.paginate_disabled_previous {
157
    background-image: url("../../img/prev-disabled.png");
183
    background: transparent url("../../images/prev-disabled.png") no-repeat 3px top;
158
}
184
}
159
.paginate_enabled_previous {
185
.paginate_enabled_previous {
160
    background-image: url("../../img/prev.png");
186
    background: transparent url("../../images/prev.png") no-repeat 3px top;
161
    cursor: pointer;
187
    cursor: pointer;
162
}
188
}
163
.paginate_disabled_next {
189
.paginate_disabled_next {
164
    background-image: url("../../img/next-disabled.png");
190
    background: transparent url("../../images/next-disabled.png") no-repeat right top;
165
}
191
}
166
.paginate_enabled_next {
192
.paginate_enabled_next {
167
    background-image: url("../../img/next.png");
193
    background: transparent url("../../images/next.png") no-repeat right top;
168
    cursor: pointer;
194
    cursor: pointer;
169
}
195
}
170
.paginate_disabled_last {
196
.paginate_disabled_last {
171
    background-image: url("../../img/last-disabled.png");
197
    background: transparent url("../../images/last-disabled.png") no-repeat right top;
172
}
198
}
173
.paginate_enabled_last {
199
.paginate_enabled_last {
174
    background-image: url("../../img/last.png");
200
    background: transparent url("../../images/last.png") no-repeat right top;
175
    cursor: pointer;
201
    cursor: pointer;
176
}
202
}
177
203
178
179
/*
180
table.display {
181
    width: 100%;
182
}
183
table.display thead th {
184
    border-bottom: 1px solid black;
185
    cursor: pointer;
186
    font-weight: bold;
187
    padding: 3px 18px 3px 10px;
188
}
189
.dataTables_wrapper {
190
    clear: both;
191
    position: relative;
192
}
193
.dataTables_processing {
204
.dataTables_processing {
194
    background-color: white;
205
    background-color: white;
195
    border: 1px solid #DDDDDD;
206
    border: 1px solid #DDDDDD;
Lines 205-265 table.display thead th { Link Here
205
    top: 50%;
216
    top: 50%;
206
    width: 250px;
217
    width: 250px;
207
}
218
}
208
.dataTables_info {
209
    float: left;
210
    width: 60%;
211
}
212
.dataTables_paginate {
213
    float: right;
214
    text-align: right;
215
    width: 44px;
216
}
217
.paging_full_numbers {
218
    height: 22px;
219
    line-height: 22px;
220
    width: 400px;
221
}
222
.paging_full_numbers span.paginate_button,
223
     .paging_full_numbers span.paginate_active {
224
    border: 1px solid #aaa;
225
    -webkit-border-radius: 5px;
226
    -moz-border-radius: 5px;
227
    padding: 2px 5px;
228
    margin: 0 3px;
229
    cursor: pointer;
230
    *cursor: hand;
231
}
232
219
233
.paging_full_numbers span.paginate_button {
220
tr.odd.selected td {
234
    background-color: #ddd;
221
    background-color: #D3D3D3;
235
}
222
}
236
223
237
.paging_full_numbers span.paginate_button:hover {
224
tr.even.selected td {
238
    background-color: #ccc;
225
    background-color: #D3D3D3;
239
}
226
}
240
227
241
.paging_full_numbers span.paginate_active {
228
/* ColumnFilter */
242
    background-color: #99B3FF;
229
span.filter_column > input.text_filter {
243
}
230
    font-size: 80%;
244
.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next {
231
    width: 100%;
245
    float: left;
246
    height: 19px;
247
    margin-left: 3px;
248
    width: 19px;
249
}
232
}
250
.paginate_disabled_previous {
233
251
    background-image: url("../../img/datatables/back_disabled.jpg");
234
div.pager {
235
    background-color : #E8E8E8;
236
    border : 1px solid #BCBCBC;
237
    -moz-border-radius : 5px;
238
    border-radius : 5px;
239
    display : inline-block;
240
    font-size : 85%;
241
    padding : .3em .5em .3em .5em;
242
    margin : .4em 0;
252
}
243
}
253
.paginate_enabled_previous {
244
div.pager img {
254
    background-image: url("../../img/datatables/back_enabled.jpg");
245
    vertical-align : middle;
255
}
246
}
256
.paginate_disabled_next {
247
257
    background-image: url("../../img/datatables/forward_disabled.jpg");
248
div.pager img.last {
249
    padding-right: 5px;
258
}
250
}
259
.paginate_enabled_next {
251
div.pager input.pagedisplay {
260
    background-image: url("../../img/datatables/forward_enabled.jpg");
252
    border : 0;
253
    background-color : transparent;
254
    font-weight: bold;
255
    text-align : center;
261
}
256
}
262
.spacer {
257
div.pager p {
263
    clear: both;
258
    margin: 0;
264
    height: 20px;
265
}
259
}
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc (+8 lines)
Lines 19-29 not use an API to fetch items that populates item.datedue. Link Here
19
        [% END %]
19
        [% END %]
20
    [% END %]
20
    [% END %]
21
[% ELSIF ( item.datedue || issue.date_due ) %]
21
[% ELSIF ( item.datedue || issue.date_due ) %]
22
  [% IF inhouse_use %]
23
    [% IF ( OPACShowCheckoutName ) %]
24
        Currently in local use by [% item.cardnumber %] [% item.firstname %] [% item.surname %]
25
    [% ELSE %]
26
        Currently in local use
27
    [% END %]
28
  [% ELSE %]
22
    [% IF ( OPACShowCheckoutName ) %]
29
    [% IF ( OPACShowCheckoutName ) %]
23
        Checked out to [% item.cardnumber %] [% item.firstname %] [% item.surname %]
30
        Checked out to [% item.cardnumber %] [% item.firstname %] [% item.surname %]
24
    [% ELSE %]
31
    [% ELSE %]
25
        Checked out
32
        Checked out
26
    [% END %]
33
    [% END %]
34
  [% END %]
27
[% ELSIF ( item.transfertwhen ) %]
35
[% ELSIF ( item.transfertwhen ) %]
28
    In transit from [% item.transfertfrom %]
36
    In transit from [% item.transfertfrom %]
29
    to [% item.transfertto %] since [% item.transfertwhen %]
37
    to [% item.transfertto %] since [% item.transfertwhen %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js (-1 / +1 lines)
Lines 97-100 jQuery.extend( jQuery.fn.dataTableExt.oSort, { Link Here
97
        }
97
        }
98
    });
98
    });
99
99
100
}());
100
}());
(-)a/svc/checkouts (-1 / +3 lines)
Lines 63-68 my $sql = ' Link Here
63
        date_due < now() as date_due_overdue,
63
        date_due < now() as date_due_overdue,
64
        issues.timestamp,
64
        issues.timestamp,
65
65
66
        inhouse_use,
67
66
        biblionumber,
68
        biblionumber,
67
        biblio.title,
69
        biblio.title,
68
        author,
70
        author,
Lines 152-157 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
152
        date_due            => $c->{date_due},
154
        date_due            => $c->{date_due},
153
        date_due_overdue    => $c->{date_due_overdue} ? JSON::true : JSON::false,
155
        date_due_overdue    => $c->{date_due_overdue} ? JSON::true : JSON::false,
154
        timestamp           => $c->{timestamp},
156
        timestamp           => $c->{timestamp},
157
        inhouse_use         => $c->{inhouse_use},
155
        renewals_count      => $renewals_count,
158
        renewals_count      => $renewals_count,
156
        renewals_allowed    => $renewals_allowed,
159
        renewals_allowed    => $renewals_allowed,
157
        renewals_remaining  => $renewals_remaining,
160
        renewals_remaining  => $renewals_remaining,
158
- 

Return to bug 10860