Attachment 9180 Details for Bug 7936 – Bug 7936: Acq Help Files for 3.8

[patch] Bug 7936: Acq Help Files for 3.8

Bug-7936-Acq-Help-Files-for-38.patch (text/plain), 29.79 KB, created by Nicole C. Engard on 2012-04-13 15:13:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicole C. Engard

Created: 2012-04-13 15:13:27 UTC

Size: 29.79 KB

patch

obsolete

>From 3f2028fd5f6a9d95951353cf3a63a2c6d09a9f1c Mon Sep 17 00:00:00 2001
>From: Nicole C. Engard <nengard@bywatersolutions.com>
>Date: Thu, 12 Apr 2012 12:02:56 -0400
>Subject: [PATCH] Bug 7936: Acq Help Files for 3.8
>
>---
> .../prog/en/modules/help/acqui/acqcontract.tt      |    8 ++--
> .../prog/en/modules/help/acqui/acqui-home.tt       |   10 +++--
> .../prog/en/modules/help/acqui/basket.tt           |   20 ++++++------
> .../prog/en/modules/help/acqui/basketgroup.tt      |    4 +-
> .../prog/en/modules/help/acqui/basketheader.tt     |    6 ++--
> .../prog/en/modules/help/acqui/booksellers.tt      |   17 +++++-----
> .../prog/en/modules/help/acqui/histsearch.tt       |   14 ++++----
> .../prog/en/modules/help/acqui/lateorders.tt       |   12 +++++--
> .../prog/en/modules/help/acqui/neworderbiblio.tt   |    4 +-
> .../prog/en/modules/help/acqui/neworderempty.tt    |    4 +-
> .../en/modules/help/acqui/newordersuggestion.tt    |    6 ++--
> .../prog/en/modules/help/acqui/orderreceive.tt     |    6 ++-
> .../prog/en/modules/help/acqui/parcel.tt           |    6 ++-
> .../prog/en/modules/help/acqui/parcels.tt          |    6 ++-
> .../prog/en/modules/help/acqui/supplier.tt         |   33 +++++++++++--------
> .../prog/en/modules/help/acqui/z3950_search.tt     |    4 +-
> 16 files changed, 89 insertions(+), 71 deletions(-)
>
>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 4d0cd59..8440894 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
>@@ -1,12 +1,12 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Vendor contracts</h1>
>+<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>
>+<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>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>
> 
>@@ -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.6/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.8/en/acqvendors.html#vendorcontracts">manual</a> (online).</strong></p>
> 
> [% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>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 85ed10f..491f184 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
>@@ -2,12 +2,14 @@
> 
> <h1>Acquisitions</h1>
> 
>-<p>The Koha acquisitions module provides a way where the library can record orders placed with vendors and manage purchase budgets.</p>
>+<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, acquisitions is used only to track vendors and spending against your budgets.</p>
>+<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>Before using the acquisitions module you will want to make sure that you have completed all of the set up.</p>
>+<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>
>+<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>
> 
> [% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>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 4a6967c..9c8898a 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
>@@ -1,6 +1,6 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h2>Placing an order</h2>
>+<h2>Placing an Order</h2>
> 
> <p>Once your basket is created you are presented with several options for adding items to the order.</p>
> 
>@@ -18,7 +18,7 @@
> <ul>
> 	<li>
> <ul>
>-    <li>From this form you can make changes to the catalog details if necessary</li>
>+	<li>From this form you can make changes to the Catalog Details if necessary</li>
> </ul>
> </li>
> </ul>
>@@ -30,10 +30,10 @@
> </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
>+	<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>
>+	<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>
>@@ -65,7 +65,7 @@
> 	<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>
>+	<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>
>@@ -78,13 +78,13 @@
> 
> <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>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>
>+<h2>Printing Baskets</h2>
> 
>-<p>When you are finished adding items to your basket you want to click 'Close this basket'</p>
>+<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>
> 
>@@ -92,6 +92,6 @@
> 
> <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>
> 
>-<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/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.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
> 
> [% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>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 093552e..6da5426 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
>@@ -1,6 +1,6 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Basket groups</h1>
>+<h1>Basket Groups</h1>
> 
> <p>A basket group is a group of closed baskets that you can perform actions on.</p>
> 
>@@ -8,7 +8,7 @@
> 
> <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>
> 
>-<p><strong>See the full documentation for basket groups in the <a href="http://manual.koha-community.org/3.6/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.8/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 1fe4e87..4f8598e 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
>@@ -1,6 +1,6 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h2>Adding a basket</h2>
>+<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>
> 
>@@ -8,11 +8,11 @@
> 
> <p>When finished, click 'Save'</p>
> 
>-<h2>Editing basket headers</h2>
>+<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><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/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.8/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 1a75807..b11f84a 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
>@@ -1,19 +1,20 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Acquisitions searching</h1>
>+<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>
> 
>-<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 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>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.6/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.8/en/acqsearch.html">manual</a> (online).</strong></p>
> 	
>-[% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>+[% 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 8432692..b11f84a 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
>@@ -1,20 +1,20 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Acquisitions searching</h1>
>+<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>
> 
>-<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 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>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.6/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.8/en/acqsearch.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 f02522d..8ab0fba 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
>@@ -1,17 +1,21 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Claims &amp; late orders</h1>
>+<h1>Claims &amp; 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>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. These filters will be applied only closed baskets.</p>
>+
>+<p><strong>Note:</strong> The vendor pull down only shows vendors with closed baskets that are late.</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>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' at the bottom right of the list. This will automatically send an email to the vendor at the email address you have on file.</p>
>+
>+<p><strong>Note:</strong> The Estimated Delivery Date is based on the Delivery time value entered on the vendor record.</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>
> 
>-<p><strong>See the full documentation for claims and late orders in the <a href="http://manual.koha-community.org/3.6/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.8/en/acqclaims.html">manual</a> (online).</strong></p>
> 
> [% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>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 5ebeccd..707b73a 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
>@@ -1,6 +1,6 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Order from an existing record</h1>
>+<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>
> 
>@@ -12,6 +12,6 @@
> </li>
> </ul>
> 
>-<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/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.8/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 bd65b41..cda5510 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
>@@ -1,6 +1,6 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Order from a new empty record</h1>
>+<h1>Order from a New Empty Record</h1>
> 
> <p>To order from a record that can't be found anywhere else, choose the 'From a new (empty) record'</p>
> 
>@@ -8,6 +8,6 @@
> 	<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>
> 
>-<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/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.8/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 3e7dbe1..447924f 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
>@@ -1,13 +1,13 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Order from purchase suggestion</h1>
>+<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>
>+	<li>From this form you can make changes to the Catalog Details if necessary</li>
> </ul>
> 
>-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.6/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.8/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 a2bd19d..b8ebfeb 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
>@@ -1,6 +1,6 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Receiving orders</h1>
>+<h1>Receiving Orders</h1>
> 
> <p>Orders can be received from the vendor information page or the vendor search results page.</p>
> 
>@@ -12,8 +12,10 @@
> 
> <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>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 will also see that the item is received 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.6/en/receiveacqorder.html">manual</a> (online).</strong></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>
> 
> [% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>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 14d0c96..b8ebfeb 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
>@@ -1,6 +1,6 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Receiving orders</h1>
>+<h1>Receiving Orders</h1>
> 
> <p>Orders can be received from the vendor information page or the vendor search results page.</p>
> 
>@@ -12,8 +12,10 @@
> 
> <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>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 will also see that the item is received 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.6/en/receiveacqorder.html">manual</a> (online).</strong></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>
> 
> [% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>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 14d0c96..b8ebfeb 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
>@@ -1,6 +1,6 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Receiving orders</h1>
>+<h1>Receiving Orders</h1>
> 
> <p>Orders can be received from the vendor information page or the vendor search results page.</p>
> 
>@@ -12,8 +12,10 @@
> 
> <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>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 will also see that the item is received 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.6/en/receiveacqorder.html">manual</a> (online).</strong></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>
> 
> [% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>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 e24b13d..17b1b12 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
>@@ -4,19 +4,19 @@
> 
> <p>Before any orders can be places you must first enter at least one vendor.</p>
> 
>-<h2>Add a vendor</h2>
>+<h2>Add a Vendor</h2>
> 
>-<p>To add a vendor click the 'New vendor' button on the Acquisitions page.</p>
>+<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>
>+<p>The vendor add form is broken into three pieces</p>
> 
> <ul>
>-    <li>The first section is for basic information about the vendor
>+	<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>
>+	<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
>+	<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>
>@@ -24,30 +24,35 @@
> 	<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
>+	<li>For List Prices and Invoice Prices choose the currency
> <ul>
>-    <li>Currencies are assigned in the Currencies &amp; Exchange rates admin area</li>
>+	<li>Currencies are assigned in the Currencies &amp; Exchange Rates admin area</li>
> </ul>
> </li>
>-    <li>If the vendor offers a consistent blank discount, enter that in the 'Discount' field
>+	<li>If your library is charged tax mark your Tax Number as registered</li>
>+	<li>Note if you list prices and/or invoice prices include tax</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>Enter your tax rate if your library is charged taxes on orders</li>
>+	<li>If you know about how long it usually takes orders to arrive from this vendor you can enter a delivery time. This will allow Koha to estimate when orders will arrive at your library on the late orders report.</li>
> 	<li>Notes are for internal use</li>
> </ul>
> </li>
> </ul>
> 
>-<h2>View/Edit a vendor</h2>
>+<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>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>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>
> 
>-<p><strong>See the full documentation for managing vendors in the <a href="http://manual.koha-community.org/3.6/en/acqvendors.html">manual</a> (online).</strong></p>
>+<p>If the vendor has no baskets attached to it then a 'Delete' button will also be visible and the vendor can 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>
> 
> [% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>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 7afff73..0017900 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
>@@ -1,6 +1,6 @@
> [% INCLUDE 'help-top.inc' %]
> 
>-<h1>Order from an external source</h1>
>+<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>
> 
>@@ -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.6/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.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
> 
> [% INCLUDE 'help-bottom.inc' %]
>-- 
>1.7.2.3

Actions: View | Diff | Splinter Review

Attachments on bug 7936: 9049 | 9051 | 9053 | 9080 | 9083 | 9084 | 9085 | 9086 | 9088 | 9098 | 9099 | 9100 | 9101 | 9102 | 9103 | 9104 | 9105 | 9106 | 9117 | 9119 | 9120 | 9121 | 9126 | 9136 | 9137 | 9138 | 9139 | 9140 | 9158 | 9177 | 9180 | 9181 | 9184 | 9185 | 9186 | 9187 | 9929 | 9930 | 9931 | 9932 | 9933 | 9934 | 9935 | 9936 | 9937 | 9938 | 9939 | 9967