Revision 718f7a1b
Von Kivitendo Admin vor fast 11 Jahren hinzugefügt
| SL/DB/MetaSetup/Default.pm | ||
|---|---|---|
| 75 | 75 |
servicenumber => { type => 'text' },
|
| 76 | 76 |
show_bestbefore => { type => 'boolean', default => 'false' },
|
| 77 | 77 |
show_weight => { type => 'boolean', default => 'false', not_null => 1 },
|
| 78 |
signature => { type => 'text' },
|
|
| 78 | 79 |
sonumber => { type => 'text' },
|
| 79 | 80 |
sqnumber => { type => 'text' },
|
| 80 | 81 |
taxnumber => { type => 'text' },
|
| SL/DN.pm | ||
|---|---|---|
| 379 | 379 |
$mail->{subject} = $template->parse_block($ref->{email_subject});
|
| 380 | 380 |
$mail->{message} = $template->parse_block($ref->{email_body});
|
| 381 | 381 |
|
| 382 |
if ($myconfig->{signature}) {
|
|
| 383 |
$mail->{message} .= "\n-- \n$myconfig->{signature}";
|
|
| 384 |
} |
|
| 382 |
$mail->{message} .= $form->create_email_signature();
|
|
| 385 | 383 |
|
| 386 | 384 |
$mail->{message} =~ s/\r\n/\n/g;
|
| 387 | 385 |
|
| SL/Form.pm | ||
|---|---|---|
| 1105 | 1105 |
$mail->{to} = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email};
|
| 1106 | 1106 |
$mail->{from} = qq|"$myconfig->{name}" <$myconfig->{email}>|;
|
| 1107 | 1107 |
$mail->{fileid} = time() . '.' . $$ . '.';
|
| 1108 |
$myconfig->{signature} =~ s/\r//g;
|
|
| 1108 |
my $full_signature = $self->create_email_signature(); |
|
| 1109 |
$full_signature =~ s/\r//g; |
|
| 1109 | 1110 |
|
| 1110 | 1111 |
# if we send html or plain text inline |
| 1111 | 1112 |
if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {
|
| 1112 | 1113 |
$mail->{contenttype} = "text/html";
|
| 1113 | 1114 |
$mail->{message} =~ s/\r//g;
|
| 1114 | 1115 |
$mail->{message} =~ s/\n/<br>\n/g;
|
| 1115 |
$myconfig->{signature} =~ s/\n/<br>\n/g;
|
|
| 1116 |
$mail->{message} .= "<br>\n-- <br>\n$myconfig->{signature}\n<br>";
|
|
| 1116 |
$full_signature =~ s/\n/<br>\n/g;
|
|
| 1117 |
$mail->{message} .= $full_signature;
|
|
| 1117 | 1118 |
|
| 1118 | 1119 |
open(IN, "<", $self->{tmpfile})
|
| 1119 | 1120 |
or $self->error($self->cleanup . "$self->{tmpfile} : $!");
|
| ... | ... | |
| 1129 | 1130 |
"name" => $attachment_name }]; |
| 1130 | 1131 |
} |
| 1131 | 1132 |
|
| 1132 |
$mail->{message} =~ s/\r//g;
|
|
| 1133 |
$mail->{message} .= "\n-- \n$myconfig->{signature}";
|
|
| 1134 |
|
|
| 1133 |
$mail->{message} .= $full_signature;
|
|
| 1135 | 1134 |
} |
| 1136 | 1135 |
|
| 1137 | 1136 |
my $err = $mail->send(); |
| ... | ... | |
| 3484 | 3483 |
$::myconfig{numberformat} = $saved_numberformat;
|
| 3485 | 3484 |
} |
| 3486 | 3485 |
|
| 3486 |
sub create_email_signature {
|
|
| 3487 |
|
|
| 3488 |
my $client_signature = $::instance_conf->get_signature; |
|
| 3489 |
my $user_signature = $::myconfig{signature};
|
|
| 3490 |
|
|
| 3491 |
my $signature = ''; |
|
| 3492 |
if ( $client_signature or $user_signature ) {
|
|
| 3493 |
$signature = "\n\n-- \n"; |
|
| 3494 |
$signature .= $user_signature . "\n" if $user_signature; |
|
| 3495 |
$signature .= $client_signature . "\n" if $client_signature; |
|
| 3496 |
}; |
|
| 3497 |
return $signature; |
|
| 3498 |
|
|
| 3499 |
}; |
|
| 3500 |
|
|
| 3487 | 3501 |
sub layout {
|
| 3488 | 3502 |
my ($self) = @_; |
| 3489 | 3503 |
$::lxdebug->enter_sub; |
| bin/mozilla/am.pl | ||
|---|---|---|
| 1037 | 1037 |
$form->{title} = $locale->text('Edit Preferences for #1', $form->{login});
|
| 1038 | 1038 |
|
| 1039 | 1039 |
$form->header(); |
| 1040 |
|
|
| 1041 |
$form->{full_signature} = $form->create_email_signature();
|
|
| 1042 |
|
|
| 1040 | 1043 |
print $form->parse_html_template('am/config');
|
| 1041 | 1044 |
|
| 1042 | 1045 |
$main::lxdebug->leave_sub(); |
| locale/de/all | ||
|---|---|---|
| 437 | 437 |
'Check' => 'Scheck', |
| 438 | 438 |
'Check Details' => 'Bitte Angaben überprüfen', |
| 439 | 439 |
'Check for duplicates' => 'Dublettencheck', |
| 440 |
'Check full signature' => 'Volle Signatur prüfen', |
|
| 440 | 441 |
'Check on ap transaction' => 'Prüfen bei Kreditorenbuchung', |
| 441 | 442 |
'Check on ar transaction' => 'Prüfen bei Debitorenbuchung', |
| 442 | 443 |
'Check on gl transaction' => 'Prüfen bei Dialogbuchung', |
| ... | ... | |
| 865 | 866 |
'Edit the sales_quotation' => 'Bearbeiten des Angebots', |
| 866 | 867 |
'Edit the stylesheet' => 'Stilvorlage bearbeiten', |
| 867 | 868 |
'Edit units' => 'Einheiten bearbeiten', |
| 869 |
'Edit user signature' => 'Benutzersignatur bearbeiten', |
|
| 868 | 870 |
'Editable' => 'Bearbeitbar', |
| 869 | 871 |
'Either there are no open invoices, or you have already initiated bank transfers with the open amounts for those that are still open.' => 'Entweder gibt es keine offenen Rechnungen, oder es wurden bereits Überweisungen über die offenen Beträge aller offenen Rechnungen erstellt.', |
| 870 | 872 |
'Element disabled' => 'Element deaktiviert', |
| sql/Pg-upgrade2/defaults_signature.sql | ||
|---|---|---|
| 1 |
-- @tag: defaults_signature |
|
| 2 |
-- @description: Neues Feld in defaults für Firmensignatur |
|
| 3 |
-- @depends: clients |
|
| 4 |
-- @ignore: 0 |
|
| 5 |
|
|
| 6 |
ALTER TABLE defaults ADD COLUMN signature TEXT; |
|
| templates/webpages/am/config.html | ||
|---|---|---|
| 37 | 37 |
<th align="right">[% 'E-mail' | $T8 %]</th> |
| 38 | 38 |
<td><input name="email" size="30" value="[% HTML.escape(myconfig_email) %]"></td> |
| 39 | 39 |
</tr> |
| 40 |
|
|
| 40 |
|
|
| 41 | 41 |
<tr valign="top"> |
| 42 | 42 |
<th align="right">[% 'Signature' | $T8 %]</th> |
| 43 |
<td><textarea name="signature" rows="3" cols="50">[% HTML.escape(myconfig_signature) %]</textarea></td> |
|
| 44 |
</tr> |
|
| 45 |
|
|
| 43 |
<td><textarea id="signature" name="signature" class="toggletextarea" rows="5" cols="50">[% HTML.escape(myconfig_signature) %] </textarea> |
|
| 44 |
<span id="full_signature" class="toggletextarea"> <textarea readonly name="full_signature" rows="10" cols="50" >[% HTML.escape(full_signature) %]</textarea> </span> |
|
| 45 |
<a href="#" class="togglelink">[% 'Check full signature' | $T8 %]</a> |
|
| 46 |
<a href="#" id="edit_signature" class="togglelink">[% 'Edit user signature' | $T8 %]</a> |
|
| 47 |
</td> </tr> |
|
| 46 | 48 |
<tr> |
| 47 | 49 |
<th align="right">[% 'Phone' | $T8 %]</th> |
| 48 | 50 |
<td><input name="tel" size="14" value="[% HTML.escape(myconfig_tel) %]"></td> |
| ... | ... | |
| 218 | 220 |
|
| 219 | 221 |
<p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p> |
| 220 | 222 |
</form> |
| 223 |
|
|
| 224 |
<script type="text/javascript"> |
|
| 225 |
<!-- |
|
| 226 |
$(function() {
|
|
| 227 |
$("#full_signature").toggle();
|
|
| 228 |
$("#edit_signature").toggle();
|
|
| 229 |
$('.togglelink').click(function() {
|
|
| 230 |
$('.toggletextarea').toggle();
|
|
| 231 |
$('.togglelink').toggle();
|
|
| 232 |
return false; |
|
| 233 |
}); |
|
| 234 |
}); |
|
| 235 |
--> |
|
| 236 |
</script> |
|
| templates/webpages/client_config/_miscellaneous.html | ||
|---|---|---|
| 14 | 14 |
<td valign="top">[% L.textarea_tag('defaults.address', SELF.defaults.address, style=style, rows=4) %]</td>
|
| 15 | 15 |
</tr> |
| 16 | 16 |
|
| 17 |
<tr> |
|
| 18 |
<td align="right" valign="top">[% LxERP.t8("Signature") %]</td>
|
|
| 19 |
<td valign="top">[% L.textarea_tag('defaults.signature', SELF.defaults.signature, style=style, rows=4) %]</td>
|
|
| 20 |
</tr> |
|
| 21 |
|
|
| 17 | 22 |
<tr> |
| 18 | 23 |
<td align="right">[% LxERP.t8("Tax number") %]</td>
|
| 19 | 24 |
<td>[% L.input_tag('defaults.taxnumber', SELF.defaults.taxnumber, style=style) %]</td>
|
Auch abrufbar als: Unified diff
Neues Feld Firmensignatur in Mandantenkonfiguration
Seit der Umstellung auf die Mandantenfähigkeit gab es für einen Benutzer
nur eine einheitliche E-Mail Signatur in allen Mandanten. Dadurch konnte
man keine firmenindividuellen Signaturen einsetzen. Ab jetzt kann man
eine benutzerdefinierte Signatur mit einer Mandantensignatur
kombinieren. Für die komplette Signatur wird dafür die Firmensignatur an
die Benutzersignatur angehängt.
Beim Bearbeiten der Benutzersignatur kann in einem readonly-Textfeld
überprüft werden, wie die zusammengesetzte Signatur aussieht.
Läßt man die Mandantensignatur leer ändert sich nichts am bisherigen
Signaturverhalten.