Attachment #166256 for bug #35169

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




        $dbh->do(
            q{
            INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type) VALUES
            ('DefaultLongOverduePatronCategories', '', NULL, 'Set the borrower categories that will be listed when longoverdue cronjob is executed', 'choice'),
            ('DefaultLongOverdueSkipPatronCategories', '', NULL, 'Set the borrower categories that will not be listed when longoverdue cronjob is executed', 'choice');
        }
        );

        # sysprefs
        say $out "Added new system preference 'DefaultLongOverduePatronCategories'";
        say $out "Added new system preference 'DefaultLongOverdueSkipPatronCategories'";
    },
};

Lines 198-208 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-2 / +2 lines)
198	('DefaultHoldExpirationdateUnitOfTime','days','days\|months\|years','Which unit of time is used when setting the default expiration date. ','choice'),	198	('DefaultHoldExpirationdateUnitOfTime','days','days\|months\|years','Which unit of time is used when setting the default expiration date. ','choice'),
199	('DefaultHoldPickupLocation','loggedinlibrary','loggedinlibrary\|homebranch\|holdingbranch','Which branch should a hold pickup location default to. ','choice'),	199	('DefaultHoldPickupLocation','loggedinlibrary','loggedinlibrary\|homebranch\|holdingbranch','Which branch should a hold pickup location default to. ','choice'),
200	('DefaultLanguageField008','','','Fill in the default language for field 008 Range 35-37 of MARC21 records (e.g. eng, nor, ger, see <a href=\"http://www.loc.gov/marc/languages/language_code.html\">MARC Code List for Languages</a>)','Free'),	200	('DefaultLanguageField008','','','Fill in the default language for field 008 Range 35-37 of MARC21 records (e.g. eng, nor, ger, see <a href=\"http://www.loc.gov/marc/languages/language_code.html\">MARC Code List for Languages</a>)','Free'),
201	('DefaultLongOverdueBorrowerCategories', '', NULL, "Set the borrower categories that will be listed when longoverdue cronjob is executed", 'choice'),	201	('DefaultLongOverduePatronCategories', '', NULL, "Set the borrower categories that will be listed when longoverdue cronjob is executed", 'choice'),
202	('DefaultLongOverdueChargeValue', '', NULL, "Charge a lost item to the borrower's account when the LOST value of the item changes to n.", 'integer'),	202	('DefaultLongOverdueChargeValue', '', NULL, "Charge a lost item to the borrower's account when the LOST value of the item changes to n.", 'integer'),
203	('DefaultLongOverdueDays', '', NULL, "Set the LOST value of an item when the item has been overdue for more than n days.", 'integer'),	203	('DefaultLongOverdueDays', '', NULL, "Set the LOST value of an item when the item has been overdue for more than n days.", 'integer'),
204	('DefaultLongOverdueLostValue', '', NULL, "Set the LOST value of an item to n when the item has been overdue for more than defaultlongoverduedays days.", 'integer'),	204	('DefaultLongOverdueLostValue', '', NULL, "Set the LOST value of an item to n when the item has been overdue for more than defaultlongoverduedays days.", 'integer'),
205	('DefaultLongOverdueSkipBorrowerCategories', '', NULL, "Set the borrower categories that will not be listed when longoverdue cronjob is executed", 'choice'),	205	('DefaultLongOverdueSkipPatronCategories', '', NULL, "Set the borrower categories that will not be listed when longoverdue cronjob is executed", 'choice'),
206	('DefaultLongOverdueSkipLostStatuses', '', NULL, 'Skip these lost statuses by default in longoverdue.pl', 'Free'),	206	('DefaultLongOverdueSkipLostStatuses', '', NULL, 'Skip these lost statuses by default in longoverdue.pl', 'Free'),
207	('DefaultPatronSearchFields', 'firstname\|middle_name\|surname\|othernames\|cardnumber\|userid',NULL,'Pipe separated list defining the default fields to be used during a patron search using the "standard" option. If empty Koha will default to "firstname\|surname\|othernames\|cardnumber\|userid". Additional fields added to this preference will be added as search options in the dropdown menu on the patron search page.','free'),	207	('DefaultPatronSearchFields', 'firstname\|middle_name\|surname\|othernames\|cardnumber\|userid',NULL,'Pipe separated list defining the default fields to be used during a patron search using the "standard" option. If empty Koha will default to "firstname\|surname\|othernames\|cardnumber\|userid". Additional fields added to this preference will be added as search options in the dropdown menu on the patron search page.','free'),
208	('DefaultPatronSearchMethod','starts_with','Choose which search method to use by default when searching with PatronAutoComplete','starts_with\|contains','Choice'),	208	('DefaultPatronSearchMethod','starts_with','Choose which search method to use by default when searching with PatronAutoComplete','starts_with\|contains','Choice'),




            - <br>Leave this field empty if you don't want to skip any <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=LOST">LOST</a> statuses.
            - <br>Set to a list of comma separated values, e.g. <em>5,6,7</em>.
        -
            - Set the default patron categories to receive overdues to
            - pref: DefaultLongOverduePatronCategories
              choices: patron-categories
              class: multiple
            - <br>Leave this field empty if you want to process overdues for all patron categories.
            - <br>(Used when the longoverdue.pl script is called without the --category parameter)
            - <br>WARNING — This preference will be active only if DefaultLongOverdueSkipPatronCategories is empty.
            - <br>
            - Set the default patron categories to <i>not</i> receive overdues to
            - pref: DefaultLongOverdueSkipPatronCategories
              choices: patron-categories
              class: multiple
            - <br>Leave this field empty if you want to process overdues for all patron categories.
            - <br>(Used when the longoverdue.pl script is called without the --skip-category parameter)
            - <br>WARNING - This preference overrides the DefaultLongOverduePatronCategories preference, so the DefaultLongOverduePatronCategories filter will not take effect.
            - "<br><strong>NOTE:</strong> This system preference requires the <code>misc/cronjobs/longoverdue.pl</code> cronjob. Ask your system administrator to schedule it."

        -




