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

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

Revision: 7027
          http://sourceforge.net/p/web-erp/reponame/7027
Author:   daintree
Date:     2014-12-17 09:04:39 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
tweaks to QA stuff

Modified Paths:
--------------
    trunk/AccountGroups.php
    trunk/CustomerBalancesMovement.php
    trunk/ProductSpecs.php
    trunk/QATests.php
    trunk/includes/MainMenuLinksArray.php
    trunk/sql/mysql/upgrade4.11-4.12.sql

Added Paths:
-----------
    trunk/doc/Manual/ManualQualityAssurance.html
    trunk/doc/Manual/images/QA_Config.png
    trunk/doc/Manual/images/QA_Menus.png
    trunk/doc/Manual/images/QA_Tests.png
    trunk/doc/Manual/images/QA_TestsEntry.png

Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php	2014-12-16 20:55:46 UTC (rev 7026)
+++ trunk/AccountGroups.php	2014-12-17 09:04:39 UTC (rev 7027)
@@ -34,9 +34,6 @@
 	return false;
 } //end of function CheckForRecursiveGroupName
 
-
-
-
 // If $Errors is set, then unset it.
 if (isset($Errors)) {
 	unset($Errors);
@@ -200,6 +197,7 @@
 		unset ($_POST['GroupName']);
 		unset ($_POST['SequenceInTB']);
 	}
+
 } elseif (isset($_GET['delete'])) {
 //the link to delete a selected record was clicked instead of the submit button
 
@@ -258,7 +256,6 @@
 		}
 
 	} //end if account group used in GL accounts
-
 }
 
 if (!isset($_GET['SelectedAccountGroup']) AND !isset($_POST['SelectedAccountGroup'])) {
@@ -471,4 +468,4 @@
 
 } //end if record deleted no point displaying form to add record
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/CustomerBalancesMovement.php
===================================================================
--- trunk/CustomerBalancesMovement.php	2014-12-16 20:55:46 UTC (rev 7026)
+++ trunk/CustomerBalancesMovement.php	2014-12-17 09:04:39 UTC (rev 7027)
@@ -16,6 +16,7 @@
 
 	$SalesAreasResult = DB_query("SELECT areacode, areadescription FROM areas");
 	$CustomersResult = DB_query("SELECT debtorno, name FROM debtorsmaster ORDER BY name");
+	$SalesFolkResult = DB_query("SELECT salesmancode, salesmanname FROM salesman ORDER BY salesmanname");
 
 	echo '<form id="Form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
 
@@ -44,6 +45,16 @@
 					</td>
 				</tr>
 				<tr>
+					<td>' . _('Sales Person') . '</td>
+					<td><select name="SalesPerson">
+						<option selected="selected" value="">' . _('All') . '</option>';
+	while ($SalesPersonRow = DB_fetch_array($SalesFolkResult)) {
+		echo 			'<option value="' . $SalesPersonRow['salesmancode'] . '">' . $SalesPersonRow['salesmanname'] . '</option>';
+	}
+	echo 			'</select>
+					</td>
+				</tr>
+				<tr>
 					<td>' . _('Date From') . ':</td>
 					<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . Date($_SESSION['DefaultDateFormat'], Mktime(0, 0, 0, Date('m') - $_SESSION['NumberOfMonthMustBeShown'], Date('d'), Date('Y'))) . '" /></td>
 				</tr>
@@ -72,8 +83,8 @@
 	$WhereClause = "debtorsmaster.debtorno='" . $_POST['Customer'] . "'";
 } elseif ($_POST['SalesArea']!='') {
 	$WhereClause = "custbranch.area='" . $_POST['SalesArea'] . "'";
-} else {
-	$WhereClause ='';
+} elseif ($_POST['SalesPerson']!='') {
+	$WhereClause = "custbranch.salesman='" . $_POST['SalesPerson'] . "'";
 }
 
 $sql = "SELECT SUM(ovamount+ovgst+ovdiscount+ovfreight-alloc) AS currencybalance,

