[% IF ( DisplayClearScreenButton ) %]
-
+
[% END %]
Checking out to [% firstname %] [% surname %] ([% cardnumber %])
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tt/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index 6cbb73f15d..f016158d97 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -57,9 +57,9 @@
[% itemsloo.location %] [% itemsloo.itemcallnumber %] [% itemsloo.enumchron %]
[% IF ( itemsloo.item_level_request ) %]
- Only Item: [% itemsloo.barcode %]
+ Only Item: [% itemsloo.barcode %]
[% ELSE %]
- [% itemsloo.barcode %] or Any available
+ [% itemsloo.barcode %] or any available
[% END %]
[% itemsloo.surname %], [% itemsloo.firstname %] ([% itemsloo.cardnumber %])
[% itemsloo.phone %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
new file mode 100644
index 0000000000..e50edf672b
--- /dev/null
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
@@ -0,0 +1,19 @@
+[% INCLUDE 'help-top.inc' %]
+
+Vendor Contracts
+
+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.
+
+Add a Contract
+
+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.
+
+The contract form will ask for some very basic information about the contract.
+
+Important: You will not be able to enter a contract retrospectively, the end date must not be before today's date.
+
+Once the contract is saved it will appear below the vendor information.
+
+It will also be an option when creating a basket.
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
index 6fcc9e49da..0b3e484e75 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
@@ -1,17 +1,13 @@
[% INCLUDE 'help-top.inc' %]
-Acquisitions Help
+Acquisitions
-What is Acquisitions?
The Koha Acquisitions module provides a way where the library can record orders placed with vendors and manage purchase budgets.
-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 "Add MARC" feature in Cataloging to add new bibliographic and item records.
-How to place an order?
+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.
-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.
What needs to be setup to use Acquisitions?
-To make the most of acquisitions the following needs to be setup under System Administration
-
- Budgets and Funds - "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.
- Exchange Rates (optional)- 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.00NOTE: Exchanges Rates need to be updated manually.
- Vendor(s) - These are the entities where items are purchased, or donated from. Orders are placed with Vendors.
- [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+Before using the Acquisitions Module you will want to make sure that you have completed all of the set up.
+
+First, set your Acquisitions System Preferences and Acquisitions Administration to match your library's workflow.
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/basket.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
index 4b18381ef2..06b6c553c7 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
@@ -1,20 +1,95 @@
[% INCLUDE 'help-top.inc' %]
-Placing an Order Help
-
-What is a Basket and Order?
-A Basket is used to group a set of order lines. An order is placed for an individual item.
-An Order can have multiple copies/units placed against it. A Basket can have multiple Orders.
-
-How do I add Items to an Order?
-
- From an existing record - Use the search to locate the bibliographic record of the item that you wish to order more copies of.
- From A Suggestion - view suggestions placed by Patrons and add to the item to the basket.
- From a new (empty) record - If you know that the item is not in the library already, then create a new record from scratch.
-
-
- TIP: Always check your Catalog first
-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.
-
-Do I have to "Close" a Basket?
-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.
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+Placing an Order
+
+Once your basket is created you are presented with several options for adding items to the order.
+
+
+ If you are ordering another copy of an existing item, you can simply search for the record in your system
+
+ From the results, simply click 'Order' to be brought to the order form
+
+ All of the details associated with the item will already be listed under 'Catalog details'
+
+
+
+
+ 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
+
+
+
+ From this form you can make changes to the Catalog Details if necessary
+
+
+
+
+ To order from a record that can't be found anywhere else, choose the 'From a new (empty) record'
+
+ You will be presented with an empty form to fill in all of the necessary details about the item you are ordering
+
+
+ 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
+
+ From the results click the Order link next to the item you want to purchase
+ 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
+
+ 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.
+
+
+ In the order form that pops up you will not be able to edit the catalog details
+
+
+ The final option for ordering is to order from a staged record (learn more about staging records)
+
+ From the list of files you are presented with, choose the 'Add orders' link
+
+ From the list of records, click 'Add order' next to the item you want to add to your order
+
+ From the order form you will not be able to edit the catalog details.
+
+
+
+
+
+
+
+
+Once you have entered the info about the item you need to enter the Accounting information.
+
+
+ Quantity is populated by the number of items you've added to the order above
+ The list of funds is populated by the funds you have assigned in the Acquisitions Administration area.
+ The vendor price will be used to calculate the rest of the amount fields below
+ If the price is uncertain, check the uncertain price box.
+
+ A basket with at least one uncertain price can't be closed
+
+
+ If you added Planning Values when creating the Fund those values will appear in the two planning value fields
+
+
+Once an item is added to the basket you will be presented with a basket summary.
+
+From here you can edit or remove the items you have added.
+
+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.
+
+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.
+
+Important: A basket with at least one items marked as 'uncertain price' will not be able to be closed
+
+Clicking the 'Uncertain Prices' button will up a list of items with uncertain prices to quick editing.
+
+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.
+
+Printing Baskets
+
+When you are finished adding items to your basket you want to click 'Close this Basket'
+
+You will be asked if you want to create a purchase order at this time.
+
+Your completed order will be listed on the Basket Grouping page for the printing or further modification.
+
+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.
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
new file mode 100644
index 0000000000..b77b9ad6fb
--- /dev/null
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
@@ -0,0 +1,12 @@
+[% INCLUDE 'help-top.inc' %]
+
+Basket Groups
+
+A basket group is a group of closed baskets that you can perform actions on.
+
+Create a basket group
+
+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.
+
+[% INCLUDE 'help-bottom.inc' %]
+
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
new file mode 100644
index 0000000000..0d00781b8b
--- /dev/null
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
@@ -0,0 +1,16 @@
+[% INCLUDE 'help-top.inc' %]
+
+Adding a Basket
+
+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.
+
+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.
+
+When finished, click 'Save'
+
+Editing Basket Headers
+
+After creating your basket you can edit the name of the basket, the notes associated with it and the contract you're ordering against.
+
+[% INCLUDE 'help-bottom.inc' %]
+
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
index 48e6a1edbc..5970f596c5 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
@@ -1,58 +1,9 @@
[% INCLUDE 'help-top.inc' %]
-Ordering
-
- Click 'New order'
- You can add a new order from a book you already have in your catalog, a suggestion from a patron or an empty form.
-
-
-
-TIP: For instructions on ordering from a suggestion see 'Managing Suggestions' in this manual
-
- To order from an existing record, search for the record in your system
- To order a new book, click 'From a new (empty) record'
- Fill in the fields for your order.
-
-
-
-TIP: After entering a quantity and vendor price, the other fields will be calculated automatically.
-
-Actual Cost will be used to subtract from your budgets (whereas the other fees will be used when calculating replacement costs)
-
- After clicking 'Save' you will be brought to an order summary
- If you are done adding to that order, click the 'Close this basket' link
-
-
-
-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.
-
-
-
- Receiving Orders After your orders have been entered into the system and sent off to the vendors, you will need to mark them received.
-
-TIP: To receive serials see the 'Receiving Serials' part of this manual.
-
- To receive an order click 'Receive Shipment'
- Enter the invoice number is 'Vendor invoice' and the shipment date in 'Shipment date'
- Click 'Save'
- You'll need to choose which items arrived in this shipment
- Either search by title or ISBN or click 'Receive order' next to the item you'd like to mark as received
- Be sure to update the 'Quantity received' as well as any other information you need for your records
-
-
-
-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)
-
- Click 'Save'
- You will now see the received items in the summary of 'Items in this shipment'
- When you've added all of the items to your shipment you can browse away from the page.
-
- To make edits to your shipment return to Acquisitions and search for the vendor in question.
-
- Click the 'Receive Parcel' button
- Your previous orders will be searchable and editable from here
-
-
-
+Vendor Search
+
+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.
+
+In the Vendor Search you can enter any part of the vendor name to get results.
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
index ca96137bf8..86db1f0a57 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
@@ -1,13 +1,15 @@
[% INCLUDE 'help-top.inc' %]
-Late Orders
-
-Late orders is a report that checks for orders that were placed X days ago and still haven't been marked as received.
-
-
- Click on 'Late Orders' on the menu on the left
- You will be presented with a list of orders with baskets that have been closed for 30+ days
-
+Claims & Late Orders
+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.
+
+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.
+
+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.
+
+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.
+
+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.
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
new file mode 100644
index 0000000000..97cd1a776c
--- /dev/null
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
@@ -0,0 +1,15 @@
+[% INCLUDE 'help-top.inc' %]
+
+Order from an Existing Record
+
+If you are ordering another copy of an existing item, you can simply search for the record in your system
+
+
+ From the results, simply click 'Order' to be brought to the order form
+
+ All of the details associated with the item will already be listed under 'Catalog details'
+
+
+
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
index dce6920f1b..235c6b739d 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
@@ -1,18 +1,11 @@
[% INCLUDE 'help-top.inc' %]
-Order Details Help
+Order from a New Empty Record
-What is the "Vendor Price"?
-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.
+To order from a record that can't be found anywhere else, choose the 'From a new (empty) record'
-What is the "Replacement Price"?
-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.
-
-What is the "Budgeted Price"?
-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 Committed budget .
-
-What is the "Actual Price"?
-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.
-The Actual price is what is committed to your Spent budget .
+
+ You will be presented with an empty form to fill in all of the necessary details about the item you are ordering
+
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
new file mode 100644
index 0000000000..cb708afe1c
--- /dev/null
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
@@ -0,0 +1,11 @@
+[% INCLUDE 'help-top.inc' %]
+
+Order from Purchase Suggestion
+
+If you allow patrons to make purchase suggestions then you can place orders from those suggestions
+
+
+ From this form you can make changes to the Catalog Details if necessary
+
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
index 48907a8f29..916eea37b6 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
@@ -1,21 +1,17 @@
[% INCLUDE 'help-top.inc' %]
-Receiving Orders Help
-
-How do I receive items that have arrived?
-Firstly, check the catalog details that you are recieiving the right item. If these are correct, you can add the item details.
-For each item you will need to check the following:
-
- Volume/Copy for Serials
- Item Barcode scan or enter the barcode that has been assigned to the item
- Home Library choose the home library for the item from the drop down list
- Item Type choose the item type from the drop down.
-
-
- How do I receive multiple identical items?
-If you have ordered multiple copies of the same item, then use the "+" to bring up another Item Details input fieldset.
-For each copy you will need to set that Item Barcode, Home Library and Item Type.
-Each time you add a new item, the Quantity Received under Accounting Details should be updated.
-If you press the "+" by mistake, use the "-" button to remove the unwanted Item Details input fieldset
+Receiving Orders
+
+Orders can be received from the vendor information page or the vendor search results page.
+
+After clicking 'Receive shipment' you will be asked to enter a vendor invoice number and a shipment received date.
+
+The receive page will list all items still on order with the vendor regardless of the basket the item is from.
+
+To receive a specific item, click the 'Receive' link to the right of the item.
+
+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.
+
+You will also see that the item is received if you view the basket.
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
index d4a9e11261..dd574fa97c 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
@@ -1,30 +1,17 @@
[% INCLUDE 'help-top.inc' %]
Receiving Orders
-After your orders have been entered into the system and sent off to the vendors, you will need to mark them received.
-TIP: To receive serials see the 'Receiving Serials' part of this manual.
-
- To receive an order click 'Receive Shipment'
- Enter the invoice number is 'Vendor invoice' and the shipment date in 'Shipment date'
- Click 'Save'
- You'll need to choose which items arrived in this shipment
- Either search by title or ISBN or click 'Receive order' next to the item you'd like to mark as received
- Be sure to update the 'Quantity received' as well as any other information you need for your records
-
-
-
-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)
-
- Click 'Save'
- You will now see the received items in the summary of 'Items in this shipment'
- When you've added all of the items to your shipment you can browse away from the page.
-
- To make edits to your shipment return to Acquisitions and search for the vendor in question.
-
- Click the 'Receive Parcel' button
- Your previous orders will be searchable and editable from here
-
-
-
+
+Orders can be received from the vendor information page or the vendor search results page.
+
+After clicking 'Receive shipment' you will be asked to enter a vendor invoice number and a shipment received date.
+
+The receive page will list all items still on order with the vendor regardless of the basket the item is from.
+
+To receive a specific item, click the 'Receive' link to the right of the item.
+
+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.
+
+You will also see that the item is received if you view the basket.
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
index 7b1e3e4624..916eea37b6 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
@@ -2,29 +2,16 @@
Receiving Orders
-After your orders have been entered into the system and sent off to the vendors, you will need to mark them received.
-
-
- You must first pick a vendor
- After searching for a vendor you will see all open orders on a summary page
- To receive an order click 'Receive order' (link) or 'Receive Parcel' (button)
- Enter the invoice number is 'Vendor invoice' and the shipment date in 'Shipment date'
- Click 'Save'
- You'll need to choose which items arrived in this shipment
- Either search by title or ISBN or click 'Receive order' next to the item you'd like to mark as received
- Be sure to update the 'Quantity received' as well as any other information you need for your records
-
-
-
-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)
-
- Click 'Save'
- You will now see the received items in the summary of 'Items in this shipment'
- When you've added all of the items to your shipment you can browse away from the page.
-
- To make edits to your shipment return to Acquisitions and search for the vendor in question.
- Click the 'Receive Parcel' button
- Your previous orders will be searchable and editable from here
-
-
-