Bug 3150: Move emails for sending cart and list contents to notices
[srvgit] / installer / data / mysql / en / mandatory / sample_notices.yml
index 533a90f..765875f 100644 (file)
@@ -43,125 +43,291 @@ tables:
             - ""
             - "Your library."
 
+        - module: catalogue
+          code: TICKET_ACKNOWLEDGE
+          branchcode: ""
+          name: "Concern acknowledgement"
+          is_html: 1
+          title: "Catalog concern acknowledgment"
+          message_transport_type: email
+          lang: default
+          content:
+            - "[%- PROCESS 'html_helpers.inc' -%]"
+            - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br>"
+            - "<br>"
+            - "Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br>"
+            - "<br>"
+            - "You reported: <br>"
+            - "[%- ticket.body -%]<br>"
+            - "<br>"
+            - "Thankyou"
+
+        - module: catalogue
+          code: TICKET_RESOLVE
+          branchcode: ""
+          name: "Concern resolved"
+          is_html: 1
+          title: "Catalog concern resolved"
+          message_transport_type: email
+          lang: default
+          content:
+            - "[%- PROCESS 'html_helpers.inc' -%]"
+            - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br>"
+            - "<br>"
+            - "The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%] as resolved.<br>"
+            - "<br>"
+            - "The following comment was left: <br>"
+            - "[%- ticket_update.message -%]<br>"
+            - "<br>"
+            - "Thankyou"
+
+        - module: catalogue
+          code: TICKET_UPDATE
+          branchcode: ""
+          name: "Concern updated"
+          is_html: 1
+          title: "Catalog concern updated"
+          message_transport_type: email
+          lang: default
+          content:
+            - "[%- PROCESS 'html_helpers.inc' -%]"
+            - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br>"
+            - "<br>"
+            - "The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br>"
+            - "<br>"
+            - "The following comment was left: <br>"
+            - "[%- ticket_update.message -%]<br>"
+            - "<br>"
+            - "Thankyou"
+
+        - module: catalogue
+          code: TICKET_NOTIFY
+          branchcode: ""
+          name: "Concern notification"
+          is_html: 1
+          title: "Catalog concern reported"
+          message_transport_type: email
+          lang: default
+          content:
+            - "[%- PROCESS 'html_helpers.inc' -%]"
+            - "[%- USE Koha -%]"
+            - "Dear cataloger,<br>"
+            - "[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%] reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]<br>"
+            - "<br>"
+            - "[%- ticket.body -%]<br>"
+            - "<br>"
+            - "You can mark this concern as resolved from the concern management <a href='[%- Koha.Preference('IntranetBaseURL') -%]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>."
+
         - module: circulation
           code: ACCOUNT_CREDIT
           branchcode: ""
           name: "Account payment"
-          is_html: 0
+          is_html: 1
           title: "Account payment"
           message_transport_type: print
           lang: default
           content:
+            - "[%- USE AuthorisedValues -%]"
+            - "[%- USE KohaDates -%]"
+            - "[%- USE Price -%]"
+            - "[%- PROCESS \"accounts.inc\" -%]"
             - "<table>"
-            - "[% IF ( LibraryName ) %]"
-            - " <tr>"
-            - "    <th colspan=\"4\" class=\"centerednames\">"
+            - "    [% IF ( LibraryName ) %]"
+            - "    <tr>"
+            - "      <th colspan=\"2\" class=\"centerednames\">"
             - "        <h3>[% LibraryName | html %]</h3>"
-            - "    </th>"
-            - " </tr>"
-            - "[% END %]"
-            - " <tr>"
-            - "    <th colspan=\"4\" class=\"centerednames\">"
-            - "        <h2><u>Fee receipt</u></h2>"
-            - "    </th>"
-            - " </tr>"
-            - " <tr>"
-            - "    <th colspan=\"4\" class=\"centerednames\">"
-            - "        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>"
-            - "    </th>"
-            - " </tr>"
-            - " <tr>"
-            - "    <th colspan=\"4\">"
-            - "        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />"
-            - "        Card number: [% patron.cardnumber | html %]<br />"
-            - "    </th>"
-            - " </tr>"
-            - "  <tr>"
-            - "    <th>Date</th>"
-            - "    <th>Description of charges</th>"
-            - "    <th>Note</th>"
-            - "    <th>Amount</th>"
-            - " </tr>"
-            - ""
-            - "  [% FOREACH account IN accounts %]"
+            - "      </th>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    [% IF credit.library %]"
+            - "    <tr>"
+            - "      <th colspan=\"2\" class=\"centerednames\">"
+            - "        <h2>[% credit.library.branchname | html %]</h2>"
+            - "      </th>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    <tr>"
+            - "      <th colspan=\"2\" class=\"centerednames\">"
+            - "        <h3>[% today | $KohaDates %]</h3>"
+            - "      </th>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td>Transaction ID: </td>"
+            - "      <td>[% credit.accountlines_id %]</td>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td>Operator ID: </td>"
+            - "      <td>[% credit.manager_id %]</td>"
+            - "    </tr>"
+            - "    [% IF credit.payment_type %]"
+            - "    <tr>"
+            - "      <td>Payment type: </td>"
+            - "      <td>[% AuthorisedValues.GetByCode('PAYMENT_TYPE', credit.payment_type) %]</td>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    <tr>"
+            - "      <th colspan=\"2\" class=\"centerednames\">"
+            - "        <h2><u>[%- PROCESS credit_type_description credit_type = credit.credit_type -%] receipt</u></h2>"
+            - "      </th>"
+            - "    </tr>"
+            - "    [% IF ( credit.credit_type_code == 'PAYMENT' ) %]"
+            - "    <tr>"
+            - "      <th colspan=\"2\">"
+            - "        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
+            - "        Card number: [% credit.patron.cardnumber | html %]<br />"
+            - "      </th>"
+            - "    </tr>"
+            - "    [% ELSIF ( credit.credit_type_code == 'CREDIT' ) %]"
+            - "    <tr>"
+            - "      <th colspan=\"2\">"
+            - "        Credit added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
+            - "        Card number: [% credit.patron.cardnumber | html %]<br />"
+            - "      </th>"
+            - "    </tr>"
+            - "    [% ELSIF ( credit.credit_type_code == 'WRITEOFF' ) %]"
+            - "    <tr>"
+            - "      <th colspan=\"2\">"
+            - "        Writeoff added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
+            - "        Card number: [% credit.patron.cardnumber | html %]<br />"
+            - "      </th>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    [% IF credit.amountoutstanding + 0 != 0 %]"
+            - "    <tr>"
+            - "      <th>Description of credit</th>"
+            - "      <th>Amount</th>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td>[%- PROCESS credit_type_description credit_type = credit.credit_type -%]</td>"
+            - "      <td>[% credit.amount * -1 | $Price %]</td>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <th style=\"text-align:right;\">Total available:</th>"
+            - "      <td>[% credit.amountoutstanding * -1 | $Price %]</td>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    [% IF credit.amount != credit.amountoutstanding %]"
+            - "    <tr>"
+            - "      <th>Description of charges</th>"
+            - "      <th>Amount</th>"
+            - "    </tr>"
+            - "    [% FOREACH offset IN credit.credit_offsets %]"
+            - "    <tr>"
+            - "      <td>[% PROCESS account_type_description account=offset.debit %][% IF ( offset.debit.itemnumber ) %] - [% offset.debit.item.biblio.title %][% END %]</td>"
+            - "      <td>[% offset.amount * -1 | $Price %]</td>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    [% END %]"
+            - "  <tfoot>"
             - "    <tr class=\"highlight\">"
