[Weberp-svn] SF.net SVN: weberp:[4251] trunk

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

Revision: 4251
          http://weberp.svn.sourceforge.net/weberp/?rev=4251&view=rev
Author:   tim_schofield
Date:     2011-01-11 12:28:10 +0000 (Tue, 11 Jan 2011)

Log Message:
-----------
Phil: Improvements to Sales Invoice layouts

Modified Paths:
--------------
    trunk/PrintCustTrans.php
    trunk/PrintCustTransPortrait.php
    trunk/companies/weberpdemo/FormDesigns/SalesInvoice.xml
    trunk/includes/PDFTransPageHeader.inc
    trunk/includes/PDFTransPageHeaderPortrait.inc

Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php	2011-01-11 11:42:44 UTC (rev 4250)
+++ trunk/PrintCustTrans.php	2011-01-11 12:28:10 UTC (rev 4251)
@@ -31,7 +31,6 @@
 if (isset($PrintPDF) or isset($_GET['PrintPDF']) and $PrintPDF and isset($FromTransNo) and isset($InvOrCredit) and $FromTransNo != '') {
 	$PaperSize = $FormDesign->PaperSize;
 	include ('includes/PDFStarter.php');
-	require ('fpdi/fpdi.php');
 	// Javier: now I use the native constructor, better to not use references
 	if ($InvOrCredit == 'Invoice') {
 		$pdf->addInfo('Title', _('Sales Invoice') . ' ' . $FromTransNo . ' to ' . $_POST['ToTransNo']);
@@ -360,92 +359,31 @@
 		$FromTransNo++;
 	}
 } /* end loop to print invoices */
