[Koha-patches] [PATCH] Bug 5940: Acq and Suggestion Help Files for 3.4
Ian Walls
ian.walls at bywatersolutions.com
Tue Mar 29 16:21:15 CEST 2011
From: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
---
.../prog/en/modules/help/acqui/acqcontract.tmpl | 19 ++++
.../prog/en/modules/help/acqui/acqui-home.tmpl | 18 ++--
.../prog/en/modules/help/acqui/basket.tmpl | 111 ++++++++++++++++---
.../prog/en/modules/help/acqui/basketgroup.tmpl | 12 ++
.../prog/en/modules/help/acqui/basketheader.tmpl | 16 +++
.../prog/en/modules/help/acqui/booksellers.tmpl | 59 +----------
.../prog/en/modules/help/acqui/lateorders.tmpl | 18 ++--
.../prog/en/modules/help/acqui/neworderbiblio.tmpl | 15 +++
.../prog/en/modules/help/acqui/neworderempty.tmpl | 17 +--
.../en/modules/help/acqui/newordersuggestion.tmpl | 11 ++
.../prog/en/modules/help/acqui/orderreceive.tmpl | 30 +++---
.../prog/en/modules/help/acqui/parcel.tmpl | 37 ++-----
.../prog/en/modules/help/acqui/parcels.tmpl | 39 +++-----
.../prog/en/modules/help/acqui/supplier.tmpl | 90 +++++++++-------
.../prog/en/modules/help/acqui/z3950_search.tmpl | 17 +++
.../en/modules/help/suggestion/suggestion.tmpl | 75 +++----------
16 files changed, 314 insertions(+), 270 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tmpl
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tmpl
new file mode 100644
index 0000000..da0cf81
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tmpl
@@ -0,0 +1,19 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
+<h1>Vendor Contracts</h1>
+
+<p>You can define contracts (with a start and end date) and attach it to a vendor. This is used so that at the end of the year you can see how much you spent on a specific contract with a vendor. In some places, contracts are set up with a minimum and maximum yearly amount.</p>
+
+<h2>Add a Contract</h2>
+
+<p>At the top of a vendor search results page with only result or at the top of a vendor information page you will see a 'New Contract' button.</p>
+
+<p>The contract form will ask for some very basic information about the contract.</p>
+
+<p style="color: #ff0000">Important: You will not be able to enter a contract retrospectively, the end date must not be before today's date.</p>
+
+<p>Once the contract is saved it will appear below the vendor information.</p>
+
+<p>It will also be an option when creating a basket.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tmpl
index 278302d..8b0c0e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tmpl
@@ -1,17 +1,13 @@
<!-- TMPL_INCLUDE NAME="help-top.inc" -->
-<h1>Acquisitions Help</h1>
+<h1>Acquisitions</h1>
-<h2>What is Acquisitions?</h2>
<p>The Koha Acquisitions module provides a way where the library can record orders placed with vendors and manage purchase budgets.</p>
-<p>You do not need to use Acquisitions to add items to your catalog. If you do not want to track orders and budget expenditure, then use the <strong>"Add MARC" </strong>feature in <strong>Cataloging </strong>to add new bibliographic and item records.</p>
-<h2>How to place an order?</h2>
+<p>You do not need to use Acquisitions to add items to your catalog, Acquisitions is used only to track vendors and spending against your budgets.</p>
-<p>To place an order, the first step is to locate your Vendor (supplier). If no Vendor exists, you will need to create one. Once you have a Vendor you can place an order.</p><h2>What needs to be setup to use Acquisitions?</h2>
-<p>To make the most of acquisitions the following needs to be setup under <strong>System Administration</strong></p>
- <ul>
- <li><strong>Budgets and Funds</strong> - "Funds" are used to group "Budgets". For example a Fund may be called "General Stack", and will have a "Budget" which records the amount availalbe to spend during the period of the budget. A budget must have a start and end date.</li>
- <li><strong>Exchange Rates (optional)- </strong>If making purchases in overseas currency, the exchange rate will need to be set realtive to your local currency. Remember that your local currency should be set to 1.00<br/><strong>NOTE: Exchanges Rates need to be updated manually.</strong></li>
- <li><strong>Vendor(s) - </strong>These are the entities where items are purchased, or donated from. Orders are placed with Vendors.</li>
- </ul><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
+<p>Before using the Acquisitions Module you will want to make sure that you have completed all of the set up.</p>
+
+<p>First, set your Acquisitions System Preferences and Acquisitions Administration to match your library's workflow.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tmpl
index 5b7799a..99d97a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tmpl
@@ -1,20 +1,95 @@
<!-- TMPL_INCLUDE NAME="help-top.inc" -->
-<h1>Placing an Order Help</h1>
-
-<h2>What is a Basket and Order?</h2>
-<p>A Basket is used to group a set of order lines. An order is placed for an individual item.</p>
-<p>An Order can have multiple copies/units placed against it. A Basket can have multiple Orders.</p>
-
-<h2>How do I add Items to an Order?</h2>
- <ol>
- <li><strong>From an existing record -</strong> Use the search to locate the bibliographic record of the item that you wish to order more copies of.</li>
- <li><strong>From A Suggestion - </strong>view suggestions placed by Patrons and add to the item to the basket.</li>
- <li><strong>From a new (empty) record - </strong>If you know that the item is not in the library already, then create a new record from scratch.</li>
- </ol>
-
- <h3>TIP: Always check your Catalog first </h3>
-<p>It is highly advisable that you get in the habit of checking the catalog first before placing an order for a new item. This saves unnecessary duplicate bibliographic records in your database and any need to merge/deduplicate records.</p>
-
-<h2>Do I have to "Close" a Basket?</h2>
-<p>No, this is not necessary, you will still be able to mark items received without closing a basket. Closing a basket is good practice for keeping track of late orders which is discussed in this manual.</p><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
+<h2>Placing an Order</h2>
+
+<p>Once your basket is created you are presented with several options for adding items to the order.</p>
+
+<ul>
+ <li>If you are ordering another copy of an existing item, you can simply search for the record in your system
+<ul>
+ <li>From the results, simply click 'Order' to be brought to the order form
+<ul>
+ <li>All of the details associated with the item will already be listed under 'Catalog details'</li>
+</ul>
+</li>
+</ul>
+</li>
+ <li>If you allow patrons to make purchase suggestions (learn more in the Managing Suggestions section of this manual) then you can place orders from those suggestions
+<ul>
+ <li>
+<ul>
+ <li>From this form you can make changes to the Catalog Details if necessary</li>
+</ul>
+</li>
+</ul>
+</li>
+ <li>To order from a record that can't be found anywhere else, choose the 'From a new (empty) record'
+<ul>
+ <li>You will be presented with an empty form to fill in all of the necessary details about the item you are ordering</li>
+</ul>
+</li>
+ <li>If you want to search other libraries for an item to purchase you can use the 'From an external source' option which will allow you to order from a MARC record found via a Z39.50 search
+<ul>
+ <li>From the results click the Order link next to the item you want to purchase</li>
+ <li>If the item you're ordering from an external source looks like it might be a duplicate, Koha will warn you and give you options on how to proceed
+<ul>
+ <li>From the warning you can choose to just order another copy on the existing bib record, create a new bib record, or cancel your order of this item.</li>
+</ul>
+</li>
+ <li>In the order form that pops up you will not be able to edit the catalog details</li>
+</ul>
+</li>
+ <li>The final option for ordering is to order from a staged record (learn more about staging records)
+<ul>
+ <li>From the list of files you are presented with, choose the 'Add orders' link
+<ul>
+ <li>From the list of records, click 'Add order' next to the item you want to add to your order
+<ul>
+ <li>From the order form you will not be able to edit the catalog details.</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+
+<p>Once you have entered the info about the item you need to enter the Accounting information.</p>
+
+<ul>
+ <li>Quantity is populated by the number of items you've added to the order above</li>
+ <li>The list of funds is populated by the funds you have assigned in the Acquisitions Administration area.</li>
+ <li>The vendor price will be used to calculate the rest of the amount fields below</li>
+ <li>If the price is uncertain, check the uncertain price box.
+<ul>
+ <li>A basket with at least one uncertain price can't be closed</li>
+</ul>
+</li>
+ <li>If you added Planning Values when creating the Fund those values will appear in the two planning value fields</li>
+</ul>
+
+<p>Once an item is added to the basket you will be presented with a basket summary.</p>
+
+<p>From here you can edit or remove the items you have added.</p>
+
+<p>Also on the summary page you have the option to edit the information you entered about the basket by clicking the 'Edit basket header information' button, deleting the basket altogether by clicking the 'Delete this basket' button, or exporting your basket as a CSV file by clicking the 'Export this basket as CSV' button.</p>
+
+<p>Once you're sure your basket is complete you can click 'Close this basket' button to indicate that this basket is complete and has been sent to the vendor.</p>
+
+<p style="color: #ff0000">Important: A basket with at least one items marked as 'uncertain price' will not be able to be closed</p>
+
+<p>Clicking the 'Uncertain Prices' button will up a list of items with uncertain prices to quick editing.</p>
+
+<p style="color: #ff0000">Important: The Uncertain Prices page is independent of the basket, it is linked to the vendor, so you will see all items on order for this vendor with uncertain prices.</p>
+
+<h2>Printing Baskets</h2>
+
+<p>When you are finished adding items to your basket you want to click 'Close this Basket'</p>
+
+<p>You will be asked if you want to create a purchase order at this time.</p>
+
+<p>Your completed order will be listed on the Basket Grouping page for the printing or further modification.</p>
+
+<p>Clicking 'Print' below your order will generate a PDF for printing. The PDF will have all of your library information followed by the items in your order.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tmpl
new file mode 100644
index 0000000..b43f0f5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tmpl
@@ -0,0 +1,12 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
+<h1>Basket Groups</h1>
+
+<p>A basket group is a group of closed baskets that you can perform actions on.</p>
+
+<h2>Create a basket group</h2>
+
+<p>A basket group is simply a group of baskets. In some libraries, you have several staff members that create baskets, and, at the end of a period of time, someone then groups them together to send to the vendor in bulk. That said, it is possible to have one basket in a basket group if that's the workflow used in your library.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tmpl
new file mode 100644
index 0000000..48cde6e
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tmpl
@@ -0,0 +1,16 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
+<h2>Adding a Basket</h2>
+
+<p>When adding a basket you want to give it a name that will help you identify it later. The notes fields are optional and can contain any type of information.</p>
+
+<p>If you have added contracts to the vendor you're ordering from, you will also have an option to choose which contract you're ordering these items under.</p>
+
+<p>When finished, click 'Save'</p>
+
+<h2>Editing Basket Headers</h2>
+
+<p>After creating your basket you can edit the name of the basket, the notes associated with it and the contract you're ordering against.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tmpl
index 7a16728..effa759 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tmpl
@@ -1,58 +1,9 @@
<!-- TMPL_INCLUDE NAME="help-top.inc" -->
-<h1>Ordering</h1>
- <ul>
- <li>Click 'New order'</li>
- <li>You can add a new order from a book you already have in your catalog, a suggestion from a patron or an empty form.
- <ul>
- <li>
- <span style="background-color: #ffe599">
-TIP: For instructions on ordering from a suggestion see 'Managing Suggestions' in this manual</span></li>
- </ul></li>
- <li>To order from an existing record, search for the record in your system</li>
- <li>To order a new book, click 'From a new (empty) record'</li>
- <li>Fill in the fields for your order.
- <ul>
- <li>
- <span style="background-color: #ffe599">
-TIP: After entering a quantity and vendor price, the other fields will be calculated automatically.</span></li>
- <li>
-Actual Cost will be used to subtract from your budgets (whereas the other fees will be used when calculating replacement costs)</li>
- </ul></li>
- <li>After clicking 'Save' you will be brought to an order summary</li>
- <li>If you are done adding to that order, click the 'Close this basket' link
- <ul>
- <li>
- <span style="background-color: #ffe599">
-TIP: This is not necessary, you will still be able to mark items received without closing a basket. Closing a basket is good practice for keeping track of late orders which is discussed in this manual.</span></li>
- </ul></li>
- </ul>
-<p>
- <font size="4" id="bfed"><strong>Receiving Orders</strong></font>After your orders have been entered into the system and sent off to the vendors, you will need to mark them received.
- <span style="background-color: #ffe599">
-TIP: To receive serials see the 'Receiving Serials' part of this manual.</span></p>
- <ul>
- <li>To receive an order click 'Receive Shipment'</li>
- <li>Enter the invoice number is 'Vendor invoice' and the shipment date in 'Shipment date'</li>
- <li>Click 'Save'</li>
- <li>You'll need to choose which items arrived in this shipment</li>
- <li>Either search by title or ISBN or click 'Receive order' next to the item you'd like to mark as received</li>
- <li>Be sure to update the 'Quantity received' as well as any other information you need for your records
- <ul>
- <li>
- <span style="background-color: #ffe599">
-TIP: To add another received item, click the '+' (plus) icon at the bottom left. If you add too many click the '-' (minus) to the right of the '+' (plus)</span></li>
- </ul></li>
- <li>Click 'Save'</li>
- <li>You will now see the received items in the summary of 'Items in this shipment'</li>
- <li>When you've added all of the items to your shipment you can browse away from the page.
- <ul>
- <li>To make edits to your shipment return to Acquisitions and search for the vendor in question.
- <ul>
- <li>Click the 'Receive Parcel' button</li>
- <li>Your previous orders will be searchable and editable from here</li>
- </ul></li>
- </ul></li>
- </ul>
+<h1>Vendor Search</h1>
+
+<p>At the top of the various Acquisition pages there is a quick search box where you can perform either a Vendor Search or an Order Search.</p>
+
+<p>In the Vendor Search you can enter any part of the vendor name to get results.</p>
<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tmpl
index 70ff67f..2ae6044 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tmpl
@@ -1,13 +1,15 @@
<!-- TMPL_INCLUDE NAME="help-top.inc" -->
-<h1>Late Orders</h1>
-<p>
-Late orders is a report that checks for orders that were placed X days ago and still haven't been marked as received.
-</p>
-<ul>
- <li>Click on 'Late Orders' on the menu on the left</li>
- <li>You will be presented with a list of orders with baskets that have been closed for 30+ days</li>
-</ul>
+<h1>Claims & Late Orders</h1>
+<p>If you have entered in an email address for the vendors in your system you can send them claim emails when an order is late. Before you can send claims you will need to set up an acquisitions claim notice.</p>
+
+<p>Upon clicking on the link to 'Late Orders' from the Acquisitions page you will be presented with a series of filter options on the left hand side.</p>
+
+<p>Once you filter your orders to show you the things you consider to be late you will be presented with a list of these items.</p>
+
+<p>To the right of each late title you will be see a checkbox. Check off the ones you want a claim letter sent to and click 'Claim Order.' This will automatically send an email to the vendor at the email address you have on file.</p>
+
+<p>If you would rather use a different acquisition claim letter (other than the default) you can create that in the notices module and choose it from the menu above the list of late items.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tmpl
new file mode 100644
index 0000000..e37523a
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tmpl
@@ -0,0 +1,15 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
+<h1>Order from an Existing Record</h1>
+
+<p>If you are ordering another copy of an existing item, you can simply search for the record in your system</p>
+
+<ul>
+ <li>From the results, simply click 'Order' to be brought to the order form
+<ul>
+ <li>All of the details associated with the item will already be listed under 'Catalog details'</li>
+</ul>
+</li>
+</ul>
+
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tmpl
index 85af6a9..0cd90a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tmpl
@@ -1,18 +1,11 @@
<!-- TMPL_INCLUDE NAME="help-top.inc" -->
-<h1>Order Details Help</h1>
+<h1>Order from a New Empty Record</h1>
-<h2>What is the "Vendor Price"?</h2>
-<p>The vendor price is the price given to you by the vendor, sometimes called the "List Price". Depending on how the Vendor is setup this may or maynot include any discount given to you by the vendor and/or any sales tax. See Vendors for more information.</p>
+<p>To order from a record that can't be found anywhere else, choose the 'From a new (empty) record'</p>
-<h2>What is the "Replacement Price"?</h2>
-<p>The replacement price is the total cost of what it would cost to replace the item if you had to purchase the item retail at recommended retail. This is the amount that a patron could be charged if item is lost or damaged beyond repair.</p>
-
-<h2>What is the "Budgeted Price"?</h2>
-<p>This is the price you expect to pay for the item, including any discount and any relevant sales tax (depending on the vendor setup) and is the amount that will be charged to your <strong>Committed budget</strong>.</p>
-
-<h2>What is the "Actual Price"?</h2>
-<p>This is the price that shows on the invoice or packing slip when you receive the item. When placing an order, Koha will automatically calculate this for you. When an item is received, this can be over keyed with the actual value. This is to take into account any slight differences in rounding or price fluctuations between ordering the item and actually recieving it.</p>
-<p>The Actual price is what is committed to your <strong>Spent budget</strong>.</p>
+<ul>
+ <li>You will be presented with an empty form to fill in all of the necessary details about the item you are ordering</li>
+</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tmpl
new file mode 100644
index 0000000..b7075c7
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tmpl
@@ -0,0 +1,11 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
+<h1>Order from Purchase Suggestion</h1>
+
+<p>If you allow patrons to make purchase suggestions then you can place orders from those suggestions</p>
+
+<ul>
+ <li>From this form you can make changes to the Catalog Details if necessary</li>
+</ul>
+
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tmpl
index e742436..dcf43f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tmpl
@@ -1,21 +1,17 @@
<!-- TMPL_INCLUDE NAME="help-top.inc" -->
-<h1>Receiving Orders Help</h1>
-
-<h2>How do I receive items that have arrived?</h2>
-<p>Firstly, check the catalog details that you are recieiving the right item. If these are correct, you can add the item details.</p>
-<p>For each item you will need to check the following:</p>
- <ul>
- <li><strong>Volume/Copy </strong>for Serials</li>
- <li><strong>Item Barcode</strong> scan or enter the barcode that has been assigned to the item</li>
- <li><strong>Home Library </strong>choose the home library for the item from the drop down list</li>
- <li><strong>Item Type </strong>choose the item type from the drop down.</li>
- </ul>
-
- <h2>How do I receive multiple identical items?</h2>
-<p>If you have ordered multiple copies of the same item, then use the "+" to bring up another <strong>Item Details</strong> input fieldset.</p>
-<p>For each copy you will need to set that Item Barcode, Home Library and Item Type.</p>
-<p>Each time you add a new item, the <strong>Quantity Received</strong> under <strong>Accounting Details</strong> should be updated.</p>
-<p>If you press the "+" by mistake, use the "-" button to remove the unwanted Item Details <strong>input fieldset </strong></p>
+<h1>Receiving Orders</h1>
+
+<p>Orders can be received from the vendor information page or the vendor search results page.</p>
+
+<p>After clicking 'Receive shipment' you will be asked to enter a vendor invoice number and a shipment received date.</p>
+
+<p>The receive page will list all items still on order with the vendor regardless of the basket the item is from.</p>
+
+<p>To receive a specific item, click the 'Receive' link to the right of the item.</p>
+
+<p>From this form you can alter the cost information. You can also choose to only receive 1 of multiple items if only 1 arrived. Once you have made any changes necessary, click 'Save' to mark the item as received.</p>
+
+<p>You will also see that the item is received if you view the basket.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tmpl
index 59877f9..841136b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tmpl
@@ -1,30 +1,17 @@
<!-- TMPL_INCLUDE NAME="help-top.inc" -->
<h1>Receiving Orders</h1>
-<p>After your orders have been entered into the system and sent off to the vendors, you will need to mark them received. <span style="background-color: #ffe599">
-TIP: To receive serials see the 'Receiving Serials' part of this manual.</span></p>
- <ul>
- <li>To receive an order click 'Receive Shipment'</li>
- <li>Enter the invoice number is 'Vendor invoice' and the shipment date in 'Shipment date'</li>
- <li>Click 'Save'</li>
- <li>You'll need to choose which items arrived in this shipment</li>
- <li>Either search by title or ISBN or click 'Receive order' next to the item you'd like to mark as received</li>
- <li>Be sure to update the 'Quantity received' as well as any other information you need for your records
- <ul>
- <li>
- <span style="background-color: #ffe599">
-TIP: To add another received item, click the '+' (plus) icon at the bottom left. If you add too many click the '-' (minus) to the right of the '+' (plus)</span></li>
- </ul></li>
- <li>Click 'Save'</li>
- <li>You will now see the received items in the summary of 'Items in this shipment'</li>
- <li>When you've added all of the items to your shipment you can browse away from the page.
- <ul>
- <li>To make edits to your shipment return to Acquisitions and search for the vendor in question.<br/>
- <ul>
- <li>Click the 'Receive Parcel' button</li>
- <li>Your previous orders will be searchable and editable from here</li>
- </ul></li>
- </ul></li>
- </ul>
+
+<p>Orders can be received from the vendor information page or the vendor search results page.</p>
+
+<p>After clicking 'Receive shipment' you will be asked to enter a vendor invoice number and a shipment received date.</p>
+
+<p>The receive page will list all items still on order with the vendor regardless of the basket the item is from.</p>
+
+<p>To receive a specific item, click the 'Receive' link to the right of the item.</p>
+
+<p>From this form you can alter the cost information. You can also choose to only receive 1 of multiple items if only 1 arrived. Once you have made any changes necessary, click 'Save' to mark the item as received.</p>
+
+<p>You will also see that the item is received if you view the basket.</p>
<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tmpl
index f7b2edd..f1dd6b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tmpl
@@ -2,29 +2,16 @@
<h1>Receiving Orders</h1>
-<p>After your orders have been entered into the system and sent off to the vendors, you will need to mark them received.</p>
-
- <ul>
- <li>You must first pick a vendor</li>
- <li>After searching for a vendor you will see all open orders on a summary page</li>
- <li>To receive an order click 'Receive order' (link) or 'Receive Parcel' (button)</li>
- <li>Enter the invoice number is 'Vendor invoice' and the shipment date in 'Shipment date'</li>
- <li>Click 'Save'</li>
- <li>You'll need to choose which items arrived in this shipment</li>
- <li>Either search by title or ISBN or click 'Receive order' next to the item you'd like to mark as received</li>
- <li>Be sure to update the 'Quantity received' as well as any other information you need for your records
- <ul>
- <li>
- <span style="background-color: #ffe599">
-TIP: To add another received item, click the '+' (plus) icon at the bottom left. If you add too many click the '-' (minus) to the right of the '+' (plus)</span></li>
- </ul></li>
- <li>Click 'Save'</li>
- <li>You will now see the received items in the summary of 'Items in this shipment'</li>
- <li>When you've added all of the items to your shipment you can browse away from the page.
- <ul>
- <li>To make edits to your shipment return to Acquisitions and search for the vendor in question.</li>
- <li>Click the 'Receive Parcel' button</li>
- <li>Your previous orders will be searchable and editable from here</li>
- </ul></li>
- </ul>
- </div> <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
+<p>Orders can be received from the vendor information page or the vendor search results page.</p>
+
+<p>After clicking 'Receive shipment' you will be asked to enter a vendor invoice number and a shipment received date.</p>
+
+<p>The receive page will list all items still on order with the vendor regardless of the basket the item is from.</p>
+
+<p>To receive a specific item, click the 'Receive' link to the right of the item.</p>
+
+<p>From this form you can alter the cost information. You can also choose to only receive 1 of multiple items if only 1 arrived. Once you have made any changes necessary, click 'Save' to mark the item as received.</p>
+
+<p>You will also see that the item is received if you view the basket.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tmpl
index bc169d1..2078384 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tmpl
@@ -1,43 +1,51 @@
<!-- TMPL_INCLUDE NAME="help-top.inc" -->
-<h1>Creating a vendor</h1>
-
- <ul>
- <li>Search for the vendor you want by using the 'Vendor Search' at the top.</li>
- <li>If 'no results found', click on 'New Vendor'.</li>
- <li>Enter the contact information for your vendor
- <ul>
- <li>
- <span style="background-color: #ffff99">
-TIP: Only the 'Company Name' is required but the more contact information you provide, the easier it will be to contact vendors when necessary</span></li>
- </ul></li>
- <li>Enter additional infomration for your vendor
- <ul>
- <li>Active/Inactive<br/>
- <ul>
- <li>Orders can only be placed against Active vendors.</li>
- <li>
- <span style="background-color: #ffe599">
-TIP: Mark vendors inactive if you no longer order from them or if they merged with another vendor, but you want to keep the data of your orders with them</span></li>
- </ul></li>
- <li>Preferred publishers<br/>
- <ul>
- <li>This is for information only and is a space where you can record what the vendor sells</li>
- </ul></li>
- <li>List Prices/Invoice Prices<br/>
- <ul>
- <li>If using multiple currencies you will need to pick which currency the totals are in when listed by the vendor and on the invoice.</li>
- <li>
- <span style="background-color: #ffe599">
-TIP: Some vendors will list the prices in their own currency, but bill in your currency</span></li>
- </ul></li>
- <li>Discount<br/>
- <ul>
- <li>Some vendors will offer a blanket discount to all orders placed with them, this will be calculated from their list price.</li>
- </ul></li>
- <li>Notes
- <ul>
- <li>Include any notes that you may want to record for internal purposes.</li>
- </ul></li>
- </ul></li>
- </ul><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
+<h1>Vendors</h1>
+
+<p>Before any orders can be places you must first enter at least one vendor.</p>
+
+<h2>Add a Vendor</h2>
+
+<p>To add a vendor click the 'New Vendor' button on the Acquisitions page.</p>
+
+<p>The vendor add form is broken into three pieces.</p>
+
+<ul>
+ <li>The first section is for basic information about the Vendor
+<ul>
+ <li>Of these fields, only the Vendor name is required, the rest of the information should be added to help with generating claim letters and invoices</li>
+</ul>
+</li>
+ <li>The second section is for information regarding your contact at the Vendor's office
+<ul>
+ <li>None of these fields are required, they should only be entered if you want to keep track of your contact's information within Koha</li>
+</ul>
+</li>
+ <li>The final section is for billing information
+<ul>
+ <li>To be able to order from a vendor you must make them 'Active'</li>
+ <li>For List Prices and Invoice Prices choose the currency
+<ul>
+ <li>Currencies are assigned in the Currencies & Exchange Rates admin area</li>
+</ul>
+</li>
+ <li>If the vendor offers a consistent blank discount, enter that in the 'Discount' field
+<ul>
+ <li>You can enter item specific discounts when placing an order</li>
+</ul>
+</li>
+ <li>GST rate is for any tax the vendor may charge</li>
+ <li>Notes are for internal use</li>
+</ul>
+</li>
+</ul>
+
+<h2>View/Edit a Vendor</h2>
+
+<p>To view a vendor's information page you must search for the vendor from the Acquisitions home page. Your search can be for any part of the Vendor's name.</p>
+
+<p>From the results, click on the name of the vendor you want to view or edit.</p>
+
+<p>To make changes to the vendor, simply click the 'Edit' button.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tmpl
new file mode 100644
index 0000000..6157174
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tmpl
@@ -0,0 +1,17 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
+<h1>Order from an External Source</h1>
+
+<p>If you want to search other libraries for an item to purchase you can use the 'From an external source' option which will allow you to order from a MARC record found via a Z39.50 search</p>
+
+<ul>
+ <li>From the results click the Order link next to the item you want to purchase</li>
+ <li>If the item you're ordering from an external source looks like it might be a duplicate, Koha will warn you and give you options on how to proceed
+<ul>
+ <li>From the warning you can choose to just order another copy on the existing bib record, create a new bib record, or cancel your order of this item.</li>
+</ul>
+</li>
+ <li>In the order form that pops up you will not be able to edit the catalog details</li>
+</ul>
+
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tmpl
index 9089b01..3a5a396 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tmpl
@@ -1,65 +1,24 @@
<!-- TMPL_INCLUDE NAME="help-top.inc" -->
-<h1>Suggestions Management</h1>
-<h2>What are Purchase Suggestions?</h2>
-<p>
-Purchase suggestions give the users of the OPAC a way to lodge requests for the library to purchase for items.
-</p>
-<p>
-<span style="color: #990000">IMPORTANT: To use this feature, purchase suggestions need to be turned on in
-system preferences.</span> <br />
+<h1>Purchase Suggestions</h1>
-</p>
-<ul>
- <li><em>Get there:</em> More > Administration > Global System Preferences > OPAC > suggestion</li>
-</ul>
-<span style="color: #990000">IMPORTANT: Suggestions are only managed here if the emailPurchaseSuggestions preference is turned off.<br /></span>
+<p>Depending on your settings in the suggestion system preference, patrons may be able to make purchase suggestions via the OPAC. When a suggestion is waiting for library review, it will appear on the Acquisitions home page in the list of links on the left of the page.</p>
-<ul>
- <li><em>Get there:</em> More > Administration > Global System Preferences > Acquisitions > emailPurchaseSuggestions</li>
-</ul>
-<h2>Manage Suggestions<br />
-</h2>
-<p>
-To manage suggestions, go to More > Acquisitions
-</p>
-<ul>
- <li>Click 'Manage suggestions'</li>
- <li>If you have suggestions to manage they will appear here
- </li>
- <li style="color: #990000">IMPORTANT: You need to have authorized values for 'Reason' already set before working with suggestions</li>
- <ul>
- <li style="background-color: #ffe599">TIP: Reasons are the librarian's reason for accepting/rejecting request</li>
- <li>If reasons are not set the Suggestions page will look like this:<br />
- </li>
- <li>If you get this error, click 'authorized values'
- <ul>
- <li style="background-color: #ffe599">TIP: You can also edit these values by going to More > Administration > Authorized Values</li>
- </ul>
- </li>
- <li>Choose SUGGEST from the pull down
- <br />
- </li>
- <li>Enter a short 'Authorized value' and a longer 'Description' (this second field is optional)<br />
- </li>
- <li>This will result in a list of values that can be added to or edited at any time
- <br />
- </li>
- <li>It will also add these values to the pull down on the manage suggestions page
- <br />
- </li>
- </ul>
- <li>If there are no errors, continue to approving or rejecting the request and submitting a reason
- <br />
- </li>
- <li style="background-color: #ffe599">TIP: By choosing 'Others...' from the reason pull down you will be able to enter a free text reason.<br />
- </li>
- <li>After choosing your reason, click 'Change Status'</li>
- <li style="background-color: #ffe599">TIP: Statuses can be updated in bulk by choosing from the pull down at the bottom and clicking 'Mark all with this reason'<br />
- </li>
- <li>The item will be moved to the 'Accepted' or 'Rejected' menu</li>
- <li>If you accidentally pick the wrong option (accept or reject) you can always edit your selection by visiting the appropriate tab</li>
-</ul>
+<p>Clicking 'Manage suggestions' will take you to the suggestion management tool. If there are no pending suggestions you can access the suggestion management tool by clicking the 'Manage suggestions' link on the menu on the left of the Acquisitions page.</p>
+
+<p>Your suggestions will be sorted into three categories: Accepted, Pending, and Rejected. Each accepted or rejected suggestion will show the name of the librarian who managed the suggestion and the reason they gave for accepting or rejecting it (found under 'Status').</p>
+
+<p>For libraries with lots of suggestions, there are filters on the left hand side of the Manage Suggestions page to assist in limiting the number of titles displayed on the screen.</p>
+
+<p>Clicking on the blue headings will expand the filtering options and clicking '[clear]' will clear all filters and show all suggestions.</p>
+
+<p>When reviewing 'Pending' suggestions you can choose to check the box next to the item(s) you want to approve/reject and then choose the status and reason for your selection. You can also choose to completely delete the suggestion by checking the 'Delete selected' box.</p>
+
+<p>Reasons for accepting and rejecting suggestions are defined by the SUGGEST authorized value.</p>
+
+<p>If you choose 'Others...' as your reason you will be prompted to enter your reason in a text box. Clicking 'Cancel' to the right of the box will bring back the pull down menu with authorized reasons.</p>
+
+<p>Once you have clicked 'Submit' the suggestion will be moved to the matching tab. The status will also be updated on the patron's account in the OPAC and an email notice will be sent to the patron using the template that matches the status you have chosen.</p>
<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--
1.5.6.5
More information about the Koha-patches
mailing list