From 6b0c0141c7291ab0760af5b97373fb3de7923247 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 25 Nov 2016 13:22:42 +0100 Subject: [PATCH] Bug 17681: Exiisting typos might thow some feees when recieved Yes, we are fixing these four typos here. Test plan: [1] Read the changes. [2] Run t/Auth_with_shibboleth.t [3] Run git grep recieved| grep -v -e 'recievedlist' | grep -v -e 'serials-recieve.tt' Note: serials-recieve.tt is just history. Bonus points for the one who makes us get rid of that column recievedlist. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec EDIT: Rebased. Change in Accounts has been corrected already. Removed the po file. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit b5c1a965b165093fb66a5db356da84b4a62bf9a6) Signed-off-by: Katrin Fischer (cherry picked from commit 327c2ba63612c56599d590a0a2dd8539d255b145) Signed-off-by: Julian Maurice --- Koha/Object.pm | 2 +- acqui/finishreceive.pl | 2 +- misc/cronjobs/cleanup_database.pl | 2 +- misc/release_notes/release_notes_200RC4.txt | 4 ++-- t/Auth_with_shibboleth.t | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Koha/Object.pm b/Koha/Object.pm index 9d23fb421e..2aef46d0f8 100644 --- a/Koha/Object.pm +++ b/Koha/Object.pm @@ -148,7 +148,7 @@ Returns: sub delete { my ($self) = @_; - # Deleting something not in storage thows an exception + # Deleting something not in storage throws an exception return -1 unless $self->_result()->in_storage(); # Return a boolean for succcess diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl index 111eadcc5c..89e742523c 100755 --- a/acqui/finishreceive.pl +++ b/acqui/finishreceive.pl @@ -61,7 +61,7 @@ my $bookfund = $input->param("bookfund"); my $order = GetOrder($ordernumber); my $new_ordernumber = $ordernumber; -#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME +#need old receivedate if we update the order, parcel.pl only shows the right parcel this way FIXME if ($quantityrec > $origquantityrec ) { my @received_items = (); if(C4::Context->preference('AcqCreateItem') eq 'ordering') { diff --git a/misc/cronjobs/cleanup_database.pl b/misc/cronjobs/cleanup_database.pl index bb54256093..e7fe47a85c 100755 --- a/misc/cronjobs/cleanup_database.pl +++ b/misc/cronjobs/cleanup_database.pl @@ -63,7 +63,7 @@ Usage: $0 [-h|--help] [--sessions] [--sessdays DAYS] [-v|--verbose] [--zebraqueu of Z39.50 searches --fees DAYS purge entries accountlines older than DAYS days, where amountoutstanding is 0 or NULL. - In the case of --feees, DAYS must be greater than + In the case of --fees, DAYS must be greater than or equal to 1. WARNING: Fees and payments may not be deleted together. This will not affect the account balance but may be diff --git a/misc/release_notes/release_notes_200RC4.txt b/misc/release_notes/release_notes_200RC4.txt index d190549ad6..107447552a 100644 --- a/misc/release_notes/release_notes_200RC4.txt +++ b/misc/release_notes/release_notes_200RC4.txt @@ -56,7 +56,7 @@ major : * indicators where stored but not displayed in MARC editor/viewer. * book shelves work again (note bookshelves are not avaible in OPAC. they will be added in 2.2.0) minor : -* it's now impossible to create a basket for an inactive supplier (it's of course possible to change supplier datas and recieve a past order) +* it's now impossible to create a basket for an inactive supplier (it's of course possible to change supplier datas and receive a past order) * removing "bulk", useless field, in admin/categorie.pl list (NOT in DB, in case someone uses the field) * removing forced order in admin/thesaurus.pl => mySQL returns datas ordered by relevance in fulltext index if you don't force an order. * Next borrower didn't work in circulation.pl (didn't return to borrower form) @@ -67,4 +67,4 @@ minor : IMPROVEMENTS: * Minor translation & HTML fixes. * Adding >>> in biblio editor to change tab. -* Adding a "print" link in MARCbiblio : popup a small windows, print the biblio, and closes. Nice for libraries still having a paper catalog. \ No newline at end of file +* Adding a "print" link in MARCbiblio : popup a small windows, print the biblio, and closes. Nice for libraries still having a paper catalog. diff --git a/t/Auth_with_shibboleth.t b/t/Auth_with_shibboleth.t index 0c34fc564e..5f24cd28ad 100644 --- a/t/Auth_with_shibboleth.t +++ b/t/Auth_with_shibboleth.t @@ -154,7 +154,7 @@ subtest "get_login_shib tests" => sub { ## debug off $C4::Auth_with_shibboleth::debug = '0'; warnings_are { $login = get_login_shib() }[], - "good config with debug off, no warnings recieved"; + "good config with debug off, no warnings received"; is( $login, "test1234", "good config with debug off, attribute value returned" ); @@ -165,7 +165,7 @@ subtest "get_login_shib tests" => sub { "shibboleth attribute to match: uid", "uid value: test1234" ], - "good config with debug enabled, correct warnings recieved"; + "good config with debug enabled, correct warnings received"; is( $login, "test1234", "good config with debug enabled, attribute value returned" ); -- 2.20.1