Bug 5948 : Creation of a quantity column in receipt summary

In receipt summary the quantity did'nt appear in already received table, this patch fixes the omission

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch tested on current master. Works like advertised.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index ad95944..ec5071b 100755 (executable)
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -320,3 +320,4 @@ $template->param(
     resultsperpage        => $resultsperpage,
 );
 output_html_with_http_headers $input, $cookie, $template->output;
+ 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
index d3409ca..4be4ee8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -252,6 +252,7 @@
                <th>Order Line</th>
                <th>Summary</th>
                <th>View Record</th>
+               <th>Quantity</th>  
                <th>Est cost</th>
                <th>Actual cost</th>
                <th>TOTAL</th>
@@ -260,20 +261,22 @@
 <tfoot>
            <tr>
                <td colspan="4" class="total">SUBTOTAL</td>
-               <td>&nbsp;</td>
+               <td colspan="2">&nbsp;</td>
                <td><!-- TMPL_VAR NAME="totalprice" --></td>
                <td><!-- TMPL_VAR NAME="tototal" --></td>
            </tr>
+             
              <!-- TMPL_IF NAME="totalfreight" -->
                    <tr>
-               <td colspan="5">&nbsp;
+                       <td colspan="6">&nbsp;
                </td>
                            <td>Shipping</td>
                <td><!-- TMPL_VAR NAME="totalfreight" --></td>
-           </tr> <!-- /TMPL_IF -->
+               </tr> 
+           <!-- /TMPL_IF -->
              <!-- TMPL_IF NAME="gst" -->
                    <tr>
-               <td colspan="5">
+                       <td colspan="6">
                <p class="message">
                            <b>HELP</b><br />
                    The total at the bottom of the page should be within a few cents of the total for the invoice.
@@ -281,9 +284,11 @@
                </td>
                            <td><b>Tax rate</b></td>
                <td><!-- TMPL_VAR NAME="gst" --></td>
-           </tr> <!-- /TMPL_IF -->
+               </tr> 
+           <!-- /TMPL_IF -->
            <tr>
            <td colspan="4" class="total">TOTAL</td>
+               <td><!-- TMPL_VAR NAME="totalquantity" --></td>
                <td colspan="2">&nbsp;</td>
                <td><!-- TMPL_VAR NAME="grandtot" --></td>
            </tr>
@@ -303,6 +308,7 @@
                 <!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
                 </td>
                 <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>
+                <td><!-- TMPL_VAR NAME="quantityreceived" --></td>
                 <td><!-- TMPL_VAR NAME="ecost" --></td>
                 <td><!-- TMPL_VAR NAME="unitprice" --></td>
                 <td><!-- TMPL_VAR NAME="total" --></td>
@@ -351,3 +357,4 @@
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+