From f8637504fd57c7a19a7645f599def45a5c747fcc Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Mon, 14 Oct 2013 14:46:09 +0200 Subject: [PATCH] =?utf8?q?Wiederkehrende=20Rechnung:=20Option=20f=C3=BCr?= =?utf8?q?=20halbj=C3=A4hrliche=20Fakturierung?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/mozilla/oe.pl | 4 ++-- locale/de/all | 3 +++ templates/webpages/oe/edit_periodic_invoices_config.html | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index a2d7175bc..285f5aaa4 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -1936,7 +1936,7 @@ sub edit_periodic_invoices_config { }; } - $config->{periodicity} = 'm' if none { $_ eq $config->{periodicity} } qw(m q y); + $config->{periodicity} = 'm' if none { $_ eq $config->{periodicity} } qw(m q b y); $::form->get_lists(printers => "ALL_PRINTERS", charts => { key => 'ALL_CHARTS', @@ -1962,7 +1962,7 @@ sub save_periodic_invoices_config { my $config = { active => $::form->{active} ? 1 : 0, terminated => $::form->{terminated} ? 1 : 0, - periodicity => (any { $_ eq $::form->{periodicity} } qw(m q y)) ? $::form->{periodicity} : 'm', + periodicity => (any { $_ eq $::form->{periodicity} } qw(m q b y)) ? $::form->{periodicity} : 'm', start_date_as_date => $::form->{start_date_as_date}, end_date_as_date => $::form->{end_date_as_date}, print => $::form->{print} ? 1 : 0, diff --git a/locale/de/all b/locale/de/all index 0a228c412..911f0279f 100755 --- a/locale/de/all +++ b/locale/de/all @@ -790,6 +790,7 @@ $self->{texts} = { 'Duplicate in CSV file' => 'Duplikat in CSV-Datei', 'Duplicate in database' => 'Duplikat in Datenbank', 'During the next update a taxkey 0 with tax rate of 0 will automatically created.' => 'Beim nächsten Ausführen des Updates wird ein Steuerschlüssel 0 mit einem Steuersatz von 0% automatisch erzeugt.', + 'E-Mail' => '', 'E-mail' => 'E-Mail', 'E-mail Statement to' => 'Fälligkeitsabrechnung als E-Mail an', 'E-mail address missing!' => 'E-Mail-Adresse fehlt!', @@ -1664,6 +1665,7 @@ $self->{texts} = { 'Printer management' => 'Druckerverwaltung', 'Printing ... ' => 'Es wird gedruckt.', 'Prior year' => 'Vorheriges Jahr', + 'Private E-Mail' => '', 'Private E-mail' => 'Private E-Mail', 'Private Phone' => 'Privates Tel.', 'Problem' => 'Problem', @@ -2757,6 +2759,7 @@ $self->{texts} = { 'saved' => 'gespeichert', 'saved!' => 'gespeichert', 'saving data' => 'Speichere Daten', + 'semiannually' => 'halbjährlich', 'sent' => 'gesendet', 'sent to printer' => 'an Drucker geschickt', 'service' => 'Dienstleistung', diff --git a/templates/webpages/oe/edit_periodic_invoices_config.html b/templates/webpages/oe/edit_periodic_invoices_config.html index 74fb123cc..3c2042fb3 100644 --- a/templates/webpages/oe/edit_periodic_invoices_config.html +++ b/templates/webpages/oe/edit_periodic_invoices_config.html @@ -27,6 +27,8 @@
[% L.radio_button_tag("periodicity", value => "q", label => LxERP.t8("every third month"), checked => periodicity == 'q') %]
+ [% L.radio_button_tag("periodicity", value => "b", label => LxERP.t8("semiannually"), checked => periodicity == 'b') %] +
[% L.radio_button_tag("periodicity", value => "y", label => LxERP.t8("yearly"), checked => periodicity == 'y') %] -- 2.20.1