diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
index 276324f1e0..3a10265310 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -2466,7 +2466,7 @@ tables:
- "
"
- "[%~ INCLUDE 'patron-title.inc' patron => borrower, no_title => 1, no_cardnumber => 1 ~%],
"
- "
"
- - "A recall has been placed on the following item:[%~ INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %][% IF biblio.author %]/ [% biblio.author %][% END %] ([% item.barcode %]). The due date has been updated, and is now [% item.onloan | $KohaDates %]. Please return the item before the due date.
"
+ - "A recall has been placed on the following item:[%~ INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %][% IF biblio.author %]/ [% biblio.author %][% END %] ([% item.barcode %]). The due date has been updated, and is now [% checkout.date_due | $KohaDates %]. Please return the item before the due date.
"
- "
"
- "Thank you!"
@@ -2479,7 +2479,7 @@ tables:
message_transport_type: email
lang: default
content:
- - "[%- USE Branches -%]
"
+ - "[%- USE Branches -%]"
- "Date: [% today | $KohaDates %]
"
- "
"
- "[%~ INCLUDE 'patron-title.inc' patron => borrower, no_title => 1, no_cardnumber => 1, no_html = 1 ~%],
"
@@ -2497,7 +2497,7 @@ tables:
message_transport_type: sms
lang: default
content:
- - "Your item has been recalled: [% INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %] ([% item.barcode %]). Please return it by [% item.onloan | $KohaDates %]."
+ - "Your item has been recalled: [% INCLUDE 'biblio-title.inc' biblio=biblio link=0 %] ([% item.barcode %]). Please return by [% checkout.date_due | $KohaDates %]."
- module: circulation
code: PICKUP_RECALLED_ITEM
@@ -2523,14 +2523,14 @@ tables:
- "
"
- "Recall for pickup at [% branch.branchname %]
"
- "[% INCLUDE 'patron-title.inc' patron => borrower, no_title => 1, no_html = 1 %]
"
- - "[% borrower.phone %]
"
+ - "[% IF borrower.phone %][% borrower.phone %]
[% END %]"
- "[% borrower.streetnumber %][% IF borrower.address %] [% borrower.address %],[% END %][% IF borrower.address2 %] [% borrower.address2 %],[% END %] [% borrower.city %] [% borrower.state %] [% borrower.zipcode %]
"
- - "[% borrower.email %]
"
+ - "[% IF borrower.email %][% borrower.email %]
[% END %]"
- "
"
- "ITEM RECALLED
"
- "[% INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %][% IF biblio.author %] by [% biblio.author %][% END %]
"
- "Barcode: [% item.barcode %]
"
- - "Callnumber: [% item.itemcallnumber %]
"
+ - "[% IF item.itemcallnumber %] Callnumber: [% item.itemcallnumber %]
[% END %]"
- "Waiting since: [% recall.waiting_date | $KohaDates %]
"
- "[% IF recall.notes %]Notes: [% recall.notes %]
[% END %]"