-// Start FPDI concatination to append PDF files conditionally to the invoice
-// This part taken from FPDI example page -not used yet since change to TCPDF Dec 2009
-if (isset($PrintPDF)) {
-	class concat_pdf extends FPDI {
-		var $files = array();
-		function setFiles($files) {
-			$this->files = $files;
-		}
-		function concat() {
-			foreach($this->files as $file) {
-				if ($file != 'pdf_append/none') {
-					$pagecount = $this->setSourceFile($file);
-					for ($i = 1;$i <= $pagecount;$i++) {
-						$tplidx = $this->ImportPage($i);
-						$s = $this->getTemplatesize($tplidx);
-						$this->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-						$this->useTemplate($tplidx);
-					}
-				}
-			}
-		}
-	}
-}
-// $pdf =& new concat_pdf();
-// Have to get the TransNo again, GET[FromTransNo] is updated on each pass of loop
-if (isset($_GET['FromTransNo'])) {
-	$FromTransNo = trim($_GET['FromTransNo']);
-} elseif (isset($_POST['FromTransNo'])) {
-	$FromTransNo = trim($_POST['FromTransNo']);
-}
-if (!isset($InvOrCredit)) {
-	$InvOrCredit='';
-}
+
 if (($InvOrCredit == 'Invoice' or $InvOrCredit == 'Credit') and isset($PrintPDF)) {
-	$sql = "SELECT stockmoves.stockid, stockmaster.appendfile
-			FROM stockmoves, stockmaster
-			WHERE stockmoves.stockid = stockmaster.stockid
-			AND stockmoves.type=10
-			AND stockmoves.transno='" . $FromTransNo . "'
-			AND stockmoves.show_on_inv_crds=1";
-	// };
-	if ($FromTransNo!='Preview') {
-		$result = DB_query($sql, $db);
-	}
-	// Loop the result set and add appendfile if the field is not 0 or none
-	while (isset($result) and $row = DB_fetch_array($result)) {
-		if ($row['appendfile'] != '0' AND $row['appendfile'] !== 'none') {
-			$pdf->setFiles(array($_SESSION['reports_dir'] . '/Invoice.pdf', 'companies/' . $_SESSION['DatabaseName'] . '/pdf_append/' . $row['appendfile']));
-			$pdf->concat();
-			$pdf->Output($_SESSION['CompanyRecord']['coyname'] . '_Invoice.pdf', 'I');
-			exit;
-			// If EMAIL is selected, send the invoice via email, this is not appending pages yet though
 
-		} elseif (isset($_GET['Email'])) {
-			$pdf->Output($_SESSION['reports_dir'] . '/Invoice.pdf', 'F');
-		} else {
-			// If the appendfile field is empty and EMAIL is not selected, just print the invoice without any appended pages
-			$pdf->Output($_SESSION['CompanyRecord']['coyname'] . '_Invoice.pdf', 'I');
-			exit;
-		}
-	}
-	//End FPDI Concat
 	if (isset($_GET['Email'])) { //email the invoice to address supplied
 		include ('includes/header.inc');
 		include ('includes/htmlMimeMail.php');
 		$mail = new htmlMimeMail();
-		$filename = $_SESSION['reports_dir'] . '/Invoice.pdf';
-		$fp = fopen($_SESSION['reports_dir'] . '/Invoice.pdf', 'wb');
-		fwrite($fp, $pdfcode);
-		fclose($fp);
-		$attachment = $mail->getFile($filename);
+		$FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
+		$pdf->Output($FileName, 'F');
+		$Attachment = $mail->getFile($FileName);
 		$mail->setText(_('Please find attached') . ' ' . $InvOrCredit . ' ' . $_GET['FromTransNo']);
 		$mail->SetSubject($InvOrCredit . ' ' . $_GET['FromTransNo']);
-		$mail->addAttachment($attachment, $filename, 'application/pdf');
+		$mail->addAttachment($Attachment, $FileName, 'application/pdf');
 		$mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
 		$result = $mail->send(array($_GET['Email']));
-		unlink($filename); //delete the temporary file
+		unlink($FileName); //delete the temporary file
 		$title = _('Emailing') . ' ' . $InvOrCredit . ' ' . _('Number') . ' ' . $FromTransNo;
 		include ('includes/header.inc');
-		echo "<p>$InvOrCredit " . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
+		echo '<p>' . $InvOrCredit . ' '  . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
 		include ('includes/footer.inc');
 		exit;
 	} else {
-		$pdf->OutputD('PrintCustTrans.pdf');
-		$pdf->__destruct();
+		$pdf->OutputD( $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf');
 	}
+	$pdf->__destruct();
 } else { /*The option to print PDF was not hit */
 	$title = _('Select Invoices/Credit Notes To Print');
 	include ('includes/header.inc');

Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php	2011-01-11 11:42:44 UTC (rev 4250)
+++ trunk/PrintCustTransPortrait.php	2011-01-11 12:28:10 UTC (rev 4251)
@@ -41,9 +41,9 @@
 	and isset($InvOrCredit)
 	and $FromTransNo!=''){
 
-        include ('includes/class.pdf.php');
-        require('fpdi/fpdi.php');
+	include ('includes/class.pdf.php');
 
+
     $Page_Width=595;
     $Page_Height=842;
     $Top_Margin=30;
@@ -487,101 +487,35 @@
 	    $FromTransNo++;
 	} /* end loop to print invoices */
 
-/* Javier: This actually would produce the output, and maybe it should do
-//	$pdfcode = $pdf->stream();
-	$pdfcode = $pdf->Output('Invoice.pdf', "I"); una mala jugada de cierta persona
-	$len = strlen($pdfcode); Este fichero es especial pq $len anulado en L596
-*/
 
-// Start FPDI concatination to append PDF files conditionally to the invoice
-// This part taken from FPDI example page - but not actually used .... yet Muz??
-class concat_pdf extends FPDI {
-
-            var $files = array();
-
-            function setFiles($files) {
-                $this->files = $files;
-            }
-
-            function concat() {
-                foreach($this->files AS $file) {
-                    $pagecount = $this->setSourceFile($file);
-                    for ($i = 1; $i <= $pagecount; $i++) {
-                         $tplidx = $this->ImportPage($i);
-                         $s = $this->getTemplatesize($tplidx);
-                         $this->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-                         $this->useTemplate($tplidx);
-                    }
-                }
-            }
-        }
-
-//        $pdf =& new concat_pdf();
-
-// Have to get the TransNo again, $_GET{FromTransNo] is updated with each pass
-	if (isset($_GET['FromTransNo'])){
-	        $FromTransNo = trim($_GET['FromTransNo']);
-	} elseif (isset($_POST['FromTransNo'])){
-	        $FromTransNo = trim($_POST['FromTransNo']);
-	}
-	// Check its an Invoice type again, then select appendfile filename
-	if ($InvOrCredit=='Invoice'){
-		$sql = "SELECT stockmoves.stockid, stockmaster.appendfile
-					FROM stockmoves INNER JOIN stockmaster
-		            ON stockmoves.stockid = stockmaster.stockid
-		            WHERE stockmoves.type=10
-		            AND stockmoves.transno='" . $FromTransNo . "'
-					AND stockmoves.show_on_inv_crds=1";
-	} else {
-		 $sql = "SELECT stockmoves.stockid, stockmaster.appendfile
-					FROM stockmoves INNER JOIN stockmaster
-		            ON stockmoves.stockid = stockmaster.stockid
-		            AND stockmoves.type=11
-					AND stockmoves.transno='" . $FromTransNo . "'
-					AND stockmoves.show_on_inv_crds=1";
-	}
-	$result=DB_query($sql,$db);
-	// Loop the result set and add appendfile if the field is not 0 or none
-
-	while ($row=DB_fetch_array($result)){
-	    if ($row['appendfile'] !='0' AND $row['appendfile'] !=='none') {
-	        $pdf->setFiles(array($_SESSION['reports_dir'] . '/Invoice.pdf','companies/' . $_SESSION['DatabaseName'] . '/pdf_append/' . $row['appendfile']));
-	        $pdf->concat();
-	     }
-	}//End FPDI Concat
-
 	if (isset($_GET['Email'])){ //email the invoice to address supplied
 		include('includes/header.inc');
 
 		include ('includes/htmlMimeMail.php');
-		$pdf->Output($_SESSION['reports_dir'] . '/Invoice.pdf','F');
-		$pdf-> __destruct();
+		$FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
+		$pdf->Output($FileName,'F');
 		$mail = new htmlMimeMail();
-		$filename = $_SESSION['reports_dir'] . '/Invoice.pdf';
-    	$fp = fopen( $_SESSION['reports_dir'] . '/Invoice.pdf','wb');
-		fwrite ($fp, $pdfcode);
-		fclose ($fp);
 
-		$attachment = $mail->getFile($filename);
+		$Attachment = $mail->getFile($FileName);
 		$mail->setText(_('Please find attached') . ' ' . $InvOrCredit . ' ' . $_GET['FromTransNo'] );
 		$mail->SetSubject($InvOrCredit . ' ' . $_GET['FromTransNo']);
-		$mail->addAttachment($attachment, $filename, 'application/pdf');
+		$mail->addAttachment($Attachment, $FileName, 'application/pdf');
 		$mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
 		$result = $mail->send(array($_GET['Email']));
 
-		unlink($filename); //delete the temporary file
+		unlink($FileName); //delete the temporary file
 
 		$title = _('Emailing') . ' ' .$InvOrCredit . ' ' . _('Number') . ' ' . $FromTransNo;
 		include('includes/header.inc');
-		echo "<p>$InvOrCredit " . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
+		echo '<p>' . $InvOrCredit . ' '  . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
 		include('includes/footer.inc');
 		exit;
 
 	} else { //its not an email just print the invoice to PDF
-		$pdf->OutputD($_SESSION['DatabaseName'] . '_Invoice' . date('Y-m-d') . '.pdf');
-		$pdf-> __destruct();
-	}
+		$pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf');
 
+	}
+	$pdf->__destruct();
 } else { /*The option to print PDF was not hit */
 
 	$title=_('Select Invoices/Credit Notes To Print');

Modified: trunk/companies/weberpdemo/FormDesigns/SalesInvoice.xml
===================================================================
--- trunk/companies/weberpdemo/FormDesigns/SalesInvoice.xml	2011-01-11 11:42:44 UTC (rev 4250)
+++ trunk/companies/weberpdemo/FormDesigns/SalesInvoice.xml	2011-01-11 12:28:10 UTC (rev 4251)
@@ -15,7 +15,7 @@
 	</Title>
 	<BillingDetailBox type="CurvedRectangle" name="Billing detail box" id="BillingDetailBox">
 		<x>567</x>
-		<y>51</y>
+		<y>61</y>
 		<width>225</width>
 		<height>88</height>
 		<radius>10</radius>
@@ -248,7 +248,7 @@
 	</Currency>
 	<MainOutputBox type="CurvedRectangle" name="Main Output Box" id="MainOutputBox">
 		<x>40</x>
-		<y>164</y>
+		<y>176</y>
 		<width>762</width>
 		<height>390</height>
 		<radius>10</radius>
@@ -256,44 +256,44 @@
 	<CustomerTaxReferenceCaption type="SimpleText" name="Customer Tax Reference Caption" id="CustomerTaxReferenceCaption">
 		<FontSize>10</FontSize>
 		<x>44</x>
-		<y>174</y>
+		<y>166</y>
 	</CustomerTaxReferenceCaption>
 	<CustomerTaxReference type="SimpleText" name="Customer Tax Reference" id="CustomerTaxReference">
 		<FontSize>10</FontSize>
 		<x>130</x>
-		<y>174</y>
+		<y>166</y>
 	</CustomerTaxReference>
 	<OrderRefLine type="Line" name="Order Reference Line" id="OrderRefLine">
 		<startx>288</startx>
-		<starty>155</starty>
+		<starty>165</starty>
 		<endx>288</endx>
 		<endy>182</endy>
 	</OrderRefLine>
 	<CustomerOrderReferenceCaption type="SimpleText" name="Customer Order Reference Caption" id="CustomerOrderReferenceCaption">
 		<FontSize>10</FontSize>
 		<x>290</x>
-		<y>174</y>
+		<y>166</y>
 	</CustomerOrderReferenceCaption>
 	<CustomerOrderReference type="SimpleText" name="Customer Order Reference" id="CustomerOrderReference">
 		<FontSize>10</FontSize>
 		<x>388</x>
-		<y>174</y>
+		<y>166</y>
 	</CustomerOrderReference>
 	<SalesmanLine type="Line" name="Salesman Line" id="SalesmanLine">
 		<startx>490</startx>
-		<starty>155</starty>
+		<starty>165</starty>
 		<endx>490</endx>
 		<endy>182</endy>
 	</SalesmanLine>
 	<SalesmanReferenceCaption type="SimpleText" name="Salesman Reference Caption" id="SalesmanReferenceCaption">
 		<FontSize>10</FontSize>
 		<x>493</x>
-		<y>174</y>
+		<y>166</y>
 	</SalesmanReferenceCaption>
 	<SalesmanReference type="SimpleText" name="Salesman Reference" id="SalesmanReference">
 		<FontSize>10</FontSize>
 		<x>570</x>
-		<y>174</y>
+		<y>166</y>
 	</SalesmanReference>
 	<LineAboveColumns type="Line" name="Line Above Columns" id="LineAboveColumns">
 		<startx>40</startx>
@@ -311,37 +311,37 @@
 		<Column1 type="SimpleText" name="Heading 1" id="Heading1">
 			<FontSize>10</FontSize>
 			<x>44</x>
-			<y>194</y>
+			<y>184</y>
 		</Column1>
 		<Column2 type="SimpleText" name="Heading 2" id="Heading2">
 			<FontSize>10</FontSize>
 			<x>140</x>
-			<y>194</y>
+			<y>184</y>
 		</Column2>
 		<Column3 type="SimpleText" name="Heading 3" id="Heading3">
 			<FontSize>10</FontSize>
 			<x>431</x>
-			<y>194</y>
+			<y>184</y>
 		</Column3>
 		<Column4 type="SimpleText" name="Heading 4" id="Heading4">
 			<FontSize>10</FontSize>
 			<x>541</x>
-			<y>194</y>
+			<y>184</y>
 		</Column4>
 		<Column5 type="SimpleText" name="Heading 5" id="Heading5">
 			<FontSize>10</FontSize>
 			<x>596</x>
-			<y>194</y>
+			<y>184</y>
 		</Column5>
 		<Column6 type="SimpleText" name="Heading 6" id="Heading6">
 			<FontSize>10</FontSize>
 			<x>631</x>
-			<y>194</y>
+			<y>184</y>
 		</Column6>
 		<Column7 type="SimpleText" name="Heading 7" id="Heading7">
 			<FontSize>10</FontSize>
 			<x>731</x>
-			<y>194</y>
+			<y>184</y>
 		</Column7>
 	</Headings>
 	<Data type="ElementArray" name="Column Data">
@@ -441,7 +441,7 @@
 	<SubTotalCaption type="SimpleText" name="Sub-Total Caption" id="SubTotalCaption">
 		<FontSize>10</FontSize>
 		<x>592</x>
-		<y>512</y>
+		<y>502</y>
 	</SubTotalCaption>
 	<SubTotal type="MultiLineText" name="Sub-Total" id="SubTotal">
 		<FontSize>10</FontSize>
@@ -452,7 +452,7 @@
 	<FreightCaption type="SimpleText" name="Freight Caption" id="FreightCaption">
 		<FontSize>10</FontSize>
 		<x>592</x>
-		<y>528</y>
+		<y>518</y>
 	</FreightCaption>
 	<Freight type="MultiLineText" name="Freight" id="Freight">
 		<FontSize>10</FontSize>
@@ -463,7 +463,7 @@
 	<TaxCaption type="SimpleText" name="Tax Caption" id="TaxCaption">
 		<FontSize>10</FontSize>
 		<x>592</x>
-		<y>544</y>
+		<y>534</y>
 	</TaxCaption>
 	<Tax type="MultiLineText" name="Tax" id="Tax">
 		<FontSize>10</FontSize>
@@ -479,14 +479,14 @@
 	</TotalLine>
 	<RomalpaLine type="Line" name="Romalpa Line" id="RomalpaLine">
 		<startx>590</startx>
-		<starty>490</starty>
+		<starty>500</starty>
 		<endx>590</endx>
-		<endy>565</endy>
+		<endy>575</endy>
 	</RomalpaLine>
 	<TotalCaption type="SimpleText" name="Total Caption" id="TotalCaption">
 		<FontSize>10</FontSize>
 		<x>592</x>
-		<y>560</y>
+		<y>550</y>
 	</TotalCaption>
 	<Total type="MultiLineText" name="Total" id="Total">
 		<FontSize>10</FontSize>

Modified: trunk/includes/PDFTransPageHeader.inc
===================================================================
--- trunk/includes/PDFTransPageHeader.inc	2011-01-11 11:42:44 UTC (rev 4250)
+++ trunk/includes/PDFTransPageHeader.inc	2011-01-11 12:28:10 UTC (rev 4251)
@@ -71,7 +71,11 @@
 }
 /*draw a nice curved corner box around the billing details */
 /*from the top right*/
