Zahlungsbedingungen: <%payment_(terms|options)%> werden nicht ersetzt

diff --git a/locale/de/all b/locale/de/all
index 3466131efa61de6a4d182a67a47131e0f5d6945b..65daedf052d512c9f8eefd3a70c2908b58dd05da 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1987,8 +1987,6 @@ $self->{texts} = {
   'Payment Terms'               => 'Zahlungsbedingungen',
   'Payment Terms missing in row ' => 'Zahlungsfrist fehlt in Zeile ',
   'Payment date missing!'       => 'Tag der Zahlung fehlt!',
   'Payment Terms'               => 'Zahlungsbedingungen',
   'Payment Terms missing in row ' => 'Zahlungsfrist fehlt in Zeile ',
   'Payment date missing!'       => 'Tag der Zahlung fehlt!',

-  'Payment description'         => 'Beschreibung der Zahlungsbedingung',
-  'Payment description detail'  => 'Langtext (Detail) der Zahlungsbedingung',

   'Payment list as PDF'         => 'Zahlungsliste als PDF',
   'Payment posted!'             => 'Zahlung gebucht!',
   'Payment terms'               => 'Zahlungsbedingungen',
   'Payment list as PDF'         => 'Zahlungsliste als PDF',
   'Payment posted!'             => 'Zahlung gebucht!',
   'Payment terms'               => 'Zahlungsbedingungen',

diff --git a/templates/webpages/payment_term/form.html b/templates/webpages/payment_term/form.html
index df09a016160416128aa36abc811ba81eee80c44d..6cd81c89d3dc75d0cdcd57980c57991daa8de835 100755 (executable)
--- a/templates/webpages/payment_term/form.html
+++ b/templates/webpages/payment_term/form.html
@@ -92,8 +92,6 @@
 
   <table>
    <tr class="listheading"><th>[%- LxERP.t8('Field') %]</th><th>[%- LxERP.t8('Description') %]</th></tr>
 
   <table>
    <tr class="listheading"><th>[%- LxERP.t8('Field') %]</th><th>[%- LxERP.t8('Description') %]</th></tr>

-   <tr><td>&lt;%payment_terms%&gt;</td><td>[% LxERP.t8("Payment description") %]</td></tr>
-   <tr><td>&lt;%payment_description%&gt;</td><td>[% LxERP.t8("Payment description detail") %]</td></tr>

    <tr><td>&lt;%netto_date%&gt;</td><td>[% LxERP.t8("Date the payment is due in full") %]</td></tr>
    <tr><td>&lt;%skonto_date%&gt;</td><td>[% LxERP.t8("Date the payment is due with discount") %]</td></tr>
    <tr><td>&lt;%skonto_amount%&gt;</td><td>[% LxERP.t8("The deductible amount") %]</td></tr>
    <tr><td>&lt;%netto_date%&gt;</td><td>[% LxERP.t8("Date the payment is due in full") %]</td></tr>
    <tr><td>&lt;%skonto_date%&gt;</td><td>[% LxERP.t8("Date the payment is due with discount") %]</td></tr>
    <tr><td>&lt;%skonto_amount%&gt;</td><td>[% LxERP.t8("The deductible amount") %]</td></tr>