Modified: trunk/ProductSpecs.php
===================================================================
--- trunk/ProductSpecs.php	2014-12-16 20:55:46 UTC (rev 7026)
+++ trunk/ProductSpecs.php	2014-12-17 09:04:39 UTC (rev 7027)
@@ -3,6 +3,8 @@
 
 include('includes/session.inc');
 $Title = _('Product Specifications Maintenance');
+$ViewTopic= 'QualityAssurance';// Filename in ManualContents.php's TOC.
+$BookMark = 'QA';// Anchor's id in the manual's html document.
 include('includes/header.inc');
 
 if (isset($_GET['SelectedQATest'])){
@@ -16,15 +18,15 @@
 	$KeyValue =mb_strtoupper($_POST['KeyValue']);
 }
 
-if ($_POST['RangeMin']=='') {
-	$RangeMin="NULL";
+if (!isset($_POST['RangeMin']) OR $_POST['RangeMin']=='') {
+	$RangeMin = 'NULL';
 } else {
-	$RangeMin="'" . $_POST['RangeMin'] . "'";
+	$RangeMin = "'" . $_POST['RangeMin'] . "'";
 }
-if ($_POST['RangeMax']=='') {
-	$RangeMax="NULL";
+if (!isset($_POST['RangeMax']) OR $_POST['RangeMax']=='') {
+	$RangeMax = 'NULL';
 } else {
-	$RangeMax="'" . $_POST['RangeMax'] . "'";
+	$RangeMax = "'" . $_POST['RangeMax'] . "'";
 }
 
 if (isset($Errors)) {
@@ -48,7 +50,7 @@
 		include('includes/footer.inc');
 		exit;
 	} else {
-		$sql = "INSERT IGNORE INTO prodspecs 
+		$sql = "INSERT IGNORE INTO prodspecs
 							(keyval,
 							testid,
 							defaultvalue,
@@ -73,7 +75,7 @@
 			$msg = _('A Product Specification has been copied to') . ' ' . $_POST['CopyTo']  . ' from ' . ' ' . $KeyValue ;
 			$ErrMsg = _('The insert of the Product Specification failed because');
 			$DbgMsg = _('The SQL that was used and failed was');
-			$result = DB_query($sql,$db,$ErrMsg, $DbgMsg);
+			$result = DB_query($sql,$ErrMsg, $DbgMsg);
 			prnMsg($msg , 'success');
 		$KeyValue=$_POST['CopyTo'];
 		unset($_GET['CopySpec']);
@@ -107,15 +109,15 @@
 							description
 						FROM prodspecs LEFT OUTER JOIN stockmaster
 						ON stockmaster.stockid=prodspecs.keyval";
-						
 
-	$ResultSelection=DB_query($SQLSpecSelect, $db);
+
+	$ResultSelection=DB_query($SQLSpecSelect);
 	echo '<td><select name="KeyValue">';
 
 	while ($MyRowSelection=DB_fetch_array($ResultSelection)){
 		echo '<option value="' . $MyRowSelection['keyval'] . '">' . $MyRowSelection['keyval'].' - ' .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false)  . '</option>';
 	}
-	echo '</select></td>';		
+	echo '</select></td>';
 	echo '</tr>
 		</table>
 		</div>
@@ -123,15 +125,15 @@
 		<input type="submit" name="pickspec" value="' . _('Submit') . '" />
 		</div>
 		</form>';
-	
 
+
 } else {
 	//show header
 	$SQLSpecSelect="SELECT description
 						FROM stockmaster
 						WHERE stockmaster.stockid='" .$KeyValue. "'";
 
-	$ResultSelection=DB_query($SQLSpecSelect, $db);
+	$ResultSelection=DB_query($SQLSpecSelect);
 	$MyRowSelection=DB_fetch_array($ResultSelection);
 	echo '<br/>' . _('Product Specification for') . ' ' . $KeyValue . '-' . $MyRowSelection['description'] . '<br/><br/>';
 }
@@ -144,13 +146,13 @@
 				numericvalue,
 				qatests.defaultvalue
 			FROM qatests
-			LEFT JOIN prodspecs 
+			LEFT JOIN prodspecs
 			ON prodspecs.testid=qatests.testid
 			AND prodspecs.keyval='".$KeyValue."'
 			WHERE qatests.active='1'
 			AND prodspecs.keyval IS NULL
 			ORDER BY name";
-	$result = DB_query($sql,$db);
+	$result = DB_query($sql);
 	echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
     echo '<div>';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -186,7 +188,7 @@
 	} else {
 		$IsNumeric = _('No');
 	}
-	
+
 	switch ($myrow['type']) {
 	 	case 0; //textbox
 	 		$TypeDisp=_('Text Box');
@@ -226,8 +228,8 @@
 			$RangeMax);
 
 	} //END WHILE LIST LOOP