-$pdf->RoundRectangle($FormDesign->BillingDetailBox->x, $Page_Height - $FormDesign->BillingDetailBox->y,$FormDesign->BillingDetailBox->width, $FormDesign->BillingDetailBox->height, $FormDesign->BillingDetailBox->radius);
+$pdf->RoundRectangle($FormDesign->BillingDetailBox->x, 
+											$Page_Height - $FormDesign->BillingDetailBox->y,
+											$FormDesign->BillingDetailBox->width, 
+											$FormDesign->BillingDetailBox->height, 
+											$FormDesign->BillingDetailBox->radius);
 
 $pdf->addText($FormDesign->NumberCaption->x, $Page_Height -$FormDesign->NumberCaption->y, $FormDesign->NumberCaption->FontSize, _('Number'));
 $pdf->addText($FormDesign->InvoiceNumber->x, $Page_Height -$FormDesign->InvoiceNumber->y, $FormDesign->InvoiceNumber->FontSize, $FromTransNo);
@@ -160,28 +164,41 @@
 
 /*draw a box with nice round corner for entering line items */
 /*90 degree arc at top right of box 0 degrees starts a bottom */
-$pdf->RoundRectangle($FormDesign->MainOutputBox->x, $Page_Height - $FormDesign->MainOutputBox->y,$FormDesign->MainOutputBox->width, $FormDesign->MainOutputBox->height, $FormDesign->MainOutputBox->radius);
+$pdf->RoundRectangle($FormDesign->MainOutputBox->x, 
+											$Page_Height - $FormDesign->MainOutputBox->y,
+											$FormDesign->MainOutputBox->width, 
+											$FormDesign->MainOutputBox->height, 
+											$FormDesign->MainOutputBox->radius);
 
 /*Set up headings */
 $pdf->addText($FormDesign->CustomerTaxReferenceCaption->x, $Page_Height -$FormDesign->CustomerTaxReferenceCaption->y, $FormDesign->CustomerTaxReferenceCaption->FontSize, _('Customer Tax Ref') . ':');
 $pdf->addText($FormDesign->CustomerTaxReference->x, $Page_Height -$FormDesign->CustomerTaxReference->y, $FormDesign->CustomerTaxReference->FontSize, $myrow['taxref']);
 
 /*Print a vertical line */
