Bug 30484: Add ILL update notice
[srvgit] / installer / data / mysql / en / mandatory / sample_notices.yml
index 50bb421..fed8713 100644 (file)
@@ -47,58 +47,71 @@ tables:
           code: ACCOUNT_CREDIT
           branchcode: ""
           name: "Account payment"
-          is_html: 0
+          is_html: 1
           title: "Account payment"
           message_transport_type: print
           lang: default
           content:
+            - "[% USE Price %]"
+            - "[% PROCESS 'accounts.inc' %]"
             - "<table>"
             - "[% IF ( LibraryName ) %]"
             - " <tr>"
-            - "    <th colspan=\"4\" class=\"centerednames\">"
+            - "    <th colspan=\"5\" class=\"centerednames\">"
             - "        <h3>[% LibraryName | html %]</h3>"
             - "    </th>"
             - " </tr>"
             - "[% END %]"
             - " <tr>"
-            - "    <th colspan=\"4\" class=\"centerednames\">"
+            - "    <th colspan=\"5\" class=\"centerednames\">"
             - "        <h2><u>Fee receipt</u></h2>"
             - "    </th>"
             - " </tr>"
             - " <tr>"
-            - "    <th colspan=\"4\" class=\"centerednames\">"
-            - "        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>"
+            - "    <th colspan=\"5\" class=\"centerednames\">"
+            - "        <h2>[% Branches.GetName( credit.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 colspan=\"5\">"
+            - "        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
+            - "        Card number: [% credit.patron.cardnumber | html %]<br />"
             - "    </th>"
             - " </tr>"
             - "  <tr>"
-            - "    <th>Date</th>"
+            - "    <th>Created</th>"
+            - "    <th>Updated</th>"
             - "    <th>Description of charges</th>"
             - "    <th>Note</th>"
             - "    <th>Amount</th>"
             - " </tr>"
             - ""
-            - "  [% FOREACH account IN accounts %]"
-            - "    <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>"
-            - "    </tr>"
+            - " <tr class=\"highlight\">"
+            - "    <td>[% credit.date | $KohaDates %]</td>"
+            - "    <td>[% credit.timestamp | $KohaDates with_hours = 1 %]</td>"
+            - "    <td>"
+            - "      [% PROCESS account_type_description account=credit %]"
+            - "      [%- IF credit.description %], [% credit.description | html %][% END %]"
+            - "    </td>"
+            - "    <td>[% credit.note | html %]</td>"
+            - "    <td class=\"credit\">[% credit.amount | $Price %]</td>"
+            - " </tr>"
+            - ""
+            - "[% IF ( tendered ) %]"
+            - "  <tr>"
+            - "    <td colspan=\"3\">Amount tendered: </td>"
+            - "    <td>[% tendered | $Price %]</td>"
+            - "  </tr>"
+            - "  <tr>"
+            - "    <td colspan=\"3\">Change given: </td>"
+            - "    <td>[% change | $Price %]</td>"
+            - "  </tr>"
+            - "[% END %]"
             - ""
-            - "  [% 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>"
+            - "    <td colspan=\"4\">Total outstanding dues as on date: </td>"
+            - "    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>"
             - "  </tr>"
             - "</tfoot>"
             - "</table>"
@@ -107,60 +120,62 @@ tables:
           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 %]"
+            - "[% PROCESS 'accounts.inc' %]"
             - "<table>"
             - "  [% IF ( LibraryName ) %]"
             - "    <tr>"
-            - "      <th colspan=\"5\" class=\"centerednames\">"
+            - "      <th colspan=\"6\" class=\"centerednames\">"
             - "        <h3>[% LibraryName | html %]</h3>"
             - "      </th>"
             - "    </tr>"
             - "  [% END %]"
             - ""
             - "  <tr>"
-            - "    <th colspan=\"5\" class=\"centerednames\">"
+            - "    <th colspan=\"6\" class=\"centerednames\">"
             - "      <h2><u>INVOICE</u></h2>"
             - "    </th>"
             - "  </tr>"
             - "  <tr>"
-            - "    <th colspan=\"5\" class=\"centerednames\">"
-            - "      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>"
+            - "    <th colspan=\"6\" class=\"centerednames\">"
+            - "      <h2>[% Branches.GetName( debit.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 colspan=\"6\" >"
+            - "      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />"
+            - "      Card number: [% debit.patron.cardnumber | html %]<br />"
             - "    </th>"
             - "  </tr>"
             - "  <tr>"
