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

(-)a/circ/returns.pl (+3 lines)
Lines 47-52 use C4::Members; Link Here
47
use C4::Members::Messaging;
47
use C4::Members::Messaging;
48
use C4::Koha;   # FIXME : is it still useful ?
48
use C4::Koha;   # FIXME : is it still useful ?
49
use C4::RotatingCollections;
49
use C4::RotatingCollections;
50
use C4::Log;
50
use Koha::AuthorisedValues;
51
use Koha::AuthorisedValues;
51
use Koha::DateUtils;
52
use Koha::DateUtils;
52
use Koha::Calendar;
53
use Koha::Calendar;
Lines 251-256 if ($canceltransfer){ Link Here
251
# actually return book and prepare item table.....
252
# actually return book and prepare item table.....
252
my $returnbranch;
253
my $returnbranch;
253
if ($barcode) {
254
if ($barcode) {
255
    logaction("CIRCULATION", "BARCODE_SCAN_CHECKIN", $barcode, $barcode ) if C4::Context->preference('CirculationCheckinLog');
256
254
    $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
257
    $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
255
    $barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');
258
    $barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');
256
    $itemnumber = GetItemnumberFromBarcode($barcode);
259
    $itemnumber = GetItemnumberFromBarcode($barcode);
(-)a/installer/data/mysql/atomicupdate/bug_17541.perl (+10 lines)
Line 0 Link Here
1
$DBversion = 'XXX';  # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do(q{
4
        INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
5
        ('CirculationCheckinLog','0',NULL,'If ON, log all barcodes scanned at during checkin, regardless of validity.','YesNo');
6
    });
7
8
    SetVersion( $DBversion );
9
    print "Upgrade to $DBversion done (Bug 17541 - Add ability to log all barcodes scanned at checkin)\n";
10
}
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 101-106 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
101
('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'),
101
('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'),
102
('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),
102
('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),
103
('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),
103
('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),
104
('CirculationCheckinLog','0',NULL,'If ON, log all barcodes scanned at during checkin, regardless of validity.','YesNo'),
104
('ClaimsBccCopy','0','','Bcc the ClaimAcquisition and ClaimIssues alerts','YesNo'),
105
('ClaimsBccCopy','0','','Bcc the ClaimAcquisition and ClaimIssues alerts','YesNo'),
105
('Coce','0', NULL, 'If on, enables cover retrieval from the configured Coce server', 'YesNo'),
106
('Coce','0', NULL, 'If on, enables cover retrieval from the configured Coce server', 'YesNo'),
106
('CoceHost', '', NULL, 'Coce server URL', 'Free'),
107
('CoceHost', '', NULL, 'Coce server URL', 'Free'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref (+6 lines)
Lines 66-71 Logging: Link Here
66
                  on: Log
66
                  on: Log
67
                  off: "Don't log"
67
                  off: "Don't log"
68
            - when reports are added, deleted or changed.
68
            - when reports are added, deleted or changed.
69
        -
70
            - pref: CirculationCheckinLog
71
              choices:
72
                  on: Log
73
                  off: "Don't log"
74
            - log all barcodes scanned at during checkin, regardless of validity.
69
    Debugging:
75
    Debugging:
70
        -
76
        -
71
            - pref: DumpTemplateVarsIntranet
77
            - pref: DumpTemplateVarsIntranet
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-3 / +20 lines)
Lines 50-55 Link Here
50
[%        CASE 'CHANGE PASS' %]Change password
50
[%        CASE 'CHANGE PASS' %]Change password
51
[%        CASE 'ADDCIRCMESSAGE' %]Add circulation message
51
[%        CASE 'ADDCIRCMESSAGE' %]Add circulation message
52
[%        CASE 'DELCIRCMESSAGE' %]Delete circulation message
52
[%        CASE 'DELCIRCMESSAGE' %]Delete circulation message
53
[%        CASE 'BARCODE_SCAN_CHECKIN' %]Scanned barcode at checkin
53
[%        CASE 'Run'    %]Run
54
[%        CASE 'Run'    %]Run
54
[%        CASE %][% action %]
55
[%        CASE %][% action %]
55
[%    END %]
56
[%    END %]
Lines 117-123 Link Here
117
                                        <option value="">All</option>
118
                                        <option value="">All</option>
118
                                    [% END %]
119
                                    [% END %]
119
120
120
                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'CHANGE PASS' 'Run' ] %]
121
                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'CHANGE PASS' 'Run' 'BARCODE_SCAN_CHECKIN'] %]