-$pdf->line($FormDesign->OrderRefLine->startx, $Page_Height -$FormDesign->OrderRefLine->starty,$FormDesign->OrderRefLine->endx, $Page_Height -$FormDesign->OrderRefLine->endy);
+$pdf->line($FormDesign->OrderRefLine->startx, 
+					$Page_Height -$FormDesign->OrderRefLine->starty,
+					$FormDesign->OrderRefLine->endx, 
+					$Page_Height -$FormDesign->OrderRefLine->endy);
 
 $pdf->addText($FormDesign->CustomerOrderReferenceCaption->x, $Page_Height -$FormDesign->CustomerOrderReferenceCaption->y, $FormDesign->CustomerOrderReferenceCaption->FontSize, _('Customer Order Ref.') . ':');
 $pdf->addText($FormDesign->CustomerOrderReference->x, $Page_Height -$FormDesign->CustomerOrderReference->y, $FormDesign->CustomerOrderReference->FontSize, $myrow['customerref']);
 
 /*Print a vertical line */
-$pdf->line($FormDesign->SalesmanLine->startx, $Page_Height -$FormDesign->SalesmanLine->starty,$FormDesign->SalesmanLine->endx, $Page_Height -$FormDesign->SalesmanLine->endy);
+$pdf->line($FormDesign->SalesmanLine->startx, 
+					$Page_Height -$FormDesign->SalesmanLine->starty,
+					$FormDesign->SalesmanLine->endx, 
+					$Page_Height -$FormDesign->SalesmanLine->endy);
 
 $pdf->addText($FormDesign->SalesmanReferenceCaption->x, $Page_Height -$FormDesign->SalesmanReferenceCaption->y, $FormDesign->SalesmanReferenceCaption->FontSize, _('Sales Person') . ':');
 $pdf->addText($FormDesign->SalesmanReference->x, $Page_Height -$FormDesign->SalesmanReference->y, $FormDesign->SalesmanReference->FontSize, $myrow['salesmanname']);
 
 /*draw a line */
