From 3971be1309b1e53bfd8ade1ac5ca2f9406cebe0b Mon Sep 17 00:00:00 2001 From: oleonard Date: Mon, 2 May 2005 18:06:45 +0000 Subject: [PATCH] Synching with rel_2_2. --- .../npl/en/acqui.simple/addbiblio.tmpl | 754 ++++++++++-------- .../npl/en/acqui.simple/addbooks.tmpl | 62 +- .../npl/en/acqui.simple/additem.tmpl | 125 +-- .../npl/en/acqui.simple/isbnsearch.tmpl | 134 ++-- .../intranet-tmpl/npl/en/acqui/basket.tmpl | 57 +- .../intranet-tmpl/npl/en/acqui/newbiblio.tmpl | 80 +- .../intranet-tmpl/npl/en/acqui/order.tmpl | 36 +- .../intranet-tmpl/npl/en/acqui/recieve.tmpl | 1 - .../npl/en/acqui/recieveorder.tmpl | 4 +- .../npl/en/acqui/suggestion-select.tmpl | 2 +- .../npl/en/authorities/auth_finder.tmpl | 19 +- .../npl/en/authorities/authorities-home.tmpl | 29 +- .../npl/en/authorities/authorities.tmpl | 13 +- .../en/authorities/detail-biblio-search.tmpl | 13 +- .../npl/en/authorities/detail.tmpl | 13 +- .../en/authorities/searchresultlist-auth.tmpl | 11 +- .../npl/en/authorities/searchresultlist.tmpl | 31 +- .../en/bookshelves/addbookbybiblionumber.tmpl | 22 +- 18 files changed, 808 insertions(+), 598 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl index 7e865c49e9..f117bea4c5 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl @@ -1,337 +1,441 @@ Koha -- Cataloging: Edit MARC Record Number Add MARC Record - + +
-
- - -"> -" /> -

Edit MARC Record Number Add MARC Record ( Framework)(Default Framework)

+ +

Edit MARC Record Number Add MARC Record

+ + + +
+ + " /> + " /> - + - + - - - -
- Page 1 - Page 2 -Page 3 -Page 4 -Page 5 -Page 6 -Page 7 -Page 8 -Page 9 -Page 10 -
+
+ + +
+ + 0 + + + 1 + + + 2 + + + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + +
-
-
+
-

Possible duplicate of &popup=1" onclick="openWindow('../MARCdetail.pl?bib=&popup=1', 'Duplicate biblio'); return false;">

-

Please choose an option:

-
    -
  1. Check here to confirm it's not a duplicate (and click the 'Add' button again).
    2. -
  2. " class="button catalogue">Edit the items of the existing record.
    3. -
+

Is this a duplicate of " onclick="openWindow('../MARCdetail.pl?bib=&popup=1', 'Duplicate biblio'; return false;)">?

+

You must either :

+
- - + - +

+ + " /> + " /> - + + ')">+ + +

- - - - - - - + +

+ + + " /> + " /> + " /> + " /> + " /> +

-
" />" /> - )">+
*  - - " /> - " /> - " /> - " /> - " /> -
- -
- - + + +
+ -
+

+ + " /> + " /> - + + ')">+ + +

- - - - - - - + +

+ + + " /> + " /> + " /> + " /> + " /> +

-
" />" /> - )">+
  * - - " /> - " /> - " /> - " /> - " /> -
- -
- - + + +
+ -
+

+ + " /> + " /> - + + ')">+ + +

- - - - - - - + +

+ + + " /> + " /> + " /> + " /> + " /> +

-
" />" /> - )">+
  * - - " /> - " /> - " /> - " /> - " /> -
- -
- - + + +
+ -
+

+ + " /> + " /> - + + ')">+ + +

- - - - - - - + +

+ + + " /> + " /> + " /> + " /> + " /> +

-
" />" /> - )">+
  * - - " /> - " /> - " /> - " /> - " /> -
- -
- - + + +
+ -
+

+ + " /> + " /> - + + ')">+ + +

- - - - - - - + +

+ + + " /> + " /> + " /> + " /> + " /> +

-
" />" /> - )">+
  * - - " /> - " /> - " /> - " /> - " /> -
- -
- - + + +
+ -
+

+ + " /> + " /> - + + ')">+ + +

- - - - - - - + +

+ + + " /> + " /> + " /> + " /> + " /> +

-
" />" /> - )">+
  * - - " /> - " /> - " /> - " /> - " /> -
- -
- - + + +
+ -
+

+ + " /> + " /> - + + ')">+ + +

- - - - - - - + +

+ + + " /> + " /> + " /> + " /> + " /> +

-
" />" /> - )">+
  * - - " /> - " /> - " /> - " /> - " /> -
- -
- - + + +
+ -
+

+ + " /> + " /> - + + ')">+ + +

- - - - - - - + +

+ + + " /> + " /> + " /> + " /> + " /> +

