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

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

Revision: 5825
          http://sourceforge.net/p/web-erp/reponame/5825
Author:   tim_schofield
Date:     2013-03-06 09:18:49 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
Tim Schofield: Only display those offers that have not past their expiry dates

Modified Paths:
--------------
    trunk/OffersReceived.php
    trunk/SupplierTenders.php

Modified: trunk/OffersReceived.php
===================================================================
--- trunk/OffersReceived.php	2013-02-25 09:25:12 UTC (rev 5824)
+++ trunk/OffersReceived.php	2013-03-06 09:18:49 UTC (rev 5825)
@@ -87,7 +87,7 @@
 			LEFT JOIN stockmaster
 				ON stockmaster.stockid=offers.stockid
 			WHERE purchorderauth.userid='" . $_SESSION['UserID'] . "'
-			AND offers.expirydate>'" . date('Y-m-d') . "'
+			AND offers.expirydate>='NOW()'
 			AND offers.supplierid='" . $_POST['supplierid'] . "'
 			ORDER BY offerid";
 	$result=DB_query($sql, $db);

Modified: trunk/SupplierTenders.php
===================================================================
--- trunk/SupplierTenders.php	2013-02-25 09:25:12 UTC (rev 5824)
+++ trunk/SupplierTenders.php	2013-03-06 09:18:49 UTC (rev 5825)
@@ -299,7 +299,8 @@
 			FROM offers
 			INNER JOIN stockmaster
 				ON offers.stockid=stockmaster.stockid
-			WHERE offers.supplierid='" . $_POST['SupplierID'] . "'";
+			WHERE offers.supplierid='" . $_POST['SupplierID'] . "'
+				AND offers.expirydate>=NOW()";
 	$result=DB_query($sql, $db);
 	$_SESSION['offer'.$identifier]=new Offer($_POST['SupplierID']);
 	$_SESSION['offer'.$identifier]->CurrCode=$Currency;