-$pdf->line($FormDesign->LineAboveColumns->startx, $Page_Height -$FormDesign->LineAboveColumns->starty,$FormDesign->LineAboveColumns->endx, $Page_Height -$FormDesign->LineAboveColumns->endy);
+$pdf->line($FormDesign->LineAboveColumns->startx, 
+					$Page_Height -$FormDesign->LineAboveColumns->starty,
+					$FormDesign->LineAboveColumns->endx, 
+					$Page_Height -$FormDesign->LineAboveColumns->endy);
 
-$pdf->addText($FormDesign->Headings->Column1->x,$Page_Height - $FormDesign->Headings->Column1->y, $FormDesign->Headings->Column1->FontSize, _('Item Code'));
+$pdf->addText($FormDesign->Headings->Column1->x, $Page_Height - $FormDesign->Headings->Column1->y, $FormDesign->Headings->Column1->FontSize, _('Item Code'));
 $pdf->addText($FormDesign->Headings->Column2->x,$Page_Height - $FormDesign->Headings->Column2->y, $FormDesign->Headings->Column2->FontSize, _('Description'));
 $pdf->addText($FormDesign->Headings->Column3->x,$Page_Height - $FormDesign->Headings->Column3->y, $FormDesign->Headings->Column3->FontSize, _('Unit Price'));
 $pdf->addText($FormDesign->Headings->Column4->x,$Page_Height - $FormDesign->Headings->Column4->y, $FormDesign->Headings->Column4->FontSize, _('Quantity'));
