From: Andreas Rudin Date: Thu, 18 May 2017 14:07:22 +0000 (+0200) Subject: Korrekturen und Vereinheitlichung der Nomenklatur bzgl. Buchungs- und Erfassungsdatum... X-Git-Tag: release-3.5.4~1086 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0070a2500fcd59d65a6f39a7a4e8d5eb9ef6cdbd;p=kivitendo-erp.git Korrekturen und Vereinheitlichung der Nomenklatur bzgl. Buchungs- und Erfassungsdatum, diverse kleinere Korrekturen bei der Nomenklatur --- diff --git a/SL/Controller/CsvImport/BankTransaction.pm b/SL/Controller/CsvImport/BankTransaction.pm index d6a7e87aa..50a89d89b 100644 --- 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 cbe4d338a..14fd1cc8e 100644 --- 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 3c6d2e3dd..8379608d4 100644 --- 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 bf96fa447..c39ba3407 100644 --- 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 b147580d1..50d56a966 100644 --- 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 d8d11fc98..708e72653 100644 --- 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 82b8a508d..a6e36daaa 100644 --- 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 7af34d8fb..9d1784f78 100644 --- 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 b625c868a..862315320 100644 --- 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 d6a67c47a..f11fad9a8 100644 --- 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 f7b950ca2..a81fd6289 100755 --- 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 32da270f6..b9a391180 100644 --- 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 5170b1fcd..ac1d70fd6 100644 --- a/templates/webpages/ap/search.html +++ b/templates/webpages/ap/search.html @@ -116,7 +116,7 @@ [% 'Payment Terms' | $T8 %] - [% 'Buchungskonto' | $T8 %] + [% 'Chart' | $T8 %] [% 'direct debit' | $T8 %] diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html index ceac6ce5a..1c0b9e60a 100644 --- a/templates/webpages/ar/search.html +++ b/templates/webpages/ar/search.html @@ -179,7 +179,7 @@ [% 'Payment Terms' | $T8 %] - [% 'Buchungskonto' | $T8 %] + [% 'Chart' | $T8 %] [% 'direct debit' | $T8 %] diff --git a/templates/webpages/bank_transactions/add_list.html b/templates/webpages/bank_transactions/add_list.html index d56217217..e32f4fa5c 100644 --- a/templates/webpages/bank_transactions/add_list.html +++ b/templates/webpages/bank_transactions/add_list.html @@ -9,7 +9,7 @@ [%- LxERP.t8("Amount") %] [%- LxERP.t8("Open amount") %] [%- LxERP.t8("Amount less skonto") %] - [%- LxERP.t8("Transdate") %] + [%- LxERP.t8("Invoice Date") %] [%- LxERP.t8("Customer/Vendor number") %] [%- LxERP.t8("Customer/Vendor name") %] diff --git a/templates/webpages/dbupgrade/acc_trans_constraints.html b/templates/webpages/dbupgrade/acc_trans_constraints.html index 7cfa410df..b0e1e8d54 100644 --- a/templates/webpages/dbupgrade/acc_trans_constraints.html +++ b/templates/webpages/dbupgrade/acc_trans_constraints.html @@ -14,10 +14,10 @@ - - + + - + @@ -54,8 +54,8 @@
[% 'Database ID' | $T8 %][% 'Booking Date' | $T8 %][% 'Invoice Date' | $T8 %][% 'Gldate' | $T8 %][% 'Transdate' | $T8 %] [% 'Amount' | $T8 %][% 'Buchungsnummer' | $T8 %][% 'ID' | $T8 %] [% 'Source' | $T8 %] [% 'Reference / Invoice Number' | $T8 %] [% 'Description' | $T8 %]
- - + + diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html index f5a792b91..e8b7b5a6a 100644 --- a/templates/webpages/gl/form_header.html +++ b/templates/webpages/gl/form_header.html @@ -66,7 +66,7 @@ [%- IF id %] - + @@ -74,9 +74,9 @@ - + - + diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html index 80be43c6a..51d4bc10f 100644 --- a/templates/webpages/ic/search.html +++ b/templates/webpages/ic/search.html @@ -205,10 +205,10 @@ - - - + + + @@ -219,10 +219,10 @@ - + + - - + [% 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 67666ba65..481ce178a 100644 --- 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 @@ - + - +
[% 'Database ID' | $T8 %][% 'Booking Date' | $T8 %][% 'Invoice Date' | $T8 %][% 'Gldate' | $T8 %][% 'Transdate' | $T8 %] [% 'Amount' | $T8 %] [% 'Source' | $T8 %] [% 'Account Number' | $T8 %] - +
[% 'Date' | $T8 %][% 'Transdate' | $T8 %] [% L.date_tag('transdate', transdate, readonly=readonly) %]
@@ -74,12 +74,12 @@
[% 'Belegnummer' | $T8 %][% 'ID' | $T8 %] [% L.input_tag('id', id, size=20, readonly=readonly) %] - +
[% 'Buchungsdatum' | $T8 %][% 'Gldate' | $T8 %] [% L.date_tag('gldate', gldate, readonly=1) %]
diff --git a/templates/webpages/gl/search.html b/templates/webpages/gl/search.html index 2ba1e398e..c4f8db381 100644 --- a/templates/webpages/gl/search.html +++ b/templates/webpages/gl/search.html @@ -45,8 +45,8 @@
[% 'Filter date by' | $T8 %] - [% 'Booking Date' | $T8 %] - [% 'Invoice Date' | $T8 %] + [% 'Transdate' | $T8 %] + [% 'Gldate' | $T8 %]
[% 'ID' | $T8 %] [% 'Invoice Date' | $T8 %][% 'Transdate' | $T8 %] [% 'Booking Date' | $T8 %][% 'Gldate' | $T8 %] [% 'Reference' | $T8 %]
[%- L.checkbox_tag('l_transdate', label=LxERP.t8('Transdate'), value='Y') %][%- L.checkbox_tag('l_subtotal', label=LxERP.t8('Subtotal'), value='Y') %][%- L.checkbox_tag('l_soldtotal', label=LxERP.t8('Qty in Selected Records'), value='Y') %][%- L.checkbox_tag('l_insertdate', label=LxERP.t8('Insert Date'), value='Y') %][%- L.checkbox_tag('l_notes', label=LxERP.t8('Notes'), value='Y') %] [%- L.checkbox_tag('l_ean', label=LxERP.t8('EAN'), value='Y') %][%- L.checkbox_tag('l_shop', label=LxERP.t8('Shop article'), value='Y') %]
[%- L.checkbox_tag('l_notes', label=LxERP.t8('Notes'), value='Y') %][%- L.checkbox_tag('l_subtotal', label=LxERP.t8('Subtotal'), value='Y') %][%- L.checkbox_tag('l_transdate', label=LxERP.t8('Transdate Record'), value='Y') %] [%- L.checkbox_tag('l_name', label=LxERP.t8('Name in Selected Records'), value='Y') %][%- L.checkbox_tag('l_shop', label=LxERP.t8('Shop article'), value='Y') %][%- L.checkbox_tag('l_insertdate', label=LxERP.t8('Insert Date'), value='Y') %][%- L.checkbox_tag('l_soldtotal', label=LxERP.t8('Qty in Selected Records'), value='Y') %]
[% LxERP.t8('Customer') %] [% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, size = 20) %]
[% LxERP.t8('Transdate') %] [% LxERP.t8('From Date') %][% LxERP.t8('Delivery Order Date') %] [% LxERP.t8('From Date') %] [% L.date_tag('filter.transdate:date::ge', filter.transdate_date__ge) %]
[% LxERP.t8('Transdate') %] [% LxERP.t8('To Date') %][% LxERP.t8('Delivery Order Date') %] [% LxERP.t8('To Date') %] [% L.date_tag('filter.transdate:date::le', filter.transdate_date__le) %]
diff --git a/templates/webpages/order_items_search/_order_item_list.html b/templates/webpages/order_items_search/_order_item_list.html index 3a66857d9..0ae57596d 100644 --- a/templates/webpages/order_items_search/_order_item_list.html +++ b/templates/webpages/order_items_search/_order_item_list.html @@ -9,7 +9,7 @@ [%- LxERP.t8("Part") %] [%- LxERP.t8("Customer") %] [%- LxERP.t8("Order") %] - [%- LxERP.t8("Transdate") %] + [%- LxERP.t8("Order Date") %] [%- LxERP.t8("Qty") %] [%- LxERP.t8("Delivered") %] [%- LxERP.t8("Price") %] diff --git a/templates/webpages/price_rule/_filter.html b/templates/webpages/price_rule/_filter.html index c11585b74..e39733d93 100644 --- a/templates/webpages/price_rule/_filter.html +++ b/templates/webpages/price_rule/_filter.html @@ -47,7 +47,7 @@ [% L.date_tag('filter.item_type_matches[].reqdate', FORM.filter.item_type_matches.0.reqdate, style='width: 300px') %] - [% 'Transdate' | $T8 %] + [% 'Transdate Record' | $T8 %] [% L.date_tag('filter.item_type_matches[].transdate', FORM.filter.item_type_matches.0.transdate, style='width: 300px') %] diff --git a/templates/webpages/price_rule/item.html b/templates/webpages/price_rule/item.html index a6eaa5144..e0906669d 100644 --- 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 %]