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

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

Revision: 7006
          http://sourceforge.net/p/web-erp/reponame/7006
Author:   rchacon
Date:     2014-11-24 17:40:55 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
In PrintCustStatements.php, make translatable the currency name and the transaction type.

Modified Paths:
--------------
    trunk/PrintCustStatements.php
    trunk/doc/Change.log
    trunk/includes/PDFStatementPageHeader.inc

Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php	2014-11-24 16:25:25 UTC (rev 7005)
+++ trunk/PrintCustStatements.php	2014-11-24 17:40:55 UTC (rev 7006)
@@ -49,7 +49,7 @@
 
 	$FirstStatement = True;
 
-	
+
 	// check if the user has set a default bank account for invoices, if not leave it blank
 	$sql = "SELECT bankaccounts.invoice,
 				bankaccounts.bankaccountnumber,
@@ -124,7 +124,7 @@
 					ON debtortrans.type=systypes.typeid
 				WHERE debtortrans.debtorno='" . $StmtHeader['debtorno'] . "'
 				AND debtortrans.settled=0";
-	
+
 		if ($_SESSION['SalesmanLogin'] != '') {
 			$sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
 		}
@@ -198,7 +198,7 @@
 
 						$FontSize=9;
 
-						$LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize,$myrow['typename'], 'left');
+						$LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize, _($myrow['typename']), 'left');
 						$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left');
 						$LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
 
@@ -248,7 +248,7 @@
 				$DisplayOutstanding = locale_number_format($myrow['ostdg'],$StmtHeader['currdecimalplaces']);
 
 				$FontSize=9;
-				$LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize,$myrow['typename'], 'left');
+				$LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize, _($myrow['typename']), 'left');
 				$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left');
 				$LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
 
@@ -266,7 +266,7 @@
 
 				/*Now show also in the remittance advice sectin */
 				$FontSize=8;
-				$LeftOvers = $pdf->addTextWrap($Perforation+10,$YPos,30,$FontSize,$myrow['typename'], 'left');
+				$LeftOvers = $pdf->addTextWrap($Perforation+10,$YPos,30,$FontSize, _($myrow['typename']), 'left');
 				$LeftOvers = $pdf->addTextWrap($Perforation+75,$YPos,30,$FontSize,$myrow['transno'], 'left');
 				$LeftOvers = $pdf->addTextWrap($Perforation+90,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
 
@@ -420,7 +420,7 @@
 			/* Show the bank account details */
 			$pdf->addText($Perforation-250, $Bottom_Margin+32, $FontSize, _('Please make payments to our account:') . ' ' . $DefaultBankAccountNumber);
 			$pdf->addText($Perforation-250, $Bottom_Margin+32-$line_height, $FontSize, _('Quoting your account reference') . ' ' . $StmtHeader['debtorno'] );
-			
+
 			/*also show the total due in the remittance section */
 			if ($AgedAnalysis['balance']>0){ /*No point showing a negative balance for payment! */
 					$FontSize=8;

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2014-11-24 16:25:25 UTC (rev 7005)
+++ trunk/doc/Change.log	2014-11-24 17:40:55 UTC (rev 7006)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+24/11/14 RChacon: In PrintCustStatements.php, make translatable the currency name and the transaction type.
 24/11/14 RChacon: Spanish translation improvements. Merging "View GL Entries" and "View the GL Entries".
 22/11/14 Exson: Fix the qualitytext does not have default value for strict sql mode in Credit_Invoice.php.
 22/11/14 Phil: Z_DeleteOldPrices.php now removes all old prices where there is a later start for a price with no end date

Modified: trunk/includes/PDFStatementPageHeader.inc
===================================================================
--- trunk/includes/PDFStatementPageHeader.inc	2014-11-24 16:25:25 UTC (rev 7005)
+++ trunk/includes/PDFStatementPageHeader.inc	2014-11-24 17:40:55 UTC (rev 7006)
@@ -113,7 +113,7 @@
 
 $FontSize=8;
 $XPos = $Page_Width/2 - 60;
-$pdf->addText($XPos, $YPos,$FontSize, _('All amounts stated in') . ' - ' . $StmtHeader['currency']);
+$pdf->addText($XPos, $YPos,$FontSize, _('All amounts stated in') . ': ' . _($StmtHeader['currency']));
 $YPos -= $line_height;
 $pdf->addText($XPos, $YPos,$FontSize, $StmtHeader['terms']);