[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui... [rel_2_2]
|
From: |
Ryan Higgins |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui... [rel_2_2] |
|
Date: |
Sun, 15 Jul 2007 16:48:45 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Ryan Higgins <rych> 07/07/15 16:48:45
Modified files:
koha-tmpl/intranet-tmpl/npl/en/acqui: acqui-home.tmpl
acquire.tmpl
newbiblio.tmpl
recieve.tmpl
recieveorder.tmpl
Log message:
adding multi-item add and fix some javascript ; prevent user from
inputting invoice number at order creation; change ParcelCode to Invoice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.7&r2=1.3.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.9&r2=1.2.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.7&r2=1.1.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.5&r2=1.1.2.6
Patches:
Index: acqui-home.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/acqui-home.tmpl,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -b -r1.3.2.7 -r1.3.2.8
--- acqui-home.tmpl 12 Dec 2006 15:38:46 -0000 1.3.2.7
+++ acqui-home.tmpl 15 Jul 2007 16:48:45 -0000 1.3.2.8
@@ -11,7 +11,7 @@
<!-- TMPL_ELSE -->
<div class="details">
<form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
-<caption>Start, Recieve, or Modify Any Order</caption>
+<caption>Start, Receive, 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>
@@ -23,7 +23,7 @@
<!-- /TMPL_IF -->
-<!-- currencies-->
+<!--
<div class="details">
<!-- TMPL_IF NAME="loop_currency" -->
<h4>Currencies</h4>
@@ -47,7 +47,7 @@
</table><input type="submit" class="submit" value="Update Exchange Rates"
/><!-- /TMPL_IF -->
<a href="/cgi-bin/koha/admin/currency.pl?op=add_form">Add Currency</a>
</div>
-
+-->
<!-- suggestions -->
<div class="details">
<h4>Pending Suggestions</h4>
Index: acquire.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/acquire.tmpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- acquire.tmpl 12 Dec 2006 15:38:46 -0000 1.1.2.6
+++ acquire.tmpl 15 Jul 2007 16:48:45 -0000 1.1.2.7
@@ -1,14 +1,60 @@
-<!-- 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="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="masthead.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<script type="text/javascript" >
+
+function countItemBlocks() {
+ var outeritemblock = document.getElementById('outeritemblock');
+ var quantityrec = document.getElementById('quantityrec');
+ var origquantityrec = document.getElementById('origquantityrec');
+ var itemblockcount = outeritemblock.getElementsByTagName('div');
+ var num = parseFloat(origquantityrec.value) + itemblockcount.length;
+ quantityrec.setAttribute('value',num);
+}
+function deleteItemBlock(index) {
+ var aDiv = document.getElementById(index);
+ aDiv.parentNode.removeChild(aDiv);
+ countItemBlocks();
+}
+function cloneItemBlock(index) {
+ var original = document.getElementById(index); //original <div>
+ var clone = original.cloneNode(true);
+ // set the attribute for the new 'div' subfields
+ clone.setAttribute('id',index + index);//set another id.
+ var NumTabIndex;
+ NumTabIndex = parseInt(original.getAttribute('tabindex'));
+ if(isNaN(NumTabIndex)) NumTabIndex = 0;
+ clone.setAttribute('tabindex',NumTabIndex+1);
+ var CloneButtonPlus;
+ var CloneButtonMinus;
+ // try{
+ CloneButtonPlus = clone.getElementsByTagName('a')[0];
+ CloneButtonPlus.setAttribute('onclick',"cloneItemBlock('" + index +
index + "')");
+ CloneButtonMinus = clone.getElementsByTagName('a')[1];
+ CloneButtonMinus.setAttribute('onclick',"deleteItemBlock('" + index +
index + "')");
+ CloneButtonMinus.setAttribute('style',"display:inline");
+ // }
+ //catch(e){ // do nothig if ButtonPlus & CloneButtonPlus don't
exist.
+ //}
+ // insert this line on the page
+ original.parentNode.insertBefore(clone,original.nextSibling);
+ countItemBlocks();
+}
+
+</script>
+
<div id="main">
+<h1>Receipt Summary </h1>
<h1>Receipt Summary for: <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!--
TMPL_VAR NAME="invoice" --></i></h1>
-
+<h2>Supplier: <i><!-- TMPL_VAR NAME="name" --></i></h2>
+<h2> Invoice: <i><!-- TMPL_VAR NAME="invoice" --></i></h2>
+<hr />
<!-- TMPL_IF name="count" -->
<form action="/cgi-bin/koha/acqui/finishreceive.pl"
method="post">
- <h1><!-- TMPL_VAR NAME="ordernumber" --> - Receive Order</h1>
+ <h2>Order # <!-- TMPL_VAR NAME="ordernumber" --></h2>
<h4>Shopping Basket For: <!-- TMPL_VAR NAME="name" --></h4>
<h5>Order placed: <!-- TMPL_VAR NAME="date" --></h5>
<div class="box">
@@ -37,18 +83,43 @@
<td><strong>Series:</strong></td><td>
<!-- TMPL_VAR NAME="seriestitle" -->
</td></tr></table>
- <p>Enter barcode(s) and branch if you want to add
item(s) immediatly</p>
- <table><tr>
+
+ <p>Enter barcode(s) and branch if you want to add
item(s) to the catalog now</p>
+ <div id="outeritemblock">
+ <div id="itemblock">
+ <table>
+ <tr>
<td><label for="">Branch:</label></td>
<td><!-- TMPL_VAR NAME="CGIbranch" --></td>
</tr>
+ <!-- TMPL_IF NAME="CGIitype" -->
+ <tr>
+ <td><label for="">Item type:</label></td>
+ <td><!-- TMPL_VAR NAME="CGIitype" --></td>
+ </tr>
+ <!-- /TMPL_IF -->
+ <tr>
+ <td><label for="">Location:</label></td>
+ <td><!-- TMPL_IF NAME="CGIlocation" --><!--
TMPL_VAR NAME="CGIlocation" -->
+ <!-- TMPL_ELSE --><input type="text"
size="20" name="location" value="<!-- TMPL_VAR name="location" -->" />
+ <!-- /TMPL_IF --></td>
+ </tr>
+ <tr>
+ <td><label for="">Item CallNumber: </label></td>
+ <td><input type="text" size="20" name="itemcallnumber"
value="<!-- TMPL_VAR name="itemcallnumber" -->" /></td>
+ </tr>
<tr>
<td><label for="">Item Barcode: *</label></td>
<td><input type="text" size="20" name="barcode"
value="<!-- TMPL_VAR name="barcode" -->" /></td>
</tr></table>
+ <a style="cursor: crosshair; color: grey; font-size: 180%;"
onclick="cloneItemBlock('itemblock<!-- TMPL_VAR name="itemBlockIndex"
-->')">+</a>
+ <a style="display:none; cursor: crosshair; color: grey; font-size: 180%;"
onclick="deleteItemBlock('itemblock<!-- TMPL_VAR name="itemBlockIndex"
-->')">-</a>
</div>
+ </div>
+ </div>
+
<div class="box">
- <h2>Accounting details</h2>
+ <h2>Accounting details (per item)</h2>
<table><tr>
<td><strong>Bookfund:</strong></td><td>
<!-- TMPL_VAR NAME="bookfund" -->
@@ -59,8 +130,9 @@
<input type="hidden" name="quantity"
value="<!-- TMPL_VAR NAME="quantity" -->" />
</td></tr>
<tr>
- <td><label for="">Quantity Received:
*</label></td>
- <td><input type="text" size="20"
name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" />
+ <td><label for="">Total Items Received:
</label></td>
+ <td><input id="quantityrec" READONLY
type="text" size="20" name="quantityrec" value="<!-- TMPL_IF
NAME="quantityreceived" --><!-- TMPL_VAR NAME="quantityreceivedplus1" --><!--
TMPL_ELSE -->1<!-- /TMPL_IF -->" />
+ <input id="origquantityrec" READONLY
type="hidden" name="origquantityrec" value="<!-- TMPL_IF
NAME="quantityreceived" --><!-- TMPL_VAR NAME="quantityreceived" --><!--
TMPL_ELSE -->0<!-- /TMPL_IF -->" />
</td></tr>
<tr>
<td><label for="">Replacement Cost:</label></td>
@@ -72,7 +144,7 @@
</td></tr>
<tr>
<td><label for="">Actual Cost: *</label></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><input type="text" size="20" name="cost"
value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!--
TMPL_ELSE --><!-- TMPL_VAR name="ecost" --><!-- /TMPL_IF -->">
</td></tr>
<tr>
<td><strong>Invoice Number:</strong></td>
@@ -90,7 +162,7 @@
<input type="hidden" name="supplierid"
value="<!-- TMPL_VAR NAME="supplierid" -->">
<input type="hidden" name="freight" value="<!--
TMPL_VAR NAME="freight" -->">
<input type="hidden" name="gst" value="<!--
TMPL_VAR NAME="gst" -->">
-<p><input type="submit" class="submit" value="Save"> (that all costs are for 1
item)</p>
+<p><input type="submit" class="submit" value="Save"> </p>
</div>
</form>
<!-- TMPL_ELSE -->
@@ -116,5 +188,4 @@
</table>
<!-- /TMPL_IF -->
</div>
-
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: newbiblio.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/newbiblio.tmpl,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -u -b -r1.2.2.9 -r1.2.2.10
--- newbiblio.tmpl 25 Sep 2006 19:01:02 -0000 1.2.2.9
+++ newbiblio.tmpl 15 Jul 2007 16:48:45 -0000 1.2.2.10
@@ -24,15 +24,15 @@
gst_on=(!listinc && applygst);
//do real stuff
rrp=listprice*exchangerate;
- ecost=rrp*(100-discount)/100
+ ecost=rrp*(100-discount)/100;
+ gst_rate =<!-- TMPL_IF NAME="gstrate" --><!-- TMPL_VAR NAME="gstrate"
--><!-- TMPL_ELSE -->0<!-- /TMPL_IF -->;
GST=0;
if (gst_on){
- rrp=rrp*(1+<!-- TMPL_VAR NAME="gstrate" -->);
- GST=ecost*(<!-- TMPL_VAR NAME="gstrate" -->);
+ rrp = rrp*(1 + gst_rate );
+ GST=ecost*(gst_rate);
}
- total=(ecost+GST)*quantity
-
+ total=(ecost+GST)*quantity;
f.rrp.value=rrp;
f.ecost.value=ecost;
f.GST.value=GST;
@@ -156,8 +156,8 @@
<tr><th><label for="ecost">Budgeted Cost</label></th><td><input
type="text" size="20" id="ecost" name="ecost" value="<!-- TMPL_VAR NAME="ecost"
-->"<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF-->
/></td></tr>
<!-- TMPL_IF NAME="GST" --><tr><th><label for="GST">Budgeted
GST</label></th><td><input type="text" size="20" id="GST" name="GST"
value=""<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF-->
/></td></tr><!-- TMPL_ELSE --><input type="hidden" name="GST" value="0" /><!--
/TMPL_IF -->
<tr><th><label for="total"><strong>BUDGETED
TOTAL</strong></label></th><td><input type="text" size="20" id="total"
name="total" value=""<!-- TMPL_IF name="close" -->
readonly="readonly"<!--/TMPL_IF--> /></td></tr>
- <tr><th><label for="cost">Actual Cost</label></th><td><input
type="text" size="20" id="cost" name="cost" value="<!-- TMPL_VAR
name="ecost"-->"<!-- TMPL_IF name="close" -->
readonly="readonly"<!--/TMPL_IF--> /></td></tr>
- <tr><th><label for="invoice">Invoice Number
*</label></th><td><input type="text" size="20" id="invoice" name="invoice"
value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
+ <tr><th><label for="cost">Actual Cost</label></th><td><input
type="text" size="20" id="cost" name="cost" value="<!-- TMPL_VAR
name="ecost"-->" readonly="readonly" style="background-color:#ccc;" /></td></tr>
+ <tr><th><label for="invoice">Invoice
Number</label></th><td><input type="text" size="20" id="invoice" name="invoice"
value="<!-- TMPL_VAR name="invoice" -->" readonly="readonly"
style="background-color:#ccc;" /></td></tr>
<tr><th><label for="notes-details">Notes</label></th><td><input
type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR
NAME="notes" -->" /></td></tr>
<tr><th><label for="sort1">Sort field 1</label></th><td>
<!-- TMPL_IF Name="CGIsort1" -->
Index: recieve.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/recieve.tmpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- recieve.tmpl 12 Dec 2006 15:38:46 -0000 1.1.2.7
+++ recieve.tmpl 15 Jul 2007 16:48:45 -0000 1.1.2.8
@@ -1,9 +1,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for :
<!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --><!--
TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE name="acqui-full-topmenu.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
- <h1>Receipt parcel for <em><!-- TMPL_VAR NAME="name" --></em></h1>
+ <h1>Receive parcel for <em><!-- TMPL_VAR NAME="name" --></em></h1>
<ul class="notes">
<li><strong>Invoice:</strong> <!-- TMPL_VAR NAME="invoice"
--></li>
@@ -88,7 +89,7 @@
<td><!-- TMPL_VAR NAME="title" --></td>
<td class="number"><!-- TMPL_VAR
NAME="quantity" --></td>
<td class="number"><!-- TMPL_VAR
NAME="quantityrecieved" --></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" -->&datereceived=<!-- TMPL_VAR
name="datereceived"-->&catview=yes" class="button acquisition">Recieve</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" -->&datereceived=<!-- TMPL_VAR
name="datereceived"-->&catview=yes" class="button acquisition">Receive</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
Index: recieveorder.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/recieveorder.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- recieveorder.tmpl 13 Sep 2006 19:28:26 -0000 1.1.2.5
+++ recieveorder.tmpl 15 Jul 2007 16:48:45 -0000 1.1.2.6
@@ -81,7 +81,7 @@
<form method="get" action="receive.pl">
<table><tr><th><input type="hidden" name="supplierid"
value="<!-- TMPL_VAR NAME="supplierid" -->" />
- <label for="invoice">Parcel Code</label></th>
+ <label for="invoice">Supplier Invoice</label></th>
<td><input type="text" size="20" id="invoice"
name="invoice" /></td></tr>
<!-- TMPL_IF NAME="GST" --> <tr><th><label
for="gst">GST</label></th>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui... [rel_2_2],
Ryan Higgins <=