[Koha-cvs] koha acqui/acquire.pl koha-tmpl/intranet-tmpl/p...
paul poulain
paul at koha-fr.org
Wed Jan 18 16:38:17 CET 2006
CVSROOT: /cvsroot/koha
Module name: koha
Branch:
Changes by: paul poulain <tipaul at savannah.gnu.org> 06/01/18 15:38:17
Modified files:
acqui : acquire.pl
koha-tmpl/intranet-tmpl/prog/en/acqui: acqui-home.tmpl
acquire.tmpl basket.tmpl
histsearch.tmpl
newbasket2.tmpl
Added files:
koha-tmpl/intranet-tmpl/prog/en/acqui: lateorders.tmpl
newbiblio.tmpl order.tmpl
recieveorder.tmpl
recieve.tmpl
suggestion-select.tmpl
supplier.tmpl
Log message:
prog templates : completed, fixed & xhtml valid
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/acqui/acquire.pl.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl?rev=1.1
Patches:
Index: koha/acqui/acquire.pl
diff -u koha/acqui/acquire.pl:1.20 koha/acqui/acquire.pl:1.21
--- koha/acqui/acquire.pl:1.20 Thu Jul 28 07:52:02 2005
+++ koha/acqui/acquire.pl Wed Jan 18 15:38:17 2006
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: acquire.pl,v 1.20 2005/07/28 07:52:02 hdl Exp $
+# $Id: acquire.pl,v 1.21 2006/01/18 15:38:17 tipaul Exp $
#script to recieve orders
#written by chris at katipo.co.nz 24/2/2000
@@ -26,13 +26,9 @@
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 @@
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, at 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 @@
$sth->finish;
}
-# my @bookfund;
-# my @select_bookfund;
-# my %select_bookfunds;
-# ($count2, at 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 @@
$results[0]->{'unitprice'}='';
}
$template->param(
+ branchloop => \@branchloop,
count => 1,
biblionumber => $results[0]->{'biblionumber'},
ordernumber => $results[0]->{'ordernumber'},
@@ -147,7 +105,6 @@
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: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl:1.1 Wed Jul 20 21:36:24 2005
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl Wed Jan 18 15:38:17 2006
@@ -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>
@@ -92,23 +82,21 @@
</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: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl:1.1 Wed Jul 20 21:36:24 2005
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl Wed Jan 18 15:38:17 2006
@@ -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>
@@ -26,106 +28,45 @@
<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" -->&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" -->&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: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl:1.1 Wed Jul 20 21:36:24 2005
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl Wed Jan 18 15:38:17 2006
@@ -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" -->&order=biblioitems.publishercode">Publisher</a></th>
@@ -65,7 +75,13 @@
<!-- 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>
@@ -97,7 +115,6 @@
</table>
<!-- TMPL_ELSE -->
<table>
- <caption>Order Details</caption>
<tr><td>Basket empty</td></tr>
</table>
<!-- /TMPL_IF -->
@@ -106,9 +123,10 @@
<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" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
<li><a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">New Record</a></li>
</ul>
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl:1.1 Wed Jul 20 21:36:24 2005
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl Wed Jan 18 15:38:17 2006
@@ -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> </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) {
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl:1.1 Wed Jul 20 21:36:24 2005
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl Wed Jan 18 15:38:17 2006
@@ -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" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">Add New Biblio</a>
-<!-- TMPL_ELSE -->
- <a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&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 @@
<!-- TMPL_LOOP name="loopresult" -->
<tr>
<td>
- <!-- TMPL_IF name="testdonation" -->
- <a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" -->&author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
+ <a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" -->&author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&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" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&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" -->&type=<!-- TMPL_VAR name="type" -->">
More information about the Koha-cvs
mailing list