-            - "      <td>[% account.date | $KohaDates %]</td>"
-            - "      <td>"
-            - "        [% PROCESS account_type_description account=account %]"
-            - "        [%- IF account.description %], [% account.description | html %][% END %]"
-            - "      </td>"
-            - "      <td>[% account.note | html %]</td>"
-            - "      [% IF ( account.amountcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% account.amount | $Price %]</td>"
+            - "      <td>Total:</td>"
+            - "      <td>[% credit.amount * -1 | $Price %]</td>"
             - "    </tr>"
-            - ""
-            - "  [% END %]"
-            - "<tfoot>"
-            - "  <tr>"
-            - "    <td colspan=\"3\">Total outstanding dues as on date: </td>"
-            - "    [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>"
-            - "  </tr>"
-            - "</tfoot>"
+            - "    [% IF change.defined %]"
+            - "    <tr>"
+            - "      <td>Change given: </td>"
+            - "      <td>[% change | $Price %]</td>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    <tr>"
+            - "      <td colspan=\"2\"></td>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td>Account balance as on date:</td>"
+            - "      <td>[% credit.patron.account.balance * -1 | $Price %]</td>"
+            - "    </tr>"
+            - "  </tfoot>"
             - "</table>"
 
         - module: circulation
           code: ACCOUNT_DEBIT
           branchcode: ""
           name: "Account fee"
-          is_html: 0
+          is_html: 1
           title: "Account fee"
           message_transport_type: print
           lang: default
           content:
+            - "[% USE Price %]"
+            - "[% USE KohaDates %]"
+            - "[% PROCESS \"accounts.inc\" %]"
             - "<table>"
-            - "  [% IF ( LibraryName ) %]"
+            - "    [% IF ( LibraryName ) %]"
             - "    <tr>"
-            - "      <th colspan=\"5\" class=\"centerednames\">"
+            - "      <th colspan=\"3\" class=\"centerednames\">"
             - "        <h3>[% LibraryName | html %]</h3>"
             - "      </th>"
             - "    </tr>"
-            - "  [% END %]"
-            - ""
-            - "  <tr>"
-            - "    <th colspan=\"5\" class=\"centerednames\">"
-            - "      <h2><u>INVOICE</u></h2>"
-            - "    </th>"
-            - "  </tr>"
-            - "  <tr>"
-            - "    <th colspan=\"5\" class=\"centerednames\">"
-            - "      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>"
-            - "    </th>"
-            - "  </tr>"
-            - "  <tr>"
-            - "    <th colspan=\"5\" >"
-            - "      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />"
-            - "      Card number: [% patron.cardnumber | html %]<br />"
-            - "    </th>"
-            - "  </tr>"
-            - "  <tr>"
-            - "    <th>Date</th>"
-            - "    <th>Description of charges</th>"
-            - "    <th>Note</th>"
-            - "    <th style=\"text-align:right;\">Amount</th>"
-            - "    <th style=\"text-align:right;\">Amount outstanding</th>"
-            - "  </tr>"
-            - ""
-            - "  [% FOREACH account IN accounts %]"
+            - "    [% END %]"
+            - "    [% IF debit.library %]"
+            - "    <tr>"
+            - "      <th colspan=\"3\" class=\"centerednames\">"
+            - "        <h2>[% debit.library.branchname | html %]</h2>"
+            - "      </th>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    <tr>"
+            - "      <td colspan=\"2\" style=\"text-align:right;\">Fee ID: </td>"
+            - "      <td>[% debit.accountlines_id %]</td>"
+            - "    </tr>"
+            - "    [% IF credit.manager_id %]"
+            - "    <tr>"
+            - "      <td colspan=\"2\" style=\"text-align:right;\">Operator ID: </td>"
+            - "      <td>[% credit.manager_id %]</td>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    <tr>"
+            - "      <th colspan=\"3\" class=\"centerednames\">"
+            - "        <h2><u>Invoice</u></h2>"
+            - "      </th>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <th colspan=\"3\" >"
+            - "        Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />"
+            - "        Card number: [% debit.patron.cardnumber | html %]<br />"
+            - "      </th>"
+            - "    </tr>"
+            - "    [% IF debit.amountoutstanding != 0 %]"
+            - "    <tr>"
+            - "      <th>Date</th>"
+            - "      <th>Description of charges</th>"
+            - "      <th>Amount</th>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td>[% debit.date | $KohaDates %]</td>"
+            - "      <td>[% PROCESS account_type_description account=debit %]</td>"
+            - "      <td>[% debit.amount | $Price %]</td>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td colspan=\"2\" style=\"text-align:right;\">Total owed:</td>"
+            - "      <td>[% debit.amount | $Price %]</td>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    [% IF debit.amount != debit.amountoutstanding %]"
+            - "    <tr>"
+            - "      <th>Date</th>"
+            - "      <th>Description of payments</th>"
+            - "      <th>Amount</th>"
+            - "    </tr>"
+            - "    [% FOREACH offset IN debit.debit_offsets %]"
+            - "    <tr>"
+            - "      <td>[% offset.credit.date | $KohaDates %]</td>"
+            - "      <td>[% PROCESS account_type_description account=offset.credit %]</td>"
+            - "      <td>[% offset.amount * -1 | $Price %]</td>"
+            - "    </tr>"
+            - "    [% END %]"
             - "    <tr class=\"highlight\">"
-            - "      <td>[% account.date | $KohaDates%]</td>"
-            - "      <td>"
-            - "        [% PROCESS account_type_description account=account %]"
-            - "        [%- IF account.description %], [% account.description | html %][% END %]"
-            - "      </td>"
-            - "      <td>[% account.note | html %]</td>"
-            - "      [% IF ( account.amountcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% account.amount | $Price %]</td>"
-            - "      [% IF ( account.amountoutstandingcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% account.amountoutstanding | $Price %]</td>"
+            - "      <td colspan=\"2\" style=\"text-align:right;\">Total paid:</td>"
+            - "      <td>[% debit.amount - debit.amountoutstanding | $Price %]</td>"
             - "    </tr>"
-            - "  [% END %]"
-            - ""
+            - "    [% END %]"
+            - "    </tr>"
+            - "      <td colspan=\"3\"></td>"
+            - "    <tr>"
             - "  <tfoot>"
             - "    <tr>"
-            - "      <td colspan=\"4\">Total outstanding dues as on date: </td>"
-            - "      [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>"
+            - "      <th colspan=\"2\" style=\"text-align:right;\">Total outstanding:</th>"
+            - "      <td>[% debit.amountoutstanding | $Price %]</td>"
             - "    </tr>"
             - "  </tfoot>"
             - "</table>"
