From f78b79da6c5656ed955b91dc2b3423ecc105cc5a Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Tue, 1 Jan 2008 21:02:10 -0500 Subject: [PATCH] nomenclature cleanup for acquisitions: supplier -> vendor freight -> shipping parcel -> shipment shopping basket -> basket parcel code -> invoice number Signed-off-by: Joshua Ferraro --- .../prog/en/modules/acqui/acqui-home.tmpl | 11 +++++------ .../prog/en/modules/acqui/basket.tmpl | 8 ++++---- .../prog/en/modules/acqui/booksellers.tmpl | 10 +++++----- .../prog/en/modules/acqui/histsearch.tmpl | 6 +++--- .../prog/en/modules/acqui/lateorders.tmpl | 6 +++--- .../prog/en/modules/acqui/neworderempty.tmpl | 6 +++--- .../prog/en/modules/acqui/parcel.tmpl | 8 ++++---- .../prog/en/modules/acqui/parcels.tmpl | 16 ++++++++-------- .../prog/en/modules/acqui/spent.tmpl | 2 +- .../prog/en/modules/acqui/supplier.tmpl | 14 +++++++------- 10 files changed, 43 insertions(+), 44 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl index cd973a0027..3b6dff4fd3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl @@ -29,13 +29,13 @@ Your administrator must define a budget in Administration
-

+

-

+

@@ -131,10 +131,9 @@

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".

+

To begin an order, local purchase or donation, search for the vendor or benefactor, and then you can create a new Basket.

+

A Basket is a collection of orders.

+

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 and then add the item.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index d0e8cac1ce..218555de8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -1,5 +1,5 @@ -Koha › Acquisitions › <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" --> +Koha › Acquisitions › <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" -->