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

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

Revision: 4668
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4668&view=rev
Author:   daintree
Date:     2011-08-26 21:06:27 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
27/8/11 Phil: WorkOrderIssue.php now allows issue of 0 cost items to the work order - in the event that customer supplied product needs to be included in a work order and the quantities maintained for accountability to the customer
26/8/11 Pablo Martin: Fixed bugs in ConnectDB_mysql.inc in DB_Txn_Commit and DB_Txn_Begin was using msql functions not mysql functions!!

Modified Paths:
--------------
    trunk/SelectCustomer.php
    trunk/Stocks.php
    trunk/WorkOrderIssue.php
    trunk/doc/Change.log
    trunk/includes/ConnectDB_mysql.inc
    trunk/includes/session.inc

Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php	2011-08-24 10:29:52 UTC (rev 4667)
+++ trunk/SelectCustomer.php	2011-08-26 21:06:27 UTC (rev 4668)
@@ -259,7 +259,7 @@
 
 if (isset($_POST['JustSelectedACustomer'])){
 	/*Need to figure out the number of the form variable that the user clicked on */
-	for ($i=0; $i< count($_POST); $i++){ //loop through the returned customers
+	for ($i=0; $i==count($_POST); $i++){ //loop through the returned customers
 		if(isset($_POST['SubmitCustomerSelection'.$i])){
 			break;
 		}
@@ -514,7 +514,7 @@
 				echo '<tr class="OddTableRows">';
 				$k = 1;
 			}
-			echo '<td><font size=1><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlentities($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '" /></font></td>
+			echo '<td><font size="1"><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlentities($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '" /></font></td>
 				<input type="hidden" name="SelectedCustomer' . $i .'" value="'.$myrow['debtorno'].'">
 				<input type="hidden" name="SelectedBranch' . $i .'" value="'. $myrow['branchcode'].'" />
 				<td><font size=1>' . $myrow['name'] . '</font></td>

Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php	2011-08-24 10:29:52 UTC (rev 4667)
+++ trunk/Stocks.php	2011-08-26 21:06:27 UTC (rev 4668)
@@ -105,7 +105,7 @@
 	}
 	if (ContainsIllegalCharacters($StockID) OR mb_strpos($StockID,' ')) {
 		$InputError = 1;
-		prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
+		prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ ." . _('or a space'),'error');
 		$Errors[$i] = 'StockID';
 		$i++;
 		$StockID='';

Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php	2011-08-24 10:29:52 UTC (rev 4667)
+++ trunk/WorkOrderIssue.php	2011-08-26 21:06:27 UTC (rev 4668)
@@ -103,8 +103,7 @@
 	$IssueItemRow = DB_fetch_array($Result);
 
 	if ($IssueItemRow['cost']==0){
-		prnMsg(_('The item being issued has a zero cost. Zero cost items cannot be issued to work orders'),'error');
-		$InputError=1;
+		prnMsg(_('The item being issued has a zero cost. The issue will still be processed '),'warn');
 	}
 
 	if ($_SESSION['ProhibitNegativeStock']==1

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2011-08-24 10:29:52 UTC (rev 4667)
+++ trunk/doc/Change.log	2011-08-26 21:06:27 UTC (rev 4668)
@@ -1,5 +1,7 @@
 webERP Change Log
 
+27/8/11 Phil: WorkOrderIssue.php now allows issue of 0 cost items to the work order - in the event that customer supplied product needs to be included in a work order and the quantities maintained for accountability to the customer
+26/8/11 Pablo Martin: Fixed bugs in ConnectDB_mysql.inc in DB_Txn_Commit and DB_Txn_Begin was using msql functions not mysql functions!!
 23/8/11 Phil: Added BuyerName to Delivery Details and the cart class
 23/8/11 Ricard: PDFPrintLabel Does Not display discontinued items and now allows printing of future price labels
 21/8/11 Phil: Fixed bug that duplicated purchase order items when more than one item was added to an existing purchase order

Modified: trunk/includes/ConnectDB_mysql.inc
===================================================================
--- trunk/includes/ConnectDB_mysql.inc	2011-08-24 10:29:52 UTC (rev 4667)
+++ trunk/includes/ConnectDB_mysql.inc	2011-08-26 21:06:27 UTC (rev 4668)
@@ -214,10 +214,10 @@
 }
 
 function DB_IgnoreForeignKeys($Conn){
-	msql_query("SET FOREIGN_KEY_CHECKS=0",$Conn);
+	mysql_query("SET FOREIGN_KEY_CHECKS=0",$Conn);
 }
 function DB_ReinstateForeignKeys($Conn){
-	msql_query("SET FOREIGN_KEY_CHECKS=1",$Conn);
+	mysql_query("SET FOREIGN_KEY_CHECKS=1",$Conn);
 }
 
 ?>

Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc	2011-08-24 10:29:52 UTC (rev 4667)
+++ trunk/includes/session.inc	2011-08-26 21:06:27 UTC (rev 4668)
@@ -5,6 +5,7 @@
 	$PathPrefix='';
 }
 
+
 if (!file_exists($PathPrefix . 'config.php')){
 	$rootpath = dirname($_SERVER['PHP_SELF']);
 	if ($rootpath == '/' OR $rootpath == "\\") {

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