@@ -217,7 +383,7 @@ tables:
             - ""
             - "Your request for an article from <<biblio.title>> (<<items.barcode>>) has been canceled for the following reason:"
             - ""
-            - "<<article_requests.notes>>"
+            - "<<reason>>"
             - ""
             - "Article requested:"
             - "Title: <<article_requests.title>>"
@@ -225,9 +391,11 @@ tables:
             - "Volume: <<article_requests.volume>>"
             - "Issue: <<article_requests.issue>>"
             - "Date: <<article_requests.date>>"
+            - "TOC: [% IF article_request.toc_request %]Yes[% ELSE %]No[% END %]"
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
             - "Your library"
 
@@ -250,18 +418,47 @@ tables:
             - "Volume: <<article_requests.volume>>"
             - "Issue: <<article_requests.issue>>"
             - "Date: <<article_requests.date>>"
+            - "TOC: [% IF article_request.toc_request %]Yes[% ELSE %]No[% END %]"
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
-            - "You may pick your article up at <<branches.branchname>>."
+            - "[% IF article_request.format == 'PHOTOCOPY' %]You may pick up your article at [% branch.branchname %].[% ELSIF article_request.format == 'SCAN' %]You can download the scanned materials via the following URL(s): [% article_request.urls %].[% END %]"
             - ""
             - "Thank you!"
 
         - module: circulation
           code: AR_PENDING
           branchcode: ""
-          name: "Article request - open"
+          name: "Article request - pending"
+          is_html: 0
+          title: "Pending article request"
+          message_transport_type: email
+          lang: default
+          content:
+            - "Dear <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>)"
+            - ""
+            - "Your request for an article from <<biblio.title>> (<<items.barcode>>) is now in pending state."
+            - ""
+            - "Article requested:"
+            - "Title: <<article_requests.title>>"
+            - "Author: <<article_requests.author>>"
+            - "Volume: <<article_requests.volume>>"
+            - "Issue: <<article_requests.issue>>"
+            - "Date: <<article_requests.date>>"
+            - "TOC: [% IF article_request.toc_request %]Yes[% ELSE %]No[% END %]"
+            - "Pages: <<article_requests.pages>>"
+            - "Chapters: <<article_requests.chapters>>"
+            - "Notes: <<article_requests.patron_notes>>"
+            - ""
+            - ""
+            - "Thank you!"
+
+        - module: circulation
+          code: AR_REQUESTED
+          branchcode: ""
+          name: "Article request - new"
           is_html: 0
           title: "Article request received"
           message_transport_type: email
@@ -277,10 +474,11 @@ tables:
             - "Volume: <<article_requests.volume>>"
             - "Issue: <<article_requests.issue>>"
             - "Date: <<article_requests.date>>"
+            - "TOC: [% IF article_request.toc_request %]Yes[% ELSE %]No[% END %]"
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
-            - ""
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
             - "Thank you!"
 
@@ -303,9 +501,11 @@ tables:
             - "Volume: <<article_requests.volume>>"
             - "Issue: <<article_requests.issue>>"
             - "Date: <<article_requests.date>>"
+            - "TOC: [% IF article_request.toc_request %]Yes[% ELSE %]No[% END %]"
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
             - "Thank you!"
 
@@ -331,9 +531,11 @@ tables:
             - "Volume: <<article_requests.volume>>"
             - "Issue: <<article_requests.issue>>"
             - "Date: <<article_requests.date>>"
+            - "TOC: [% IF article_request.toc_request %]Yes[% ELSE %]No[% END %]"
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
 
         - module: circulation
@@ -352,6 +554,21 @@ tables:
             - "Thank you."
 
         - module: circulation
+          code: CHECKIN
+          branchcode: ""
+          name: "Item check-in (digest)"
+          is_html: 0
+          title: "Check-ins"
+          message_transport_type: sms
+          lang: default
+          content:
+            - "The following items have been checked in:"
+            - "----"
+            - "[% biblio.title %]"
+            - "----"
+            - "Thank you."
+
+        - module: circulation
           code: CHECKOUT
           branchcode: ""
           name: "Item check-out (digest)"
@@ -367,6 +584,21 @@ tables:
             - "Thank you for visiting [% branch.branchname %]."
 
         - module: circulation
+          code: CHECKOUT
+          branchcode: ""
+          name: "Item check-out (digest)"
+          is_html: 0
+          title: "Checkouts"
+          message_transport_type: sms
+          lang: default
+          content:
+            - "The following items have been checked out:"
+            - "----"
+            - "[% biblio.title %]"
+            - "----"
+            - "Thank you for visiting [% branch.branchname %]."
+
+        - module: circulation
           code: CHECKOUT_NOTE
           branchcode: ""
           name: "Checkout note on item set by patron"
@@ -393,6 +625,21 @@ tables:
             - "<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)"
 
         - module: circulation
+          code: DUE
+          branchcode: ""
+          name: "Item due reminder"
+          is_html: 0
+          title: "Item due reminder"
+          message_transport_type: sms
+          lang: default
+          content:
+            - "Dear <<borrowers.firstname>> <<borrowers.surname>>,"
+            - ""
+            - "The following item is now due:"
+            - ""
+            - "<<biblio.title>>"
+
+        - module: circulation
           code: DUEDGST
           branchcode: ""
           name: "Item due reminder (digest)"
@@ -401,7 +648,28 @@ tables:
           message_transport_type: email
           lang: default
           content:
-            - "You have <<count>> items due"
+            - "Dear <<borrowers.firstname>> <<borrowers.surname>>,"
+            - ""
+            - "The following item(s) are now due:"
+            - ""
+            - "<<items.content>>"
+            - ""
+            - "Thank you."
+
+        - module: circulation
+          code: DUEDGST
+          branchcode: ""
+          name: "Item due reminder (digest)"
+          is_html: 0
+          title: "Item due reminder"
+          message_transport_type: sms
+          lang: default
+          content:
+            - "Dear <<borrowers.firstname>> <<borrowers.surname>>,"
+            - ""
+            - "You have <<count>> item(s) that are now due"
+            - ""
+            - "Thank you."
 
         - module: circulation
           code: HOLD_SLIP
@@ -503,9 +771,9 @@ tables:
             - "<h4 style=\"text-align: center; font-style:italic;\">News</h4>"
             - "<news>"
             - "<div class=\"newsitem\">"
-            - "<h5 style=\"margin-bottom: 1px; margin-top: 1px\"><b><<opac_news.title>></b></h5>"
-            - "<p style=\"margin-bottom: 1px; margin-top: 1px\"><<opac_news.content>></p>"
-            - "<p class=\"newsfooter\" style=\"font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px\">Posted on <<opac_news.published_on>></p>"
+            - "<h5 style=\"margin-bottom: 1px; margin-top: 1px\"><b><<additional_contents.title>></b></h5>"
+            - "<p style=\"margin-bottom: 1px; margin-top: 1px\"><<additional_contents.content>></p>"
+            - "<p class=\"newsfooter\" style=\"font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px\">Posted on <<additional_contents.published_on>></p>"
             - "<hr />"
             - "</div>"
             - "</news>"
