[Weberp-cvs] SF.net SVN: web-erp:[3047] trunk

[<tim...@us...>]

Revision: 3047
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3047&view=rev
Author:   tim_schofield
Date:     2009-11-18 14:43:40 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
Include payment terms on the order.

Modified Paths:
--------------
    trunk/PO_PDFPurchOrder.php
    trunk/doc/Change.log.html
    trunk/includes/PO_PDFOrderPageHeader.inc

Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php	2009-11-18 14:21:39 UTC (rev 3046)
+++ trunk/PO_PDFPurchOrder.php	2009-11-18 14:43:40 UTC (rev 3047)
@@ -86,6 +86,7 @@
 			purchorders.allowprint,
 			purchorders.requisitionno,
 			purchorders.initiator,
+			purchorders.paymentterms,
 			suppliers.currcode
 		FROM purchorders INNER JOIN suppliers
 			ON purchorders.supplierno = suppliers.supplierid

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2009-11-18 14:21:39 UTC (rev 3046)
+++ trunk/doc/Change.log.html	2009-11-18 14:43:40 UTC (rev 3047)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p>
+<p>18/11/09 Tim: PO_PDFOrderPageHeader.inc - Include payment terms on the order.
 <p>18/11/09 Tim: Customers.php - Provide for better error handling when price lists and customer types are not setup.
 <p>18/11/09 Tim: Customers.php - Provide option to just view a customers details
 <p>18/11/09 Tim: PDFReceipt.php - Provide option to print a customer receipt

Modified: trunk/includes/PO_PDFOrderPageHeader.inc
===================================================================
--- trunk/includes/PO_PDFOrderPageHeader.inc	2009-11-18 14:21:39 UTC (rev 3046)
+++ trunk/includes/PO_PDFOrderPageHeader.inc	2009-11-18 14:43:40 UTC (rev 3047)
@@ -56,7 +56,6 @@
 $pdf->addText($XPos+2,$YPos-(3*$line_height), $FontSize, $POHeader['deladd3'] . ' ' . $POHeader['deladd4'] . ' ' . $POHeader['deladd5']);
 $pdf->addText($XPos+2,$YPos-(4*$line_height), $FontSize, $POHeader['deladd6']);
 
-
 /*draw a nice curved corner box around the delivery to address */
 /*from the top right */
 $pdf->partEllipse($XPos+250-10,$YPos+10,0,90,10,10);
@@ -124,6 +123,11 @@
 	$LeftOvers = $pdf->addTextWrap($XPos, $YPos-$line_height,250,$FontSize,$LeftOvers, 'left');
 }
 
+$sql='SELECT terms FROM paymentterms where termsindicator="'.$POHeader['paymentterms'].'"';
+$result=DB_query($sql, $db);
+$myrow=DB_fetch_array($result);
+$pdf->addText($XPos+2,$YPos-($line_height), $FontSize, _('Payment Terms').' :  '.$myrow['terms']);
+
 $XPos = $Left_Margin;
 $YPos -= ($line_height*2);
 $pdf->addText($Left_Margin,$YPos, $FontSize, _('All amounts stated in').' - ' . $POHeader['currcode']);


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