From c5521d18cc8c543c29b6fe706956bf34525ec7f3 Mon Sep 17 00:00:00 2001 From: tipaul Date: Fri, 20 Jan 2006 16:04:42 +0000 Subject: [PATCH] updating prog templates for acqui --- .../prog/en/acqui/acqui-home.tmpl | 101 ++++----- .../intranet-tmpl/prog/en/acqui/acquire.tmpl | 15 +- .../intranet-tmpl/prog/en/acqui/basket.tmpl | 50 +++-- .../prog/en/acqui/histsearch.tmpl | 184 ++++++++-------- .../prog/en/acqui/lateorders.tmpl | 204 +++++++++--------- .../prog/en/acqui/newbasket2.tmpl | 108 +++++----- .../prog/en/acqui/newbiblio.tmpl | 41 ++-- .../intranet-tmpl/prog/en/acqui/order.tmpl | 117 +++++----- .../intranet-tmpl/prog/en/acqui/recieve.tmpl | 30 +-- .../prog/en/acqui/recieveorder.tmpl | 14 +- .../prog/en/acqui/suggestion-select.tmpl | 2 + .../intranet-tmpl/prog/en/acqui/supplier.tmpl | 15 +- 12 files changed, 459 insertions(+), 422 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl index 468b034a8d..3ce2f55a92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl @@ -3,25 +3,26 @@

Acquisitions

+
You must define a budget in parameters -
-

Start, Recieve, or Modify Any Order

-

- -
-
- -
- - +
+

Start, Recieve, or Modify Any Order

+

+ +
+
+ +
+ +
- +
-

Exchange Rates

+ @@ -46,57 +47,57 @@ + - - - +

Pending Suggestions

suggestions waiting Manage Suggestions

No suggestions waiting

+
- - - - +
+

You must define a budget in parameters

Budgets and Bookfunds

Currency
+ + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + -
BudgetsTotalSpentComtdAvail
BudgetsTotalSpentComtdAvail
Total
- -

Use your reload button [ctrl + r] to get the most recent figures. -Committed figures are approximate only, as exchange rates will affect the amount actually paid.

- -

Help

-

To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).

-

To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.

-

To start a new shopping basket with a new supplier return to this page and just start a new supplier search.

-

To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".

+ + + Total + + + + + + +
+
+

Use your reload button [ctrl + r] to get the most recent figures. + Committed figures are approximate only, as exchange rates will affect the amount actually paid.

+ +

Help

+

To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).

+

To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.

+

To start a new shopping basket with a new supplier return to this page and just start a new supplier search.

+

To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".

+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl index b54d079d46..8ce51dd33a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/acquire.tmpl @@ -6,12 +6,14 @@

Receipt Summary for : Invoice,

- +
+ Invoice:

+

Received By:

+

Date:

+
+
- To /includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="calendar" /> - " type="text" /> - -   +
+
+ + + + + + + + + - - - + - - - - - - - - - + + + + + + + + + - -
 TitleAuthorSupplierPlaced onRecieved onQuantity orderedUnit cost  
 "> Filter By:" />" />" />From /includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" alt="calendar" /> + " /> + + To /includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="calendar" /> + " type="text" /> +    
+ + +   + "> + + + + + + +   + + + + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl index 1482dde80e..32f79185ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl @@ -3,107 +3,109 @@

: Late issues

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
SupplierOrder DateOrdered forIncluding BasketBook informationBranchEstimated Unit PriceRetailer Catalogue Unit PriceQuantityTotal costBudget 
- -   - " /> days - -   - - - -   - - -
- - - - - - - - - -
Author: -
Published by: in - 		- - - - - - - - - - - - -   -
+ + + + + + + + + + + + + - - - - - - - - - -
SupplierOrder DateOrdered forIncluding BasketBook informationBranchEstimated Unit PriceRetailer Catalogue Unit PriceQuantityTotal costBudget 
- Total - -   -   -   - - -
-
+ + + + +   + + " /> days + + +   + + + + + +   + + + + + + + + + + + + + + + + + + + + + + +
Author: +
Published by: in + + + + + + + + + + + + + + + + + + + + +   + + + + + + Total + + +   + +   + +   + + + + + + + + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl index 89fbb591a6..4687b286bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/newbasket2.tmpl @@ -5,61 +5,65 @@

