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

(-)a/acqui/parcel.pl (+1 lines)
Lines 320-322 $template->param( Link Here
320
    resultsperpage        => $resultsperpage,
320
    resultsperpage        => $resultsperpage,
321
);
321
);
322
output_html_with_http_headers $input, $cookie, $template->output;
322
output_html_with_http_headers $input, $cookie, $template->output;
323
 
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl (-6 / +12 lines)
Lines 252-257 Link Here
252
		<th>Order Line</th>
252
		<th>Order Line</th>
253
		<th>Summary</th>
253
		<th>Summary</th>
254
		<th>View Record</th>
254
		<th>View Record</th>
255
		<th>Quantity</th>  
255
		<th>Est cost</th>
256
		<th>Est cost</th>
256
		<th>Actual cost</th>
257
		<th>Actual cost</th>
257
		<th>TOTAL</th>
258
		<th>TOTAL</th>
Lines 260-279 Link Here
260
<tfoot>
261
<tfoot>
261
	    <tr>
262
	    <tr>
262
		<td colspan="4" class="total">SUBTOTAL</td>
263
		<td colspan="4" class="total">SUBTOTAL</td>
263
		<td>&nbsp;</td>
264
		<td colspan="2">&nbsp;</td>
264
		<td><!-- TMPL_VAR NAME="totalprice" --></td>
265
		<td><!-- TMPL_VAR NAME="totalprice" --></td>
265
		<td><!-- TMPL_VAR NAME="tototal" --></td>
266
		<td><!-- TMPL_VAR NAME="tototal" --></td>
266
	    </tr>
267
	    </tr>
268
	      
267
	      <!-- TMPL_IF NAME="totalfreight" -->
269
	      <!-- TMPL_IF NAME="totalfreight" -->
268
		    <tr>
270
		    <tr>
269
		<td colspan="5">&nbsp;
271
			<td colspan="6">&nbsp;
270
		</td>
272
		</td>
271
			    <td>Shipping</td>
273
			    <td>Shipping</td>
272
		<td><!-- TMPL_VAR NAME="totalfreight" --></td>
274
		<td><!-- TMPL_VAR NAME="totalfreight" --></td>
273
	    </tr> <!-- /TMPL_IF -->
275
	    	</tr> 
276
	    <!-- /TMPL_IF -->
274
	      <!-- TMPL_IF NAME="gst" -->
277
	      <!-- TMPL_IF NAME="gst" -->
275
		    <tr>
278
		    <tr>
276
		<td colspan="5">
279
			<td colspan="6">
277
		<p class="message">
280
		<p class="message">
278
			    <b>HELP</b><br />
281
			    <b>HELP</b><br />
279
		    The total at the bottom of the page should be within a few cents of the total for the invoice.
282
		    The total at the bottom of the page should be within a few cents of the total for the invoice.
Lines 281-289 Link Here
281
		</td>
284
		</td>
282
			    <td><b>Tax rate</b></td>
285
			    <td><b>Tax rate</b></td>
283
		<td><!-- TMPL_VAR NAME="gst" --></td>
286
		<td><!-- TMPL_VAR NAME="gst" --></td>
284
	    </tr> <!-- /TMPL_IF -->
287
	    	</tr> 
288
	    <!-- /TMPL_IF -->
285
	    <tr>
289
	    <tr>
286
	    <td colspan="4" class="total">TOTAL</td>
290
	    <td colspan="4" class="total">TOTAL</td>
291
		<td><!-- TMPL_VAR NAME="totalquantity" --></td>
287
		<td colspan="2">&nbsp;</td>
292
		<td colspan="2">&nbsp;</td>
288
		<td><!-- TMPL_VAR NAME="grandtot" --></td>
293
		<td><!-- TMPL_VAR NAME="grandtot" --></td>
289
	    </tr>
294
	    </tr>
Lines 303-308 Link Here
303
                <!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
308
                <!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
304
                </td>
309
                </td>
305
                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
310
                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
311
                <td><!-- TMPL_VAR NAME="quantityreceived" --></td>
306
                <td><!-- TMPL_VAR NAME="ecost" --></td>
312
                <td><!-- TMPL_VAR NAME="ecost" --></td>
307
                <td><!-- TMPL_VAR NAME="unitprice" --></td>
313
                <td><!-- TMPL_VAR NAME="unitprice" --></td>
308
                <td><!-- TMPL_VAR NAME="total" --></td>
314
                <td><!-- TMPL_VAR NAME="total" --></td>
Lines 351-353 Link Here
351
</div>
357
</div>
352
</div>
358
</div>
353
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
359
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
354
- 
360
 

Return to bug 5948