View | Details | Raw Unified | Return to bug 22818
Collapse All | Expand All

(-)a/Koha/Illrequest.pm (-4 / +4 lines)
Lines 1328-1335 sub generic_confirm { Link Here
1328
            "No target email addresses found. Either select at least one partner or check your ILL partner library records.")
1328
            "No target email addresses found. Either select at least one partner or check your ILL partner library records.")
1329
          if ( !$to );
1329
          if ( !$to );
1330
        # Create the from, replyto and sender headers
1330
        # Create the from, replyto and sender headers
1331
        my $from = $branch->branchillemail || $branch->branchemail;
1331
        my $from = $branch->branchemail;
1332
        my $replyto = $branch->branchreplyto || $from;
1332
        my $replyto = $branch->inbound_ill_address;
1333
        Koha::Exceptions::Ill::NoLibraryEmail->throw(
1333
        Koha::Exceptions::Ill::NoLibraryEmail->throw(
1334
            "Your library has no usable email address. Please set it.")
1334
            "Your library has no usable email address. Please set it.")
1335
          if ( !$from );
1335
          if ( !$from );
Lines 1568-1575 sub get_notice { Link Here
1568
            branches    => $self->branchcode,
1568
            branches    => $self->branchcode,
1569
        },
1569
        },
1570
        substitute  => {
1570
        substitute  => {
1571
            ill_bib_title      => $title ? $title->value : qw{},
1571
            ill_bib_title      => $title ? $title->value : '',
1572
            ill_bib_author     => $author ? $author->value : qw{},
1572
            ill_bib_author     => $author ? $author->value : '',
1573
            ill_full_metadata  => $metastring
1573
            ill_full_metadata  => $metastring
1574
        }
1574
        }
1575
    );
1575
    );
