[Web-erp-svn] SF.net SVN: web-erp:[6290] trunk

[<rc...@us...>]

Revision: 6290
          http://sourceforge.net/p/web-erp/reponame/6290
Author:   rchacon
Date:     2013-08-25 23:08:50 +0000 (Sun, 25 Aug 2013)
Log Message:
-----------
Adjust to Left and right alignment in relative way.

Modified Paths:
--------------
    trunk/PrintCustTransPortrait.php
    trunk/includes/PDFTransPageHeaderPortrait.inc

Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php	2013-08-25 13:08:04 UTC (rev 6289)
+++ trunk/PrintCustTransPortrait.php	2013-08-25 23:08:50 UTC (rev 6290)
@@ -351,7 +351,7 @@
 				$LeftOvers = $pdf->addTextWrap($Left_Margin+350,$YPos,36,$FontSize,$DisplayQty,'right');
 				$LeftOvers = $pdf->addTextWrap($Left_Margin+390,$YPos,26,$FontSize,$myrow2['units'],'center');
 				$LeftOvers = $pdf->addTextWrap($Left_Margin+420,$YPos,26,$FontSize,$DisplayDiscount,'right');
-				$LeftOvers = $pdf->addTextWrap($Left_Margin+450,$YPos,72,$FontSize,$DisplayNet,'right');
+				$LeftOvers = $pdf->addTextWrap($Page_Width-$Left_Margin-72, $YPos, 72, $FontSize, $DisplayNet, 'right');
 
 				if ($myrow2['controlled']==1){
 
@@ -460,23 +460,23 @@
 		$YPos = $Bottom_Margin+(3*$line_height);
 	/* Print out the payment terms */
 
-  		$pdf->addTextWrap($Left_Margin+5,$YPos+3,280,$FontSize,_('Payment Terms') . ': ' . $myrow['terms']);
+  		$pdf->addTextWrap($Left_Margin, $YPos+3, 280, $FontSize,_('Payment Terms') . ': ' . $myrow['terms']);
 
 		$FontSize =8;
 		$LeftOvers=explode('\r\n',DB_escape_string($myrow['invtext']));
 		for ($i=0;$i<sizeOf($LeftOvers);$i++) {
-			$pdf->addText($Left_Margin+5, $YPos-8-($i*8), $FontSize, $LeftOvers[$i]);
+			$pdf->addText($Left_Margin, $YPos-8-($i*8), $FontSize, $LeftOvers[$i]);
 		}
 		$FontSize = 10;
 
-		$pdf->addText($Page_Width-$Right_Margin-220, $YPos+12,$FontSize, _('Sub Total'));
-		$LeftOvers = $pdf->addTextWrap($Left_Margin+450,$YPos+5,72,$FontSize,$DisplaySubTot, 'right');
+		$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-220, $YPos+5, 72, $FontSize, _('Sub Total'));
+		$LeftOvers = $pdf->addTextWrap($Page_Width-$Left_Margin-72, $YPos+5, 72, $FontSize, $DisplaySubTot, 'right');
 
-		$pdf->addText($Page_Width-$Right_Margin-220, ($YPos+12)-$line_height+5,$FontSize, _('Freight'));
-		$LeftOvers = $pdf->addTextWrap($Left_Margin+450,$YPos-$line_height+5,72,$FontSize,$DisplayFreight, 'right');
+		$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-220, $YPos+5-$line_height, 72, $FontSize, _('Freight'));
+		$LeftOvers = $pdf->addTextWrap($Page_Width-$Left_Margin-72, $YPos+5-$line_height, 72, $FontSize, $DisplayFreight, 'right');
 
-		$pdf->addText($Page_Width-$Right_Margin-220, ($YPos+12)-(2*$line_height)+5,$FontSize, _('Tax'));
-		$LeftOvers = $pdf->addTextWrap($Left_Margin+450,$YPos-(2*$line_height)+5,72, $FontSize,$DisplayTax, 'right');
+		$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-220, $YPos+5-$line_height*2, 72, $FontSize, _('Tax'));
+		$LeftOvers = $pdf->addTextWrap($Page_Width-$Left_Margin-72, $YPos+5-$line_height*2, 72, $FontSize, $DisplayTax, 'right');
 
 		/*rule off for total */
 		$pdf->line($Page_Width-$Right_Margin-222, $YPos-(2*$line_height),$Page_Width-$Right_Margin,$YPos-(2*$line_height));
