From 651c29d6a3a7be63c9ede2ea30288256f1e4c603 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 21 Oct 2016 02:17:58 +0000 Subject: [PATCH] Bug 14610 - Follow-up Patch fixes some smaller problems: - Adds new notices to the it-IT installer (xt/sample_notices.t) - Renames one of the classes used in the table to avoid double up - Fixes POD of Bilbio.pm by removing a doubled up line --- Koha/Biblio.pm | 2 -- installer/data/mysql/it-IT/necessari/notices.sql | 7 +++++++ .../intranet-tmpl/prog/en/includes/patron-article-requests.inc | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm index b33a863..dbf0c56 100644 --- a/Koha/Biblio.pm +++ b/Koha/Biblio.pm @@ -218,8 +218,6 @@ sub article_requests_finished { =head3 items -=head3 items - my @items = $biblio->items(); my $items = $biblio->items(); diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql index 323ae28..6b1fbb5 100644 --- a/installer/data/mysql/it-IT/necessari/notices.sql +++ b/installer/data/mysql/it-IT/necessari/notices.sql @@ -164,3 +164,10 @@ VALUES ( 'circulation', 'OVERDUES_SLIP', '', 'Ritardi (ricevuta)', '0', 'Ricevut INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, message_transport_type) VALUES ('members','PASSWORD_RESET','','Nuova password',1,'Nuova password','\r\n

Questa email ti è stata mandata come risposta allaa tua richiesta di recupero pssword per l\'utente <>.\r\n

\r\n

\r\nPuoi ora creare una nuova password usando questo link:\r\n
>\"><>\r\n

\r\n

Queso link rimarrà valido per 2 giorni dalla ricezione dell\' email, successivamente dovrai rifare la procedura se non cambi la tua password.

\r\n

Grazie.

\r\n\r\n','email' ); + +INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) VALUES +('circulation', 'AR_CANCELED', '', 'Article Request - Email - Canceled', 0, 'Article Request Canceled', '<> <> (<>)\r\n\r\nYour request for an article from <> (<>) has been canceled for the following reason:\r\n\r\n<>\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n', 'email'), +('circulation', 'AR_COMPLETED', '', 'Article Request - Email - Completed', 0, 'Article Request Completed', '<> <> (<>)\r\n\r\nWe are have completed your request for an article from <> (<>).\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n\r\nYou may pick your article up at <>.\r\n\r\nThank you!', 'email'), +('circulation', 'AR_PENDING', '', 'Article Request - Email - Open', 0, 'Article Request Recieved', '<> <> (<>)\r\n\r\nWe have received your request for an article from <> (<>).\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n\r\n\r\nThank you!', 'email'), +('circulation', 'AR_SLIP', '', 'Article Request - Print Slip', 0, 'Test', 'Article Request:\r\n\r\n<> <> (<>)\r\n\r\nTitle: <>\r\nBarcode: <>\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n', 'print'), +('circulation', 'AR_PROCESSING', '', 'Article Request - Email - Processing', 0, 'Article Request Processing', '<> <> (<>)\r\n\r\nWe are now processing your request for an article from <> (<>).\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n\r\nThank you!', 'email'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc index b2856ea..0f7dda5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ [% FOREACH ar IN patron.article_requests_current %] -
Record titleRecord title Placed on Title Author
+ [% ar.biblio.title %] [% ar.item.enumchron %] -- 2.7.4