(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (-74 / +74 lines)
Lines 668-693 tables: Link Here
668
          message_transport_type: email
668
          message_transport_type: email
669
          lang: default
669
          lang: default
670
          content:
670
          content:
671
            - "Dear [% borrowers.firstname %] [% borrowers.surname %],"
671
            - "Dear [% borrower.firstname %] [% borrower.surname %],"
672
            - ""
672
            - ""
673
            - "The Interlibrary loans request number [% illrequests.illrequest_id %] you placed for:"
673
            - "The Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:"
674
            - ""
674
            - ""
675
            - "- [% ill_bib_title %] - [% ill_bib_author %]"
675
            - "- [% ill_bib_title %] - [% ill_bib_author %]"
676
            - ""
676
            - ""
677
            - "is ready for pick up from [% branches.branchname %]."
677
            - "is ready for pick up from [% branch.branchname %]."
678
            - ""
678
            - ""
679
            - "Kind Regards"
679
            - "Kind Regards"
680
            - ""
680
            - ""
681
            - "[% branches.branchname %]"
681
            - "[% branch.branchname %]"
682
            - "[% branches.branchaddress1 %]"
682
            - "[% branch.branchaddress1 %]"
683
            - "[% branches.branchaddress2 %]"
683
            - "[% branch.branchaddress2 %]"
684
            - "[% branches.branchaddress3 %]"
684
            - "[% branch.branchaddress3 %]"
685
            - "[% branches.branchcity %]"
685
            - "[% branch.branchcity %]"
686
            - "[% branches.branchstate %]"
686
            - "[% branch.branchstate %]"
687
            - "[% branches.branchzip %]"
687
            - "[% branch.branchzip %]"
688
            - "[% branches.branchphone %]"
688
            - "[% branch.branchphone %]"
689
            - "[% branches.branchillemail %]"
689
            - "[% branch.branchillemail %]"
690
            - "[% branches.branchemail %]"
690
            - "[% branch.branchemail %]"
691
691
692
        - module: ill
692
        - module: ill
693
          code: ILL_REQUEST_UNAVAIL
693
          code: ILL_REQUEST_UNAVAIL
Lines 698-706 tables: Link Here
698
          message_transport_type: email
698
          message_transport_type: email
699
          lang: default
699
          lang: default
700
          content:
700
          content:
701
            - "Dear [% borrowers.firstname %] [% borrowers.surname %],"
701
            - "Dear [% borrower.firstname %] [% borrower.surname %],"
702
            - ""
702
            - ""
703
            - "The Interlibrary loans request number [% illrequests.illrequest_id %] you placed for"
703
            - "The Interlibrary loans request number [% illrequest.illrequest_id %] you placed for"
704
            - ""
704
            - ""
705
            - "- [% ill_bib_title %] - [% ill_bib_author %]"
705
            - "- [% ill_bib_title %] - [% ill_bib_author %]"
706
            - ""
706
            - ""
Lines 708-723 tables: Link Here
708
            - ""
708
            - ""
709
            - "Kind Regards"
709
            - "Kind Regards"
710
            - ""
710
            - ""
711
            - "[% branches.branchname %]"
711
            - "[% branch.branchname %]"
712
            - "[% branches.branchaddress1 %]"
712
            - "[% branch.branchaddress1 %]"
713
            - "[% branches.branchaddress2 %]"
713
            - "[% branch.branchaddress2 %]"
714
            - "[% branches.branchaddress3 %]"
714
            - "[% branch.branchaddress3 %]"
715
            - "[% branches.branchcity %]"
715
            - "[% branch.branchcity %]"
716
            - "[% branches.branchstate %]"
716
            - "[% branch.branchstate %]"
717
            - "[% branches.branchzip %]"
717
            - "[% branch.branchzip %]"
718
            - "[% branches.branchphone %]"
718
            - "[% branch.branchphone %]"
719
            - "[% branches.branchillemail %]"
719
            - "[% branch.branchillemail %]"
720
            - "[% branches.branchemail %]"
720
            - "[% branch.branchemail %]"
721
721
722
        - module: ill
722
        - module: ill
723
          code: ILL_REQUEST_CANCEL
723
          code: ILL_REQUEST_CANCEL
Lines 728-734 tables: Link Here
728
          message_transport_type: email
728
          message_transport_type: email
729
          lang: default
729
          lang: default
730
          content:
730
          content:
731
            - "The patron for interlibrary loans request [% illrequests.illrequest_id %], with the following details, has requested cancellation of this ILL request:"
731
            - "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:"
732
            - ""
732
            - ""
733
            - "[% ill_full_metadata %]"
733
            - "[% ill_full_metadata %]"
734
734
Lines 741-747 tables: Link Here
741
          message_transport_type: email
741
          message_transport_type: email
742
          lang: default
742
          lang: default
743
          content:
743
          content:
744
            - "The patron for interlibrary loans request [% illrequests.illrequest_id %], with the following details, has modified this ILL request:"
744
            - "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:"
745
            - ""
745
            - ""
746
            - "[% ill_full_metadata %]"
746
            - "[% ill_full_metadata %]"
747
747
Lines 764-779 tables: Link Here
764
            - ""
764
            - ""
765
            - "Kind Regards"
765
            - "Kind Regards"
766
            - ""
766
            - ""
767
            - "[% branches.branchname %]"
767
            - "[% branch.branchname %]"
768
            - "[% branches.branchaddress1 %]"
768
            - "[% branch.branchaddress1 %]"
769
            - "[% branches.branchaddress2 %]"
769
            - "[% branch.branchaddress2 %]"
770
            - "[% branches.branchaddress3 %]"
770
            - "[% branch.branchaddress3 %]"
771
            - "[% branches.branchcity %]"
771
            - "[% branch.branchcity %]"
772
            - "[% branches.branchstate %]"
772
            - "[% branch.branchstate %]"
773
            - "[% branches.branchzip %]"
773
            - "[% branch.branchzip %]"
774
            - "[% branches.branchphone %]"
774
            - "[% branch.branchphone %]"
775
            - "[% branches.branchillemail %]"
775
            - "[% branch.branchillemail %]"
776
            - "[% branches.branchemail %]"
776
            - "[% branch.branchemail %]"
777
777
778
        - module: ill
778
        - module: ill
779
          code: ILL_PICKUP_READY
779
          code: ILL_PICKUP_READY
Lines 784-809 tables: Link Here
784
          message_transport_type: sms
784
          message_transport_type: sms
785
          lang: default
785
          lang: default
786
          content:
786
          content:
787
            - "Dear [% borrowers.firstname %] [% borrowers.surname %],"
787
            - "Dear [% borrower.firstname %] [% borrower.surname %],"
788
            - ""
788
            - ""
789
            - "The Interlibrary loans request number [% illrequests.illrequest_id %] you placed for:"
789
            - "The Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:"
790
            - ""
790
            - ""
791
            - "- [% ill_bib_title %] - [% ill_bib_author %]"
791
            - "- [% ill_bib_title %] - [% ill_bib_author %]"
792
            - ""
792
            - ""
793
            - "is ready for pick up from [% branches.branchname %]."
793
            - "is ready for pick up from [% branch.branchname %]."
794
            - ""
794
            - ""
795
            - "Kind Regards"
795
            - "Kind Regards"
796
            - ""
796
            - ""
797
            - "[% branches.branchname %]"
797
            - "[% branch.branchname %]"
798
            - "[% branches.branchaddress1 %]"
798
            - "[% branch.branchaddress1 %]"
799
            - "[% branches.branchaddress2 %]"
799
            - "[% branch.branchaddress2 %]"
800
            - "[% branches.branchaddress3 %]"
800
            - "[% branch.branchaddress3 %]"
801
            - "[% branches.branchcity %]"
801
            - "[% branch.branchcity %]"
802
            - "[% branches.branchstate %]"
802
            - "[% branch.branchstate %]"
803
            - "[% branches.branchzip %]"
803
            - "[% branch.branchzip %]"
804
            - "[% branches.branchphone %]"
804
            - "[% branch.branchphone %]"
805
            - "[% branches.branchillemail %]"
805
            - "[% branch.branchillemail %]"
806
            - "[% branches.branchemail %]"
806
            - "[% branch.branchemail %]"
807
807
808
        - module: ill
808
        - module: ill
809
          code: ILL_REQUEST_UNAVAIL
809
          code: ILL_REQUEST_UNAVAIL
Lines 814-822 tables: Link Here
814
          message_transport_type: sms
814
          message_transport_type: sms
815
          lang: default
815
          lang: default
816
          content:
816
          content:
817
            - "Dear [% borrowers.firstname %] [% borrowers.surname %],"
817
            - "Dear [% borrower.firstname %] [% borrower.surname %],"
818
            - ""
818
            - ""
819
            - "The Interlibrary loans request number [% illrequests.illrequest_id %] you placed for"
819
            - "The Interlibrary loans request number [% illrequest.illrequest_id %] you placed for"
820
            - ""
820
            - ""
821
            - "- [% ill_bib_title %] - [% ill_bib_author %]"
821
            - "- [% ill_bib_title %] - [% ill_bib_author %]"
822
            - ""
822
            - ""
Lines 824-839 tables: Link Here
824
            - ""
824
            - ""
825
            - "Kind Regards"
825
            - "Kind Regards"
826
            - ""
826
            - ""
827
            - "[% branches.branchname %]"
827
            - "[% branch.branchname %]"
828
            - "[% branches.branchaddress1 %]"
828
            - "[% branch.branchaddress1 %]"
829
            - "[% branches.branchaddress2 %]"
829
            - "[% branch.branchaddress2 %]"
830
            - "[% branches.branchaddress3 %]"
830
            - "[% branch.branchaddress3 %]"
831
            - "[% branches.branchcity %]"
831
            - "[% branch.branchcity %]"
832
            - "[% branches.branchstate %]"
832
            - "[% branch.branchstate %]"
833
            - "[% branches.branchzip %]"
833
            - "[% branch.branchzip %]"
834
            - "[% branches.branchphone %]"
834
            - "[% branch.branchphone %]"
835
            - "[% branches.branchillemail %]"
835
            - "[% branch.branchillemail %]"
836
            - "[% branches.branchemail %]"
836
            - "[% branch.branchemail %]"
837
837
838
        - module: ill
838
        - module: ill
839
          code: ILL_REQUEST_CANCEL
839
          code: ILL_REQUEST_CANCEL
Lines 844-850 tables: Link Here
844
          message_transport_type: sms
844
          message_transport_type: sms
845
          lang: default
845
          lang: default
846
          content:
846
          content:
847
            - "The patron for interlibrary loans request [% illrequests.illrequest_id %], with the following details, has requested cancellation of this ILL request:"
847
            - "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:"
848
            - ""
848
            - ""
849
            - "[% ill_full_metadata %]"
849
            - "[% ill_full_metadata %]"
850
850
Lines 857-863 tables: Link Here
857
          message_transport_type: sms
857
          message_transport_type: sms
858
          lang: default
858
          lang: default
859
          content:
859
          content:
860
            - "The patron for interlibrary loans request [% illrequests.illrequest_id %], with the following details, has modified this ILL request:"
860
            - "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:"
861
            - ""
861
            - ""
862
            - "[% ill_full_metadata %]"
862
            - "[% ill_full_metadata %]"
863
863
Lines 880-895 tables: Link Here
880
            - ""
880
            - ""
881
            - "Kind Regards"
881
            - "Kind Regards"
882
            - ""
882
            - ""
883
            - "[% branches.branchname %]"
883
            - "[% branch.branchname %]"
884
            - "[% branches.branchaddress1 %]"
884
            - "[% branch.branchaddress1 %]"
885
            - "[% branches.branchaddress2 %]"
885
            - "[% branch.branchaddress2 %]"
886
            - "[% branches.branchaddress3 %]"
886
            - "[% branch.branchaddress3 %]"
887
            - "[% branches.branchcity %]"
887
            - "[% branch.branchcity %]"
888
            - "[% branches.branchstate %]"
888
            - "[% branch.branchstate %]"
889
            - "[% branches.branchzip %]"
889
            - "[% branch.branchzip %]"
890
            - "[% branches.branchphone %]"
890
            - "[% branch.branchphone %]"
891
            - "[% branches.branchillemail %]"
891
            - "[% branch.branchillemail %]"
892
            - "[% branches.branchemail %]"
892
            - "[% branch.branchemail %]"
893
893
894
        - module: members
894
        - module: members
895
          code: ACCTDETAILS
895
          code: ACCTDETAILS
(-)a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql (+11 lines)
Lines 291-293 The following item, [% biblio.title %], has correctly been renewed and is now du Link Here
291
[% END %]", 'email');
291
[% END %]", 'email');
292
292
293
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
293
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
294
295
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
296
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
297
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
298
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
299
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
300
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
301
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
302
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
303
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
304
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql (+11 lines)
Lines 402-404 The following item, [% biblio.title %], has correctly been renewed and is now du Link Here
402
[% END %]", 'email');
402
[% END %]", 'email');
403
403
404
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
404
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
405
406
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
407
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
408
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
409
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
410
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
411
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
412
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
413
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
414
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
415
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql (+11 lines)
Lines 420-422 The following item, [% biblio.title %], has correctly been renewed and is now du Link Here
420
[% END %]", 'email');
420
[% END %]", 'email');
421
421
422
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
422
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
423
424
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
425
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
426
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
427
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
428
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
429
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
430
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
431
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
432
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
433
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
(-)a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql (+11 lines)
Lines 399-401 The following item, [% biblio.title %], has correctly been renewed and is now du Link Here
399
[% END %]", 'email');
399
[% END %]", 'email');
400
400
401
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
401
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
402
403
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
404
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
405
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
406
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
407
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
408
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
409
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
410
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
411
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
412
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
(-)a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql (+11 lines)
Lines 401-403 The following item, [% biblio.title %], has correctly been renewed and is now du Link Here
401
[% END %]", 'email');
401
[% END %]", 'email');
402
402
403
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
403
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
404
405
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
406
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
407
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
408
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
409
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
410
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
411
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
412
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
413
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
414
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
(-)a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql (+11 lines)
Lines 492-494 The following item, [% biblio.title %], has correctly been renewed and is now du Link Here
492
[% END %]", 'email');
492
[% END %]", 'email');
493
493
494
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
494
INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default');
495
496
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
497
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
498
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
499
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'email', 'default');
500
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'email', 'default');
501
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PICKUP_READY', '', 'ILL request ready for pickup', 0, "Interlibrary loan request ready for pickup", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis ready for pick up from [% branch.branchname %].\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
502
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_UNAVAIL', '', 'ILL request unavailable', 0, "Interlibrary loan request unavailable", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe Interlibrary loans request number [% illrequest.illrequest_id %] you placed for\n\n- [% ill_bib_title %] - [% ill_bib_author %]\n\nis unfortunately unavailable.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
503
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
504
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
505
INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc (-2 / +3 lines)
Lines 13-18 Link Here
13
        <!-- <th>RSS</th> -->
