From 89c053e7dddf0c7b7088731afabbc1e6c320fa3a Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 24 Oct 2015 20:58:04 +0200 Subject: [PATCH] Bug 12933: QA Followq-up - Add missing notice templates and other small fixes - Fixes page title of slip print window: Members > Patrons - Fixes error message if no notice template is found - Fixes a stray template variable that resulted in the borrower number showing in the 'Print' pull down - Fixes xt/sample_notices.t by adding the sample notice to it-IT and es-ES --- installer/data/mysql/es-ES/mandatory/sample_notices.sql | 6 ++++++ installer/data/mysql/it-IT/necessari/notices.sql | 6 ++++++ koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt | 8 ++++---- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql index 7ae1b25..115b1f1 100644 --- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql +++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql @@ -151,3 +151,9 @@ Your library.' INSERT INTO letter(module, code, branchcode, name, title, content, message_transport_type) VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <> <>,\n\n The order <> (<>) has been received.\n\nYour library.', 'email'), ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration','Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>','email'); + +INSERT INTO letter ( module, code, branchcode, name, is_html, title, content, message_transport_type ) +VALUES ( 'circulation', 'OVERDUES_SLIP', '', 'Overdues Slip', '0', 'OVERDUES_SLIP', 'The following item(s) is/are currently overdue: + +"<>" by <>, <>, Barcode: <> Fine: <> +', 'print' ); diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql index d458980..66cddb7 100644 --- a/installer/data/mysql/it-IT/necessari/notices.sql +++ b/installer/data/mysql/it-IT/necessari/notices.sql @@ -149,3 +149,9 @@ Lo staff della biblioteca.' INSERT INTO letter(module, code, branchcode, name, title, content, message_transport_type) VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <> <>,\n\n The order <> (<>) has been received.\n\nYour library.', 'email'), ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration','Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>','email'); + +INSERT INTO letter ( module, code, branchcode, name, is_html, title, content, message_transport_type ) +VALUES ( 'circulation', 'OVERDUES_SLIP', '', 'Overdues Slip', '0', 'OVERDUES_SLIP', 'The following item(s) is/are currently overdue: + +"<>" by <>, <>, Barcode: <> Fine: <> +', 'print' ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 1ace189..b6d12d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -159,7 +159,7 @@ function searchToHold(){