gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug_7241' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-03-21 11:44:15 -04:00
parent c1f4866312 7f8369dc2f
commit 6807d7e338
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C4/Circulation.pm
View File

@ -1317,7 +1317,7 @@ sub AddIssue {
}
}
logaction("CIRCULATION", "ISSUE", $borrower->{'borrowernumber'}, $biblio->{'biblionumber'})
logaction("CIRCULATION", "ISSUE", $borrower->{'borrowernumber'}, $biblio->{'itemnumber'})
if C4::Context->preference("IssueLog");
}
return ($datedue); # not necessarily the same as when it came in!
@ -1885,7 +1885,7 @@ sub AddReturn {
});
}
logaction("CIRCULATION", "RETURN", $borrowernumber, $item->{'biblionumber'})
logaction("CIRCULATION", "RETURN", $borrowernumber, $item->{'itemnumber'})
if C4::Context->preference("ReturnLog");
# FIXME: make this comment intelligible.

10
installer/data/mysql/updatedatabase.pl
View File

@ -6661,6 +6661,16 @@ if ( CheckVersion($DBversion) ) {
SetVersion ($DBversion);
}
$DBversion = "3.11.00.108";
if ( CheckVersion($DBversion) ) {
$dbh->do("ALTER TABLE action_logs CHANGE timestamp timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;");
$dbh->do("UPDATE action_logs SET info=(SELECT itemnumber FROM items WHERE biblionumber= action_logs.info LIMIT 1) WHERE module='CIRCULATION' AND action in ('ISSUE','RETURN');");
$dbh->do("ALTER TABLE action_logs CHANGE timestamp timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;");
print "Upgrade to $DBversion done (Bug 7241: Fix on circulation logs)\n";
print "WARNING about bug 7241: to partially correct the broken logs, the log history is filled with the first found item for each biblio.\n";
SetVersion($DBversion);
}
=head1 FUNCTIONS

2
koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
View File

@ -168,7 +168,7 @@
</td>
<td>
[% IF ( loopro.CIRCULATION ) %]
<a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.info %]&amp;biblionumber=[% loopro.biblionumber %]&amp;bi=[% loopro.biblioitemnumber %]#item[% loopro.object %]" title="Display detail for this biblio">Item [% loopro.barcode |html %]</a>
<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>
[% ELSE %]
[% loopro.info |html %]
[% END %]

2
kohaversion.pl
View File

@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
use strict;
sub kohaversion {
our $VERSION = '3.11.00.107';
our $VERSION = '3.11.00.108';
# version needs to be set this way
# so that it can be picked up by Makefile.PL
# during install