Bugzilla – Attachment 120077 Details for
Bug 26734
Convert accounts (monetary) notices to use GetPreparedLetter
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26734: Add notices for translations
Bug-26734-Add-notices-for-translations.patch (text/plain), 50.50 KB, created by
Martin Renvoize (ashimema)
on 2021-04-23 11:51:42 UTC
(
hide
)
Description:
Bug 26734: Add notices for translations
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2021-04-23 11:51:42 UTC
Size:
50.50 KB
patch
obsolete
>From 7c181a39966bc8d05b9a7c7ea50c1abc75d7c9b6 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Fri, 23 Apr 2021 12:50:27 +0100 >Subject: [PATCH] Bug 26734: Add notices for translations > >This patch updates the translated sample_notices.sql files for each of >the remaining translations. >--- > .../fr-CA/obligatoire/sample_notices.sql | 111 ++++++++++-------- > .../fr-FR/1-Obligatoire/sample_notices.sql | 102 ++++++++-------- > .../data/mysql/it-IT/necessari/notices.sql | 101 +++++++++------- > .../nb-NO/1-Obligatorisk/sample_notices.sql | 101 +++++++++------- > .../mysql/pl-PL/mandatory/sample_notices.sql | 101 +++++++++------- > .../mysql/ru-RU/mandatory/sample_notices.sql | 101 +++++++++------- > .../mysql/uk-UA/mandatory/sample_notices.sql | 101 +++++++++------- > 7 files changed, 397 insertions(+), 321 deletions(-) > >diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql >index 84ca137c09..ceaf88f1fb 100644 >--- a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql >+++ b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql >@@ -110,108 +110,119 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_WRITEOFF', '', 'Amnistie', 0, 'Amnistie', '[%- USE Price -%]\r\nNous avons accordé une amnistie de [% credit.amount * -1 | $Price %] à votre compte.\r\n\r\nLes frais suivants ont été amnistiés :\r\n[%- FOREACH o IN offsets %]\r\nDescription: [% o.debit.description %]\r\nMontant payé : [% o.amount * -1 | $Price %]\r\nMontant en souffrance : [% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default'); > > INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '<table> >+('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > <tr> >- <th colspan="4" class="centerednames"> >- <h2><u>REÃU</u></h2> >+ <th colspan=\"4\" 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=\"4\" class=\"centerednames\"> >+ <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="4"> >- Reçu de [% patron.firstname | html %] [% patron.surname | html %] <br /> >- Numéro de carte : [% patron.cardnumber | html %]<br /> >+ <th colspan=\"4\"> >+ 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>Description des frais</th> >+ <th>Description of charges</th> > <th>Note</th> >- <th>Montant</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> >+ [% 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">Solde non-réglé : </td> >- [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> >+ <td colspan=\"3\">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>', 'print', 'default'); > > INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table> >+('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > > <tr> >- <th colspan="5" class="centerednames"> >- <h2><u>FACTURE</u></h2> >+ <th colspan=\"5\" class=\"centerednames\"> >+ <h2><u>INVOICE</u></h2> > </th> > </tr> > <tr> >- <th colspan="5" class="centerednames"> >- <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2> >+ <th colspan=\"5\" class=\"centerednames\"> >+ <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="5" > >- Facturé à : [% patron.firstname | html %] [% patron.surname | html %] <br /> >- Numéro de carte : [% patron.cardnumber | html %]<br /> >+ <th colspan=\"5\" > >+ 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>Description des frais</th> >+ <th>Description of charges</th> > <th>Note</th> >- <th style="text-align:right;">Montant</th> >- <th style="text-align:right;">Solde</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> >+ [% 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">Solde non-réglé : </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 ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td> > </tr> > </tfoot> > </table>', 'print', 'default'); >diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >index aa02c2d671..1af3d38a8f 100644 >--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >@@ -223,28 +223,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_WRITEOFF', '', 'Account writeoff', 0, 'Account writeoff', '[%- USE Price -%]\r\nAn account writeoff of [% credit.amount * -1 | $Price %] has been applied to your account.\r\n\r\nThis writeoff affected the following fees:\r\n[%- FOREACH o IN offsets %]\r\nDescription: [% o.debit.description %]\r\nAmount paid: [% o.amount * -1 | $Price %]\r\nAmount remaining: [% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default'); > > INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table> >+('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" 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=\"4\" 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=\"4\"> >+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br /> >+ Card number: [% credit.patron.cardnumber | html %]<br /> > </th> > </tr> > <tr> >@@ -254,81 +256,89 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > <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> >+ [% 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=\"3\">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>', 'print', 'default'); > > INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table> >+('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h2><u>INVOICE</u></h2> > </th> > </tr> > <tr> >- <th colspan="5" class="centerednames"> >- <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2> >+ <th colspan=\"5\" 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=\"5\" > >+ 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>Description of charges</th> > <th>Note</th> >- <th style="text-align:right;">Amount</th> >- <th style="text-align:right;">Amount outstanding</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> >+ [% 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> >- [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> >+ <td colspan=\"4\">Total outstanding dues as on date: </td> >+ [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td> > </tr> > </tfoot> > </table>', 'print', 'default'); >- > INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) VALUES > ('circulation', 'SR_SLIP', '', 'Stock rotation slip', 0, 'Stock rotation report', 'Stock rotation report for [% branch.name %]:\r\n\r\n[% IF branch.items.size %][% branch.items.size %] items to be processed for this branch.\r\n[% ELSE %]No items to be processed for this branch\r\n[% END %][% FOREACH item IN branch.items %][% IF item.reason != \'in-demand\' %]Title: [% item.title %]\r\nAuthor: [% item.author %]\r\nCallnumber: [% item.callnumber %]\r\nLocation: [% item.location %]\r\nBarcode: [% item.barcode %]\r\nOn loan?: [% item.onloan %]\r\nStatus: [% item.reason %]\r\nCurrent library: [% item.branch.branchname %] [% item.branch.branchcode %]\r\n\r\n[% END %][% END %]', 'email'); > INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql >index 7e89f6b762..a1e464361f 100644 >--- a/installer/data/mysql/it-IT/necessari/notices.sql >+++ b/installer/data/mysql/it-IT/necessari/notices.sql >@@ -225,28 +225,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_WRITEOFF', '', 'Account writeoff', 0, 'Account writeoff', '[%- USE Price -%]\r\nAn account writeoff of [% credit.amount * -1 | $Price %] has been applied to your account.\r\n\r\nThis writeoff affected the following fees:\r\n[%- FOREACH o IN offsets %]\r\nDescription: [% o.debit.description %]\r\nAmount paid: [% o.amount * -1 | $Price %]\r\nAmount remaining: [% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default'); > > INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table> >+('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" 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=\"4\" 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=\"4\"> >+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br /> >+ Card number: [% credit.patron.cardnumber | html %]<br /> > </th> > </tr> > <tr> >@@ -256,77 +258,86 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > <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> >+ [% 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=\"3\">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>', 'print', 'default'); > > INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table> >+('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h2><u>INVOICE</u></h2> > </th> > </tr> > <tr> >- <th colspan="5" class="centerednames"> >- <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2> >+ <th colspan=\"5\" 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=\"5\" > >+ 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>Description of charges</th> > <th>Note</th> >- <th style="text-align:right;">Amount</th> >- <th style="text-align:right;">Amount outstanding</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> >+ [% 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> >- [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> >+ <td colspan=\"4\">Total outstanding dues as on date: </td> >+ [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td> > </tr> > </tfoot> > </table>', 'print', 'default'); >diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql >index b257d7b141..cb82227bd9 100644 >--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql >+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql >@@ -241,28 +241,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_WRITEOFF', '', 'Account writeoff', 0, 'Account writeoff', '[%- USE Price -%]\r\nAn account writeoff of [% credit.amount * -1 | $Price %] has been applied to your account.\r\n\r\nThis writeoff affected the following fees:\r\n[%- FOREACH o IN offsets %]\r\nDescription: [% o.debit.description %]\r\nAmount paid: [% o.amount * -1 | $Price %]\r\nAmount remaining: [% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default'); > > INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table> >+('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" 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=\"4\" 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=\"4\"> >+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br /> >+ Card number: [% credit.patron.cardnumber | html %]<br /> > </th> > </tr> > <tr> >@@ -272,77 +274,86 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > <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> >+ [% 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=\"3\">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>', 'print', 'default'); > > INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table> >+('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h2><u>INVOICE</u></h2> > </th> > </tr> > <tr> >- <th colspan="5" class="centerednames"> >- <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2> >+ <th colspan=\"5\" 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=\"5\" > >+ 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>Description of charges</th> > <th>Note</th> >- <th style="text-align:right;">Amount</th> >- <th style="text-align:right;">Amount outstanding</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> >+ [% 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> >- [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> >+ <td colspan=\"4\">Total outstanding dues as on date: </td> >+ [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td> > </tr> > </tfoot> > </table>', 'print', 'default'); >diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql >index 0c6e1bfa4d..e9c83b6e57 100644 >--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql >+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql >@@ -220,28 +220,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_WRITEOFF', '', 'Account writeoff', 0, 'Account writeoff', '[%- USE Price -%]\r\nAn account writeoff of [% credit.amount * -1 | $Price %] has been applied to your account.\r\n\r\nThis writeoff affected the following fees:\r\n[%- FOREACH o IN offsets %]\r\nDescription: [% o.debit.description %]\r\nAmount paid: [% o.amount * -1 | $Price %]\r\nAmount remaining: [% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default'); > > INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table> >+('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" 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=\"4\" 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=\"4\"> >+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br /> >+ Card number: [% credit.patron.cardnumber | html %]<br /> > </th> > </tr> > <tr> >@@ -251,77 +253,86 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > <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> >+ [% 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=\"3\">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>', 'print', 'default'); > > INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table> >+('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h2><u>INVOICE</u></h2> > </th> > </tr> > <tr> >- <th colspan="5" class="centerednames"> >- <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2> >+ <th colspan=\"5\" 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=\"5\" > >+ 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>Description of charges</th> > <th>Note</th> >- <th style="text-align:right;">Amount</th> >- <th style="text-align:right;">Amount outstanding</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> >+ [% 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> >- [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> >+ <td colspan=\"4\">Total outstanding dues as on date: </td> >+ [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td> > </tr> > </tfoot> > </table>', 'print', 'default'); >diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql >index de1cc4972b..8711c40012 100644 >--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql >+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql >@@ -222,28 +222,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_WRITEOFF', '', 'Account writeoff', 0, 'Account writeoff', '[%- USE Price -%]\r\nAn account writeoff of [% credit.amount * -1 | $Price %] has been applied to your account.\r\n\r\nThis writeoff affected the following fees:\r\n[%- FOREACH o IN offsets %]\r\nDescription: [% o.debit.description %]\r\nAmount paid: [% o.amount * -1 | $Price %]\r\nAmount remaining: [% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default'); > > INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table> >+('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" 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=\"4\" 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=\"4\"> >+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br /> >+ Card number: [% credit.patron.cardnumber | html %]<br /> > </th> > </tr> > <tr> >@@ -253,77 +255,86 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > <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> >+ [% 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=\"3\">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>', 'print', 'default'); > > INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table> >+('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h2><u>INVOICE</u></h2> > </th> > </tr> > <tr> >- <th colspan="5" class="centerednames"> >- <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2> >+ <th colspan=\"5\" 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=\"5\" > >+ 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>Description of charges</th> > <th>Note</th> >- <th style="text-align:right;">Amount</th> >- <th style="text-align:right;">Amount outstanding</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> >+ [% 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> >- [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> >+ <td colspan=\"4\">Total outstanding dues as on date: </td> >+ [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td> > </tr> > </tfoot> > </table>', 'print', 'default'); >diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql >index 74e3521cb7..4306377ec0 100644 >--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql >+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql >@@ -316,28 +316,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_WRITEOFF', '', 'Account writeoff', 0, 'Account writeoff', '[%- USE Price -%]\r\nAn account writeoff of [% credit.amount * -1 | $Price %] has been applied to your account.\r\n\r\nThis writeoff affected the following fees:\r\n[%- FOREACH o IN offsets %]\r\nDescription: [% o.debit.description %]\r\nAmount paid: [% o.amount * -1 | $Price %]\r\nAmount remaining: [% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default'); > > INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table> >+('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan=\"4\" 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=\"4\" 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=\"4\"> >+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br /> >+ Card number: [% credit.patron.cardnumber | html %]<br /> > </th> > </tr> > <tr> >@@ -347,77 +349,86 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > <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> >+ [% 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=\"3\">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>', 'print', 'default'); > > INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >-('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table> >+('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] >+[% PROCESS \"accounts.inc\" %] >+<table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan=\"5\" class=\"centerednames\"> > <h2><u>INVOICE</u></h2> > </th> > </tr> > <tr> >- <th colspan="5" class="centerednames"> >- <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2> >+ <th colspan=\"5\" 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=\"5\" > >+ 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>Description of charges</th> > <th>Note</th> >- <th style="text-align:right;">Amount</th> >- <th style="text-align:right;">Amount outstanding</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> >+ [% 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> >- [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> >+ <td colspan=\"4\">Total outstanding dues as on date: </td> >+ [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td> > </tr> > </tfoot> > </table>', 'print', 'default'); >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26734
:
111976
|
111977
|
111978
|
112023
|
112024
|
112025
|
112026
|
116257
|
116259
|
116260
|
116261
|
116262
|
116263
|
116272
|
116275
|
116276
|
116277
|
116278
|
116279
|
116644
|
116645
|
116646
|
116647
|
116648
|
116655
|
116656
|
116657
|
116658
|
116659
|
116663
|
116664
|
116665
|
116666
|
116667
|
117261
|
117262
|
117263
|
117264
|
117265
|
118191
|
118192
|
118193
|
118194
|
118195
|
118196
|
118197
|
118200
|
118482
|
118483
|
118484
|
118485
|
118486
|
118487
|
118488
|
118489
|
119350
|
119351
|
119352
|
119353
|
119354
|
119355
|
119356
|
119357
|
119358
|
119642
| 120077 |
121446
|
121449