-
" />" /> - )">+
  * - - " /> - " /> - " /> - " /> - " /> -
- -
- - + + +
+ -
+

+ + " /> + " /> - + + ')">+ + +

- - - - - - - + +

+ + + " /> + " /> + " /> + " /> + " /> +

-
" />" /> - )">+
  * - - " /> - " /> - " /> - " /> - " /> -
- -
- - + + +
+ -
+

+ + " /> + " /> - + + ')">+ + +

- - - - - - - + +

+ + + " /> + " /> + " /> + " /> + " /> +

-
" />" /> - )">+
  * - - " /> - " /> - " /> - " /> - " /> -
- -
- - - - - - - - -
  * - - - " /> - " /> - " /> - " /> - " /> -
- - " /> - " /> - " /> - - " /> - " /> - " /> - " /> - - " /> - " /> - - -
+ +
+ + " /> + " /> + " /> + " /> + " /> +
+

+ + " /> + " /> + " /> + + " /> + " /> + " /> + " /> + + " /> + " /> + + +
- + diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbooks.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbooks.tmpl index 17c571588e..946850ef46 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbooks.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbooks.tmpl @@ -4,25 +4,35 @@
-

Catalog Maintenance

- -

 

- No items found - - -
-
  • If the ISBN is found into the biblio table, it will be retrieved and can be modified.
    • -
  • If the ISBN is found into the reservoir, it will be retrieved, and a biblio added.
    • -
  • Otherwise, a biblio can be added from scratch.
-
- - -
Search Existing Records
-

+

Catalog Maintenance

+ + No items found + + +
+
+ + + + + + +
Search Existing Records
+ + +
+ + + +
+

+
  • If the ISBN is found into the database, that record will be retrieved and can be modified.
    • +
  • If the ISBN is found in the reservoir, it will be retrieved and a full record added.
    • +
  • Otherwise, a record can be added from scratch.
+ - -

+

@@ -32,22 +42,16 @@ - -
-

+ +
- - - +//Display for NPL --> diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl index e201dc195b..d389d5e10e 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl @@ -4,63 +4,69 @@
+

Edit Items for Bibliographic Record

-

Items for Bibliographic Record

-
-
">
">
-
-
Date Accessioned must be entered in this format: yyyy-mm-dd
- -
- - - - - - - - - - +
">
" />
">
">
">
+ + + " /> + "> + +
+
Existing Items
 
&itemnum=">Edit ,)">Delete
+ + + + + + + + + + + + + + +
Existing items
+ +  
&itemnum=">Edit,)">Delete
+
+ + +
+ + + + + + + + + + - -
Add ItemEdit Item
+ "> + "> + ">
+ + + "> + +
ERROR : Barcode already exists !
+ + + + + "> + "> + "> + + +
- - -
ERROR: Barcode already exists!
- -
-

Add New ItemUpdate Item

-
-"> -"> - - - - - - - -
* - - "> - "> - "> -
-"> - - - - -"> -"> -"> - - -
-
- - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/isbnsearch.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/isbnsearch.tmpl index 3c4291c57c..9fdb761af4 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/isbnsearch.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/isbnsearch.tmpl @@ -2,77 +2,91 @@ -

Biblio Search Results for ISBN title

+

Search Results for ISBN title

- results found
-Results to displayed +Results to of
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + -
Existing Bibliographic Records
TitleAuthor©Call Number 
"> -  ">Add items">Edit Record
TitleAuthor©Call Number  
"> ">Add items">Edit Biblio">Edit Items&op=duplicate">Duplicate
Nothing found
+ + + +
- - - - - - - - - - - - - - - - -
Bibliographic Records in the Reservoir
TitleAuthorISBNcoming from  
- ">Add biblio

No records found in the Reservoir

+ + Title + Author + ISBN + coming from +   +   + + + + + + + + + + + ">Add biblio + + + + +

No records found in the Reservoir

Create a New Record

@@ -87,4 +101,4 @@ Results to di
- \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl index c715af0d4d..bb721f58ab 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl @@ -5,7 +5,7 @@

New Shopping Basket for ">


