projects / koha_fer / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
More fixes for Bug 2600, enabling the appearance of HTML tags in item titles. Resubmi...
[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / parcel.tmpl
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 9dda33e..d6e5c2c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Acquisitions &rsaquo; <!-- TMPL_IF name="date" -->
-            Receipt Summary for <!-- TMPL_VAR NAME="name" --> <!--TMPL_IF Name="invoice"-->Parcel <!-- TMPL_VAR NAME="invoice" --><!--/TMPL_IF --> on <!-- TMPL_VAR NAME="date" --><!-- TMPL_ELSE -->Orders not yet Received for <!-- TMPL_VAR NAME="name" --><!-- /TMPL_IF --></title>
+            Receipt Summary for <!-- TMPL_VAR NAME="name" --> <!--TMPL_IF Name="invoice"-->Invoice <!-- TMPL_VAR NAME="invoice" --><!--/TMPL_IF --> on <!-- TMPL_VAR NAME="formatteddatereceived" --><!-- TMPL_ELSE -->Receive Orders from <!-- TMPL_VAR NAME="name" --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="greybox.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
@@ -8,10 +8,10 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  <!-- TMPL_IF name="date" -->
-            Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> <!--TMPL_IF Name="invoice"-->Parcel <i><!-- TMPL_VAR NAME="invoice" --></i><!--/TMPL_IF --> on <i><!-- TMPL_VAR NAME="date" --></i>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  <!-- TMPL_IF name="datereceived" -->
+            Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> <!--TMPL_IF Name="invoice"--><i>[ <!-- TMPL_VAR NAME="invoice" --> ]</i><!--/TMPL_IF --> on <i><!-- TMPL_VAR NAME="formatteddatereceived" --></i>
         <!-- TMPL_ELSE -->
-            Orders not yet Received for <!-- TMPL_VAR NAME="name" -->
+            Receive orders from <!-- TMPL_VAR NAME="name" -->
         <!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
@@ -19,21 +19,31 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-       
+       <!-- TMPL_IF NAME="receive_error" -->
+       <div class="dialog alert">
+       <h3>Error adding items:</h3>
+       <ul>
+       <!-- TMPL_LOOP NAME="error_loop" -->
+               <li><!-- TMPL_VAR NAME="error_param" --><!-- TMPL_IF NAME="error_duplicate_barcode" -->Duplicate Barcode<!-- /TMPL_IF --> <!-- todo: other error conditions come here. --></li>
+       <!-- /TMPL_LOOP -->
+       </ul>
+       </div>
+       <!-- /TMPL_IF -->
     <h1>
-        <!-- TMPL_IF name="date" -->
-            Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> <!--TMPL_IF Name="invoice"-->Parcel <i><!-- TMPL_VAR NAME="invoice" --></i><!--/TMPL_IF --> on <i><!-- TMPL_VAR NAME="date" --></i>
+        <!-- TMPL_IF name="datereceived" -->
+            Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> <!--TMPL_IF Name="invoice"--> <i> [ <!-- TMPL_VAR NAME="invoice" --> ] </i><!--/TMPL_IF --> on <i><!-- TMPL_VAR NAME="formatteddatereceived" --></i>
         <!-- TMPL_ELSE -->
-            Orders not yet Received for <!-- TMPL_VAR NAME="name" -->
+            Receive orders from <!-- TMPL_VAR NAME="name" -->
         <!-- /TMPL_IF -->
     </h1>
-<div id="acqui_recieve_summary">
-    <p>Parcel: <!-- TMPL_VAR NAME="invoice" --></p>
+<div id="acqui_receive_summary">
+    <p>Invoice number: <!-- TMPL_VAR NAME="invoice" --></p>
     <p>Received by: <!-- TMPL_VAR NAME="loggedinusername" --></p>
-    <p>On: <!-- TMPL_VAR NAME="datereceived" --></p>
+    <p>On: <!-- TMPL_VAR NAME="formatteddatereceived" --></p>
+       <!-- TODO: Add date picker, change rcv date. -->
 </div>
-<div id="acqui_recieve_recievelist">
-    <h2>Items in parcel</h2>
+<div id="acqui_receive_receivelist">
+    <h2>Items in shipment</h2>
     <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
     <table>
         <tr>
@@ -41,35 +51,40 @@
             <th>Basket/Order</th>
             <th>Summary</th>
             <th>View Record</th>
-                       <th>Qty ordered</th>
             <th>Est cost</th>
             <th>Actual cost</th>
             <th>TOTAL</th>
         </tr>
         <!-- TMPL_LOOP NAME="loop_received" -->
             <tr>
-                <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="quantityreceived" --></a></td>
+                <td><!-- TMPL_VAR NAME="quantityreceived" --></td>
                 <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="basketno" --></a>&nbsp; / &nbsp;<!-- TMPL_VAR NAME="ordernumber" --></td>
-                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a>
                 <!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
                 <!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
                 <!-- 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]">View MARC</a></td>
