[Weberp-svn] SF.net SVN: weberp:[7712] trunk

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

Revision: 7712
          http://weberp.svn.sourceforge.net/weberp/?rev=7712&view=rev
Author:   tim_schofield
Date:     2011-08-09 18:59:07 +0000 (Tue, 09 Aug 2011)

Log Message:
-----------
Add the ability to make an order complete once the order has been printed

Modified Paths:
--------------
    trunk/GoodsReceived.php
    trunk/PO_Header.php
    trunk/includes/DefinePOClass.php

Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php	2011-08-09 18:58:43 UTC (rev 7711)
+++ trunk/GoodsReceived.php	2011-08-09 18:59:07 UTC (rev 7712)
@@ -694,7 +694,7 @@
 		$date = date($_SESSION['DefaultDateFormat']);
 		$StatusComment=$date.' - Order Completed'.'<br />'.$comment;
 		$sql="UPDATE purchorders
-					SET status='" . PurchOrder::STATUS_COMPLITED . "',
+					SET status='" . PurchOrder::STATUS_COMPLETED . "',
 					stat_comment='" . $StatusComment . "'
 					WHERE orderno='" . $_SESSION['PO']->OrderNo . "'";
 		$result=DB_query($sql,$db);

Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php	2011-08-09 18:58:43 UTC (rev 7711)
+++ trunk/PO_Header.php	2011-08-09 18:59:07 UTC (rev 7712)
@@ -308,31 +308,31 @@
 			$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
 
 			$SQL = "SELECT suppliers.supplierid,
-											suppliers.suppname,
-											suppliers.address1,
-											suppliers.address2,
-											suppliers.address3,
-											suppliers.address4,
-											suppliers.address5,
-											suppliers.address6,
-											suppliers.currcode
-										FROM suppliers
-										WHERE suppliers.suppname LIKE '". $SearchString ."'
-										ORDER BY suppliers.suppname";
+							suppliers.suppname,
+							suppliers.address1,
+							suppliers.address2,
+							suppliers.address3,
+							suppliers.address4,
+							suppliers.address5,
+							suppliers.address6,
+							suppliers.currcode
+						FROM suppliers
+						WHERE suppliers.suppname LIKE '". $SearchString ."'
+						ORDER BY suppliers.suppname";
 
 		} elseif (mb_strlen($_POST['SuppCode'])>0){
 			$SQL = "SELECT suppliers.supplierid,
-											suppliers.suppname,
-											suppliers.address1,
-											suppliers.address2,
-											suppliers.address3,
-											suppliers.address4,
-											suppliers.address5,
-											suppliers.address6,
-											suppliers.currcode
-										FROM suppliers
-										WHERE suppliers.supplierid LIKE '%" . $_POST['SuppCode'] . "%'
-										ORDER BY suppliers.supplierid";
+							suppliers.suppname,
+							suppliers.address1,
+							suppliers.address2,
+							suppliers.address3,
+							suppliers.address4,
+							suppliers.address5,
+							suppliers.address6,
+							suppliers.currcode
+						FROM suppliers
+						WHERE suppliers.supplierid LIKE '%" . $_POST['SuppCode'] . "%'
+						ORDER BY suppliers.supplierid";
 		}
 
 		$ErrMsg = _('The searched supplier records requested cannot be retrieved because');
@@ -805,10 +805,10 @@
 			break;
 		case PurchOrder::STATUS_PRINTED:
 			$StatusList = array(PurchOrder::STATUS_PENDING, PurchOrder::STATUS_PRINTED,
-                                PurchOrder::STATUS_CANCELLED);
+                                PurchOrder::STATUS_CANCELLED, PurchOrder::STATUS_COMPLETED);
 			break;
-		case PurchOrder::STATUS_COMPLITED:
-			$StatusList = array(PurchOrder::STATUS_COMPLITED);
+		case PurchOrder::STATUS_COMPLETED:
+			$StatusList = array(PurchOrder::STATUS_COMPLETED);
 			break;
 		default:
 			$StatusList = array(PurchOrder::STATUS_NEW_ORDER, PurchOrder::STATUS_PENDING,

Modified: trunk/includes/DefinePOClass.php
===================================================================
--- trunk/includes/DefinePOClass.php	2011-08-09 18:58:43 UTC (rev 7711)
+++ trunk/includes/DefinePOClass.php	2011-08-09 18:59:07 UTC (rev 7712)
@@ -11,7 +11,7 @@
 	const STATUS_REJECTED   = 'Rejected';
 	const STATUS_CANCELLED  = 'Cancelled';
 	const STATUS_PRINTED    = 'Printed';
-	const STATUS_COMPLITED  = 'Completed';
+	const STATUS_COMPLETED  = 'Completed';
 
 	var $LineItems; /*array of objects of class LineDetails using the product id as the pointer */
 	var $CurrCode;


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