Korrekturen und Vereinheitlichung der Nomenklatur bzgl. Buchungs- und Erfassungsdatum...

diff --git a/SL/Controller/CsvImport/BankTransaction.pm b/SL/Controller/CsvImport/BankTransaction.pm
index d6a7e87aa3880fb8b08b4941b61d6fc2bb03fea6..50a89d89bdfc3e3caf494ccf3de37f1810cad7f1 100644 (file)
--- a/SL/Controller/CsvImport/BankTransaction.pm
+++ b/SL/Controller/CsvImport/BankTransaction.pm
@@ -90,8 +90,8 @@ sub _displayable_columns {
    { name => 'local_bank_account_id', description => $::locale->text('ID of own bank account') },
    { name => 'remote_bank_code',      description => $::locale->text('Bank code of the goal/source') },
    { name => 'remote_account_number', description => $::locale->text('Account number of the goal/source') },
-   { name => 'transdate',             description => $::locale->text('Date of transaction') },
-   { name => 'valutadate',            description => $::locale->text('Valuta date') },
+   { name => 'transdate',             description => $::locale->text('Transdate') },
+   { name => 'valutadate',            description => $::locale->text('Valutadate') },
    { name => 'amount',                description => $::locale->text('Amount') },
    { name => 'currency',              description => $::locale->text('Currency') },
    { name => 'currency_id',           description => $::locale->text('Currency (database ID)')          },

diff --git a/SL/Controller/MassInvoiceCreatePrint.pm b/SL/Controller/MassInvoiceCreatePrint.pm
index cbe4d338a8dc11f768b8fd907966b1a67eeb919f..14fd1cc8eead3aba20a79d9a103de86f88d8259a 100644 (file)
--- a/SL/Controller/MassInvoiceCreatePrint.pm
+++ b/SL/Controller/MassInvoiceCreatePrint.pm
@@ -213,7 +213,7 @@ sub _init_sales_delivery_order_models {
       },
       customer     => t8('Customer'),
       employee     => t8('Employee'),
-      transdate    => t8('Date'),
+      transdate    => t8('Delivery Order Date'),
       donumber     => t8('Delivery Order Number'),
       ordnumber     => t8('Order Number'),
     },
