[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/acqui acqu...
paul poulain
paul at koha-fr.org
Fri Jan 20 17:04:42 CET 2006
CVSROOT: /cvsroot/koha
Module name: koha
Branch:
Changes by: paul poulain <tipaul at savannah.gnu.org> 06/01/20 16:04:42
Modified files:
koha-tmpl/intranet-tmpl/prog/en/acqui: acqui-home.tmpl
acquire.tmpl basket.tmpl
histsearch.tmpl
lateorders.tmpl
newbasket2.tmpl
newbiblio.tmpl order.tmpl
recieveorder.tmpl
recieve.tmpl
suggestion-select.tmpl
supplier.tmpl
Log message:
updating prog templates for acqui
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.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/newbasket2.tmpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.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/order.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/recieveorder.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/recieve.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/suggestion-select.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/supplier.tmpl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
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.2 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl:1.3
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl:1.2 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl Fri Jan 20 16:04:42 2006
@@ -3,25 +3,26 @@
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
<h1>Acquisitions</h1>
+<div id="acqui_acqui_home_order">
<!-- TMPL_IF name="nobudget" -->
You must define a budget in parameters
<!-- TMPL_ELSE -->
-<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/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 -->
+</div>
-<!-- currencies-->
+<div id="acqui_acqui_home_currency">
<!-- TMPL_IF NAME="loop_currency" -->
- <form action="/cgi-bin/koha/currency.pl">
<h2>Exchange Rates</h2>
+ <form action="/cgi-bin/koha/currency.pl">
<table>
<tr>
<th>Currency</th>
@@ -46,57 +47,57 @@
<input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Currency" />
</form>
<!-- /TMPL_IF -->
+</div>
-
-<!-- suggestions -->
-
+<div id="acqui_acqui_home_suggestions">
<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 -->
<p>No suggestions waiting</p>
<!-- /TMPL_IF -->
+</div>
-
-<!-- showbudget-->
-
- <!-- TMPL_IF name="nobudget" -->
+<div id="acqui_acqui_home_budgets">
+ <!-- TMPL_IF name="nobudget" -->
<p>You must define a budget in parameters</p>
<!-- TMPL_ELSE -->
<h2>Budgets and Bookfunds</h2>
<table>
+ <tr>
+ <th>Budgets</th>
+ <th>Total</th>
+ <th>Spent</th>
+ <th>Comtd</th>
+ <th>Avail</th>
+ </tr>
+ <!-- TMPL_LOOP name="loop_budget" -->
<tr>
- <th>Budgets</th>
- <th>Total</th>
- <th>Spent</th>
- <th>Comtd</th>
- <th>Avail</th>
- </tr>
- <!-- TMPL_LOOP name="loop_budget" -->
- <tr>
- <td><!-- TMPL_VAR name="bookfundname" --></td>
- <td><!-- TMPL_VAR name="budgetamount" --></td>
- <td><!-- TMPL_VAR name="spent" --></td>
- <td><!-- TMPL_VAR name="comtd" --></td>
- <td><!-- TMPL_VAR name="avail" --></td>
- </tr>
- <!-- /TMPL_LOOP -->
- <tr>
- <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>
+ <td><!-- TMPL_VAR name="bookfundname" --></td>
+ <td><!-- TMPL_VAR name="budgetamount" --></td>
+ <td><!-- TMPL_VAR name="spent" --></td>
+ <td><!-- TMPL_VAR name="comtd" --></td>
+ <td><!-- TMPL_VAR name="avail" --></td>
</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>
-
-<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_LOOP -->
+ <tr>
+ <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>
+ </tr>
+ </table><!-- /TMPL_IF -->
+</div>
+<div id="acqui_acqui_home_hints">
+ <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>
+</div>
<!-- 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.2 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl:1.3
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl:1.2 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl Fri Jan 20 16:04:42 2006
@@ -6,12 +6,14 @@
<h1>Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --></h1>
-<ul><li>Invoice: <!-- TMPL_VAR NAME="invoice" --></li>
-<li>Received By: <!-- TMPL_VAR NAME="user" --></li>
-<li>Date: <!-- TMPL_VAR NAME="date" --></li>
-</ul>
+<div id="acqui_acquire_summary">
+ Invoice: <!-- TMPL_VAR NAME="invoice" --></p>
+ <p>Received By: <!-- TMPL_VAR NAME="user" --></p>
+ <p>Date: <!-- TMPL_VAR NAME="date" --></p>
+</div>
<!-- TMPL_IF name="count" -->
+<div id="acqui_acquire_neworder">
<script language="javascript" type="text/javascript">
<!--
function messenger(X,Y,etc){
@@ -68,9 +70,9 @@
<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>
-
+</div>
<!-- TMPL_ELSE -->
-
+<div id="acqui_acquire_orderlist">
<table>
<tr>
<th>Basket</th>
@@ -91,6 +93,7 @@
</tr>
<!-- /TMPL_LOOP -->
</table>
+</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl:1.2 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl:1.3
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl:1.2 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl Fri Jan 20 16:04:42 2006
@@ -3,30 +3,28 @@
<!-- 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>
- <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 -->
-
- <!-- /TMPL_UNLESS -->
-
+ <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>
+ <div id="acqui_basket_summary">
+ <h2>Basket Details</h2>
+ <table>
+ <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 -->
+ </div>
+ <div id="acqui_basket_content">
<h2>Order Details</h2>
<!-- TMPL_IF name="books_loop" -->
<table>
@@ -120,7 +118,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="closedate" -->
-
+ </div>
+ <div id="acqui_basket_add">
<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" -->" />
@@ -131,8 +130,7 @@
<li><a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">New Record</a></li>
</ul>
</form>
-
+ </div>
<!-- /TMPL_UNLESS -->
-
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl:1.2 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl:1.3
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl:1.2 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl Fri Jan 20 16:04:42 2006
@@ -5,100 +5,102 @@
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
<h1>Order search</h1>
- <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
- <table>
- <tr>
- <th> </th>
- <th>Title</th>
- <th>Author</th>
- <th>Supplier</th>
- <th>Placed on</th>
- <th>Recieved on</th>
- <th>Quantity ordered</th>
- <th>Unit cost</th>
- <th> </th>
- </tr>
- <tr>
-
- <th>Filter By:</th>
- <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;" 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();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var weekDay = date.getDay();
- var dayMonth = month + '-' + day;
- var dateString = year + '-' + month + '-' + day;
- var dateTo = document.getElementById('to').value.split("-");
- var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
- if (date > limitDate) {
- return true;
- } else {
- return false;
- }
- }
- Calendar.setup(
- {
- inputField : "from",
- ifFormat : "%Y-%m-%d",
- button : "openCalendarFrom",
- disableFunc : validate1,
- dateStatusFunc : validate1
- }
- );
- </script>
- 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) {
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var weekDay = date.getDay();
- var dayMonth = month + '-' + day;
- var dateString = year + '-' + month + '-' + day;
- var dateFrom = document.getElementById('from').value.split("-");
- var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
- if (limitDate > date) {
- return true;
- } else {
- return false;
- }
- }
-
- Calendar.setup(
- {
- inputField : "to",
- ifFormat : "%Y-%m-%d",
- button : "openCalendarTo",
- disableFunc : validate2,
- dateStatusFunc : validate2
- }
- );
- </script></th>
- <th> </th>
+ <div id="acqui_histsearch">
+ <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
+ <table>
+ <tr>
<th> </th>
+ <th>Title</th>
+ <th>Author</th>
+ <th>Supplier</th>
+ <th>Placed on</th>
+ <th>Recieved on</th>
+ <th>Quantity ordered</th>
+ <th>Unit cost</th>
<th> </th>
- <th><input type="submit" value="Set Filter" /></th>
- </tr>
- <!-- TMPL_LOOP NAME="suggestions_loop" -->
+ </tr>
<tr>
- <td> </td>
- <td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
- <td><!-- TMPL_VAR NAME="author" --></td>
- <td><!-- TMPL_VAR NAME="name" --></td>
- <td><!-- TMPL_VAR name="creationdate" --></td>
- <td><!-- TMPL_VAR name="datereceived" --></td>
- <td><!-- TMPL_VAR name="quantity" --></td>
- <td><!-- TMPL_VAR name="ecost" --></td>
- <td> </td>
+ <th>Filter By:</th>
+ <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;" 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();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var weekDay = date.getDay();
+ var dayMonth = month + '-' + day;
+ var dateString = year + '-' + month + '-' + day;
+ var dateTo = document.getElementById('to').value.split("-");
+ var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+ if (date > limitDate) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ Calendar.setup(
+ {
+ inputField : "from",
+ ifFormat : "%Y-%m-%d",
+ button : "openCalendarFrom",
+ disableFunc : validate1,
+ dateStatusFunc : validate1
+ }
+ );
+ </script>
+ 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) {
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var weekDay = date.getDay();
+ var dayMonth = month + '-' + day;
+ var dateString = year + '-' + month + '-' + day;
+ var dateFrom = document.getElementById('from').value.split("-");
+ var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
+ if (limitDate > date) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ Calendar.setup(
+ {
+ inputField : "to",
+ ifFormat : "%Y-%m-%d",
+ button : "openCalendarTo",
+ disableFunc : validate2,
+ dateStatusFunc : validate2
+ }
+ );
+ </script></th>
+ <th> </th>
+ <th> </th>
+ <th> </th>
+ <th><input type="submit" value="Set Filter" /></th>
</tr>
- <!-- /TMPL_LOOP -->
- </table></form>
+ <!-- TMPL_LOOP NAME="suggestions_loop" -->
+ <tr>
+ <td> </td>
+ <td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+ <td><!-- TMPL_VAR NAME="author" --></td>
+ <td><!-- TMPL_VAR NAME="name" --></td>
+ <td><!-- TMPL_VAR name="creationdate" --></td>
+ <td><!-- TMPL_VAR name="datereceived" --></td>
+ <td><!-- TMPL_VAR name="quantity" --></td>
+ <td><!-- TMPL_VAR name="ecost" --></td>
+ <td> </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+ </form>
+ </div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl:1.1 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl Fri Jan 20 16:04:42 2006
@@ -3,107 +3,109 @@
<!-- 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> </th>
- </tr>
- <tr>
- <td class="doNotPrint">
- <!-- TMPL_VAR name="CGIsupplier" -->
- </td>
- <td> </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">
-
- </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">
-
- </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">
-
- </td>
+ <div id="acqui_lateorders">
+ <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> </th>
</tr>
- <!-- /TMPL_LOOP -->
- <tr>
- <th>
- Total
- </th>
- <th colspan="2">
-
- </th>
- <th class="doNotPrint"> </th>
- <th colspan="5">
-
- </th>
-
- <th>
- <!-- TMPL_VAR name="total" -->
- </th>
- </tr>
- </table>
-</form>
+ <tr>
+ <td class="doNotPrint">
+ <!-- TMPL_VAR name="CGIsupplier" -->
+ </td>
+ <td> </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">
+
+ </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">
+
+ </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">
+
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ <tr>
+ <th>
+ Total
+ </th>
+ <th colspan="2">
+
+ </th>
+ <th class="doNotPrint"> </th>
+ <th colspan="5">
+
+ </th>
+
+ <th>
+ <!-- TMPL_VAR name="total" -->
+ </th>
+ </tr>
+ </table>
+ </form>
+ </div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl:1.2 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl:1.3
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl:1.2 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl Fri Jan 20 16:04:42 2006
@@ -5,61 +5,65 @@
<h1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></h1>
+<div id="acqui_newbasket2_add">
<a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">Add New Biblio</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>
-
-
-<h2>You searched for
-<!-- TMPL_LOOP name="loopsearch" -->
- <!-- TMPL_VAR name="key" --> <!-- TMPL_VAR name="value" -->
-<!-- /TMPL_LOOP -->
-
-</h2>
-<p>Results <!-- TMPL_VAR name="dispnum" --> to <!-- TMPL_VAR name="offset2" --> of <!-- TMPL_VAR name="count" --> results displayed.</p>
-
-<table>
- <tr>
- <th>Title</th>
- <th>Author</th>
- <th>©</th>
- <th>Count</th>
- <th>Location</th>
- </tr>
-
-<!-- TMPL_LOOP name="loopresult" -->
- <tr>
- <td>
- <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>
- </td>
- <td>
- <a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR name="word" -->&type=<!-- TMPL_VAR name="type" -->">
- <!-- TMPL_VAR name="author" -->
- </a>
- </td>
- <td>
- <!-- TMPL_VAR name="copyright" -->
- </td>
- <td>
- <!-- TMPL_VAR name="itemcount" -->
- </td>
- <td>
- <!-- TMPL_VAR name="location" -->
- </td>
- </tr>
-
-<!-- /TMPL_LOOP -->
-
-</table>
-
-<!-- TMPL_IF name="offsetover" -->
-<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR name="num" -->&offset=<!-- TMPL_VAR name="offset" -->&type=<!-- TMPL_VAR name="type" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&search=<!-- TMPL_VAR name="title" -->&author=<!-- TMPL_VAR name="author" -->">Next</a>
-<!-- /TMPL_IF -->
+ | <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>
+</div>
+
+<div id="acqui_newbasket2_search_result">
+ <h2>You searched for
+ <!-- TMPL_LOOP name="loopsearch" -->
+ <!-- TMPL_VAR name="key" --> <!-- TMPL_VAR name="value" -->
+ <!-- /TMPL_LOOP -->
+ </h2>
+ <p>Results <!-- TMPL_VAR name="dispnum" --> to <!-- TMPL_VAR name="offset2" --> of <!-- TMPL_VAR name="count" --> results displayed.</p>
+
+ <table>
+ <tr>
+ <th>Title</th>
+ <th>Author</th>
+ <th>©</th>
+ <th>Count</th>
+ <th>Location</th>
+ </tr>
+
+ <!-- TMPL_LOOP name="loopresult" -->
+ <tr>
+ <td>
+ <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>
+ </td>
+ <td>
+ <a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR name="word" -->&type=<!-- TMPL_VAR name="type" -->">
+ <!-- TMPL_VAR name="author" -->
+ </a>
+ </td>
+ <td>
+ <!-- TMPL_VAR name="copyright" -->
+ </td>
+ <td>
+ <!-- TMPL_VAR name="itemcount" -->
+ </td>
+ <td>
+ <!-- TMPL_VAR name="location" -->
+ </td>
+ </tr>
+
+ <!-- /TMPL_LOOP -->
+
+ </table>
+
+ <!-- TMPL_IF name="offsetover" -->
+ <a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR name="num" -->&offset=<!-- TMPL_VAR name="offset" -->&type=<!-- TMPL_VAR name="type" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&search=<!-- TMPL_VAR name="title" -->&author=<!-- TMPL_VAR name="author" -->">
+ Next
+ </a>
+ <!-- /TMPL_IF -->
+</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl:1.1 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl Fri Jan 20 16:04:42 2006
@@ -66,13 +66,33 @@
}
document.frusin.submit();
}
-
-//-->
-
</script>
+<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>
+ <div id="acqui_basket_summary">
+ <h2>Basket Details</h2>
+ <table>
+ <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>
+ </div>
+
+<div id="acqui_newbiblio_edit_catalogue">
+ <h2>catalogue details</h2>
<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" --> -->
+ <!-- TMPL_UNLESS name="existing" -->
+ <input type="hidden" name="existing" value="no" />
+ <!-- /TMPL_UNLESS -->
<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" -->" />
@@ -87,17 +107,6 @@
<!-- 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" -->
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl:1.1 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl Fri Jan 20 16:04:42 2006
@@ -3,63 +3,70 @@
<!-- 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> </th>
-</tr>
-
-<!-- TMPL_LOOP name="loop_suppliers" -->
+<div id="acqui_order_supplierlist">
+ <table>
<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> </th>
- </tr>
- <!-- TMPL_LOOP NAME="loop_basket" -->
+ <th>Order</th>
+ <th>Receive</th>
+ <th>Company</th>
+ <th> </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>
- <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 -->
+ <th>Basket</th>
+ <th>Items</th>
+ <th>Created by</th>
+ <th>Date</th>
+ <th> </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 -->
- <!-- /TMPL_IF -->
- </td>
- </tr>
- <!-- /TMPL_LOOP -->
- </table>
- </td>
- </tr>
- <!-- /TMPL_LOOP -->
- </table>
-<p><a href="supplier.pl?supplierid=0">Add supplier</a></p>
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+</div>
+<div id="acqui_order_add_supplier">
+ <form action="supplier.pl">
+ <input type="hidden" name="supplierid" value="0" />
+ <input type="submit" value="Add supplier" />
+ </form>
+</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl:1.1 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl Fri Jan 20 16:04:42 2006
@@ -10,18 +10,13 @@
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>
+<div id="acqui_recieve_summary">
+ <p>Invoice: <!-- TMPL_VAR NAME="invoice" --></p>
+ <p>Received By: <!-- TMPL_VAR NAME="user" --></p>
+ <p>On: <!-- TMPL_VAR NAME="date" --></p>
+</div>
+<div id="acqui_recieve_recievelist">
+ <h2>Recieve list</h2>
<form action="" method="get" name="orderform">
<table>
<tr>
@@ -70,4 +65,15 @@
</tr>
</table>
</form>
+</div>
+<div id="acqui_recieve_search">
+ <h2>Add a book to the receipt</h2>
+ <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>
+</div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl:1.1 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl Fri Jan 20 16:04:42 2006
@@ -2,11 +2,11 @@
<!-- 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>
+<h1>Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
+<div id="acqui_recieveorder">
+ <h2 class="acquisition">Supplier invoice information</h2>
+ <form method="get" action="receive.pl">
+ <input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
<p>
<label>Supplier Invoice Number</label>
<input type="text" size="20" name="invoice">
@@ -22,6 +22,6 @@
<p>
<input type="submit" class="button acquisition" value="save">
</p>
- </form>
-
+ </form>
+</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl:1.1 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl Fri Jan 20 16:04:42 2006
@@ -4,6 +4,7 @@
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
<h1>Suggestions</h1>
+<div id="acqui_suggestion_select">
<form action="/cgi-bin/koha/acqui/suggestion-select.pl" method="get">
<table>
<tr>
@@ -60,4 +61,5 @@
<!-- /TMPL_LOOP -->
</table>
</form>
+</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
Index: koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl:1.1 Wed Jan 18 15:38:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl Fri Jan 20 16:04:42 2006
@@ -2,15 +2,14 @@
<!-- 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 -->
+ <form action="updatesupplier.pl" method="post">
+ <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
+ <div id="acqui_supplier_company">
<h2>COMPANY DETAILS</h2>
<p>
<label>Company Name</label>
@@ -65,6 +64,8 @@
<label>Notes</label>
<textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
</p>
+ </div>
+ <div id="acqui_supplier_status">
<h2>CURRENT STATUS</h2>
<p>
<label>Supplier is</label>
@@ -76,6 +77,8 @@
<input type="radio" name="status" value="0" checked="checked" />Inactive
<!-- /TMPL_IF -->
</p>
+ </div>
+ <div id="acqui_supplier_ordering">
<h2>ORDERING INFORMATION</h2>
<p>
<label>Publishers and Imprints</label>
@@ -131,8 +134,8 @@
<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" />
+ </div>
+ <input type="submit" name="submit" title="save" />
</form>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
More information about the Koha-cvs
mailing list