From: Werner Hahn <wh@futureworldsearch.net>
Date: Tue, 11 Sep 2018 07:22:08 +0000 (+0200)
Subject: Kundenstatistik: Link bei den Rechnungen, Übersetzungen
X-Git-Tag: release-3.5.4~283
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b058e195e82aa1f6b7614b8f83be6122ec3d3dca;p=kivitendo-erp.git

Kundenstatistik: Link bei den Rechnungen, Übersetzungen
---

diff --git a/locale/de/all b/locale/de/all
index f8ce2d640..794c82a98 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -1094,7 +1094,8 @@ $self->{texts} = {
   'Dunning overview'            => 'Mahnungsübersicht',
   'Dunning status'              => 'Mahnstatus',
   'Dunnings'                    => 'Mahnungen',
-  'Dunningstatistic'            => 'Mahnstatistic',
+  'Dunnings (Id -- Dunning Date --Dunning Level -- Dunning Fee)' => 'Mahnungen -- Mahndatum -- Mahnstufe -- Mahngebühr/Zinsen',
+  'Dunningstatistic'            => 'Mahnstatistik',
   'Duplicate in CSV file'       => 'Duplikat in CSV-Datei',
   'Duplicate in database'       => 'Duplikat in Datenbank',
   'During the next update a taxkey 0 with tax rate of 0 will automatically created.' => 'Beim nächsten Ausführen des Updates wird ein Steuerschlüssel 0 mit einem Steuersatz von 0% automatisch erzeugt.',
@@ -1824,7 +1825,7 @@ $self->{texts} = {
   'MD'                          => 'PT',
   'MIME type'                   => 'MIME-Typ',
   'MT940 import'                => 'MT940 Import',
-  'Mails'                       => 'Emails',
+  'Mails'                       => 'E-Mails',
   'Main Preferences'            => 'Grundeinstellungen',
   'Main sorting'                => 'Hauptsortierung',
   'Make'                        => 'Lieferant',
diff --git a/templates/webpages/customer_vendor_turnover/_list_open_items.html b/templates/webpages/customer_vendor_turnover/_list_open_items.html
index 0f62e6eaa..4ea914803 100644
--- a/templates/webpages/customer_vendor_turnover/_list_open_items.html
+++ b/templates/webpages/customer_vendor_turnover/_list_open_items.html
@@ -14,12 +14,12 @@
         <td class="listheading">[% 'Inv. Duedate' | $T8 %]</td>
         <td class="listheading">[% 'Paid' | $T8 %]</td>
         <td class="listheading">[% 'Open Amount' | $T8 %]</td>
-        <td class="listheading">[% 'Dunnings' | $T8 %]</td>
+        <td class="listheading">[% 'Dunnings (Id -- Dunning Date --Dunning Level -- Dunning Fee)' | $T8 %]</td>
       </tr>
 
       [%- FOREACH row = OPEN_ITEMS %]
       <tr class="listrow[% loop.count % 2 %]">
-        <td>[% row.invnumber | html %]</td>
+        <td><a href="[% IF row.type == 'invoice' || row.type == 'credit_note' %]is.pl[% ELSE %]ar.pl[% END %]?action=edit&id=[% row.id %]#ui-tabs-basic-data">[% row.invnumber | html %]</a></td>
         <td>[% row.transdate.to_kivitendo | html %]</td>
         <td>[%- LxERP.format_amount(row.amount, 2) %]</td>
         <td>[% row.duedate.to_kivitendo | html %]</td>
@@ -28,7 +28,7 @@
         <td>
         [%- IF row.dunning_config_id != '' %]
           [%- FOREACH dun = row.dunnings %]
-          [% dun.dunning_id | html %] -- [% dun.duedate.to_kivitendo | html %] -- [% dun.dunning_level | html %] -- [% dun.fee %]<br>
+          [% dun.dunning_id | html %] -- [% dun.transdate.to_kivitendo | html %] -- [% dun.dunning_level | html %] -- [%- LxERP.format_amount(dun.fee, 2) %]<br>
           [% END %]
         [% END %]
         </td>
diff --git a/templates/webpages/customer_vendor_turnover/invoices_statistic.html b/templates/webpages/customer_vendor_turnover/invoices_statistic.html
index 7b8f3d945..16a157461 100644
--- a/templates/webpages/customer_vendor_turnover/invoices_statistic.html
+++ b/templates/webpages/customer_vendor_turnover/invoices_statistic.html
@@ -16,7 +16,7 @@
 
       [%- FOREACH row = invoices %]
       <tr class="listrow[% loop.count % 2 %]">
-        <td>[% row.invnumber | html %]</td>
+        <td><a href="[% IF row.type == 'invoice' || row.type == 'credit_note' %]is.pl[% ELSE %]ar.pl[% END %]?action=edit&id=[% row.id %]#ui-tabs-basic-data">[% row.invnumber | html %]</a></td>
         <td>[% row.transdate.to_kivitendo | html %]</td>
         <td>[%- LxERP.format_amount(row.amount, 2) %]</td>
         <td>[% row.duedate.to_kivitendo | html %]</td>
@@ -27,7 +27,7 @@
     </tbody>
   </table>
 
-      
+
     </tbody>
   </table>
 </div>