Thread: [Weberp-cvs] SF.net SVN: web-erp:[3458] trunk (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3458
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3458&view=rev
Author:   tim_schofield
Date:     2010-05-12 05:23:41 +0000 (Wed, 12 May 2010)

Log Message:
-----------
Tim: Exit MRP scripts gracefully if no MRP calculation has been done.

Modified Paths:
--------------
    trunk/MRPPlannedPurchaseOrders.php
    trunk/MRPPlannedWorkOrders.php
    trunk/MRPReschedules.php
    trunk/MRPShortages.php
    trunk/doc/Change.log.html

Modified: trunk/MRPPlannedPurchaseOrders.php
===================================================================

--- trunk/MRPPlannedPurchaseOrders.php	2010-05-08 11:29:25 UTC (rev 3457)
+++ trunk/MRPPlannedPurchaseOrders.php	2010-05-12 05:23:41 UTC (rev 3458)
@@ -5,7 +5,18 @@
 // purchase orders created for them
 $PageSecurity = 2;
 include('includes/session.inc');
-If (isset($_POST['PrintPDF'])) {
+$sql='show tables where Tables_in_'.$_SESSION['DatabaseName'].'="mrprequirements"';
+$result=DB_query($sql,$db);
+if (DB_num_rows($result)==0) {
+	$title='MRP error';
+	include('includes/header.inc');
+	echo '<br>';
+	prnMsg( _('The MRP calculation must be run before you can run this report').'<br>'.
+			_('To run the MRP calculation click').' '.'<a href='.$rootpath .'/MRP.php?' . SID .'>'._('here').'</a>', 'error');
+	include('includes/footer.inc');
+	exit;
+}
+if (isset($_POST['PrintPDF'])) {
 
 	include('includes/PDFStarter.php');
 	$pdf->addInfo('Title',_('MRP Planned Purchase Orders Report'));

Modified: trunk/MRPPlannedWorkOrders.php
===================================================================
--- trunk/MRPPlannedWorkOrders.php	2010-05-08 11:29:25 UTC (rev 3457)
+++ trunk/MRPPlannedWorkOrders.php	2010-05-12 05:23:41 UTC (rev 3458)
@@ -5,7 +5,18 @@
 // work orders created for them
 $PageSecurity = 2;
 include('includes/session.inc');
-If (isset($_POST['PrintPDF'])) {
+$sql='show tables where Tables_in_'.$_SESSION['DatabaseName'].'="mrprequirements"';
+$result=DB_query($sql,$db);
+if (DB_num_rows($result)==0) {
+	$title='MRP error';
+	include('includes/header.inc');
+	echo '<br>';
+	prnMsg( _('The MRP calculation must be run before you can run this report').'<br>'.
+			_('To run the MRP calculation click').' '.'<a href='.$rootpath .'/MRP.php?' . SID .'>'._('here').'</a>', 'error');
+	include('includes/footer.inc');
+	exit;
+}
+if (isset($_POST['PrintPDF'])) {
 
 	include('includes/PDFStarter.php');
 

Modified: trunk/MRPReschedules.php
===================================================================
--- trunk/MRPReschedules.php	2010-05-08 11:29:25 UTC (rev 3457)
+++ trunk/MRPReschedules.php	2010-05-12 05:23:41 UTC (rev 3458)
@@ -8,7 +8,18 @@
 $PageSecurity = 2;
 include('includes/session.inc');
 
-If (isset($_POST['PrintPDF'])) {
+$sql='show tables where Tables_in_'.$_SESSION['DatabaseName'].'="mrprequirements"';
+$result=DB_query($sql,$db);
+if (DB_num_rows($result)==0) {
+	$title='MRP error';
+	include('includes/header.inc');
+	echo '<br>';
+	prnMsg( _('The MRP calculation must be run before you can run this report').'<br>'.
+			_('To run the MRP calculation click').' '.'<a href='.$rootpath .'/MRP.php?' . SID .'>'._('here').'</a>', 'error');
+	include('includes/footer.inc');
+	exit;
+}
+if (isset($_POST['PrintPDF'])) {
 
 	include('includes/PDFStarter.php');
 	$pdf->addInfo('Title',_('MRP Reschedule Report'));
@@ -64,29 +75,29 @@
 
 		$YPos -=$line_height;
 		$FontSize=8;
-		
+
 		$FormatedDueDate = ConvertSQLDate($myrow['duedate']);
 		$FormatedMRPDate = ConvertSQLDate($myrow['mrpdate']);
 		if ($myrow['mrpdate'] == '2050-12-31') {
 			$FormatedMRPDate = 'Cancel';
 		}
-		
+
 		// Use to alternate between lines with transparent and painted background
 		if ($_POST['Fill'] == 'yes'){
 		    $fill=!$fill;
 		}
-		
+
 		// Parameters for addTextWrap are defined in /includes/class.pdf.php
 		// 1) X position 2) Y position 3) Width
 		// 4) Height 5) Text 6) Alignment 7) Border 8) Fill - True to use SetFillColor
 		// and False to set to transparent
-		$pdf->addTextWrap($Left_Margin,$YPos,90,$FontSize,$myrow['part'],'',0,$fill);				
+		$pdf->addTextWrap($Left_Margin,$YPos,90,$FontSize,$myrow['part'],'',0,$fill);
 		$pdf->addTextWrap(130,$YPos,200,$FontSize,$myrow['description'],'',0,$fill);
 		$pdf->addTextWrap(330,$YPos,50,$FontSize,$myrow['orderno'],'right',0,$fill);
 		$pdf->addTextWrap(380,$YPos,30,$FontSize,$myrow['ordertype'],'right',0,$fill);
 		$pdf->addTextWrap(410,$YPos,50,$FontSize,number_format($myrow['supplyquantity'],
 		                                        $myrow['decimalplaces']),'right',0,$fill);
-		$pdf->addTextWrap(460,$YPos,55,$FontSize,$FormatedDueDate,'right',0,$fill);				
+		$pdf->addTextWrap(460,$YPos,55,$FontSize,$FormatedDueDate,'right',0,$fill);
 		$pdf->addTextWrap(515,$YPos,50,$FontSize,$FormatedMRPDate,'right',0,$fill);
 
 		if ($YPos < $Bottom_Margin + $line_height){
@@ -125,13 +136,13 @@
 			header('Expires: 0');
 			header('Cache-Control: private, post-check=0, pre-check=0');
 			header('Pragma: public');
-	
+
 			$pdf->Output('MRPRescedules.pdf', 'I');
 	}
 */
     $pdf->OutputD($_SESSION['DatabaseName'] . '_MRPReschedules_' . date('Y-m-d').'.pdf');//UldisN
     $pdf->__destruct(); //UldisN
-	
+
 } else { /*The option to print PDF was not hit so display form */
 
 	$title=_('MRP Reschedule Reporting');
@@ -171,7 +182,7 @@
 $YPos -=$line_height;
 
 $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('MRP Reschedule Report'));
-$pdf->addTextWrap($Page_Width-$Right_Margin-115,$YPos,160,$FontSize,_('Printed') . ': ' . 
+$pdf->addTextWrap($Page_Width-$Right_Margin-115,$YPos,160,$FontSize,_('Printed') . ': ' .
      Date($_SESSION['DefaultDateFormat']) . '   ' . _('Page') . ' ' . $PageNumber);
 $YPos -=$line_height;
 $pdf->addTextWrap($Left_Margin,$YPos,70,$FontSize,_('Selection:'));

Modified: trunk/MRPShortages.php
===================================================================
--- trunk/MRPShortages.php	2010-05-08 11:29:25 UTC (rev 3457)
+++ trunk/MRPShortages.php	2010-05-12 05:23:41 UTC (rev 3458)
@@ -7,6 +7,18 @@
 $PageSecurity = 2;
 include('includes/session.inc');
 
+$sql='show tables where Tables_in_'.$_SESSION['DatabaseName'].'="mrprequirements"';
+$result=DB_query($sql,$db);
+if (DB_num_rows($result)==0) {
+	$title='MRP error';
+	include('includes/header.inc');
+	echo '<br>';
+	prnMsg( _('The MRP calculation must be run before you can run this report').'<br>'.
+			_('To run the MRP calculation click').' '.'<a href='.$rootpath .'/MRP.php?' . SID .'>'._('here').'</a>', 'error');
+	include('includes/footer.inc');
+	exit;
+}
+
 If (isset($_POST['PrintPDF'])) {
 
 	include('includes/PDFStarter.php');

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-05-08 11:29:25 UTC (rev 3457)
+++ trunk/doc/Change.log.html	2010-05-12 05:23:41 UTC (rev 3458)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>11/05/10 Tim: Exit MRP scripts gracefully if no MRP calculation has been done.</p>
 <p>08/05/10 Lindsay: API was broken after adding a test for global variable $DatabaseName in ConnectDB_mysql* for this variable being set and using it as DB name if so.  The variable of that name in the api_php.php has been changed to $api_DatabaseName.</p>
 <p>08/05/10 Phil: GetPrices.inc now uses the new price startdate and enddate to return the price which falls within the date range base on the current date. Changes to Prices.php and Prices_Customer.php to allow entry of effective from and effective to dates and updating/deleting of prices with appropriate error trapping and rescheduling of enddates where start and end dates would otherwise overlap.</p>
 <p>08/05/10 Phil: Found a bug in Date1GreaterThanDate2 function (in includes/DateFunction.inc) with SESSION['DefaultDateFormat'] = 'd/m/Y' this function had been broken  </p>


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




Thread: [Weberp-cvs] SF.net SVN: web-erp:[3458] trunk (Page 9)

Accounting & Best Practice Business Administration System

deleted-70949-cvs