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

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

Revision: 6022
          http://sourceforge.net/p/web-erp/reponame/6022
Author:   rchacon
Date:     2013-06-14 16:13:47 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
PDFQuotation.php: Sort Quotation Excluding Tax, Total Tax and Quotation Including Tax. includes/PDFQuotationPageHeader.inc: Add currency name from includes/CurrenciesArray.php.

Modified Paths:
--------------
    trunk/PDFQuotation.php
    trunk/includes/PDFQuotationPageHeader.inc
    trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
    trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po

Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php	2013-06-14 15:36:22 UTC (rev 6021)
+++ trunk/PDFQuotation.php	2013-06-14 16:13:47 UTC (rev 6022)
@@ -230,12 +230,12 @@
 	} //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 -= 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');
 	$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');
-	$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');
 

Modified: trunk/includes/PDFQuotationPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPageHeader.inc	2013-06-14 15:36:22 UTC (rev 6021)
+++ trunk/includes/PDFQuotationPageHeader.inc	2013-06-14 16:13:47 UTC (rev 6022)
@@ -84,7 +84,8 @@
 /*Finally join up to the top right corner where started */
 $pdf->line($XPos+235, $YPos,$XPos+235, $YPos+60);
 
-$pdf->addText($Page_Width/2-60, $YPos-5, $FontSize, _('All amounts stated in') . ' - ' . $myrow['currcode']);
+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']);

Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po	2013-06-14 15:36:22 UTC (rev 6021)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po	2013-06-14 16:13:47 UTC (rev 6022)
@@ -8,7 +8,7 @@
 "Project-Id-Version: WebERP 4.081\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-05-25 11:02+1200\n"
-"PO-Revision-Date: 2013-06-14 09:28-0600\n"
+"PO-Revision-Date: 2013-06-14 09:47-0600\n"
 "Last-Translator: Rafael Chacon <raf...@gm...>\n"
 "Language-Team: TecnoSoluciones.com <web...@te...>\n"
 "Language: es_ES\n"
@@ -17775,7 +17775,7 @@
 #: includes/PDFQuotationPortraitPageHeader.inc:22
 #: includes/PDFSalesOrder_generic.inc:34
 msgid "Ph"
-msgstr "Tel."
+msgstr "Tel"
 
 #: PDFCustomerList.php:368
 msgid "Customer Details Listing"