[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/acqui late... [rel_3_0]
|
From: |
paul poulain |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/acqui late... [rel_3_0] |
|
Date: |
Thu, 25 Jan 2007 09:40:47 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 07/01/25 09:40:47
Modified files:
koha-tmpl/intranet-tmpl/prog/en/acqui: lateorders.tmpl
orderreceive.tmpl
parcels.tmpl parcel.tmpl
Log message:
bugfixing (see .pl commits)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
Patches:
Index: lateorders.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- lateorders.tmpl 8 Jan 2007 15:46:51 -0000 1.2.2.2
+++ lateorders.tmpl 25 Jan 2007 09:40:47 -0000 1.2.2.3
@@ -32,14 +32,7 @@
<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 colspan="6">
</td>
Index: orderreceive.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/Attic/orderreceive.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- orderreceive.tmpl 9 Jan 2007 08:30:38 -0000 1.2.2.2
+++ orderreceive.tmpl 25 Jan 2007 09:40:47 -0000 1.2.2.3
@@ -4,13 +4,7 @@
<!-- 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>
-
-<div id="acqui_acquire_summary">
- Invoice: <!-- TMPL_VAR NAME="invoice" --></p>
- <p>Received By: <!-- TMPL_VAR NAME="user" --></p>
- <p>Date: <!-- TMPL_VAR NAME="daterecieved" --></p>
-</div>
+<h1>Receipt order for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF
NAME="invoice" -->Parcel <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF -->
(order #<!-- TMPL_VAR NAME="ordernumber" -->)</h1>
<!-- TMPL_IF name="count" -->
<div id="acqui_acquire_neworder">
@@ -28,90 +22,62 @@
//-->
</script>
<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 on: <!-- TMPL_VAR NAME="closedate" --></li>
- </ul>
-
- <h2>Catalogue Details</h2>
- <p><label>Title *</label><input type="text" size="20" name="title"
value="<!-- TMPL_VAR NAME="title" -->" /></p>
+ <fieldset>
+ <legend>Catalogue Details</legend>
+ <p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p>
<label>Author</label>
- <input type="text" size="20" name="author" value="<!-- TMPL_VAR
NAME="author" -->" />
+ <!-- TMPL_VAR NAME="author" -->
</p>
<p>
<label>Copyright Date</label>
- <input type="text" size="20" name="copyright" value="<!-- TMPL_VAR
NAME="copyrightdate" -->" />
+ <!-- TMPL_VAR NAME="copyrightdate" -->
</p>
- <!-- TMPL_IF NAME="itemtypeloop" -->
- <p>
- <label for="itemtype">Item Type</label>
- <select id="itemtype" name="itemtype">
- <option value="">Please choose</option>
- <!-- TMPL_LOOP name="itemtypeloop" -->
- <option value="<!-- TMPL_VAR name="value" -->">
- <!-- TMPL_VAR name="description" -->
- </option>
- <!-- /TMPL_LOOP -->
- </select>
- </p>
- <!-- /TMPL_IF -->
-
<p>
<label>ISBN</label>
- <input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR
NAME="isbn" -->" />
+ <!-- TMPL_VAR NAME="isbn" -->
</p>
<p>
<label>Series</label>
- <input type="text" size="20" name="Series" value="<!-- TMPL_VAR
NAME="seriestitle" -->" />
+ <!-- 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>
+ <label>Item Barcode</label>
<input type="text" size="20" name="barcode" value="<!-- TMPL_VAR
NAME="barcode" -->" />
</p>
<p>
- <label for="location">Location</label>
- <!-- TMPL_IF NAME="CGIlocation" -->
- <!-- TMPL_VAR NAME="CGIlocation" -->
- <!-- TMPL_ELSE -->
- <input id="location" type="text" size="20" name="location"
value="<!-- TMPL_VAR name="location" -->" />
- <!-- /TMPL_IF -->
- </p>
- <p>
- <label>Volume Info (for serials) *</label>
+ <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="biblionumber" 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="biblioitemnumber" value="<!-- TMPL_VAR
NAME="biblioitemnumber" -->" />
+ <input type="hidden" name="supplierid" value="<!-- TMPL_VAR
NAME="supplierid" -->" />
<input type="hidden" name="daterecieved" value="<!-- TMPL_VAR
NAME="daterecieved" -->" />
<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight"
-->" />
<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->" />
-
- <h2>Accounting Details</h2>
- <p><label>Bookfund *</label><!-- TMPL_VAR NAME="CGIbookfund" --></p>
+ </fieldset>
+ <fieldset>
+ <legend>Accounting Details</legend>
<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>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>Actual Cost</label>
+ <!-- TMPL_IF name="unitprice"-->
+ <input type="text" size="20" name="cost" value="<!-- TMPL_VAR
NAME="unitprice" -->" />
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="cost" value="<!-- TMPL_VAR
name="rrp" -->" />
+ <!-- /TMPL_IF --></p>
+ <input type="hidden" name="invoice" value="<!-- TMPL_VAR
NAME="invoice" -->" />
<p><label>Notes</label><input type="text" size="20" name="notes"
value="<!-- TMPL_VAR NAME="notes" -->" /></p>
<!-- TMPL_IF name="catview" -->
<input type="submit" name="submit" value="Save" />
<!-- TMPL_ELSE -->
<a href="/cgi-bin/koha/acqui/neworderempty.pl?ordnum=<!-- TMPL_VAR
NAME="ordernumber" -->&id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
<!-- /TMPL_IF -->
+ </fieldset>
</form>
</div>
<!-- TMPL_ELSE -->
Index: parcels.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- parcels.tmpl 31 Jul 2006 12:49:49 -0000 1.2
+++ parcels.tmpl 25 Jan 2007 09:40:47 -0000 1.2.2.1
@@ -1,8 +1,8 @@
- <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Recieve <!-- TMPL_VAR
name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Recieve <!-- TMPL_VAR
name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<h1 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>
+<h1>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">
@@ -32,29 +32,29 @@
<form method="post" action="parcels.pl">
<table class="small">
<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>
+ <th>Line</th>
+ <th>Code</th>
+ <th>Date Received</th>
+ <th>Item Count</th>
+ <th>Biblio count</th>
+ <th>Items expected</th>
</tr>
<tr>
- <th class="acquisition">
+ <th>
<input type="hidden" name="supplierid"
value=<!-- TMPL_VAR NAME="supplierid" -->>
</th>
- <th class="acquisition">
+ <th>
<input type="text" size="20" name="filter"
value="<!-- TMPL_VAR NAME="filter" -->">
</th>
- <th class="acquisition">
+ <th>
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>
- <th class="acquisition">
+ <th>
Sort by :<select name="orderby" size="1">
<option
value="aqorders.booksellerinvoicenumber"> Code</option>
<option value="datereceived"> Date
Received</option>
@@ -68,7 +68,7 @@
<option value="100">100</option>
</select>
</th>
- <th class="acquisition">
+ <th>
<input type="submit" class="button acquisition"
value="Filter">
</th>
</tr>
@@ -102,8 +102,9 @@
</table>
</form>
<!--/TMPL_IF-->
- <div id="bloc25">
- <h2 class="acquisition"> Receive a new Parcel </h2>
+ <div id="parcels_new_parcel">
+ <fieldset>
+ <legend>Receive a new Parcel </legend>
<form method="get" action="parcel.pl">
<p>
<input type="hidden" name="supplierid" value=<!--
TMPL_VAR NAME="supplierid" -->>
@@ -122,5 +123,6 @@
<input type="submit" class="button acquisition"
value="save">
</p>
</form>
+ </fieldset>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: parcel.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- parcel.tmpl 9 Jan 2007 09:42:40 -0000 1.1.2.3
+++ parcel.tmpl 25 Jan 2007 09:40:47 -0000 1.1.2.4
@@ -5,14 +5,14 @@
<h1>
<!-- TMPL_IF name="date" -->
- Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i>
<!--TMPL_IF Name="invoice"-->Invoice <i><!-- TMPL_VAR NAME="invoice"
--></i><!--/TMPL_IF --> on <i><!-- TMPL_VAR NAME="date" --></i>
+ Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i>
<!--TMPL_IF Name="invoice"-->Parcel <i><!-- TMPL_VAR NAME="invoice"
--></i><!--/TMPL_IF --> on <i><!-- TMPL_VAR NAME="date" --></i>
<!-- TMPL_ELSE -->
orders not yet recieved for <!-- TMPL_VAR NAME="name" -->
<!-- /TMPL_IF -->
</h1>
<div id="acqui_recieve_summary">
- <p>Invoice: <!-- TMPL_VAR NAME="invoice" --></p>
- <p>Received By: <!-- TMPL_VAR NAME="user" --></p>
+ <p>Parcel: <!-- TMPL_VAR NAME="invoice" --></p>
+ <p>Received by: <!-- TMPL_VAR NAME="loggedinusername" --></p>
<p>On: <!-- TMPL_VAR NAME="datereceived" --></p>
</div>
<div id="acqui_recieve_recievelist">
@@ -32,7 +32,7 @@
<!-- TMPL_LOOP NAME="loop_received" -->
<tr>
<td><!-- TMPL_VAR NAME="basketno" --></td>
- <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&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><a href="orderreceive.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber"
-->&daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&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>
<!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR
NAME="isbn" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR
NAME="author" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!--
TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
@@ -78,7 +78,7 @@
<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>
- <table> <caption>Pending Orders</caption>
+ <table> <caption>or select a pending orders</caption>
<tr>
<th class="acquisition">BASKET</th>
<th class="acquisition">Summary</th>
@@ -92,7 +92,7 @@
<tr>
<td><!-- TMPL_VAR NAME="basketno" --></td>
<td>
- <a href="orderreceive.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&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>
+ <a href="orderreceive.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber"
-->&daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&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>
<!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR
NAME="isbn" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR
NAME="author" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!--
TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->