Bugzilla – Attachment 43930 Details for
Bug 12933
Add ability to print overdue slip from staff intranet
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12933: QA Followq-up - Add missing notice templates and other small fixes
Bug-12933-QA-Followq-up---Add-missing-notice-templ.patch (text/plain), 5.64 KB, created by
Katrin Fischer
on 2015-10-24 19:30:04 UTC
(
hide
)
Description:
Bug 12933: QA Followq-up - Add missing notice templates and other small fixes
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2015-10-24 19:30:04 UTC
Size:
5.64 KB
patch
obsolete
>From 89c053e7dddf0c7b7088731afabbc1e6c320fa3a Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >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 <<borrowers.firstname>> <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> (<<biblio.title>>) has been received.\n\nYour library.', 'email'), > ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration','Dear <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<<borrowers.dateexpiry>>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<<branches.branchname>>','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: >+ >+<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <<items.fine>></item> >+', '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 <<borrowers.firstname>> <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> (<<biblio.title>>) has been received.\n\nYour library.', 'email'), > ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration','Dear <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<<borrowers.dateexpiry>>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<<branches.branchname>>','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: >+ >+<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <<items.fine>></item> >+', '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(){ > <ul class="dropdown-menu"> > [% IF ( CAN_user_borrowers ) %]<li><a id="printsummary" href="#">Print summary</a></li>[% END %] > <li><a id="printslip" href="#">Print slip</a></li> >- <li><a id="printquickslip" href="#">Print quick slip[% Borrowers.HasOverdues( borrowernumber ) %]</a></li> >+ <li><a id="printquickslip" href="#">Print quick slip</a></li> > [% IF Borrowers.HasOverdues( borrowernumber ) %] > <li><a id="print_overdues" href="#">Print overdues</a></li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >index e6c3f2b..9bf6707 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -5,9 +5,9 @@ > [% ELSIF ( caller == 'transfer' ) %] > <title>Koha › Circulation › Transfers print receipt</title> > [% ELSIF ( caller == 'members' ) %] >-<title>Koha › Members › Print receipt for [% borrowernumber %]</title> >+<title>Koha › Patrons › Print receipt for [% borrowernumber %]</title> > [% ELSIF ( title ) %] >-<title>Koha › Members › [% title %]</title> >+<title>Koha › Patrons › [% title %]</title> > [% END %] > > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >@@ -24,10 +24,10 @@ > > [% IF plain %] > <pre> >-[% IF ( slip ) %][% slip %][% ELSE %]No hold found[% END %] >+[% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %] > </pre> > [% ELSE %] >-[% IF ( slip ) %][% slip %][% ELSE %]No hold found[% END %] >+[% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12933
:
31638
|
31667
|
34456
|
34457
|
34467
|
34468
|
34469
|
34470
|
34471
|
34474
|
34475
|
34884
|
34885
|
34886
|
34887
|
34888
|
34889
|
35533
|
35534
|
35535
|
35536
|
35537
|
35538
|
35918
|
41606
|
41607
|
41608
|
41609
|
41610
|
41611
|
43514
|
43515
|
43516
|
43517
|
43518
|
43519
|
43520
|
43521
|
43522
|
43523
|
43904
|
43905
|
43906
|
43907
|
43908
|
43925
|
43926
|
43927
|
43928
|
43929
|
43930
|
43953