@@ -571,6 +839,21 @@ tables:
             - "<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)"
 
         - module: circulation
+          code: PREDUE
+          branchcode: ""
+          name: "Advance notice of item due"
+          is_html: 0
+          title: "Advance notice of item due"
+          message_transport_type: sms
+          lang: default
+          content:
+            - "Dear <<borrowers.firstname>> <<borrowers.surname>>,"
+            - ""
+            - "The following item will be due soon:"
+            - ""
+            - "<<biblio.title>>"
+
+        - module: circulation
           code: PREDUEDGST
           branchcode: ""
           name: "Advance notice of item due (digest)"
@@ -588,12 +871,27 @@ tables:
             - "Thank you."
 
         - module: circulation
-          code: RENEWAL
+          code: PREDUEDGST
           branchcode: ""
-          name: "Item renewals"
+          name: "Advance notice of item due (digest)"
           is_html: 0
-          title: "Item renewals"
-          message_transport_type: email
+          title: "Advance notice of item due"
+          message_transport_type: sms
+          lang: default
+          content:
+            - "Dear <<borrowers.firstname>> <<borrowers.surname>>,"
+            - ""
+            - "You have <<count>> item(s) that will be due soon."
+            - ""
+            - "Thank you."
+
+        - module: circulation
+          code: RENEWAL
+          branchcode: ""
+          name: "Item renewals"
+          is_html: 0
+          title: "Item renewals"
+          message_transport_type: email
           lang: default
           content:
             - "The following items have been renewed:"
@@ -617,7 +915,7 @@ tables:
             - "[% ELSE %]No items to be processed for this branch"
             - "[% END %][% FOREACH item IN branch.items %][% IF item.reason != 'in-demand' %]Title: [% item.title %]"
             - "Author: [% item.author %]"
-            - "Callnumber: [% item.callnumber %]"
+            - "Call number: [% item.callnumber %]"
             - "Location: [% item.location %]"
             - "Barcode: [% item.barcode %]"
             - "On loan?: [% item.onloan %]"
@@ -682,7 +980,7 @@ tables:
             - ""
             - "is ready for pick up from [% branch.branchname %]."
             - ""
-            - "Kind Regards"
+            - "Kind regards"
             - ""
             - "[% branch.branchname %]"
             - "[% branch.branchaddress1 %]"
@@ -712,7 +1010,7 @@ tables:
             - ""
             - "is unfortunately unavailable."
             - ""
-            - "Kind Regards"
+            - "Kind regards"
             - ""
             - "[% branch.branchname %]"
             - "[% branch.branchaddress1 %]"
@@ -768,7 +1066,41 @@ tables:
             - ""
             - "Please let us know if you are able to supply this to us."
             - ""
-            - "Kind Regards"
+            - "Kind regards"
+            - ""
+            - "[% branch.branchname %]"
+            - "[% branch.branchaddress1 %]"
+            - "[% branch.branchaddress2 %]"
+            - "[% branch.branchaddress3 %]"
+            - "[% branch.branchcity %]"
+            - "[% branch.branchstate %]"
+            - "[% branch.branchzip %]"
+            - "[% branch.branchphone %]"
+            - "[% branch.branchillemail %]"
+            - "[% branch.branchemail %]"
+
+        - module: ill
+          code: ILL_REQUEST_UPDATE
+          branchcode: ""
+          name: "ILL request update"
+          is_html: 0
+          title: "Interlibrary loan request update"
+          message_transport_type: email
+          lang: default
+          content:
+            - "Dear [% borrower.firstname %] [% borrower.surname %],"
+            - ""
+            - "The Interlibrary loans request number [% illrequest.illrequest_id %] you placed for"
+            - ""
+            - "- [% ill_bib_title %] - [% ill_bib_author %]"
+            - ""
+            - "has been updated."
+            - ""
+            - "Details of the update are below:"
+            - ""
+            - "[% additional_text %]"
+            - ""
+            - "Kind regards"
             - ""
             - "[% branch.branchname %]"
             - "[% branch.branchaddress1 %]"
@@ -798,7 +1130,7 @@ tables:
             - ""
             - "is ready for pick up from [% branch.branchname %]."
             - ""
-            - "Kind Regards"
+            - "Kind regards"
             - ""
             - "[% branch.branchname %]"
             - "[% branch.branchaddress1 %]"
@@ -828,7 +1160,7 @@ tables:
             - ""
             - "is unfortunately unavailable."
             - ""
-            - "Kind Regards"
+            - "Kind regards"
             - ""
             - "[% branch.branchname %]"
             - "[% branch.branchaddress1 %]"
@@ -884,7 +1216,7 @@ tables:
             - ""
             - "Please let us know if you are able to supply this to us."
             - ""
-            - "Kind Regards"
+            - "Kind regards"
             - ""
             - "[% branch.branchname %]"
             - "[% branch.branchaddress1 %]"
@@ -897,27 +1229,39 @@ tables:
             - "[% branch.branchillemail %]"
             - "[% branch.branchemail %]"
 
-        - module: members
-          code: ACCTDETAILS
+        - module: ill
+          code: ILL_REQUEST_UPDATE
           branchcode: ""
-          name: "Account details template - DEFAULT"
+          name: "ILL request update"
           is_html: 0
-          title: "Your new Koha account details."
-          message_transport_type: email
+          title: "Interlibrary loan request update"
+          message_transport_type: sms
           lang: default
           content:
-            - "Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>."
+            - "Dear [% borrower.firstname %] [% borrower.surname %],"
+            - ""
+            - "The Interlibrary loans request number [% illrequest.illrequest_id %] you placed for"
             - ""
-            - "Your new Koha account details are:"
+            - "- [% ill_bib_title %] - [% ill_bib_author %]"
             - ""
-            - "User:  <<borrowers.userid>>"
-            - "Password: <<borrowers.password>>"
+            - "has been updated."
             - ""
-            - "If you have any problems or questions regarding your account, please contact your Koha Administrator."
+            - "Details of the update are below:"
             - ""
-            - "Thank you,"
-            - "Koha Administrator"
-            - "kohaadmin@yoursite.org"
+            - "[% additional_text %]"
+            - ""
+            - "Kind regards"
+            - ""
+            - "[% branch.branchname %]"
+            - "[% branch.branchaddress1 %]"
+            - "[% branch.branchaddress2 %]"
+            - "[% branch.branchaddress3 %]"
+            - "[% branch.branchcity %]"
+            - "[% branch.branchstate %]"
+            - "[% branch.branchzip %]"
+            - "[% branch.branchphone %]"
+            - "[% branch.branchillemail %]"
+            - "[% branch.branchemail %]"
 
         - module: members
           code: DISCHARGE
@@ -974,6 +1318,21 @@ tables:
             - "If you did not initiate this request, you may safely ignore this one-time message. The request will expire shortly."
 
         - module: members