@@ -486,24 +486,24 @@
 
 		$YPos+=10;
 		if ($InvOrCredit=='Invoice'){
-			$pdf->addText($Page_Width-$Right_Margin-220, ($YPos+6) - ($line_height*3),$FontSize, _('TOTAL INVOICE'));
+			$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-220, $Bottom_Margin+5, 144, $FontSize, _('TOTAL INVOICE'));
 			$FontSize=8;
-			$LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos-18,280,$FontSize,$_SESSION['RomalpaClause']);
+			$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos-18,280,$FontSize,$_SESSION['RomalpaClause']);
 			while (mb_strlen($LeftOvers)>0 AND $YPos > $Bottom_Margin){
 				$YPos -=10;
-				$LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos-18,280,$FontSize,$LeftOvers);
+				$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos-18,280,$FontSize,$LeftOvers);
 			}
-/* Add Images for Visa / Mastercard / Paypal */
+			/* Add Images for Visa / Mastercard / Paypal */
 			if (file_exists('companies/' . $_SESSION['DatabaseName'] . '/payment.jpg')) {
 				$pdf->addJpegFromFile('companies/' . $_SESSION['DatabaseName'] . '/payment.jpg',$Page_Width/2 -60,$YPos-15,0,20);
 			}
-// Print Bank acount details if available and default for invoices is selected
-            $pdf->addText($Page_Width-$Right_Margin-450, $YPos - ($line_height*3)+22,$FontSize, $DefaultBankAccountCode . '  ' . $DefaultBankAccountNumber);
+			// Print Bank acount details if available and default for invoices is selected
+            $pdf->addText($Left_Margin, $YPos+22-$line_height*3, $FontSize, $DefaultBankAccountCode . '  ' . $DefaultBankAccountNumber);
 			$FontSize=10;
 		} else {
-			$pdf->addText($Page_Width-$Right_Margin-220, ($YPos+6)-($line_height*3),$FontSize, _('TOTAL CREDIT'));
+			$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-220, $Bottom_Margin+5, 144, $FontSize, _('TOTAL CREDIT'));
  		}
-		$LeftOvers = $pdf->addTextWrap($Left_Margin+450,35,72, $FontSize,$DisplayTotal, 'right');
+		$LeftOvers = $pdf->addTextWrap($Page_Width-$Left_Margin-72, $Bottom_Margin+5, 72, $FontSize, $DisplayTotal, 'right');
 	    } /* end of check to see that there was an invoice record to print */
 
 	    $FromTransNo++;

Modified: trunk/includes/PDFTransPageHeaderPortrait.inc
===================================================================
--- trunk/includes/PDFTransPageHeaderPortrait.inc	2013-08-25 13:08:04 UTC (rev 6289)
+++ trunk/includes/PDFTransPageHeaderPortrait.inc	2013-08-25 23:08:50 UTC (rev 6290)
@@ -19,9 +19,9 @@
 	$pdf->addText($Page_Width/2 - 60, $YPos, $FontSize, _('TAX CREDIT NOTE') . ' ');
 }
 
+// Prints page number
 $FontSize = 10;
-$pdf->addText($Page_Width-128, $YPos, $FontSize, _('Page'));
-$pdf->addText($Page_Width-60, $YPos, $FontSize, $PageNumber);
+$pdf->addTextWrap($Page_Width-$Left_Margin-72, $YPos-$FontSize, 72, $FontSize, _('Page').' '.$PageNumber, 'right');
 
 
 $XPos = $Page_Width - 265;
@@ -259,13 +259,13 @@
 
 $TopOfColHeadings = $YPos;
 
-$pdf->addText($Left_Margin+5, $YPos+12, $FontSize, _('Item Code'));
+$pdf->addText($Left_Margin, $YPos+12, $FontSize, _('Item Code'));
 $pdf->addText($Left_Margin+80, $YPos+12, $FontSize, _('Description'));
 $pdf->addText($Left_Margin+270, $YPos+12, $FontSize, _('Unit Price'));
 $pdf->addText($Left_Margin+350, $YPos+12, $FontSize, _('Qty'));
 $pdf->addText($Left_Margin+390, $YPos+12, $FontSize, _('UOM'));
 $pdf->addText($Left_Margin+420, $YPos+12, $FontSize, _('Disc.'));
-$pdf->addText($Left_Margin+450, $YPos+12, $FontSize, _('Price'));
+$pdf->addTextWrap($Page_Width-$Left_Margin-72, $YPos, 72, $FontSize, _('Price'), 'right');
 
 $YPos-=0;