13
        <!-- <th>RSS</th> -->
14
    </tr>
14
    </tr>
15
    [% FOREACH messaging_preference IN messaging_preferences %]
15
    [% FOREACH messaging_preference IN messaging_preferences %]
16
    [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]
16
    <tr>
17
    <tr>
17
      <td>[% IF ( messaging_preference.Item_Due ) %]Item due
18
      <td>[% IF ( messaging_preference.Item_Due ) %]Item due
18
          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
19
          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
Lines 25-32 Link Here
25
            [% ELSE %]
26
            [% ELSE %]
26
                Item checkout
27
                Item checkout
27
            [% END %]
28
            [% END %]
28
          [% ELSIF ( Koha.Preference('ILLModule') && messaging_preference.Ill_ready ) %]Interlibrary loan ready
29
          [% ELSIF ( messaging_preference.Ill_ready ) %]Interlibrary loan ready
29
          [% ELSIF ( Koha.Preference('ILLModule') && messaging_preference.Ill_unavailable ) %]Interlibrary loan unavailable
30
          [% ELSIF ( messaging_preference.Ill_unavailable ) %]Interlibrary loan unavailable
30
          [% ELSE %]Unknown [% END %]</td>
31
          [% ELSE %]Unknown [% END %]</td>
31
      [% IF ( messaging_preference.takes_days ) %]
