[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. e683e46267af4f126e045d4dd45997a3655aeb16
Evergreen Git
git at git.evergreen-ils.org
Thu Mar 29 14:45:37 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_3_1 has been updated
via e683e46267af4f126e045d4dd45997a3655aeb16 (commit)
via 3fc0672f93e370fa1bfea6016490209d25594cb6 (commit)
via 741f27d6cbf86038b8786c996d4fe5ca512e4151 (commit)
via fda829e13e8ad939a02491db1b584aeec9bd1278 (commit)
via d4e86f4486b12a7a8a6de8b00ab09d72d8e5cb51 (commit)
via a3ec12d3d11c762445436a28614cb191c5943775 (commit)
from 79b61de9f03af09032dc9586983cf30006edcfed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e683e46267af4f126e045d4dd45997a3655aeb16
Author: Remington Steed <rjs7 at calvin.edu>
Date: Thu Mar 29 09:55:08 2018 -0400
Docs: Add screenshots to "Load MARC Order Records"
Thanks to Morkor Quarshie for the screenshots.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/acquisitions/vandelay_acquisitions_integration.adoc b/docs/acquisitions/vandelay_acquisitions_integration.adoc
index a632437..be9c1af 100644
--- a/docs/acquisitions/vandelay_acquisitions_integration.adoc
+++ b/docs/acquisitions/vandelay_acquisitions_integration.adoc
@@ -40,6 +40,9 @@ system will use the organizational unit's default fiscal year stored in the
database. If not fiscal year is set, the system will default to the current
calendar year.
+image::media/load_marc_order_records.png[Acquisitions MARC upload screen]
+
+
Record Matching Options
~~~~~~~~~~~~~~~~~~~~~~~
Use the options below the horizontal rule for the system to check for matching
@@ -81,6 +84,9 @@ will load them as acquisitions copies. (Note: These can be overlayed with real c
during the MARC batch importing process.) Or you can select *Load Items for
Imported Records* to load them as live copies that display in the catalog.
+image::media/load_marc_order_records.png[Acquisitions MARC upload screen]
+
+
Default Upload Settings
~~~~~~~~~~~~~~~~~~~~~~~
@@ -100,6 +106,9 @@ You can set default upload values by modifying the following settings in
- Upload Merge on Exact Match by Default
- Upload Merge on Single Match by Default
+image::media/acq_upload_library_settings.png[Acq upload settings in Library Settings Editor]
+
+
Sticky Settings
~~~~~~~~~~~~~~~
diff --git a/docs/media/acq_upload_library_settings.png b/docs/media/acq_upload_library_settings.png
new file mode 100644
index 0000000..f33d348
Binary files /dev/null and b/docs/media/acq_upload_library_settings.png differ
diff --git a/docs/media/load_marc_order_records.png b/docs/media/load_marc_order_records.png
new file mode 100644
index 0000000..5997776
Binary files /dev/null and b/docs/media/load_marc_order_records.png differ
commit 3fc0672f93e370fa1bfea6016490209d25594cb6
Author: Remington Steed <rjs7 at calvin.edu>
Date: Wed Mar 21 17:01:05 2018 -0400
Docs: Update "User and Group Permissions" for web client
- Update instructions for web client
- New screenshot shows menu path from patron screen. Thanks to Kevin
Tran for the screenshot.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/admin/permissions.adoc b/docs/admin/permissions.adoc
index 0b116ba..054c8cc 100644
--- a/docs/admin/permissions.adoc
+++ b/docs/admin/permissions.adoc
@@ -30,6 +30,9 @@ access level in staff client interfaces.
. To assign a working location open the newly created staff account using *F1*
(retrieve patron) or *F4* (patron search).
. Select _Other -> User Permission Editor_
++
+image::media/permissions_1.png[Click User Permission Editor in the Patron's Other menu]
++
. Place a check in the box next to the desired working location, then scroll to
the bottom of the display and click _Save_.
+
@@ -40,7 +43,7 @@ Staff Account Permissions
^^^^^^^^^^^^^^^^^^^^^^^^^
To view a detailed list of permissions for a particular Evergreen account go to
-_Admin (-) -> User permission editor_ in the staff client.
+_Administration -> User Permission Editor_ in the staff client.
Granting Additional Permissions
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -51,7 +54,7 @@ permission to process offline transactions, a function which otherwise requires
an _LSA_ login.
. Log in as a Local System Administrator.
-. Select _Admin (-) -> User Permission Editor_ and enter the staff account
+. Select _Administration -> User Permission Editor_ and enter the staff account
barcode when prompted
+
OR
diff --git a/docs/media/permissions_1.png b/docs/media/permissions_1.png
new file mode 100644
index 0000000..b0c4e45
Binary files /dev/null and b/docs/media/permissions_1.png differ
commit 741f27d6cbf86038b8786c996d4fe5ca512e4151
Author: Kevin Tran <kdt8 at students.calvin.edu>
Date: Thu Mar 15 10:48:09 2018 -0400
Docs: Update MARC_RAD_MVF_CRA.adoc for web client
- Updated instructions for web client
- Narrower screenshot (with arrow) for Coded Value Map section
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/admin/MARC_RAD_MVF_CRA.adoc b/docs/admin/MARC_RAD_MVF_CRA.adoc
index 67811fc..6cd6ba5 100644
--- a/docs/admin/MARC_RAD_MVF_CRA.adoc
+++ b/docs/admin/MARC_RAD_MVF_CRA.adoc
@@ -19,8 +19,8 @@ image::media/radmvcolumn_1.jpg[]
To edit an existing record attribute definition and set the *Multi-valued?* field to *True*:
-. Click *Admin* on the menu bar
-. Hover over *Server Administration* and click *MARC Record Attributes*
+. Click *Administration* on the menu bar
+. Click *Server Administration*, then click *MARC Record Attributes*
. Double-click on the row of the record attribute definition that needs to be edited
. Select the *Multi-valued?* checkbox
. Click *Save*
@@ -45,8 +45,8 @@ Within the Coded Value Maps screen, there is a column named *Composite Definitio
To edit an existing record attribute definition and set the *Composite attribute?* field to True:
-. Click *Admin* on the menu bar
-. Hover over *Server Administration* and click *MARC Record Attributes*
+. Click *Admininstration* on the menu bar
+. Click *Server Administration*, then click *MARC Record Attributes*
. Double-click on the row of the record attribute definition that needs to be edited
. Select the *Composite attribute?* checkbox
. Click *Save*
diff --git a/docs/media/cvmpage_4.jpg b/docs/media/cvmpage_4.jpg
index a100d0e..b5a4ff0 100644
Binary files a/docs/media/cvmpage_4.jpg and b/docs/media/cvmpage_4.jpg differ
commit fda829e13e8ad939a02491db1b584aeec9bd1278
Author: Remington Steed <rjs7 at calvin.edu>
Date: Wed Mar 21 16:20:50 2018 -0400
Docs: New screenshot for "MARC Import Remove Fields"
- New screenshot for "MARC Import Remove Fields", which still showed
small amount of XUL client. Thanks to Kevin Tran for the screenshot.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/admin/MARC_Import_Remove_Fields.adoc b/docs/admin/MARC_Import_Remove_Fields.adoc
index 9fe8d6a..1e47b66 100644
--- a/docs/admin/MARC_Import_Remove_Fields.adoc
+++ b/docs/admin/MARC_Import_Remove_Fields.adoc
@@ -26,7 +26,7 @@ To create a MARC Import Remove Fields profile, go to *Administration -> Server A
. Click *Return to Groups* to go back to the list of Remove Field profiles.
-image::media/marc_import_remove_fields3.jpg[MARC Remove Fields Profile]
+image::media/marc_import_remove_fields3.png[MARC Remove Fields Profile]
Import Options
diff --git a/docs/media/marc_import_remove_fields3.png b/docs/media/marc_import_remove_fields3.png
new file mode 100644
index 0000000..841868d
Binary files /dev/null and b/docs/media/marc_import_remove_fields3.png differ
commit d4e86f4486b12a7a8a6de8b00ab09d72d8e5cb51
Author: Remington Steed <rjs7 at calvin.edu>
Date: Thu Mar 29 08:51:28 2018 -0400
Docs: Update "Selection Lists" and "Invoices" for web client
- Update references to Acq Admin menu
- Make menu name formatting more consistent (should be bold or
italics)
- Remove outdated reference to old Evergreen version under "Activate
Purchase Order with Zero Copies"
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/acquisitions/invoices.adoc b/docs/acquisitions/invoices.adoc
index 442bd73..1c0fe9b 100644
--- a/docs/acquisitions/invoices.adoc
+++ b/docs/acquisitions/invoices.adoc
@@ -24,15 +24,15 @@ Creating a blanket invoice
You can create a blanket invoice for purchases that are not attached to a purchase order.
-. Click Acquisitions -> Create invoice.
+. Click _Acquisitions_ -> _Create invoice_.
. Enter the invoice information in the top half of the screen.
. To add charges for materials not attached to a purchase order, click _Add
Charge..._ This functionality may also be used to add shipping, tax, and other fees.
. Select a charge type from the drop-down menu.
+
[NOTE]
-New charge types can be added via _Admin_ -> _Server Administration_ ->
-_Acquisitions_ -> _Invoice Item Type_.
+New charge types can be added via _Administration_ -> _Acquisitions
+Administration_ -> _Invoice Item Types_.
+
. Select a fund from the drop-down menu.
. Enter a _Title/Description_ of the resource.
@@ -74,8 +74,8 @@ as taxes, across funds, if multiple funds have been used to pay the invoice.
+
[NOTE]
Prorating will only be applied to charge types that have the _Prorate?_ flag set
-to true. This setting can be adjusted via _Admin_ -> _Server Administration_
--> _Acquisitions_ -> _Invoice Item Type_.
+to true. This setting can be adjusted via _Administration_ ->
+_Acquisitions Administration_ -> _Invoice Item Types_.
+
- Click _Close_. Choose this option when you have completed the invoice. This
@@ -203,8 +203,8 @@ as taxes, across funds, if multiple funds have been used to pay the invoice.
+
[NOTE]
Prorating will only be applied to charge types that have the Prorate? flag set
-to true. This setting can be adjusted via _Admin_ -> _Server Administration_
--> _Acquisitions_ -> Invoice Item Type.
+to true. This setting can be adjusted via _Administration_ ->
+_Acquisitions Administration_ -> _Invoice Item Types_.
+
- Click _Close_. Choose this option when you have completed the invoice. This
diff --git a/docs/acquisitions/selection_lists_po.adoc b/docs/acquisitions/selection_lists_po.adoc
index b1e5fb0..5fd17ea 100644
--- a/docs/acquisitions/selection_lists_po.adoc
+++ b/docs/acquisitions/selection_lists_po.adoc
@@ -4,7 +4,9 @@ Selection Lists and Purchase Orders
Selection Lists
~~~~~~~~~~~~~~~
-Selection lists allow you to create, manage, and save lists of items that you may want to purchase. To view your selection list, click Acquisitions -> My Selection Lists. Use the general search to view selection lists created by other users.
+Selection lists allow you to create, manage, and save lists of items
+that you may want to purchase. To view your selection list, click
+*Acquisitions* -> *My Selection Lists*. Use the general search to view selection lists created by other users.
Create a selection list
^^^^^^^^^^^^^^^^^^^^^^^
@@ -13,7 +15,7 @@ Selection lists can be created in four areas within the module. Selection lists
Selection lists can also be created through the My Selection Lists interface:
-. Click Acquisitions -> My Selection Lists.
+. Click *Acquisitions* -> *My Selection Lists*.
. Click the New Selection List drop down arrow.
. Enter the name of the selection list in the box that appears.
. Click Create.
@@ -30,7 +32,7 @@ Clone selection lists
Cloning selection lists enables you to copy one selection list into a new selection list. You can maintain both copies of the list, or you can delete the previous list.
-. Click Acquisitions -> My Selection Lists.
+. Click *Acquisitions* -> *My Selection Lists*.
. Check the box adjacent to the list that you want to clone.
. Click Clone Selected.
. Enter a name into the box that appears, and click Clone.
@@ -43,7 +45,7 @@ Merge selection lists
You can merge two or more selection lists into one selection list.
-. Click Acquisitions -> My Selection Lists.
+. Click *Acquisitions* -> *My Selection Lists*.
. Check the boxes adjacent to the selection lists that you want to merge, and click Merge Selected.
. Choose the Lead Selection List from the drop down menu. This is the list to which the items on the other list(s) will be transferred.
. Click Merge.
@@ -56,7 +58,7 @@ Delete selection lists
You can delete selection lists that you do not want to save. You will not be able to retrieve these items through the General Search after you have deleted the list. You must delete all line items from a selection list before you can delete the list.
-. Click Acquisitions -> My Selection Lists.
+. Click *Acquisitions* -> *My Selection Lists*.
. Check the box adjacent to the selection list(s) that you want to delete.
. Click Delete Selected.
@@ -67,10 +69,10 @@ After an item has been added to a selection list or purchase order, you can mark
. If you want to mark part of a selection list ready for selector, then you can check the box(es) of the line item(s) that you wish to mark ready for selector. If you want to mark the entire list ready for selector, then skip to step 2.
-. Click Actions -> Mark Ready for Selector.
+. Click *Actions* -> *Mark Ready for Selector*.
. A pop up box will appear. Choose to mark the selected line items or all line items.
. Click Go.
-. The screen will refresh. The marked line item(s) will be highlighted pink, and the status changes to selector~ready.
+. The screen will refresh. The marked line item(s) will be highlighted pink, and the status changes to selector-ready.
image::media/acq_selection_mark_ready.png[mark ready]
@@ -80,7 +82,7 @@ Convert selection list to purchase order
Use the Actions menu to convert a selection list to a purchase order.
-. From a selection list, click Actions ~> Create Purchase Order.
+. From a selection list, click *Actions* -> *Create Purchase Order*.
. A pop up box will appear.
. Select the ordering agency from the drop down menu.
. Enter the provider.
@@ -150,22 +152,20 @@ After you click *Activate Order*, you will be presented with the record import i
Activate Purchase Order with Zero Copies
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-In previous versions, by default, a purchase order could be activated with or
-without copies attached to line items.
-
-In versions 2.3 and above, by default, a purchase order cannot be activated if a line item
-on the purchase order has zero copies. A new feature enables you to activate a
-purchase order that lacks copies.
-
-To activate a purchase order with line items that have zero copies, check the
-box *Allow activation with zero-copy lineitems*.
+By default, a purchase order cannot be activated if a line item on the
+purchase order has zero copies. To activate a purchase order with line
+items that have zero copies, check the box *Allow activation with
+zero-copy lineitems*.
image::media/Zero_Copies1.jpg[Zero_Copies1]
Enhancements to Canceled and Delayed Items
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Cancel/Delay reasons have been modified so that you can easily differentiate between canceled and delayed items. Each label now begins with *Canceled* or *Delayed*. To view the list, click *Administration* -> *Server Administration* -> *Acquisitions* -> *Cancel Reasons*.
+Cancel/Delay reasons have been modified so that you can easily
+differentiate between canceled and delayed items. Each label now begins
+with *Canceled* or *Delayed*. To view the list, click *Administration*
+-> *Acquisitions Administration* -> *Cancel Reasons*.
The cancel/delay reason label is displayed as the line item status in the list of line items or as the copy status in the list of copies.
@@ -189,12 +189,12 @@ image::media/2_10_Lineitem_Paid.png[Paid Lineitem]
Brief Records
~~~~~~~~~~~~~
-Brief records are short bibliographic records with minimal information that are often used as placeholder records until items are received. Brief records can be added to selection lists or purchase orders and can be imported into the catalog. You can add brief records to new or existing selection lists. You can add brief records to new, pending or on~order purchase orders.
+Brief records are short bibliographic records with minimal information that are often used as placeholder records until items are received. Brief records can be added to selection lists or purchase orders and can be imported into the catalog. You can add brief records to new or existing selection lists. You can add brief records to new, pending or on-order purchase orders.
Add brief records to a selection list
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-. Click Acquisitions -> New Brief Record. You can also add brief records to an existing selection list by clicking the Actions menu on the selection list and choosing Add Brief Record.
+. Click *Acquisitions* -> *New Brief Record*. You can also add brief records to an existing selection list by clicking the Actions menu on the selection list and choosing Add Brief Record.
. Choose a selection list from the drop down menu, or enter the name of a new selection list.
. Enter bibliographic information in the desired fields.
. Click Save Record.
@@ -218,7 +218,7 @@ MARC Federated Search
The MARC Federated Search enables you to import bibliographic records into a selection list or purchase order from a Z39.50 source.
-. Click Acquisitions -> MARC Federated Search.
+. Click *Acquisitions* -> *MARC Federated Search*.
. Check the boxes of Z39.50 services that you want to search. Your local Evergreen Catalog is checked by default. Click Submit.
+
image::media/acq_marc_search.png[search form]
@@ -226,7 +226,11 @@ image::media/acq_marc_search.png[search form]
. A list of results will appear. Click the "Copies" link to add copy information to the line item. See the <<_line_items,section on Line Items>> for more information.
. Click the Notes link to add notes or line item alerts to the line item. See the <<_line_items,section on Line Items>> for more information.
. Enter a price in the "Estimated Price" field.
-. You can save the line item(s) to a selection list by checking the box on the line item and clicking Actions -> Save Items to Selection List. You can also create a purchase order from the line item(s) by checking the box on the line item and clicking Actions ~> Create Purchase Order.
+. You can save the line item(s) to a selection list by checking the box
+on the line item and clicking *Actions* -> *Save Items to Selection
+List*. You can also create a purchase order from the line item(s) by
+checking the box on the line item and clicking Actions -> Create
+Purchase Order.
image::media/acq_marc_search-2.png[line item]
commit a3ec12d3d11c762445436a28614cb191c5943775
Author: Remington Steed <rjs7 at calvin.edu>
Date: Wed Mar 28 15:53:18 2018 -0400
Docs: Update "Hold-driven recalls" for web client
- Update reference to "Admin" menu
- Remove old note about when feature was added to Evergreen
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/admin/hold_driven_recalls.adoc b/docs/admin/hold_driven_recalls.adoc
index 1894e25..05c60f8 100644
--- a/docs/admin/hold_driven_recalls.adoc
+++ b/docs/admin/hold_driven_recalls.adoc
@@ -4,8 +4,6 @@ Hold-driven recalls
indexterm:[hold-driven recalls]
indexterm:[circulation, recalls, hold-driven]
-_Added in Evergreen 2.1_
-
In academic libraries, it is common for groups like faculty and graduate
students to have extended loan periods (for example, 120 days), while
others have more common loan periods such as 3 weeks. In these environments,
@@ -49,5 +47,5 @@ current date is recalled.
Editing the item recall notification email template
---------------------------------------------------
The template for the item recall notification email is contained in the
-'Item Recall Email Notice' template, found under *Admin* -> *Local
+'Item Recall Email Notice' template, found under *Administration* -> *Local
Administration* -> *Notifications / Action Triggers*.
-----------------------------------------------------------------------
Summary of changes:
docs/acquisitions/invoices.adoc | 14 +++---
docs/acquisitions/selection_lists_po.adoc | 48 +++++++++++---------
.../vandelay_acquisitions_integration.adoc | 9 ++++
docs/admin/MARC_Import_Remove_Fields.adoc | 2 +-
docs/admin/MARC_RAD_MVF_CRA.adoc | 8 ++--
docs/admin/hold_driven_recalls.adoc | 4 +-
docs/admin/permissions.adoc | 7 ++-
docs/media/acq_upload_library_settings.png | Bin 0 -> 51325 bytes
docs/media/cvmpage_4.jpg | Bin 47153 -> 15576 bytes
docs/media/load_marc_order_records.png | Bin 0 -> 23740 bytes
docs/media/marc_import_remove_fields3.png | Bin 0 -> 17925 bytes
docs/media/permissions_1.png | Bin 0 -> 20664 bytes
12 files changed, 53 insertions(+), 39 deletions(-)
create mode 100644 docs/media/acq_upload_library_settings.png
create mode 100644 docs/media/load_marc_order_records.png
create mode 100644 docs/media/marc_import_remove_fields3.png
create mode 100644 docs/media/permissions_1.png
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list