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

[<dai...@us...>]

Revision: 5404
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5404&view=rev
Author:   daintree
Date:     2012-05-29 08:23:46 +0000 (Tue, 29 May 2012)
Log Message:
-----------
fix label script - also utf-8 xml-rpc

Modified Paths:
--------------
    trunk/PDFPrintLabel.php
    trunk/api/api_xml-rpc.php
    trunk/doc/Change.log

Modified: trunk/PDFPrintLabel.php
===================================================================
--- trunk/PDFPrintLabel.php	2012-05-28 02:09:06 UTC (rev 5403)
+++ trunk/PDFPrintLabel.php	2012-05-29 08:23:46 UTC (rev 5404)
@@ -223,7 +223,7 @@
 					$Image_String = ob_get_contents();
 					ob_end_clean();
 
-					$pdf->addJpegFromFile('@' . $Image_String,$XPos+$Field['HPos'],$Field['VPos'],'', $Field['FontSize']);
+					$pdf->addJpegFromFile('@' . $Image_String,$XPos+$Field['HPos'],$YPos-$LabelDimensions['label_height']+$Field['VPos'],'', $Field['FontSize']);
 
 				} else {
 					$LeftOvers = $pdf->addTextWrap($XPos+$Field['HPos'],$YPos-$LabelDimensions['label_height']+$Field['VPos'],$LabelDimensions['label_width']-$Field['HPos']-20,$Field['FontSize'],$Value);

Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php	2012-05-28 02:09:06 UTC (rev 5403)
+++ trunk/api/api_xml-rpc.php	2012-05-29 08:23:46 UTC (rev 5404)
@@ -8,7 +8,7 @@
 	include 'api_php.php';
 
 	include '../xmlrpc/lib/xmlrpc.inc';
-
+	$xmlrpc_internalencoding='UTF-8';
 	include '../xmlrpc/lib/xmlrpcs.inc';
 
 	$Description = _('This function is used to login into the API methods for the specified the database.')

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2012-05-28 02:09:06 UTC (rev 5403)
+++ trunk/doc/Change.log	2012-05-29 08:23:46 UTC (rev 5404)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+28/5/2012 Phil: Configure xmlrpc api to work correctly with utf-8 character encoding.
 26/5/2012 Phil: Fix barcode printing on PDFPrintLabel.php - barcode functionality is unreliable so used (http://www.barcodepack.com) by Tomáš Horáček very simple and clean
 23/5/2012 Klaus: PO_PDFPurchOrders.php print purchase orders with supplier's code where it is available in the purchasing data
 23/5/2012 Exson: Revise GLAccounts.php to make more than 10 digits account code is allowed. 
@@ -11,7 +12,6 @@
 14/5/2012 Exson: Fixed bug that when users input a Exchang Rate manually, when ones changed minds and select another currency, it'll not show the suggested rate correctly in Payments.php. 
 14/5/2012 Exson: Fixed when user change the currency, the suggested rate can not changed accordingly in CustomerReceipt.php. Reported by Ahmed.Fawzy.
 14/5/2012 Ahmed.Fawzy: Fixed bugs that ExchangRateText be applied with locale_number_format() function in CustomerReceipt.php
-
 10/5/2012 Exson: Fixed bug that Date selection does not work in ReverseGRN.php. Add GRN batch column. 
 9/5/2012 Ahmed.Fawzy: Fixed bugs in Stocks.php that the properties for new items cannot be saved. Checked status is not kept and numeric values between max and min are not validated.
 8/5/2012 Exson: Fixed typo in SalesCategories.php which leads to the jpg pictures do not appear. 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.