+          code: PASSWORD_CHANGE
+          branchcode: ""
+          name: "Notification of password change"
+          is_html: 1
+          title: "Library account password change notification for [% patron.firstname %] [% patron.surname %]"
+          message_transport_type: email
+          lang: default
+          content:
+            - "Dear [% patron.firstname %] [% patron.surname %],"
+            - ""
+            - "We want to notify you that your password has been changed. If you did not change it yourself (or requested that change), please contact library staff."
+            - ""
+            - "Your library."
+
+        - module: members
           code: PASSWORD_RESET
           branchcode: ""
           name: "Online password reset"
@@ -995,6 +1354,27 @@ tables:
             - ""
 
         - module: members
+          code: STAFF_PASSWORD_RESET
+          branchcode: ""
+          name: "Online password reset"
+          is_html: 1
+          title: "Koha password reset"
+          message_transport_type: email
+          lang: default
+          content:
+            - "<html>"
+            - "<p>A librarian has reset the password for the account <strong><<user>></strong>."
+            - "</p>"
+            - "<p>"
+            - "Please create your new password using the following link:"
+            - "<br/><a href=\"<<passwordreseturl>>\"><<passwordreseturl>></a>"
+            - "</p>"
+            - "<p>This link will be valid for 5 days from this email's reception, then you must reapply if you do not change your password.</p>"
+            - "<p>Thank you.</p>"
+            - "</html>"
+            - ""
+
+        - module: members
           code: SHARE_ACCEPT
           branchcode: ""
           name: "Notification about an accepted share"
@@ -1034,6 +1414,146 @@ tables:
             - ""
             - "Your library."
 
+        - module: members
+          code: WELCOME
+          branchcode: ""
+          name: "Welcome notice "
+          is_html: 1
+          title: "[% USE Koha %][% IF Koha.Preference('LibraryName') %]Welcome to [% Koha.Preference('LibraryName') %][% ELSE %]Welcome to the library[% END %]"
+          message_transport_type: email
+          lang: default
+          content:
+            - "[% USE Koha %]"
+            - "Hello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %]."
+            - ""
+            - "Thank you for joining [% IF Koha.Preference('LibraryName') %][% Koha.Preference('LibraryName') %][% ELSE %]the library[% END %]"
+            - ""
+            - "You can search for all our materials in our <a href='[% Koha.Preference('OPACBaseURL') %]'>catalog</a>."
+            - ""
+            - "Your library card number is [% borrower.cardnumber %]"
+            - ""
+            - "If you have any problems or questions regarding your account, please contact the library."
+
+        - module: members
+          code: 2FA_OTP_TOKEN
+          branchcode: ""
+          name: "two-authentication step token"
+          is_html: 1
+          title: "Two-authentication token"
+          message_transport_type: email
+          lang: default
+          content:
+            - "Dear [% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])"
+            - ""
+            - "Your authentication token is [% otp_token %]."
+            - "It is valid one minute."
+
+        - module: members
+          code: ACCOUNTS_SUMMARY
+          branchcode: ""
+          name: "Account balance slip"
+          is_html: 1
+          title: "Account summary for [% borrower.firstname %] [% borrower.surname %]"
+          message_transport_type: print
+          lang: default
+          content:
+            - "[% USE Branches %]"
+            - "[% USE Koha %]"
+            - "[% USE KohaDates %]"
+            - "[% USE Price %]"
+            - "[% PROCESS 'accounts.inc' %]"
+            - "<table>"
+            - "  [% IF ( Koha.Preference('LibraryName') ) %]"
+            - "    <tr>"
+            - "      <th colspan='4' class='centerednames'>"
+            - "        <h1>[% Koha.Preference('LibraryName') | html %]</h1>"
+            - "      </th>"
+            - "    </tr>"
+            - "  [% END %]"
+            - ""
+            - "  <tr>"
+            - "    <th colspan='4' class='centerednames'>"
+            - "      <h2>[% Branches.GetName( borrower.branchcode ) | html %]</h2>"
+            - "    </th>"
+            - "  </tr>"
+            - ""
+            - "  <tr>"
+            - "    <th colspan='4' class='centerednames'>"
+            - "      <h3>Outstanding accounts</h3>"
+            - "    </th>"
+            - "  </tr>"
+            - ""
+            - "  <tr>"
+            - "    <th colspan='4' class='centerednames'>"
+            - "      <h4>Debts</h4>"
+            - "    </th>"
+            - "  </tr>"
+            - "  [% IF borrower.account.outstanding_debits.total_outstanding %]"
+            - "  <tr>"
+            - "    <th>Date</th>"
+            - "    <th>Charge</th>"
+            - "    <th>Amount</th>"
+            - "    <th>Outstanding</th>"
+            - "  </tr>"
+            - "  [% FOREACH debit IN borrower.account.outstanding_debits %]"
+            - "  <tr>"
+            - "    <td>[% debit.date | $KohaDates %]</td>"
+            - "    <td>"
+            - "      [% PROCESS account_type_description account=debit %]"
+            - "      [%- IF debit.description %], [% debit.description | html %][% END %]"
+            - "    </td>"
+            - "    <td class='debit'>[% debit.amount | $Price %]</td>"
+            - "    <td class='debit'>[% debit.amountoutstanding | $Price %]</td>"
+            - "  </tr>"
+            - "  [% END %]"
+            - "  [% ELSE %]"
+            - "  <tr>"
+            - "    <td colspan='4'>There are no outstanding debts on your account</td>"
+            - "  </tr>"
+            - "  [% END %]"
+            - ""
+            - "  <tr>"
+            - "    <th colspan='4' class='centerednames'>"
+            - "      <h4>Credits</h4>"
+            - "    </th>"
+            - "  </tr>"
+            - "  [% IF borrower.account.outstanding_credits.total_outstanding %]"
+            - "  <tr>"
+            - "    <th>Date</th>"
+            - "    <th>Credit</th>"
+            - "    <th>Amount</th>"
+            - "    <th>Outstanding</th>"
+            - "  </tr>"
+            - "  [% FOREACH credit IN borrower.account.outstanding_credits %]"
+            - "  <tr>"
+            - "    <td>[% credit.date | $KohaDates%]</td>"
+            - "    <td>"
+            - "      [% PROCESS account_type_description account=credit %]"
+            - "      [%- IF credit.description %], [% credit.description | html %][% END %]"
+            - "    </td>"
+            - "    <td class='credit'>[% credit.amount *-1 | $Price %]</td>"
+            - "    <td class='credit'>[% credit.amountoutstanding *-1 | $Price %]</td>"
+            - "  </tr>"
+            - "  [% END %]"
+            - "  [% ELSE %]"
+            - "  <tr>"
+            - "    <td colspan='4'>There are no outstanding credits on your account</td>"
+            - "  </tr>"
+            - "  [% END %]"
+            - ""
+            - "  <tfoot>"
+            - "    <td colspan='3'>"
+            - "      [% IF borrower.account.balance < 0 %]"
+            - "        Total credit as of [% today | $KohaDates %]:"
+            - "      [% ELSE %]"
+            - "        Total outstanding dues as of [% today | $KohaDates %]:"
+            - "      [% END %]"
+            - "    </td>"
+            - "    [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% borrower.account.balance * -1 | $Price %]</td>"
+            - "    [% ELSE %]<td class='debit'>[% borrower.account.balance | $Price %]</td>[% END %]"
+            - "  </tfoot>"
+            - "</table>"
+
         - module: orderacquisition
           code: ACQORDER
           branchcode: ""
