From b0a6ab51aae3cdf7db94d7b6eade1145ca433ccd Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@biblibre.com> Date: Fri, 29 Aug 2014 14:56:54 +0200 Subject: [PATCH] [PASSED QA] Bug 12851: order tags should be removed from the claiming letter If you use a claimissue notice to claim serials, the generated letter will be <order>Title1, Author1</order> <order>Title2, Author2</order> ... <order>TitleN, AuthorN</order> This patch geds rid of these tags. Test plan: 1/ Create a claimissue notice with something like: <<LibrarianFirstname>> <<LibrarianSurname>> The following issues are in late: <order><<biblio.title>>, <<biblio.author>> (<<biblio.serial>>)</order> 2/ Generated late serial issues. 3/ Send notifications to vendor. 4/ The order tags should not exist anymore in the sent email. You can see bug 5342 for a more detailled test plan. Note for QA: This should have been done in GetPreparedLetter, but I did not find a better way to do. Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works as described. Tested having the <order> tags on one line and also for a multi-line layout. --- C4/Letters.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/C4/Letters.pm b/C4/Letters.pm index a72f310..7d1a1bd 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -370,6 +370,9 @@ sub SendAlerts { want_librarian => 1, ) or return; + # Remove the order tag + $letter->{content} =~ s/<order>(.*?)<\/order>/$1/gxms; + # ... then send mail my %mail = ( To => join( ',', @email), -- 1.9.1