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

[<tu...@us...>]

Revision: 7887
          http://sourceforge.net/p/web-erp/reponame/7887
Author:   turbopt
Date:     2017-12-18 23:35:39 +0000 (Mon, 18 Dec 2017)
Log Message:
-----------
PDFBOMListingPageHeader.inc, BOMListing.php: Adjust PDF position values, and add UoM. (Reported in forums by Paul Becker)

Modified Paths:
--------------
    trunk/BOMListing.php
    trunk/doc/Change.log
    trunk/includes/PDFBOMListingPageHeader.inc

Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php	2017-12-15 22:54:45 UTC (rev 7886)
+++ trunk/BOMListing.php	2017-12-18 23:35:39 UTC (rev 7887)
@@ -22,6 +22,7 @@
 				bom.component,
 				stockmaster.description as compdescription,
 				stockmaster.decimalplaces,
+				stockmaster.units,
 				bom.quantity,
 				bom.loccode,
 				bom.workcentreadded,
@@ -86,10 +87,11 @@
 
 		$DisplayQuantity = locale_number_format($BOMList['quantity'],$BOMList['decimalplaces']);
 		$LeftOvers = $pdf->addTextWrap(320,$YPos,50,$FontSize,ConvertSQLDate($BOMList['eff_frm']),'left');
-		$LeftOvers = $pdf->addTextWrap(370,$YPos,50,$FontSize,ConvertSQLDate($BOMList['eff_to']),'left');
-		$LeftOvers = $pdf->addTextWrap(420,$YPos,20,$FontSize,$BOMList['loccode'],'left');
-		$LeftOvers = $pdf->addTextWrap(440,$YPos,30,$FontSize,$BOMList['workcentreadded'],'left');
+		$LeftOvers = $pdf->addTextWrap(375,$YPos,50,$FontSize,ConvertSQLDate($BOMList['eff_to']),'left');
+		$LeftOvers = $pdf->addTextWrap(430,$YPos,30,$FontSize,$BOMList['loccode'],'left');
+		$LeftOvers = $pdf->addTextWrap(465,$YPos,30,$FontSize,$BOMList['workcentreadded'],'left');
 		$LeftOvers = $pdf->addTextWrap(480,$YPos,60,$FontSize,$DisplayQuantity,'right');
+		$LeftOvers = $pdf->addTextWrap(540,$YPos,20,$FontSize,$BOMList['units'],'left');
 
 		if ($YPos < $Bottom_Margin + $line_height){
 		   include('includes/PDFBOMListingPageHeader.inc');

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2017-12-15 22:54:45 UTC (rev 7886)
+++ trunk/doc/Change.log	2017-12-18 23:35:39 UTC (rev 7887)
@@ -1,6 +1,7 @@
 webERP Change Log
 
-11/14/17 PaulT: MRPPlannedPurchaseOrders.php, MRPPlannedWorkOrders.php: Fix PDF highlighting, PDF position value adjustments, and other minor tweaks. (Reported in forums by Paul Becker)
+11/18/17 PaulT: PDFBOMListingPageHeader.inc, BOMListing.php: Adjust PDF position values, and add UoM. (Reported in forums by Paul Becker)
+11/15/17 PaulT: MRPPlannedPurchaseOrders.php, MRPPlannedWorkOrders.php: Fix PDF highlighting, PDF position value adjustments, and other minor tweaks. (Reported in forums by Paul Becker)
 11/14/17 PaulT: CustomerReceipt.php: Wrap delete link parameter values with urlencode(). (Suggested by Tim in forums)
 11/13/17 PaulT: PDFCOA.php: Add column prodspeckey to queries which is used as a description alternative. (Reported in forums by Paul Becker)
 11/13/17 PaulT: PDFCOA.php, PDFProdSpec: Minor value adjust to correct inconsistent footer wrap. (Reported in forums by Paul Becker)

Modified: trunk/includes/PDFBOMListingPageHeader.inc
===================================================================
--- trunk/includes/PDFBOMListingPageHeader.inc	2017-12-15 22:54:45 UTC (rev 7886)
+++ trunk/includes/PDFBOMListingPageHeader.inc	2017-12-18 23:35:39 UTC (rev 7887)
@@ -36,12 +36,12 @@
 /*set up the headings */
 $Xpos = $Left_Margin+1;
 
-$LeftOvers = $pdf->addTextWrap($Xpos,$YPos,320 - $Left_Margin,$FontSize,_('Component Part/Description'),'centre');
-$LeftOvers = $pdf->addTextWrap(300,$YPos,60,$FontSize,_('Effective After'),'centre');
-$LeftOvers = $pdf->addTextWrap(348,$YPos,60,$FontSize,_('Effective To'),'centre');
-$LeftOvers = $pdf->addTextWrap(403,$YPos,40,$FontSize,_('Locn'),'centre');
-$LeftOvers = $pdf->addTextWrap(435,$YPos,40,$FontSize,_('Wrk Cntr'),'centre');
-$LeftOvers = $pdf->addTextWrap(500,$YPos,60,$FontSize,_('Quantity'),'centre');
+$LeftOvers = $pdf->addTextWrap($Xpos,$YPos,320 - $Left_Margin,$FontSize,_('Component Part/Description'),'center');
+$LeftOvers = $pdf->addTextWrap(320,$YPos,50,$FontSize,_('Effective After'),'left');
+$LeftOvers = $pdf->addTextWrap(380,$YPos,50,$FontSize,_('Effective To'),'left');
+$LeftOvers = $pdf->addTextWrap(440,$YPos,30,$FontSize,_('Locn'),'left');
+$LeftOvers = $pdf->addTextWrap(480,$YPos,30,$FontSize,_('Wrk Cntr'),'left');
+$LeftOvers = $pdf->addTextWrap(500,$YPos,60,$FontSize,_('Quantity'),'right');
 
 $YPos =$YPos - (2*$line_height);