[open-ils-commits] [GIT] Evergreen ILS branch master updated. f83265af1b2f5f5856a57500b791aae036021aff
Evergreen Git
git at git.evergreen-ils.org
Sun Sep 17 13:24:31 EDT 2017
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, master has been updated
via f83265af1b2f5f5856a57500b791aae036021aff (commit)
via 7a2990d52d1a6063ad6fea1ae48975e114770890 (commit)
from 5f8cdadd7c8eee777bc29f342ef822a5aad69b0f (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 f83265af1b2f5f5856a57500b791aae036021aff
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Sun Sep 17 10:24:23 2017 -0700
Docs: cleaning up headings, other small fixes
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
diff --git a/docs/admin/floating_groups.adoc b/docs/admin/floating_groups.adoc
index d4b6ef2..12660e9 100644
--- a/docs/admin/floating_groups.adoc
+++ b/docs/admin/floating_groups.adoc
@@ -5,35 +5,42 @@ Before floating groups copies could float or not. If they floated then they floa
After floating groups where a copy will float is defined by what group it has been assigned to.
-== Floating Groups
+Floating Groups
+---------------
Each floating group comes with a name and a manual flag, plus zero or more group members. The name is used solely for selection and display purposes.
The manual flag dictates whether or not the "Manual Floating Active" checkin modifier needs to be active for a copy to float. This allows for greater control over when items float. It also prevents automated checkins via SIP2 from triggering floats.
-== Floating Group Members
+Floating Group Members
+~~~~~~~~~~~~~~~~~~~~~~
Each member of a floating group references an org unit and has a stop depth, an optional max depth, and an exclude flag.
-=== Org Unit
+Org Unit
+~~~~~~~~
The org unit and all descendants are included, unless max depth is set, in which case the tree is cut off at the max depth.
-=== Stop Depth
+Stop Depth
+~~~~~~~~~~
The stop depth is the highest point from the current copy circ library to the checkin library for the item that will be traversed. If the item has to go higher than the stop depth on the tree the member rule in question is ignored.
-=== Max Depth
+Max Depth
+~~~~~~~~~
As mentioned with the org unit, the max depth is the furthest down on the tree from the org unit that gets included. This is based on the entire tree, not just off of the org unit. So in the default tree a max depth of 1 will stop at the system level no matter if org unit is set to CONS or SYS1.
-=== Exclude
+Exclude
Exclude, if set, causes floating to not happen for the member. Excludes always take priority, so you can remove an org unit from floating without having to worry about other rules overriding it.
-== Examples
+Examples
+--------
-=== Float Everywhere
+Float Everywhere
+~~~~~~~~~~~~~~~~
This is a default floating rule to emulate the previous floating behavior for new installs and upgrades.
@@ -44,7 +51,8 @@ One member:
* Max Depth: Unset
* Exclude: Off
-=== Float Within System
+Float Within System
+~~~~~~~~~~~~~~~~~~~
This would permit a copy to float anywhere within a system, but would return to the system if it was returned elsewhere.
@@ -55,7 +63,8 @@ One member:
* Max Depth: Unset
* Exclude: Off
-=== Float To All Branches
+Float To All Branches
+~~~~~~~~~~~~~~~~~~~~~
This would permit a copy to float to any branch, but not to sublibraries or bookmobiles.
@@ -66,7 +75,8 @@ One member:
* Max Depth: 2
* Exclude: Off
-=== Float To All Branches Within System
+Float To All Branches Within System
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This would permit a copy to float to any branch in a system, but not to sublibraries or bookmobiles, and returning to the system if returned elsewhere.
@@ -77,7 +87,8 @@ One member:
* Max Depth: 2
* Exclude: Off
-=== Float Between BR1 and BR3
+Float Between BR1 and BR3
+~~~~~~~~~~~~~~~~~~~~~~~~~
This would permit a copy to float between BR1 and BR3 specifically, excluding sublibraries and bookmobiles.
@@ -88,7 +99,8 @@ It would consist of two members, identical other than the org unit:
* Max Depth: 2
* Exclude: Off
-=== Float Everywhere Except BM1
+Float Everywhere Except BM1
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
This would allow an item to float anywhere except for BM1. It accomplishes this with two members.
@@ -108,7 +120,8 @@ The second excludes BM1:
That works because excludes are applied first.
-=== Float into, but not out of, BR2
+Float into, but not out of, BR2
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This would allow an item to float into BR2, but once there it would never leave. Why you would want to allow items to float to but not from a single library I dunno, but here it is. This takes advantage of the fact that the rules say where we can float *to*, but outside of stop depth don't care where we are floating *from*.
diff --git a/docs/root_staff_client_admin.adoc b/docs/root_staff_client_admin.adoc
index 7e3e85c..f7b7f04 100644
--- a/docs/root_staff_client_admin.adoc
+++ b/docs/root_staff_client_admin.adoc
@@ -102,17 +102,10 @@ include::admin/copy_statuses.adoc[]
include::admin/circing_uncataloged_materials.adoc[]
-Hold policies
--------------
+Holds, transits, and resource sharing
+-------------------------------------
-This section discusses hold policies.
-
-Transits and resource sharing
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This section offers specific information and guidance about holds that involve multiple libraries.
-
-:leveloffset: 2
+:leveloffset: 1
include::admin/age_hold_protection.adoc[]
@@ -120,7 +113,7 @@ include::admin/Best_Hold_Selection_Sort_Order.adoc[]
include::admin/Org_Unit_Proximity_Adjustments.adoc[]
-:leveloffset: 3
+:leveloffset: 2
include::admin/floating_groups.adoc[]
@@ -146,10 +139,11 @@ Paypal, Authorize.net, etc.
This section needs to be written
-Cash reports
-~~~~~~~~~~~~
+:leveloffset: 1
-This section needs to be written
+include::admin/desk_payments.adoc[]
+
+:leveloffset: 0
Negative balances
~~~~~~~~~~~~~~~~~
commit 7a2990d52d1a6063ad6fea1ae48975e114770890
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Sun Sep 17 10:23:27 2017 -0700
Docs: adding screenshot of uncataloged types editor
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
diff --git a/docs/media/noncataloged_type_add.png b/docs/media/noncataloged_type_add.png
new file mode 100644
index 0000000..9696573
Binary files /dev/null and b/docs/media/noncataloged_type_add.png differ
-----------------------------------------------------------------------
Summary of changes:
docs/admin/floating_groups.adoc | 41 ++++++++++++++++++++++-----------
docs/media/noncataloged_type_add.png | Bin 0 -> 15898 bytes
docs/root_staff_client_admin.adoc | 22 ++++++-----------
3 files changed, 35 insertions(+), 28 deletions(-)
create mode 100644 docs/media/noncataloged_type_add.png
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list