SF.net SVN: ledger-smb: [1047] branches/1.2

[..hidden..]

Revision: 1047
          http://svn.sourceforge.net/ledger-smb/?rev=1047&view=rev
Author:   einhverfr
Date:     2007-04-09 14:23:00 -0700 (Mon, 09 Apr 2007)

Log Message:
-----------
Fixing logo printing

Modified Paths:
--------------
    branches/1.2/LedgerSMB/Form.pm
    branches/1.2/templates/Default-letterhead.tex
    branches/1.2/templates/Estonian-letterhead.tex
    branches/1.2/templates/Estonian_UTF8-letterhead.tex
    branches/1.2/templates/Traditional_Chinese_Big5-letterhead.tex
    branches/1.2/templates/Traditional_Chinese_UTF8-letterhead.tex

Modified: branches/1.2/LedgerSMB/Form.pm
===================================================================
--- branches/1.2/LedgerSMB/Form.pm	2007-04-09 20:44:41 UTC (rev 1046)
+++ branches/1.2/LedgerSMB/Form.pm	2007-04-09 21:23:00 UTC (rev 1047)
@@ -39,6 +39,7 @@
 use LedgerSMB::Mailer;
 use Time::Local;
 use Cwd;
+use File::Copy;
 
 package Form;
 
@@ -638,10 +639,16 @@
 	$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} = '>';
 	}

Modified: branches/1.2/templates/Default-letterhead.tex
===================================================================
--- branches/1.2/templates/Default-letterhead.tex	2007-04-09 20:44:41 UTC (rev 1046)
+++ branches/1.2/templates/Default-letterhead.tex	2007-04-09 21:23:00 UTC (rev 1047)
@@ -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
   ..hidden..
   Tel: & <?lsmb tel ?>\\

Modified: branches/1.2/templates/Estonian-letterhead.tex
===================================================================
--- branches/1.2/templates/Estonian-letterhead.tex	2007-04-09 20:44:41 UTC (rev 1046)
+++ branches/1.2/templates/Estonian-letterhead.tex	2007-04-09 21:23:00 UTC (rev 1047)
@@ -5,7 +5,7 @@
     <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo}
+    \includegraphics[scale=0.3]{logo}
   }\hfill
   ..hidden..
   Tel: & <?lsmb tel ?>\\

Modified: branches/1.2/templates/Estonian_UTF8-letterhead.tex
===================================================================
--- branches/1.2/templates/Estonian_UTF8-letterhead.tex	2007-04-09 20:44:41 UTC (rev 1046)
+++ branches/1.2/templates/Estonian_UTF8-letterhead.tex	2007-04-09 21:23:00 UTC (rev 1047)
@@ -5,7 +5,7 @@
     <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo}
+    \includegraphics[scale=0.3]{logo}
   }\hfill
   ..hidden..
   Tel: & <?lsmb tel ?>\\

Modified: branches/1.2/templates/Traditional_Chinese_Big5-letterhead.tex
===================================================================
--- branches/1.2/templates/Traditional_Chinese_Big5-letterhead.tex	2007-04-09 20:44:41 UTC (rev 1046)
+++ branches/1.2/templates/Traditional_Chinese_Big5-letterhead.tex	2007-04-09 21:23:00 UTC (rev 1047)
@@ -5,7 +5,7 @@
     <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo}
+    \includegraphics[scale=0.3]{logo}
   }\hfill
   ..hidden..
   Tel: & <?lsmb tel ?>\\

Modified: branches/1.2/templates/Traditional_Chinese_UTF8-letterhead.tex
===================================================================
--- branches/1.2/templates/Traditional_Chinese_UTF8-letterhead.tex	2007-04-09 20:44:41 UTC (rev 1046)
+++ branches/1.2/templates/Traditional_Chinese_UTF8-letterhead.tex	2007-04-09 21:23:00 UTC (rev 1047)
@@ -5,7 +5,7 @@
     <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo}
+    \includegraphics[scale=0.3]{logo}
   }\hfill
   ..hidden..
   Tel: & <?lsmb tel ?>\\


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.