@@ -1062,11 +1582,14 @@ tables:
           code: RECEIPT
           branchcode: ""
           name: "Point of sale receipt"
-          is_html: 0
+          is_html: 1
           title: "Receipt"
           message_transport_type: print
           lang: default
           content:
+            - "[% USE KohaDates %]"
+            - "[% USE Branches %]"
+            - "[% USE Price %]"
             - "[% PROCESS \"accounts.inc\" %]"
             - "<table>"
             - "[% IF ( LibraryName ) %]"
@@ -1078,24 +1601,24 @@ tables:
             - "[% END %]"
             - " <tr>"
             - "    <th colspan=\"2\" class=\"centerednames\">"
-            - "        <h2>[% Branches.GetName( payment.branchcode ) | html %]</h2>"
+            - "        <h2>[% Branches.GetName( credit.branchcode ) | html %]</h2>"
             - "    </th>"
             - " </tr>"
             - "<tr>"
             - "    <th colspan=\"2\" class=\"centerednames\">"
-            - "        <h3>[% payment.date | $KohaDates %]</h3>"
+            - "        <h3>[% credit.date | $KohaDates %]</h3>"
             - "</tr>"
             - "<tr>"
             - "  <td>Transaction ID: </td>"
-            - "  <td>[% payment.accountlines_id %]</td>"
+            - "  <td>[% credit.accountlines_id %]</td>"
             - "</tr>"
             - "<tr>"
             - "  <td>Operator ID: </td>"
-            - "  <td>[% payment.manager_id %]</td>"
+            - "  <td>[% credit.manager_id %]</td>"
             - "</tr>"
             - "<tr>"
             - "  <td>Payment type: </td>"
-            - "  <td>[% payment.payment_type %]</td>"
+            - "  <td>[% credit.payment_type %]</td>"
             - "</tr>"
             - " <tr></tr>"
             - " <tr>"
@@ -1109,17 +1632,17 @@ tables:
             - "    <th>Amount</th>"
             - "  </tr>"
             - ""
-            - "  [% FOREACH offset IN offsets %]"
+            - "  [% FOREACH debit IN credit.debits %]"
             - "    <tr>"
-            - "        <td>[% PROCESS account_type_description account=offset.debit %]</td>"
-            - "        <td>[% offset.amount * -1 | $Price %]</td>"
+            - "        <td>[% PROCESS account_type_description account=debit %]</td>"
+            - "        <td>[% debit.amount * -1 | $Price %]</td>"
             - "    </tr>"
             - "  [% END %]"
             - ""
             - "<tfoot>"
             - "  <tr class=\"highlight\">"
             - "    <td>Total: </td>"
-            - "    <td>[% payment.amount * -1| $Price %]</td>"
+            - "    <td>[% credit.amount * -1| $Price %]</td>"
             - "  </tr>"
             - "  <tr>"
             - "    <td>Tendered: </td>"
@@ -1132,6 +1655,82 @@ tables:
             - "</tfoot>"
             - "</table>"
 
+        - module: pos
+          code: RECEIPT
+          branchcode: ""
+          name: "Point of sale receipt"
+          is_html: 1
+          title: "Receipt"
+          message_transport_type: email
+          lang: default
+          content:
+            - "[% USE KohaDates %]"
+            - "[% USE Branches %]"
+            - "[% USE Price %]"
+            - "[% PROCESS \"accounts.inc\" %]"
+            - "<table>"
+            - "    [% IF ( LibraryName ) %]"
+            - "    <tr>"
+            - "      <th colspan=\"2\" class=\"centerednames\">"
+            - "        <h3>[% LibraryName | html %]</h3>"
+            - "      </th>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    [% IF credit.library %]"
+            - "    <tr>"
+            - "      <th colspan=\"2\" class=\"centerednames\">"
+            - "        <h2>[% payment.library.branchname ) | html %]</h2>"
+            - "      </th>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "    <tr>"
+            - "      <th colspan=\"2\" class=\"centerednames\">"
+            - "        <h3>[% payment.date | $KohaDates %]</h3>"
+            - "      </th>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td>Transaction ID: </td>"
+            - "      <td>[% payment.accountlines_id %]</td>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td>Operator ID: </td>"
+            - "      <td>[% payment.manager_id %]</td>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td>Payment type: </td>"
+            - "      <td>[% payment.payment_type %]</td>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <th colspan=\"2\" class=\"centerednames\">"
+            - "        <h2><u>Payment receipt</u></h2>"
+            - "      </th>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <th>Description of charges</th>"
+            - "      <th>Amount</th>"
+            - "    </tr>"
+            - "    [% FOREACH offset IN payment.credit_offsets %]"
+            - "    <tr>"
+            - "        <td>[% PROCESS account_type_description account=debit %]</td>"
+            - "        <td>[% debit.amount * -1 | $Price %]</td>"
+            - "    </tr>"
+            - "    [% END %]"
+            - "  <tfoot>"
+            - "    <tr class=\"highlight\">"
+            - "      <td>Total:</td>"
+            - "      <td>[% payment.amount * -1 | $Price %]</td>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td>Tendered: </td>"
+            - "      <td>[% tendered | $Price %]</td>"
+            - "    </tr>"
+            - "    <tr>"
+            - "      <td>Change given:</td>"
+            - "      <td>[% change | $Price %]</td>"
+            - "    </tr>"
+            - "  </tfoot>"
+            - "</table>"
+
         - module: reserves
           code: CANCEL_HOLD_ON_LOST
           branchcode: ""
@@ -1177,6 +1776,19 @@ tables:
           branchcode: ""
           name: "Hold available for pickup"
           is_html: 0
+          title: "Hold available for pickup at <<branches.branchname>>"
+          message_transport_type: sms
+          lang: default
+          content:
+            - "Dear <<borrowers.firstname>> <<borrowers.surname>>,"
+            - ""
+            - "Your hold for <<biblio.title>> is available for pickup."
+
+        - module: reserves
+          code: HOLD
+          branchcode: ""
+          name: "Hold available for pickup"
+          is_html: 0
           title: "Hold available for pickup (print notice)"
           message_transport_type: print
           lang: default
@@ -1227,6 +1839,50 @@ tables:
           content:
             - "A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>)."
 