32
      [% IF ( messaging_preference.takes_days ) %]
32
      <td>
33
      <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt (-2 / +3 lines)
Lines 528-533 Link Here
528
                                [% SET default_messaging = category.default_messaging %]
528
                                [% SET default_messaging = category.default_messaging %]
529
                                [% IF default_messaging.size %]
529
                                [% IF default_messaging.size %]
530
                                    [% FOREACH prefs IN default_messaging %]
530
                                    [% FOREACH prefs IN default_messaging %]
531
                                        [% NEXT IF !Koha.Preference( 'ILLModule' ) && prefs.message_name.match('^Ill_') %]
531
                                        [% FOREACH transport IN prefs.transports %]
532
                                        [% FOREACH transport IN prefs.transports %]
532
                                            [% IF ( transport.transport ) %]
533
                                            [% IF ( transport.transport ) %]
533
                                                [% IF ( prefs.Item_Due ) %]Item due
534
                                                [% IF ( prefs.Item_Due ) %]Item due
Lines 536-543 Link Here
536
                                                [% ELSIF ( prefs.Hold_Filled ) %]Hold filled
537
                                                [% ELSIF ( prefs.Hold_Filled ) %]Hold filled
537
                                                [% ELSIF ( prefs.Item_Check_in ) %]Item check-in
