From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Mon, 21 Oct 2013 13:36:05 +0000 (+0200)
Subject: Hilfstext für verify_... und "Maximal amount difference" erweitert.
X-Git-Tag: release-3.1.0beta1~22^2~119
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5a9a14d7f6fa77eb7bf49e704962bfa0e04eef34;p=kivitendo-erp.git

Hilfstext für verify_... und "Maximal amount difference" erweitert.
---

diff --git a/locale/de/all b/locale/de/all
index 15885194c..9f187df8c 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -196,7 +196,7 @@ $self->{texts} = {
   'Amount'                      => 'Betrag',
   'Amount (for verification)'   => 'Betrag (zur Überprüfung)',
   'Amount Due'                  => 'Betrag fällig',
-  'Amount and net amount are calculated by kivitendo. verify_amount and verify_netamount can be used for sanity checks.' => 'Betrag und Nettobetrag werden von kivitendo berechnet. verify_amount und verify_netamount können für Plausibilitätsprüfungen angegeben werden.',
+  'Amount and net amount are calculated by kivitendo. "verify_amount" and "verify_netamount" can be used for sanity checks.' => 'Betrag und Nettobetrag werden von kivitendo berechnet. "verify_amount" und "verify_netamount" können für Plausibilitätsprüfungen angegeben werden.',
   'Amount payable'              => 'Noch zu bezahlender Betrag',
   'Amount payable less discount' => 'Noch zu bezahlender Betrag abzüglich Skonto',
   'An exception occurred during execution.' => 'Während der Ausführung trat eine Ausnahme auf.',
@@ -1055,6 +1055,7 @@ $self->{texts} = {
   'II'                          => 'II',
   'III'                         => 'III',
   'IV'                          => 'IV',
+  'If amounts differ more than "Maximal amount difference" (settings), this item is marked as invalid.' => 'Weichen die Beträge mehr als die "maximale Betragsabweichung" in den Einstellungen ab, so wird diese Position als ungültig markiert.',
   'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' => 'Falls angehakt wird der DATEV-Steuerschlüssel bei Buchungen auf dieses Konto nicht beim DATEV-Export mitexportiert, allerdings nur wenn zusätzlich der Konto-Steuerschlüssel vom Buchungs (Hauptbuch) Steuerschlüssel abweicht',
   'If configured this bin will be preselected for all new parts. Also this bin will be used as the master default bin, if default transfer out with master bin is activated.' => 'Falls konfiguriert, wird dieses Lager mit Lagerplatz für neu angelegte Waren vorausgewählt.',
   'If the article type is set to \'mixed\' then a column called \'type\' must be present.' => 'Falls der Artikeltyp auf \'gemischt\' gestellt wird, muss eine Spalte namens \'type\' vorhanden sein.',
diff --git a/locale/en/all b/locale/en/all
index f53c41857..72b49b899 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -196,7 +196,7 @@ $self->{texts} = {
   'Amount'                      => '',
   'Amount (for verification)'   => '',
   'Amount Due'                  => '',
-  'Amount and net amount are calculated by kivitendo. verify_amount and verify_netamount can be used for sanity checks.' => '',
+  'Amount and net amount are calculated by kivitendo. "verify_amount" and "verify_netamount" can be used for sanity checks.' => '',
   'Amount payable'              => '',
   'Amount payable less discount' => '',
   'An exception occurred during execution.' => '',
@@ -1055,6 +1055,7 @@ $self->{texts} = {
   'II'                          => '',
   'III'                         => '',
   'IV'                          => '',
+  'If amounts differ more than "Maximal amount difference" (settings), this item is marked as invalid.' => '',
   'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' => '',
   'If configured this bin will be preselected for all new parts. Also this bin will be used as the master default bin, if default transfer out with master bin is activated.' => '',
   'If the article type is set to \'mixed\' then a column called \'type\' must be present.' => '',
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index cb9d17e1a..97b28aeb4 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -127,7 +127,8 @@
 
 [%- ELSIF SELF.type == 'orders' %]
    <p>
-     [%- LxERP.t8('Amount and net amount are calculated by kivitendo. verify_amount and verify_netamount can be used for sanity checks.') %]
+     [%- LxERP.t8('Amount and net amount are calculated by kivitendo. "verify_amount" and "verify_netamount" can be used for sanity checks.') %]<br>
+     [%- LxERP.t8('If amounts differ more than "Maximal amount difference" (settings), this item is marked as invalid.') %]<br>
    </p>
 [%- END %]