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

Bug 10609: Use branch name rather than branch code in serials-collection.pl (3.12.x) 

This is the 3.12.x compatible version of the patch for 10609.

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Serial collection page now displays the branch description
instead of the branchcode.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit ac5aae6dd4)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Also works on 3.10
(cherry picked from commit ac5aae6dd4)
This commit is contained in:
Tomas Cohen Arazi 2013-08-28 11:48:16 -03:00 committed by Bernardo Gonzalez Kriegel
parent d774afe121
commit 40c2eab220
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
C4/Serials.pm
View File

@ -360,6 +360,7 @@ sub GetFullSubscription {
aqbooksellers.name as aqbooksellername,
biblio.title as bibliotitle,
subscription.branchcode AS branchcode,
branches.branchname AS branchname,
subscription.subscriptionid AS subscriptionid |;
if ( C4::Context->preference('IndependantBranches')
&& C4::Context->userenv
@ -369,15 +370,19 @@ sub GetFullSubscription {
, ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit ";
}
$query .= qq|
FROM serial
LEFT JOIN subscription ON
(serial.subscriptionid=subscription.subscriptionid )
LEFT JOIN aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id
LEFT JOIN biblio on biblio.biblionumber=subscription.biblionumber
WHERE serial.subscriptionid = ?
ORDER BY year DESC,
IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate) DESC,
serial.subscriptionid
FROM serial
LEFT JOIN subscription ON
( serial.subscriptionid = subscription.subscriptionid )
LEFT JOIN aqbooksellers ON
( subscription.aqbooksellerid = aqbooksellers.id )
LEFT JOIN biblio ON
( biblio.biblionumber = subscription.biblionumber )
LEFT JOIN branches ON
( subscription.branchcode = branches.branchcode )
WHERE serial.subscriptionid = ?
ORDER BY year DESC,
IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate) DESC,
serial.subscriptionid
|;
$debug and warn "GetFullSubscription query: $query";
my $sth = $dbh->prepare($query);

4
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
View File

@ -149,7 +149,7 @@ $(document).ready(function() {
[% IF ( subscription.numberpattern7 ) %]
None of the above
[% END %]</td>
<td> [% subscription.branchcode %]</td>
<td> [% subscription.branchname %]</td>
<td> [% subscription.callnumber %]</td>
<td> [% subscription.notes %] [% IF ( subscription.subscriptionexpired ) %]<br /><span class="problem"> Subscription expired</span>
[% END %]
@ -240,7 +240,7 @@ $(document).ready(function() {
[% serial.notes %]
</td>
<td>
[% serial.branchcode %]
[% serial.branchname %]
</td>
[% IF ( routing ) %]
<td>

6
serials/serials-collection.pl
View File

@ -23,6 +23,7 @@ use strict;
use warnings;
use CGI;
use C4::Auth;
use C4::Branch qw/GetBranchName/;
use C4::Koha;
use C4::Dates qw/format_date/;
use C4::Serials;
@ -112,6 +113,11 @@ if (@subscriptionid){
$subs->{ "status" . $subs->{'status'} } = 1;
$subs->{startdate} = format_date( $subs->{startdate} );
$subs->{histstartdate} = format_date( $subs->{histstartdate} );
if ( defined $subs->{ branchcode } ) {
$subs->{ branchname } = GetBranchName( $subs->{ branchcode } );
}
if ( !defined $subs->{enddate} || $subs->{enddate} eq '0000-00-00' ) {
$subs->{enddate} = '';
}