Revision 3d8c8e2f
Von Martin Helmling vor fast 8 Jahren hinzugefügt
| SL/Form.pm | ||
|---|---|---|
| 1223 | 1223 |
$self->{emailerr} = $mail->send();
|
| 1224 | 1224 |
# $self->error($self->cleanup . "$err") if $self->{emailerr};
|
| 1225 | 1225 |
$self->{email_journal_id} = $mail->{journalentry};
|
| 1226 |
$self->{snumbers} = "emailjournal" . "_" . $self->{email_journal_id};
|
|
| 1227 |
$self->{what_done} = $::form->{type};
|
|
| 1228 |
$self->{addition} = "MAILED";
|
|
| 1229 |
$self->save_history; |
|
| 1226 | 1230 |
|
| 1227 | 1231 |
#write back for message info and mail journal |
| 1228 | 1232 |
$self->{cc} = $mail->{cc};
|
| ... | ... | |
| 3177 | 3181 |
while(my $hash_ref = $sth->fetchrow_hashref()) {
|
| 3178 | 3182 |
$hash_ref->{addition} = $main::locale->text($hash_ref->{addition});
|
| 3179 | 3183 |
$hash_ref->{what_done} = $main::locale->text($hash_ref->{what_done});
|
| 3180 |
$hash_ref->{snumbers} =~ s/^.+_(.*)$/$1/g;
|
|
| 3184 |
my ( $what, $number ) = split /_/, $hash_ref->{snumbers};
|
|
| 3185 |
$hash_ref->{snumbers} = $number;
|
|
| 3186 |
$hash_ref->{haslink} = 'controller.pl?action=EmailJournal/show&id='.$number if $what eq 'emailjournal';
|
|
| 3187 |
$hash_ref->{snumbers} = $main::locale->text("E-Mail").' '.$number if $what eq 'emailjournal';
|
|
| 3181 | 3188 |
$tempArray[$i++] = $hash_ref; |
| 3182 | 3189 |
} |
| 3183 | 3190 |
$main::lxdebug->leave_sub() and return \@tempArray |
| bin/mozilla/common.pl | ||
|---|---|---|
| 237 | 237 |
my $callback = build_std_url(qw(action longdescription trans_id_type input_name)); |
| 238 | 238 |
my $restriction; |
| 239 | 239 |
if ( $form->{trans_id_type} eq 'glid' ) {
|
| 240 |
$restriction = "AND ( snumbers LIKE 'invnumber%' OR what_done LIKE '%Buchungsnummer%' OR snumbers LIKE 'gltransaction%' ) "; |
|
| 240 |
$restriction = "AND ( snumbers LIKE 'invnumber%' OR what_done LIKE '%Buchungsnummer%' OR snumbers LIKE 'gltransaction%' OR snumbers LIKE 'emailjournal%' ) ";
|
|
| 241 | 241 |
} elsif ( $form->{trans_id_type} eq 'id' ) {
|
| 242 |
$restriction = " AND ( snumbers NOT LIKE 'invnumber_%' AND snumbers NOT LIKE 'gltransaction%' AND (what_done NOT LIKE '%Buchungsnummer%' OR what_done IS null))"; |
|
| 242 |
$restriction = " AND ( snumbers NOT LIKE 'invnumber_%' AND snumbers NOT LIKE 'gltransaction%' AND snumbers NOT LIKE 'emailjournal%' AND (what_done NOT LIKE '%Buchungsnummer%' OR what_done IS null))";
|
|
| 243 | 243 |
} else {
|
| 244 | 244 |
$restriction = ''; |
| 245 | 245 |
}; |
| bin/mozilla/io.pl | ||
|---|---|---|
| 1533 | 1533 |
|
| 1534 | 1534 |
$form->{emailed} .= " $form->{formname}";
|
| 1535 | 1535 |
$form->{emailed} =~ s/^ //;
|
| 1536 |
$form->{addition} = "MAILED";
|
|
| 1536 | 1537 |
} |
| 1537 | 1538 |
my $emailed = $form->{emailed};
|
| 1538 | 1539 |
|
| templates/webpages/common/show_history.html | ||
|---|---|---|
| 105 | 105 |
[% HTML.escape(row.id) %] |
| 106 | 106 |
</td> |
| 107 | 107 |
<td> |
| 108 |
[% HTML.escape(row.snumbers) %] |
|
| 108 |
|
|
| 109 |
[% IF row.haslink %] |
|
| 110 |
<a href="[% row.haslink %]" target="_blank">[% HTML.escape(row.snumbers) %]</a> |
|
| 111 |
[% ELSE %] |
|
| 112 |
[% HTML.escape(row.snumbers) %] |
|
| 113 |
[% END %] |
|
| 114 |
|
|
| 109 | 115 |
</td> |
| 110 | 116 |
</tr> |
| 111 | 117 |
[% END %] |
Auch abrufbar als: Unified diff
Link History zu EmailJournal
Einträge in History mit addition MAILED haben nun nicht die Rechnungsnummer sondern die ID des Emailjournals
in snumber stehen, also emailjournal_${journal_id}