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

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

Revision: 5396
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5396&view=rev
Author:   daintree
Date:     2012-05-23 09:30:51 +0000 (Wed, 23 May 2012)
Log Message:
-----------
show supplier item code on po rather than our code

Modified Paths:
--------------
    trunk/PO_PDFPurchOrder.php
    trunk/doc/Change.log

Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php	2012-05-23 03:28:56 UTC (rev 5395)
+++ trunk/PO_PDFPurchOrder.php	2012-05-23 09:30:51 UTC (rev 5396)
@@ -255,7 +255,14 @@
 			$Desc=$POLine['itemdescription'];
 			
 			$OrderTotal += ($POLine['unitprice']*$POLine['quantityord']);
-			$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column1->x,$YPos,$FormDesign->Data->Column1->Length,$FormDesign->Data->Column1->FontSize,$POLine['itemcode'], 'left');
+			
+			//use suppliers itemcode if available i.e. stringlength >0
+			if (strlen($POLine['suppliers_partno']>0)) {
+				$Itemcode=$POLine['suppliers_partno']; 
+			} else {
+				$Itemcode=$POLine['itemcode'];
+			}
+			$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column1->x,$YPos,$FormDesign->Data->Column1->Length,$FormDesign->Data->Column1->FontSize,$Itemcode, 'left');
 			$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column2->x,$YPos,$FormDesign->Data->Column2->Length,$FormDesign->Data->Column2->FontSize,$Desc, 'left');
 			while (mb_strlen($LeftOvers) > 1){
 				$YPos-=$line_height;

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2012-05-23 03:28:56 UTC (rev 5395)
+++ trunk/doc/Change.log	2012-05-23 09:30:51 UTC (rev 5396)
@@ -1,4 +1,6 @@
 webERP Change Log
+
+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. 
 2012/05/22 Exson: Modify accountcode to varchar(20) to meet some countries accounting regulation for more digits account code.
 22/5/2012 Phil Klaus's spot - removed issue location (must always be the same as the manufacture location) and the issued date from WorkOrderStatus.php form - as materials could be issued on many different dates and incorrect to say they are always issued on the current date

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