[Weberp-cvs] SF.net SVN: web-erp:[3370] trunk

[<tim...@us...>]

Revision: 3370
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3370&view=rev
Author:   tim_schofield
Date:     2010-03-08 07:21:03 +0000 (Mon, 08 Mar 2010)

Log Message:
-----------
Tim: Corrections to DIFOT report to correctly show the logo

Modified Paths:
--------------
    trunk/PDFDIFOT.php
    trunk/doc/Change.log.html
    trunk/includes/PDFDIFOTPageHeader.inc

Modified: trunk/PDFDIFOT.php
===================================================================
--- trunk/PDFDIFOT.php	2010-03-05 10:47:19 UTC (rev 3369)
+++ trunk/PDFDIFOT.php	2010-03-08 07:21:03 UTC (rev 3370)
@@ -254,7 +254,7 @@
 		AND trandate <= '" . FormatDateForSQL($_POST['ToDate']) . "'";
 
 }
-$Errmsg = _('Could not retrieve the count of sales order lines in the period under review');
+$ErrMsg = _('Could not retrieve the count of sales order lines in the period under review');
 $result = DB_query($sql,$db,$ErrMsg);
 
 

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-03-05 10:47:19 UTC (rev 3369)
+++ trunk/doc/Change.log.html	2010-03-08 07:21:03 UTC (rev 3370)
@@ -1,6 +1,7 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
-<p>05/03/10 Lindsay: PrintCustTrans.php generates HTML for Print, PDF for Print PDF
+<p>08/03/10 Tim: Corrections to DIFOT report to correctly show the logo</p>
+<p>05/03/10 Lindsay: PrintCustTrans.php generates HTML for Print, PDF for Print PDF</p>
 <p>04/03/10 Tim: Z_DataExport.php - Remove unused fields</p>
 <p>04/03/10 Tim: PDFQuotation.php - Remove call to SelectFont function</p>
 <p>01/03/10 Tim: WorkCentres.php - Default value for overhead per hour</p>

Modified: trunk/includes/PDFDIFOTPageHeader.inc
===================================================================
--- trunk/includes/PDFDIFOTPageHeader.inc	2010-03-05 10:47:19 UTC (rev 3369)
+++ trunk/includes/PDFDIFOTPageHeader.inc	2010-03-08 07:21:03 UTC (rev 3370)
@@ -6,7 +6,7 @@
 
 $YPos = $Page_Height - $Top_Margin - 50;
 
-$pdf->addJpegFromFile($_SESSION['DatabaseName'],$Left_Margin,$YPos,0,50);
+$pdf->addJpegFromFile('companies/'.$_SESSION['DatabaseName'].'/logo.jpg',$Left_Margin,$YPos,0,50);
 
 $FontSize=15;
 
@@ -51,4 +51,4 @@
 $pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos);
 
 $YPos -= ($line_height);
-?>
+?>
\ No newline at end of file


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