-	
-	echo '</table><br /></div>	
+
+	echo '</table><br /></div>
 			<div class="centre">
 				<input type="hidden" name="KeyValue" value="' . $KeyValue . '" />
 				<input type="hidden" name="AddTestsCounter" value="' . $x . '" />
@@ -249,8 +251,8 @@
 			} else {
 				$AddRangeMax="'" . $_POST['AddRangeMax' .$i] . "'";
 			}
-			
-			$sql = "INSERT INTO prodspecs 
+
+			$sql = "INSERT INTO prodspecs
 							(keyval,
 							testid,
 							defaultvalue,
@@ -262,21 +264,21 @@
 							showontestplan,
 							active)
 						SELECT '"  . $KeyValue . "',
-								testid, 
-								defaultvalue, 
+								testid,
+								defaultvalue,
 								'"  .  $_POST['AddTargetValue' .$i] . "',
 								"  . $AddRangeMin . ",
 								"  . $AddRangeMax. ",
-								showoncert, 
+								showoncert,
 								showonspec,
 								showontestplan,
-								active 
+								active
 						FROM qatests WHERE testid='" .$_POST['AddTestID' .$i]. "'";
 			echo $sql;
 			$msg = _('A Product Specification record has been added for Test ID') . ' ' . $_POST['AddTestID' .$i]  . ' for ' . ' ' . $KeyValue ;
 			$ErrMsg = _('The insert of the Product Specification failed because');
 			$DbgMsg = _('The SQL that was used and failed was');
-			$result = DB_query($sql,$db,$ErrMsg, $DbgMsg);
+			$result = DB_query($sql,$ErrMsg, $DbgMsg);
 			prnMsg($msg , 'success');
 		} //if on
 	} //for
@@ -311,7 +313,7 @@
 		$msg = _('Product Specification record for') . ' ' . $_POST['QATestName']  . ' for ' . ' ' . $KeyValue .  _('has been updated');
 		$ErrMsg = _('The update of the Product Specification failed because');
 		$DbgMsg = _('The SQL that was used and failed was');
-		$result = DB_query($sql,$db,$ErrMsg, $DbgMsg);
+		$result = DB_query($sql,$ErrMsg, $DbgMsg);
 
 		prnMsg($msg , 'success');
 
@@ -323,16 +325,16 @@
 		unset($_POST['ShowOnCert']);
 		unset($_POST['ShowOnSpec']);
 		unset($_POST['Active']);
