From 972a467841a29d4a4db3e6df289e513b1ce8682d Mon Sep 17 00:00:00 2001 From: tipaul Date: Thu, 17 Jun 2004 08:19:40 +0000 Subject: [PATCH] css'ing acquisitions --- .../default/en/acqui/acquire.tmpl | 297 ++++++++---------- .../default/en/acqui/basket.tmpl | 117 ++++--- .../default/en/acqui/newbasket2.tmpl | 207 ++++++------ .../default/en/acqui/newbiblio.tmpl | 220 ++++++------- .../intranet-tmpl/default/en/acqui/order.tmpl | 24 +- .../default/en/acqui/recieve.tmpl | 144 ++++----- .../default/en/acqui/recieveorder.tmpl | 56 ++-- .../default/en/acqui/supplier.tmpl | 284 ++++++++--------- 8 files changed, 635 insertions(+), 714 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl index be98c67609..e0c8e212f4 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl @@ -1,162 +1,143 @@ -
-Invoice:
-Received By:
- -
-

Receipt Summary for: Invoice

-
- +
+

Receipt Summary for: Invoice

+
+ Invoice:
+ Received By:
+ +
- - -
-

- Receive Order


- Shopping Basket For: -
Order placed: -

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/images/background-mem.gif" colspan=2> - CATALOGUE DETAILS -
Title *" > -
Author" > -
Copyright Date" > -
Format
ISBN">
Series">
Branch
Item Barcode *">
Volume Info (for serials) *
- > - > - > - "> - "> - "> - - - - &id=>Edit - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/images/background-mem.gif" colspan=2>ACCOUNTING DETAILS
Bookfund * -
Quantity Ordered"> -
Quantity Received *"> -
Replacement Cost"> -
Budgeted Cost ">
Actual Cost *">
Invoice Number - - "> -
Notes">
- -
-
-

 

- -
-
- - - - - - - - - - + + + +

- Receive Order

+ Shopping Basket For: +
Order placed: +
+

catalogue details

+

+ + " > +

+

+ + " > +

+

+ + " > +

+

+ + +

+

+ + "> +

+

+ + "> +

+

+ + +

+

+ + "> +

+

+ + +

+

+ > + > + > + "> + "> + "> + + + + &id="> + Edit + + +

+
+
+

Accounting details

+

+ + +

+

+ + "> +

+

+ + "> +

+

+ + "> +

+

+ + "> +

+

+ + "> +

+

+ + + "> +

+

+ +

+

+ + + +
BasketISBNTITLEAUTHORQtyReceived
">
- - - - - - - - -
&biblio=&invoice=&freight=&gst=&id=>
- + Basket + ISBN + TITLE + AUTHOR + Qty + Received + + + + + + &biblio=&invoice=&freight=&gst=&id=> + + + + + + + +
+ diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl index 68a8ca0e7f..8efd6b54a0 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl @@ -1,63 +1,62 @@ -

Shopping Basket for >


-Our Reference: , # authorised by
-
-

- - - - - - - - - - - - - - "> - - - - - - - - - +
+

Shopping Basket for >


+ Our Reference: , # authorised by
+

+

Order PublisherIsbnTitleAuthor$ rrp$estQty Total
&id=&basket=">
+ + + + + + + + + + - - > - "> - - - - - - - - - - - - - - - - - -
OrderPublisherIsbnTitleAuthor$ rrp$estQtyTotal
- 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: -
-
-

- + + "> + + + + &id=&basket="> + + + + + + + + > + "> + + +   + + SubTotal + + + + GST + + + + TOTAL + + + + +
+ "> + "> + Add order : enter keyword or title: +
+ + + + +
+ diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl index fddad9d296..bd0a248b1e 100755 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl @@ -1,108 +1,105 @@ +
+

Shopping Basket For:

+ + &basket=&sub="> + //images/filenew.png" border=0 alt="Add New Biblio"> + + &basket=&sub="> + //images/filenew.png" border=0 alt="Add New Biblio"> + + "> + //images/1uparrow.png" border=0 alt="View Basket"> + +
+ > + > + New Search: + + -

Shopping Basket For:

- - - &basket=&sub="> - //images/filenew.png" border=0 align=right alt="Add New Biblio"> - - &basket=&sub="> - //images/filenew.png" border=0 align=right alt="Add New Biblio"> - - -"> -//images/1uparrow.png" border=0 align=right alt="View Basket"> -
-> -> -New Search:
-
- -
- -You searched on - - - - - -
- results found. - -
Results to displayed. - - - - - - - - - - - - "> - - - - - - - - - - - - - - - - -
TITLEAUTHOR©COUNTLOCATION
- - &author=©right=&id=&basket=&biblio=&title="> - - - - ©right=&id=&basket=&biblio=&title="> - - - - - &type="> - - - - - - - - -
- On Loan
- Lost
- Mending
- In Transit
- - - -
-   - -   - -   - -   - -   -
- - -&offset=&type=&id=&basket=&search=&author="> -Next - - -
- + You searched on + + + + + +
+ results found. + +
Results to displayed. + + + + + + + + + + + + "> + + + + + + + + + + + + + + + + +
TITLEAUTHOR©COUNTLOCATION
+ + &author=©right=&id=&basket=&biblio=&title="> + + + + ©right=&id=&basket=&biblio=&title="> + + + + + &type="> + + + + + + + + +
+ On Loan
+ Lost
+ Mending
+ In Transit
+ + + +
+   + +   + +   + +   + +   +
+ + + &offset=&type=&id=&basket=&search=&author="> + Next + + +
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl index 49725ffb49..1fca859d0b 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl @@ -49,123 +49,109 @@ win.document.write(""); //--> -
- - --> -"> -"> -"> -"> -"> -"> -"> -"> -"> -"> - - " value=""> - - -View Basket -