-            - "    <th>Date</th>"
+            - "    <th>Created</th>"
+            - "    <th>Updated</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 %]"
-            - "    <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>"
-            - "    </tr>"
-            - "  [% END %]"
+            - "  <tr class=\"highlight\">"
+            - "    <td>[% debit.date | $KohaDates%]</td>"
+            - "    <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>"
+            - "    <td>"
+            - "      [% PROCESS account_type_description account=debit %]"
+            - "      [%- IF debit.description %], [% debit.description | html %][% END %]"
+            - "    </td>"
+            - "    <td>[% debit.note | html %]</td>"
+            - "    <td class=\"debit\">[% debit.amount | $Price %]</td>"
+            - "    <td class=\"debit\">[% debit.amountoutstanding | $Price %]</td>"
+            - "  </tr>"
             - ""
             - "  <tfoot>"
             - "    <tr>"
-            - "      <td colspan=\"4\">Total outstanding dues as on date: </td>"
+            - "      <td colspan=\"5\">Total outstanding dues as on date: </td>"
             - "      [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>"
             - "    </tr>"
             - "  </tfoot>"
@@ -217,7 +232,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 +240,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 +267,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 +323,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 +350,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 +380,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
@@ -401,7 +452,13 @@ 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: HOLD_SLIP
@@ -503,9 +560,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>"
@@ -579,7 +636,13 @@ tables:
           message_transport_type: email
           lang: default
           content:
-            - "You have <<count>> items due soon"
+            - "Dear <<borrowers.firstname>> <<borrowers.surname>>,"
+            - ""
+            - "The following item(s) will be due soon:"
+            - ""
+            - "<<items.content>>"
+            - ""
+            - "Thank you."
 
         - module: circulation
           code: RENEWAL
@@ -611,7 +674,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 %]"
@@ -659,27 +722,305 @@ tables:
             - ""
             - "<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each) has not been received.</order>"
 
-        - module: members
-          code: ACCTDETAILS
+        - module: ill
+          code: ILL_PICKUP_READY
           branchcode: ""
-          name: "Account details template - DEFAULT"
+          name: "ILL request ready for pickup"
           is_html: 0
-          title: "Your new Koha account details."
+          title: "Interlibrary loan request ready for pickup"
           message_transport_type: email
           lang: default
           content:
-            - "Hello <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>."
+            - "Dear [% borrower.firstname %] [% borrower.surname %],"
             - ""
-            - "Your new Koha account details are:"
+            - "The Interlibrary loans request number [% illrequest.illrequest_id %] you placed for:"
             - ""
-            - "User:  <<borrowers.userid>>"
-            - "Password: <<borrowers.password>>"
+            - "- [% ill_bib_title %] - [% ill_bib_author %]"
             - ""
-            - "If you have any problems or questions regarding your account, please contact your Koha Administrator."
+            - "is ready for pick up from [% branch.branchname %]."
             - ""
-            - "Thank you,"
-            - "Koha Administrator"
-            - "kohaadmin@yoursite.org"
+            - "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_UNAVAIL
+          branchcode: ""
+          name: "ILL request unavailable"
+          is_html: 0
+          title: "Interlibrary loan request unavailable"
+          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 %]"
+            - ""
+            - "is unfortunately unavailable."
+            - ""
+            - "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_CANCEL
+          branchcode: ""
+          name: "ILL request cancelled"
+          is_html: 0
+          title: "Interlibrary loan request cancelled"
+          message_transport_type: email
+          lang: default
+          content:
+            - "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:"
+            - ""
+            - "[% ill_full_metadata %]"
+
+        - module: ill
+          code: ILL_REQUEST_MODIFIED
+          branchcode: ""
+          name: "ILL request modified"
+          is_html: 0
+          title: "Interlibrary loan request modified"
+          message_transport_type: email
+          lang: default
+          content:
+            - "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:"
+            - ""
+            - "[% ill_full_metadata %]"
+
+        - module: ill
+          code: ILL_PARTNER_REQ
+          branchcode: ""
+          name: "ILL request to partners"
+          is_html: 0
+          title: "Interlibrary loan request to partners"
+          message_transport_type: email
+          lang: default
+          content:
+            - "Dear Sir/Madam,"
+            - ""
+            - "We would like to request an interlibrary loan for a title matching the following description:"
+            - ""
+            - "[% ill_full_metadata %]"
+            - ""
+            - "Please let us know if you are able to supply this to us."
+            - ""
+            - "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 %]"
+            - "[% branch.branchaddress2 %]"
+            - "[% branch.branchaddress3 %]"
+            - "[% branch.branchcity %]"
+            - "[% branch.branchstate %]"
+            - "[% branch.branchzip %]"
+            - "[% branch.branchphone %]"
+            - "[% branch.branchillemail %]"
+            - "[% branch.branchemail %]"
+
+        - module: ill
+          code: ILL_PICKUP_READY
+          branchcode: ""
+          name: "ILL request ready for pickup"
+          is_html: 0
+          title: "Interlibrary loan request ready for pickup"
+          message_transport_type: sms
+          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 %]"
+            - ""
+            - "is ready for pick up from [% branch.branchname %]."
+            - ""
+            - "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_UNAVAIL
+          branchcode: ""
+          name: "ILL request unavailable"
+          is_html: 0
+          title: "Interlibrary loan request unavailable"
+          message_transport_type: sms
+          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 %]"
+            - ""
+            - "is unfortunately unavailable."
+            - ""
+            - "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_CANCEL
+          branchcode: ""
+          name: "ILL request cancelled"
+          is_html: 0
+          title: "Interlibrary loan request cancelled"
+          message_transport_type: sms
+          lang: default
+          content:
+            - "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:"
+            - ""
+            - "[% ill_full_metadata %]"
+
+        - module: ill
+          code: ILL_REQUEST_MODIFIED
+          branchcode: ""
+          name: "ILL request modified"
+          is_html: 0
+          title: "Interlibrary loan request modified"
+          message_transport_type: sms
+          lang: default
+          content:
+            - "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:"
+            - ""
+            - "[% ill_full_metadata %]"
+
+        - module: ill
+          code: ILL_PARTNER_REQ
+          branchcode: ""
+          name: "ILL request to partners"
+          is_html: 0
+          title: "Interlibrary loan request to partners"
+          message_transport_type: sms
+          lang: default
+          content:
+            - "Dear Sir/Madam,"
+            - ""
+            - "We would like to request an interlibrary loan for a title matching the following description:"
+            - ""
+            - "[% ill_full_metadata %]"
+            - ""
+            - "Please let us know if you are able to supply this to us."
+            - ""
+            - "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: sms
+          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 %]"
+            - "[% branch.branchaddress2 %]"
+            - "[% branch.branchaddress3 %]"
+            - "[% branch.branchcity %]"
+            - "[% branch.branchstate %]"
+            - "[% branch.branchzip %]"
+            - "[% branch.branchphone %]"
+            - "[% branch.branchillemail %]"
+            - "[% branch.branchemail %]"
 
         - module: members
           code: DISCHARGE