-	} 
+	}
 } elseif (isset($_GET['delete'])) {
 //the link to delete a selected record was clicked instead of the submit button
 
 // PREVENT DELETES IF DEPENDENT RECORDS
 
-	$sql= "SELECT COUNT(*) FROM qasamples 
+	$sql= "SELECT COUNT(*) FROM qasamples
 			INNER JOIN sampleresults on sampleresults.sampleid=qasamples.sampleid AND sampleresults.testid='". $SelectedQATest."'
 			WHERE qasamples.prodspeckey='".$KeyValue."'";
-	$result = DB_query($sql,$db);
+	$result = DB_query($sql);
 	$myrow = DB_fetch_row($result);
 	if ($myrow[0]>0) {
 		prnMsg(_('Cannot delete this Product Specification because there are test results tied to it'),'error');
@@ -340,7 +342,7 @@
 		$sql="DELETE FROM prodspecs WHERE keyval='". $KeyValue."'
 									AND testid='". $SelectedQATest."'";
 		$ErrMsg = _('The Product Specification could not be deleted because');
-		$result = DB_query($sql,$db,$ErrMsg);
+		$result = DB_query($sql,$ErrMsg);
 
 		prnMsg(_('Product Specification') . ' ' . $SelectedQATest . ' for ' . ' ' . $KeyValue . _('has been deleted from the database'),'success');
 		unset ($SelectedQATest);
@@ -374,10 +376,10 @@
 			ON qatests.testid=prodspecs.testid
 			WHERE prodspecs.keyval='" .$KeyValue."'
 			ORDER BY name";
-	$result = DB_query($sql,$db);
+	$result = DB_query($sql);
 
-	echo '<table class="selection">';
-	echo '<tr>
+	echo '<table class="selection">
+		<tr>
 			<th class="ascending">' . _('Name') . '</th>
 			<th class="ascending">' . _('Method') . '</th>
 			<th class="ascending">' . _('Units') . '</th>
@@ -515,8 +517,8 @@
 				ON qatests.testid=prodspecs.testid
 				WHERE prodspecs.keyval='".$KeyValue."'
 				AND prodspecs.testid='".$SelectedQATest."'";
-		
-		$result = DB_query($sql, $db);
+
+		$result = DB_query($sql);
 		$myrow = DB_fetch_array($result);
 
 		$_POST['SelectedQATest'] = $myrow['testid'];
@@ -534,8 +536,8 @@
 		$_POST['ShowOnSpec'] = $myrow['showonspec'];
 		$_POST['ShowOnTestPlan'] = $myrow['showontestplan'];
 		$_POST['Active'] = $myrow['active'];
-		
 
+
 		echo '<input type="hidden" name="SelectedQATest" value="' . $SelectedQATest . '" />';
 		echo '<input type="hidden" name="KeyValue" value="' . $KeyValue . '" />';
 		echo '<input type="hidden" name="TestID" value="' . $_POST['SelectedQATest'] . '" />';
@@ -557,7 +559,7 @@
 		if ($myrow['numericvalue'] == 1) {
 			$IsNumeric = _('Yes');
 			$Class="number";
-		} 
+		}
 		switch ($myrow['type']) {
 			case 0; //textbox
 				$TypeDisp='Text Box';
@@ -586,7 +588,7 @@
 				<td>' . _('Target Value') . ':</td>
 				<td><input type="text" class="' . $Class.'" name="TargetValue" size="15" maxlength="15" value="' . $_POST['TargetValue']. '" />&nbsp;'.$_POST['Units'].'</td>
 			</tr>';
-			
+
 		if ($TypeDisp=='Range') {
 			echo '<tr>
 					<td>' . _('Range Min') . ':</td>
@@ -596,7 +598,7 @@
 					<td>' . _('Range Max') . ':</td>
 					<td><input class="' . $Class.'" type="text" name="RangeMax" size="10" maxlength="10" value="' . $_POST['RangeMax']. '" /></td>
 				</tr>';
-		} 
+		}
 		echo '<tr>
 				<td>' . _('Show On Cert?') . ':</td>
 				<td><select name="ShowOnCert">';
@@ -658,7 +660,7 @@
 			</div>
 			</div>
 			</form>';
-	} 
+	}
 	if (isset($KeyValue)) {
 		echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?ListTests=yes&amp;KeyValue=' .$KeyValue .'">' . _('Add More Tests') . '</a></div>';
 		echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?CopySpec=yes&amp;KeyValue=' .$KeyValue .'">' . _('Copy This Specification') . '</a></div>';

Modified: trunk/QATests.php
===================================================================
--- trunk/QATests.php	2014-12-16 20:55:46 UTC (rev 7026)
+++ trunk/QATests.php	2014-12-17 09:04:39 UTC (rev 7027)
@@ -36,7 +36,7 @@
 		$Errors[$i] = 'QATestName';
 		$i++;
 	}
