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

(-)a/C4/Serials.pm (-9 / +14 lines)
Lines 369-374 sub GetFullSubscription { Link Here
369
            aqbooksellers.name as aqbooksellername,
369
            aqbooksellers.name as aqbooksellername,
370
            biblio.title as bibliotitle,
370
            biblio.title as bibliotitle,
371
            subscription.branchcode AS branchcode,
371
            subscription.branchcode AS branchcode,
372
            branches.branchname AS branchname,
372
            subscription.subscriptionid AS subscriptionid |;
373
            subscription.subscriptionid AS subscriptionid |;
373
    if (   C4::Context->preference('IndependantBranches')
374
    if (   C4::Context->preference('IndependantBranches')
374
        && C4::Context->userenv
375
        && C4::Context->userenv
Lines 378-392 sub GetFullSubscription { Link Here
378
      , ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit ";
379
      , ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit ";
379
    }
380
    }
380
    $query .= qq|
381
    $query .= qq|
381
  FROM      serial 
382
        FROM serial
382
  LEFT JOIN subscription ON 
383
        LEFT JOIN subscription ON
383
          (serial.subscriptionid=subscription.subscriptionid )
384
            ( serial.subscriptionid = subscription.subscriptionid )
384
  LEFT JOIN aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
385
        LEFT JOIN aqbooksellers ON
385
  LEFT JOIN biblio on biblio.biblionumber=subscription.biblionumber 
386
            ( subscription.aqbooksellerid = aqbooksellers.id )
386
  WHERE     serial.subscriptionid = ? 
387
        LEFT JOIN biblio ON
387
  ORDER BY year DESC,
388
            ( biblio.biblionumber = subscription.biblionumber )
388
          IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate) DESC,
389
        LEFT JOIN branches ON
389
          serial.subscriptionid
390
            ( subscription.branchcode = branches.branchcode )
391
        WHERE serial.subscriptionid = ?
392
        ORDER BY year DESC,
393
            IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate) DESC,
394
            serial.subscriptionid
390
          |;
395
          |;
391
    $debug and warn "GetFullSubscription query: $query";
396
    $debug and warn "GetFullSubscription query: $query";
392
    my $sth = $dbh->prepare($query);
397
    my $sth = $dbh->prepare($query);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-2 / +2 lines)
Lines 175-181 $(document).ready(function() { Link Here
175
                [% IF ( subscription.numberpattern7 ) %]
175
                [% IF ( subscription.numberpattern7 ) %]
176
                    None of the above
176
                    None of the above
177
                [% END %]</td>
177
                [% END %]</td>
178
            <td> [% subscription.branchcode %]</td>
178
            <td> [% subscription.branchname %]</td>
179
            <td> [% subscription.callnumber %]</td>
179
            <td> [% subscription.callnumber %]</td>
180
        <td> [% subscription.notes %]
180
        <td> [% subscription.notes %]
181
            [% UNLESS subscription.closed %]
181
            [% UNLESS subscription.closed %]
Lines 311-317 $(document).ready(function() { Link Here
311
                    [% serial.notes %]
311
                    [% serial.notes %]
312
                </td>
312
                </td>
313
                <td>
313
                <td>
314
                    [% serial.branchcode %]
314
                    [% serial.branchname %]
315
                </td>
315
                </td>
316
                [% IF ( routing ) %]
316
                [% IF ( routing ) %]
317
                <td>
317
                <td>
(-)a/serials/serials-collection.pl (-1 / +6 lines)
Lines 23-28 use strict; Link Here
23
use warnings;
23
use warnings;
24
use CGI;
24
use CGI;
25
use C4::Auth;
25
use C4::Auth;
26
use C4::Branch qw/GetBranchName/;
26
use C4::Koha;
27
use C4::Koha;
27
use C4::Dates qw/format_date/;
28
use C4::Dates qw/format_date/;
28
use C4::Serials;
29
use C4::Serials;
Lines 114-119 if (@subscriptionid){ Link Here
114
    $subs->{ "status" . $subs->{'status'} } = 1;
115
    $subs->{ "status" . $subs->{'status'} } = 1;
115
    $subs->{startdate}     = format_date( $subs->{startdate} );
116
    $subs->{startdate}     = format_date( $subs->{startdate} );
116
    $subs->{histstartdate} = format_date( $subs->{histstartdate} );
117
    $subs->{histstartdate} = format_date( $subs->{histstartdate} );
118
119
    if ( defined $subs->{ branchcode } ) {
120
        $subs->{ branchname } = GetBranchName( $subs->{ branchcode } );
121
    }
122
117
    if ( !defined $subs->{enddate} || $subs->{enddate} eq '0000-00-00' ) {
123
    if ( !defined $subs->{enddate} || $subs->{enddate} eq '0000-00-00' ) {
118
        $subs->{enddate} = '';
124
        $subs->{enddate} = '';
119
    }
125
    }
120
- 

Return to bug 10609