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

(-)a/C4/Serials.pm (-1 / +2 lines)
Lines 471-477 sub GetFullSubscriptionsFromBiblionumber { Link Here
471 
            year(IF(serial.publisheddate IS NULL,serial.planneddate,serial.publisheddate)) as year,
 471 
            year(IF(serial.publisheddate IS NULL,serial.planneddate,serial.publisheddate)) as year,
472 
            biblio.title as bibliotitle,
 472 
            biblio.title as bibliotitle,
473 
            subscription.branchcode AS branchcode,
 473 
            subscription.branchcode AS branchcode,
474 
            subscription.subscriptionid AS subscriptionid
 474 
            subscription.subscriptionid AS subscriptionid,
475 
            subscription.location AS location
475 
  FROM      serial
476 
  FROM      serial
476 
  LEFT JOIN subscription ON
477 
  LEFT JOIN subscription ON
477 
          (serial.subscriptionid=subscription.subscriptionid)
 478 
          (serial.subscriptionid=subscription.subscriptionid)
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt (+3 lines)
Lines 4-9 Link Here
4 
[% USE AdditionalContents %]
 4 
[% USE AdditionalContents %]
5 
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
 5 
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6 
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
 6 
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7 
[% USE AuthorisedValues %]
7 
[% INCLUDE 'doc-head-open.inc' %]
 8 
[% INCLUDE 'doc-head-open.inc' %]
8 
<title>Full subscription history for [% bibliotitle | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
 9 
<title>Full subscription history for [% bibliotitle | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
9 
[% INCLUDE 'doc-head-close.inc' %]
 10 
[% INCLUDE 'doc-head-close.inc' %]
Lines 129-134 Link Here
129 
                                        <tr>
 130 
                                        <tr>
130 
                                            <th>Date</th>
 131 
                                            <th>Date</th>
131 
                                            <th>Library</th>
 132 
                                            <th>Library</th>
133 
                                            <th>Location</th>
132 
                                            <th>Notes</th>
 134 
                                            <th>Notes</th>
133 
                                            <th>Date received</th>
 135 
                                            <th>Date received</th>
134 
                                            <th>Number</th>
 136 
                                            <th>Number</th>
Lines 151-156 Link Here
151 
                                                    [% END %]
 153 
                                                    [% END %]
152 
                                                </td>
 154 
                                                </td>
153 
                                                <td class="libraryfilterclass">[% Branches.GetName( serial.branchcode ) | html %]</td>
 155 
                                                <td class="libraryfilterclass">[% Branches.GetName( serial.branchcode ) | html %]</td>
156 
                                                <td>[% AuthorisedValues.GetByCode( 'LOC', serial.location, 1 ) | html %]</td>
154 
                                                <td>[% serial.notes | html %]</td>
 157 
                                                <td>[% serial.notes | html %]</td>
155 
                                                [% IF ( serial.status2 && serial.planneddate ) %]
 158 
                                                [% IF ( serial.status2 && serial.planneddate ) %]
156 
                                                    <td data-order="[% serial.planneddate | html %]">
 159 
                                                    <td data-order="[% serial.planneddate | html %]">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt (-1 / +4 lines)
Lines 1-5 Link Here
1 
[% USE Koha %]
 1 
[% USE Koha %]
2 
[% USE AdditionalContents %]
 2 
[% USE AdditionalContents %]
3 
[% USE AuthorisedValues %]
3 
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
 4 
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4 
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
 5 
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
5 
[% INCLUDE 'doc-head-open.inc' %]
 6 
[% INCLUDE 'doc-head-open.inc' %]
Lines 131-136 Link Here
131 
                                    [% END %]
 132 
                                    [% END %]
132 

          133
          

        

        

          133
          
                                    <h3>[% subscription_LOO.branchname | html %]</h3>

          134
          
                                    <h3>[% subscription_LOO.branchname | html %]</h3>

        

            

              
              
              135
              
                                    [% IF ( subscription_LOO.location ) %]

            

            

              136
              
                                        <p>Location : <em>[% AuthorisedValues.GetByCode( 'LOC', subscription_LOO.location, 1 ) | html | html_line_break %]</em></p>

            

            

              137
              
                                    [% END %]

            

        

          134
          

          138
          

        

        

          135
          
                                    [% IF ( subscription_LOO.notes ) %]

          139
          
                                    [% IF ( subscription_LOO.notes ) %]

        

        

          136
          
                                        <p>[% subscription_LOO.notes | html | html_line_break %]</p>

          140
          
                                        <p>[% subscription_LOO.notes | html | html_line_break %]</p>

        

            

              137
              
- 

              
              
            






  

  Return to bug 6734