Voruebergehender Warnhinweis in der Suchmaske des Buchungsjournals bezueglich geaende...

diff --git a/locale/de/all b/locale/de/all
index 5d7fca44ff8a04fe98f66c6366998dbac2a831b4..f7ecb2a8cbac924a1b41617bdffcfe4a4d9d5ba3 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -341,6 +341,7 @@ $self->{texts} = {
   'Attachment name'             => 'Name des Anhangs',
   'Attachments'                 => 'Dateianhänge',
   'Attempt to call an undefined sub named \'%s\'' => 'Es wurde versucht, eine nicht definierte Unterfunktion namens \'%s\' aufzurufen.',
   'Attachment name'             => 'Name des Anhangs',
   'Attachments'                 => 'Dateianhänge',
   'Attempt to call an undefined sub named \'%s\'' => 'Es wurde versucht, eine nicht definierte Unterfunktion namens \'%s\' aufzurufen.',

+  'Attention!'                  => 'Achtung!',

   'Attention: Here will be generated a lot of CB/OB transactions.' => 'Hiermit werden Buchungen für den Schlussbestand (SB-Buchung) und den Eröffnungsbestand (EB-Buchung) für mehrere Konten gleichzeitig gebucht.<br>In diesem Schritt wird das Datum der Buchungen sowie das Saldovortragskonto festgelegt.<br>Das Datum der SB-Buchung wird außerdem verwendet um das Saldo der Konten zu ermitteln, welche im nächsten Schritt (nach "Weiter") angezeigt werden.',
   'Audit Control'               => 'Bücherkontrolle',
   'Aug'                         => 'Aug',
   'Attention: Here will be generated a lot of CB/OB transactions.' => 'Hiermit werden Buchungen für den Schlussbestand (SB-Buchung) und den Eröffnungsbestand (EB-Buchung) für mehrere Konten gleichzeitig gebucht.<br>In diesem Schritt wird das Datum der Buchungen sowie das Saldovortragskonto festgelegt.<br>Das Datum der SB-Buchung wird außerdem verwendet um das Saldo der Konten zu ermitteln, welche im nächsten Schritt (nach "Weiter") angezeigt werden.',
   'Audit Control'               => 'Bücherkontrolle',
   'Aug'                         => 'Aug',


@@ -2700,6 +2701,7 @@ $self->{texts} = {
   'Show »not delivered qty/value« column in sales and purchase orders' => 'Spalte »Nicht gelieferte Menge/Wert« in Aufträgen anzeigen',
   'Signature'                   => 'Unterschrift',
   'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' => 'Da Lagerpl&auml;tze kein Pflichtfeld sind, geben Sie bitte einen Lagerplatz an, in dem Waren ohne spezifizierten Lagerplatz eingelagert werden sollen.',
   'Show »not delivered qty/value« column in sales and purchase orders' => 'Spalte »Nicht gelieferte Menge/Wert« in Aufträgen anzeigen',
   'Signature'                   => 'Unterschrift',
   'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' => 'Da Lagerpl&auml;tze kein Pflichtfeld sind, geben Sie bitte einen Lagerplatz an, in dem Waren ohne spezifizierten Lagerplatz eingelagert werden sollen.',

+  'Since kivitendo version 3.5 new notations, see documentation 2.14' => 'Seit kivitendo Version 3.5 ersetzt im Buchungsjournal die Bezeichnung «Buchungsdatum» den Begriff »Rechnungsdatum». Das bisherige «Buchungsdatum» heisst neu «Erfassungsdatum» - Details siehe Dokumentation Kapitel 2.14',

   'Single quotes'               => 'Einfache Anführungszeichen',
   'Single values in item mode, cumulated values in invoice mode' => 'Einzelwerte im Artikelmodus, kumulierte Werte im Rechnungsmodus',
   'Size'                        => 'Größe',
   'Single quotes'               => 'Einfache Anführungszeichen',
   'Single values in item mode, cumulated values in invoice mode' => 'Einzelwerte im Artikelmodus, kumulierte Werte im Rechnungsmodus',
   'Size'                        => 'Größe',

diff --git a/locale/en/all b/locale/en/all
index b9a3911806369ac45daa55894e9923baa55ef0fc..c52b71dc177b256e01237d46f78f6eaade48b1ea 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -341,6 +341,7 @@ $self->{texts} = {
   'Attachment name'             => '',
   'Attachments'                 => '',
   'Attempt to call an undefined sub named \'%s\'' => '',
   'Attachment name'             => '',
   'Attachments'                 => '',
   'Attempt to call an undefined sub named \'%s\'' => '',

+  'Attention!'                  => '',

   'Attention: Here will be generated a lot of CB/OB transactions.' => '',
   'Audit Control'               => '',
   'Aug'                         => '',
   'Attention: Here will be generated a lot of CB/OB transactions.' => '',
   'Audit Control'               => '',
   'Aug'                         => '',


@@ -1106,6 +1107,7 @@ $self->{texts} = {
   'Edit Warehouse'              => '',
   'Edit acceptance status'      => '',
   'Edit additional articles'    => '',
   'Edit Warehouse'              => '',
   'Edit acceptance status'      => '',
   'Edit additional articles'    => '',

+  'Edit all drafts'             => '',

   'Edit article/section assignments' => '',
   'Edit assignment of articles to sections' => '',
   'Edit background job'         => '',
   'Edit article/section assignments' => '',
   'Edit assignment of articles to sections' => '',
   'Edit background job'         => '',


@@ -1415,7 +1417,7 @@ $self->{texts} = {
   'Germany'                     => '',
   'Git revision: #1, #2 #3'     => '',
   'Given Name'                  => '',
   'Germany'                     => '',
   'Git revision: #1, #2 #3'     => '',
   'Given Name'                  => '',

-  'Gldate'                     => 'Entry Date',
+  'Gldate'                      => 'Entry Date',

   'Global Attachments'          => '',
   'Global Record BCC'           => '',
   'GoBD Export'                 => '',
   'Global Attachments'          => '',
   'Global Record BCC'           => '',
   'GoBD Export'                 => '',


@@ -2097,6 +2099,7 @@ $self->{texts} = {
   'Payment Reminder'            => '',
   'Payment Terms'               => '',
   'Payment Terms missing in row ' => '',
   'Payment Reminder'            => '',
   'Payment Terms'               => '',
   'Payment Terms missing in row ' => '',

+  'Payment bookings disallowed. After the booking this record may be suggested with the amount of \'#1\' or otherwise has to be choosen manually. No automatic payment booking will be done to chart \'#2\'.' => '',

   'Payment date missing!'       => '',
   'Payment list'                => '',
   'Payment posted!'             => '',
   'Payment date missing!'       => '',
   'Payment list'                => '',
   'Payment posted!'             => '',


@@ -2698,6 +2701,7 @@ $self->{texts} = {
   'Show »not delivered qty/value« column in sales and purchase orders' => '',
   'Signature'                   => '',
   'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' => '',
   'Show »not delivered qty/value« column in sales and purchase orders' => '',
   'Signature'                   => '',
   'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' => '',

+  'Since kivitendo version 3.5 new notations, see documentation 2.14' => 'Since kivitendo version 3.5 new usage of the notations «Booking Date» and «Entry Date», see documentation 2.14',

   'Single quotes'               => '',
   'Single values in item mode, cumulated values in invoice mode' => '',
   'Size'                        => '',
   'Single quotes'               => '',
   'Single values in item mode, cumulated values in invoice mode' => '',
   'Size'                        => '',


@@ -2728,11 +2732,11 @@ $self->{texts} = {
   'Space'                       => '',
   'Split entry detected. The values you have entered will result in an entry with more than one position on both debit and credit. Due to known problems involving accounting software kivitendo does not allow these.' => '',
   'Spoolfile'                   => '',
   'Space'                       => '',
   'Split entry detected. The values you have entered will result in an entry with more than one position on both debit and credit. Due to known problems involving accounting software kivitendo does not allow these.' => '',
   'Spoolfile'                   => '',

+  'Start (verb)'                => '',

   'Start Dunning Process'       => '',
   'Start date'                  => '',
   'Start of year'               => '',
   'Start process'               => '',
   'Start Dunning Process'       => '',
   'Start date'                  => '',
   'Start of year'               => '',
   'Start process'               => '',

-  'Start server'                => '',

   'Start the correction assistant' => '',
   'Startdate_coa'               => '',
   'Starting Balance'            => '',
   'Start the correction assistant' => '',
   'Startdate_coa'               => '',
   'Starting Balance'            => '',


@@ -2754,7 +2758,7 @@ $self->{texts} = {
   'Stock for part #1'           => '',
   'Stock value'                 => '',
   'Stocked Qty'                 => '',
   'Stock for part #1'           => '',
   'Stock value'                 => '',
   'Stocked Qty'                 => '',

-  'Stop server'                 => '',
+  'Stop (verb)'                 => '',

   'Stopping the task server failed. Output:' => '',
   'Storage Backends'            => '',
   'Storage Type for Attachments' => '',
   'Stopping the task server failed. Output:' => '',
   'Storage Backends'            => '',
   'Storage Type for Attachments' => '',


@@ -3318,7 +3322,7 @@ $self->{texts} = {
   'Transactions without reference:' => '',
   'Transactions, AR transactions, AP transactions' => '',
   'Transdate'                   => 'Booking Date',
   'Transactions without reference:' => '',
   'Transactions, AR transactions, AP transactions' => '',
   'Transdate'                   => 'Booking Date',

-  'Transdate Record'           => 'Booking Date Record',
+  'Transdate Record'            => 'Booking Date Record',

   'Transdate from'              => '',
   'Transdate is #1'             => 'Record date is #1',
   'Transdate is after #1'       => 'Record date is after #1',
   'Transdate from'              => '',
   'Transdate is #1'             => 'Record date is #1',
   'Transdate is after #1'       => 'Record date is after #1',


@@ -3464,7 +3468,7 @@ $self->{texts} = {
   'Valid until'                 => '',
   'Valid/Obsolete'              => '',
   'Value'                       => '',
   'Valid until'                 => '',
   'Valid/Obsolete'              => '',
   'Value'                       => '',

-  'Valutadate'                 => '',
+  'Valutadate'                  => '',

   'Valutadate from'             => '',
   'Valutadate to'               => '',
   'Variable'                    => '',
   'Valutadate from'             => '',
   'Valutadate to'               => '',
   'Variable'                    => '',

diff --git a/templates/webpages/gl/search.html b/templates/webpages/gl/search.html
index c4f8db381b9aaa1d03db61bc57dd47b467541ea6..e1f2d80aa6cf68183c4a276bfb0df1d462b303ed 100644 (file)
--- a/templates/webpages/gl/search.html
+++ b/templates/webpages/gl/search.html
@@ -42,6 +42,12 @@
     <th align=right>[% 'Employee' | $T8 %]</th>
     <td colspan=3>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key = 'safe_name', with_empty = 1) %]</td>
   </tr>
     <th align=right>[% 'Employee' | $T8 %]</th>
     <td colspan=3>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key = 'safe_name', with_empty = 1) %]</td>
   </tr>

+  <tr>
+    <th align=right style="color:red;">[% 'Attention!' | $T8 %]</th>
+    <td colspan=3 style="color:red;">
+    [% 'Since kivitendo version 3.5 new notations, see documentation 2.14' | $T8 %]
+    </td>
+  </tr>

   <tr>
     <th align=right>[% 'Filter date by' | $T8 %]</th>
     <td colspan=3>
   <tr>
     <th align=right>[% 'Filter date by' | $T8 %]</th>
     <td colspan=3>