538
                                                [% ELSIF ( prefs.Item_Check_in ) %]Item check-in
538
                                                [% ELSIF ( prefs.Item_Checkout ) %]Item checkout
539
                                                [% ELSIF ( prefs.Item_Checkout ) %]Item checkout
539
                                                [% ELSIF ( Koha.Preference('ILLModule') && prefs.Ill_ready ) %]Interlibrary loan ready
540
                                                [% ELSIF ( prefs.Ill_ready ) %]Interlibrary loan ready
540
                                                [% ELSIF ( Koha.Preference('ILLModule') && prefs.Ill_unavailable ) %]Interlibrary loan unavailable
541
                                                [% ELSIF ( prefs.Ill_unavailable ) %]Interlibrary loan unavailable
541
                                                [% ELSE %]Unknown
542
                                                [% ELSE %]Unknown
542
                                                [% END %]:
543
                                                [% END %]:
543
                                                <strong>[% transport.transport | html %]</strong><br />
544
                                                <strong>[% transport.transport | html %]</strong><br />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-1 / +2 lines)
Lines 102-107 Link Here
102
[%        CASE 'ADDCIRCMESSAGE' %]Add circulation message
102
[%        CASE 'ADDCIRCMESSAGE' %]Add circulation message
103
[%        CASE 'DELCIRCMESSAGE' %]Delete circulation message
103
[%        CASE 'DELCIRCMESSAGE' %]Delete circulation message
104
[%        CASE 'STATUS_CHANGE'  %]Change ILL request status
104
[%        CASE 'STATUS_CHANGE'  %]Change ILL request status
105
[%        CASE 'PATRON_NOTICE'  %]Send a notice to a patron
105
[%        CASE 'Run'    %]Run
106
[%        CASE 'Run'    %]Run
106
[%        CASE %][% action | html %]
107
[%        CASE %][% action | html %]
107
[%    END %]
108
[%    END %]
Lines 176-182 Link Here
176
                                        <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
