From: Cem Aydin Date: Tue, 11 Jan 2022 16:59:00 +0000 (+0100) Subject: Swiss QR-Bill: Variante IBAN ohne Referenz in Druckablauf und Mandantenkonfiguration... X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~238 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a9d122f7ebf215d8b310ea598af11f8aff85807e;p=kivitendo-erp.git Swiss QR-Bill: Variante IBAN ohne Referenz in Druckablauf und Mandantenkonfiguration hinzugefügt --- diff --git a/SL/Template/OpenDocument.pm b/SL/Template/OpenDocument.pm index 7a9f95207..db254559f 100644 --- a/SL/Template/OpenDocument.pm +++ b/SL/Template/OpenDocument.pm @@ -678,10 +678,20 @@ sub generate_qr_code { $form->{'invnumber'}, ); - my %ref_nr_data = ( - 'type' => 'QRR', - 'ref_number' => $ref_number, - ); + my %ref_nr_data; + if ($::instance_conf->get_create_qrbill_invoices == 1) { + %ref_nr_data = ( + 'type' => 'QRR', + 'ref_number' => $ref_number, + ); + } elsif ($::instance_conf->get_create_qrbill_invoices == 2) { + %ref_nr_data = ( + 'type' => 'NON', + 'ref_number' => '', + ); + } else { + $::form->error($::locale->text('Error getting QR-Bill type.')); + } # set into form for template processing $form->{'biller_information'} = \%biller_information; diff --git a/locale/de/all b/locale/de/all index 79188448f..b451f51b8 100755 --- a/locale/de/all +++ b/locale/de/all @@ -815,8 +815,10 @@ $self->{texts} = { 'Create one from the context menu by right-clicking on this text.' => 'Erstellen Sie einen aus dem Kontextmenü, indem Sie auf diesen Text rechtsklicken.', 'Create order' => 'Auftrag erstellen', 'Create sales invoices with Factur-X/ZUGFeRD data' => 'Verkaufsrechnungen mit Factur-X-/ZUGFeRD-Daten erzeugen', - 'Create sales invoices with Swiss QR-Bill' => 'Verkaufsrechnungen mit Schweizer QR-Rechnung erzeugen', + 'Create sales invoices with Swiss QR-bill' => 'Verkaufsrechnungen mit Schweizer QR-Rechnung erzeugen', 'Create tables' => 'Tabellen anlegen', + 'Create variant IBAN without reference' => 'Variante IBAN ohne Referenz erzeugen', + 'Create variant QR-IBAN with QR reference' => 'Variante QR-IBAN mit QR-Referenz erzeugen', 'Create with profile \'Factur-X 1.0.05/ZUGFeRD 2.1.1 extended\'' => 'Mit Profil »Factur-X 1.0.05/ZUGFeRD 2.1.1 extended«', 'Create with profile \'Factur-X 1.0.05/ZUGFeRD 2.1.1 extended\' (test mode)' => 'Mit Profil »Factur-X 1.0.05/ZUGFeRD 2.1.1 extended« (Test-Modus)', 'Create with profile \'XRechnung 2.0.0\'' => 'Mit Profil »XRechnung 2.0.0«', @@ -1114,6 +1116,7 @@ $self->{texts} = { 'Do not change the tax rate of taxkey 0.' => 'Ändern Sie nicht den Steuersatz vom Steuerschlüssel 0.', 'Do not check for duplicates' => 'Nicht nach Dubletten suchen', 'Do not create Factur-X/ZUGFeRD invoices' => 'Keine Factur-X-/ZUGFeRD-Rechnungen erzeugen', + 'Do not create QR-bill invoices' => 'Keine QR-Rechnungen erzeugen', 'Do not leave booking form?' => 'Buchungsmaske nicht verlassen?', 'Do not link to a project.' => 'Nicht mit einem Projekt verknüpfen.', 'Do not modify this position' => 'Diese Position nicht verändern', @@ -1356,6 +1359,7 @@ $self->{texts} = { 'Equity' => 'Passiva', 'Erfolgsrechnung' => 'Erfolgsrechnung', 'Error' => 'Fehler', + 'Error getting QR-Bill type.' => 'Fehler in QR-Rechnung Varianten Auswahl.', 'Error handling' => 'Fehlerbehandlung', 'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s', 'Error in position #1: You must either assign no stock at all or the full quantity of #2 #3.' => 'Fehler in Position #1: Sie müssen einer Position entweder gar keinen Lagereingang oder die vollständige im Lieferschein vermerkte Menge von #2 #3 zuweisen.', diff --git a/locale/en/all b/locale/en/all index dc99bfcfd..24a4366d1 100644 --- a/locale/en/all +++ b/locale/en/all @@ -817,6 +817,8 @@ $self->{texts} = { 'Create sales invoices with Factur-X/ZUGFeRD data' => '', 'Create sales invoices with Swiss QR-Bill' => '', 'Create tables' => '', + 'Create variant with QR reference' => '', + 'Create variant without reference number' => '', 'Create with profile \'Factur-X 1.0.05/ZUGFeRD 2.1.1 extended\'' => '', 'Create with profile \'Factur-X 1.0.05/ZUGFeRD 2.1.1 extended\' (test mode)' => '', 'Create with profile \'XRechnung 2.0.0\'' => '', @@ -1114,6 +1116,7 @@ $self->{texts} = { 'Do not change the tax rate of taxkey 0.' => '', 'Do not check for duplicates' => '', 'Do not create Factur-X/ZUGFeRD invoices' => '', + 'Do not create QR-Bill invoices' => '', 'Do not leave booking form?' => '', 'Do not link to a project.' => '', 'Do not modify this position' => '', @@ -1356,6 +1359,7 @@ $self->{texts} = { 'Equity' => '', 'Erfolgsrechnung' => '', 'Error' => '', + 'Error getting QR-Bill type.' => '', 'Error handling' => '', 'Error in database control file \'%s\': %s' => '', 'Error in position #1: You must either assign no stock at all or the full quantity of #2 #3.' => '', diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html index 46d8a37e9..ce754c9ca 100644 --- a/templates/webpages/client_config/_features.html +++ b/templates/webpages/client_config/_features.html @@ -278,8 +278,10 @@ - [% LxERP.t8("Create sales invoices with Swiss QR-Bill") %] - [% L.yes_no_tag("defaults.create_qrbill_invoices", SELF.defaults.create_qrbill_invoices) %] + [% LxERP.t8("Create sales invoices with Swiss QR-bill") %] + + [% L.select_tag("defaults.create_qrbill_invoices", [ [ 0, LxERP.t8('Do not create QR-bill invoices') ], [ 1, LxERP.t8('Create variant QR-IBAN with QR reference') ], [ 2, LxERP.t8('Create variant IBAN without reference') ] ], default=SELF.defaults.create_qrbill_invoices) %] + [% LxERP.t8("If enabled sales invoices created using OpenDocument/OASIS format will include data for Swiss QR-Bill creation.") %]