From 5aa07d44c946775737fc9eb55e2612cb8b896fda 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 Signed-off-by: Kyle M Hall Signed-off-by: Lucas Gass Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- .../mysql/en/mandatory/sample_notices.yml | 342 ++++++++++-------- 1 file changed, 185 insertions(+), 157 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index a98e6a1dd7..f4a9d9abcd 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -52,68 +52,77 @@ tables: message_transport_type: print lang: default content: - - "[% USE Price %]" - - "[% PROCESS 'accounts.inc' %]" + - "[% PROCESS \"accounts.inc\" %]" - "" - - "[% IF ( LibraryName ) %]" - - " " - - " " + - " " - - " " - - "[% END %]" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " + - " " + - " [% END %]" + - " [% IF credit.library %]" + - " " + - " " + - " " + - " [% END %]" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - "" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - "" - - "[% IF ( tendered ) %]" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - "[% END %]" - - "" - - "" - - " " - - " " - - " [% IF ( credit.patron.account.balance >= 0 ) %]" - - " " - - "" + - " " + - " " + - " " + - " " + - " " + - " " + - " [% FOREACH offset IN credit.credit_offsets %]" + - " " + - " " + - " " + - " " + - " [% END %]" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " - "
" + - " [% IF ( LibraryName ) %]" + - "
" - "

[% LibraryName | html %]

" - - "
" - - "

Fee receipt

" - - "
" - - "

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

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

[% 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 %]
" - - "
CreatedUpdatedDescription of chargesNoteAmount
[% credit.date | $KohaDates %][% credit.timestamp | $KohaDates with_hours = 1 %]" - - " [% PROCESS account_type_description account=credit %]" - - " [%- IF credit.description %], [% credit.description | html %][% END %]" - - " [% credit.note | html %][% credit.amount | $Price %]
Amount tendered: [% tendered | $Price %]
Change given: [% change | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
Description of chargesAmount
[% PROCESS account_type_description account=offset.debit %][% offset.amount * -1 | $Price %]
Total:[% credit.amount * -1 | $Price %]
Change given: [% change | $Price %]
Account balance as on date:[% credit.patron.account.balance * -1 | $Price %]
" - module: circulation @@ -126,57 +135,77 @@ tables: lang: default content: - "[% USE Price %]" - - "[% PROCESS 'accounts.inc' %]" + - "[% PROCESS \"accounts.inc\" %]" - "" - - " [% IF ( LibraryName ) %]" + - " [% IF ( LibraryName ) %]" - " " - - " " - " " - - " [% END %]" - - "" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - "" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - "" + - " [% END %]" + - " [% IF debit.library %]" + - " " + - " " + - " " + - " [% END %]" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " [% IF credit.manager_id %]" + - " " + - " " + - " " + - " " + - " [% END %]" + - " " + - " " + - " " + - " " + - " " + - " " + - " [% IF debit.amount != debit.amountoutstanding %]" + - " " + - " " + - " " + - " " + - " " + - " [% FOREACH offset IN debit.debit_offsets %]" + - " " + - " " + - " " + - " " + - " " + - " [% END %]" + - " " + - " " + - " " + - " " + - " [% END %]" + - " " + - " " + - " " - " " - " " - - " " - - " [% IF ( totalcredit ) %]" + - " " + - " " + - " " + - " " + - " " + - " " - " " - " " - "
" + - " " - "

[% LibraryName | html %]

" - "
" - - "

INVOICE

" - - "
" - - "

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

" - - "
" - - " Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
" - - " Card number: [% debit.patron.cardnumber | html %]
" - - "
CreatedUpdatedDescription of chargesNoteAmountAmount outstanding
[% debit.date | $KohaDates%][% debit.timestamp | $KohaDates with_hours = 1 %]" - - " [% PROCESS account_type_description account=debit %]" - - " [%- IF debit.description %], [% debit.description | html %][% END %]" - - " [% debit.note | html %][% debit.amount | $Price %][% debit.amountoutstanding | $Price %]
" + - "

[% 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 %]
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 %]
" @@ -1322,67 +1351,66 @@ tables: - "[% USE Price %]" - "[% PROCESS \"accounts.inc\" %]" - "" - - "[% IF ( LibraryName ) %]" - - " " - - " " + - " " - - " " - - "[% END %]" - - " " - - " " - - " " - - "" - - " " - - "" - - " " - - " " - - "" - - "" - - " " - - " " - - "" - - "" - - " " - - " " - - "" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - "" - - " [% FOREACH debit IN credit.debits %]" + - " " + - " " + - " [% END %]" + - " [% IF credit.library %]" + - " " + - " " + - " " + - " [% END %]" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " [% FOREACH offset IN payment.credit_offsets %]" - " " - " " - " " - " " - - " [% END %]" - - "" - - "" - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " - - " " + - " [% END %]" + - " " + - " " + - " " + - " " - " " - - "" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " - "
" + - " [% IF ( LibraryName ) %]" + - "
" - "

[% LibraryName | html %]

" - - "
" - - "

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

" - - "
" - - "

[% credit.date | $KohaDates %]

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

Fee receipt

" - - "
Description of chargesAmount
" + - "

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

" + - "
" + - "

[% payment.date | $KohaDates %]

" + - "
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=debit %][% debit.amount * -1 | $Price %]
Total: [% credit.amount * -1| $Price %]
Tendered: [% collected | $Price %]
Change: [% change | $Price %]
Total:[% payment.amount * -1 | $Price %]
Tendered: [% tendered | $Price %]
Change given:[% change | $Price %]
" - module: reserves -- 2.39.5