177
                                        <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
177
                                    [% END %]
178
                                    [% END %]
178
179
179
                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' ] %]
180
                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' ] %]
180
                                        [% IF actions.grep(actx).size %]
181
                                        [% IF actions.grep(actx).size %]
181
                                            <label for="action[% actx | html %]" class="viewlog"><input type="checkbox" id="action[% actx | html %]" name="actions" value="[% actx | html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
182
                                            <label for="action[% actx | html %]" class="viewlog"><input type="checkbox" id="action[% actx | html %]" name="actions" value="[% actx | html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
182
                                        [% ELSE %]
183
                                        [% ELSE %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt (-6 / +6 lines)
Lines 78-86 Link Here
78
                                    </p>
78
                                    </p>
79
                                    [% USE link_url = url('/cgi-bin/koha/opac-illrequests.pl', whole.value.other) %]
79
                                    [% USE link_url = url('/cgi-bin/koha/opac-illrequests.pl', whole.value.other) %]
80
                                    <a href="[% link_url _ '&amp;stage=copyrightclearance' | $raw %]"
80
                                    <a href="[% link_url _ '&amp;stage=copyrightclearance' | $raw %]"
81
                                    class="btn btn-sm btn-default"><i class="fa fa-check" aria-hidden="true"></i> Yes</a>
81
                                    class="btn btn-sm btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Yes</a>
82
                                    <a href="/cgi-bin/koha/opac-illrequests.pl"
82
                                    <a href="/cgi-bin/koha/opac-illrequests.pl"
83
                                    class="btn btn-sm btn-default"><i class="fa fa-times" aria-hidden="true"></i> No</a>
83
                                    class="btn btn-sm btn-danger"><i class="fa fa-times" aria-hidden="true"></i> No</a>
84
                                </div>
84
                                </div>
85
                            [% ELSE %]
85
                            [% ELSE %]
86
                                [% INCLUDE messages %]
86
                                [% INCLUDE messages %]
Lines 109-115 Link Here
109
109
110
                            <div id="illrequests-create-button" class="dropdown btn-group">
110
                            <div id="illrequests-create-button" class="dropdown btn-group">
111
                                [% IF backends.size > 1 %]
111
                                [% IF backends.size > 1 %]
112
                                        <button class="btn btn-default dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
112
                                        <button class="btn btn-primary dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
113
                                            <i class="fa fa-plus" aria-hidden="true"></i> Create a new request <span class="caret"></span>
113
                                            <i class="fa fa-plus" aria-hidden="true"></i> Create a new request <span class="caret"></span>
114
                                        </button>
114
                                        </button>
115
                                        <ul id="backend-dropdown-options" class="dropdown-menu nojs" aria-labelledby="ill-backend-dropdown">
115
                                        <ul id="backend-dropdown-options" class="dropdown-menu nojs" aria-labelledby="ill-backend-dropdown">
Lines 118-124 Link Here
118
                                            [% END %]
118
                                            [% END %]
119
                                        </ul>
119
                                        </ul>
120
                                [% ELSE %]
120
                                [% ELSE %]
121
                                    <a id="ill-new" class="btn btn-default" href="/cgi-bin/koha/opac-illrequests.pl?method=create&amp;backend=[% backends.0 | html %]">
121
                                    <a id="ill-new" class="btn btn-primary" href="/cgi-bin/koha/opac-illrequests.pl?method=create&amp;backend=[% backends.0 | html %]">
122
                                        <i class="fa fa-plus" aria-hidden="true"></i> Create a new request
122
                                        <i class="fa fa-plus" aria-hidden="true"></i> Create a new request
123
                                    </a>
123
                                    </a>
124
                                [% END %]
124
                                [% END %]
Lines 158-164 Link Here
158
                                            <td><span title="[% request.placed | html %]">[% request.placed | $KohaDates %]</span></td>
158
                                            <td><span title="[% request.placed | html %]">[% request.placed | $KohaDates %]</span></td>
159
                                            <td><span title="[% request.updated | html %]">[% request.updated | $KohaDates %]</span></td>
159
                                            <td><span title="[% request.updated | html %]">[% request.updated | $KohaDates %]</span></td>
160
                                            <td>
160
                                            <td>
161
                                                <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&amp;illrequest_id=[% request.id | uri %]" class="btn btn-default btn-sm pull-right">View</a>
161
                                                <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&amp;illrequest_id=[% request.id | uri %]" class="btn btn-primary btn-sm pull-right">View</a>
162
                                            </td>
162
                                            </td>
163
                                        </tr>
163
                                        </tr>
164
                                    [% END %]
164
                                    [% END %]
Lines 233-239 Link Here
233
                                        [% IF request.status == "NEW" %]
233
                                        [% IF request.status == "NEW" %]
234
                                            <a class="cancel-illrequest btn btn-danger" href="/cgi-bin/koha/opac-illrequests.pl?method=cancreq&amp;illrequest_id=[% request.illrequest_id | html %]">Request cancellation</a>
234
                                            <a class="cancel-illrequest btn btn-danger" href="/cgi-bin/koha/opac-illrequests.pl?method=cancreq&amp;illrequest_id=[% request.illrequest_id | html %]">Request cancellation</a>
235
                                        [% END %]
235
                                        [% END %]
236
                                        <input type="submit" class="update-illrequest btn btn-default" value="Submit modifications" />
236
                                        <input type="submit" class="update-illrequest btn btn-primary" value="Submit modifications" />
237
                                    [% END %]
237
                                    [% END %]
238
                                    <span class="cancel"><a href="/cgi-bin/koha/opac-illrequests.pl">Cancel</a></span>
238
                                    <span class="cancel"><a href="/cgi-bin/koha/opac-illrequests.pl">Cancel</a></span>
239
                                </fieldset>
239
                                </fieldset>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-3 / +3 lines)
