From 7c181a39966bc8d05b9a7c7ea50c1abc75d7c9b6 Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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', ' +('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - - + - + - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - + + + + + + + +[% IF ( tendered ) %] + + + + + + + + +[% END %] - [% END %] - - [% IF ( totalcredit ) %] + + [% IF ( credit.patron.account.balance >= 0 ) %]
+

[% LibraryName | html %]
-

REÇU

+ 		+

Fee receipt
-

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

+ 		+

[% Branches.GetName( credit.patron.branchcode ) | html %]
- Reçu de [% patron.firstname | html %] [% patron.surname | html %]
- Numéro de carte : [% patron.cardnumber | html %]
+ 		+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
+ Card number: [% credit.patron.cardnumber | html %]
DateDescription des fraisDescription of charges NoteMontantAmount
[% account.date | $KohaDates %] - [% PROCESS account_type_description account=account %] - [%- IF account.description %], [% account.description | html %][% END %] - [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %]
[% credit.date | $KohaDates %] + [% 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 %]
Solde non-réglé : [% ELSE %][% END %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - - + - - + + - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - [% IF ( account.amountoutstandingcredit ) %] - - [% END %] + + + + + + + - - [% IF ( totalcredit ) %] + + [% IF ( debit.patron.account.balance <= 0 ) %]
+

[% LibraryName | html %]
-

FACTURE

+ 		+

INVOICE
-

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

+ 		+

[% Branches.GetName( debit.patron.branchcode ) | html %]
- Facturé à : [% patron.firstname | html %] [% patron.surname | html %]
- Numéro de carte : [% patron.cardnumber | html %]
+ 		+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
+ Card number: [% debit.patron.cardnumber | html %]
DateDescription des fraisDescription of charges NoteMontantSoldeAmountAmount outstanding
[% 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 %]
[% debit.date | $KohaDates%] + [% PROCESS account_type_description account=debit %] + [%- IF debit.description %], [% debit.description | html %][% END %] + [% debit.note | html %][% debit.amount | $Price %][% debit.amountoutstanding | $Price %]
Solde non-réglé : [% ELSE %][% END %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - @@ -254,81 +256,89 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - + + + + + + + +[% IF ( tendered ) %] + + + + + + + + +[% END %] - [% END %] - - [% IF ( totalcredit ) %] + + [% IF ( credit.patron.account.balance >= 0 ) %]
+

[% LibraryName | html %]
+

Fee receipt
-

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

+ 		+

[% Branches.GetName( credit.patron.branchcode ) | html %]
- Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
+ Card number: [% credit.patron.cardnumber | html %]
Amount
[% account.date | $KohaDates %] - [% PROCESS account_type_description account=account %] - [%- IF account.description %], [% account.description | html %][% END %] - [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %]
[% credit.date | $KohaDates %] + [% 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 %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - - - + + - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - [% IF ( account.amountoutstandingcredit ) %] - - [% END %] + + + + + + + - - [% IF ( totalcredit ) %] + + [% IF ( debit.patron.account.balance <= 0 ) %]
+

[% LibraryName | html %]
+

INVOICE
-

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

+ 		+

[% Branches.GetName( debit.patron.branchcode ) | html %]
- Bill to: [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
+ Card number: [% debit.patron.cardnumber | html %]
Date Description of charges NoteAmountAmount outstandingAmountAmount outstanding
[% 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 %]
[% debit.date | $KohaDates%] + [% PROCESS account_type_description account=debit %] + [%- IF debit.description %], [% debit.description | html %][% END %] + [% debit.note | html %][% debit.amount | $Price %][% debit.amountoutstanding | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - @@ -256,77 +258,86 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - + + + + + + + +[% IF ( tendered ) %] + + + + + + + + +[% END %] - [% END %] - - [% IF ( totalcredit ) %] + + [% IF ( credit.patron.account.balance >= 0 ) %]
+

[% LibraryName | html %]
+

Fee receipt
-

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

+ 		+

[% Branches.GetName( credit.patron.branchcode ) | html %]
- Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
+ Card number: [% credit.patron.cardnumber | html %]
Amount
[% account.date | $KohaDates %] - [% PROCESS account_type_description account=account %] - [%- IF account.description %], [% account.description | html %][% END %] - [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %]
[% credit.date | $KohaDates %] + [% 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 %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - - - + + - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - [% IF ( account.amountoutstandingcredit ) %] - - [% END %] + + + + + + + - - [% IF ( totalcredit ) %] + + [% IF ( debit.patron.account.balance <= 0 ) %]
+

[% LibraryName | html %]
+

INVOICE
-

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

+ 		+

[% Branches.GetName( debit.patron.branchcode ) | html %]
- Bill to: [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
+ Card number: [% debit.patron.cardnumber | html %]
Date Description of charges NoteAmountAmount outstandingAmountAmount outstanding
[% 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 %]
[% debit.date | $KohaDates%] + [% PROCESS account_type_description account=debit %] + [%- IF debit.description %], [% debit.description | html %][% END %] + [% debit.note | html %][% debit.amount | $Price %][% debit.amountoutstanding | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - @@ -272,77 +274,86 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - + + + + + + + +[% IF ( tendered ) %] + + + + + + + + +[% END %] - [% END %] - - [% IF ( totalcredit ) %] + + [% IF ( credit.patron.account.balance >= 0 ) %]
+

[% LibraryName | html %]
+

Fee receipt
-

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

+ 		+

[% Branches.GetName( credit.patron.branchcode ) | html %]
- Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
+ Card number: [% credit.patron.cardnumber | html %]
Amount
[% account.date | $KohaDates %] - [% PROCESS account_type_description account=account %] - [%- IF account.description %], [% account.description | html %][% END %] - [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %]
[% credit.date | $KohaDates %] + [% 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 %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - - - + + - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - [% IF ( account.amountoutstandingcredit ) %] - - [% END %] + + + + + + + - - [% IF ( totalcredit ) %] + + [% IF ( debit.patron.account.balance <= 0 ) %]
+

[% LibraryName | html %]
+

INVOICE
-

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

+ 		+

[% Branches.GetName( debit.patron.branchcode ) | html %]
- Bill to: [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
+ Card number: [% debit.patron.cardnumber | html %]
Date Description of charges NoteAmountAmount outstandingAmountAmount outstanding
[% 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 %]
[% debit.date | $KohaDates%] + [% PROCESS account_type_description account=debit %] + [%- IF debit.description %], [% debit.description | html %][% END %] + [% debit.note | html %][% debit.amount | $Price %][% debit.amountoutstanding | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - @@ -251,77 +253,86 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - + + + + + + + +[% IF ( tendered ) %] + + + + + + + + +[% END %] - [% END %] - - [% IF ( totalcredit ) %] + + [% IF ( credit.patron.account.balance >= 0 ) %]
+

[% LibraryName | html %]
+

Fee receipt
-

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

+ 		+

[% Branches.GetName( credit.patron.branchcode ) | html %]
- Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
+ Card number: [% credit.patron.cardnumber | html %]
Amount
[% account.date | $KohaDates %] - [% PROCESS account_type_description account=account %] - [%- IF account.description %], [% account.description | html %][% END %] - [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %]
[% credit.date | $KohaDates %] + [% 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 %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - - - + + - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - [% IF ( account.amountoutstandingcredit ) %] - - [% END %] + + + + + + + - - [% IF ( totalcredit ) %] + + [% IF ( debit.patron.account.balance <= 0 ) %]
+

[% LibraryName | html %]
+

INVOICE
-

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

+ 		+

[% Branches.GetName( debit.patron.branchcode ) | html %]
- Bill to: [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
+ Card number: [% debit.patron.cardnumber | html %]
Date Description of charges NoteAmountAmount outstandingAmountAmount outstanding
[% 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 %]
[% debit.date | $KohaDates%] + [% PROCESS account_type_description account=debit %] + [%- IF debit.description %], [% debit.description | html %][% END %] + [% debit.note | html %][% debit.amount | $Price %][% debit.amountoutstanding | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - @@ -253,77 +255,86 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - + + + + + + + +[% IF ( tendered ) %] + + + + + + + + +[% END %] - [% END %] - - [% IF ( totalcredit ) %] + + [% IF ( credit.patron.account.balance >= 0 ) %]
+

[% LibraryName | html %]
+

Fee receipt
-

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

+ 		+

[% Branches.GetName( credit.patron.branchcode ) | html %]
- Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
+ Card number: [% credit.patron.cardnumber | html %]
Amount
[% account.date | $KohaDates %] - [% PROCESS account_type_description account=account %] - [%- IF account.description %], [% account.description | html %][% END %] - [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %]
[% credit.date | $KohaDates %] + [% 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 %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - - - + + - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - [% IF ( account.amountoutstandingcredit ) %] - - [% END %] + + + + + + + - - [% IF ( totalcredit ) %] + + [% IF ( debit.patron.account.balance <= 0 ) %]
+

[% LibraryName | html %]
+

INVOICE
-

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

+ 		+

[% Branches.GetName( debit.patron.branchcode ) | html %]
- Bill to: [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
+ Card number: [% debit.patron.cardnumber | html %]
Date Description of charges NoteAmountAmount outstandingAmountAmount outstanding
[% 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 %]
[% debit.date | $KohaDates%] + [% PROCESS account_type_description account=debit %] + [%- IF debit.description %], [% debit.description | html %][% END %] + [% debit.note | html %][% debit.amount | $Price %][% debit.amountoutstanding | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - @@ -347,77 +349,86 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - + + + + + + + +[% IF ( tendered ) %] + + + + + + + + +[% END %] - [% END %] - - [% IF ( totalcredit ) %] + + [% IF ( credit.patron.account.balance >= 0 ) %]
+

[% LibraryName | html %]
+

Fee receipt
-

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

+ 		+

[% Branches.GetName( credit.patron.branchcode ) | html %]
- Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
+ Card number: [% credit.patron.cardnumber | html %]
Amount
[% account.date | $KohaDates %] - [% PROCESS account_type_description account=account %] - [%- IF account.description %], [% account.description | html %][% END %] - [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %]
[% credit.date | $KohaDates %] + [% 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 %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
', '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', ' +('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '[% USE Price %] +[% PROCESS \"accounts.inc\" %] +
[% IF ( LibraryName ) %] - [% END %] - - - - - + + - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amountcredit ) %] - [% IF ( account.amountoutstandingcredit ) %] - - [% END %] + + + + + + + - - [% IF ( totalcredit ) %] + + [% IF ( debit.patron.account.balance <= 0 ) %]
+

[% LibraryName | html %]
+

INVOICE
-

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

+ 		+

[% Branches.GetName( debit.patron.branchcode ) | html %]
- Bill to: [% patron.firstname | html %] [% patron.surname | html %]
- Card number: [% patron.cardnumber | html %]
+ 		+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
+ Card number: [% debit.patron.cardnumber | html %]
Date Description of charges NoteAmountAmount outstandingAmountAmount outstanding
[% 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 %]
[% debit.date | $KohaDates%] + [% PROCESS account_type_description account=debit %] + [%- IF debit.description %], [% debit.description | html %][% END %] + [% debit.note | html %][% debit.amount | $Price %][% debit.amountoutstanding | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
', 'print', 'default'); -- 2.20.1