+        - module: reserves
+          code: HOLD_CHANGED
+          branchcode: ""
+          name: "Canceled hold available for different patron"
+          is_html: 0
+          title: "Canceled hold available for different patron"
+          message_transport_type: email
+          lang: default
+          content:
+            - "The patron picking up <<biblio.title>> (<<items.barcode>>) has changed to <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>)."
+            - "Please update the hold information for this item."
+            - "Title: <<biblio.title>>"
+            - "Author: <<biblio.author>>"
+            - "Item: <<items.itemcallnumber>>"
+            - "Pickup location: <<branches.branchname>>"
+
+        - module: reserves
+          code: HOLD_REMINDER
+          branchcode: ""
+          name: "Waiting hold reminder"
+          is_html: 0
+          title: "You have waiting holds."
+          message_transport_type: email
+          lang: default
+          content:
+            - "Dear [% borrower.firstname %] [% borrower.surname %],\n\nThe following holds are waiting at [% branch.branchname %]:\n\n[% FOREACH hold IN holds %]\n    [% hold.biblio.title %] : waiting since [% hold.waitingdate | $KohaDates %]\n[% END %]"
+
+        - module: reserves
+          code: NEW_CURBSIDE_PICKUP
+          branchcode: ""
+          name: "New curbside pickup"
+          is_html: 0
+          title: "You have scheduled a curbside pickup for [% branch.branchname %]"
+          message_transport_type: email
+          lang: default
+          content:
+            - "[%- USE KohaDates -%]"
+            - "[%- SET cp = curbside_pickup -%]"
+            - ""
+            - "You have a curbside pickup scheduled for [% cp.scheduled_pickup_datetime | $KohaDates with_hours => 1 %] at [% cp.library.branchname %]."
+            - "Any holds waiting for you at the pickup time will be included in this pickup. At this time, that list includes:\n[%- FOREACH h IN cp.patron.holds %]\n[%- IF h.branchcode == cp.branchcode && h.found == 'W' %]\n* [% h.biblio.title %], [% h.biblio.author %] ([% h.item.barcode %])\n[%- END %]\n[%- END %]"
+            - ""
+            - "Once you have arrived, please call your library or log into your account and click the \"Alert staff of your arrival\" button to let them know you are there."
+
         - module: serial
           code: SERIAL_ALERT
           branchcode: ""
@@ -1295,7 +1951,7 @@ tables:
           message_transport_type: email
           lang: default
           content:
-            - "<h3>Suggestion pendin    g approval</h3>"
+            - "<h3>Suggestion pending approval</h3>"
             - "    <p><h4>Suggested by</h4>"
             - "    <ul>"
             - "    <li><<borrowers.firstname>> <<borrowers.surname>></li>"
@@ -1393,7 +2049,7 @@ tables:
           message_transport_type: email
           lang: default
           content:
-            - "Dear [% borrower.firstname %] [% borrowers.surname %],"
+            - "Dear [% borrower.firstname %] [% borrower.surname %],"
             - ""
             - "A new suggestion has been assigned to you: [% suggestion.title %]."
             - ""
@@ -1431,7 +2087,7 @@ tables:
             - "[% IF checkout.auto_renew_error %]"
             - "The following item, [% biblio.title %], has not been renewed because:"
             - "[% IF checkout.auto_renew_error == 'too_many' %]"
-            - "You have reached the maximum number of checkouts possible."
+            - "You have reached the maximum number of renewals possible."
             - "[% ELSIF checkout.auto_renew_error == 'on_reserve' %]"
             - "This item is on hold for another patron."
             - "[% ELSIF checkout.auto_renew_error == 'restriction' %]"
@@ -1444,7 +2100,253 @@ tables:
             - "Your total unpaid fines are too high."
             - "[% ELSIF checkout.auto_renew_error == 'too_unseen' %]"
             - "This item must be renewed at the library."
+            - "[% ELSIF checkout.auto_renew_error == 'auto_account_expired' %]"
+            - "Your account has expired."
             - "[% END %]"
             - "[% ELSE %]"
             - "The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %]"
             - "[% END %]"
