Initial review in upgrading templates to 2.2

diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl
index e04e66b..14794da 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl
@@ -10,11 +10,7 @@
 <caption>Start, Recieve, or Modify Any Order</caption>
 <tr>
        <th><label for="supplier">Supplier ID or Name</label></th>
-       <td>
-               
-               <input type="text" size="25" name="supplier" id="supplier" />
-               
-       </td>
+       <td><input type="text" size="25" name="supplier" id="supplier" /></td>
 </tr>
 </table>
 <input type="submit" class="submit" value="Search" /></form>
@@ -58,6 +54,16 @@
         </form><!-- /TMPL_IF -->
 </div>
 
+<!-- suggestions -->
+<div class="details">
+       <h3>Pending Suggestions</h3>
+               <!-- TMPL_IF name="suggestion" -->
+                       <!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Manage Suggestions</a>
+               <!-- TMPL_ELSE -->
+                       No suggestions waiting
+               <!-- /TMPL_IF -->
+</div>
+
 <!-- showbudget-->
        <div class="table"><table>
                <caption>Budgets and Bookfunds</caption>
@@ -78,11 +84,13 @@
                                </tr>
                        <!-- /TMPL_LOOP -->
                        <tr>
-                               <td><b>Total</b></td>
-                               <td><b><!-- TMPL_VAR name="total" --></b></td>
-                               <td><b><!-- TMPL_VAR name="totspent" --></b></td>
-                               <td><b><!-- TMPL_VAR name="totcomtd" --></b></td>
-                               <td><b><!-- TMPL_VAR name="totavail" --></b></td>
+                               <tfoot>
+                               <td>Total</td>
+                               <td><!-- TMPL_VAR name="total" --></td>
+                               <td><!-- TMPL_VAR name="totspent" --></td>
+                               <td><!-- TMPL_VAR name="totcomtd" --></td>
+                               <td><!-- TMPL_VAR name="totavail" --></td>
+                               </tfoot>
                        </tr>
                </table></div>
 <p>            Use your reload button [ctrl + r] to get the most recent figures.

diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl
index 38f5e65..9596835 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl
@@ -3,56 +3,89 @@
 <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
 
 <div id="main">
