From 0cb4db753523ec36eb0686d5ad465aa360f283fc Mon Sep 17 00:00:00 2001 From: oleonard Date: Thu, 28 Oct 2004 17:12:26 +0000 Subject: [PATCH] Initial review in upgrading templates to 2.2 --- .../npl/en/acqui/acqui-home.tmpl | 28 ++- .../intranet-tmpl/npl/en/acqui/basket.tmpl | 135 ++++++++----- .../intranet-tmpl/npl/en/acqui/newbiblio.tmpl | 186 +++++++----------- .../intranet-tmpl/npl/en/acqui/order.tmpl | 53 +++-- 4 files changed, 207 insertions(+), 195 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 e04e66b898..14794da4a0 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl @@ -10,11 +10,7 @@ Start, Recieve, or Modify Any Order - - - - - + @@ -58,6 +54,16 @@ + +
+

Pending Suggestions

+ + suggestions waiting Manage Suggestions + + No suggestions waiting + +
+
@@ -78,11 +84,13 @@ - - - - - + + + + + + +
Budgets and Bookfunds
Total
Total

Use your reload button [ctrl + r] to get the most recent figures. diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl index 38f5e65a5f..95968359a4 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl @@ -3,56 +3,89 @@

-

Shopping Basket for ">

-

(Our Reference: , #, authorised by: )

- - - - - - - - - - - - - - - "> - - - - - - - - - - - " /> - " /> - - - - - - - - - - - - - -
OrderIsbnTitleAuthor$ rrp$estQtyTotal
&id=&basket=">
- HELP -

To change any of the catalogue or accounting information attached to an order, click on the title.

- 		SubTotal
GST
TOTAL
-

- " /> - " /> - Add order : enter keyword or title: -

+

New Shopping Basket for ">


+ +
+ + + + + + + + + +
Basket Details
Basket Number:
Managed By:
Open On:
For:Supplier Id
Invoice Number:
Closed On:
" />" />
+
+ +
+ + + + + + + + + + + + + + + + + "> + + + + + + + + + + + + + > + "> + + + + + + + + + + + + + +
Order Details
OrderPublisher &order=biblioitems.publishercode">[order]ISBNTitleAuthorrrpestQtyTotalFund &order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]
&booksellerid=&basketno=">
+   + SubTotal
GST
TOTAL
+ + + + +
Order Details
Basket empty
+ +
+ +
+

Add To Order

+
+ "> + "> + +
+
+
+ diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl index 51453a96d4..97721c2ca8 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl @@ -24,17 +24,16 @@ function update(f){ ecost=rrp*(100-discount)/100 GST=0; if (gst_on){ - rrp=rrp*(1+); - GST=ecost*(); + rrp=rrp*(1+); + GST=ecost*(); } total=(ecost+GST)*quantity - - f.rrp.value=rrp - f.ecost.value=ecost - f.GST.value=GST - f.total.value=total + f.rrp.value=rrp; + f.ecost.value=ecost; + f.GST.value=GST; + f.total.value=total; } @@ -44,118 +43,79 @@ 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("


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

"); +win.document.write("
"); win.document.write(""); } //--> -
- - --> -" /> -" /> -" /> -" /> -" /> -" /> -" /> -" /> -" /> -" /> - - " value="" /> - - - -

- Order Details

-

Shopping Basket For:

-">View Basket -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Catalogue Details
Title *" />
Author" />
Copyright Date" /> -
Format
ISBN">
Series">
Branch
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Accounting Details
Quantity" onchange="update(this.form)" />
Bookfund
Suppliers List Price" onchange="update(this.form)" />
Replacement Cost
" onchange="update(this.form)" /> -
Budgeted Cost
(ex GST, inc discount) 		" onchange="update(this.form)" />
Budgeted GST
BUDGETED TOTAL
Actual Cost
Invoice Number *
Notes" />
- -
-

HELP

-
    -
  • Bold fields must be filled in to create a new bibilo and item.

    -

  • Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received. -
-
+
+
" />
+
+ + --> + " /> + " /> + " /> + " /> + " /> + " /> + " /> + " /> + " /> + "> + " /> + + " value="" /> + + +

+ Modify order details (line #) + + New order + + (created from suggestion #) +

+

Shopping Basket For

+
+ + + + + + + + + + +
Catalog Details
" />
" />
" />
" />
">
" />
+
+ +
+ + + + + + + + + + + + + + +
Accounting details
" onchange="update(this.form);" />
" onchange="update(this.form)" />
" onchange="update(this.form)" />
" onchange="update(this.form)" />
" />
" />
" />
" />
" />

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 e5cf9106f2..1d293abdb3 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl @@ -6,17 +6,17 @@ - - + @@ -24,23 +24,34 @@ - +
Supplier Search Results
OrderReceiveAction Company - - - - - - + + + + + + +
BasketItemsStaffDate
BasketItemsCreated byDate 
- /images/mail_send.png" title="Add order" ALT="Add" border="0" > + Add - /images/mail_get.png" title="receive" ALT="Add" border="0" > + Receive - - - - - - - - - -
">
+ + + + + + + + + + +
+ + + + + closed on + ">View + + ">Modify + +
-- 2.39.5