diff options
| -rwxr-xr-x | LedgerSMB/Form.pm | 9 | ||||
| -rwxr-xr-x | templates/Default-letterhead.tex | 2 | ||||
| -rwxr-xr-x | templates/Estonian-letterhead.tex | 2 | ||||
| -rwxr-xr-x | templates/Estonian_UTF8-letterhead.tex | 2 | ||||
| -rwxr-xr-x | templates/Traditional_Chinese_Big5-letterhead.tex | 2 | ||||
| -rwxr-xr-x | templates/Traditional_Chinese_UTF8-letterhead.tex | 2 |
6 files changed, 13 insertions, 6 deletions
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm index b54745d3..5c249f4d 100755 --- a/LedgerSMB/Form.pm +++ b/LedgerSMB/Form.pm @@ -39,6 +39,7 @@ use List::Util qw(first); use LedgerSMB::Mailer; use Time::Local; use Cwd; +use File::Copy; package Form; @@ -638,10 +639,16 @@ sub parse_template { $tmpfile =~ s/\./_$self->{fileid}./ if $self->{fileid}; $self->{tmpfile} = "${LedgerSMB::Sysconfig::tempdir}/${fileid}_${tmpfile}"; - my $temphash; + my $temphash; if ($self->{format} =~ /(postscript|pdf)/ || $self->{media} eq 'email') { $temphash{out} = $self->{OUT}; $self->{OUT} = "$self->{tmpfile}"; + File::Copy::copy( + "$self->{templates}/logo.png", + "${LedgerSMB::Sysconfig::tempdir}/"); + File::Copy::copy( + "$self->{templates}/logo.eps", + "${LedgerSMB::Sysconfig::tempdir}/"); $temphash{printmode} = $self->{printmode}; $self->{printmode} = '>'; } diff --git a/templates/Default-letterhead.tex b/templates/Default-letterhead.tex index 10ad0c44..dbaa198b 100755 --- a/templates/Default-letterhead.tex +++ b/templates/Default-letterhead.tex @@ -5,7 +5,7 @@ <?lsmb address ?> } \parbox[b]{.2\textwidth}{ - \includegraphics[scale=0.3]{../<?lsmb templates ?>/<?lsmb language_code ?>/logo} + \includegraphics[scale=0.3]{logo} }\hfill \begin{tabular}[b]{rr@{}} Tel: & <?lsmb tel ?>\\ diff --git a/templates/Estonian-letterhead.tex b/templates/Estonian-letterhead.tex index 24e29b4f..dbaa198b 100755 --- a/templates/Estonian-letterhead.tex +++ b/templates/Estonian-letterhead.tex @@ -5,7 +5,7 @@ <?lsmb address ?> } \parbox[b]{.2\textwidth}{ - \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo} + \includegraphics[scale=0.3]{logo} }\hfill \begin{tabular}[b]{rr@{}} Tel: & <?lsmb tel ?>\\ diff --git a/templates/Estonian_UTF8-letterhead.tex b/templates/Estonian_UTF8-letterhead.tex index 24e29b4f..dbaa198b 100755 --- a/templates/Estonian_UTF8-letterhead.tex +++ b/templates/Estonian_UTF8-letterhead.tex @@ -5,7 +5,7 @@ <?lsmb address ?> } \parbox[b]{.2\textwidth}{ - \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo} + \includegraphics[scale=0.3]{logo} }\hfill \begin{tabular}[b]{rr@{}} Tel: & <?lsmb tel ?>\\ diff --git a/templates/Traditional_Chinese_Big5-letterhead.tex b/templates/Traditional_Chinese_Big5-letterhead.tex index 24e29b4f..dbaa198b 100755 --- a/templates/Traditional_Chinese_Big5-letterhead.tex +++ b/templates/Traditional_Chinese_Big5-letterhead.tex @@ -5,7 +5,7 @@ <?lsmb address ?> } \parbox[b]{.2\textwidth}{ - \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo} + \includegraphics[scale=0.3]{logo} }\hfill \begin{tabular}[b]{rr@{}} Tel: & <?lsmb tel ?>\\ diff --git a/templates/Traditional_Chinese_UTF8-letterhead.tex b/templates/Traditional_Chinese_UTF8-letterhead.tex index 24e29b4f..dbaa198b 100755 --- a/templates/Traditional_Chinese_UTF8-letterhead.tex +++ b/templates/Traditional_Chinese_UTF8-letterhead.tex @@ -5,7 +5,7 @@ <?lsmb address ?> } \parbox[b]{.2\textwidth}{ - \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo} + \includegraphics[scale=0.3]{logo} }\hfill \begin{tabular}[b]{rr@{}} Tel: & <?lsmb tel ?>\\ |