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

diff --git a/locale/de/all b/locale/de/all
index 15885194c306608f958f15b0c4607857ad554e68..9f187df8c11922c57eb8407091635ad0b76fdb8a 100755 (executable)
--- 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'                      => '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.',
   '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',
   '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.',
   '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 f53c4185755046b6bd7f28f3eec0d5cd5fe8c6e6..72b49b899c20dbd4d5a99e61a50a6c13cda33e6b 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -196,7 +196,7 @@ $self->{texts} = {
   'Amount'                      => '',
   'Amount (for verification)'   => '',
   'Amount Due'                  => '',
   '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.' => '',
   'Amount payable'              => '',
   'Amount payable less discount' => '',
   'An exception occurred during execution.' => '',


@@ -1055,6 +1055,7 @@ $self->{texts} = {
   'II'                          => '',
   'III'                         => '',
   'IV'                          => '',
   '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.' => '',
   '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 cb9d17e1a5cb7dd9eebe2010586c9c8d04f0a09b..97b28aeb41716e9119337f9718ef1b13b8bd6fb1 100644 (file)
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -127,7 +127,8 @@
 
 [%- ELSIF SELF.type == 'orders' %]
    <p>
 
 [%- 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 %]
 
    </p>
 [%- END %]