-	
+
 	if (mb_strlen($_POST['Type']) =='') {
 		$InputError = 1;
 		prnMsg(_('The Type must not be blank'),'error');
@@ -51,7 +51,7 @@
 		$InputError = 1;
 		prnMsg(_('The QA Test name already exists'),'error');
 		$Errors[$i] = 'QATestName';
-		$i++;	
+		$i++;
 	}
 
 	if (isset($SelectedQATest) AND $InputError !=1) {
@@ -189,8 +189,8 @@
 		$_POST['ShowOnSpec'] = $myrow['showonspec'];
 		$_POST['ShowOnTestPlan'] = $myrow['showontestplan'];
 		$_POST['Active'] = $myrow['active'];
-		
 
+
 		echo '<input type="hidden" name="SelectedQATest" value="' . $SelectedQATest . '" />';
 		echo '<input type="hidden" name="TestID" value="' . $_POST['SelectedQATest'] . '" />';
 		echo '<table class="selection">
@@ -236,23 +236,24 @@
 	}
 	echo '<tr>
 			<td>' . _('QA Test Name') . ':</td>
-			<td><input type="text" '. (in_array('QATestName',$Errors) ? 'class="inputerror"' : '' ) .' name="QATestName"  size="30" maxlength="50" value="' . $_POST['QATestName'] . '" /></td>
+			<td><input type="text" '. (in_array('QATestName',$Errors) ? 'class="inputerror"' : '' ) .' name="QATestName"  required="required" title="' . _('The name of the Test you are setting up') . '" size="30" maxlength="50" value="' . $_POST['QATestName'] . '" /></td>
 		</tr>';
 	echo '<tr>
 			<td>' . _('Method') . ':</td>
-			<td><input type="text" name="Method" size="20" maxlength="20" value="' . $_POST['Method'] . '" /></td>
+			<td><input type="text" name="Method" title="' . _('ASTM, ISO, UL or other') . '" size="20" maxlength="20" value="' . $_POST['Method'] . '" /></td>
 		</tr>';
 	echo '<tr>
 			<td>' . _('Group By') . ':</td>
-			<td><input type="text" name="GroupBy" size="20" maxlength="20" value="' . $_POST['GroupBy'] . '" /></td>
+			<td><input type="text" name="GroupBy" title="' . _('Can be used to group certain Tests on the Product Specification or Certificate of
+Analysis or left blank') . '" size="20" maxlength="20" value="' . $_POST['GroupBy'] . '" /></td>
 		</tr>';
 	echo '<tr>
 			<td>' . _('Units') . ':</td>
-			<td><input type="text" name="Units" size="20" maxlength="20" value="' . $_POST['Units'] . '" /></td>
+			<td><input type="text" name="Units" title="' . _('How this is measured. PSI, Fahrenheit, Celsius etc.') . '" size="20" maxlength="20" value="' . $_POST['Units'] . '" /></td>
 		</tr>';
 	echo '<tr>
 			<td>' . _('Type') . ':</td>