Act on the listed borrower category code (borrowers.categorycode).
Exclude all others. This may be specified multiple times to include multiple categories.
May not be used with B<--skip-category>
If not provided, the value of the system preference 'DefaultLongOverduePatronCategories' will be used.

=item B<--skip-category>

Act on all available borrower category codes, except those listed.
This may be specified multiple times, to exclude multiple categories.
May not be used with B<--category>
If not provided, the value of the system preference 'DefaultLongOverdueSkipPatronCategories' will be used.

=item B<--list-categories>


}

if ( scalar @$borrower_category == 0 ) {
    if ( C4::Context->preference('DefaultLongOverduePatronCategories') ) {
        my $categories = C4::Context->preference('DefaultLongOverduePatronCategories');
        $borrower_category = [ split( ',', $categories ) ];
    }
}

if ( scalar @$skip_borrower_category == 0 ) {
    if ( C4::Context->preference('DefaultLongOverdueSkipPatronCategories') ) {
        my $categories = C4::Context->preference('DefaultLongOverdueSkipPatronCategories');
        $skip_borrower_category = [ split( ',', $categories ) ];
    }
}
- 

Return to bug 35169

Lines 452-472 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-6 / +6 lines)
452	- <br>Leave this field empty if you don't want to skip any <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=LOST">LOST</a> statuses.	452	- <br>Leave this field empty if you don't want to skip any <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=LOST">LOST</a> statuses.
453	- <br>Set to a list of comma separated values, e.g. <em>5,6,7</em>.	453	- <br>Set to a list of comma separated values, e.g. <em>5,6,7</em>.
454	-	454	-
455	- Set the default patron categories to recieve overdues to	455	- Set the default patron categories to receive overdues to
456	- pref: DefaultLongOverdueBorrowerCategories	456	- pref: DefaultLongOverduePatronCategories
457	choices: patron-categories	457	choices: patron-categories
458	class: multiple	458	class: multiple
459	- <br>Leave this field empty if you want to process overdues for all patron categories.	459	- <br>Leave this field empty if you want to process overdues for all patron categories.
460	- <br>(Used when the longoverdue.pl script is called without the --category parameter)	460	- <br>(Used when the longoverdue.pl script is called without the --category parameter)
461	- <br>WARNING — This preference will be active only if DefaultLongOverdueSkipBorrowerCategories is empty.	461	- <br>WARNING — This preference will be active only if DefaultLongOverdueSkipPatronCategories is empty.
462	- <br>	462	- <br>
463	- Set the default patron categories to <i>not</i> recieve overdues to	463	- Set the default patron categories to <i>not</i> receive overdues to
464	- pref: DefaultLongOverdueSkipBorrowerCategories	464	- pref: DefaultLongOverdueSkipPatronCategories
465	choices: patron-categories	465	choices: patron-categories
466	class: multiple	466	class: multiple
467	- <br>Leave this field empty if you want to process overdues for all patron categories.	467	- <br>Leave this field empty if you want to process overdues for all patron categories.
468	- <br>(Used when the longoverdue.pl script is called without the --skip-category parameter)	468	- <br>(Used when the longoverdue.pl script is called without the --skip-category parameter)
469	- <br>WARNING - This preference overrides the DefaultLongOverdueBorrowerCategories preference, so the DefaultLongOverdueBorrowerCategories filter will not take effect.	469	- <br>WARNING - This preference overrides the DefaultLongOverduePatronCategories preference, so the DefaultLongOverduePatronCategories filter will not take effect.
470	- "<br><strong>NOTE:</strong> This system preference requires the <code>misc/cronjobs/longoverdue.pl</code> cronjob. Ask your system administrator to schedule it."	470	- "<br><strong>NOTE:</strong> This system preference requires the <code>misc/cronjobs/longoverdue.pl</code> cronjob. Ask your system administrator to schedule it."
471		471
472	-	472	-

