From 62e5219977d034a3845db4b4d0120770e70e5212 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 16 Jul 2020 12:01:30 +0100 Subject: [PATCH] Bug 24381: Update sample notices This patch update the sample notices for new installs --- .../mysql/en/mandatory/sample_notices.yml | 322 ++++++++++-------- 1 file changed, 182 insertions(+), 140 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index ca04caf232..6949b90732 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -52,55 +52,77 @@ tables: message_transport_type: print lang: default content: + - "[% PROCESS \"accounts.inc\" %]" - "" - - "[% IF ( LibraryName ) %]" - - " " - - " " + - " " - - " " - - "[% END %]" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - "" - - " [% FOREACH account IN accounts %]" + - " " + - " " + - " [% END %]" + - " [% IF credit.library %]" + - " " + - " " + - " " + - " [% END %]" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " [% FOREACH offset IN credit.credit_offsets %]" + - " " + - " " + - " " + - " " + - " [% END %]" + - " " - " " - - " " - - " " - - " " - - " [% IF ( account.amountcredit ) %]" + - " " + - " " - " " - - "" - - " [% END %]" - - "" - - " " - - " " - - " [% IF ( totalcredit ) %]" - - " " - - "" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " - "
" + - " [% IF ( LibraryName ) %]" + - "
" - "

[% LibraryName | html %]

" - - "
" - - "

Fee receipt

" - - "
" - - "

[% Branches.GetName( patron.branchcode ) | html %]

" - - "
" - - " Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
" - - " Card number: [% patron.cardnumber | html %]
" - - "
DateDescription of chargesNoteAmount
" + - "

[% credit.library.branchname | html %]

" + - "
" + - "

[% credit.date | $KohaDates %]

" + - "
Transaction ID: [% credit.accountlines_id %]
Operator ID: [% credit.manager_id %]
Payment type: [% credit.payment_type %]
" + - "

Payment receipt

" + - "
" + - " Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
" + - " Card number: [% credit.patron.cardnumber | html %]
" + - "
Description of chargesAmount
[% PROCESS account_type_description account=offset.debit %][% offset.amount * -1 | $Price %]
[% account.date | $KohaDates %]" - - " [% PROCESS account_type_description account=account %]" - - " [%- IF account.description %], [% account.description | html %][% END %]" - - " [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %]Total:[% credit.amount * -1 | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
Change given: [% change | $Price %]
Account balance as on date:[% credit.patron.account.balance * -1 | $Price %]
" - module: circulation @@ -112,56 +134,77 @@ tables: message_transport_type: print lang: default content: + - "[% PROCESS \"accounts.inc\" %]" - "" - - " [% IF ( LibraryName ) %]" + - " [% IF ( LibraryName ) %]" - " " - - " " - " " - - " [% END %]" - - "" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - "" - - " [% FOREACH account IN accounts %]" + - " [% END %]" + - " [% IF debit.library %]" + - " " + - " " + - " " + - " [% END %]" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " [% IF credit.manager_id %]" + - " " + - " " + - " " + - " " + - " [% END %]" + - " " + - " " + - " " + - " " + - " " + - " " + - " [% IF debit.amount != debit.amountoutstanding %]" + - " " + - " " + - " " + - " " + - " " + - " [% FOREACH offset IN debit.debit_offsets %]" + - " " + - " " + - " " + - " " + - " " + - " [% END %]" - " " - - " " - - " " - - " " - - " [% IF ( account.amountcredit ) %]" - - " [% IF ( account.amountoutstandingcredit ) %]" + - " " + - " " - " " - - " [% END %]" - - "" + - " [% END %]" + - " " + - " " + - " " - " " - " " - - " " - - " [% IF ( totalcredit ) %]" + - " " + - " " + - " " + - " " + - " " + - " " - " " - " " - "
" + - " " - "

[% LibraryName | html %]

" - "
" - - "

INVOICE

" - - "
" - - "

[% Branches.GetName( patron.branchcode ) | html %]

" - - "
" - - " Bill to: [% patron.firstname | html %] [% patron.surname | html %]
" - - " Card number: [% patron.cardnumber | html %]
" - - "
DateDescription of chargesNoteAmountAmount outstanding
" + - "

[% debit.library.branchname | html %]

" + - "
" + - "

[% debit.date | $KohaDates %]

" + - "
Fee ID: [% debit.accountlines_id %]
Operator ID: [% credit.manager_id %]
" + - "

Invoice

" + - "
" + - " Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
" + - " Card number: [% debit.patron.cardnumber | html %]
" + - "
DateDescription of paymentsAmount
[% offset.credit.date | $KohaDates %][% PROCESS account_type_description account=offset.credit %][% offset.amount * -1 | $Price %]
[% account.date | $KohaDates%]" - - " [% PROCESS account_type_description account=account %]" - - " [%- IF account.description %], [% account.description | html %][% END %]" - - " [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %][% ELSE %][% END %][% account.amountoutstanding | $Price %]Total paid:[% debit.amount - debit.amountoutstanding | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]Total owed:[% debit.amount | $Price %]
Total outstanding:[% debit.amountoutstanding | $Price %]
" @@ -831,67 +874,66 @@ tables: content: - "[% PROCESS \"accounts.inc\" %]" - "" - - "[% IF ( LibraryName ) %]" - - " " - - " " + - " " - - " " - - "[% END %]" - - " " - - " " - - " " - - "" - - " " + - " " + - " [% END %]" + - " [% IF credit.library %]" + - " " + - " " + - " " + - " [% END %]" + - " " + - " " - - "" - - " " - - " " - - "" - - "" - - " " - - " " - - "" - - "" - - " " - - " " - - "" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - "" - - " [% FOREACH offset IN offsets %]" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " [% FOREACH offset IN payment.credit_offsets %]" - " " - " " - " " - " " - - " [% END %]" - - "" - - "" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " + - " [% END %]" + - " " + - " " + - " " + - " " - " " - - "" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " - "
" + - " [% IF ( LibraryName ) %]" + - "
" - "

[% LibraryName | html %]

" - - "
" - - "

[% Branches.GetName( payment.branchcode ) | html %]

" - - "
" + - "
" + - "

[% payment.library.branchname ) | html %]

" + - "
" - "

[% payment.date | $KohaDates %]

" - - "
Transaction ID: [% payment.accountlines_id %]
Operator ID: [% payment.manager_id %]
Payment type: [% payment.payment_type %]
" - - "

Fee receipt

" - - "
Description of chargesAmount
Transaction ID: [% payment.accountlines_id %]
Operator ID: [% payment.manager_id %]
Payment type: [% payment.payment_type %]
" + - "

Payment receipt

" + - "
Description of chargesAmount
[% PROCESS account_type_description account=offset.debit %][% offset.amount * -1 | $Price %]
Total: [% payment.amount * -1| $Price %]
Tendered: [% collected | $Price %]
Change: [% change | $Price %]
Total:[% payment.amount * -1 | $Price %]
Tendered: [% tendered | $Price %]
Change given:[% change | $Price %]
" - module: reserves -- 2.20.1