Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d3425278

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

  • ID d3425278405994688462010d341962c31f9ae106
  • Vorgänger 55a27184
  • Nachfolger f846a634

EmailJournal: Zusätzlicher Type für Beleg-Importe

Unterschiede anzeigen:

SL/DB/MetaSetup/EmailJournal.pm
recipients => { type => 'text', not_null => 1 },
sender_id => { type => 'integer' },
sent_on => { type => 'timestamp', default => 'now()', not_null => 1 },
status => { type => 'enum', check_in => [ 'sent', 'send_failed', 'imported' ], db_type => 'email_journal_status', not_null => 1 },
status => { type => 'enum', check_in => [ 'sent', 'send_failed', 'imported', 'record_imported' ], db_type => 'email_journal_status', not_null => 1 },
subject => { type => 'text', not_null => 1 },
uid => { type => 'integer' },
);
SL/Presenter/EmailJournal.pm
my ($email_journal_entry, %params) = @_;
my %status_to_text = (
sent => t8('sent'),
send_failed => t8('send failed'),
imported => t8('imported'),
sent => t8('sent'),
send_failed => t8('send failed'),
imported => t8('imported'),
record_imported => t8('record imported'),
);
my $status = $email_journal_entry->status;
sql/Pg-upgrade2/email_journal_extend_status.sql
-- @tag: email_journal_extend_status
-- @description: Zusätzlicher Status für E-Mail-Journal
-- @depends: release_3_8_0 email_import email_journal_add_uidvalidity
ALTER TYPE email_journal_status ADD VALUE 'record_imported' AFTER 'imported';
templates/design40_webpages/email_journal/_filter.html
</tr>
<tr>
<th>[% LxERP.t8("Status") %]</th>
<td>[% L.select_tag("filter.status:eq_ignore_empty", [ [ "", "" ], [ "send_failed", LxERP.t8("send failed") ], [ "sent", LxERP.t8("sent") ], [ "imported", LxERP.t8("imported") ] ], default=filter.status_eq_ignore_empty) %]</td>
<td>[% L.select_tag("filter.status:eq_ignore_empty", [
[ "", "" ],
[ "send_failed", LxERP.t8("send failed") ],
[ "sent", LxERP.t8("sent") ],
[ "imported", LxERP.t8("imported") ]
[ "record_imported", LxERP.t8("record imported") ]
], default=filter.status_eq_ignore_empty) %]</td>
</td>
</tr>
</tbody>
templates/webpages/email_journal/_filter.html
</tr>
<tr>
<th align="right">[% LxERP.t8("Status") %]</th>
<td>[% L.select_tag("filter.status:eq_ignore_empty", [ [ "", "" ], [ "send_failed", LxERP.t8("send failed") ], [ "sent", LxERP.t8("sent") ], [ "imported", LxERP.t8("imported") ] ], default=filter.status_eq_ignore_empty) %]</td>
<td>[% L.select_tag("filter.status:eq_ignore_empty", [
[ "", "" ],
[ "send_failed", LxERP.t8("send failed") ],
[ "sent", LxERP.t8("sent") ],
[ "imported", LxERP.t8("imported") ]
[ "record_imported", LxERP.t8("record imported") ]
], default=filter.status_eq_ignore_empty) %]</td>
</tr>
</table>

Auch abrufbar als: Unified diff