@@ -, +, @@
---
C4/Letters.pm | 4 ++--
C4/UsageStats.pm | 2 +-
installer/data/mysql/atomicupdate/claimslog.perl | 14 ++++++++++++++
installer/data/mysql/mandatory/sysprefs.sql | 2 +-
.../prog/en/modules/admin/preferences/logs.pref | 2 +-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 4 ++--
t/db_dependent/Letters.t | 8 ++++----
t/db_dependent/UsageStats.t | 2 +-
8 files changed, 26 insertions(+), 12 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/claimslog.perl
--- a/C4/Letters.pm
+++ a/C4/Letters.pm
@@ -534,7 +534,7 @@ sub SendAlerts {
unless $success;
logaction(
- "ACQUISITION",
+ "CLAIMS",
$action,
undef,
"To="
@@ -543,7 +543,7 @@ sub SendAlerts {
. $letter->{title}
. " Content="
. $letter->{content}
- ) if C4::Context->preference("LetterLog");
+ ) if C4::Context->preference("ClaimsLog");
}
# send an "account details" notice to a newly created user
elsif ( $type eq 'members' ) {
--- a/C4/UsageStats.pm
+++ a/C4/UsageStats.pm
@@ -222,7 +222,7 @@ sub BuildReport {
CataloguingLog
FinesLog
IssueLog
- LetterLog
+ ClaimsLog
ReturnLog
SubscriptionLog
BiblioDefaultView
--- a/installer/data/mysql/atomicupdate/claimslog.perl
+++ a/installer/data/mysql/atomicupdate/claimslog.perl
@@ -0,0 +1,14 @@
+$DBversion = 'XXX'; # will be replaced by the RM
+if ( CheckVersion($DBversion) ) {
+ $dbh->do(q{
+ UPDATE action_logs SET module = 'CLAIMS'
+ WHERE module = 'ACQUISITIONS' AND ( action = 'SERIAL CLAIM' OR action = 'ACQUISITION ORDER' OR action = 'ACQUISITION CLAIM')
+ });
+
+ $dbh->do(q{
+ UPDATE systempreferences SET variable = 'ClaimsLog' WHERE variable = 'LetterLog';
+ });
+
+ # Always end with this (adjust the bug info)
+ NewVersion( $DBversion, XXXXX, "Description" );
+}
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ a/installer/data/mysql/mandatory/sysprefs.sql
@@ -296,7 +296,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('KohaManualLanguage','en','en|ar|cs|de|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'),
('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'),
('language','en',NULL,'Set the default language in the staff interface.','Languages'),
-('LetterLog','1',NULL,'If ON, log all notices sent','YesNo'),
+('ClaimsLog','1',NULL,'If ON, log all notices sent','YesNo'),
('LibraryName','','','Define the library name as displayed on the OPAC',''),
('LibraryThingForLibrariesEnabled','0','','Enable or Disable Library Thing for Libraries Features','YesNo'),
('LibraryThingForLibrariesID','','','See:http://librarything.com/forlibraries/','free'),
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref
@@ -1,7 +1,7 @@
Logging:
Logging:
-
- - pref: LetterLog
+ - pref: ClaimsLog
choices:
1: Log
0: "Don't log"
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -84,7 +84,7 @@
[% CASE 'CIRCULATION' %]Circulation[% UNLESS Koha.Preference('IssueLog') %] [% END %]
-[% CASE 'LETTER' %]Letter[% UNLESS Koha.Preference('LetterLog') %] [% END %]
+[% CASE 'CLAIMS' %]Claims[% UNLESS Koha.Preference('ClaimsLog') %] [% END %]
[% CASE 'FINES' %]Fines[% UNLESS Koha.Preference('FinesLog') %] [% END %]
@@ -191,7 +191,7 @@
[% ELSE %]
[% END %]
- [% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES' ] %]
+ [% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'CLAIMS' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES' ] %]
[% IF modules.grep(modx).size %]
[% ELSE %]
--- a/t/db_dependent/Letters.t
+++ a/t/db_dependent/Letters.t
@@ -454,8 +454,8 @@ is($err->{'error'}, 'no_email', "Trying to send an alert when there's no e-mail
$bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
$bookseller->contacts->next->email('testemail@mydomain.com')->store;
-# Ensure that the preference 'LetterLog' is set to logging
-t::lib::Mocks::mock_preference( 'LetterLog', 'on' );
+# Ensure that the preference 'ClaimsLog' is set to logging
+t::lib::Mocks::mock_preference( 'ClaimsLog', 'on' );
# SendAlerts needs branchemail or KohaAdminEmailAddress as sender
t::lib::Mocks::mock_preference( 'KohaAdminEmailAddress', 'library@domain.com' );
@@ -633,8 +633,8 @@ subtest 'SendAlerts - claimissue' => sub {
$bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
$bookseller->contacts->next->email('testemail@mydomain.com')->store;
- # Ensure that the preference 'LetterLog' is set to logging
- t::lib::Mocks::mock_preference( 'LetterLog', 'on' );
+ # Ensure that the preference 'ClaimsLog' is set to logging
+ t::lib::Mocks::mock_preference( 'ClaimsLog', 'on' );
# SendAlerts needs branchemail or KohaAdminEmailAddress as sender
t::lib::Mocks::mock_userenv({ branchcode => $library->{branchcode} });
--- a/t/db_dependent/UsageStats.t
+++ a/t/db_dependent/UsageStats.t
@@ -483,7 +483,7 @@ sub mocking_systempreferences_to_a_set_value {
CataloguingLog
FinesLog
IssueLog
- LetterLog
+ ClaimsLog
ReturnLog
SubscriptionLog
BiblioDefaultView
--