@@ -757,6 +1098,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"
@@ -796,6 +1158,40 @@ 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: orderacquisition
           code: ACQORDER
           branchcode: ""
@@ -824,11 +1220,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 ) %]"
@@ -840,24 +1239,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>"
@@ -871,17 +1270,94 @@ 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>"
+            - "    <td>[% collected | $Price %]</td>"
+            - "  </tr>"
+            - "  <tr>"
+            - "    <td>Change: </td>"
+            - "    <td>[% change | $Price %]</td>"
+            - "    </tr>"
+            - "</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 %]"
+            - " <tr>"
+            - "    <th colspan=\"2\" class=\"centerednames\">"
+            - "        <h2>[% Branches.GetName( credit.branchcode ) | html %]</h2>"
+            - "    </th>"
+            - " </tr>"
+            - "<tr>"
+            - "    <th colspan=\"2\" class=\"centerednames\">"
+            - "        <h3>[% credit.date | $KohaDates %]</h3>"
+            - "</tr>"
+            - "<tr>"
+            - "  <td>Transaction ID: </td>"
+            - "  <td>[% credit.accountlines_id %]</td>"
+            - "</tr>"
+            - "<tr>"
+            - "  <td>Operator ID: </td>"
+            - "  <td>[% credit.manager_id %]</td>"
+            - "</tr>"
+            - "<tr>"
+            - "  <td>Payment type: </td>"
+            - "  <td>[% credit.payment_type %]</td>"
+            - "</tr>"
+            - " <tr></tr>"
+            - " <tr>"
+            - "    <th colspan=\"2\" class=\"centerednames\">"
+            - "        <h2><u>Fee receipt</u></h2>"
+            - "    </th>"
+            - " </tr>"
+            - " <tr></tr>"
+            - " <tr>"
+            - "    <th>Description of charges</th>"
+            - "    <th>Amount</th>"
+            - "  </tr>"
+            - ""
+            - "  [% FOREACH debit IN credit.debits %]"
+            - "    <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>[% credit.amount * -1| $Price %]</td>"
             - "  </tr>"
             - "  <tr>"
             - "    <td>Tendered: </td>"
@@ -989,6 +1465,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: ""
@@ -1057,7 +1577,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>"
@@ -1155,7 +1675,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 %]."
             - ""
@@ -1193,7 +1713,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' %]"
@@ -1204,20 +1724,169 @@ tables:
             - "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."
+            - "[% 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: reserves
-          code: HOLD_CANCELLATION
+        - module: circulation
+          code: CHECKINSLIP
           branchcode: ""
-          name: "Notification of hold cancellation"
+          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: "Your hold was canceled."
+          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.branchcode>>. Please pick up your item by <<recalls.expirationdate>>."
+            - ""
+            - "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.waitingdate>>"
+            - "Notes: <<recalls.recallnotes>>"
+
+        - 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:
-              - "[%- USE AuthorisedValues -%]"
-              - "Dear [% borrower.firstname %] [% borrower.surname %],"
-              - "Your hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( 'HOLD_CANCELLATION', hold.cancellation_reason ) %]"
+            - "<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>"