Lines 54-59 Link Here
54
                                    </thead>
54
                                    </thead>
55
                                    <tbody>
55
                                    <tbody>
56
                                    [% FOREACH messaging_preference IN messaging_preferences %]
56
                                    [% FOREACH messaging_preference IN messaging_preferences %]
57
                                        [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]
57
                                        <tr>
58
                                        <tr>
58
                                            <td>[% IF ( messaging_preference.Item_Due ) %]Item due
59
                                            <td>[% IF ( messaging_preference.Item_Due ) %]Item due
59
                                                [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
60
                                                [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
Lines 66-73 Link Here
66
                                                    [% ELSE %]
67
                                                    [% ELSE %]
67
                                                        Item checkout
68
                                                        Item checkout
68
                                                    [% END %]
69
                                                    [% END %]
69
                                                [% ELSIF ( Koha.Preference( 'ILLModule' ) && messaging_preference.Ill_ready ) %]Interlibrary loan ready
70
                                                [% ELSIF ( messaging_preference.Ill_ready ) %]Interlibrary loan ready
70
                                                [% ELSIF ( Koha.Preference( 'ILLModule' ) && messaging_preference.Ill_unavailable ) %]Interlibrary loan unavailable
71
                                                [% ELSIF ( messaging_preference.Ill_unavailable ) %]Interlibrary loan unavailable
71
                                                [% ELSE %]Unknown [% END %]</td>
72
                                                [% ELSE %]Unknown [% END %]</td>
72
                                            [% IF ( messaging_preference.takes_days ) %]
73
                                            [% IF ( messaging_preference.takes_days ) %]
73
                                                <td><select class="input-mini" name="[% messaging_preference.message_attribute_id | html %]-DAYS">
74
                                                <td><select class="input-mini" name="[% messaging_preference.message_attribute_id | html %]-DAYS">
74
- 

Return to bug 22818