Merge branch 'permissions' into 'master'

[kohadocs.git] / source / administration.rst

diff --git a/source/administration.rst b/source/administration.rst
index 5acbb7e..9473fa3 100644 (file)
--- a/source/administration.rst
+++ b/source/administration.rst
@@ -1,9 +1,11 @@
 .. include:: images.rst
 
+.. _administration-label:
+
 Administration
 ==============
 
-.. _administration-label:
+.. _basic-parameters-label:
 
 Basic parameters
 -----------------------------------
@@ -130,6 +132,8 @@ link to edit/alter details associated with the library in question.
 
     You will be unable to edit the 'Library code'
 
+.. _library-groups-label:
+
 Library groups
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -280,7 +284,7 @@ top of the Item types page.
           points (ex. $5.00 should be entered as 5 or 5.00)
 
 -  You can add a default replacement cost for this type of item. If left 
-   blank, the replacement price of the item itelf will be cherged to the 
+   blank, the replacement price of the item itself will be charged to the 
    user when the item is lost.
 
     -  **Important**
@@ -403,6 +407,19 @@ use, for instance 'Lost'.
 
    -  Collection codes (appears when cataloging and working with items)
 
+- CONTROL\_NUM\_SEQUENCE
+
+   - Used to generate control numbers in the advanced cataloguing editor.
+     Enter a string ending with a number as the authorized value and use
+     the description to describe the type of number. For example: 'sprLib0001'
+     'Springfield library'. In the advanced editor this will activate a
+     new widget that will allow you to choose the type of number and
+     generate the next number in the sequence.
+
+-  COUNTRY
+
+   -  Used in UNIMARC 102 $a
+
 -  DAMAGED
 
    -  Descriptions for items marked as damaged (appears when cataloging
@@ -413,6 +430,11 @@ use, for instance 'Lost'.
    -  Departments are required by and will be used in the `Course
       Reserves <#coursereserves>`__ module
 
+-  ETAT
+
+   -  Used in French UNIMARC installations in field 995 $o to identify item status.
+      Similar to NOT_LOAN
+
 -  HINGS\_AS
 
    -  General holdings: acquisition status designator :: This data
@@ -453,6 +475,10 @@ use, for instance 'Lost'.
      This is helpful when a patron chooses the Search category of NEW, they could
      get Koha to search multiple Item types with a single search.
 
+-  LANG
+
+   -  ISO 639-2 standard language codes
+
 -  LOC
 
    Shelving location (usually appears when adding or editing an item). LOC maps to 
@@ -516,6 +542,19 @@ use, for instance 'Lost'.
 
    -  Reasons why an order might have been cancelled
 
+-  PAYMENT\_TYPE
+
+   -  Populates a dropdown list of custom payment types when paying fines
+
+-  qualif
+
+   -  Function codes (author, editor, collaborator, etc.) used in UNIMARC 7XX $4
+      (French)
+      
+-  RELTERMS
+
+   -  French terms of relations
+
 -  REPORT\_GROUP
 
    -  A way to sort and filter your reports, the default values in this
@@ -562,6 +601,10 @@ use, for instance 'Lost'.
 
    -  A list of additional custom status values for suggestions that can 
       be used in addition to the default values.
+      
+-  STACK
+
+   -  Shelving control number
 
 -  TERM
 
@@ -862,6 +905,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
 
@@ -1397,7 +1445,7 @@ type' button at the top of the page
       appear in this menu
 
       -  *Get there:*\ More > Administration > Basic parameters >
-         :ref:`Authorized values <authorized_values-label>`
+         :ref:`Authorized values <authorized-values-label>`
 
    -  **Important**
 
@@ -3186,6 +3234,11 @@ top right of the page
 
 |image244|
 
+       **Note**
+      
+       Any tables with columns listed here have the option to export to Excel, export to CSV,
+       copy, or print within the table header
+
 .. _audio-alerts-label:
 
 Audio alerts