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

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

Revision: 6137
          http://sourceforge.net/p/web-erp/reponame/6137
Author:   rchacon
Date:     2013-07-22 16:45:04 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
Relative alignment of the rightmost column.

Modified Paths:
--------------
    trunk/PDFQuotation.php
    trunk/PDFQuotationPortrait.php
    trunk/includes/PDFQuotationPageHeader.inc
    trunk/includes/PDFQuotationPortraitPageHeader.inc

Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php	2013-07-22 14:16:56 UTC (rev 6136)
+++ trunk/PDFQuotation.php	2013-07-22 16:45:04 UTC (rev 6137)
@@ -203,7 +203,7 @@
 		}
 		$LeftOvers = $pdf->addTextWrap(585,$YPos,85,$FontSize,$DisplayTaxClass,'right');
 		$LeftOvers = $pdf->addTextWrap(650,$YPos,85,$FontSize,$DisplayTaxAmount,'right');
-		$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,$DisplayTotal,'right');
+		$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, $DisplayTotal,'right');
 		if (mb_strlen($myrow2['narrative'])>1){
 			$YPos -= ($line_height);
 			$LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,870,$FontSize,$myrow2['narrative']);
@@ -229,15 +229,15 @@
 			include ('includes/PDFQuotationPageHeader.inc');
 	} //end if need a new page headed up
 
-	$YPos -= ($line_height);
-	$LeftOvers = $pdf->addTextWrap(40,$YPos,655,$FontSize,_('Quotation Excluding Tax'),'right');
-	$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($QuotationTotalEx,$myrow['currdecimalplaces']),'right');
+	$YPos -= ($line_height);	
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90-655, $YPos, 655, $FontSize, _('Quotation Excluding Tax'),'right');
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, locale_number_format($QuotationTotalEx,$myrow['currdecimalplaces']), 'right');	
 	$YPos -= 12;
-	$LeftOvers = $pdf->addTextWrap(40,$YPos,655,$FontSize,_('Total Tax'),'right');
-	$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($TaxTotal,$myrow['currdecimalplaces']),'right');
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90-655, $YPos, 655, $FontSize, _('Total Tax'), 'right');
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, locale_number_format($TaxTotal,$myrow['currdecimalplaces']), 'right');
 	$YPos -= 12;
-	$LeftOvers = $pdf->addTextWrap(40,$YPos,655,$FontSize,_('Quotation Including Tax'),'right');
-	$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($QuotationTotal,$myrow['currdecimalplaces']),'right');
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90-655, $YPos, 655, $FontSize, _('Quotation Including Tax'),'right');
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, locale_number_format($QuotationTotal,$myrow['currdecimalplaces']), 'right');
 
 	$YPos -= ($line_height);
 	$LeftOvers = $pdf->addTextWrap($XPos,$YPos,30,10,_('Notes:'));

Modified: trunk/PDFQuotationPortrait.php
===================================================================
--- trunk/PDFQuotationPortrait.php	2013-07-22 14:16:56 UTC (rev 6136)
+++ trunk/PDFQuotationPortrait.php	2013-07-22 16:45:04 UTC (rev 6137)
@@ -203,7 +203,7 @@
 		}
 		$LeftOvers = $pdf->addTextWrap(330,$YPos,85,$FontSize,$DisplayTaxClass,'right');
 		$LeftOvers = $pdf->addTextWrap(410,$YPos,85,$FontSize,$DisplayTaxAmount,'center');
-		$LeftOvers = $pdf->addTextWrap(460,$YPos,90,$FontSize,$DisplayTotal,'right');
+		$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, $DisplayTotal,'right');
 		if (mb_strlen($myrow2['narrative'])>1){
 			$YPos -= 10;
 			$LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,750,10,$myrow2['narrative']);
@@ -247,15 +247,15 @@
 			}
 		}
 	}
-	$YPos -= ($line_height);
-	$LeftOvers = $pdf->addTextWrap(40,$YPos,655,$FontSize,_('Total Tax'),'right');
-	$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($TaxTotal,$myrow['currdecimalplaces']),'right');
+	$YPos -= ($line_height);	
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90-655, $YPos, 655, $FontSize, _('Quotation Excluding Tax'),'right');
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, locale_number_format($QuotationTotalEx,$myrow['currdecimalplaces']), 'right');	
 	$YPos -= 12;
-	$LeftOvers = $pdf->addTextWrap(40,$YPos,655,$FontSize,_('Quotation Excluding Tax'),'right');
-	$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($QuotationTotalEx,$myrow['currdecimalplaces']),'right');
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90-655, $YPos, 655, $FontSize, _('Total Tax'), 'right');
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, locale_number_format($TaxTotal,$myrow['currdecimalplaces']), 'right');
 	$YPos -= 12;
-	$LeftOvers = $pdf->addTextWrap(40,$YPos,655,$FontSize,_('Quotation Including Tax'),'right');
-	$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($QuotationTotal,$myrow['currdecimalplaces']),'right');
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90-655, $YPos, 655, $FontSize, _('Quotation Including Tax'),'right');
+	$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, locale_number_format($QuotationTotal,$myrow['currdecimalplaces']), 'right');
 
 } /*end if there are line details to show on the quotation*/
 

Modified: trunk/includes/PDFQuotationPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPageHeader.inc	2013-07-22 14:16:56 UTC (rev 6136)
+++ trunk/includes/PDFQuotationPageHeader.inc	2013-07-22 16:45:04 UTC (rev 6137)
@@ -107,7 +107,7 @@
 $LeftOvers = $pdf->addTextWrap(535,$YPos,85,$FontSize, _('Discount'),'right');
 $LeftOvers = $pdf->addTextWrap(585,$YPos,85,$FontSize, _('Tax Class'),'right');
 $LeftOvers = $pdf->addTextWrap(650,$YPos,85,$FontSize, _('Tax Amount'),'right');
-$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize, _('Total'),'right');
+$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, _('Total'),'right');
 
 /*draw a box with nice round corner for entering line items */
 /*90 degree arc at top right of box 0 degrees starts a bottom */

Modified: trunk/includes/PDFQuotationPortraitPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPortraitPageHeader.inc	2013-07-22 14:16:56 UTC (rev 6136)
+++ trunk/includes/PDFQuotationPortraitPageHeader.inc	2013-07-22 16:45:04 UTC (rev 6137)
@@ -106,7 +106,7 @@
 $LeftOvers = $pdf->addTextWrap(280,$YPos,85,$FontSize, _('Discount'),'right');
 $LeftOvers = $pdf->addTextWrap(330,$YPos,85,$FontSize, _('Tax Class'),'right');
 $LeftOvers = $pdf->addTextWrap(400,$YPos,85,$FontSize, _('Tax Amount'),'right');
-$LeftOvers = $pdf->addTextWrap(450,$YPos,90,$FontSize, _('Total'),'right');
+$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, _('Total'),'right');
 
 
 /*draw a box with nice round corner for entering line items */
@@ -136,4 +136,4 @@
 
 $FontSize =12;
 
-?>
\ No newline at end of file
+?>