- Order Details


-Shopping Basket For: -

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/images/background-mem.gif" colspan=2>CATALOGUE DETAILS
Title *">
Author" >
Publisher" >
Copyright Date"> -
Format
ISBN">
Series">
Branch
-/images/holder.gif" width=32 height=250 align=left> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/images/background-mem.gif" colspan=2>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">
- -
- -
- -
/images/background-mem.gif">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=""> + + + View Basket +

- Order Details

+ Shopping Basket For +
+

catalogue details

+

+ + "> +

+

+ + " > +

+

+ + " > +

+

+ + "> +

+

+ + +

+

+ + "> +

+

+ + "> +

+

+ + +

+
+
+

Accounting details

+

+ + " onchange='update(this.form)' > +

+

+ + +

+

+ + " onchange='update(this.form)'> +

+

+ + " onchange='update(this.form)'> +

+

+ + " onchange='update(this.form)'> +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+ + "> +

+

+ +

+ +
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl index 9f25c6a464..ae54538070 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl @@ -1,20 +1,20 @@
-

Supplier Search Results

+

Supplier Search Results

-
You searched on supplier , results found
+

You searched on supplier , results found

- - - - "> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
OrderReceiveCompany - + + + +
OrderReceiveCompany + - - - - + + + +
BasketItemsStaffDateBasketItemsStaffDate
@@ -49,5 +49,5 @@

-Add supplier +Add supplier diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl index 4bb01d999e..25f5d787e0 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl @@ -1,75 +1,75 @@ -
-Invoice:
-Received By:
- -
-

Receipt Summary for : Invoice

-
- -
-"> -"> -"> -"> - -Search ISBN or Title: -
-

-

- - - - - - - - - - - - - - - "> - - - - - - - - +
+

Receipt Summary for : Invoice

+ +
+ Invoice:
+ Received By:
+ +
+ +
+ + "> + "> + "> + "> + + Search ISBN or Title: + +

+
+ +

BASKETISBNTITLEAUTHORACTUALP&PQTYTOTAL
&biblio=&invoice=&gst=&freight=&id=">$$
+ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - -
BASKETISBNTITLEAUTHORACTUALP&PQTYTOTAL
-
SUBTOTALS$$
- 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$
TOTAL$
-
+ + +
&biblio=&invoice=&gst=&freight=&id=">$$
SUBTOTALS$$
+ 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$
TOTAL$
+
+
+ diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl index a82768a5d2..49e5db3437 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl @@ -1,33 +1,27 @@ - -

Receive Orders From Supplier ">

-

-

- -> -

- - - - - - - - - - - - - - - - - -
SUPPLIER INVOICE INFORMATION
Supplier Invoice Number -
GST -
Freight -
-
-

- +
+

Receive Orders From Supplier ">

+
+ +

+ > +

Supplier invoice information

+

+ + +

+

+ + +

+

+ + +

+

+ +

+ +
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl index 0b0f7482c5..6b96958503 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl @@ -1,164 +1,128 @@ -
- -> - - -

Update:

- -

Add supplier

- - -

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
COMPANY DETAILS
Company Name"> -
Postal Address - -
Physical Address -
Phone"> -
Fax"> -
Website"> -
CONTACT DETAILS
Contact Name">
Position"> -
Phone"> -
Alternative Phone"> -
Fax"> -
E-mail"> -
Notes -
- - - - - - - - - - Active - Inactive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CURRENT STATUS
Supplier is - - Active - Inactive
ORDERING INFORMATION
Publishers and Imprints -
List Prices are - -
Invoice Prices are - -
GST Registered - checked>Yes - checked>No -
List Item Price Includes GST - checked>Yes - checked>No -
Invoice Item Price Includes GST - checked>Yes - checked>No -
Discount> % -
-
-
/images/filesave.png" border=0 title="save" alt="save" class="button"> - -
- +
+
+ + > + + +

Update:

+ +

Add supplier

+ +
+

COMPANY DETAILS

+

+ + "> +

+

+ + +

+

+ + +

+

+ + "> +

+

+ + "> +

+

+ + "> +

+

CONTACT DETAILS

+

+ + "> +

+

+ + "> +

+

+ + "> +

+

+ + "> +

+

+ + "> +

+

+ + "> +

+

+ + +

+
+
+

CURRENT STATUS

+

+ + + Active + Inactive + + Active + Inactive + +

+

ORDERING INFORMATION

+

+

+ + +

+

+ + +

+

+ + +

+

+ + checked>Yes + checked>No +

+

+ + checked>Yes + checked>No +

+

+ + checked>Yes + checked>No +

+

+ + > % +

+
+
/images/filesave.png" border=0 title="save" alt="save" class="button acquisition"> + +
+
-- 2.20.1