-
+
@@ -13,30 +13,32 @@ - - -
Basket Details
Basket Number:
Open On:
For:Supplier Id
Invoice Number:
Closed On:
" />" />
+ Closed On: +
" />" />
-
+
- - - - - - - - - - + + + + + + + + + + + + + - "> - + + @@ -46,23 +48,28 @@ + + + - > - "> + - - - + + - + - +
Order Details
OrderPublisher &order=biblioitems.publishercode">[order]ISBNTitleAuthorrrpestQtyTotalFund &order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]Order&order=biblioitems.publishercode">PublisherISBNTitleAuthorrrpestQtyTotal&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">FundRemove
&booksellerid=&basketno="> +
" />" />" />
+
-   + +  " /> + " /> SubTotal SubTotal  
GSTGST
TOTALTOTAL
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl index 97721c2ca8..18266ca503 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl @@ -7,6 +7,9 @@ function update(f){ //collect values quantity=f.quantity.value + if (quantity ==0) { + alert("Quantity must be >0"); + } discount=f.discount.value listinc=parseInt(f.listinc.value) currency=f.currency.value @@ -34,19 +37,31 @@ function update(f){ f.ecost.value=ecost; f.GST.value=GST; f.total.value=total; - + return true; } - - function messenger(X,Y,etc){ -win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0"); -win.focus(); -win.document.close(); -win.document.write("


"); -win.document.write(etc); -win.document.write("

"); -win.document.write(""); + win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0"); + win.focus(); + win.document.close(); + win.document.write("


"); + win.document.write(etc); + win.document.write("

"); + win.document.write(""); +} + +function check(f) { + quantity=f.quantity.value + title=f.title.value + if (title == "") { + alert("Title can't be empty"); + return false; + } + if (quantity ==0) { + alert("Quantity must be >0"); + return false; + } + document.frusin.submit(); } //--> @@ -79,21 +94,43 @@ win.document.write(""); (created from suggestion #)

Shopping Basket For

-
+
- - - - + + + + - - + +
Catalog Details
" />
" />
" />
" />
+ " /> + " />
+ " /> + + " /> +
+ " /> + + " /> +
+ " /> + + " /> +
">
" />
+ " /> + + " /> +
+ " /> + + " /> +
-
+
@@ -105,12 +142,13 @@ win.document.write(""); - + -
Accounting details
" onchange="update(this.form);" />
" />
" />
" />
" />
" />
" />

The 'Sort' fields are available for your own usage. They can be useful for stat purposes

+
+

The 'Sort' fields are available for your own usage. They can be useful for stat purposes

- +

diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl index 38df6dbde7..41c9eb6199 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl @@ -6,36 +6,34 @@ - + + - + -
Supplier Search Results
ActionOrderReceive Company - - - - - - - - -
BasketItemsCreated byDate 
- 		Exisiting Baskets
- Add + + Add Order Inactive Receive - +
+ + + + + + + - + -
BasketItemsCreated byDate 
@@ -43,15 +41,15 @@ - closed on - ">View + Closed on + ">(View) ">Modify
+
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl index 728ca74b60..f0d1ee38f4 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl @@ -59,7 +59,6 @@ HELP

The total at the bottom of the page should be within a few cents of the total for the invoice.

-

When you have finished this invoice save the changes.

GST $ diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl index 4481cd49ca..b8704dd8f1 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl @@ -7,10 +7,10 @@
" /> -
+
- + diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl index b5befcc485..41c8d7e36e 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl @@ -38,7 +38,7 @@ , +
Supplier Invoice Information
Supplier Invoice Number - , + , diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/auth_finder.tmpl index 68951baafa..2b37ee998b 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/authorities/auth_finder.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/auth_finder.tmpl @@ -1,20 +1,25 @@ - -
+Koha -- Authorities + + + + -

Authority search

+
+ +

Authority search

">
-

Search on

+

Search on

- +

- "> + "> "> @@ -28,5 +33,5 @@

- + diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl index 6291a98910..e728151ac0 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl @@ -6,27 +6,40 @@
-
+ " /> - +
- - -
Authority search
" /> - +
" /> + -
- +
"> + + + +
+

+ +

+ diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl index ef9e238ad4..aa84ad3ac9 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl @@ -1,9 +1,15 @@ - +Koha -- Authorities + + + + + +
/includes/marc-editor.css">
-

Authority number

+

Authority number

@@ -170,5 +176,4 @@ function AddField(field) { document.f.submit(); } - - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/detail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/detail-biblio-search.tmpl index aef9c39316..d46533fcf1 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/authorities/detail-biblio-search.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/detail-biblio-search.tmpl @@ -1,7 +1,13 @@ - +Koha -- Authorities + + + + + +

/includes/marc-editor.css">
-

Authority number :

+

Authority number :

"> //images/fileopen.png"> @@ -82,5 +88,4 @@ if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.documen } - - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl index a21fae6662..98017e94c4 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl @@ -1,7 +1,13 @@ - +Koha -- Authorities + + + + + +
/includes/marc-editor.css">
-

Authority number :

+

Authority number :

"> //images/fileopen.png"> @@ -44,5 +50,4 @@ function Dopop(link) { newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes'); } - - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl index 56c9ffa3f8..0782608ba0 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl @@ -1,5 +1,10 @@ - -
+Koha -- Authorities + + + + + +

Authority search results

@@ -114,4 +119,4 @@ function jumpfull(page) window.open(page,'','fullscreen,scrollbars'); } - + diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl index ca52c32036..afc0fbc8c6 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl @@ -1,10 +1,15 @@ - -
+Koha -- Authorities + + + + + +

Authority search results

- +