From ead96b8c8f6e2899fc5724122b11093fd5c3e9c9 Mon Sep 17 00:00:00 2001 From: oleonard Date: Tue, 12 Dec 2006 15:38:46 +0000 Subject: [PATCH] - adding edit currencies link to acqui-home (even if one or more currencies are configured) - re-synching acquire.tmpl and recieve.tmpl to try to iron out bugs --- .../npl/en/acqui/acqui-home.tmpl | 17 +- .../intranet-tmpl/npl/en/acqui/acquire.tmpl | 256 ++++++++---------- .../intranet-tmpl/npl/en/acqui/recieve.tmpl | 100 +++---- 3 files changed, 164 insertions(+), 209 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl index 99adbb699e..bd4bc9ff5d 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl @@ -26,9 +26,13 @@
- - +

Currencies

+ +

No Currencies Configured

+ + +
Exchange Rates
-
@@ -40,16 +44,13 @@
-
- - -
+ +Add Currency
-

Pending Suggestions

+

Pending Suggestions

suggestions waiting Manage Suggestions diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl index 9987da2fdb..d3ebc52efb 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl @@ -4,151 +4,117 @@
-

Receipt Summary for : Invoice,

+

Receipt Summary for: Invoice

-
  • Invoice:
    • -
  • Received By:
    • -
  • Date:
    • -
- - - -
-

- Receive Order

-
  • Shopping Basket For:
    • -
  • Order placed:
    • -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Catalogue Details
Title *" /> -
Author" /> -
Copyright Date" /> -
Format
ISBN" />
Series" />
Branch
Item Barcode *" />
Volume Info (for serials) *
- " /> - " /> - " /> - " /> - " /> - " /> - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Accounting Details
Bookfund * -
Quantity Ordered" /> -
Quantity Received *" /> -
Replacement Cost" /> -
Budgeted Cost " />
Actual Cost *" />
Invoice Number - - " /> - " /> -
Notes" />
-
- - - - - - - - - - - - - - - - - - - - - - -
BasketISBNTitleAuthorQtyReceived
&biblio=&invoice=&freight=&gst=&id=">
- + +
+

- Receive Order

+

Shopping Basket For:

+
Order placed:
+
+

Catalogue Details

+ + + + + + + + + + + +
Title: + +
Author: + +
Copyright Date: + +
Format: + +
ISBN: + +
Series: + +
+

Enter barcode(s) and branch if you want to add item(s) immediatly

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

Accounting details

+ + + + + + + + + + + + + + + + + + + + +
Bookfund: + +
Quantity Ordered: + + " /> +
" /> +
" /> +
Budgeted Cost: + +
"> +
Invoice Number: + "> + "> +
Notes: +
+ "> + "> + "> + "> + "> + "> +

(that all costs are for 1 item)

+
+
+ + + + + + + + + + + + + + + + + + + + +
BasketISBNTITLEAUTHORQtyReceived
&biblio=&invoice=&freight=&gst=&supplierid=">
+
+ diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl index e9f645f91a..37851e92f3 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl @@ -3,27 +3,23 @@
- -

- Receipt Summary for Invoice -

+

Receipt parcel for

-
    -
  • Invoice:
    • -
  • Received by:
    • -
  • Date:
    • -
+
    +
  • Invoice:
    • +
  • Date:
    • +
+

Items in parcel

-
- bibliographic record(s) received -
+

+ records received +

+ - - @@ -32,51 +28,40 @@ - - - - - - - - - - - + "> + + + + + + + + - - - - - - - - - - - - - - + - + - +
BasketISBN TitleAuthor Est. cost Qty ordered P&PTotal
&biblio=&invoice=&gst=&freight=&supplierid=&catview=yes&datereceived="> 
&biblio=&invoice=&gst=&freight=&supplierid=&catview=yes&datereceived=">
         
-

HELP

-

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

+ 		+   GSTGST:
FREIGHTFREIGHT:
TOTALTOTAL:
+
+ Note: The total at the bottom of the page should be within a few cents of the total for the invoice. +
+
-
-

Pending orders

+
+

Pending orders

"> "> @@ -85,26 +70,29 @@ Search ISBN or Title:
-
- - +

+
+ +

- - + + + - + lines "> - - - - + + + + +
BasketISBN TitleAuthorOrderedReceived 
&biblio=&invoice=&gst=&freight=&supplierid=&datereceived=&catview=yes"">&biblio=&invoice=&gst=&freight=&supplierid=&datereceived=&catview=yes" class="button acquisition">Recieve
-
+ -- 2.39.5