Bug 14576: (follow-up) fix some typos and style

Signed-off-by: Liz Rea <wizzyrea@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/installer/data/mysql/atomicupdate/bug_14576_add_UpdateItemLocationOnCheckin.perl b/installer/data/mysql/atomicupdate/bug_14576_add_UpdateItemLocationOnCheckin.perl
index bb16511..06f6057 100644 (file)
--- a/installer/data/mysql/atomicupdate/bug_14576_add_UpdateItemLocationOnCheckin.perl
+++ b/installer/data/mysql/atomicupdate/bug_14576_add_UpdateItemLocationOnCheckin.perl
@@ -1,7 +1,7 @@
 $DBversion = 'XXX';  # will be replaced by the RM
 if( CheckVersion( $DBversion ) ) {
     $dbh->do(q{
-        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('UpdateItemLocationOnCheckin', 'PROC: _PERM_\n', 'NULL', 'This a list of value pairs. When an item is checked in, if the location value on the left matches the items location value t will be updated to the right-hand value. E.g. ''PROC: FIC'' will cause an item that was set to ''Book Cart'' to now be in the ''Fiction'' shelving location. Note that PROC and CART are special values, for these locations only can location and permanent_location differ.  In all other cases an update will affect both.  Items in the CART location will be returned to their permanent location on checkout.  You can also use the special term _BLANK_ on either side of a pair to update/remove items with no locaiton assigned.  You can use the special term _ALL_ on the left side to affect all items and the special term _PERM_ on the right side to return items to their permanent location', 'Free');
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('UpdateItemLocationOnCheckin', 'PROC: _PERM_\n', 'NULL', 'This a list of value pairs. When an item is checked in, if the location value on the left matches the items location value t will be updated to the right-hand value. E.g. ''PROC: FIC'' will cause an item that was set to ''Processing Center'' to now be in the ''Fiction'' shelving location. Note that PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both.  Items in the CART location will be returned to their permanent location on checkout.  You can also use the special term _BLANK_ on either side of a pair to update/remove items with no locaiton assigned.  You can use the special term _ALL_ on the left side to affect all items and the special term _PERM_ on the right side to return items to their permanent location', 'Free');
     });
     $dbh->do(q{
         UPDATE systempreferences s1, (SELECT IF(value,'PROC: CART\n','') AS p2c FROM systempreferences WHERE variable='InProcessingToShelvingCart') s2 SET s1.value= CONCAT(s2.p2c, REPLACE(s1.value,'PROC: _PERM_\n','') ) WHERE s1.variable='UpdateItemLocationOnCheckin' AND s1.value NOT LIKE '%PROC: CART%';

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index a187e22..db662ca 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -530,13 +530,13 @@ Circulation:
             - This is is a list of value pairs, the first value is followed immediately by colon space then the second value i.e.:<br/>
             - "PROC: FIC"
             - <br/> When an item is checked in, if the location value on the left matches the items location value
-            - "it will be updated to the right-hand value.<br/> E.g. ''PROC: FIC'' will cause an item that was set to ''Book Cart'' to now be in the ''Fiction'' shelving location."
-            - <br/>Note that PROC and CART are special values, for these locations only can location and permanent_location differ.  In all other cases an update will affect both.
-            - <br/>Items in the CART location will be returned to their permanent location on checkout
-            - <br/>You can use the special term _BLANK_ on either side of a pair to update/remove items with no location assigned
-            - <br>You can use the special term _ALL_ on the left side to affect all items
-            - and the special term _PERM_ on the right side to return items to their permanent location
-            - <br>**Use of an _ALL_ rule will override/ignore any other values**
+            - "it will be updated to the right-hand value.<br/> E.g. ''PROC: FIC'' will cause an item that was set to ''Processing Center'' to now be in the ''Fiction'' shelving location."
+            - <br/>Note that PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both.
+            - <br/>Items in the CART location will be returned to their permanent location on checkout.
+            - <br/>You can use the special term _BLANK_ on either side of a pair to update/remove items with no location assigned.
+            - <br>You can use the special term _ALL_ on the left side to affect all items.
+            - and the special term _PERM_ on the right side to return items to their permanent location.
+            - <br><b>Use of an _ALL_ rule will override/ignore any other values.</b>
             - <br>Each pair of values should be on a separate line.
         -
             - pref: UpdateNotForLoanStatusOnCheckin