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

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

Revision: 6724
          http://sourceforge.net/p/web-erp/reponame/6724
Author:   daintree
Date:     2014-05-22 08:05:30 +0000 (Thu, 22 May 2014)
Log Message:
-----------
Tidy up SQL in StockClone.php

Modified Paths:
--------------
    trunk/StockClone.php
    trunk/doc/Change.log

Modified: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php	2014-05-22 07:40:15 UTC (rev 6723)
+++ trunk/StockClone.php	2014-05-22 08:05:30 UTC (rev 6724)
@@ -473,21 +473,11 @@
                     //What about cost data?
                     //get any existing cost data
                     $sql = "SELECT materialcost,
-                                        labourcost,
-                                        overheadcost,
-                                        mbflag,
-                                        sum(quantity) as totalqoh
-                                FROM stockmaster INNER JOIN locstock
-                                ON stockmaster.stockid=locstock.stockid
-                                WHERE stockmaster.stockid='".$_POST['OldStockID']."'
-                                GROUP BY description,
-                                        units,
-                                        lastcost,
-                                        actualcost,
-                                        materialcost,
-                                        labourcost,
-                                        overheadcost,
-                                        mbflag";
+									labourcost,
+									overheadcost,
+									lastcost
+							FROM stockmaster 
+							WHERE stockmaster.stockid='".$_POST['OldStockID']."'";
                         $ErrMsg = _('The entered item code does not exist');
                         $OldResult = DB_query($sql,$db,$ErrMsg);
                         $OldRow = DB_fetch_array($OldResult);
@@ -507,7 +497,7 @@
 
                     //finish up
 					if (DB_error_no($db) ==0) {
-						prnMsg( _('New Cloned Item') .' ' . '<a href="SelectProduct.php?StockID=' . $_POST['StockID'] . '">' . $_POST['StockID'] . '</a> '. _('has been added to the database') .
+						prnMsg( _('New cloned Item') .' ' . '<a href="SelectProduct.php?StockID=' . $_POST['StockID'] . '">' . $_POST['StockID'] . '</a> '. _('has been added to the database') .
 							'<br />' . _('We also attempted to setup item purchase data and pricing.'));
 
                             if ($NoPricingData==1)

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2014-05-22 07:40:15 UTC (rev 6723)
+++ trunk/doc/Change.log	2014-05-22 08:05:30 UTC (rev 6724)
@@ -1,4 +1,8 @@
 webERP Change Log
+
+22/5/14 Tim: Currencies.php now allows FunctionalCurrency to be modified
+22/5/14 Phil: Prevent use of enter key - experimental - in number fields - prevents users from losing data in big forms where they are entering large amounts of data e.g. purchase ordering - maybe we should consider for integer fields too?
+22/5/14 Ricard/Phil: Tidy up SQL in StockClone.php
 19/5/14 Exson: Tidy up code of SelectOrderItems.php.
 18/5/14 Thumb: Fixed the bug in ConfirmDispatch_Invoice.php for Balance quantity canceled policy by line no instead of by stockid since webERP allow same stock appeared in one order multiple times.
 18/5/14 Exson: Tidy up SelectSalesOrder.php SQL code and add Thumb's salesman login control and fixed bugs caused by no group by statements for customer and items selected.