Shopping Basket For:

+
&basket=&sub=">Add New Biblio - | ">View Basket | -
-" /> -" /> -New Search:
+ | ">View Basket | +
+ " /> + " /> + New Search:
+
+
+

You searched for + + + +

+

Results to of results displayed.

+ + + + + + + + + + + + + + + + + + + + + +
TitleAuthor©CountLocation
+ &author=&copyright=&id=&basket=&biblio=&title="> + + + + &type="> + + + + + + + + +
-

You searched for - - - - -

-

Results to of results displayed.

- - - - - - - - - - - - - - - - - - - - - -
TitleAuthor©CountLocation
- &author=&copyright=&id=&basket=&biblio=&title="> - - - - &type="> - - - - - - - - -
- - -&offset=&type=&id=&basket=&search=&author=">Next - + + &offset=&type=&id=&basket=&search=&author="> + Next + + +
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl index d6966be9d0..d8b7a5eb01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/newbiblio.tmpl @@ -66,13 +66,33 @@ function check(f) { } document.frusin.submit(); } - -//--> - +

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

+
+

Basket Details

+ + + + + + + +
Basket Number:
Managed By:
Open On:
For:Supplier Id
Invoice Number:
Closed On:
+
+ +
+

catalogue details

- - --> + + + " /> " /> " /> @@ -87,17 +107,6 @@ function check(f) { " value="" /> - " class="button acquisition">View Basket -

- - Modify order details (line #) - - New order - - (defined from suggestion #) -

- Shopping Basket For -

catalogue details

diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl index 859eaac2fb..1a8a519da2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/order.tmpl @@ -3,63 +3,70 @@

You searched on supplier , results found

- - - - - - - - - +
+
OrderReceiveCompany 
- - - - + + +
- - Add order - - Inactive - - - Recieve order - - - - - - - - - - + + + + + + + + + + + + - - -
BasketItemsCreated byDate 
OrderReceiveCompany 
+ + Add order + + Inactive + + + Recieve order + + - - - - - + + + + + + + + + + + + - - -
- - - - - closed on - " class="button acquisition">View - - - " class="button acquisition">modify - + BasketItemsCreated byDate 
+ + + + + closed on " class="button acquisition">View + + + " class="button acquisition">modify + + " class="button acquisition">View + - -
-
-

Add supplier

+
+ + + + +
+
+ + + + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl index 114ae4a95a..6c609a2759 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/recieve.tmpl @@ -10,18 +10,13 @@ orders not yet recieved for - -

Invoice:

-

Received By:

-

On:

- -
- " /> - " /> - " /> - " /> -

Search ISBN or Title:

-
+
+

Invoice:

+

Received By:

+

On:

+
+
+

Recieve list

@@ -70,4 +65,15 @@
+
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl index 3c98a9df01..d8a0fbdc61 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/recieveorder.tmpl @@ -2,11 +2,11 @@ -

Receive Orders From Supplier ">

-
-

- > -

Supplier invoice information

+

Receive Orders From Supplier ">

+
+

Supplier invoice information

+ + >

@@ -22,6 +22,6 @@

- - + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl index b2fe4a0fdd..b9dbd2cc53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/suggestion-select.tmpl @@ -4,6 +4,7 @@

Suggestions

+
@@ -60,4 +61,5 @@
+
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl index 4eb8da8608..6cb2b49372 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl @@ -2,15 +2,14 @@ -
- - " /> -

Update:

Add supplier

+ + " /> +

COMPANY DETAILS

@@ -65,6 +64,8 @@

+
+

CURRENT STATUS

@@ -76,6 +77,8 @@ Inactive

+
+

ORDERING INFORMATION

@@ -131,8 +134,8 @@ " /> %

-
-
+
+
-- 2.39.5