@@ -, +, @@
---
Koha/Patron.pm | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 4 ++--
t/db_dependent/Koha/Patron/Log.t | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
--- a/Koha/Patron.pm
+++ a/Koha/Patron.pm
@@ -679,7 +679,7 @@ sub merge_with {
if (C4::Context->preference("BorrowersLog")){
my $info = $patron->firstname. " " . $patron->surname . " (".$patron->cardnumber . ")". " has been merged into " . $self->firstname . " " . $self->surname . " (".$self->cardnumber . ")" ;
- logaction("MEMBERS", "Merge", $self->id, $info );
+ logaction("MEMBERS", "PATRON_MERGE", $self->id, $info );
}
}
});
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -146,7 +146,7 @@
[% CASE 'DELETE_FUND' %]Delete a fund
[% CASE 'Run' %]Run
[% CASE 'End' %]End
-[% CASE 'Merge' %]Merge
+[% CASE 'PATRON_MERGE' %]Merge
[% CASE 'EDIT_MAPPINGS' %]Edit mappings
[% CASE 'RESET_MAPPINGS' %]Reset mappings
[% CASE 'SERIAL CLAIM' %]Serial claim
@@ -239,7 +239,7 @@
[% END %]
- [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'MODCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' 'End' 'Merge' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'ACQUISITION CLAIM' 'ACQUISITION ORDER' 'OVERDUE' 'EXPIRE' ] %]
+ [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'MODCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' 'End' 'PATRON_MERGE' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'ACQUISITION CLAIM' 'ACQUISITION ORDER' 'OVERDUE' 'EXPIRE' ] %]
[% IF actions.grep(actx).size %]
[% ELSE %]
--- a/t/db_dependent/Koha/Patron/Log.t
+++ a/t/db_dependent/Koha/Patron/Log.t
@@ -41,7 +41,7 @@ subtest 'Test Koha::Patrons::merge' => sub {
my $results = $keeper->merge_with([ $borrower1->{borrowernumber}, $borrower2->{borrowernumber} ]);
- my $log=GetLogs("","","",["MEMBERS"],["Merge"],$keeper->id,"");
+ my $log=GetLogs("","","",["MEMBERS"],["PATRON_MERGE"],$keeper->id,"");
my $info_borrower1 = $borrower1->{firstname} . " " . $borrower1->{surname} . " (" . $borrower1->{cardnumber} . ") has been merged into " .
$keeper->firstname . " " . $keeper->surname . " (" . $keeper->cardnumber . ")";
@@ -63,7 +63,7 @@ subtest 'Test Koha::Patrons::merge' => sub {
$results = $keeper->merge_with([ $borrower3->{borrowernumber}, $borrower4->{borrowernumber} ]);
- $log=GetLogs("","","",["MEMBERS"],["Merge"],$keeper->id,"");
+ $log=GetLogs("","","",["MEMBERS"],["PATRON_MERGE"],$keeper->id,"");
$info_log = $log->[0]{info};
is($info_log,undef,"GetLogs didn't returns results in the log viewer for the merge of " . $borrower3->{borrowernumber});
@@ -73,4 +73,4 @@ subtest 'Test Koha::Patrons::merge' => sub {
is($info_log,undef,"GetLogs didn't returns results in the log viewer for the merge of " . $borrower4->{borrowernumber});
};
-$schema->storage->txn_rollback;
+$schema->storage->txn_rollback;
--