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

(-)a/C4/Acquisition.pm (-1 / +2 lines)
Lines 2657-2666 sub GetInvoiceDetails { Link Here
2657
    my $invoice = $sth->fetchrow_hashref;
2657
    my $invoice = $sth->fetchrow_hashref;
2658
2658
2659
    $query = q{
2659
    $query = q{
2660
        SELECT aqorders.*, biblio.*, aqbasket.basketname
2660
        SELECT aqorders.*, biblio.*, biblioitems.*, aqbasket.basketname
2661
        FROM aqorders
2661
        FROM aqorders
2662
          LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
2662
          LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
2663
          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
2663
          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
2664
          LEFT JOIN biblioitems ON aqorders.biblionumber = biblioitems.biblionumber
2664
        WHERE invoiceid = ?
2665
        WHERE invoiceid = ?
2665
    };
2666
    };
2666
    $sth = $dbh->prepare($query);
2667
    $sth = $dbh->prepare($query);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-11 / +9 lines)
Lines 131-137 Link Here
131
            <thead>
131
            <thead>
132
              <tr>
132
              <tr>
133
                <th>Summary</th>
133
                <th>Summary</th>
134
                <th>Publisher</th>
135
                <th>Library</th>
134
                <th>Library</th>
136
                <th class="gste">Actual cost tax exc.</th>
135
                <th class="gste">Actual cost tax exc.</th>
137
                <th class="gsti">Actual cost tax inc.</th>
136
                <th class="gsti">Actual cost tax inc.</th>
Lines 146-163 Link Here
146
            <tbody>
145
            <tbody>
147
              [% FOREACH order IN orders_loop %]
146
              [% FOREACH order IN orders_loop %]
148
                <tr>
147
                <tr>
149
                  <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a>
148
                  <td>
149
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a>
150
                    [% IF ( order.author ) %]
150
                    [% IF ( order.author ) %]
151
                      <br /><em>by</em> [% order.author %]
151
                      <br /><em>by</em> [% order.author %]
152
                    [% END %]
152
                    [% END %]
153
                  </p></td>
154
                  <td>
155
                    [% IF ( order.publishercode ) %]
153
                    [% IF ( order.publishercode ) %]
156
                      <p>[% order.publishercode %]
154
                      <br/>[% order.publishercode %]
157
                        [% IF ( order.publicationyear ) %]
155
                        [% IF order.publicationyear > 0 %]
158
                          - [% order.publicationyear %]
156
                          - [% order.publicationyear %]
157
                        [% ELSIF ( order.copyrightdate > 0) %]
158
                          - [% order.copyrightdate %]
159
                        [% END %]
159
                        [% END %]
160
                      </p>
161
                    [% END %]
160
                    [% END %]
162
                  </td>
161
                  </td>
163
                  <td><p>[% order.branchcode %]</p></td>
162
                  <td><p>[% order.branchcode %]</p></td>
Lines 175-181 Link Here
175
            <tfoot>
174
            <tfoot>
176
              [% FOR tf IN foot_loop %]
175
              [% FOR tf IN foot_loop %]
177
                <tr>
176
                <tr>
178
                    <th colspan='3'>Total (GST [% tf.gstgsti %] %)</th>
177
                    <th colspan='2'>Total (GST [% tf.gstgsti %] %)</th>
179
                    <th class="gste"/><th class="gsti"/>
178
                    <th class="gste"/><th class="gsti"/>
180
                    <th>[% tf.quantity %]</th>
179
                    <th>[% tf.quantity %]</th>
181
                    <th class="gste">[% tf.totalgste %]</th>
180
                    <th class="gste">[% tf.totalgste %]</th>
Lines 186-192 Link Here
186
                </tr>
185
                </tr>
187
              [% END %]
186
              [% END %]
188
              <tr>
187
              <tr>
189
                <th colspan='3'>Total ([% currency %])</th>
188
                <th colspan='2'>Total ([% currency %])</th>
190
                <th class="gste"/><th class="gsti"/>
189
                <th class="gste"/><th class="gsti"/>
191
                <th>[% total_quantity %]</th>
190
                <th>[% total_quantity %]</th>
192
                <th class="gste">[% total_gste %]</th>
191
                <th class="gste">[% total_gste %]</th>
Lines 196-202 Link Here
196
                <th>&nbsp;</th>
195
                <th>&nbsp;</th>
197
              </tr>
196
              </tr>
198
              <tr>
197
              <tr>
199
                <th colspan="3">Total + Shipment cost ([% currency %])</th>
198
                <th colspan="2">Total + Shipment cost ([% currency %])</th>
200
                <th class="gste"></th>
199
                <th class="gste"></th>
201
                <th class="gsti"></th>
200
                <th class="gsti"></th>
202
                <th>[% total_quantity %]</th>
201
                <th>[% total_quantity %]</th>
203
- 

Return to bug 12059