+
+        - module: circulation
+          code: CHECKINSLIP
+          branchcode: ""
+          name: "Checkin slip"
+          is_html: 1
+          title: "Checkin slip"
+          message_transport_type: print
+          lang: default
+          content:
+            - "<h3>[% branch.branchname %]</h3>"
+            - "Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %] <br />"
+            - "([% borrower.cardnumber %]) <br />"
+            - ""
+            - "[% today | $KohaDates %]<br />"
+            - ""
+            - "<h4>Checked in today</h4>"
+            - "[% FOREACH checkin IN old_checkouts %]"
+            - "[% SET item = checkin.item %]"
+            - "<p>"
+            - "[% item.biblio.title %] <br />"
+            - "Barcode: [% item.barcode %] <br />"
+            - "</p>"
+            - "[% END %]"
+
+        - module: circulation
+          code: OVERDUE_FINE_DESC
+          branchcode: ""
+          name: "Overdue item fine description"
+          is_html: 0
+          title: "Overdue item fine description"
+          message_transport_type: print
+          lang: default
+          content:
+            - "[% item.biblio.title %] [% checkout.date_due | $KohaDates %]"
+
+        - module: circulation
+          code: AUTO_RENEWALS_DGST
+          branchcode: ""
+          name: "Notification on auto renewals"
+          is_html: 0
+          title: "Auto renewals (Digest)"
+          message_transport_type: email
+          lang: default
+          content:
+            - "Dear [% borrower.firstname %] [% borrower.surname %],"
+            - "[% IF error %]"
+            - "There were [% error %] items that were not renewed."
+            - "[% END %]"
+            - "[% IF success %]"
+            - "There were [% success %] items that were renewed."
+            - "[% END %]"
+            - "[% FOREACH checkout IN checkouts %]"
+            - "[% checkout.item.biblio.title %] : [% checkout.item.barcode %]"
+            - "[% IF !checkout.auto_renew_error %]"
+            - "was renewed until [% checkout.date_due | $KohaDates as_due_date => 1%]"
+            - "[% ELSIF checkout.auto_renew_error == 'too_many' %]"
+            - "You have reached the maximum number of renewals possible."
+            - "[% ELSIF checkout.auto_renew_error == 'on_reserve' %]"
+            - "This item is on hold for another patron."
+            - "[% ELSIF checkout.auto_renew_error == 'restriction' %]"
+            - "You are currently restricted."
+            - "[% ELSIF checkout.auto_renew_error == 'overdue' %]"
+            - "You have overdue items."
+            - "[% ELSIF checkout.auto_renew_error == 'auto_too_late' %]"
+            - "It's too late to renew this item."
+            - "[% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %]"
+            - "Your total unpaid fines are too high."
+            - "[% ELSIF checkout.auto_renew_error == 'too_unseen' %]"
+            - "This item must be renewed at the library."
+            - "[% END %]"
+            - "[% END %]"
+
+        - module: circulation
+          code: RETURN_RECALLED_ITEM
+          branchcode: ""
+          name: "Notification to return a recalled item"
+          is_html: 0
+          title: "Notification to return a recalled item"
+          message_transport_type: email
+          lang: default
+          content:
+            - "Date: <<today>>"
+            - ""
+            - "<<borrowers.firstname>> <<borrowers.surname>>,"
+            - ""
+            - "A recall has been placed on the following item: <<biblio.title>> / <<biblio.author>> (<<items.barcode>>). The due date has been updated, and is now <<issues.date_due>>. Please return the item before the due date."
+            - ""
+            - "Thank you!"
+
+        - module: circulation
+          code: PICKUP_RECALLED_ITEM
+          branchcode: ""
+          name: "Recalled item awaiting pickup"
+          is_html: 0
+          title: "Recalled item awaiting pickup"
+          message_transport_type: email
+          lang: default
+          content:
+            - "Date: <<today>>"
+            - ""
+            - "<<borrowers.firstname>> <<borrowers.surname>>,"
+            - ""
+            - "A recall that you requested on the following item: <<biblio.title>> / <<biblio.author>> (<<items.barcode>>) is now ready for you to pick up at <<recalls.pickup_library_id>>. Please pick up your item by <<recalls.expiration_date>>."
+            - ""
+            - "Thank you!"
+
+        - module: circulation
+          code: RECALL_REQUESTER_DET
+          branchcode: ""
+          name: "Details of patron who recalled item"
+          is_html: 0
+          title: "Details of patron who recalled item"
+          message_transport_type: print
+          lang: default
+          content:
+            - "Date: <<today>>"
+            - ""
+            - "Recall for pickup at <<branches.branchname>>"
+            - "<<borrowers.surname>>, <<borrowers.firstname>> (<<borrowers.cardnumber>>)"
+            - "<<borrowers.phone>>"
+            - "<<borrowers.streetnumber>> <<borrowers.address>>, <<borrowers.address2>>, <<borrowers.city>> <<borrowers.zipcode>>"
+            - "<<borrowers.email>>"
+            - ""
+            - "ITEM RECALLED"
+            - "<<biblio.title>> by <<biblio.author>>"
+            - "Barcode: <<items.barcode>>"
+            - "Callnumber: <<items.itemcallnumber>>"
+            - "Waiting since: <<recalls.waiting_date>>"
+            - "Notes: <<recalls.notes>>"
+
+        - module: members
+          code: 2FA_DISABLE
+          branchcode: ""
+          name: "Confirmation of disabling two factor authentication"
+          is_html: 1
+          title: "Confirmation of disabling two factor authentication"
+          message_transport_type: email
+          lang: default
+          content:
+            - "<p>Dear [% borrower.firstname %] [% borrower.surname %],</p>"
+            - "<p>This is to confirm that someone disabled two factor authentication on your account.</p>"
+            - "<p>If you did not do this, someone else may be using your account. Please contact technical support.</p>"
+            - "<p>Your library</p>"
+
+        - module: members
+          code: 2FA_ENABLE
+          branchcode: ""
+          name: "Confirmation of enabling two factor authentication"
+          is_html: 1
+          title: "Confirmation of enabling two factor authentication"
+          message_transport_type: email
+          lang: default
+          content:
+            - "<p>Dear [% borrower.firstname %] [% borrower.surname %],</p>"
+            - "<p>This is to confirm that someone enabled two factor authentication on your account.</p>"
+            - "<p>If you did not do this, someone else may be using your account. Please contact technical support.</p>"
+            - "<p>Your library</p>"
+
+        - module: members
+          code: OPAC_REG
+          branchcode: ""
+          name: "New OPAC self-registration submitted"
+          is_html: 1
+          title: "New OPAC self-registration"
+          message_transport_type: email
+          lang: default
+          content:
+            - "<h3>New OPAC self-registration</h3>"
+            - "<p><h4>Self-registration made:</h4>"
+            - "<ul>"
+            - "<li> [% borrower.firstname %] [% borrower.surname %]</li>"
+            - "[% IF borrower.cardnumber %]<li>Cardnumber: [% borrower.cardnumber %]</li>[% END %]"
+            - "[% IF borrower.email %]<li>Email: [% borrower.email %]</li>[% END %]"
+            - "[% IF borrower.phone %]<li>Phone: [% borrower.phone %]</li>[% END %]"
+            - "[% IF borrower.mobile %]<li>Mobile: [% borrower.mobile %]</li>[% END %]"
+            - "[% IF borrower.fax %]<li>Fax: [% borrower.fax %]</li>[% END %]"
+            - "[% IF borrower.emailpro %]<li>Secondary email: [% borrower.emailpro %]</li>[% END %]"
+            - "[% IF borrower.phonepro %]<li>Secondary phone: [% borrower.phonepro %]</li>[% END %]"
+            - "[% IF borrower.branchcode %]<li>Home library: [% borrower.branchcode %]</li>[% END %]"
+            - "[% IF borrower.categorycode %]<li>Temporary patron category: [% borrower.categorycode %]</li>[% END %]"
+            - "</ul>"
+            - "</p>"
+
+        - module: catalogue
+          code: LIST
+          branchcode: ""
+          name: "Send list"
+          is_html: 1
+          title: "Your list: [% listname | html %]"
+          message_transport_type: email
+          lang: default
+          content:
+            - "Hi,"
+            - "[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %]."
+            - "Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite."
+            - "<hr/>[% comment | html %]<hr/>"
+            - "<ol>[% FOREACH biblio IN biblios %]<li>"
+            - "[% biblio.title | html %]"
+            - "[% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% biblio.part_number | html %] [% biblio.part_name | html %]"
+            - "[% IF ( biblio.author || biblio.get_marc_contributors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_contributors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_contributors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %]"
+            - "[% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %]"
+            - "[% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %]"
+            - "[% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %]"
+            - "[% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %]"
+            - "[% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %]"
+            - "[% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %]"
+            - "[% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %]"
+            - "[% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %]"
+            - "[% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %]"
+            - "[% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %]"
+            - "[% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% Branches.GetName( item.holdingbranch ) | html %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %][% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %][% item.barcode | html %]</li>[% END %]</ul>[% END %]"
+            - "<hr/></li>[% END %]</ol>"
+
+        - module: catalogue
+          code: CART
+          branchcode: ""
+          name: "Send cart"
+          is_html: 1
+          title: "Your cart"
+          message_transport_type: email
+          lang: default
+          content:
+            - "Hi,"
+            - "[% borrower.firstname | html %] [% borrower.surname | html %] sent you a cart from our online catalog."
+            - "[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %]."
+            - "Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite."
+            - "<hr/>[% comment | html %]<hr/>"
+            - "<ol>[% FOREACH biblio IN biblios %]<li>"
+            - "[% biblio.title | html %]"
+            - "[% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% biblio.part_number | html %] [% biblio.part_name | html %]"
+            - "[% IF ( biblio.author || biblio.get_marc_contributors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_contributors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_contributors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %]"
+            - "[% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %]"
+            - "[% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %]"
+            - "[% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %]"
+            - "[% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %]"
+            - "[% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %]"
+            - "[% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %]"
+            - "[% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %]"
+            - "[% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %]"
+            - "[% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %]"
+            - "[% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %]"
+            - "[% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% Branches.GetName( item.holdingbranch ) | html %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %][% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %][% item.barcode | html %]</li>[% END %]</ul>[% END %]"
+            - "<hr/></li>[% END %]</ol>"