-<h1>Shopping Basket <!-- TMPL_VAR name="basket" --> for <a href="supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->"><!-- TMPL_VAR name="name" --></a> </h1>
-<h4>(Our Reference: <!-- TMPL_VAR name="entrydate" -->, #<!-- TMPL_VAR name="basket" -->, authorised by: <!-- TMPL_VAR name="loggedinusername" -->)</h4>
-
-
-<table>
-       <tr>
-               <th>Order</th>
-               <th>Isbn</th>
-               <th>Title</th>
-               <th>Author</th>
-               <th>$ rrp</th>
-               <th>$est</th>
-               <th>Qty</th>
-               <th>Total</th>
-       </tr>
-       <!-- TMPL_LOOP name="books_loop" -->
-               <tr bgcolor="<!-- TMPL_VAR name="color" -->">
-                       <td><!-- TMPL_VAR name="ordernumber" --></td>
-                       <td><!-- TMPL_VAR name="isbn" --></td>
-                       <td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&amp;id=<!-- TMPL_VAR name="booksellerid" -->&amp;basket=<!-- TMPL_VAR name="basket" -->"><!-- TMPL_VAR name="title" --></a></td>
-                       <td><!-- TMPL_VAR name="author" --></td>
-                       <td><!-- TMPL_VAR name="rrp" --></td>
-                       <td><!-- TMPL_VAR name="ecost" --></td>
-                       <td><!-- TMPL_VAR name="quantity" --></td>
-                       <td><!-- TMPL_VAR name="line_total" --></td>
-               </tr>
-       <!-- /TMPL_LOOP -->
-       <input type="hidden" name="number" value="<!-- TMPL_VAR name="count" -->" />
-       <input type="hidden" name="basketno" value="<!-- TMPL_VAR name="basket" -->" />
-       <tr>
-               <td colspan="6" rowspan="3">
-                       <b>HELP</b>
-                       <p>To change any of the catalogue or accounting information attached to an order,  click on the title.</p>
-               </td>
-               <th>SubTotal</th>
-               <td><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR name="sub_total" --></td>
-       </tr>
-       <tr>
-               <th>GST</th>
-               <td><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR name="gist" --></td>
-       </tr>
-       <tr>
-               <th>TOTAL</th>
-               <td><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR name="grand_total" --></td>
-       </tr>
-</table>
-<p>                    <form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
-                               <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-                               <input type="hidden" name="basket" value="<!-- TMPL_VAR name="basket" -->" />
-                       Add order : enter keyword or title: <input type="text"  size="25" name="search"> <input type="submit" class="submit" value="Submit" />
-                       </form></p>
+       <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
+       <!-- TMPL_UNLESS name="closedate" -->
+               <div class="details">
+                       <table>
+                       <caption>Basket Details</caption>
+                       <tr><th>Basket Number:</th><td><!-- TMPL_VAR NAME="basketno" --></td></tr>
+                       <tr><th>Managed By:</th><td><!-- TMPL_VAR NAME="authorisedbyname" --></td></tr>
+                       <tr><th>Open On:</th><td><!-- TMPL_VAR NAME="creationdate" --></td></tr>
+                       <tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR NAME="booksellerid" --></td></tr>
+                       <tr><th>Invoice Number:</th><td><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></td></tr>
+                       <!-- TMPL_IF name="closedate" --><tr><th>Closed On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- TMPL_ELSE -->
+                       <tr><tfoot><td colspan="2"><form action="/cgi-bin/koha/acqui/order.pl" method="get"><input type="hidden" name="op" value="close" /><input type="hidden" name="basket" value="<!-- TMPL_VAR NAME="basketno" -->" /><input type="hidden" name="supplier" value="<!-- TMPL_VAR name="booksellerid" -->" /><input type="submit" class="submit" value="Close this Basket" /></form></td></tfoot></tr><!-- /TMPL_IF -->
+                       </table>
+               </div>
+       <!-- /TMPL_UNLESS -->
+       <div class="details">
+       <!-- TMPL_IF name="books_loop" -->
+               <table>
+                       <caption>Order Details</caption>
+                       <tr>
+                               <th>Order</th>
+                               <th>Publisher <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">[order]</a></th>
+                               <th>ISBN</th>
+                               <th>Title</th>
+                               <th>Author</th>
+                               <th>rrp</th>
+                               <th>est</th>
+                               <th>Qty</th>
+                               <th>Total</th>
+                               <th>Fund <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]</a></th>
+                       </tr>
+                       <!-- TMPL_LOOP NAME="books_loop" -->
+                               <tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+                                       <td><!-- TMPL_VAR NAME="ordernumber" --></td>
+                                       <td><!-- TMPL_VAR NAME="publishercode" --></td>
+                                       <td><!-- TMPL_VAR NAME="isbn" --></td>
+                                       <td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+                                       <td><!-- TMPL_VAR NAME="author" --></td>
+                                       <td><!-- TMPL_VAR NAME="rrp" --></td>
+                                       <td><!-- TMPL_VAR NAME="ecost" --></td>
+                                       <td><!-- TMPL_VAR NAME="quantity" --></td>
+                                       <td><!-- TMPL_VAR NAME="line_total" --></td>
+                                       <td><!-- TMPL_VAR NAME="bookfundid" --></td>
+                               </tr>
+                       <!-- /TMPL_LOOP -->
+                       <input type="hidden" name="number" value=<!-- TMPL_VAR NAME="count" -->>
+                       <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
+                       <tr>
+                               <td colspan="7" rowspan=3>
+                                       &nbsp;
+                               </td>
+                               <th>SubTotal</th>
+                               <th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="sub_total" --></th>
+                       </tr>
+                       <tr>
+                               <th>GST</th>
+                               <th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="gist" --></th>
+                       </tr>
+                       <tr>
+                               <th>TOTAL</th>
+                               <th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="grand_total" --></th>
+                       </tr>
+               </table>
+       <!-- TMPL_ELSE -->
+               <table>
+                       <caption>Order Details</caption>
+                       <tr><td>Basket empty</td></tr>
+               </table>
+       <!-- /TMPL_IF -->
+       </div>
+       <!-- TMPL_UNLESS name="closedate" -->
+       <div class="details">
+               <h2>Add To Order</h2>
+               <form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
+                       <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
+                       <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
+                       <ul><li>From an existing record: <input type="text"  size="25"   name="search"><input type="submit" value="Search" class="submit"></li>
+                       <li><a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
+                       <li><a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">New Record</a></li>
+                       </ul>
+               </form>
+       </div>
+       <!-- /TMPL_UNLESS -->
 </div>
