prog templates : completed, fixed & xhtml valid
authortipaul <tipaul>
Wed, 18 Jan 2006 15:38:17 +0000 (15:38 +0000)
committertipaul <tipaul>
Wed, 18 Jan 2006 15:38:17 +0000 (15:38 +0000)
13 files changed:
acqui/acquire.pl
koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl
koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl
koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl
koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl
koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl [new file with mode: 0644]

index 44facdf..a5986c2 100755 (executable)
@@ -26,13 +26,9 @@ use strict;
 use CGI;
 use C4::Context;
 use C4::Acquisition;
-use C4::Biblio;
-use C4::Output;
-use C4::Search;
+use C4::Koha;
 use C4::Auth;
 use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
 use C4::Date;
 
 my $input=new CGI;
@@ -65,39 +61,15 @@ my ($flags, $homebranch)=$sthtemp->fetchrow;
 
 if ($count == 1){
        my $sth;
-#      my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
-#      $sth->execute;
-#      my  @itemtype;
-#      my %itemtypes;
-#      push @itemtype, "";
-#      $itemtypes{''} = "Please choose";
-#      while (my ($value,$lib) = $sth->fetchrow_array) {
-#              push @itemtype, $value;
-#              $itemtypes{$value}=$lib;
-#      }
-# 
-#      my $CGIitemtype=CGI::scrolling_list( -name     => 'format',
-#                              -values   => \@itemtype,
-#                              -default  => $results[0]->{'itemtype'},
-#                              -labels   => \%itemtypes,
-#                              -size     => 1,
-#                              -multiple => 0 );
-#      $sth->finish;
 
-       my @branches;
-       my @select_branch;
-       my %select_branches;
-       my ($count2,@branches)=branches();
-       for (my $i=0;$i<$count2;$i++){
-               push @select_branch, $branches[$i]->{'branchcode'};#
-               $select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
+       my $branches = getbranches;
+       my @branchloop;
+       foreach my $thisbranch (sort keys %$branches) {
+               my %row =(value => $thisbranch,
+                                       branchname => $branches->{$thisbranch}->{'branchname'},
+                               );
+               push @branchloop, \%row;
        }
-       my $CGIbranch=CGI::scrolling_list( -name     => 'branch',
-                               -values   => \@select_branch,
-                               -default  => $results[0]->{'branchcode'},
-                               -labels   => \%select_branches,
-                               -size     => 1,
-                               -multiple => 0 );
 
        my $auto_barcode = C4::Context->boolean_preference("autoBarcode") || 0;
                # See whether barcodes should be automatically allocated.
@@ -111,21 +83,6 @@ if ($count == 1){
                $sth->finish;
        }
 
-#      my @bookfund;
-#      my @select_bookfund;
-#      my %select_bookfunds;
-#      ($count2,@bookfund)=bookfunds();
-#      for (my $i=0;$i<$count2;$i++){
-#              push @select_bookfund, $bookfund[$i]->{'bookfundid'};
-#              $select_bookfunds{$bookfund[$i]->{'bookfundid'}} = $bookfund[$i]->{'bookfundname'}
-#      }
-#      my $CGIbookfund=CGI::scrolling_list( -name     => 'bookfund',
-#                              -values   => \@select_bookfund,
-#                              -default  => $results[0]->{'bookfundid'},
-#                              -labels   => \%select_bookfunds,
-#                              -size     => 1,
-#                              -multiple => 0 );
-
        if ($results[0]->{'quantityreceived'} == 0){
        $results[0]->{'quantityreceived'}='';
        }
@@ -133,6 +90,7 @@ if ($count == 1){
        $results[0]->{'unitprice'}='';
        }
        $template->param(
+               branchloop => \@branchloop,
                count => 1,
                biblionumber => $results[0]->{'biblionumber'},
                ordernumber => $results[0]->{'ordernumber'},
@@ -147,7 +105,6 @@ if ($count == 1){
                author => $results[0]->{'author'},
                copyrightdate => format_date($results[0]->{'copyrightdate'}),
                itemtype => $results[0]->{'itemtype'},
-               CGIbranch => $CGIbranch,
                isbn => $results[0]->{'isbn'},
                seriestitle => $results[0]->{'seriestitle'},
                barcode => $barcode,
index ac4b457..468b034 100644 (file)
@@ -1,80 +1,70 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
 <h1>Acquisitions</h1>
        <!-- TMPL_IF name="nobudget" -->
                You must define a budget in parameters
        <!-- TMPL_ELSE -->
-
-<form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
-<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>
-</tr>
-</table>
-<input type="submit" value="Search" /></form>
-<p>    <form action="histsearch.pl" method="get"><input type="submit" value="Search Order History" /></form></p>
+<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+       <h2>Start, Recieve, or Modify Any Order</h2>
+       <p><label for="supplier">Supplier ID or Name</label><input type="text" size="25" name="supplier" id="supplier" /></p>
+       <input type="submit" value="Search" />
+</form>
+       <form action="histsearch.pl" method="get">
+               <input type="submit" value="Search Order History" />
+       </form>
 
 <!-- /TMPL_IF -->
 
-
-<form action="/cgi-bin/koha/acqui/acquire.pl" method="post"><table>
-<caption>Receive or Modify a Periodical Order</caption>
-<tr>
-       <th><label for="recieve">Title Search</label></th>
-       <td>
-               
-               <input type="text"  size="25" name="recieve" id="recieve" />
-               
-       </td>
-</tr>
-</table>
-<input type="submit" value="Search" /></form>
-
-
 <!-- currencies-->
 
 <!-- TMPL_IF NAME="loop_currency" -->
-<table>
-       <caption>Exchange Rates</caption>
-
-       <!-- TMPL_LOOP name="loop_currency" -->
+       <form action="/cgi-bin/koha/currency.pl">
+       <h2>Exchange Rates</h2>
+       <table>
                <tr>
-                       <th>
-                               <label for="<!-- TMPL_VAR name="currency" -->"><!-- TMPL_VAR name="currency" --></label>
-                       </th>
-                       <td>    <form action="/cgi-bin/koha/currency.pl">
-       <input type="hidden" name="type" value="change" />
-                               <input type="text" size="10" id="<!-- TMPL_VAR name="currency" -->" name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->" />   </form>
-                       </td>
+                       <th>Currency</th>
+                       <th>Rate</th>
                </tr>
-       <!-- /TMPL_LOOP -->
-</table><input type="submit" value="Save Exchange Rate" />
-<!-- TMPL_ELSE --><form action="/cgi-bin/koha/admin/currency.pl" method="post">
-        <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Currency" />
-
-        </form><!-- /TMPL_IF -->
+               <!-- TMPL_LOOP name="loop_currency" -->
+                       <tr>
+                               <td>
+                                       <label for="<!-- TMPL_VAR name="currency" -->"><!-- TMPL_VAR name="currency" --></label>
+                               </td>
+                               <td>
+                                               <input type="hidden" name="type" value="change" />
+                                               <input type="text" size="10" id="<!-- TMPL_VAR name="currency" -->" name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->" />
+                               </td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+       </table>
+       <input type="submit" value="Save Exchange Rate" />
+       </form>
+<!-- TMPL_ELSE -->
+       <form action="/cgi-bin/koha/admin/currency.pl" method="post">
+       <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Currency" />
+       </form>
+<!-- /TMPL_IF -->
 
 
 <!-- suggestions -->
 
-       <h3>Pending Suggestions</h3>
+       <h2>Pending Suggestions</h2>
                <!-- 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
+                       <p>No suggestions waiting</p>
                <!-- /TMPL_IF -->
 
 
 <!-- showbudget-->
        
                <!-- TMPL_IF name="nobudget" -->
-               You must define a budget in parameters
+               <p>You must define a budget in parameters</p>
        <!-- TMPL_ELSE -->
+       <h2>Budgets and Bookfunds</h2>
        <table>
-               <caption>Budgets and Bookfunds</caption>
                        <tr>
                                <th>Budgets</th>
                                <th>Total</th>
                                </tr>
                        <!-- /TMPL_LOOP -->
                        <tr>
-                               <tfoot>
-                               <td>Total</td>
+                               <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><!-- /TMPL_IF -->
-<p>            Use your reload button [ctrl + r] to get the most recent figures.
-               Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
-
 
-               <h4>Help</h4> <p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which  will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).</p>
-               <p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.  </p>
-               <p>To start a new shopping basket with a new supplier return to this page and just start a new supplier search.</p>
-               <p>To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".</p>
+<p>Use your reload button [ctrl + r] to get the most recent figures.
+Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
 
+<h2>Help</h2>
+<p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which  will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).</p>
+<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.  </p>
+<p>To start a new shopping basket with a new supplier return to this page and just start a new supplier search.</p>
+<p>To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".</p>
 
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
index 147cf6a..b54d079 100644 (file)
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
 
 <h1>Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --></h1>
        <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
        <h1><!-- TMPL_VAR NAME="ordernumber" --> - Receive Order</h1>
        <ul><li>Shopping Basket For: <!-- TMPL_VAR NAME="name" --></li>
-               <li>Order placed: <!-- TMPL_VAR NAME="date" --></li>
+               <li>Order placed on: <!-- TMPL_VAR NAME="date" --></li>
        </ul>
 
-       <table>
-       <caption>Catalogue Details</caption>
-               <tr>
-                       <td>Title *</td>
-                       <td><input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>Author</td>
-                       <td><input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>Copyright Date</td>
-                       <td><input type="text" size="20" name="copyright" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>Format</td>
-                       <td><!-- TMPL_VAR NAME="CGIitemtype" --></td>
-               </tr>
-               <tr>
-                       <td>ISBN</td>
-                       <td><input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /></td>
-               </tr>
-               <tr>
-                       <td>Series</td>
-                       <td><input type="text" size="20" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /></td>
-               </tr>
-               <tr>
-                       <td>Branch</td>
-                       <td><!-- TMPL_VAR NAME="CGIbranch" --></td>
-               </tr>
-               <tr>
-                       <td>Item Barcode *</td>
-                       <td><input type="text" size="20" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" /></td>
-               </tr>
-               <tr>
-                       <td>Volume Info (for serials) *</td>
-                       <td><input type="text" size="20" name="volinf" /></td>
-               </tr>
-               <tr>
-                       <td colspan="2">
-                               <input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-                               <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
-                               <input type="hidden" name="biblioitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
-                               <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
-                               <input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
-                               <input type="hidden" name="gst" "value"="<!-- TMPL_VAR NAME="gst" -->" />
-                               <!-- TMPL_IF name="catview" -->
-                                       <input type="submit"  name="submit" value="Save" />
-                               <!-- TMPL_ELSE -->
-                                       <a href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
-                               <!-- /TMPL_IF -->
-                       </td>
-               </tr>
-       </table>
-       <table>
-       <caption>Accounting Details</caption>
-               <tr>
-                       <td>Bookfund *</td>
-                       <td><!-- TMPL_VAR NAME="CGIbookfund" -->
-               </tr>
-               <tr>
-                       <td>Quantity Ordered</td>
-                       <td><input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>Quantity Received *</td>
-                       <td><input type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>Replacement Cost</td>
-                       <td><input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
-               </tr>
-               <tr>
-                       <td>Budgeted Cost </td>
-                       <td><input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></td>
-               </tr>
-               <tr>
-                       <td>Actual Cost *</td>
-                       <td><input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->" /></td>
-               </tr>
-               <tr>
-                       <td>Invoice Number</td>
-                       <td>
-                               <!-- TMPL_VAR NAME="invoice" -->
-                               <input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>Notes</td>
-                       <td><input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td>
-               </tr>
-       </table>
+       <h2>Catalogue Details</h2>
+       <p><label>Title *</label><input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" /></p>
+       <p><label>Author</label><input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" /></p>
+       <p><label>Copyright Date</label><input type="text" size="20" name="copyright" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /></p>
+       <p><label>Format</label><!-- TMPL_VAR NAME="CGIitemtype" --></p>
+       <p><label>ISBN</label><input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /></p>
+       <p><label>Series</label><input type="text" size="20" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /></p>
+       <p><label>Branch</label>
+                       <select name="branch">
+                       <!-- TMPL_LOOP name="branchloop" -->
+                               <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="branchname" --></option>
+                       <!-- /TMPL_LOOP -->
+                       </select>
+       </p>
+       <p><label>Item Barcode *</label><input type="text" size="20" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" /></p>
+       <p><label>Volume Info (for serials) *</label><input type="text" size="20" name="volinf" /></p>
+       <input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+       <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
+       <input type="hidden" name="biblioitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
+       <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
+       <input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
+       <input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->" />
+       <!-- TMPL_IF name="catview" -->
+               <input type="submit"  name="submit" value="Save" />
+       <!-- TMPL_ELSE -->
+               <a href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
+       <!-- /TMPL_IF -->
+       <h2>Accounting Details</h2>
+               <p><label>Bookfund *</label><!-- TMPL_VAR NAME="CGIbookfund" --></p>
+               <p><label>Quantity Ordered</label><input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /></p>
+               <p><label>Quantity Received *</label><input type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /></p>
+               <p><label>Replacement Cost</label><input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /></p>
+               <p><label>Budgeted Cost </label><input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></p>
+               <p><label>Actual Cost *</label><input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->" /></p>
+               <p><label>Invoice Number</label><!-- TMPL_VAR NAME="invoice" --><input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" /></p>
+               <p><label>Notes</label><input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></p>
        </form>
 
 <!-- TMPL_ELSE -->
index 9d50dcf..50f8f82 100644 (file)
@@ -1,25 +1,35 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
        <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_VAR NAME="basketno" --> for <a href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
        <!-- TMPL_UNLESS name="closedate" -->
                
+                       <h2>Basket Details</h2>
                        <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_IF -->
-                       </table><!-- TMPL_UNLESS name="closedate" --><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" value="Close this Basket" /></form><!-- /TMPL_UNLESS -->
+                       </table>
+                       <!-- TMPL_UNLESS name="closedate" -->
+                       <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" value="Close this Basket" />
+                       </form>
+                       <!-- /TMPL_UNLESS -->
                
        <!-- /TMPL_UNLESS -->
        
        
+       <h2>Order Details</h2>
        <!-- TMPL_IF name="books_loop" -->
                <table>
-                       <caption>Order Details</caption>
                        <tr>
                                <th scope="col">Order</th>
                                <th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
                                        <!-- TMPL_IF name="active" -->
                                        <!-- TMPL_UNLESS name="closedate" -->
                                        <td>
-                                                       <form action="addorder.pl" method="get"><input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" /><input type="hidden" name="quantity" value="0" /><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="delete" value="Delete" /></form>
+                                                       <form action="addorder.pl" method="get">
+                                                               <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
+                                                               <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
+                                                               <input type="hidden" name="quantity" value="0" />
+                                                               <input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+                                                               <input type="submit" class="delete" value="Delete" />
+                                                       </form>
                                                </td>
                                        <!-- /TMPL_UNLESS -->
                                                <!-- /TMPL_IF -->
@@ -74,7 +90,9 @@
                        
                        <tr>
                                <td colspan="2" rowspan="3">
-<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />  </td>
+                                       <input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
+                                       <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
+                               </td>
                                <th>SubTotal</th>
                                <th><!-- TMPL_VAR NAME="sub_total_est" --></th>
                                <th><!-- TMPL_VAR NAME="sub_total" --></td>
                </table>
        <!-- TMPL_ELSE -->
                <table>
-                       <caption>Order Details</caption>
                        <tr><td>Basket empty</td></tr>
                </table>
        <!-- /TMPL_IF -->
        
                <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"></li>
+                       <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" /></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>
index 50e5621..d1ab45c 100644 (file)
@@ -1,8 +1,12 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search order
+<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
-       <h1>Order search</h3>
-       <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"><table>
+       <h1>Order search</h1>
+       <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
+       <table>
                <tr>
                        <th>&nbsp;</th>
                        <th>Title</th>
@@ -20,8 +24,8 @@
                                <th><input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" /></th>
                                <th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
                                <th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
-                               <th>                                    From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
-                                       <input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
+                               <th>From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" alt="calendar" />
+                                       <input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->" />
                                        <script language="JavaScript" type="text/javascript">
                                                function validate1(date) {
                                                        var day = date.getDate();
@@ -48,7 +52,7 @@
                                                        }
                                                );
                                        </script>
-                                       To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" border="0" />
+                                       To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="calendar" />
                                        <input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" />
                                        <script type="text/javascript">
                                                function validate2(date) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl
new file mode 100644 (file)
index 0000000..1482dde
--- /dev/null
@@ -0,0 +1,109 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+
+<h1 ><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR name="Supplier" --> : <!--/TMPL_IF -->Late issues</h1>
+                       <form action="lateorders.pl" method="post">
+       <table>
+               <tr>
+                       <th>Supplier</th>
+                       <th>Order Date</th>
+                       <th>Ordered for</th>
+                       <th>Including Basket</th>
+                       <th>Book information</th>
+                       <th>Branch</th>
+                       <th>Estimated Unit Price</th>
+                       <th>Retailer Catalogue Unit Price</th>
+                       <th>Quantity</th>
+                       <th>Total cost</th>
+                       <th>Budget</th>
+                       <th>&nbsp;</th>
+               </tr>
+               <tr>
+                               <td class="doNotPrint">
+                                       <!-- TMPL_VAR name="CGIsupplier" -->
+                               </td>
+                               <td> &nbsp;</td>
+                               <td align="center" class="doNotPrint">
+                                       <input align="right" size="4" maxlength="3" type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->" /> days
+                               </td>
+                               <td colspan="2">
+                                       &nbsp;
+                               </td>
+                               <td class="doNotPrint">
+                                       <select name="branch">
+                                       <!-- TMPL_LOOP name="branchloop" -->
+                                               <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="branchname" --></option>
+                                       <!-- /TMPL_LOOP -->
+                                       </select>
+                               </td>
+                               <td colspan="5">
+                                       &nbsp;
+                               </td>
+                               
+                               <td class="doNotPrint">
+                                       <input type="submit" value="filter" />
+                               </td>
+               </tr>
+               <!-- TMPL_LOOP name="lateorders" -->
+                       <!--TMPL_IF Name="hilighted" --> <tr class="hilighted"> <!--TMPL_ELSE--> <tr> <!-- /TMPL_IF -->
+                               <td class="doNotPrint">
+                                       <!-- TMPL_VAR name="supplier" -->
+                               </td>
+                               <td>
+                                       <!-- TMPL_VAR name="orderdate" -->
+                               </td>
+                               <td class="number" align="right">
+                                       <!-- TMPL_VAR name="latesince" -->
+                               </td>
+                               <td align="center" class="doNotPrint">
+                                       <!-- TMPL_VAR name="basketno" -->
+                               </td>
+                               <td >
+                                       <b><!-- TMPL_VAR name="title" --></b>
+                               <!-- TMPL_IF name="author" --><br/><i>Author:</i> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="publisher" --><br/><i>Published by:</i> <!-- TMPL_VAR NAME="publisher" --><!-- TMPL_IF name="publicationyear" --><i> in </i><!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                               </td>
+                               <td class="doNotPrint">
+                                       <!-- TMPL_VAR name="branch" -->
+                               </td>
+                               <td align="right" class="doNotPrint">
+                                       <!-- TMPL_VAR name="unitpricelib" -->
+                               </td>
+                               <td align="right">
+                                       <!-- TMPL_VAR name="unitpricesupplier" -->
+                               </td>
+                               <td align="right">
+                                       <!-- TMPL_VAR name="quantity" -->
+                               </td>
+                               <td align="right">
+                                       <!-- TMPL_VAR name="subtotal" -->
+                               </td>
+                               <td class="doNotPrint">
+                                       <!-- TMPL_VAR name="budget" -->
+                               </td>
+                               <td class="doNotPrint">
+                                       &nbsp;
+                               </td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+               <tr> 
+                               <th>
+                                       Total
+                               </th>
+                               <th colspan="2">
+                                       &nbsp;
+                               </th>
+                               <th class="doNotPrint"> &nbsp;</th>
+                               <th colspan="5">
+                                       &nbsp;
+                               </th>
+                               
+                               <th>
+                                       <!-- TMPL_VAR name="total" -->
+                               </th>
+               </tr>
+       </table>
+</form>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
index b7ddc53..89fbb59 100644 (file)
@@ -1,26 +1,25 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
- <h1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></h1>
+<h1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></h1>
 
-<!-- TMPL_IF name ="testdonation" -->
        <a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- TMPL_VAR name="basket" -->&amp;sub=<!-- TMPL_VAR name="parsub" -->">Add New Biblio</a>
-<!-- TMPL_ELSE -->
-       <a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- TMPL_VAR name="basket" -->&amp;sub=<!-- TMPL_VAR name="parsub" -->">Add New Biblio</a>
-<!-- /TMPL_IF --> | <a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">View Basket</a> | 
+ | <a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">View Basket</a> | 
 <form class="inline" action="/cgi-bin/koha/acqui/newbasket2.pl">
 <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
 <input type="hidden" name="basket" value="<!-- TMPL_VAR name="basket" -->" />
 New Search: <input type="text"  size="25" name="search" /></form>
 
 
-<h3>You searched for 
+<h2>You searched for 
 <!-- TMPL_LOOP name="loopsearch" -->
        <!-- TMPL_VAR name="key" --> <!-- TMPL_VAR name="value" -->
 <!-- /TMPL_LOOP -->
 
-</h3>
-Results <!-- TMPL_VAR name="dispnum" --> to <!-- TMPL_VAR name="offset2" --> of <!-- TMPL_VAR name="count" --> results displayed.
+</h2>
+<p>Results <!-- TMPL_VAR name="dispnum" --> to <!-- TMPL_VAR name="offset2" --> of <!-- TMPL_VAR name="count" --> results displayed.</p>
 
 <table>
        <tr>
@@ -34,15 +33,9 @@ Results <!-- TMPL_VAR name="dispnum" --> to <!-- TMPL_VAR name="offset2" --> of
 <!-- TMPL_LOOP name="loopresult" -->
        <tr>
                <td>
-                       <!-- TMPL_IF name="testdonation" -->
-                               <a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" -->&amp;author=<!-- TMPL_VAR name="author2" -->&amp;copyright=<!-- TMPL_VAR name="copyright" -->&amp;id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- TMPL_VAR name="basket" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" -->&amp;title=<!-- TMPL_VAR name="title2" -->">
+                       <a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" -->&amp;author=<!-- TMPL_VAR name="author2" -->&amp;copyright=<!-- TMPL_VAR name="copyright" -->&amp;id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- TMPL_VAR name="basket" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" -->&amp;title=<!-- TMPL_VAR name="title2" -->">
                                <!-- TMPL_VAR name="title" -->
-                               </a>
-                       <!-- TMPL_ELSE -->
-                               <a href="/cgi-bin/koha/acqui/newdonation.pl?author=<!-- TMPL_VAR name="author2" -->&amp;copyright=<!-- TMPL_VAR name="copyright" -->&amp;id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- TMPL_VAR name="basket" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" -->&amp;title=<!-- TMPL_VAR name="title2" -->">
-                               <!-- TMPL_VAR name="title" -->
-                               </a>
-                       <!-- /TMPL_IF -->
+                       </a>
                </td>
                <td>
                        <a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR name="word" -->&amp;type=<!-- TMPL_VAR name="type" -->">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl
new file mode 100644 (file)
index 0000000..d6966be
--- /dev/null
@@ -0,0 +1,240 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+
+<script language="javascript" type="text/javascript">
+<!--
+function update(f){
+  //collect values
+  quantity=f.quantity.value
+  if (quantity ==0) {
+       alert("Quantity must be >0");
+  }
+  discount=f.discount.value
+  listinc=parseInt(f.listinc.value)
+  currency=f.currency.value
+  applygst=parseInt(f.applygst.value)
+  listprice=f.list_price.value
+  //  rrp=f.rrp.value
+  //  ecost=f.ecost.value  //budgetted cost
+  //  GST=f.GST.value
+  //  total=f.total.value
+  //make useful constants out of the above
+  exchangerate=f.elements[currency].value      //get exchange rate
+  gst_on=(!listinc && applygst);
+  //do real stuff
+  rrp=listprice*exchangerate;
+  ecost=rrp*(100-discount)/100
+  GST=0;
+  if (gst_on){
+    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;
+  return true;
+}
+
+
+
+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(etc);
+       win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
+       win.document.write("</font></body></html>");
+}
+
+function check(f) {
+  quantity=f.quantity.value
+  title=f.title.value
+  if (title == "") {
+       alert("Title can't be empty");
+       return false;
+  }
+  if (quantity ==0) {
+       alert("Quantity must be >0");
+       return false;
+  }
+       document.frusin.submit();
+}
+
+//-->
+
+</script>
+       <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 -->
+       <a href="basket.pl?basket=<!-- TMPL_VAR NAME="basket" -->" class="button acquisition">View Basket</a>
+       <h1>
+               <!-- TMPL_IF name="ordnum" -->
+                       Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)
+               <!-- TMPL_ELSE -->
+                       New order
+               <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
+       </h1>
+       Shopping Basket For <!-- TMPL_VAR NAME="name" -->
+       <h2>catalogue details</h2>
+       <p>
+               <label><b>Title *</b></label>
+               <!-- TMPL_IF name="biblio" -->
+                       <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" /><!-- TMPL_VAR NAME="title" -->
+               <!-- TMPL_ELSE -->
+                       <input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
+               <!-- /TMPL_IF -->
+       </p>
+       <p>
+               <label>Author</label>
+               <!-- TMPL_IF name="biblio" -->
+                       <input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
+               <!-- TMPL_ELSE -->
+                       <input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
+               <!-- /TMPL_IF -->
+       </p>
+       <p>
+               <label> Publisher</label>
+               <!-- TMPL_IF name="biblio" -->
+                       <input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
+               <!-- TMPL_ELSE -->
+                       <input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
+               <!-- /TMPL_IF -->
+       </p>
+       <p>
+               <label>Copyright Date</label>
+               <!-- TMPL_IF name="biblio" -->
+                       <input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
+               <!-- TMPL_ELSE -->
+                       <input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
+               <!-- /TMPL_IF -->
+       </p>
+       <p>
+               <label>Format</label>
+               <!-- TMPL_VAR NAME="CGIitemtype" -->
+       </p>
+       <p>
+               <label>ISBN</label>
+               <!-- TMPL_IF name="biblio" -->
+                       <input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
+               <!-- TMPL_ELSE -->
+                       <input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
+               <!-- /TMPL_IF -->
+       </p>
+       <p>
+               <label>Series</label>
+               <!-- TMPL_IF name="biblio" -->
+                       <input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
+               <!-- TMPL_ELSE -->
+                       <input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
+               <!-- /TMPL_IF -->
+       </p>
+       <p>
+               <label>Branch</label>
+               <select name="branch">
+               <!-- TMPL_LOOP name="branchloop" -->
+                       <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+               <!-- /TMPL_LOOP -->
+               </select>
+       </p>
+               
+       <h2>Accounting details</h2>
+               <p>
+                       <label>Quantity</label>
+                       <!-- TMPL_IF name="close" -->
+                               <input type="hidden" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /><!-- TMPL_VAR NAME="quantity" -->
+                       <!-- TMPL_ELSE -->
+                               <input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
+                       <!--/TMPL_IF-->
+               </p>
+               <p>
+                       <label>Bookfund</label>
+                       <!-- TMPL_IF name="close" -->
+                               <input type="hidden" size="20" name="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
+                       <!-- TMPL_ELSE -->
+                               <!-- TMPL_VAR NAME="CGIbookfund" -->
+                       <!--/TMPL_IF-->
+               </p>
+               <p>
+                       <label>Suppliers List Price</label>
+                       <!-- TMPL_IF name="close" -->
+                               <input type="hidden" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR NAME="listprice" -->
+                       <!-- TMPL_ELSE -->
+                               <input type="text" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
+                       <!--/TMPL_IF-->
+               </p>
+               <p>
+                       <label>Replacement Cost </label>
+                       <!-- TMPL_IF name="close" -->
+                               <input type="hidden" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /><!-- TMPL_VAR NAME="rrp" -->
+                       <!-- TMPL_ELSE -->
+                               <input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
+                       <!--/TMPL_IF-->
+               </p>
+               <p>
+                       <label>Budgeted Cost</label>
+                       <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->"<!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+               </p>
+               <p>
+                       <label>Budgeted GST</label>
+                       <input type="text" size="20" name="GST" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+               </p>
+               <p>
+                       <label><b>BUDGETED TOTAL</b></label>
+                       <input type="text" size="20" name="total" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+               </p>
+               <p>
+                       <label>Actual Cost</label>
+                       <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+               </p>
+               <p>
+                       <label>Invoice Number *</label>
+                       <input type="text" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" />
+               </p>
+               <p>
+                       <label>Notes</label>
+                       <input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" />
+               </p>
+               <p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
+               <p>
+                       <label>Sort field 1</label>
+                       <!-- TMPL_IF Name="CGIsort1" -->
+                               <!-- TMPL_VAR Name="CGIsort1" -->
+                       <!-- TMPL_ELSE -->
+                               <input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
+                       <!--/TMPL_IF -->
+               </p>
+               <p>
+                       <label>Sort field 2</label>
+                       <!-- TMPL_IF Name="CGIsort2" -->
+                               <!-- TMPL_VAR Name="CGIsort2" -->
+                       <!-- TMPL_ELSE -->
+                               <input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
+                       <!--/TMPL_IF -->
+               </p>
+               <p>
+                       <input type="button" value="OK" onclick="check(this.form)" />
+               </p>
+       </form>
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl
new file mode 100644 (file)
index 0000000..859eaac
--- /dev/null
@@ -0,0 +1,65 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search supplier <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+
+<h1>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
+<table>
+<tr>
+       <th>Order</th>
+       <th>Receive</th>
+       <th>Company</th>
+       <th>&nbsp;</th>
+</tr>
+
+<!-- TMPL_LOOP name="loop_suppliers" -->
+       <tr>
+               <td>
+                       <!-- TMPL_IF name="active" -->
+                               <a href="basket.pl?supplierid=<!-- TMPL_VAR name=supplierid -->">Add order</a>
+                       <!-- TMPL_ELSE -->
+                               Inactive
+                       <!-- /TMPL_IF -->
+               </td>
+               <td>
+                       <a href="recieveorder.pl?supplierid=<!-- TMPL_VAR name=supplierid -->">Recieve order</a>
+               </td>
+               <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
+               <td>
+                       <table>
+                                       <tr>
+                                               <th>Basket</th>
+                                               <th>Items</th>
+                                               <th>Created by</th>
+                                               <th>Date</th>
+                                               <th>&nbsp;</th>
+                                       </tr>
+                                       <!-- TMPL_LOOP NAME="loop_basket" -->
+                                               <tr>
+                                                       <td><!-- TMPL_VAR NAME="basketno" --></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" -->" class="button acquisition">View</a>
+                                                               <!-- TMPL_ELSE -->
+                                                                       <!-- TMPL_IF name="active" -->
+                                                                               <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">modify</a>
+                                                                       <!-- TMPL_ELSE -->
+                                                                               <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
+                                                                       <!-- /TMPL_IF -->
+                                                               <!-- /TMPL_IF -->
+                                                       </td>
+                                               </tr>
+                                       <!-- /TMPL_LOOP -->
+                               </table>
+               </td>
+               </tr>
+       <!-- /TMPL_LOOP -->
+       </table>
+<p><a href="supplier.pl?supplierid=0">Add supplier</a></p>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl
new file mode 100644 (file)
index 0000000..114ae4a
--- /dev/null
@@ -0,0 +1,73 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Recieve <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+
+       <h1>
+               <!-- TMPL_IF name="invoice" -->
+                       Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i>
+               <!-- TMPL_ELSE -->
+                       orders not yet recieved for <!-- TMPL_VAR NAME="name" -->
+               <!-- /TMPL_IF -->
+       </h1>
+       
+               <p>Invoice: <!-- TMPL_VAR NAME="invoice" --></p>
+               <p>Received By: <!-- TMPL_VAR NAME="user" --></p>
+               <p>On: <!-- TMPL_VAR NAME="date" --></p>
+       
+               <form action="/cgi-bin/koha/acqui/acquire.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><b>Search ISBN or Title:</b> <input type="text" size="25" name="recieve" /></p>
+               </form>
+       <form action="" method="get" name="orderform">
+       <table>
+               <tr>
+                       <th class="acquisition">BASKET</th>
+                       <th class="acquisition">ISBN</th>
+                       <th class="acquisition">TITLE</th>
+                       <th class="acquisition">AUTHOR</th>
+                       <th class="acquisition">ACTUAL</th>
+                       <th class="acquisition">P&amp;P</th>
+                       <th class="acquisition">QTY</th>
+                       <th class="acquisition">TOTAL</th>
+               </tr>
+               <!-- TMPL_LOOP NAME="loop_orders" -->
+                       <tr>
+                               <td><!-- TMPL_VAR NAME="basketno" --></td>
+                               <td><!-- TMPL_VAR NAME="isbn" --></td>
+                               <td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&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="title" --></a></td>
+                               <td><!-- TMPL_VAR NAME="author" --></td>
+                               <td><!-- TMPL_VAR NAME="unitprice" --></td>
+                               <td></td>
+                               <td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+                               <td><!-- TMPL_VAR NAME="total" --></td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+               <tr>
+                       <th class="acquisition"></th>
+                       <th class="acquisition"></th>
+                       <th class="acquisition"></th>
+                       <th class="acquisition">SUBTOTALS</th>
+                       <th class="acquisition"><!-- TMPL_VAR NAME="totalprice" --></th>
+                       <th class="acquisition"><!-- TMPL_VAR NAME="totalfreight" --></th>
+                       <th class="acquisition"><!-- TMPL_VAR NAME="totalquantity" --></th>
+                       <th class="acquisition"><!-- TMPL_VAR NAME="tototal" --></th>
+               </tr>
+               <tr>
+                       <td>
+                       <b>HELP</b>
+                               <p>The total at the bottom of the page should be within a few cents of the total for the invoice.</p>
+                       </td>
+                       <td colspan="2"><b>GST</b></td>
+                       <td><!-- TMPL_VAR NAME="gst" --></td>
+               </tr>
+               <tr>
+                       <td colspan="2"><b>TOTAL</b></td>
+                       <td><!-- TMPL_VAR NAME="grandtot" --></td>
+               </tr>
+       </table>
+       </form>
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl
new file mode 100644 (file)
index 0000000..3c98a9d
--- /dev/null
@@ -0,0 +1,27 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Recieve <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+
+       <h1>Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
+               <form method="get" action="receive.pl">
+               <p>
+                       <input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
+                       <h2 class="acquisition">Supplier invoice information</h2>
+               <p>
+                       <label>Supplier Invoice Number</label>
+                       <input type="text" size="20" name="invoice">
+               </p>
+               <p>
+                       <label>GST</label>
+                       <input type="text" size="20" name="gst">
+               </p>
+               <p>
+                       <label>Freight</label>
+                       <input type="text" size="20" name="freight">
+               </p>
+               <p>
+                       <input type="submit" class="button acquisition" value="save">
+               </p>
+               </form>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl
new file mode 100644 (file)
index 0000000..b2fe4a0
--- /dev/null
@@ -0,0 +1,63 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Add order from suggestion: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+
+<h1>Suggestions</h1>
+       <form action="/cgi-bin/koha/acqui/suggestion-select.pl" method="get">
+       <table>
+               <tr>
+                       <th>Suggestion</th>
+                       <th>Suggested by</th>
+                       <th>Accepted by</th>
+                       <th>&nbsp;</th>
+               </tr>
+               <tr>
+                       <th>
+                               <p>Filter on :
+                               title: <input type="text" name="title" value="<!-- TMPL_VAR NAME="title"-->" />
+                               author: <input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
+                               publisher: <input type="text" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" /></p>
+                       </th>
+                       <th>
+                               &nbsp;
+                       </th>
+                       <th>
+                               &nbsp;
+                       </th>
+                       <th>
+                               <input type="submit" class="button acquisition" value="Set Filter" />
+                       </th>
+               </tr>
+               <!-- TMPL_LOOP NAME="suggestions_loop" -->
+                       <tr>
+                               <td>
+                                       <p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
+                                       <p>
+                                               <!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR NAME="publishercode" --> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR NAME="publicationyear" --></i> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR NAME="place" --></i> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR NAME="note" -->)</i></p> <!-- /TMPL_IF -->
+                                       </p>
+                               </td>
+                               <td>
+                                       <!-- TMPL_VAR NAME="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamesuggestedby" -->
+                               </td>
+                               <td>
+                                       <!-- TMPL_VAR NAME="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
+                               </td>
+                               <td>
+                                       <!-- TMPL_IF name="biblionumber" -->
+                                               <a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
+                                       <!-- TMPL_ELSE -->
+                                               <a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
+                                       <!-- /TMPL_IF -->
+                               </td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+       </table>
+       </form>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl
new file mode 100644 (file)
index 0000000..4eb8da8
--- /dev/null
@@ -0,0 +1,138 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Supplier <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+
+       <form action="updatesupplier.pl" method="post">
+       
+       <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
+       
+       <!-- TMPL_IF name="id" -->
+               <h1>Update: <!-- TMPL_VAR NAME="name" --></h1>
+       <!-- TMPL_ELSE -->
+               <h1>Add supplier</h1>
+       <!-- /TMPL_IF -->
+               <h2>COMPANY DETAILS</h2>
+               <p>
+                       <label>Company Name</label>
+                       <input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->" />
+               </p>
+               <p>
+                       <label>Postal Address</label>
+                               <textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
+               </p>
+               <p>
+                       <label>Physical Address</label>
+                       <textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
+               </p>
+               <p>
+                       <label>Phone</label>
+                       <input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" />
+               </p>
+               <p>
+                       <label>Fax</label>
+                       <input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" />
+               </p>
+               <p>
+                       <label>Website</label>
+                       <input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->" />
+               </p>
+               <h2 class="acquisition">CONTACT DETAILS</h2>
+               <p>
+                       <label>Contact Name</label>
+                       <input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" />
+               </p>
+               <p>
+                       <label>Position</label>
+                       <input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" />
+               </p>
+               <p>
+                       <label>Phone</label>
+                       <input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" />
+               </p>
+               <p>
+                       <label>Alternative phone</label>
+                       <input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" />
+               </p>
+               <p>
+                       <label>Fax</label>
+                       <input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" />
+               </p>
+               <p>
+                       <label>E-mail</label>
+                       <input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" />
+               </p>
+               <p>
+                       <label>Notes</label>
+                       <textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
+               </p>
+               <h2>CURRENT STATUS</h2>
+               <p>
+                       <label>Supplier is</label>
+                               <!-- TMPL_IF name="active" -->
+                                       <input type="radio" name="status" value="1" checked="checked" />Active
+                                       <input type="radio" name="status" value="0" />Inactive
+                               <!-- TMPL_ELSE -->
+                                       <input type="radio" name="status" value="1" />Active
+                                       <input type="radio" name="status" value="0" checked="checked" />Inactive
+                               <!-- /TMPL_IF -->
+               </p>
+               <h2>ORDERING INFORMATION</h2>
+               <p>
+                       <label>Publishers and Imprints</label>
+                       <textarea name="publishers_imprints" cols="20" rows="4"><!-- TMPL_VAR NAME="specialty" --></textarea>
+               </p>
+               <p>
+                       <label>List Prices are</label>
+                               <select name="list_currency" size="1">
+                               <!-- TMPL_LOOP NAME="loop_pricescurrency" -->
+                                       <!-- TMPL_VAR NAME="currency" -->
+                               <!-- /TMPL_LOOP -->
+                               </select>
+               </p>
+               <p>
+                       <label>Invoice Prices are</label>
+                               <select name="invoice_currency" size="1">
+                               <!-- TMPL_LOOP NAME="loop_invoicecurrency" -->
+                                       <!-- TMPL_VAR NAME="currency" -->
+                               <!-- /TMPL_LOOP -->
+                               </select>
+               </p>
+               <p>
+                       <label>GST Registered</label>
+                               <!-- TMPL_IF name="gstreg" -->
+                                       <input type="radio" name="gst" value="1" checked="checked" /> Yes
+                                       <input type="radio" name="gst" value="0" /> No
+                               <!-- TMPL_ELSE -->
+                                       <input type="radio" name="gst" value="1" /> Yes
+                                       <input type="radio" name="gst" value="0" checked="checked" /> No
+                               <!-- /TMPL_IF -->
+               </p>
+               <p>
+                       <label>List Item Price Includes GST</label>
+                               <!-- TMPL_IF name="listincgst" -->
+                                       <input type="radio" name="list_gst" value="1" checked="checked" /> Yes
+                                       <input type="radio" name="list_gst" value="0" /> No
+                               <!-- TMPL_ELSE -->
+                                       <input type="radio" name="list_gst" value="1" /> Yes
+                                       <input type="radio" name="list_gst" value="0" checked="checked" /> No
+                               <!-- /TMPL_IF -->
+               </p>
+               <p>
+                       <label>Invoice Item Price Includes GST</label>
+                               <!-- TMPL_IF name="invoice_gst" -->
+                                       <input type="radio" name="invoiceincgst" value="1" checked="checked" /> Yes
+                                       <input type="radio" name="invoiceincgst" value="0" /> No
+                               <!-- TMPL_ELSE -->
+                                       <input type="radio" name="invoiceincgst" value="1" /> Yes
+                                       <input type="radio" name="invoiceincgst" value="0" checked="checked" /> No
+                               <!-- /TMPL_IF -->
+               </p>
+               <p>
+                       <label>Discount</label>
+                       <input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %
+               </p>
+       <br/>
+       <br/><input type="submit"  name="submit" title="save" />
+       </form>
+
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->