Created attachment 45337 [details] [review] Bug 15284 - Switch default ISSUESLIP notice to Template Toolkit Test Plan: 1) Apply this patch 2) Replace your ISSUESLIP with the following: [% USE KohaDates %] <h3>[% branch.branchname %]</h3> Checked out to [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %] <br /> ([% borrower.cardnumber %]) <br /> [% today | $KohaDates %]<br /> <h4>Checked Out</h4> [% FOREACH checkout IN borrower.checkouts %] [% IF ! checkout.is_overdue %] <p> [% checkout.item.biblio.title %] <br /> Barcode: [% checkout.item.barcode %]<br /> Date due: [% checkout.date_due | $KohaDates %]<br /> </p> [% END %] [% END %] <h4>Overdues</h4> [% FOREACH checkout IN borrower.checkouts %] [% IF checkout.is_overdue %] <p> [% checkout.item.biblio.title %] <br /> Barcode: [% checkout.item.barcode %]<br /> Date due: [% checkout.date_due | $KohaDates %]<br /> </p> [% END %] [% END %] <hr> <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.new>></p> <p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on <<opac_news.timestamp>></p> <hr /> </div> </news> 3) Print a slip for a patron, note the data is complete
Applying: Bug 15284 - Switch default ISSUESLIP notice to Template Toolkit fatal: sha1 information is lacking or useless (installer/data/mysql/de-DE/mandatory/sample_notices.sql). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 15284 - Switch default ISSUESLIP notice to Template Toolkit
Created attachment 70598 [details] [review] Bug 15284: Switch default ISSUESLIP notice to Template Toolkit Updated for english version.
I tried to apply the patch, but I got a sha1 error. fatal: sha1 information is lacking or useless (installer/data/mysql/de-DE/mandatory/sample_notices.sql). error: could not build fake ancestor
Please rebase on master: Patch failed at 0001 Bug 15283 - Switch default ISSUEQSLIP notice to Template Toolkit Thanks Mike
Created attachment 91659 [details] [review] Bug 15284 - Switch default ISSUESLIP notice to Template Toolkit Test Plan: 1) Apply this patch 2) Replace your ISSUESLIP with the following: [% USE KohaDates %] <h3>[% branch.branchname %]</h3> Checked out to [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %] <br /> ([% borrower.cardnumber %]) <br /> [% today | $KohaDates %]<br /> <h4>Checked Out</h4> [% FOREACH checkout IN borrower.checkouts %] [% IF ! checkout.is_overdue %] <p> [% checkout.item.biblio.title %] <br /> Barcode: [% checkout.item.barcode %]<br /> Date due: [% checkout.date_due | $KohaDates %]<br /> </p> [% END %] [% END %] <h4>Overdues</h4> [% FOREACH checkout IN borrower.checkouts %] [% IF checkout.is_overdue %] <p> [% checkout.item.biblio.title %] <br /> Barcode: [% checkout.item.barcode %]<br /> Date due: [% checkout.date_due | $KohaDates %]<br /> </p> [% END %] [% END %] <hr> <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.new>></p> <p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on <<opac_news.timestamp>></p> <hr /> </div> </news> 3) Print a slip for a patron, note the data is complete
Created attachment 91664 [details] [review] Bug 15284 - Switch default ISSUESLIP notice to Template Toolkit Test Plan: 1) Apply this patch 2) Replace your ISSUESLIP with the following: [% USE KohaDates %] <h3>[% branch.branchname %]</h3> Checked out to [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %] <br /> ([% borrower.cardnumber %]) <br /> [% today | $KohaDates %]<br /> <h4>Checked Out</h4> [% FOREACH checkout IN borrower.checkouts %] [% IF ! checkout.is_overdue %] <p> [% checkout.item.biblio.title %] <br /> Barcode: [% checkout.item.barcode %]<br /> Date due: [% checkout.date_due | $KohaDates %]<br /> </p> [% END %] [% END %] <h4>Overdues</h4> [% FOREACH checkout IN borrower.checkouts %] [% IF checkout.is_overdue %] <p> [% checkout.item.biblio.title %] <br /> Barcode: [% checkout.item.barcode %]<br /> Date due: [% checkout.date_due | $KohaDates %]<br /> </p> [% END %] [% END %] <hr> <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.new>></p> <p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on <<opac_news.timestamp>></p> <hr /> </div> </news> 3) Print a slip for a patron, note the data is complete Signed-off-by: Michal Denar <black23@gmail.com>
Currently blocked by depency needing sign-off.
I think some of those sample notices might've been updated in error or not properly updated?