@@ -190,6 +207,9 @@
 $pdf->addText($FormDesign->Headings->Column7->x,$Page_Height - $FormDesign->Headings->Column7->y, $FormDesign->Headings->Column7->FontSize, _('Extended Price'));
 
 /*draw a line */
-$pdf->line($FormDesign->LineBelowColumns->startx, $Page_Height -$FormDesign->LineBelowColumns->starty,$FormDesign->LineBelowColumns->endx, $Page_Height -$FormDesign->LineBelowColumns->endy);
+$pdf->line($FormDesign->LineBelowColumns->startx, 
+					$Page_Height -$FormDesign->LineBelowColumns->starty,
+					$FormDesign->LineBelowColumns->endx, 
+					$Page_Height -$FormDesign->LineBelowColumns->endy);
 
 ?>
\ No newline at end of file

Modified: trunk/includes/PDFTransPageHeaderPortrait.inc
===================================================================
--- trunk/includes/PDFTransPageHeaderPortrait.inc	2011-01-11 11:42:44 UTC (rev 4250)
+++ trunk/includes/PDFTransPageHeaderPortrait.inc	2011-01-11 12:28:10 UTC (rev 4251)
@@ -9,7 +9,7 @@
 
 $YPos = $Page_Height - $Top_Margin;
 
-$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -115,$YPos-35,0,35);
+$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -115,$YPos-50,0,35);
 
 $FontSize =15;
 if ($InvOrCredit=='Invoice') {


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