Merge branch 'master' of ssh://lx-office/~/lx-office-erp

diff --git a/SL/Form.pm b/SL/Form.pm
index 32a82e08bd3595baf0fff992a8a909309f95d2fa..2ba19b65cea9ca933ddbcce091bbfce371cf9297 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1813,6 +1813,7 @@ sub set_payment_options {
     $amounts{invtotal} = $self->{invtotal};
     $amounts{total}    = $self->{total};
   }
+  $amounts{skonto_in_percent} = 100.0 * $self->{percent_skonto};
 
   map { $amounts{$_} = $self->parse_amount($myconfig, $amounts{$_}) } keys %amounts;
 
@@ -1866,6 +1867,8 @@ sub set_payment_options {
 
   map { $self->{payment_terms} =~ s/<%${_}%>/$formatted_amounts{$_}/g; } keys %formatted_amounts;
 
+  $self->{skonto_in_percent} = $formatted_amounts{skonto_in_percent};
+
   $main::lxdebug->leave_sub();
 
 }

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 1700b754faa1ba9964704b3fffd8de2ac99c28f3..a1e227fa8a03f02772b4c4a8a2204a415cdbc58f 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -2531,6 +2531,8 @@ sub payment_header {
                         "with discount")
 . qq|</li>
   <li>| . $locale->text("&lt;%skonto_amount%&gt; -- The deductible amount")
+. qq|</li>
+  <li>| . $locale->text("&lt;%skonto_in_percent%&gt; -- The discount in percent")
 . qq|</li>
   <li>| . $locale->text("&lt;%total%&gt; -- Amount payable")
 . qq|</li>

diff --git a/locale/de/am b/locale/de/am
index 06eb1308ca92da5b4161a39bbd2abdef7380e79a..c4e043aa6d6191d3a711c34d28788872abbb3eb6 100644 (file)
--- a/locale/de/am
+++ b/locale/de/am
@@ -10,6 +10,7 @@ $self->{texts} = {
   '<%netto_date%> -- Date the payment is due in full' => '<%netto_date%> -- Das Datum, bis die Rechnung in voller Höhe bezahlt werden muss',
   '<%skonto_amount%> -- The deductible amount' => '<%skonto_amount%> -- Der abziehbare Skontobetrag',
   '<%skonto_date%> -- Date the payment is due with discount' => '<%skonto_date%> -- Das Datum, bis die Rechnung unter Abzug von Skonto bezahlt werden kann',
+  '<%skonto_in_percent%> -- The discount in percent' => '<%skonto_in_percent%> -- Skonto in Prozent',
   '<%terms_netto%> -- The number of days for full payment' => '<%terms_netto%> -- Die Anzahl Tage, bis die Rechnung in voller Höhe bezahlt werden muss',
   '<%total%> -- Amount payable' => '<%total%> -- Noch zu bezahlender Betrag',
   '<%total_wo_skonto%> -- Amount payable less discount' => '<%total_wo_skonto%> -- Noch zu bezahlender Betrag abzüglich Skonto',

diff --git a/locale/en/am b/locale/en/am
index b9937cd9895b101211a6ee409a63df8ffe350004..5c02a96251d4f9ff46afd2917e4c1aeed5e1deae 100644 (file)
--- a/locale/en/am
+++ b/locale/en/am
@@ -10,6 +10,7 @@ $self->{texts} = {
   '<%netto_date%> -- Date the payment is due in full' => '<%netto_date%> -- Date the payment is due in full',
   '<%skonto_amount%> -- The deductible amount' => '<%skonto_amount%> -- The deductible amount',
   '<%skonto_date%> -- Date the payment is due with discount' => '<%skonto_date%> -- Date the payment is due with discount',
+  '<%skonto_in_percent%> -- The discount in percent' => '<%skonto_in_percent%> -- The discount in percent',
   '<%terms_netto%> -- The number of days for full payment' => '<%terms_netto%> -- The number of days for full payment',
   '<%total%> -- Amount payable' => '<%total%> -- Amount payable',
   '<%total_wo_skonto%> -- Amount payable less discount' => '<%total_wo_skonto%> -- Amount payable less discount',