Lines 11-23 return { Link Here

(-)a/installer/data/mysql/atomicupdate/bug_35169.pl (-4 / +4 lines)
11	$dbh->do(	11	$dbh->do(
12	q{	12	q{
13	INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type) VALUES	13	INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type) VALUES
14	('DefaultLongOverdueBorrowerCategories', '', NULL, 'Set the borrower categories that will be listed when longoverdue cronjob is executed', 'choice'),	14	('DefaultLongOverduePatronCategories', '', NULL, 'Set the borrower categories that will be listed when longoverdue cronjob is executed', 'choice'),
15	('DefaultLongOverdueSkipBorrowerCategories', '', NULL, 'Set the borrower categories that will not be listed when longoverdue cronjob is executed', 'choice');	15	('DefaultLongOverdueSkipPatronCategories', '', NULL, 'Set the borrower categories that will not be listed when longoverdue cronjob is executed', 'choice');
16	}	16	}
17	);	17	);
18		18
19	# sysprefs	19	# sysprefs
20	say $out "Added new system preference 'DefaultLongOverdueBorrowerCategories'";	20	say $out "Added new system preference 'DefaultLongOverduePatronCategories'";
21	say $out "Added new system preference 'DefaultLongOverdueSkipBorrowerCategories'";	21	say $out "Added new system preference 'DefaultLongOverdueSkipPatronCategories'";
22	},	22	},
23	};	23	};

Lines 173-186 If not provided, the value of the system preference 'MarkLostItemsAsReturned' wi Link Here

(-)a/misc/cronjobs/longoverdue.pl (-7 / +6 lines)
173	Act on the listed borrower category code (borrowers.categorycode).	173	Act on the listed borrower category code (borrowers.categorycode).
174	Exclude all others. This may be specified multiple times to include multiple categories.	174	Exclude all others. This may be specified multiple times to include multiple categories.
175	May not be used with B<--skip-category>	175	May not be used with B<--skip-category>
176	If not provided, the value of the system preference 'DefaultLongOverdueBorrowerCategories' will be used.	176	If not provided, the value of the system preference 'DefaultLongOverduePatronCategories' will be used.
177		177
178	=item B<--skip-category>	178	=item B<--skip-category>
179		179
180	Act on all available borrower category codes, except those listed.	180	Act on all available borrower category codes, except those listed.
181	This may be specified multiple times, to exclude multiple categories.	181	This may be specified multiple times, to exclude multiple categories.
182	May not be used with B<--category>	182	May not be used with B<--category>
183	If not provided, the value of the system preference 'DefaultLongOverdueSkipBorrowerCategories' will be used.	183	If not provided, the value of the system preference 'DefaultLongOverdueSkipPatronCategories' will be used.
184		184
185	=item B<--list-categories>	185	=item B<--list-categories>
186		186
Lines 279-293 if ( ! defined($charge) ) { Link Here
279	}	279	}
280		280
281	if ( scalar @$borrower_category == 0 ) {	281	if ( scalar @$borrower_category == 0 ) {
282	if ( C4::Context->preference('DefaultLongOverdueBorrowerCategories') ) {	282	if ( C4::Context->preference('DefaultLongOverduePatronCategories') ) {
283	my $categories = C4::Context->preference('DefaultLongOverdueBorrowerCategories');	283	my $categories = C4::Context->preference('DefaultLongOverduePatronCategories');
284	$borrower_category = [ split( ',', $categories ) ];	284	$borrower_category = [ split( ',', $categories ) ];
285	}	285	}
286	}	286	}
287		287
288	if ( scalar @$skip_borrower_category == 0 ) {	288	if ( scalar @$skip_borrower_category == 0 ) {
289	if ( C4::Context->preference('DefaultLongOverdueSkipBorrowerCategories') ) {	289	if ( C4::Context->preference('DefaultLongOverdueSkipPatronCategories') ) {
290	my $categories = C4::Context->preference('DefaultLongOverdueSkipBorrowerCategories');	290	my $categories = C4::Context->preference('DefaultLongOverdueSkipPatronCategories');
291	$skip_borrower_category = [ split( ',', $categories ) ];	291	$skip_borrower_category = [ split( ',', $categories ) ];
292	}	292	}
293	}	293	}
294	-