Bug 22381: Change wording on Calendar-related system
TEST PLAN:
1. Apply Patch
2. Look at the 5 sysprefs (useDaysMode, OverdueNoticeCalendar, finesCalendar, ExcludeHolidaysFromMaxPickUpDelay, SuspensionsCalendar)
3. Make sure the wording and options all make sense
4. Make sure the options are properly ignoring or using the calendar.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Fixed double 'when' on line 740
No errors
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit 30843da503)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
parent
51687066a5
commit
05bf4e974d
|
|
@ -282,12 +282,13 @@ Circulation:
|
|||
homebranch: the library the item is from.
|
||||
holdingbranch: the library the item is held by.
|
||||
-
|
||||
- Calculate the due date using
|
||||
- pref: useDaysMode
|
||||
choices:
|
||||
Days: circulation rules only.
|
||||
Calendar: the calendar to skip all days the library is closed.
|
||||
Datedue: the calendar to push the due date to the next open day
|
||||
Days: Ignore the calendar
|
||||
Calendar: Use the calendar to skip days the library is closed
|
||||
Datedue: Use the calendar to push the due date to the next open day
|
||||
Dayweek: Use the calendar to push the due date to the next open matching weekday for weekly loan periods, or the next open day otherwise
|
||||
- when calculating the date due.
|
||||
-
|
||||
- Calculate "No renewal before" based on
|
||||
- pref: NoRenewalBeforePrecision
|
||||
|
|
@ -730,9 +731,9 @@ Circulation:
|
|||
-
|
||||
- pref: ExcludeHolidaysFromMaxPickUpDelay
|
||||
choices:
|
||||
yes: Allow
|
||||
no: "Don't allow"
|
||||
- Closed days to be taken into account in reserves max pickup delay.
|
||||
yes: Ignore the calendar
|
||||
no: Use the calendar
|
||||
- when calculating the period for reserves max pickup delay.
|
||||
-
|
||||
- pref: decreaseLoanHighHolds
|
||||
choices:
|
||||
|
|
@ -829,19 +830,19 @@ Circulation:
|
|||
- unmediated Interlibrary loan requests. If enabled and the ILL backend supports it, the newly created requests are immediately requested by backend.
|
||||
Fines Policy:
|
||||
-
|
||||
- Calculate fines based on days overdue
|
||||
- pref: finesCalendar
|
||||
type: choice
|
||||
choices:
|
||||
ignoreCalendar: directly.
|
||||
noFinesWhenClosed: not including days the library is closed.
|
||||
ignoreCalendar: Ignore the calendar
|
||||
noFinesWhenClosed: Use the calendar
|
||||
- when calculating the period for fines.
|
||||
-
|
||||
- Calculate suspension expiration based on days overdue
|
||||
- pref: SuspensionsCalendar
|
||||
type: choice
|
||||
choices:
|
||||
ignoreCalendar: directly.
|
||||
noSuspensionsWhenClosed: not including days the library is closed.
|
||||
ignoreCalendar: Ignore the calendar
|
||||
noSuspensionsWhenClosed: Use the calendar
|
||||
- when calculating the period for suspension expiration.
|
||||
-
|
||||
- pref: finesMode
|
||||
type: choice
|
||||
|
|
|
|||
Loading…
Reference in New Issue