gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some minor spelling changes

This commit is contained in:
tipaul 2006-04-04 13:56:44 +00:00
parent f9cf7662c4
commit b3b2d4bc18
5 changed files with 87 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
View File

@ -90,7 +90,7 @@ function check(f) {
<!-- TMPL_IF name="ordnum" -->
Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)
<!-- TMPL_ELSE -->
New order
New order line
<!-- /TMPL_IF -->
<!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
</h1>
@ -205,7 +205,7 @@ function check(f) {
<input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
</p>
<p>
<label class="label100">Invoice Number *</label>
<label class="label100"><i>Parcel code</i></label>
<input type="text" size="20" name="invoice" value="<!-- TMPL_VAR name="invoice" -->">
<p>
<label class="label100">Notes</label>

2
koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
View File

@ -6,7 +6,7 @@
<tr>
<th class="acquisition">Order</th>
<th class="acquisition">Receive</th>
<th class="acquisition">Company</th>
<th class="acquisition">Supplier</th>
<th class="acquisition">&nbsp;</th>
</tr>

36
koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
View File

@ -18,23 +18,19 @@
</p>
<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">Basket</th>
<th class="acquisition">Title</th>
<th class="acquisition">Est. cost</th>
<th class="acquisition">Qty ordered</th>
<th class="acquisition">P&amp;P</th>
<th class="acquisition">ACTUAL</th>
<th class="acquisition">QTY</th>
<th class="acquisition">TOTAL</th>
<th class="acquisition">Actual</th>
<th class="acquisition">Qty</th>
<th class="acquisition">Total</th>
</tr>
<!-- TMPL_LOOP NAME="loop_received" -->
<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
<td><!-- TMPL_VAR NAME="basketno" --></td>
<td><!-- TMPL_VAR NAME="isbn" --></td>
<td class="number"><!-- TMPL_VAR NAME="basketno" --></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" -->&catview=yes"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td><!-- TMPL_VAR NAME="ecost" --></td>
<td><!-- TMPL_VAR NAME="quantity" --></td>
<td></td>
@ -51,12 +47,10 @@
<th class="acquisition"></th>
<th class="acquisition"></th>
<th class="acquisition"></th>
<th class="acquisition"></th>
<th class="acquisition"></th>
<th class="acquisition"><!-- TMPL_VAR NAME="tototal" --></th>
</tr>
<tr>
<td colspan="7" rowspan=2 bgcolor="#ffdf61">
<td colspan="5" rowspan=2 bgcolor="#ffdf61">
<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>
@ -83,20 +77,18 @@
<p>
<form action="" method="get" name="orderform">
<table>
<table class="small">
<tr>
<th class="acquisition">BASKET</th>
<th class="acquisition">ISBN</th>
<th class="acquisition">TITLE</th>
<th class="acquisition">AUTHOR</th>
<th class="acquisition">Basket</th>
<th class="acquisition">Title</th>
<th class="acquisition"></th>
</tr>
<!-- TMPL_VAR NAME="countpending" -->
<!-- TMPL_LOOP NAME="loop_orders" -->
<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
<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 class="number"><!-- TMPL_VAR NAME="basketno" --></td>
<td><!-- TMPL_VAR NAME="title" --></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" -->" class="button acquisition">Recieve</td>
</tr>
<!-- /TMPL_LOOP -->
</table>

93
koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl
View File

@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
<div id="mainbloc">
<h1 class="acquisition">Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
<h1 class="acquisition">Receive parcel from supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
<!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> parcels found</p><!--/TMPL_IF-->
<div id="resultnumber">
@ -28,43 +28,72 @@
<!-- Search Results Table -->
<!-- TMPL_IF NAME="count" -->
<form method="post" action="recieveorder.pl">
<table>
<table class="small">
<tr>
<th class="acquisition">Number</th><th class="acquisition">Code</th><th class="acquisition">Date Received</th><th class="acquisition">Item Count</th><th class="acquisition">Biblio count</th><th class="acquisition">Items expected</th>
</tr>
<th class="acquisition">Line</th>
<th class="acquisition">Code</th>
<th class="acquisition">Date Received</th>
<th class="acquisition">Item Count</th>
<th class="acquisition">Biblio count</th>
<th class="acquisition">Items expected</th>
</tr>
<tr>
<th class="acquisition">&nbsp;<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->></th><th class="acquisition"><input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->"></th>
<th class="acquisition">From :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->"> <p>To :<input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->"></th><th class="acquisition">&nbsp;</th><th class="acquisition">Sort by :<select name="orderby" size="1">
<option value="aqorders.booksellerinvoicenumber"> Code</option>
<option value="datereceived"> Date Received</option>
<option value="datereceived desc"> Date Received reverse</option>
<option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
</select><br />
Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
<option value="20">20</option>
<option value="30">30</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
</th><th class="acquisition"><input type="submit" class="button acquisition" value="Filter">
</th>
</tr>
<th class="acquisition">
&nbsp;
<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
</th>
<th class="acquisition">
<input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->">
</th>
<th class="acquisition">
From :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->">
<p>To :<input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->">
</th>
<th class="acquisition">
&nbsp;
</th>
<th class="acquisition">
Sort by :<select name="orderby" size="1">
<option value="aqorders.booksellerinvoicenumber"> Code</option>
<option value="datereceived"> Date Received</option>
<option value="datereceived desc"> Date Received reverse</option>
<option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
</select><br />
Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
<option value="20">20</option>
<option value="30">30</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
</th>
<th class="acquisition">
<input type="submit" class="button acquisition" value="Filter">
</th>
</tr>
<!-- Actual Search Results -->
<!-- TMPL_LOOP NAME="searchresults" -->
<tr>
<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
<a href="/cgi-bin/koha/acqui/receive.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
<!-- TMPL_VAR NAME="number" -->
</a>
</td>
<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
<!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
</td>
<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR NAME="datereceived" --> </td>
<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR NAME="reccount" --> </td>
<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="bibcount" -->
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="number" -->
</td>
<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="itemcount" -->
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
<!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
</td>
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
<!-- /TMPL_IF -->
<a href="/cgi-bin/koha/acqui/receive.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
<!-- TMPL_VAR NAME="datereceived" -->
</a>
</td>
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
<!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="reccount" -->
</td>
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="bibcount" -->
</td>
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="itemcount" -->
</td>
</tr>
<!-- /TMPL_LOOP -->

12
koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
View File

@ -126,10 +126,16 @@
</div>
</div>
<!--TMPL_ELSE-->
<a href="recieveorder.pl?supplierid=<!--TMPL_VAR Name="id"-->" class="button acquisition"> Receive Parcel </a>
<a href="order.pl?supplier=<!--TMPL_VAR Name="name"-->" class="button acquisition"> Manage Orders </a>
<a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->" class="button acquisition"> Edit Supplier </a>
<h1 class="acquisition">Information for : <!-- TMPL_VAR NAME="name" --></h1>
<a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->" class="button acquisition">
Edit Supplier
</a>
<a href="order.pl?supplier=<!--TMPL_VAR Name="name"-->" class="button acquisition">
Manage Orders
</a>
<a href="recieveorder.pl?supplierid=<!--TMPL_VAR Name="id"-->" class="button acquisition">
Receive Parcel
</a>
<div id="bloc25">
<h2 class="acquisition">COMPANY DETAILS</h2>
<p>