[Web-erp-svn] SF.net SVN: web-erp:[6138] trunk/includes

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

Revision: 6138
          http://sourceforge.net/p/web-erp/reponame/6138
Author:   rchacon
Date:     2013-07-22 17:46:59 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
Relative alignment of the upper-right-corner data (quotation number, quotation date, quotation page and customer reference).

Modified Paths:
--------------
    trunk/includes/PDFQuotationPageHeader.inc
    trunk/includes/PDFQuotationPortraitPageHeader.inc

Modified: trunk/includes/PDFQuotationPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPageHeader.inc	2013-07-22 16:45:04 UTC (rev 6137)
+++ trunk/includes/PDFQuotationPageHeader.inc	2013-07-22 17:46:59 UTC (rev 6138)
@@ -84,18 +84,14 @@
 /*Finally join up to the top right corner where started */
 $pdf->line($XPos+235, $YPos,$XPos+235, $YPos+60);
 
+$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*1, 200, $FontSize, _('Number'). ': '.$_GET['QuotationNo'], 'right');
+$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*2, 200, $FontSize, _('Your Ref'). ': '.$myrow['customerref'], 'right');
+$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*3, 200, $FontSize, _('Date'). ': '.ConvertSQLDate($myrow['orddate']), 'right');
+$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*4, 200, $FontSize, _('Page').': '.$PageNumber, 'right');
+
 include($PathPrefix . 'includes/CurrenciesArray.php');	/* To get the currency name */
 $pdf->addText($Page_Width/2-60, $YPos-5, $FontSize, _('All amounts stated in') . ' - ' . $myrow['currcode'] . ' ' . $CurrenciesArray[$myrow['currcode']]['Currency']);
 
-$pdf->addText(620, 560,$FontSize, _('Number'). ':');
-$pdf->addText(700, 560,$FontSize, $_GET['QuotationNo']);
-$pdf->addText(620, 560-15,$FontSize, _('Your Ref'). ':');
-$pdf->addText(700, 560-15,$FontSize, $myrow['customerref']);
-$pdf->addText(620, 560-30,$FontSize,  _('Date'). ':');
-$pdf->addText(700, 560-30,$FontSize,  ConvertSQLDate($myrow['orddate']));
-$pdf->addText(620, 560-45,$FontSize,  _('Page'). ':');
-$pdf->addText(700, 560-45,$FontSize,  $PageNumber);
-
 $YPos -= 37;
 $XPos = 40;
 

Modified: trunk/includes/PDFQuotationPortraitPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPortraitPageHeader.inc	2013-07-22 16:45:04 UTC (rev 6137)
+++ trunk/includes/PDFQuotationPortraitPageHeader.inc	2013-07-22 17:46:59 UTC (rev 6138)
@@ -83,15 +83,19 @@
 /*Finally join up to the top right corner where started */
 $pdf->line($XPos+210, $YPos,$XPos+210, $YPos+60);
 
+$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*1, 200, $FontSize, _('Number'). ': '.$_GET['QuotationNo'], 'right');
+$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*2, 200, $FontSize, _('Your Ref'). ': '.$myrow['customerref'], 'right');
+$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*3, 200, $FontSize, _('Date'). ': '.ConvertSQLDate($myrow['orddate']), 'right');
+$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*4, 200, $FontSize, _('Page').': '.$PageNumber, 'right');
 
-$pdf->addText(490, 790,$FontSize, _('Number'). ':');
+/*$pdf->addText(490, 790,$FontSize, _('Number'). ':');
 $pdf->addText(535, 790,$FontSize, $_GET['QuotationNo']);
 $pdf->addText(490, 790-15,$FontSize, _('Your Ref'). ':');
 $pdf->addText(520, 790-15,$FontSize, $myrow['customerref']);
 $pdf->addText(490, 790-30,$FontSize,  _('Date'). ':');
 $pdf->addText(520, 790-30,$FontSize,  ConvertSQLDate($myrow['orddate']));
 $pdf->addText(490, 790-45,$FontSize,  _('Page'). ':');
-$pdf->addText(520, 790-45,$FontSize,  $PageNumber);
+$pdf->addText(520, 790-45,$FontSize,  $PageNumber);*/
 
 $pdf->addText($Page_Width/2-10, $YPos+15, $FontSize, _('All amounts stated in') . ' - ' . $myrow['currcode']);