Attachment 9938 Details for Bug 7936 – Bug 7936 followup: Copyedited Acquisitions help files

[patch] Bug 7936 followup: Copyedited Acquisitions help files

Bug-7936-followup-Copyedited-Acquisitions-help-fil.patch (text/plain), 37.69 KB, created by Jared Camins-Esakov on 2012-06-05 21:44:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jared Camins-Esakov

Created: 2012-06-05 21:44:12 UTC

Size: 37.69 KB

patch

obsolete

>From ae7a8e767fb2d4c85ba8eb27600906460eab8ba7 Mon Sep 17 00:00:00 2001
>From: Shari Perkins <dear.shari+koha@gmail.com>
>Date: Tue, 5 Jun 2012 16:58:55 -0400
>Subject: [PATCH] Bug 7936 followup: Copyedited Acquisitions help files
>Content-Type: text/plain; charset="UTF-8"
>
>Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
>---
> .../prog/en/modules/help/acqui/acqcontract.tt | 8 +-
> .../prog/en/modules/help/acqui/acqui-home.tt | 8 +-
> .../prog/en/modules/help/acqui/basket.tt | 71 +++++++++-----------
> .../prog/en/modules/help/acqui/basketgroup.tt | 2 +-
> .../prog/en/modules/help/acqui/basketheader.tt | 8 +-
> .../prog/en/modules/help/acqui/booksellers.tt | 6 +-
> .../prog/en/modules/help/acqui/histsearch.tt | 8 +-
> .../prog/en/modules/help/acqui/lateorders.tt | 12 ++--
> .../prog/en/modules/help/acqui/neworderbiblio.tt | 7 +--
> .../prog/en/modules/help/acqui/neworderempty.tt | 4 +-
> .../en/modules/help/acqui/newordersuggestion.tt | 4 +-
> .../prog/en/modules/help/acqui/orderreceive.tt | 10 ++--
> .../prog/en/modules/help/acqui/parcel.tt | 12 ++--
> .../prog/en/modules/help/acqui/parcels.tt | 10 ++--
> .../prog/en/modules/help/acqui/supplier.tt | 42 ++++++------
> .../prog/en/modules/help/acqui/z3950_search.tt | 10 ++--
> 16 files changed, 106 insertions(+), 116 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 8440894..4340b11 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
>@@ -2,15 +2,15 @@
> 
> <h1>Vendor Contracts</h1>
> 
>-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.
>+You can define contracts (with a start and end date) and attach them 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.
> 
> <h2>Add a Contract</h2>
> 
>-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.
>+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.
>+Important: You cannot 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.
> 
>@@ -18,4 +18,4 @@
> 
> 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).
> 
>-[% 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/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
>index 491f184..9d64838 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,14 +2,14 @@
> 
> <h1>Acquisitions</h1>
> 
>-The Koha Acquisitions module provides a way where the library can record orders placed with vendors and manage purchase budgets.
>+The Koha Acquisitions module provides a way for the library to record orders placed with vendors and manage purchase budgets.
> 
>-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.
>+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.
> 
>-Before using the Acquisitions Module you will want to make sure that you have completed all of the set up.
>+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.
> 
> See the full documentation for Acquisitions in the <a href="http://manual.koha-community.org/3.8/en/acqmodule.html">manual</a> (online).
> 
>-[% 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/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
>index 810c732..2b457c4 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,47 +5,44 @@
> Once your basket is created you are presented with several options for adding items to the order.
> 
> <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
>-<ul>
>-	<li>
>-<ul>
>- <li>From this form you can make changes to the Catalog Details if necessary</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>
> </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 which 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 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 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 you are presented with, choose the 'Add orders' link
>+ <li>From the list of files with which you are presented, choose the 'Add orders' link.
> <ul>
>-	<li>From the list of records, click 'Add order' next to the item you want to add to your order
>+ <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>
> </ul>
>@@ -54,44 +51,42 @@
> </li>
> </ul>
> 
>-Once you have entered the info about the item you need to enter the Accounting information.
>+
>+Once you have entered the info about the item, you need to enter the Accounting information.
> 
> <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 vendor price will be used to calculate the rest of the amount fields below.</li>
> 	<li>If the price is uncertain, check the uncertain price box.
> <ul>
>-	<li>A basket with at least one uncertain price can't be closed</li>
>+ <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>
> 
>-Once an item is added to the basket you will be presented with a basket summary.
>+
>+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.
>+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.
> 
>-From here you can edit or remove the items you have added.
>+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.
> 
>-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.
>+Important: A basket with at least one item marked as 'uncertain price' will not be able to be closed
> 
>-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 call up a list of items with uncertain prices to quick editing.
> 
>-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.
>+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.
> 
> <h2>Printing Baskets</h2>
> 
>-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.
>+When you are finished adding items to your basket, 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.
>+Your completed order will be listed on the Basket Grouping page for 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.
>+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.
> 
> See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).
> 
>-[% 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/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
>index 6da5426..40255e9 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
>@@ -6,7 +6,7 @@
> 
> <h2>Create a basket group</h2>
> 
>-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.
>+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.
> 
> 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).
> 
>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 4f8598e..1df42ef 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,15 +2,15 @@
> 
> <h2>Adding a Basket</h2>
> 
>-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.
>+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.
> 
>-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.
>+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.
> 
>-When finished, click 'Save'
>+When finished, click 'Save.'
> 
> <h2>Editing Basket Headers</h2>
> 
>-After creating your basket you can edit the name of the basket, the notes associated with it and the contract you're ordering against.
>+After creating your basket, you can edit the name of the basket, the notes associated with it and the contract you're ordering against.
> 
> See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).
> 
>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 efc171b..0ceca1e 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>
> 
>-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.
>+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.
>+In the Vendor Search, you can enter any part of the vendor name to get results.
> 
>-Using the Orders Search you can search for items that have been ordered with or without the vendor.
>+Using the Orders Search, you can search for items that have been ordered with or without the vendor.
> 
> You can enter info in one or both fields and you can enter any part of the title and/or vendor name.
> 
>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 b11f84a..57bad58 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,13 +2,13 @@
> 
> <h1>Acquisitions Searching</h1>
> 
>-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.
>+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.
> 
>-In the Vendor Search you can enter any part of the vendor name to get results.
>+In the Vendor Search, you can enter any part of the vendor name to get results.
> 
>-Using the Orders Search you can search for items that have been ordered with or without the vendor.
>+Using the Orders Search, you can search for items that have been ordered with or without the vendor.
> 
>-You can enter info in one or both fields and you can enter any part of the title and/or vendor name.
>+You can enter info in one or both fields, and you can enter any part of the title and/or vendor name.
> 
> Clicking the plus sign to the right of the Vendor search box will expand the search and allow you to search for additional fields.
> 
>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 8ab0fba..20d93ef 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
>@@ -2,20 +2,20 @@
> 
> <h1>Claims &amp; Late Orders</h1>
> 
>-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.
>+If you have entered 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. These filters will be applied only closed baskets.
>+Upon clicking 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 to closed baskets.
> 
> Note: The vendor pull down only shows vendors with closed baskets that are late.
> 
>-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.
>+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' at the bottom right of the list. This will automatically send an email to the vendor at the email address you have on file.
>+To the right of each late title you will be see a checkbox. Check the ones that 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.
> 
> Note: The Estimated Delivery Date is based on the Delivery time value entered on the vendor record.
> 
>-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.
>+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.
> 
> 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).
> 
>-[% 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/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
>index 707b73a..7bdb253c 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
>@@ -2,15 +2,12 @@
> 
> <h1>Order from an Existing Record</h1>
> 
>-If you are ordering another copy of an existing item, you can simply search for the record in your system
>+If you are ordering another copy of an existing item, you can simply search for the record in your system.
> 
> <ul>
>-	<li>From the results, simply click 'Order' to be brought to the order form
>-<ul>
>+ <li>From the results, simply click 'Order' to be brought to the order form.</li>
> 	<li>All of the details associated with the item will already be listed under 'Catalog details'</li>
> </ul>
>-</li>
>-</ul>
> 
> See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).
> 
>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 cda5510..e0b7801 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
>@@ -2,10 +2,10 @@
> 
> <h1>Order from a New Empty Record</h1>
> 
>-To order from a record that can't be found anywhere else, choose the 'From a new (empty) record'
>+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.</li>
> </ul>
> 
> See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).
>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 50ed08d..fd32094 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
>@@ -2,10 +2,10 @@
> 
> <h1>Order from Purchase Suggestion</h1>
> 
>-If you allow patrons to make purchase suggestions then you can place orders from those suggestions
>+If you allow patrons to make purchase suggestions, then you can place orders from those suggestions.
> 
> <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>
> 
> See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).
>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 b8ebfeb..b961c36 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,18 @@
> 
> 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.
>+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.
>+The receive page will list all items still on order with the vendor, regardless of which basket contains the item.
> 
> 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.
>+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.
> 
>-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.
>+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.
> 
> You will also see that the item is received if you view the basket.
> 
> See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.8/en/receiveacqorder.html">manual</a> (online).
> 
>-[% 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/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
>index b8ebfeb..f3426f3 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,20 @@
> 
> <h1>Receiving Orders</h1>
> 
>-Orders can be received from the vendor information page or the vendor search results page.
>+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.
>+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.
>+The Receive page will list all items still on order with the vendor, no matter which 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.
>+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.
> 
>-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.
>+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.
> 
> You will also see that the item is received if you view the basket.
> 
> See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.8/en/receiveacqorder.html">manual</a> (online).
> 
>-[% 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/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
>index b8ebfeb..416fa19 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,18 @@
> 
> 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.
>+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.
>+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.
>+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.
> 
>-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.
>+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.
> 
> You will also see that the item is received if you view the basket.
> 
> See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.8/en/receiveacqorder.html">manual</a> (online).
> 
>-[% 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/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
>index a68c615..00d6eb5 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
>@@ -2,57 +2,55 @@
> 
> <h1>Vendors</h1>
> 
>-Before any orders can be places you must first enter at least one vendor.
>+Before any orders can be placed, you must first enter at least one vendor.
> 
> <h2>Add a Vendor</h2>
> 
>-To add a vendor click the 'New Vendor' button on the Acquisitions page
>+To add a vendor, click the 'New Vendor' button on the Acquisitions page.
> 
>-The vendor add form is broken into three pieces
>+The vendor add form is broken into three pieces:
> 
> <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>
>+ <li>None of these fields are required. They should only be entered if you want to keep track of your contact information within Koha.</li>
> </ul>
> </li>
>-	<li>The final section is for billing information
>+ <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>To be able to order from a vendor, you must make them 'Active.'</li>
>+ <li>For List Prices and Invoice Prices, choose the currency.
> <ul>
>- <li>Currencies are assigned in the Currencies &amp; Exchange Rates admin area</li>
>+ <li>Currencies are assigned in the Currencies &amp; Exchange Rates admin area.</li>
> </ul>
> </li>
>- <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
>+ <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>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>
>+ <li>Enter your tax rate if your library is charged taxes on orders.</li>
>+ <li>If you know 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>
> 
>-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
>-
>-From the results, click on the name of the vendor you want to view or edit
>+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. From the results, click on the name of the vendor you want to view or edit.
> 
> To make changes to the vendor, simply click the 'Edit' button.
> 
>-If the vendor has no baskets attached to it then a 'Delete' button will also be visible and the vendor can be deleted.
>+If the vendor has no baskets attached to it, a 'Delete' button will also be visible, allowing the vendor to be deleted.
> 
> See the full documentation for managing Vendors in the <a href="http://manual.koha-community.org/3.8/en/acqvendors.html">manual</a> (online).
> 
>-[% 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/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
>index 0017900..9873e1a 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
>@@ -2,16 +2,16 @@
> 
> <h1>Order from an External Source</h1>
> 
>-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
>+If you want to search other libraries for an item to purchase, 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 for 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 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>
> 
> See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).
>-- 
>1.7.2.5

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