Merge branch 'BZ20643' into 'master'

Bug 20643: More info about CheckPrevCheckout

See merge request koha-community/koha-manual!186

diff --git a/source/administration.rst b/source/administration.rst
index 05a603f..fb204c7 100644 (file)
--- a/source/administration.rst
+++ b/source/administration.rst
@@ -894,6 +894,11 @@ To add a new patron category click 'New category' at the top of the page
 
     |image1204|
 
+-  You can set the preference for checking the patron's circulation history 
+   when checking out an item. The default value for this is set in the 
+   :ref:`CheckPrevCheckout` system preference. This setting can be 
+   overridden on a per-patron basis in their :ref:`individual file <add-a-new-patron>`.
+
 -  Finally you can assign advanced messaging preferences by default to a
    patron category
 

diff --git a/source/images.rst b/source/images.rst
index f701ee1..9a28c04 100644 (file)
--- a/source/images.rst
+++ b/source/images.rst
@@ -1376,3 +1376,4 @@
 .. |image1387| image:: images/ILLrequests/CreateILLstaff1.png
 .. |image1388| image:: images/ILLrequests/CreateILLstaff2.png
 .. |image1389| image:: images/ILLrequests/Confirmrequeststaff.png
+.. |image1390| image:: images/circ/prevcheckout.png
\ No newline at end of file

diff --git a/source/images/admin/patroncirc/newpatroncat.png b/source/images/admin/patroncirc/newpatroncat.png
index 7adbf46..cce201d 100644 (file)
Binary files a/source/images/admin/patroncirc/newpatroncat.png and b/source/images/admin/patroncirc/newpatroncat.png differ

diff --git a/source/images/circ/warnings/prevcheckout.png b/source/images/circ/warnings/prevcheckout.png
new file mode 100644 (file)
index 0000000..5e9e02f
Binary files /dev/null and b/source/images/circ/warnings/prevcheckout.png differ

diff --git a/source/images/patrons/addlibmanagement.png b/source/images/patrons/addlibmanagement.png
index 55a6035..61342bb 100644 (file)
Binary files a/source/images/patrons/addlibmanagement.png and b/source/images/patrons/addlibmanagement.png differ

diff --git a/source/patrons.rst b/source/patrons.rst
index f88234a..5040a6b 100644 (file)
--- a/source/patrons.rst
+++ b/source/patrons.rst
@@ -123,6 +123,11 @@ Once there you can add a new patron.
       beginning you can fix that here
 
    -  Sort 1 and 2 are used for statistical purposes within your library
+      
+   -  'Check for previous checkouts' is used to set the patron's personal preference 
+      regarding checking their circulation history to see if they have borrowed this 
+      item in the past. This overrides the setting of the :ref:`patron category 
+      <adding-a-patron-category>` and of the :ref:`CheckPrevCheckout` system preference.
 
 -  Next, the library set-up section includes additional library settings
 

diff --git a/source/systempreferences.rst b/source/systempreferences.rst
index 074e5f8..be56b55 100644 (file)
--- a/source/systempreferences.rst
+++ b/source/systempreferences.rst
@@ -11616,15 +11616,25 @@ Values:
 
 Description:
 
-When the value of this system preference is set to 'do', Koha will look at the
-patron's circulation history to see if they have checked this item out before.
-An alert will show up on the screen indicating that patron has indeed checked
-this item out.  Staff will be prompted to allow the checkout to occur.
-If the vaulue is set to 'don't', Koha will not check the patron's circulation
-history. When the value is set to 'Unless overridden, do', this will check the
-patron's circulation history even if there are fines, fees, and/or holds on the
-patron's account.  Lastly, if the value is set to 'Unless overridden, don't',
-Koha will not check circulation history regardless of fines, fees, and/or holds.
+-  When the value of this system preference is set to 'do', Koha will look at the
+   patron's circulation history to see if they have checked this item out before.
+   An alert will show up on the screen indicating that patron has indeed checked
+   this item out. Staff will be prompted to allow the checkout to occur.
+
+   |image1390|
+
+-  If the value is set to 'do not', Koha will not check the patron's circulation
+   history.
+
+-  When the value is set to 'Unless overridden, do', this will check the
+   patron's circulation history unless the patron's :ref:`personal setting 
+   <add-a-new-patron>` or the :ref:`patron category setting <adding-a-patron-category>` 
+   specifically say not to.
+   
+-  Lastly, if the value is set to 'Unless overridden, do not',
+   Koha will not check circulation history unless the patron's :ref:`personal 
+   setting <add-a-new-patron>` or the :ref:`patron category setting <adding-a-
+   patron-category>` specifically say to check.
 
      **Note**