[Weberp-cvs] SF.net SVN: web-erp:[4141] trunk

[<tim...@us...>]

Revision: 4141
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4141&view=rev
Author:   tim_schofield
Date:     2010-11-05 11:03:04 +0000 (Fri, 05 Nov 2010)

Log Message:
-----------
Change the standard order quantities to agree with Minimum order qty

Modified Paths:
--------------
    trunk/SelectProduct.php
    trunk/doc/Change.log.html
    trunk/sql/mysql/upgrade3.11.1-4.00.sql

Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php	2010-11-05 10:48:14 UTC (rev 4140)
+++ trunk/SelectProduct.php	2010-11-05 11:03:04 UTC (rev 4141)
@@ -330,7 +330,7 @@
 						purchdata.effectivefrom,
 						purchdata.leadtime,
 						purchdata.conversionfactor,
-                                         purchdata.MinOrderQty,
+						purchdata.minorderqty,
 						purchdata.preferred
 					FROM purchdata INNER JOIN suppliers
 					ON purchdata.supplierno=suppliers.supplierid
@@ -342,7 +342,7 @@
 						<td class=select>' . $SuppRow['currcode'] . '</td>
 						<td class=select>' . ConvertSQLDate($SuppRow['effectivefrom']) . '</td>
                                          <td class=select>' . $SuppRow['leadtime'] . '</td>
-						<td class=select>' . $SuppRow['MinOrderQty'] . '</td>';
+						<td class=select>' . $SuppRow['minorderqty'] . '</td>';
 
 		switch ($SuppRow['preferred']) {
 				/* 2008-08-19 ToPu */
@@ -353,7 +353,8 @@
 				echo '<td class=select>' . _('No') . '</td>';
 			break;
 		}
-		echo '<td class=select><a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity=1">' . _('Order') . ' </a></td>';
+		echo '<td class=select><a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' .
+			$SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity='.$SuppRow['minorderqty'].'">' . _('Order') . ' </a></td>';
 		echo '</tr>';
 	}
 	echo '</tr></table></td>';
@@ -402,7 +403,8 @@
 		echo '<br>';
 		$SuppResult = DB_query("SELECT  suppliers.suppname,
 						suppliers.supplierid,
-						purchdata.preferred
+						purchdata.preferred,
+						purchdata.minorderqty
 					FROM purchdata INNER JOIN suppliers
 					ON purchdata.supplierno=suppliers.supplierid
 					WHERE purchdata.stockid = '" . $StockID . "'", $db);
@@ -410,11 +412,12 @@
 			/**/
 			//
 			if ($myrow['eoq'] == 0) {
-				$EOQ = 1;
+				$EOQ = $SuppRow['minorderqty'];
 			} else {
 				$EOQ = $myrow['eoq'];
 			}
-			echo '<a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity=' . $EOQ . '">' . _('Purchase this Item from') . ' ' . $SuppRow['suppname'] . ' (default)</a><br>';
+			echo '<a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] .
+				'&StockID=' . $StockID . '&Quantity=' . $EOQ . '">' . _('Purchase this Item from') . ' ' . $SuppRow['suppname'] . ' (default)</a><br>';
 			/**/
 		} /* end of while */
 	} /* end of $myrow['mbflag'] == 'B' */

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-11-05 10:48:14 UTC (rev 4140)
+++ trunk/doc/Change.log.html	2010-11-05 11:03:04 UTC (rev 4141)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>02/11/10 Tim: SelectProduct.php. Change the standard order quantities to agree with Minimum order qty</p>
 <p>02/11/10 Tim: PurchData.php. Make the Minimum order quantity field numeric only</p>
 <p>02/11/10 Poul Bjerre-Jensen: SelectProduct.php,PurchData.php. Add in Minimum order quantity to Purchasing data</p>
 <p>02/11/10 Tim: SelectCustomer.php. Correction to work with debtors that have a - in the code</p>

Modified: trunk/sql/mysql/upgrade3.11.1-4.00.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-4.00.sql	2010-11-05 10:48:14 UTC (rev 4140)
+++ trunk/sql/mysql/upgrade3.11.1-4.00.sql	2010-11-05 11:03:04 UTC (rev 4141)
@@ -263,7 +263,7 @@
 ALTER TABLE `prices` ADD `startdate` DATE NOT NULL DEFAULT '0000-00-00' , ADD `enddate` DATE NOT NULL DEFAULT '9999-12-31';
 ALTER TABLE prices DROP PRIMARY KEY ,
 ADD PRIMARY KEY ( `stockid` , `typeabbrev` , `currabrev` , `debtorno` , `branchcode`, `startdate` , `enddate` ) ;
-
+ALTER TABLE purchdata ADD column minorderqty int(11) NOT NULL default 1;
 UPDATE prices SET startdate='1999-01-01', enddate='';
 
 ALTER TABLE stockcheckfreeze ADD COLUMN stockcheckdate date NOT NULL;


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