-                               <td><!-- TMPL_VAR NAME="quantity" --></td>
                 <td><!-- TMPL_VAR NAME="ecost" --></td>
                 <td><!-- TMPL_VAR NAME="unitprice" --></td>
                 <td><!-- TMPL_VAR NAME="total" --></td>
             </tr>
         <!-- /TMPL_LOOP -->
         <tr>
-            <th colspan="3">&nbsp;</th>
-            <th>SUBTOTALS</th>
+            <td colspan="3">&nbsp;</td>
+            <th>SUBTOTAL</th>
+            <td>&nbsp;</td>
             <th><!-- TMPL_VAR NAME="totalprice" --></th>
-            <th><!-- TMPL_VAR NAME="totalfreight" --></th>
-            <th><!-- TMPL_VAR NAME="totalquantity" --></th>
             <th><!-- TMPL_VAR NAME="tototal" --></th>
         </tr>
+          <!-- TMPL_IF NAME="totalfreight" -->
+               <tr>
+            <td colspan="5">
+            </td>
+            </p>
+                       <th colspan="1">Shipping</th>
+            <td><!-- TMPL_VAR NAME="totalfreight" --></td>
+        </tr> <!-- /TMPL_IF -->
           <!-- TMPL_IF NAME="gst" -->
                <tr>
             <td colspan="5">
@@ -82,60 +97,55 @@
             <td><!-- TMPL_VAR NAME="gst" --></td>
         </tr> <!-- /TMPL_IF -->
         <tr>
-        <td colspan="5">&nbsp;</td>
-            <td colspan="2"><b>TOTAL</b></td>
-            <td><!-- TMPL_VAR NAME="grandtot" --></td>
+        <td colspan="3">&nbsp;</td>
+            <th>TOTAL</th>
+            <td colspan="2">&nbsp;</td>
+            <th><!-- TMPL_VAR NAME="grandtot" --></th>
         </tr>
     </table>
     </form>
 </div>
-<div id="acqui_recieve_search">
-    <h2>Search orders to add to this parcel</h2>
+<div id="acqui_receive_search">
+    <h2>Search orders to add to this shipment</h2>
     <form action="/cgi-bin/koha/acqui/orderreceive.pl">
         <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
         <input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->" />
         <input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
         <input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
-        <p><label for="recieve">Search ISBN or Title:</label> <input type="text" size="25" id="recieve" name="recieve" /></p>
+        <p><label for="receive">Search ISBN or Title:</label> <input type="text" size="25" id="receive" name="receive" /></p>
     </form>
     <table> <caption>or select a pending orders</caption>
         <tr>
             <th>BASKET</th>
             <th>Summary</th>
                        <th>View Record</th>
-            <th>Order qty</th>
+            <th>Still on order</th>
+            <th>Unit cost</th>
             <th>Order cost</th>
-            <th>Already Received </th>
-            <th>Received cost</th>
+            <th>&nbsp;</th>
         </tr>
         <!-- TMPL_LOOP NAME="loop_orders" -->
             <tr>
                 <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="basketno" --></a></td>
                 <td>
-                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
-                  <!-- TMPL_VAR NAME="title" --></a>
+                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a>
                 <!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
                 <!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
                 <!-- 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&id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
-                               <td><!-- TMPL_VAR NAME="quantity" --></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="quantity" --></td>
                 <td><!-- TMPL_VAR NAME="ecost" --></td>
-                <td><!-- TMPL_IF name="quantityreceived" -->
-                        <!-- TMPL_VAR NAME="quantityreceived" --> <a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->">More</a>
-                    <!-- TMPL_ELSE -->
-                        <a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->">Receive</a>
-                    <!-- /TMPL_IF -->
-                </td>
-                <td><!-- TMPL_IF EXPR="unitprice ne '0.00'" --><!-- TMPL_VAR NAME="unitprice" --><!-- /TMPL_IF --></td>
+                <td><!-- TMPL_VAR NAME="ordertotal" --></td>
+                               <td><a href="orderreceive.pl?receive=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;datereceived=<!-- TMPL_VAR NAME="invoicedatereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->">Receive order</a></td>
             </tr>
         <!-- /TMPL_LOOP -->
-            <tr>
-                <th colspan="3">TOTAL</th>
-                <th><!-- TMPL_VAR NAME="totalPquantity" --></th>
-                <th><!-- TMPL_VAR NAME="totalPecost" --></th>
-                <th><!-- TMPL_VAR NAME="quantityreceived" --></th>
-                <th><!-- TMPL_VAR NAME="totalPunitprice" --></th>
+            <tr><td colspan="2">&nbsp;</td>
+                <th>TOTAL</th>
+                <th> <!-- TMPL_VAR NAME="totalPquantity" --> </th>
+                               <td>&nbsp;</td>
+                <th><!-- TMPL_VAR NAME="ordergrandtotal" --></th>
+                               <td>&nbsp;</td>
             </tr>
      </table>
 </div>
Unnamed repository; edit this file 'description' to name the repository.