@@ -324,8 +324,8 @@ sub make_filter_summary {
 
   my @filters = (
     [ $filter->{customer}{"name:substr::ilike"}, t8('Customer') ],
-    [ $filter->{"transdate:date::ge"},           t8('Transdate') . " " . t8('From Date') ],
-    [ $filter->{"transdate:date::le"},           t8('Transdate') . " " . t8('To Date')   ],
+    [ $filter->{"transdate:date::ge"},           t8('Delivery Order Date') . " " . t8('From Date') ],
+    [ $filter->{"transdate:date::le"},           t8('Delivery Order Date') . " " . t8('To Date')   ],
   );
 
   for (@filters) {

diff --git a/SL/Controller/TopQuickSearch/OERecord.pm b/SL/Controller/TopQuickSearch/OERecord.pm
index 3c6d2e3ddba3fd6282e9e1e3a64c31fa01b66daf..8379608d4cdc7dad95eda63beb306ba77516393f 100644 (file)
--- a/SL/Controller/TopQuickSearch/OERecord.pm
+++ b/SL/Controller/TopQuickSearch/OERecord.pm
@@ -106,7 +106,7 @@ sub init_models {
         by  => 'transdate',
         dir => 0,
       },
-      transdate => t8('Transdate'),
+      transdate => t8('Date'),
     },
     paginated  => {
       per_page => 10,

diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index bf96fa4471a52c3eb912245658372f35dcec3296..c39ba34074f21e2107f4e205e7456e0c447de92c 100644 (file)
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -1202,7 +1202,7 @@ sub csv_export_for_tax_accountant {
     taxkey            => { 'text' => $::locale->text('Taxkey'), },
     tax_accname       => { 'text' => $::locale->text('Tax Account Name'), },
     tax_accno         => { 'text' => $::locale->text('Tax Account'), },
-    transdate         => { 'text' => $::locale->text('Invoice Date'), },
+    transdate         => { 'text' => $::locale->text('Transdate'), },
     vcnumber          => { 'text' => $::locale->text('Customer/Vendor Number'), },
   );
 

diff --git a/SL/GoBD.pm b/SL/GoBD.pm
index b147580d174f39809b33fa972f764c32b9c2a8ad..50d56a9661158456245f32a4453f9b2e806418c7 100644 (file)
--- a/SL/GoBD.pm
+++ b/SL/GoBD.pm
@@ -85,12 +85,12 @@ my %datev_column_defs = (
   taxkey            => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Taxkey'), },
   tax_accname       => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Tax Account Name'), },
   tax_accno         => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Tax Account'), },
-  transdate         => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Invoice Date'), },
+  transdate         => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Transdate'), },
   vcnumber          => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Customer/Vendor Number'), },
   customer_id       => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Customer (database ID)'), },
   vendor_id         => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Vendor (database ID)'), },
   itime             => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Create Date'), },
-  gldate            => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Booking Date'), },
+  gldate            => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Gldate'), },
 );
 
 my @datev_columns = qw(

diff --git a/SL/Presenter/Record.pm b/SL/Presenter/Record.pm
index d8d11fc98f8c968016bf3c54185b6c801f8454d8..708e72653fd53113a6f1f90d8d8659a0fec56483 100644 (file)
--- a/SL/Presenter/Record.pm
+++ b/SL/Presenter/Record.pm
@@ -445,7 +445,7 @@ sub _gl_transaction_list {
     title   => $::locale->text('GL Transactions'),
     type    => 'gl_transaction',
     columns => [
-      [ $::locale->text('Date'),        'transdate'                                                    ],
+      [ $::locale->text('Transdate'),        'transdate'                                                    ],
       [ $::locale->text('Reference'),   'reference'                                                    ],
       [ $::locale->text('Description'), sub { $self->gl_transaction($_[0 ], display => 'table-cell') } ],
     ],

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 82b8a508d8bcde342673f35ae8fb0e6aa990fd82..a6e36daaade4f3431a4006d30e7f44c611b6334e 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -998,7 +998,7 @@ sub ap_transactions {
     'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },
     'taxzone'                 => { 'text' => $locale->text('Tax rate'), },
     'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
-    'charts'                  => { 'text' => $locale->text('Buchungskonto'), },
+    'charts'                  => { 'text' => $locale->text('Chart'), },
     'direct_debit'            => { 'text' => $locale->text('direct debit'), },
   );
 

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 7af34d8fb30791b73f0987818f6f7175b9dbd32b..9d1784f78f2d3d6d70a073959a9ed854e0435afc 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1031,7 +1031,7 @@ sub ar_transactions {
     'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },
     'taxzone'                 => { 'text' => $locale->text('Steuersatz'), },
     'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
-    'charts'                  => { 'text' => $locale->text('Buchungskonto'), },
+    'charts'                  => { 'text' => $locale->text('Chart'), },
     'customertype'            => { 'text' => $locale->text('Customer type'), },
     'direct_debit'            => { 'text' => $locale->text('direct debit'), },
     'department'              => { 'text' => $locale->text('Department'), },

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index b625c868a96421597a2a42b11edb23cda69d8d7f..8623153209d80129bc93a75e3b890eaac1744ce4 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -415,7 +415,7 @@ sub generate_report {
   my $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
 
   my @columns = qw(
-    gldate         transdate        id             reference      description
+    transdate      gldate   id      reference      description
     notes          source   doccnt  debit          debit_accno
     credit         credit_accno     debit_tax      debit_tax_accno
     credit_tax     credit_tax_accno projectnumbers balance employee
@@ -434,7 +434,7 @@ sub generate_report {
   push @options,      $locale->text('Description') . " : $form->{description}"                        if ($form->{description});
   push @options,      $locale->text('Notes')       . " : $form->{notes}"                              if ($form->{notes});
   push @options,      $locale->text('Employee')    . " : $employee"                                   if $employee;
-  my $datesorttext = $form->{datesort} eq 'transdate' ? $locale->text('Invoice Date') :  $locale->text('Booking Date');
+  my $datesorttext = $form->{datesort} eq 'transdate' ? $locale->text('Transdate') :  $locale->text('Gldate');
   push @date_options,      "$datesorttext"                              if ($form->{datesort} and ($form->{datefrom} or $form->{dateto}));
   push @date_options, $locale->text('From'), $locale->date(\%myconfig, $form->{datefrom}, 1)          if ($form->{datefrom});
   push @date_options, $locale->text('Bis'),  $locale->date(\%myconfig, $form->{dateto},   1)          if ($form->{dateto});
@@ -460,8 +460,8 @@ sub generate_report {
 
   my %column_defs = (
     'id'               => { 'text' => $locale->text('ID'), },
-    'transdate'        => { 'text' => $locale->text('Invoice Date'), },
-    'gldate'           => { 'text' => $locale->text('Booking Date'), },
+    'transdate'        => { 'text' => $locale->text('Transdate'), },
+    'gldate'           => { 'text' => $locale->text('Gldate'), },
     'reference'        => { 'text' => $locale->text('Reference'), },
     'source'           => { 'text' => $locale->text('Source'), },
     'doccnt'           => { 'text' => $locale->text('Document Count'), },

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index d6a67c47ae503c8437c5788634c564bc3a4b24f9..f11fad9a88b108659d6494fd3919b4279305434f 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -194,7 +194,7 @@ sub generate_report {
     'serialnumber'       => { 'text' => $locale->text('Serial Number'), },
     'soldtotal'          => { 'text' => $locale->text('Qty in Selected Records'), },
     'name'               => { 'text' => $locale->text('Name in Selected Records'), },
-    'transdate'          => { 'text' => $locale->text('Transdate'), },
+    'transdate'          => { 'text' => $locale->text('Transdate Record'), },
     'unit'               => { 'text' => $locale->text('Unit'), },
     'weight'             => { 'text' => $locale->text('Weight'), },
     'shop'               => { 'text' => $locale->text('Shop article'), },

diff --git a/locale/de/all b/locale/de/all
index f7b950ca254420504e15d97605479d8886c295c8..a81fd628902afbd8a935c015192ac823665087d1 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -413,7 +413,6 @@ $self->{texts} = {
   'Bcc E-mail'                  => 'BCC (E-Mail)',
   'Because the useability gets worse if one partnumber is used for several parts (for example if you are searching a position for an invoice), partnumbers should be unique.' => 'Da die Benutzerfreundlichkeit durch doppelte Artikelnummern erheblich verschlechtert wird (zum Beispiel, wenn man einen Artikel für eine Rechnung sucht), sollten Artikelnummern eindeutig vergeben sein.',
   'Before saving a sales order, this article will be checked and a warning is generated.' => 'Vor dem Speichern eines Angebots oder Auftrags wird überprüft, ob die hier definierte Artikelnummer vorhanden ist (Versandkosten01, etc.) und eine entsprechende Hinweiswarnung angezeigt',
-  'Belegnummer'                 => 'Buchungsnummer',
   'Belgium'                     => 'Belgien',
   'Beratername'                 => 'Beratername',
   'Beraternummer'               => 'Beraternummer',
@@ -448,7 +447,6 @@ $self->{texts} = {
   'Bis Konto: '                 => 'bis Konto: ',
   'Body'                        => 'Text',
   'Body:'                       => 'Text:',
-  'Booking Date'                => 'Buchungsdatum',
   'Booking group'               => 'Buchungsgruppe',
   'Booking group #1 needs a valid expense account' => 'Buchungsgruppe #1 braucht ein gültiges Aufwandskonto',
   'Booking group #1 needs a valid income account' => 'Buchungsgruppe #1 braucht ein gültiges Erfolgskonto',
@@ -465,9 +463,6 @@ $self->{texts} = {
   'Bought'                      => 'Gekauft',
   'Break down by'               => 'Aufschlüsseln nach',
   'Break up the update and contact a service provider.' => 'Diese Option bricht das Update ab. Bitte kontaktieren Sie Ihren Administrator oder beauftragen einen Dienstleister.',
-  'Buchungsdatum'               => 'Buchungsdatum',
-  'Buchungskonto'               => 'Buchungskonto',
-  'Buchungsnummer'              => 'Buchungsnummer',
   'Business'                    => 'Kunden-/Lieferantentyp',
   'Business Discount'           => 'Kunden-/Lieferantentyp-Rabatt',
   'Business Number'             => 'Firmennummer',
@@ -843,7 +838,6 @@ $self->{texts} = {
   'Date Paid'                   => 'Zahlungsdatum',
   'Date and timestamp variables: If the default value equals \'NOW\' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.' => 'Datums- und Uhrzeitvariablen: Wenn der Standardwert \'NOW\' ist, so wird das aktuelle Datum/die aktuelle Uhrzeit eingefügt. Andernfalls wird der Standardwert so wie er ist benutzt.',
   'Date missing!'               => 'Datum fehlt!',
-  'Date of transaction'         => 'Buchungsdatum',
   'Date the payment is due in full' => 'Das Datum, bis die Rechnung in voller Höhe bezahlt werden muss',
   'Date the payment is due with discount' => 'Das Datum, bis die Rechnung unter Abzug von Skonto bezahlt werden kann',
   'Datevautomatik'              => 'Datev-Automatik',
@@ -1421,6 +1415,7 @@ $self->{texts} = {
   'Germany'                     => 'Deutschland',
   'Git revision: #1, #2 #3'     => 'Git-Revision: #1, #2 #3',
   'Given Name'                  => 'Vorname',
+  'Gldate'                     => 'Erfassungsdatum',
   'Global Attachments'          => 'Allgemeine Dokumentenanhänge',
   'Global Record BCC'           => 'Globale BCC-Adresse',
   'GoBD Export'                 => 'GoBD Export',
@@ -3323,12 +3318,13 @@ $self->{texts} = {
   'Transactions without account:' => 'Buchungen ohne Konto:',
   'Transactions without reference:' => 'Buchungen ohne Referenz:',
   'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen',
-  'Transdate'                   => 'Belegdatum',
+  'Transdate'                   => 'Buchungsdatum',
+  'Transdate Record'           => 'Buchungsdatum Beleg',
   'Transdate from'              => 'Kontoauszugsdatum von',
   'Transdate is #1'             => 'Belegdatum ist #1',
   'Transdate is after #1'       => 'Belegdatum ist nach #1',
   'Transdate is before #1'      => 'Belegdatum ist vor #1',
-  'Transdate to'                => 'Buchungsdatum bis',
+  'Transdate to'                => 'Kontoauszugsdatum bis',
   'Transfer'                    => 'Umlagern',
   'Transfer Quantity'           => 'Umlagermenge',
   'Transfer To Stock'           => 'Lagereingang',
@@ -3469,8 +3465,7 @@ $self->{texts} = {
   'Valid until'                 => 'gültig bis',
   'Valid/Obsolete'              => 'Gültig/ungültig',
   'Value'                       => 'Wert',
-  'Valuta date'                 => 'Valutadatum',
-  'Valutadate'                  => 'Valutadatum',
+  'Valutadate'                 => 'Valutadatum',
   'Valutadate from'             => 'Valutadatum von',
   'Valutadate to'               => 'Valutadatum bis',
   'Variable'                    => 'Variable',

diff --git a/locale/en/all b/locale/en/all
index 32da270f6bc3157e704f20558f1bce41d8e9bd24..b9a3911806369ac45daa55894e9923baa55ef0fc 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -413,7 +413,6 @@ $self->{texts} = {
   'Bcc E-mail'                  => '',
   'Because the useability gets worse if one partnumber is used for several parts (for example if you are searching a position for an invoice), partnumbers should be unique.' => '',
   'Before saving a sales order, this article will be checked and a warning is generated.' => '',
-  'Belegnummer'                 => '',
   'Belgium'                     => '',
   'Beratername'                 => '',
   'Beraternummer'               => '',
@@ -448,7 +447,6 @@ $self->{texts} = {
   'Bis Konto: '                 => '',
   'Body'                        => '',
   'Body:'                       => '',
-  'Booking Date'                => '',
   'Booking group'               => '',
   'Booking group #1 needs a valid expense account' => '',
   'Booking group #1 needs a valid income account' => '',
@@ -465,9 +463,6 @@ $self->{texts} = {
   'Bought'                      => '',
   'Break down by'               => '',
   'Break up the update and contact a service provider.' => '',
-  'Buchungsdatum'               => '',
-  'Buchungskonto'               => '',
-  'Buchungsnummer'              => '',
   'Business'                    => '',
   'Business Discount'           => '',
   'Business Number'             => '',
@@ -843,7 +838,6 @@ $self->{texts} = {
   'Date Paid'                   => '',
   'Date and timestamp variables: If the default value equals \'NOW\' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.' => '',
   'Date missing!'               => '',
-  'Date of transaction'         => '',
   'Date the payment is due in full' => '',
   'Date the payment is due with discount' => '',
   'Datevautomatik'              => '',
@@ -1421,6 +1415,7 @@ $self->{texts} = {
   'Germany'                     => '',
   'Git revision: #1, #2 #3'     => '',
   'Given Name'                  => '',
+  'Gldate'                     => 'Entry Date',
   'Global Attachments'          => '',
   'Global Record BCC'           => '',
   'GoBD Export'                 => '',
@@ -3322,11 +3317,12 @@ $self->{texts} = {
   'Transactions without account:' => '',
   'Transactions without reference:' => '',
   'Transactions, AR transactions, AP transactions' => '',
-  'Transdate'                   => '',
+  'Transdate'                   => 'Booking Date',
+  'Transdate Record'           => 'Booking Date Record',
   'Transdate from'              => '',
-  'Transdate is #1'             => '',
-  'Transdate is after #1'       => '',
-  'Transdate is before #1'      => '',
+  'Transdate is #1'             => 'Record date is #1',
+  'Transdate is after #1'       => 'Record date is after #1',
+  'Transdate is before #1'      => 'Record date is before #1',
   'Transdate to'                => '',
   'Transfer'                    => '',
   'Transfer Quantity'           => '',
@@ -3468,8 +3464,7 @@ $self->{texts} = {
   'Valid until'                 => '',
   'Valid/Obsolete'              => '',
   'Value'                       => '',
-  'Valuta date'                 => '',
-  'Valutadate'                  => '',
+  'Valutadate'                 => '',
   'Valutadate from'             => '',
   'Valutadate to'               => '',
   'Variable'                    => '',

diff --git a/templates/webpages/ap/search.html b/templates/webpages/ap/search.html
index 5170b1fcdf26bb41a7834d7ae38a2b4306ed48c1..ac1d70fd603aed327f254fc08932af90846f9b31 100644 (file)
--- a/templates/webpages/ap/search.html
+++ b/templates/webpages/ap/search.html
@@ -116,7 +116,7 @@
            <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Payment Terms' | $T8 %]</td>
            <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
+           <td nowrap>[% 'Chart' | $T8 %]</td>
            <td align=right><input name="l_direct_debit" id="l_direct_debit" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'direct debit' | $T8 %]</td>
           </tr>

diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index ceac6ce5a88bde58cd648956ea4f9950251742c0..1c0b9e60ab24301688a819dd6e089ec092f9687e 100644 (file)
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -179,7 +179,7 @@
            <td align=right><input name="l_payment_terms" id="l_payment_terms" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Payment Terms' | $T8 %]</td>
            <td align=right><input name="l_charts" id="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
+           <td nowrap>[% 'Chart' | $T8 %]</td>
            <td align=right><input name="l_direct_debit" id="l_direct_debit" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'direct debit' | $T8 %]</td>
           </tr>

diff --git a/templates/webpages/bank_transactions/add_list.html b/templates/webpages/bank_transactions/add_list.html
index d562172179201e08259b340660020399bca30534..e32f4fa5c70b0aa62e0dd01d50bfb0f338cfb0c4 100644 (file)
--- a/templates/webpages/bank_transactions/add_list.html
+++ b/templates/webpages/bank_transactions/add_list.html
@@ -9,7 +9,7 @@
     <th>[%- LxERP.t8("Amount") %]</th>
     <th>[%- LxERP.t8("Open amount") %]</th>
     <th>[%- LxERP.t8("Amount less skonto") %]</th>
-    <th>[%- LxERP.t8("Transdate") %]</th>
+    <th>[%- LxERP.t8("Invoice Date") %]</th>
     <th>[%- LxERP.t8("Customer/Vendor number") %]</th>
     <th>[%- LxERP.t8("Customer/Vendor name") %]</th>
    </tr>

diff --git a/templates/webpages/dbupgrade/acc_trans_constraints.html b/templates/webpages/dbupgrade/acc_trans_constraints.html
index 7cfa410dfa3ed73a697b2e60b3ecb47bfe79dcce..b0e1e8d548018ba6ce532ff8c0ffdbb0b467e281 100644 (file)
--- a/templates/webpages/dbupgrade/acc_trans_constraints.html
+++ b/templates/webpages/dbupgrade/acc_trans_constraints.html
@@ -14,10 +14,10 @@
   <table>
     <tr>
       <th class="listheading">[% 'Database ID' | $T8 %]</th>
-      <th class="listheading">[% 'Booking Date' | $T8 %]</th>
-      <th class="listheading">[% 'Invoice Date' | $T8 %]</th>
+      <th class="listheading">[% 'Gldate' | $T8 %]</th>
+      <th class="listheading">[% 'Transdate' | $T8 %]</th>
       <th class="listheading">[% 'Amount' | $T8 %]</th>
-      <th class="listheading">[% 'Buchungsnummer' | $T8 %]</th>
+      <th class="listheading">[% 'ID' | $T8 %]</th>
       <th class="listheading">[% 'Source' | $T8 %]</th>
       <th class="listheading">[% 'Reference / Invoice Number' | $T8 %]</th>
       <th class="listheading">[% 'Description' | $T8 %]</th>
@@ -54,8 +54,8 @@
   <table>
     <tr>
       <th class="listheading">[% 'Database ID' | $T8 %]</th>
-      <th class="listheading">[% 'Booking Date' | $T8 %]</th>
-      <th class="listheading">[% 'Invoice Date' | $T8 %]</th>
+      <th class="listheading">[% 'Gldate' | $T8 %]</th>
+      <th class="listheading">[% 'Transdate' | $T8 %]</th>
       <th class="listheading">[% 'Amount' | $T8 %]</th>
       <th class="listheading">[% 'Source' | $T8 %]</th>
       <th class="listheading">[% 'Account Number' | $T8 %]</th>

diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html
index f5a792b912b3dcd67fe9bc94cede629d48b05f64..e8b7b5a6a397adf450f31ce71cad27aeaf9eaeb7 100644 (file)
--- a/templates/webpages/gl/form_header.html
+++ b/templates/webpages/gl/form_header.html
@@ -66,7 +66,7 @@
           <td align=left>
             <table>
               <tr>
-                <th align=right width=50% nowrap>[% 'Date' | $T8 %]</th>
+                <th align=right width=50% nowrap>[% 'Transdate' | $T8 %]</th>
                 <td>[% L.date_tag('transdate', transdate, readonly=readonly) %]</td>
               </tr>
             </table>
@@ -74,12 +74,12 @@
         </tr>
 [%- IF id %]
         <tr>
-          <th align=right>[% 'Belegnummer' | $T8 %]</th>
+          <th align=right>[% 'ID' | $T8 %]</th>
           <td>[% L.input_tag('id', id,  size=20, readonly=readonly) %]</td>
           <td align=left>
           <table>
               <tr>
-                <th align=right width=50%>[% 'Buchungsdatum' | $T8 %]</th>
+                <th align=right width=50%>[% 'Gldate' | $T8 %]</th>
                 <td align=left>[% L.date_tag('gldate', gldate, readonly=1) %]</td>
               </tr>
             </table>

diff --git a/templates/webpages/gl/search.html b/templates/webpages/gl/search.html
index 2ba1e398e0f05ca98679b2a16a61da39accc56da..c4f8db381b9aaa1d03db61bc57dd47b467541ea6 100644 (file)
--- a/templates/webpages/gl/search.html
+++ b/templates/webpages/gl/search.html
@@ -45,8 +45,8 @@
   <tr>
     <th align=right>[% 'Filter date by' | $T8 %]</th>
     <td colspan=3>
-    <input name=datesort class=radio type=radio value=gldate checked> [% 'Booking Date' | $T8 %]
-    <input name=datesort class=radio type=radio value=transdate> [% 'Invoice Date' | $T8 %]
+    <input name=datesort class=radio type=radio value=transdate checked> [% 'Transdate' | $T8 %]
+    <input name=datesort class=radio type=radio value=gldate> [% 'Gldate' | $T8 %]
   </td>
   </tr>
   <tr>
@@ -74,9 +74,9 @@
                     <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
                     <td>[% 'ID' | $T8 %]</td>
                     <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-                    <td>[% 'Invoice Date' | $T8 %]</td>
+                    <td>[% 'Transdate' | $T8 %]</td>
                     <td align=right><input name="l_gldate" class=checkbox type=checkbox value=Y checked></td>
-                    <td>[% 'Booking Date' | $T8 %]</td>
+                    <td>[% 'Gldate' | $T8 %]</td>
                     <td align=right><input name="l_reference" class=checkbox type=checkbox value=Y checked></td>
                     <td>[% 'Reference' | $T8 %]</td>
                     <td align=right><input name="l_description" class=checkbox type=checkbox value=Y checked></td>

diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index 80be43c6abe00a8f318a6b4689c57838bf91fed4..51d4bc10f1dc7ba8b3eb6c3502befbd88c29d506 100644 (file)
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -205,10 +205,10 @@
          </tr>
 
          <tr>
-          <td>[%- L.checkbox_tag('l_transdate', label=LxERP.t8('Transdate'), value='Y') %]</td>
-          <td>[%- L.checkbox_tag('l_subtotal', label=LxERP.t8('Subtotal'), value='Y') %]</td>
-          <td>[%- L.checkbox_tag('l_soldtotal', label=LxERP.t8('Qty in Selected Records'), value='Y') %]</td>
+          <td>[%- L.checkbox_tag('l_insertdate', label=LxERP.t8('Insert Date'), value='Y') %]</td>
+          <td>[%- L.checkbox_tag('l_notes', label=LxERP.t8('Notes'), value='Y') %]</td>
           <td>[%- L.checkbox_tag('l_ean', label=LxERP.t8('EAN'), value='Y') %]</td>
+          <td>[%- L.checkbox_tag('l_shop', label=LxERP.t8('Shop article'), value='Y') %]</td>
          </tr>
 
          <tr>
@@ -219,10 +219,10 @@
          </tr>
 
          <tr>
-          <td>[%- L.checkbox_tag('l_notes', label=LxERP.t8('Notes'), value='Y') %]</td>
+          <td>[%- L.checkbox_tag('l_subtotal', label=LxERP.t8('Subtotal'), value='Y') %]</td>
+          <td>[%- L.checkbox_tag('l_transdate', label=LxERP.t8('Transdate Record'), value='Y') %]</td>
           <td>[%- L.checkbox_tag('l_name', label=LxERP.t8('Name in Selected Records'), value='Y') %]</td>
-          <td>[%- L.checkbox_tag('l_shop', label=LxERP.t8('Shop article'), value='Y') %]</td>
-          <td>[%- L.checkbox_tag('l_insertdate', label=LxERP.t8('Insert Date'), value='Y') %]</td>
+          <td>[%- L.checkbox_tag('l_soldtotal', label=LxERP.t8('Qty in Selected Records'), value='Y') %]</td>
          </tr>
 
          [% CUSTOM_VARIABLES_INCLUSION_CODE %]

diff --git a/templates/webpages/mass_invoice_create_print_from_do/_filter.html b/templates/webpages/mass_invoice_create_print_from_do/_filter.html
index 67666ba655a289280be796f87f9ec858994e72be..481ce178af14633250463aa56d3ad824c0776f30 100644 (file)
--- a/templates/webpages/mass_invoice_create_print_from_do/_filter.html
+++ b/templates/webpages/mass_invoice_create_print_from_do/_filter.html
@@ -13,11 +13,11 @@
      <th align="right">[% LxERP.t8('Customer') %]</th>
      <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, size = 20) %]</td>
     </tr>
-     <th align="right">[% LxERP.t8('Transdate') %] [% LxERP.t8('From Date') %]</th>
+     <th align="right">[% LxERP.t8('Delivery Order Date') %] [% LxERP.t8('From Date') %]</th>
      <td>[% L.date_tag('filter.transdate:date::ge', filter.transdate_date__ge) %]</td>
     </tr>
     <tr>
-     <th align="right">[% LxERP.t8('Transdate') %] [% LxERP.t8('To Date') %]</th>
+     <th align="right">[% LxERP.t8('Delivery Order Date') %] [% LxERP.t8('To Date') %]</th>
      <td>[% L.date_tag('filter.transdate:date::le', filter.transdate_date__le) %]</td>
     </tr>
   </table>

diff --git a/templates/webpages/order_items_search/_order_item_list.html b/templates/webpages/order_items_search/_order_item_list.html
index 3a66857d90109743c9eadd7021d173bacb35501b..0ae57596d57dc67048895bb89057419e27c79de0 100644 (file)
--- a/templates/webpages/order_items_search/_order_item_list.html
+++ b/templates/webpages/order_items_search/_order_item_list.html
@@ -9,7 +9,7 @@
   <th>[%- LxERP.t8("Part")           %]</th>
   <th>[%- LxERP.t8("Customer")       %]</th>
   <th>[%- LxERP.t8("Order")          %]</th>
-  <th>[%- LxERP.t8("Transdate")      %]</th>
+  <th>[%- LxERP.t8("Order Date")      %]</th>
   <th>[%- LxERP.t8("Qty")            %]</th>
   <th>[%- LxERP.t8("Delivered")      %]</th>
   <th>[%- LxERP.t8("Price")          %]</th>

diff --git a/templates/webpages/price_rule/_filter.html b/templates/webpages/price_rule/_filter.html
index c11585b74e2e0561d749aa38950150b568c9a08b..e39733d930aee921580f657b8401a721acda9236 100644 (file)
--- a/templates/webpages/price_rule/_filter.html
+++ b/templates/webpages/price_rule/_filter.html
@@ -47,7 +47,7 @@
    <td>[% L.date_tag('filter.item_type_matches[].reqdate', FORM.filter.item_type_matches.0.reqdate, style='width: 300px') %]</td>
   </tr>
   <tr>
-   <th align="right">[% 'Transdate' | $T8 %]</th>
+   <th align="right">[% 'Transdate Record' | $T8 %]</th>
    <td>[% L.date_tag('filter.item_type_matches[].transdate', FORM.filter.item_type_matches.0.transdate, style='width: 300px') %]</td>
   </tr>
   <tr>

diff --git a/templates/webpages/price_rule/item.html b/templates/webpages/price_rule/item.html
index a6eaa5144967d67816303e83f383b30b21bbe450..e0906669db60680bd36eb0b2fc6d640ec060e555 100644 (file)
--- a/templates/webpages/price_rule/item.html
+++ b/templates/webpages/price_rule/item.html
@@ -32,7 +32,7 @@
   [% CASE 'reqdate' %]
     [% 'Reqdate' | $T8 %] [% L.select_tag('price_rule.items[].op', date_compare_ops, default=item.op) %] [% L.date_tag('price_rule.items[].value_date', item.value_date) %]
   [% CASE 'transdate' %]
-    [% 'Transdate' | $T8 %] [% L.select_tag('price_rule.items[].op', date_compare_ops, default=item.op) %] [% L.date_tag('price_rule.items[].value_date', item.value_date) %]
+    [% 'Transdate Record' | $T8 %] [% L.select_tag('price_rule.items[].op', date_compare_ops, default=item.op) %] [% L.date_tag('price_rule.items[].value_date', item.value_date) %]
   [% CASE 'pricegroup' %]
     [% 'Pricegroup' | $T8 %] [% 'is' | $T8 %] [% L.select_tag('price_rule.items[].value_int', SELF.pricegroups, title_key='pricegroup', default=item.value_int) %]
   [% CASE %]