Kundenstatistik: Fehler beim Link zu Rechnungen behoben

diff --git a/locale/de/all b/locale/de/all
index 794c82a..4ea1a6a 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1094,7 +1094,7 @@ $self->{texts} = {
   'Dunning overview'            => 'Mahnungsübersicht',
   'Dunning status'              => 'Mahnstatus',
   'Dunnings'                    => 'Mahnungen',
-  'Dunnings (Id -- Dunning Date --Dunning Level -- Dunning Fee)' => 'Mahnungen -- Mahndatum -- Mahnstufe -- Mahngebühr/Zinsen',
+  'Dunnings (Id -- Dunning Date --Dunning Level -- Dunning Fee)' => 'Mahnungen (Nummer -- Mahndatum -- Mahnstufe -- Mahngebühr/Zinsen)',
   'Dunningstatistic'            => 'Mahnstatistik',
   'Duplicate in CSV file'       => 'Duplikat in CSV-Datei',
   'Duplicate in database'       => 'Duplikat in Datenbank',

diff --git a/templates/webpages/customer_vendor_turnover/_list_open_items.html b/templates/webpages/customer_vendor_turnover/_list_open_items.html
index 4ea9148..55dc7df 100644 (file)
--- a/templates/webpages/customer_vendor_turnover/_list_open_items.html
+++ b/templates/webpages/customer_vendor_turnover/_list_open_items.html
@@ -8,31 +8,57 @@
     <caption class="listtop">[%- HTML.escape(title) %]</caption>
     <tbody>
       <tr>
+        <td class="listheading">[% 'Type' | $T8 %]</td>
         <td class="listheading">[% 'Invoice Number' | $T8 %]</td>
         <td class="listheading">[% 'Invoice Date' | $T8 %]</td>
         <td class="listheading">[% 'Amount' | $T8 %]</td>
         <td class="listheading">[% 'Inv. Duedate' | $T8 %]</td>
         <td class="listheading">[% 'Paid' | $T8 %]</td>
         <td class="listheading">[% 'Open Amount' | $T8 %]</td>
-        <td class="listheading">[% 'Dunnings (Id -- Dunning Date --Dunning Level -- Dunning Fee)' | $T8 %]</td>
+        [% IF FORM.db == 'customer' %]
+          <td class="listheading">[% 'Dunnings (Id -- Dunning Date --Dunning Level -- Dunning Fee)' | $T8 %]</td>
+        [% END %]
       </tr>
 
       [%- FOREACH row = OPEN_ITEMS %]
-      <tr class="listrow[% loop.count % 2 %]">
-        <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>
-        <td>[%- LxERP.format_amount(row.paid, 2) %]</td>
-        <td>[%- LxERP.format_amount(row.amount - row.paid,2) %]
-        <td>
-        [%- IF row.dunning_config_id != '' %]
-          [%- FOREACH dun = row.dunnings %]
-          [% dun.dunning_id | html %] -- [% dun.transdate.to_kivitendo | html %] -- [% dun.dunning_level | html %] -- [%- LxERP.format_amount(dun.fee, 2) %]<br>
+        [% IF FORM.db == 'customer' %]
+          [% IF row.type == 'invoice' %]
+            [% SET type = 'Invoice (one letter abbreviation)' %]
+            [% SET link = 'is.pl' %]
+          [% ELSIF row.type == 'credit_note' %]
+            [% SET type = 'Credit note (one letter abbreviation)' %]
+            [% SET link = 'is.pl' %]
+          [% ELSE %]
+            [% SET type = 'AR Transaction (abbreviation)' %]
+            [% SET link = 'ar.pl' %]
+          [% END %]
+        [% ELSE %]
+          [% IF row.invoice %]
+            [% SET type = 'Invoice (one letter abbreviation)' %]
+            [% SET link = 'ir.pl' %]
+          [% ELSE %]
+            [% SET type = 'AP Transaction (abbreviation)' %]
+            [% SET link = 'ap.pl' %]
           [% END %]
         [% END %]
-        </td>
-      </tr>
+        <tr class="listrow[% loop.count % 2 %]">
+          <td>[% type | $T8 %]</td>
+          <td><a href="[% link %]?action=edit&id=[% row.id %]">[% 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>
+          <td>[%- LxERP.format_amount(row.paid, 2) %]</td>
+          <td>[%- LxERP.format_amount(row.amount - row.paid,2) %]
+          [% IF FORM.db == 'customer' %]
+            <td>
+            [%- IF row.dunning_config_id != '' %]
+              [%- FOREACH dun = row.dunnings %]
+              [% dun.dunning_id | html %] -- [% dun.transdate.to_kivitendo | html %] -- [% dun.dunning_level | html %] -- [%- LxERP.format_amount(dun.fee, 2) %]<br>
+              [% END %]
+            [% END %]
+            </td>
+          [% END %]
+        </tr>
       [% END %]
     </tbody>
   </table>

diff --git a/templates/webpages/customer_vendor_turnover/invoices_statistic.html b/templates/webpages/customer_vendor_turnover/invoices_statistic.html
index 16a1574..c6dc91a 100644 (file)
--- a/templates/webpages/customer_vendor_turnover/invoices_statistic.html
+++ b/templates/webpages/customer_vendor_turnover/invoices_statistic.html
@@ -6,6 +6,7 @@
   <table width="100%">
     <tbody>
       <tr>
+        <td class="listheading">[% 'Type' | $T8 %]</td>
         <td class="listheading">[% 'Invoice Number' | $T8 %]</td>
         <td class="listheading">[% 'Invoice Date' | $T8 %]</td>
         <td class="listheading">[% 'Amount' | $T8 %]</td>
@@ -15,14 +16,35 @@
       </tr>
 
       [%- FOREACH row = invoices %]
-      <tr class="listrow[% loop.count % 2 %]">
-        <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>
-        <td>[%- LxERP.format_amount(row.paid, 2) %]</td>
-        <td>[%- LxERP.format_amount(row.amount - row.paid, 2) %]
-      </tr>
+        [% IF FORM.db == 'customer' %]
+          [% IF row.type == 'invoice' %]
+            [% SET type = 'Invoice (one letter abbreviation)' %]
+            [% SET link = 'is.pl' %]
+          [% ELSIF row.type == 'credit_note' %]
+            [% SET type = 'Credit note (one letter abbreviation)' %]
+            [% SET link = 'is.pl' %]
+          [% ELSE %]
+            [% SET type = 'AR Transaction (abbreviation)' %]
+            [% SET link = 'ar.pl' %]
+          [% END %]
+        [% ELSE %]
+          [% IF row.invoice %]
+            [% SET type = 'Invoice (one letter abbreviation)' %]
+            [% SET link = 'ir.pl' %]
+          [% ELSE %]
+            [% SET type = 'AP Transaction (abbreviation)' %]
+            [% SET link = 'ap.pl' %]
+          [% END %]
+        [% END %]
+        <tr class="listrow[% loop.count % 2 %]">
+          <td>[% type | $T8 %]</td>
+          <td><a href="[% link %]?action=edit&id=[% row.id %]">[% 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>
+          <td>[%- LxERP.format_amount(row.paid, 2) %]</td>
+          <td>[%- LxERP.format_amount(row.amount - row.paid, 2) %]
+        </tr>
       [% END %]
     </tbody>
   </table>