[Koha-patches] [PATCH] Bug 8945: Acquisitions Help Files for 3.10
Nicole C. Engard
nengard at bywatersolutions.com
Fri Oct 19 14:06:07 CEST 2012
This patch adds a few missing help files and updates all
of the existing help files for 3.10.
---
.../prog/en/modules/help/acqui/acqcontract.tt | 2 +-
.../prog/en/modules/help/acqui/acqui-home.tt | 2 +-
.../prog/en/modules/help/acqui/basket.tt | 78 +++++++++++++-------
.../prog/en/modules/help/acqui/basketgroup.tt | 2 +-
.../prog/en/modules/help/acqui/basketheader.tt | 16 +++-
.../prog/en/modules/help/acqui/booksellers.tt | 8 +-
.../prog/en/modules/help/acqui/histsearch.tt | 11 +--
.../prog/en/modules/help/acqui/invoice.tt | 13 +++
.../prog/en/modules/help/acqui/invoices.tt | 13 +++
.../prog/en/modules/help/acqui/lateorders.tt | 2 +-
.../prog/en/modules/help/acqui/neworderbiblio.tt | 2 +-
.../prog/en/modules/help/acqui/neworderempty.tt | 2 +-
.../en/modules/help/acqui/newordersuggestion.tt | 3 +-
.../prog/en/modules/help/acqui/orderreceive.tt | 14 ++--
.../prog/en/modules/help/acqui/parcel.tt | 16 ++--
.../prog/en/modules/help/acqui/parcels.tt | 14 ++--
.../prog/en/modules/help/acqui/supplier.tt | 2 +-
.../prog/en/modules/help/acqui/uncertainprice.tt | 9 ++
.../prog/en/modules/help/acqui/z3950_search.tt | 2 +-
19 files changed, 141 insertions(+), 70 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoice.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoices.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/uncertainprice.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
index 4340b11..41d65e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
@@ -16,6 +16,6 @@
<p>It will also be an option when creating a basket.</p>
-<p><strong>See the full documentation for Vendor Contracts in the <a href="http://manual.koha-community.org/3.8/en/acqvendors.html#vendorcontracts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Vendor Contracts in the <a href="http://manual.koha-community.org/3.10/en/acqvendors.html#vendorcontracts">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
index 9d64838..55f9fcc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
@@ -10,6 +10,6 @@
<p>First, set your Acquisitions System Preferences and Acquisitions Administration to match your library's workflow.</p>
-<p><strong>See the full documentation for Acquisitions in the <a href="http://manual.koha-community.org/3.8/en/acqmodule.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Acquisitions in the <a href="http://manual.koha-community.org/3.10/en/acqmodule.html">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
index 2b457c4..809ebce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
@@ -5,76 +5,100 @@
<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.
+ <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.
+ <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>
+ <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.
- <li>From this form you can make changes to the Catalog Details if necessary.</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.</li>
+ <li>From the results, click 'Order' next to the item you want to order and you will be presented with the order form including a link to the suggestion
+<ul>
+ <li>From this form you can make changes to the Catalog Details if necessary.</li>
+ <li>When the item appears in your basket it will include a link to the suggestion.</li>
</ul>
</li>
- <li>To order from a record that can't be found anywhere else, choose the 'From a new (empty) record.'
+ <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>
+ <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 that will allow you to order from a MARC record found via a Z39.50 search.
+ <li>If you want to search other libraries for an item to purchase, you can use the 'From an external source' option that 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.
+ <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 order another copy on the existing bib record, create a new bib record, or cancel your order of this item.</li>
+ <li>From the warning, you can choose to 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>
+ <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).
+ <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 with which you are presented, choose the 'Add orders' link.
+ <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 that you want to add to your order.
+ <li>From the list of records, click 'Add order' next to the item that you want to add to your order.
<ul>
- <li>From the order form, you will not be able to edit the catalog details.</li>
+ <li>From the order form, you will not be able to edit the catalog details.</li>
</ul>
</li>
+ <li>The other option is to import all records from the staged file by scrolling below the list of records in the staged file and filling in the item information.
+<ul>
+ <li>If you choose this option the Koha will look in the 020$c and grab the pricing information from that field and put that on each order line.</li>
</ul>
</li>
</ul>
</li>
</ul>
+</li>
+</ul>
+
+<p>After bringing in the bib information, if your AcqCreateItem system preference is set to add an item when ordering you will enter the item info next. You need to fill out at least one item record and then click the 'Add' button at the bottom left of the item form.</p>
+
+<p>After clicking add the item will appear above the form and then you can enter your next item the same way (if ordering more than one item).</p>
-<p/>
<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>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>The currency pull down will have the currencies you set up in the Acquisitions Administration area.</li>
+ <li>The vendor price is the price before any taxes or discounts are applied.</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>
+ <li>A basket with at least one uncertain price can't be closed.</li>
+</ul>
+</li>
+ <li>If you are charged sales tax, choose that from the gstrate field</li>
+ <li>Enter the percentage discount you're receiving on this order, once you enter this, hit tab and Koha will populate the rest of the cost fields below.</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>If you would like to see more details you can check the 'Show all details' checkbox.</p>
+
+<p>From here, you can edit or remove the items that you have added.</p>
+
+<ul>
+ <li>Choosing to 'Delete the order' will delete the order line but leave the record in the catalog.</li>
+ <li>Choosing to 'Delete order and catalog record' removes both the order line and the record in the catalog.
+<ul>
+ <li>The catalog record cannot always be deleted. You might see notes explaining why.</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/>
-<p>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 that you have added.</p>
<p>On the summary page, you also have the option to edit the information that you entered about the basket by clicking the 'Edit basket header information' button, to delete the basket altogether by clicking the 'Delete this basket' button, or to export 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 item marked as 'uncertain price' will not be able to be closed</p>
-
<p>Clicking the 'Uncertain Prices' button will call 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 with uncertain prices for that vender.</p>
@@ -87,6 +111,6 @@
<p>Clicking 'Print' below your order will generate a PDF for printing, which will have all of your library information followed by the items in your order.</p>
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.10/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
index 40255e9..5c69914 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
@@ -8,7 +8,7 @@
<p>A basket group is simply a group of baskets. In some libraries, you have several staff members who 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>
-<p><strong>See the full documentation for Basket Groups in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#acqbasketgroup">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Basket Groups in the <a href="http://manual.koha-community.org/3.10/en/placingacqorder.html#acqbasketgroup">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
index 9f8dddd..918ab98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
@@ -2,17 +2,23 @@
<h2>Adding a Basket</h2>
-<p>When adding a basket, 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>When adding a basket you want to give it a name that will help you identify it later</p>
-<p>If you have added contracts to the vendor from whom you are ordering, you will also have an option to choose which contract you are ordering those items under.</p>
+<p>Enter in the Billing Place and Delivery Place (this will default the library you're logged in at)</p>
-<p>When finished, click 'Save'.</p>
+<p>If you would like to change the vendor you're ordering from you can use the Vendor pull down menu</p>
+
+<p>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'
<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>
+<p>After creating your basket, you can edit the name of the basket, the billing place, delivery place, the notes and the contract you're ordering against.</p>
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.10/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
index 0ceca1e..830e1cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
@@ -2,11 +2,11 @@
<h1>Acquisitions Searching</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>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>
+<p>In the Vendor Search you can enter any part of the vendor name to get results.</p>
-<p>Using the Orders Search, you can search for items that have been ordered with or without the vendor.</p>
+<p>Using the Orders Search you can search for items that have been ordered with or without the vendor.</p>
<p>You can enter info in one or both fields and you can enter any part of the title and/or vendor name.</p>
@@ -14,6 +14,6 @@
<p>Clicking Advanced Search to the right of the search button will give you all of the order search options available.</p>
-<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.8/en/acqsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.10/en/acqsearch.html">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
index 57bad58..830e1cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
@@ -2,19 +2,18 @@
<h1>Acquisitions Searching</h1>
-<p>At the top of the various Acquisition pages is a quick search box where you can perform either a Vendor Search or an Order Search.</p>
+<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>
+<p>In the Vendor Search you can enter any part of the vendor name to get results.</p>
-<p>Using the Orders Search, you can search for items that have been ordered with or without the vendor.</p>
+<p>Using the Orders Search you can search for items that have been ordered with or without the vendor.</p>
-<p>You can enter info in one or both fields, and you can enter any part of the title and/or vendor name.</p>
+<p>You can enter info in one or both fields and you can enter any part of the title and/or vendor name.</p>
<p>Clicking the plus sign to the right of the Vendor search box will expand the search and allow you to search for additional fields.</p>
<p>Clicking Advanced Search to the right of the search button will give you all of the order search options available.</p>
-<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.8/en/acqsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.10/en/acqsearch.html">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoice.tt
new file mode 100644
index 0000000..640878e
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoice.tt
@@ -0,0 +1,13 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Invoices</h1>
+
+<p>When orders are received invoices are generated. Invoices can be searched by clicking on 'Invoices' in the left of the Acquisitions page.</p>
+
+<p>After searching, your results will appear to the right of the search options.</p>
+
+<p>From the results you can click the 'Details' link to see the full invoice or 'Close' to note that the invoice is closed/paid for.</p>
+
+<p><strong>See the full documentation for Invoices in the <a href="http://manual.koha-community.org/3.10/en/acqinvoices.html">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoices.tt
new file mode 100644
index 0000000..640878e
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoices.tt
@@ -0,0 +1,13 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Invoices</h1>
+
+<p>When orders are received invoices are generated. Invoices can be searched by clicking on 'Invoices' in the left of the Acquisitions page.</p>
+
+<p>After searching, your results will appear to the right of the search options.</p>
+
+<p>From the results you can click the 'Details' link to see the full invoice or 'Close' to note that the invoice is closed/paid for.</p>
+
+<p><strong>See the full documentation for Invoices in the <a href="http://manual.koha-community.org/3.10/en/acqinvoices.html">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
index 20d93ef..a2d9bfc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
@@ -16,6 +16,6 @@
<p>There is a default acquisitions cliam letter. If you would rather use a different one, you can create that in the notices module and choose it from the menu above the list of late items.</p>
-<p><strong>See the full documentation for Claims and Late Orders in the <a href="http://manual.koha-community.org/3.8/en/acqclaims.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Claims and Late Orders in the <a href="http://manual.koha-community.org/3.10/en/acqclaims.html">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
index 7bdb253..b7df875 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
@@ -9,6 +9,6 @@
<li>All of the details associated with the item will already be listed under 'Catalog details'</li>
</ul>
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.10/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
index e0b7801..a611262 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
@@ -8,6 +8,6 @@
<li>You will be presented with an empty form to fill in all of the necessary details about the item.</li>
</ul>
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.10/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
index fd32094..d581d20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
@@ -6,8 +6,9 @@
<ul>
<li>From this form you, can make changes to the Catalog Details if necessary.</li>
+ <li>When the item appears in your basket it will include a link to the suggestion.</li>
</ul>
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.10/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
index b961c36..3c41af9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
@@ -4,18 +4,20 @@
<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>After clicking 'Receive shipment' you will be asked to enter a vendor invoice number, a shipment received date, a shipping cost and a budget to subtract that shipping amount from.</p>
-<p>The receive page will list all items still on order with the vendor, regardless of which basket contains the item.</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 one of multiple items if only one arrived. Once you have made any necessary changes, click 'Save' to mark the item as received.</p>
+<p>From this form you can alter the cost information. You can also choose to mark only part of the order as received if the vendor didn't send your entire order by checking only the boxes next to the items on the left that you want to receive. The values you enter in the 'Replacement cost' and 'Actual cost' will automatically populate the item record by filling in subfield v (Cost, replacement price) and subfield g (Cost, normal purchase price) on the item record after saving.</p>
-<p>When you're finished receiving items, you can navigate away from this page or click the 'Finish receiving' button at the bottom of the screen.</p>
+<p>You can also make edits to the item record from this form by clicking the 'Edit' link next to each item. This will allow you to enter in accurate call numbers and barcodes if you'd like to do that at the point of receipt. Once you have made any changes necessary (to the order and/or items, click 'Save' to mark the item(s) as received.</p>
-<p>You will also see that the item is received if you view the basket.</p>
+<p>When you're finished receiving items you can navigate away from this page or click the 'Finish receiving' button at the bottom of the screen.</p>
-<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.8/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p>You will also see that the item is received and/or cancelled if you view the basket.</p>
+
+<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.10/en/receiveacqorder.html">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
index f3426f3..3c41af9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
@@ -2,20 +2,22 @@
<h1>Receiving Orders</h1>
-<p>Orders can be received from the Vendor Information page or the Vendor Search Results page.</p>
+<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>After clicking 'Receive shipment' you will be asked to enter a vendor invoice number, a shipment received date, a shipping cost and a budget to subtract that shipping amount from.</p>
-<p>The Receive page will list all items still on order with the vendor, no matter which basket the item is from.</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 one of multiple items if only one arrived. Once you have made any necessary changes, click 'Save' to mark the item as received.</p>
+<p>From this form you can alter the cost information. You can also choose to mark only part of the order as received if the vendor didn't send your entire order by checking only the boxes next to the items on the left that you want to receive. The values you enter in the 'Replacement cost' and 'Actual cost' will automatically populate the item record by filling in subfield v (Cost, replacement price) and subfield g (Cost, normal purchase price) on the item record after saving.</p>
-<p>When you're finished receiving items, you can navigate away from this page or click the 'Finish receiving' button at the bottom of the screen.</p>
+<p>You can also make edits to the item record from this form by clicking the 'Edit' link next to each item. This will allow you to enter in accurate call numbers and barcodes if you'd like to do that at the point of receipt. Once you have made any changes necessary (to the order and/or items, click 'Save' to mark the item(s) as received.</p>
-<p>You will also see that the item is received if you view the basket.</p>
+<p>When you're finished receiving items you can navigate away from this page or click the 'Finish receiving' button at the bottom of the screen.</p>
-<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.8/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p>You will also see that the item is received and/or cancelled if you view the basket.</p>
+
+<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.10/en/receiveacqorder.html">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
index 416fa19..3c41af9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
@@ -4,18 +4,20 @@
<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>After clicking 'Receive shipment' you will be asked to enter a vendor invoice number, a shipment received date, a shipping cost and a budget to subtract that shipping amount from.</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>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 one of multiple items if only one arrived. Once you have made any necessary changes, click 'Save' to mark the item as received.</p>
+<p>From this form you can alter the cost information. You can also choose to mark only part of the order as received if the vendor didn't send your entire order by checking only the boxes next to the items on the left that you want to receive. The values you enter in the 'Replacement cost' and 'Actual cost' will automatically populate the item record by filling in subfield v (Cost, replacement price) and subfield g (Cost, normal purchase price) on the item record after saving.</p>
-<p>When you're finished receiving items, you can navigate away from this page or click the 'Finish receiving' button at the bottom of the screen.</p>
+<p>You can also make edits to the item record from this form by clicking the 'Edit' link next to each item. This will allow you to enter in accurate call numbers and barcodes if you'd like to do that at the point of receipt. Once you have made any changes necessary (to the order and/or items, click 'Save' to mark the item(s) as received.</p>
-<p>You will also see that the item is received if you view the basket.</p>
+<p>When you're finished receiving items you can navigate away from this page or click the 'Finish receiving' button at the bottom of the screen.</p>
-<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.8/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p>You will also see that the item is received and/or cancelled if you view the basket.</p>
+
+<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.10/en/receiveacqorder.html">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
index 00d6eb5..6dbe769 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
@@ -51,6 +51,6 @@
<p>If the vendor has no baskets attached to it, a 'Delete' button will also be visible, allowing the vendor to be deleted.</p>
-<p><strong>See the full documentation for managing Vendors in the <a href="http://manual.koha-community.org/3.8/en/acqvendors.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for managing Vendors in the <a href="http://manual.koha-community.org/3.10/en/acqvendors.html">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/uncertainprice.tt
new file mode 100644
index 0000000..2616d30
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/uncertainprice.tt
@@ -0,0 +1,9 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Uncertain prices</h1>
+
+<p>The Uncertain Prices page is independent of the basket. It is linked to the vendor so you will see all items on order with uncertain prices for that vendor.</p>
+
+<p><strong>See the full documentation for Uncertain prices in the <a href="http://manual.koha-community.org/3.10/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
index 9873e1a..1ebcbb6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
@@ -14,6 +14,6 @@
<li>In the order form that pops up, you will not be able to edit the catalog details</li>
</ul>
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.10/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
[% INCLUDE 'help-bottom.inc' %]
--
1.7.2.3
More information about the Koha-patches
mailing list