[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/acqui n... [rel_2_2]
|
From: |
paul poulain |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/acqui n... [rel_2_2] |
|
Date: |
Tue, 04 Apr 2006 13:56:45 +0000 |
CVSROOT: /cvsroot/koha
Module name: koha
Branch: rel_2_2
Changes by: paul poulain <address@hidden> 06/04/04 13:56:45
Modified files:
koha-tmpl/intranet-tmpl/default/en/acqui: newbiblio.tmpl
order.tmpl
recieveorder.tmpl
recieve.tmpl
supplier.tmpl
Log message:
some minor spelling changes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl.diff?only_with_tag=rel_2_2&tr1=1.15.2.5&tr2=1.15.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl.diff?only_with_tag=rel_2_2&tr1=1.21.2.2&tr2=1.21.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl.diff?only_with_tag=rel_2_2&tr1=1.10.2.2&tr2=1.10.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl.diff?only_with_tag=rel_2_2&tr1=1.12.2.2&tr2=1.12.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl.diff?only_with_tag=rel_2_2&tr1=1.12.2.2&tr2=1.12.2.3&r1=text&r2=text
Patches:
Index: koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:1.15.2.5
koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:1.15.2.6
--- koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:1.15.2.5
Wed Dec 14 10:59:24 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl Tue Apr
4 13:56:44 2006
@@ -90,7 +90,7 @@
<!-- 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 @@
<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>
Index: koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:1.21.2.2
koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:1.21.2.3
--- koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:1.21.2.2 Mon Feb
20 14:58:46 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl Tue Apr 4
13:56:45 2006
@@ -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"> </th>
</tr>
Index: koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:1.12.2.2
koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:1.12.2.3
--- koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:1.12.2.2 Tue Feb
21 16:07:27 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl Tue Apr 4
13:56:45 2006
@@ -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&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" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR
NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&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" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR
NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&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" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR
NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!--
TMPL_VAR NAME="supplierid" -->" class="button acquisition">Recieve</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
Index: koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl
diff -u
koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl:1.10.2.2
koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl:1.10.2.3
--- koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl:1.10.2.2
Tue Feb 21 16:07:27 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl Tue Apr
4 13:56:45 2006
@@ -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"> <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"> </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">
+
+ <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">
+
+ </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&supplierid=<!-- TMPL_VAR
NAME="supplierid" ESCAPE=URL -->&datereceived=<!-- TMPL_VAR
NAME="datereceived" ESCAPE=URL --><!--TMPL_IF
Name="code"-->&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&supplierid=<!-- TMPL_VAR
NAME="supplierid" ESCAPE=URL -->&datereceived=<!-- TMPL_VAR
NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF
Name="code"-->&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 -->
Index: koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:1.12.2.2
koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:1.12.2.3
--- koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:1.12.2.2
Mon Feb 20 14:58:13 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl Tue Apr 4
13:56:45 2006
@@ -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>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/acqui n... [rel_2_2],
paul poulain <=