From cf58b778ee58660bc4a2e2349f314e2b23dd85a3 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Tue, 3 Jun 2014 15:29:07 +0200 Subject: [PATCH] MT#5879 Invoice template translation. --- lib/NGCP/Panel/Controller/InvoiceTemplate.pm | 2 +- .../invoice/default/invoice_template_svg.tt | 126 +++++++++--------- 2 files changed, 61 insertions(+), 67 deletions(-) diff --git a/lib/NGCP/Panel/Controller/InvoiceTemplate.pm b/lib/NGCP/Panel/Controller/InvoiceTemplate.pm index 850264949f..7767b6eef9 100644 --- a/lib/NGCP/Panel/Controller/InvoiceTemplate.pm +++ b/lib/NGCP/Panel/Controller/InvoiceTemplate.pm @@ -347,7 +347,7 @@ sub preview_content :Chained('base') :PathPart('editcontent/preview') :Args(0) { try { - my $dummy = NGCP::Panel::Utils::Invoice::get_dummy_data(); + my $dummy = NGCP::Panel::Utils::InvoiceTemplate::get_dummy_data(); NGCP::Panel::Utils::InvoiceTemplate::preprocess_svg(\$svg); $t->process(\$svg, $dummy, \$out) || do { my $error = $t->error(); diff --git a/share/templates/invoice/default/invoice_template_svg.tt b/share/templates/invoice/default/invoice_template_svg.tt index e038c00f07..c888cbdd4a 100644 --- a/share/templates/invoice/default/invoice_template_svg.tt +++ b/share/templates/invoice/default/invoice_template_svg.tt @@ -33,59 +33,52 @@ TitlePage_1 -[%provider.company%][%if(', ', provider.postcode _ ' ' _ provider.city ) %][%if(', ', provider.street )%] -[%client.title%] -[%client.firstname%] [%client.lastname%] -[%client.street%] -[%client.postcode%] [%client.city%] -[%client.country%] -Anschlussinhaber: [%client.firstname%] [%client.lastname%] - -Rechnung -Rechnungsnummer +[%rescontact.company%], [%rescontact.street%], [%rescontact.postcode%] [%rescontact.city%] + +[%custcontact.firstname%] [%custcontact.lastname%] +[%custcontact.street%] +[%custcontact.postcode%] [%custcontact.city%] +[%custcontact.country%] + +Contract Owner: [%custcontact.firstname%] [%custcontact.lastname%] + +Invoice +Invoice Nr: [%invoice.serial%] -Kundennummer -[%client.id%] +Customer Nr: +[%customer.id%] UID-Nummer: -[% client.uid %] -Zeitraum -[%invoice.month%] [%invoice.year%] -Datum -[%date.format(datenow.value,'%d.%m.%Y')%] - -[%provider.company%] - Ihre Abrechnung -Sehr geehrter Kunde, -für die von uns erbrachten Leistungen im Zeitraum vom [%date.format(invoice.date_start,'%d.%m.%Y')%] bis [%date.format(invoice.date_end,'%d.%m.%Y')%] erlauben wir uns -Folgendes in Rechnung zu stellen: +[% custcontact.vatnum %] +Period +[%invoice.year%]-[%invoice.month%] +Date +[%date.format(datenow.value,'%Y-%m-%d')%] +[%rescontact.company%] - Your Invoice +Dear Customer, +for our services provided in the month of [%invoice.year%]-[%invoice.month%], we allow to invoice the following items: -Serviceleistungen +Recurring Fees -Bezeichnung -Anzahl -Einzelpreis -Betrag in EUR +Name +Quantity +Price/Quantity +Sum in [% billprof.currency%] -Monatliche Grundentgelte +Monthly Service Fee -[%period = invoice%] -[%bp.name%] [%date.format(period.date_start,'%d.%m.%Y')%] - [%date.format(period.date_end,'%d.%m.%Y')%] +[%billprof.name%] [%invoice.year%]-[%invoice.month%] 1 -[%money_format(bp.interval_charge)%] -[%money_format(bp.interval_charge)%] +[%money_format(billprof.interval_charge)%] +[%money_format(billprof.interval_charge)%] -[%bp.name%] [%date.format(period.date_start,'%d.%m.%Y')%] - [%date.format(period.date_end,'%d.%m.%Y')%] -1 -50,00 -50,00 - -Summe -100,00 +Total +[%money_format(billprof.interval_charge)%] @@ -93,8 +86,8 @@ -Gesamtsumme der Serviceleistungen -100,00 +Total of Recurring Fees +[%money_format(billprof.interval_charge)%] @@ -102,19 +95,21 @@ -Verbindungsentgelte +Call Fees Zone -Anzahl -Nutzung -Betrag in EUR - -Für Rufnummer 01/30123 [%provider.company_short%] Business Phone - -Österreich Festnetz GZ -1 -00:01:36 -0,04 +Quantity +Duration +Sum in EUR + + + +Österreich Festnetz GZ +1 +00:01:36 +0,04 + + Österreich Festnetz FZ 9 @@ -145,7 +140,7 @@ Einzelpreis Betrag in EUR -Rabatte [%provider.company_short%] Business Phone +Rabatte [%rescontact.company_short%] Business Phone Grundgebühren Rabatt [%date.format(invoice.date_start,'%d.%m.%Y')%] - [%date.format(invoice.date_end,'%d.%m.%Y')%] 1 @@ -189,7 +184,7 @@ Abbuchungsauftrag von Ihrem Konto IBAN , BIC abgebucht. Mit freundlichen Grüßen -Ihr [%provider.company_short%] Service Team +Ihr [%rescontact.company_short%] Service Team Etwaige Einwände gegen die vorliegende Rechnung müssen innerhalb von 30 Tagen ab Zustellungsdatum schriftlich erhoben werden, andernfalls gilt die Forderung als anerkannt. @@ -300,19 +295,18 @@ - [%provider.company%] - [%provider.postcode %] [% provider.city %] - [%provider.url%] - E-Mail : [%provider.email%] - Tel: [% provider.mobile %] - Fax: [% provider.fax %] + [%rescontact.company%] + [%rescontact.street%] + [%rescontact.postcode %] [% rescontact.city %] + E-Mail : [%rescontact.email%] + Tel: [% rescontact.phonenumber %] + Fax: [% rescontact.faxnumber %] - DVR-Nr.: [% provider.dvr %] UID-Nr.: [% provider.uid %] - IBAN: [% provider.iban %] BIC: [% provider.bic %] - FN:[% provider.fn %] - Firmensitz: [%provider.postcode %] [% provider.city %] - Konto-Nr.: [% provider.bankaccount %] BLZ [% provider.blz %], - [% provider.bank %] + Company Reg.Nr.: [% rescontact.comregnum %] + IBAN: [% rescontact.iban %] BIC: [% rescontact.bic %] + xxx + yyy + zzz