Revision 8d425838
Von Tamino Steinert vor 12 Monaten hinzugefügt
| SL/Controller/EmailJournal.pm | ||
|---|---|---|
| 531 | 531 |
sent_on => t8('Sent on'),
|
| 532 | 532 |
status => t8('Status'),
|
| 533 | 533 |
extended_status => t8('Extended status'),
|
| 534 |
linked => t8('Linked'),
|
|
| 534 | 535 |
}, |
| 535 | 536 |
); |
| 536 | 537 |
} |
| ... | ... | |
| 551 | 552 |
@filters; |
| 552 | 553 |
|
| 553 | 554 |
my %status = ( |
| 554 |
send_failed => $::locale->text('send failed'),
|
|
| 555 |
sent => $::locale->text('sent'),
|
|
| 556 |
imported => $::locale->text('imported'),
|
|
| 555 |
send_failed => $::locale->text('send failed'),
|
|
| 556 |
sent => $::locale->text('sent'),
|
|
| 557 |
imported => $::locale->text('imported'),
|
|
| 558 |
record_imported => $::locale->text('record imported'),
|
|
| 557 | 559 |
); |
| 558 | 560 |
push @filter_strings, $status{ $filter->{'status:eq_ignore_empty'} } if $filter->{'status:eq_ignore_empty'};
|
| 559 | 561 |
|
| SL/DB/EmailJournal.pm | ||
|---|---|---|
| 51 | 51 |
$self->link_to_record($record); |
| 52 | 52 |
} |
| 53 | 53 |
|
| 54 |
sub linked {
|
|
| 55 |
my ($self) = @_; |
|
| 56 |
|
|
| 57 |
return !!scalar @{$self->linked_records};
|
|
| 58 |
} |
|
| 59 |
|
|
| 54 | 60 |
sub process_attachments_as_purchase_invoices {
|
| 55 | 61 |
my ($self) = @_; |
| 56 | 62 |
|
| SL/DB/Manager/EmailJournal.pm | ||
|---|---|---|
| 17 | 17 |
columns => {
|
| 18 | 18 |
SIMPLE => 'ALL', |
| 19 | 19 |
sender => 'sender.name', |
| 20 |
linked => "( |
|
| 21 |
SELECT count(*) from record_links where |
|
| 22 |
( record_links.from_table = 'email_journal'::varchar(50) |
|
| 23 |
AND record_links.from_id = email_journal.id |
|
| 24 |
) OR ( |
|
| 25 |
record_links.to_table = 'email_journal'::varchar(50) |
|
| 26 |
AND record_links.to_id = email_journal.id |
|
| 27 |
) |
|
| 28 |
) > 0" |
|
| 20 | 29 |
}, |
| 21 | 30 |
); |
| 22 | 31 |
} |
| locale/de/all | ||
|---|---|---|
| 2226 | 2226 |
'Link to' => 'Verknüpfen mit', |
| 2227 | 2227 |
'Link to invoice' => 'Beleglink', |
| 2228 | 2228 |
'Link to the following project:' => 'Mit dem folgenden Projekt verknüpfen:', |
| 2229 |
'Linked' => 'Verknüpft', |
|
| 2229 | 2230 |
'Linked Records' => 'Verknüpfte Belege', |
| 2230 | 2231 |
'Linked email and attachment to ' => 'E-Mail und Anhang verknüpft mit ', |
| 2231 | 2232 |
'Linked invoices' => 'Verknüpfte Rechnungen', |
| locale/en/all | ||
|---|---|---|
| 2225 | 2225 |
'Link to' => '', |
| 2226 | 2226 |
'Link to invoice' => '', |
| 2227 | 2227 |
'Link to the following project:' => '', |
| 2228 |
'Linked' => '', |
|
| 2228 | 2229 |
'Linked Records' => '', |
| 2229 | 2230 |
'Linked email and attachment to ' => '', |
| 2230 | 2231 |
'Linked invoices' => '', |
| templates/design40_webpages/email_journal/_filter.html | ||
|---|---|---|
| 28 | 28 |
[ "sent", LxERP.t8("sent") ],
|
| 29 | 29 |
[ "imported", LxERP.t8("imported") ]
|
| 30 | 30 |
[ "record_imported", LxERP.t8("record imported") ]
|
| 31 |
], default=filter.status_eq_ignore_empty) %]</td>
|
|
| 31 |
], default=filter.status_eq_ignore_empty) %] |
|
| 32 | 32 |
</td> |
| 33 | 33 |
</tr> |
| 34 | 34 |
</tbody> |
| templates/design40_webpages/email_journal/list.html | ||
|---|---|---|
| 25 | 25 |
<th>[% L.sortable_table_header("sent_on") %]</th>
|
| 26 | 26 |
<th>[% L.sortable_table_header("status") %]</th>
|
| 27 | 27 |
<th>[% L.sortable_table_header("extended_status") %]</th>
|
| 28 |
<th>[% L.sortable_table_header("linked") %]</th>
|
|
| 28 | 29 |
</tr> |
| 29 | 30 |
</thead> |
| 30 | 31 |
<tbody> |
| ... | ... | |
| 39 | 40 |
<td>[% HTML.escape(entry.sent_on.to_lxoffice('precision' => 'second')) %]</td>
|
| 40 | 41 |
<td> [% P.email_journal.entry_status(entry) %] </td> |
| 41 | 42 |
<td>[% HTML.escape(entry.extended_status) %]</td> |
| 43 |
<td>[% entry.linked ? LxERP.t8('Yes') : LxERP.t8('No') %]</td>
|
|
| 42 | 44 |
</tr> |
| 43 | 45 |
[% END %] |
| 44 | 46 |
</tbody> |
Auch abrufbar als: Unified diff
EmailJournal: Report: Sortiere nach verknüpften Emails