121
                                        [% IF actions.grep(actx).size %]
122
                                        [% IF actions.grep(actx).size %]
122
                                            <option value="[% actx %]" selected="selected">[% PROCESS translate_log_action action=actx %]</option>
123
                                            <option value="[% actx %]" selected="selected">[% PROCESS translate_log_action action=actx %]</option>
123
                                        [% ELSE %]
124
                                        [% ELSE %]
Lines 214-220 Link Here
214
                                    <td>[% PROCESS translate_log_action action=loopro.action %]</td>
215
                                    <td>[% PROCESS translate_log_action action=loopro.action %]</td>
215
                                    <td>
216
                                    <td>
216
                                        [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
217
                                        [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
217
                                             <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.borrowerfirstname ) || ( loopro.borrowersurname ) %][% loopro.borrowerfirstname %] [% loopro.borrowersurname %] ([% loopro.object %]) [% ELSE %]Member [% loopro.object %][% END %][% END %] </a>
218
                                            [% IF loopro.action == 'BARCODE_SCAN_CHECKIN' %]
219
                                                [% loopro.info %]
220
                                            [% ELSE %]
221
                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details.">
222
                                                    [% IF ( loopro.object ) %]
223
                                                        [% IF ( loopro.borrowerfirstname ) || ( loopro.borrowersurname ) %]
224
                                                            [% loopro.borrowerfirstname %] [% loopro.borrowersurname %] ([% loopro.object %])
225
                                                        [% ELSE %]
226
                                                            Member [% loopro.object %]
227
                                                        [% END %]
228
                                                    [% END %]
229
                                                </a>
230
                                            [% END %]
218
                                        [% ELSE %]
231
                                        [% ELSE %]
219
                                                [% IF ( loopro.module == 'CATALOGUING' ) %]
232
                                                [% IF ( loopro.module == 'CATALOGUING' ) %]
220
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
233
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
Lines 239-245 Link Here
239
                                    </td>
252
                                    </td>
240
                                    <td>
253
                                    <td>
241
                                        [% IF ( loopro.module == 'CIRCULATION' ) %]
254
                                        [% IF ( loopro.module == 'CIRCULATION' ) %]
242
                                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info %]&amp;biblionumber=[% loopro.biblionumber %]&amp;bi=[% loopro.biblioitemnumber %]#item[% loopro.info %]" title="Display detail for this item">Item [% loopro.barcode |html %]</a>
255
                                            [% IF loopro.biblionumber %]
256
                                                <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info %]&amp;biblionumber=[% loopro.biblionumber %]&amp;bi=[% loopro.biblioitemnumber %]#item[% loopro.info %]" title="Display detail for this item">
257
                                                    Item [% loopro.barcode |html %]
258
                                                </a>
259
                                            [% END %]
243
                                        [% ELSE %]
260
                                        [% ELSE %]
244
                                            [% loopro.info |html %]
261
                                            [% loopro.info |html %]
245
                                        [% END %]
262
                                        [% END %]
(-)a/tools/viewlog.pl (-2 / +1 lines)
Lines 126-132 if ($do_it) { Link Here
126
            # get item information so we can create a working link
126
            # get item information so we can create a working link
127
            my $itemnumber = $result->{'object'};
127
            my $itemnumber = $result->{'object'};
128
            $itemnumber = $result->{'info'} if ( $result->{module} eq "CIRCULATION" );
128
            $itemnumber = $result->{'info'} if ( $result->{module} eq "CIRCULATION" );
129
            my $item = GetItem($itemnumber);
129
            my $item = GetItem($itemnumber) || GetItem( undef, $itemnumber );
130
            if ($item) {
130
            if ($item) {
131
                $result->{'biblionumber'}     = $item->{'biblionumber'};
131
                $result->{'biblionumber'}     = $item->{'biblionumber'};
132
                $result->{'biblioitemnumber'} = $item->{'biblionumber'};
132
                $result->{'biblioitemnumber'} = $item->{'biblionumber'};
133
- 

Return to bug 17541