-			<td><select name="Type">';
+			<td><select title="' . _('What sort of data field is required to record the results for this test') . '" name="Type">';
 	if ($_POST['Type']==0){
 		echo '<option selected="selected" value="0">' . _('Text Box') . '</option>';
 	} else {

Added: trunk/doc/Manual/ManualQualityAssurance.html
===================================================================
--- trunk/doc/Manual/ManualQualityAssurance.html	                        (rev 0)
+++ trunk/doc/Manual/ManualQualityAssurance.html	2014-12-17 09:04:39 UTC (rev 7027)
@@ -0,0 +1,32 @@
+<h1><a id="QA">Quality Assurance</a></h1>
+
+<h2>Overview</h2>
+
+<p>The Quality module allows the users of webERP to define what they would like to test, apply those tests to certain templates or specific products (Items, Stocks) and then to capture actual test results on a Lot to Lot or Serial number basis. Outputs from the module include a Product Specification or Data Sheet and a Certificate of Analysis. Historical Results are kept and can be compared side by side for any particular Item. There is an option in the configuration that allows QA Samples to be automatically logged for Purchase Order and Work Order receipts if the product specification exists and the item is Lot or Serial Controlled. Also in the configuration are some disclaimers for specifcations and certifications.</p>
+
+<img src="images/QA_Config.png" alt="QA Config screen" />
+
+<h2>Menu Options</h2>
+<p>All menu options for Quality are found under Manufacturing. Your menus may look differnet based on your permissoins. The menus are shown below.</p>
+<img src="images/QA_Menus.png" alt="QA Menu options screen" />
+
+<h2>QA Tests Maintenance</h2>
+<p>This is where all tests that will be performed are defined. Other specification related information can be captured here that isn’t tested but describes in more detail the product specification. An example of this would be Processing Conditions for your product that you wish for your customers to understand. A specification is made up of any number of tests. The test defines outer tolerances but the specification allows the upper and lower bounds of the test to be specified.</p>
+<img src="images/QA_Tests.png" alt="QA Tests screen" />
+
+<img src="images/QA_TestsEntry.png" alt="QA Tests Entry screen" />
+
+Test Name: The name of the Test you are setting up
+Method: ASTM, ISO, UL or other.
+Group By: Free Form. Can be used to Group certain Test on the Product Specification or Certificate of
+Analysis
+Units: How this is measure. PSI, Fahrenheit, Celsius etc.
+Type: How do we measure/Enter this value (Text, Date, Numeric Range, and Selection List?)
+Possible Values: (Only valid for type Select List, controls what appears in the drop down?)
+Numeric Value: Enforces numbers to be entered for this test type
+Show on Cert: Does this test print on the Certificate of Analysis (Can be overwritten at a Product level)
+Show on Cert: Does this test print on the Product Specification (Can be overwritten at a Product level)
+Show on Cert: Does this test print on the Test Plan (Can be overwritten at a Product level)
+Active: once a test has results entered against it delete is no longer allowed. This flag can be used to
+inactivate it and not use it on future product specifications.
+<!-- Help End: QA -->

Added: trunk/doc/Manual/images/QA_Config.png
===================================================================
(Binary files differ)

Index: trunk/doc/Manual/images/QA_Config.png
===================================================================
--- trunk/doc/Manual/images/QA_Config.png	2014-12-16 20:55:46 UTC (rev 7026)
+++ trunk/doc/Manual/images/QA_Config.png	2014-12-17 09:04:39 UTC (rev 7027)

Property changes on: trunk/doc/Manual/images/QA_Config.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/doc/Manual/images/QA_Menus.png
===================================================================
(Binary files differ)

Index: trunk/doc/Manual/images/QA_Menus.png
===================================================================
--- trunk/doc/Manual/images/QA_Menus.png	2014-12-16 20:55:46 UTC (rev 7026)
+++ trunk/doc/Manual/images/QA_Menus.png	2014-12-17 09:04:39 UTC (rev 7027)

Property changes on: trunk/doc/Manual/images/QA_Menus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/doc/Manual/images/QA_Tests.png
===================================================================
(Binary files differ)

Index: trunk/doc/Manual/images/QA_Tests.png
===================================================================
--- trunk/doc/Manual/images/QA_Tests.png	2014-12-16 20:55:46 UTC (rev 7026)
+++ trunk/doc/Manual/images/QA_Tests.png	2014-12-17 09:04:39 UTC (rev 7027)

Property changes on: trunk/doc/Manual/images/QA_Tests.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/doc/Manual/images/QA_TestsEntry.png
===================================================================
(Binary files differ)

Index: trunk/doc/Manual/images/QA_TestsEntry.png
===================================================================
--- trunk/doc/Manual/images/QA_TestsEntry.png	2014-12-16 20:55:46 UTC (rev 7026)
+++ trunk/doc/Manual/images/QA_TestsEntry.png	2014-12-17 09:04:39 UTC (rev 7027)

Property changes on: trunk/doc/Manual/images/QA_TestsEntry.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php	2014-12-16 20:55:46 UTC (rev 7026)
+++ trunk/includes/MainMenuLinksArray.php	2014-12-17 09:04:39 UTC (rev 7027)
@@ -283,7 +283,7 @@
 													'/ReorderLevelLocation.php');
 
 $MenuItems['manuf']['Transactions']['Caption'] = array(	_('Work Order Entry'),
-														_('Select A Work Order')),
+														_('Select A Work Order'),
 														_('QA Samples and Test Results'));
 
 $MenuItems['manuf']['Transactions']['URL'] = array(	'/WorkOrderEntry.php',

Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql	2014-12-16 20:55:46 UTC (rev 7026)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql	2014-12-17 09:04:39 UTC (rev 7027)
@@ -5,17 +5,19 @@
 INSERT INTO  `scripts` VALUES ('UserLocations.php',  '15',  'Location User Maintenance');
 ALTER TABLE  `stockmoves` ADD  `userid` VARCHAR( 20 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER  `trandate`;
 
-INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('QATests.php', '16', 'Quality Test Maintenance');
-INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('ProductSpecs.php', '16', 'Product Specification Maintenance');
-INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('TestPlanResults.php', '16', 'Test Plan Results Entry');
-INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('PDFProdSpec.php', '0', 'PDF OF Product Specification');
-INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('PDFCOA.php', '0', 'PDF of COA');
-INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('PDFTestPlan.php', '16', 'PDF of Test Plan');
-INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('SelectQASamples.php', '16', 'Select  QA Samples');
-INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('HistoricalTestResults.php', '16', 'Historical Test Results')
+INSERT INTO  `securitytokens` VALUES ('16', 'QA');
 
+INSERT INTO `scripts`  VALUES ('QATests.php', '16', 'Quality Test Maintenance');
+INSERT INTO `scripts`  VALUES ('ProductSpecs.php', '16', 'Product Specification Maintenance');
+INSERT INTO `scripts`  VALUES ('TestPlanResults.php', '16', 'Test Plan Results Entry');
+INSERT INTO `scripts`  VALUES ('PDFProdSpec.php', '0', 'PDF OF Product Specification');
+INSERT INTO `scripts`  VALUES ('PDFCOA.php', '0', 'PDF of COA');
+INSERT INTO `scripts`  VALUES ('PDFTestPlan.php', '16', 'PDF of Test Plan');
+INSERT INTO `scripts`  VALUES ('SelectQASamples.php', '16', 'Select  QA Samples');
+INSERT INTO `scripts`  VALUES ('HistoricalTestResults.php', '16', 'Historical Test Results');
 
-INSERT INTO `config` (`confname` ,`confvalue` )VALUES ('QualityLogSamples', '0');
+
+INSERT INTO `config` (`confname` ,`confvalue` ) VALUES ('QualityLogSamples', '0');
 INSERT INTO `config` (`confname` ,`confvalue` ) VALUES ('QualityCOAText', '');
 INSERT INTO `config` (`confname` ,`confvalue` ) VALUES (' QualityProdSpecText', '');