From: Bernd Bleßmann
Date: Mon, 30 Aug 2021 12:44:26 +0000 (+0200)
Subject: Wiedervorlagen für Belege: Nicht-erledigte und erledigte WV in je einer Tabelle
X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~377
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e64015cef8aff1dc5a1a433738472ff0d971ccd6;p=kivitendo-erp.git
Wiedervorlagen für Belege: Nicht-erledigte und erledigte WV in je einer Tabelle
---
diff --git a/bin/mozilla/fu.pl b/bin/mozilla/fu.pl
index d9001e35c..b987d1fd7 100644
--- a/bin/mozilla/fu.pl
+++ b/bin/mozilla/fu.pl
@@ -100,7 +100,10 @@ sub display_form {
my %params;
$params{not_id} = $form->{id} if ($form->{id});
$params{trans_id} = $form->{LINKS}->[0]->{trans_id} if (@{ $form->{LINKS} });
- $form->{FOLLOW_UPS} = FU->follow_ups(%params);
+
+ $form->{sort} = 'follow_up_date';
+ $form->{FOLLOW_UPS_DONE} = FU->follow_ups(%params, done => 1);
+ $form->{FOLLOW_UPS_PENDING} = FU->follow_ups(%params, not_done => 1);
setup_fu_display_form_action_bar() unless $::form->{POPUP_MODE};
diff --git a/locale/de/all b/locale/de/all
index a7f3d6489..25c15a7a0 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -1462,6 +1462,7 @@ $self->{texts} = {
'Existing contacts (with column \'cp_id\')' => 'Existierende Ansprechpersonen (mit Spalte \'cp_id\')',
'Existing customers/vendors with same customer/vendor number' => 'Existierende Kunden/Lieferanten mit derselben Kunden-/Lieferantennummer',
'Existing file on server' => 'Auf dem Server existierende Datei',
+ 'Existing finished follow-ups for this item' => 'Erledigte Wiedervorlagen für dieses Dokument',
'Existing pending follow-ups for this item' => 'Noch nicht erledigte Wiedervorlagen für dieses Dokument',
'Existing profiles' => 'Existierende Profile',
'Existing templates' => 'Vorhandene Belegvorlagen',
diff --git a/locale/en/all b/locale/en/all
index 43bfd54fe..795498de5 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -1462,6 +1462,7 @@ $self->{texts} = {
'Existing contacts (with column \'cp_id\')' => '',
'Existing customers/vendors with same customer/vendor number' => '',
'Existing file on server' => '',
+ 'Existing finished follow-ups for this item' => '',
'Existing pending follow-ups for this item' => '',
'Existing profiles' => '',
'Existing templates' => '',
diff --git a/templates/webpages/fu/add_edit.html b/templates/webpages/fu/add_edit.html
index 979061dd9..3a6f126db 100644
--- a/templates/webpages/fu/add_edit.html
+++ b/templates/webpages/fu/add_edit.html
@@ -60,7 +60,7 @@
- [%- IF FOLLOW_UPS.size %]
+ [%- IF FOLLOW_UPS_PENDING.size %]
[% 'Existing pending follow-ups for this item' | $T8 %]
@@ -73,7 +73,7 @@
[% 'Follow-up for' | $T8 %] |
- [%- FOREACH row = FOLLOW_UPS %]
+ [%- FOREACH row = FOLLOW_UPS_PENDING %]
[% HTML.escape(row.follow_up_date) %] |
[% HTML.escape(row.subject) %] |
@@ -83,6 +83,31 @@
[%- END %]
[%- END %]
+
+ [%- IF FOLLOW_UPS_DONE.size %]
+
+
+ [% 'Existing finished follow-ups for this item' | $T8 %]
+
+
+
+ [% 'Follow-Up Date' | $T8 %] |
+ [% 'Subject' | $T8 %] |
+ [% 'Created by' | $T8 %] |
+ [% 'Follow-up for' | $T8 %] |
+
+
+ [%- FOREACH row = FOLLOW_UPS_DONE %]
+
+ [% HTML.escape(row.follow_up_date) %] |
+ [% HTML.escape(row.subject) %] |
+ [% HTML.escape(row.created_by_name) %] |
+ [% HTML.escape(row.created_for_user_name) %] |
+
+ [%- END %]
+
+ [%- END %]
+
[%- END %]
[%- FOREACH row = LINKS %]