Attachment #138045 for bug #31157

View | Details | Raw Unified | Return to bug 31157
Collapse All | Expand All

Lines 9-15 return { Link Here

(-)a/installer/data/mysql/atomicupdate/bug_31157.pl (-1 / +1 lines)
9		9
10	$dbh->do(q{	10	$dbh->do(q{
11	INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES	11	INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
12	('OverdueNoticeFrom', 'cron', 'cron\|item-issuebranch\|item-homebranch', 'Use the choice as the from address when generating overdue notices', 'Choice')	12	('OverdueNoticeFrom', 'cron', 'cron\|item-issuebranch\|item-homebranch', 'Organize and send overdue notices by item home library or checkout library', 'Choice')
13	});	13	});
14	},	14	},
15	};	15	};

Lines 521-527 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +1 lines)
521	('OverDrivePasswordRequired','0',NULL,'Does the library require passwords for OverDrive SIP authentication','YesNo'),	521	('OverDrivePasswordRequired','0',NULL,'Does the library require passwords for OverDrive SIP authentication','YesNo'),
522	('OverDriveUsername','cardnumber','cardnumber\|userid','Which patron information should be passed as OverDrive username','Choice'),	522	('OverDriveUsername','cardnumber','cardnumber\|userid','Which patron information should be passed as OverDrive username','Choice'),
523	('OverdueNoticeCalendar',0,NULL,'Take the calendar into consideration when generating overdue notices','YesNo'),	523	('OverdueNoticeCalendar',0,NULL,'Take the calendar into consideration when generating overdue notices','YesNo'),
524	('OverdueNoticeFrom', 'cron', 'cron\|item-issuebranch\|item-homebranch', 'Use the choice as the from address when generating overdue notices', 'Choice'),	524	('OverdueNoticeFrom', 'cron', 'cron\|item-issuebranch\|item-homebranch', 'Organize and send overdue notices by item home library or checkout library', 'Choice'),
525	('OverduesBlockCirc','noblock','noblock\|confirmation\|block','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','Choice'),	525	('OverduesBlockCirc','noblock','noblock\|confirmation\|block','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','Choice'),
526	('OverduesBlockRenewing','allow','allow\|blockitem\|block','If any of patron checked out documents is late, should renewal be allowed, blocked only on overdue items or blocked on whatever checked out document','Choice'),	526	('OverduesBlockRenewing','allow','allow\|blockitem\|block','If any of patron checked out documents is late, should renewal be allowed, blocked only on overdue items or blocked on whatever checked out document','Choice'),
527	('PassItemMarcToXSLT','0',NULL,'If enabled, item fields in the MARC record will be made avaiable to XSLT sheets. Otherwise they will be removed.','YesNo'),	527	('PassItemMarcToXSLT','0',NULL,'If enabled, item fields in the MARC record will be made avaiable to XSLT sheets. Otherwise they will be removed.','YesNo'),




                  0: "Ignore calendar"
            - "when working out the period for overdue notices."
        -
            - "Organize and send overdue notices using the"
            - pref: OverdueNoticeFrom
              choices:
                  cron: "command-line option"
                  item-issuebranch: "checkout library"
                  item-homebranch: "item home library"
            - .
        -
            - Include up to
            - pref: PrintNoticesMaxLines

Lines 69-75 overdue_notices.pl Link Here

(-)a/misc/cronjobs/overdue_notices.pl (-5 / +6 lines)
69	--date <yyyy-mm-dd> Emulate overdues run for this date.	69	--date <yyyy-mm-dd> Emulate overdues run for this date.
70	--email <email_type> Type of email that will be used.	70	--email <email_type> Type of email that will be used.
71	Can be 'email', 'emailpro' or 'B_email'. Repeatable.	71	Can be 'email', 'emailpro' or 'B_email'. Repeatable.
72	--frombranch Set the from address for the notice to one of 'item-homebranch' or 'item-issuebranch'.	72	--frombranch Organize and send overdue notices by home library (item-homebranch) or checkout library (item-issuebranch).
		73	This option is only used, if the OverdueNoticeFrom system preference is set to 'command-line option'.
		74	Defaults to item-issuebranch.
73		75
74	=head1 OPTIONS	76	=head1 OPTIONS
75		77
Lines 180-188 Allows to specify which type of email will be used. Can be email, emailpro or B_ Link Here
180		182
181	=item B<--frombranch>	183	=item B<--frombranch>
182		184
183	Use the address information from the item homebranch library instead of the issuing library.	185	Organize overdue notices either by checkout library (item-issuebranch) or item home library (item-homebranch).
184		186	This option is only used, if the OverdueNoticeFrom system preference is set to use 'command-line option'.
185	Defaults to 'item-issuebranch'	187	Defaults to checkout library (item-issuebranch).
186		188
187	=back	189	=back
188		190
189	-

Return to bug 31157

Lines 408-420 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-3 / +3 lines)
408	0: "Ignore calendar"	408	0: "Ignore calendar"
409	- "when working out the period for overdue notices."	409	- "when working out the period for overdue notices."
410	-	410	-
411	- "Use the"	411	- "Organize and send overdue notices using the"
412	- pref: OverdueNoticeFrom	412	- pref: OverdueNoticeFrom
413	choices:	413	choices:
414	cron: "system default"	414	cron: "command-line option"
415	item-issuebranch: "checkout library"	415	item-issuebranch: "checkout library"
416	item-homebranch: "item home library"	416	item-homebranch: "item home library"
417	- "as the from address when generating overdue notices."	417	- .
418	-	418	-
419	- Include up to	419	- Include up to
420	- pref: PrintNoticesMaxLines	420	- pref: PrintNoticesMaxLines