+
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl
index 51453a9..97721c2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl
@@ -24,17 +24,16 @@ function update(f){
   ecost=rrp*(100-discount)/100
   GST=0;
   if (gst_on){
-    rrp=rrp*(1+<!-- TMPL_VAR name="gstrate" -->);
-    GST=ecost*(<!-- TMPL_VAR name="gstrate" -->);
+    rrp=rrp*(1+<!-- TMPL_VAR NAME="gstrate" -->);
+    GST=ecost*(<!-- TMPL_VAR NAME="gstrate" -->);
   }
 
   total=(ecost+GST)*quantity
 
-
-  f.rrp.value=rrp
-  f.ecost.value=ecost
-  f.GST.value=GST
-  f.total.value=total
+  f.rrp.value=rrp;
+  f.ecost.value=ecost;
+  f.GST.value=GST;
+  f.total.value=total;
 
 }
 
@@ -44,118 +43,79 @@ function messenger(X,Y,etc){
 win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
 win.focus();
 win.document.close();
-win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size=2><p><br>");
+win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br>");
 win.document.write(etc);
-win.document.write("<center><form><input type=button onclick='self.close()' value=Close></form></center>");
+win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
 win.document.write("</font></body></html>");
 }
 //-->
 
 </script>
-<div id="main"><form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin" />
-<!-- TMPL_UNLESS name="existing" --><input type="hidden" name="existing" value="no" /><!-- /TMPL_UNLESS -->
-<!-- <!-- TMPL_VAR name="title" --> -->
-<input type="hidden" name="ordnum" value="<!-- TMPL_VAR name="ordnum" -->" />
-<input type="hidden" name="basket" value="<!-- TMPL_VAR name="basket" -->" />
-<input type="hidden" name="supplier" value="<!-- TMPL_VAR name="id" -->" />
-<input type="hidden" name="biblio" value="<!-- TMPL_VAR name="biblio" -->" />
-<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR name="biblioitemnumber" -->" />
-<input type="hidden" name="oldtype" value="<!-- TMPL_VAR name="itemtype" -->" />
-<input type="hidden" name="discount" value="<!-- TMPL_VAR name="discount" -->" />
-<input type="hidden" name="listinc" value="<!-- TMPL_VAR name="listincgst" -->" />
-<input type="hidden" name="currency" value="<!-- TMPL_VAR name="currency" -->" />
-<input type="hidden" name="applygst" value="<!-- TMPL_VAR name="gstreg" -->" />
-<!-- TMPL_LOOP name="loop_currencies" -->
-       <input type="hidden" name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->" />
-<!-- /TMPL_LOOP -->
-<!-- TMPL_IF name="orderexists" --><input type="hidden" name="orderexists" value="yes" /><!-- /TMPL_IF -->
-
-<h1><!-- TMPL_VAR name="ordnum" --> - Order Details </h1>
-<h2>Shopping Basket For: <!-- TMPL_VAR name="name" --></h2>
-<a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">View Basket</a>
-<div class="details"><table>
-       <caption>Catalogue Details</caption>
-       <tr>
-               <th>Title *</th>
-               <td><input type="text" size="20" name="title" value="<!-- TMPL_VAR name="title" -->" /></td>
-       </tr>
-       <tr>
-               <th>Author</th>
-               <td><input type="text" size="20" name="author" value="<!-- TMPL_VAR name="author" -->" /></td>
-       </tr>
-       <tr>
-       <th>Copyright Date</th>
-       <td><input type="text" size="20" name="copyright" value="<!-- TMPL_VAR name="copyrightdate" -->" />
-       </td>
-       </tr>
-       <tr>
-               <th>Format</th>
-               <td><!-- TMPL_VAR name="CGIitemtype" --></td>
-       </tr>
-       <tr>
-               <th>ISBN</th>
-               <td><input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR name="isbn" -->"></td>
-       </tr>
-       <tr>
-               <th>Series</th>
-               <td><input type="text" size="20" name="Series" value="<!-- TMPL_VAR name="seriestitle" -->"></td>
-       </tr>
-       <tr valign="top">
-               <th>Branch</th>
-               <td><!-- TMPL_VAR name="CGIbranch" --></td>
-       </tr>
-</table></div>
-
-<div class="details"><table>
-       <caption>Accounting Details</caption>
-       <tr>
-               <th>Quantity</th>
-               <td><input type="text" size="20" name="quantity" value="<!-- TMPL_VAR name="quantity" -->" onchange="update(this.form)" /></td>
-       </tr>
-       <tr>
-               <th>Bookfund</th>
-               <td><!-- TMPL_VAR name="CGIbookfund" --></td>
-       </tr>
-       <tr>
-               <th>Suppliers List Price</th>
-               <td><input type="text" size="20" name="list_price" value="<!-- TMPL_VAR name="listprice" -->" onchange="update(this.form)" /></td>
-       </tr>
-       <tr>
-               <th>Replacement Cost <br><FONT SIZE=2></th>
-               <td><input type="text" size="20" name="rrp" value="<!-- TMPL_VAR name="rrp" -->" onchange="update(this.form)" />
-       </tr>
-       <tr>
-               <th>Budgeted Cost<BR><FONT SIZE=2>(ex GST, inc discount)</FONT> </th>
-               <td><input type="text" size="20" name="ecost" value="<!-- TMPL_VAR name="ecost" -->" onchange="update(this.form)" /></td>
-       </tr>
-       <tr>
-               <th>Budgeted GST</th>
-               <td><input type="text" size="20" name="GST" value="" onchange="update(this.form)"></td>
-       </tr>
-       <tr>
-               <th><B>BUDGETED TOTAL</B></th>
-               <td><input type="text" size="20" name="total" value="" onchange="update(this.form)"></td>
-       </tr>
-       <tr class="highlight">
-               <th>Actual Cost</th>
-               <td><input type="text" size="20" name="cost" /></td>
-       </tr>
-       <tr class="highlight">
-               <th>Invoice Number *</th>
-               <td><input type="text" size="20" name="invoice" /></td>
-       <tr>
-               <th>Notes</th>
-               <td><input type="text" size="20" name="notes" value="<!-- TMPL_VAR name="notes" -->" /></td>
-       </tr>
-</table></div>
-<input type="submit" value="Submit" class="submit" />
-</form>
-<div class="notice"><h3>HELP</h3>
-<UL>
-<LI><B>Bold</B> fields must be filled in to create a new bibilo and item.<p>
-<LI>Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also  be entered into the database as the quantity received.
-</UL>
-</div></div>
+<div id="main">
+<form action="basket.pl" method="get" style="float: right"><input type="hidden" name="basket" value="<!-- TMPL_VAR NAME="basket" -->" /><input type="submit" value="View Basket" class="submit" /></form>
+       <form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
+       <!-- TMPL_UNLESS name="existing" --><input type="hidden" name="existing" value="no" /><!-- /TMPL_UNLESS -->
+       <!-- <!-- TMPL_VAR NAME="title" --> -->
+       <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordnum" -->" />
+       <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
+       <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
+       <input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblio" -->" />
+       <input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
+       <input type="hidden" name="oldtype" value="<!-- TMPL_VAR NAME="itemtype" -->" />
+       <input type="hidden" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" />
+       <input type="hidden" name="listinc" value="<!-- TMPL_VAR NAME="listincgst" -->" />
+       <input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->" />
+       <input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->">
+       <input type="hidden" name="suggestionid" value="<!-- TMPL_VAR NAME="suggestionid" -->" />
+       <!-- TMPL_LOOP NAME="loop_currencies" -->
+               <input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->" />
+       <!-- /TMPL_LOOP -->
+       
+       <h1><!-- TMPL_IF name="ordnum" -->
+                       Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)
+               <!-- TMPL_ELSE -->
+                       New order
+               <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="suggestionid" -->(created from suggestion #<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
+       </h1>
+       <h2>Shopping Basket For <span class="ex"><!-- TMPL_VAR NAME="name" --></span></h2>
+       <div class="details">
+               <table>
+                       <caption>Catalog Details</caption>
+                       <tr><th><label for="title">Title *</label></th><td><input type="text" size="20" id="title" name="title" value="<!-- TMPL_VAR NAME="title" -->" /></td></tr>
+                       <tr><th><label for="author">Author</label></th><td><input type="text" size="20" id="author" name="author" value="<!-- TMPL_VAR NAME="author" -->" /></td></tr>
+                       <tr><th><label for="publishercode"> Publisher</label></th><td><input type="text" size="30" id="publishercode" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /></td></tr>
+                       <tr><th><label for="copyrightdate">Copyright Date</label></th><td><input type="text" size="20" id="copyrightdate" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /></td></tr>
+                       <tr><th><label for="itemtype">Format</label></th><td><!-- TMPL_VAR NAME="CGIitemtype" --></td></tr>
+                       <tr><th><label for="ISBN">ISBN</label></th><td><input type="text" size="20" id="ISBN" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->"></td></tr>
+               <tr><th><label for="Series">Series</label></th><td><input type="text" size="20" id="Series" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /></td></tr>
+               <tr><th><label for="branch">Branch</label></th><td><!-- TMPL_VAR NAME="CGIbranch" --></td></tr>
+               </table>
+       </div>
+       
+       <div class="details">
+               <table>
+               <caption>Accounting details</caption>
+               <tr><th><label for="quantity">Quantity</label></th><td><input type="text" size="20" id="quantity" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" /></td></tr>
+               <tr><th><label for="bookfund">Bookfund</label></th><td><!-- TMPL_VAR NAME="CGIbookfund" --></td></tr>
+               <tr><th><label for="list_price">Suppliers List Price</label></th><td><input type="text" size="20" id="list_price" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" /></td></tr>
+               <tr><th><label for="rrp">Replacement Cost </label></th><td><input type="text" size="20" id="rrp" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" onchange="update(this.form)" /></td></tr>
+               <tr><th><label for="ecost">Budgeted Cost</label></th><td><input type="text" size="20" id="ecost" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" onchange="update(this.form)" /></td></tr>
+               <tr><th><label for="GST">Budgeted GST</label></th><td><input type="text" size="20" id="GST" name="GST" value="" onchange="update(this.form)" /></td></tr>
+               <tr><th><label for="total"><strong>BUDGETED TOTAL</strong></label></th><td><input type="text" size="20" id="total" name="total" value="" onchange="update(this.form)" /></td></tr>
+               <tr><th><label for="cost">Actual Cost</label></th><td><input type="text" size="20" id="cost" name="cost" value="<!-- TMPL_VAR name="ecost"-->" /></td></tr>
+               <tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
+               <tr><th><label for="notes">Notes</label></th><td><input type="text" size="20" id="notes" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
+               <tr><th><label for="sort1">Sort field 1</label></th><td><input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" /></td></tr>
+               <tr><th><label for="sort2">Sort field 2</label></th><td><input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" /></td></tr>
+               </table></div>  <p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p> 
+               <p>
+                       <input type="submit" value="Submit" class="submit" />
+               </p>
+               
+       </form>
+       
+</div>
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
 
 

diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl
index e5cf910..1d293ab 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl
@@ -6,17 +6,17 @@
 <table>
 <caption>Supplier Search Results</caption>
 <tr>
-       <th>Order</th>
-       <th>Receive</th>
+       <th colspan="2">Action</th>
        <th>Company</th>
        <th>
                <table>
-                       <tr>
-                               <th>Basket</th>
-                               <th>Items</th>
-                               <th>Staff</th>
-                               <th>Date</th>
-                       </tr>
+                                       <tr>
+                                               <th>Basket</th>
+                                               <th>Items</th>
+                                               <th>Created by</th>
+                                               <th>Date</th>
+                                               <th>&nbsp;</th>
+                                       </tr>
                </table>
        </th>
 </tr>
@@ -24,23 +24,34 @@
 <!-- TMPL_LOOP name="loop_suppliers" -->
        <tr>
                <td>
-                       <a href="basket.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="Add order" ALT="Add" border="0" ></a>
+                       <a href="basket.pl?id=<!-- TMPL_VAR name=supplierid -->">Add</a>
                </td>
                <td>
-                       <a href="recieveorder.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_get.png" title="receive" ALT="Add" border="0" ></a>
+                       <a href="recieveorder.pl?id=<!-- TMPL_VAR name=supplierid -->">Receive</a>
                </td>
-               <td><a href="supplier.pl?id=<!-- TMPL_VAR name=id -->"><!-- TMPL_VAR name="name" --></a></td>
+               <td><a href="supplier.pl?id=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
                <td>
-                       <table>
-                               <!-- TMPL_LOOP name="loop_basket" -->
-                                       <tr>
-                                               <td><a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR name="basketno" --></a></td>
-                                               <td><TMPl_VAR name="total"></td>
-                                               <td><!-- TMPL_VAR name="authorisedby" --></td>
-                                               <td><!-- TMPL_VAR name="entrydate" --></td>
-                                       </tr>
-                               <!-- /TMPL_LOOP -->
-                       </table>
+<table>
+                                       <!-- TMPL_LOOP NAME="loop_basket" -->
+                                               <tr>
+                                                       <td><!-- TMPL_VAR NAME="basketno" --></a></td>
+                                                       <td><TMPL_VAR NAME="total"></td>
+                                                       <td>
+                                                               <!-- TMPL_VAR name="firstname" -->
+                                                                       <!-- TMPL_VAR name="surname" -->
+                                                       </td>
+                                                       <td><!-- TMPL_VAR NAME="creationdate" --></td>
+                                                       <td>
+                                                               <!-- TMPL_IF name="closedate" -->
+                                                                       closed on <!-- TMPL_VAR NAME="closedate" -->
+                                                                       <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->">View</a>
+                                                               <!-- TMPL_ELSE -->
+                                                                       <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->">Modify</a>
+                                                               <!-- /TMPL_IF -->
+                                                       </td>
+                                               </tr>
+                                       <!-- /TMPL_LOOP -->
+                               </table>
        </tr>
 <!-- /TMPL_LOOP -->
 </table>