From ba52ee604affc254bd1de43ce5ea4e5c452d7515 Mon Sep 17 00:00:00 2001 From: Martin Helmling Date: Wed, 8 Jan 2014 15:41:04 +0100 Subject: [PATCH] =?utf8?q?Preisfaktoren=20k=C3=B6nnten=20zwar=20=C3=BCber?= =?utf8?q?=20ihren=20Faktorwert=20in=20Rechnungen=20gespeichert=20werde=20?= =?utf8?q?(die=20Datenbankfelder=20sind=20vorhanden),=20werden=20aber=20?= =?utf8?q?=C3=BCber=20die=20id=20verwaltet.=20Deshalb=20ist=20der=20Faktor?= =?utf8?q?=20nur=20=C3=A4nderbar,=20falls=20der=20Faktor=20bereits=20verwe?= =?utf8?q?ndet=20wird,=20analog=20zum=20L=C3=B6schen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Behebt #2211 --- locale/de/all | 2 +- templates/webpages/am/edit_price_factor.html | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/locale/de/all b/locale/de/all index 08bb3fc42..846f6a226 100755 --- a/locale/de/all +++ b/locale/de/all @@ -10,6 +10,7 @@ use utf8; # run locales.pl from this directory to rebuild the translation files $self->{texts} = { + ' (in use so no change allowed)' => ' (Faktor wird verwendet, keine Änderung erlaubt)', ' Date missing!' => ' Datum fehlt!', ' Part Number missing!' => ' Artikelnummer fehlt!', ' missing!' => ' fehlt!', @@ -131,7 +132,6 @@ $self->{texts} = { 'Add Delivery Note' => 'Lieferschein erfassen', 'Add Delivery Order' => 'Lieferschein erfassen', 'Add Dunning' => 'Mahnung erzeugen', - 'Add Exchangerate' => 'Wechselkurs erfassen', 'Add Follow-Up' => 'Wiedervorlage erstellen', 'Add Follow-Up for #1' => 'Wiedervorlage für #1 erstellen', 'Add General Ledger Transaction' => 'Dialogbuchen', diff --git a/templates/webpages/am/edit_price_factor.html b/templates/webpages/am/edit_price_factor.html index a2191300b..1396012f6 100644 --- a/templates/webpages/am/edit_price_factor.html +++ b/templates/webpages/am/edit_price_factor.html @@ -16,7 +16,11 @@ [% 'Factor' | $T8 %] +[% IF orphaned %] +[% ELSE %] + [% HTML.escape(factor) %] [% ' (in use so no change allowed)' | $T8 %] +[% END %]

-- 2.20.1