web-erp-svn

[Web-erp-svn] SF.net SVN: web-erp:[6279] trunk/PO_SelectOSPurchOrder.php

[<ex...@us...>]

Revision: 6279
          http://sourceforge.net/p/web-erp/reponame/6279
Author:   exsonqu
Date:     2013-08-21 08:34:37 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
21/8/2013 Exson: Fixed the notice error of undefined index Status and and space for some string. 

Modified Paths:
--------------
    trunk/PO_SelectOSPurchOrder.php

Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php	2013-08-21 03:23:57 UTC (rev 6278)
+++ trunk/PO_SelectOSPurchOrder.php	2013-08-21 08:34:37 UTC (rev 6279)
@@ -166,26 +166,28 @@
 	} else {
 		echo '<option value="Pending_Authorised">' . _('Pending and Authorised') . '</option>';
 	}
-	if ($_POST['Status'] == 'Pending') {
-		echo '<option selected="selected" value="Pending">' . _('Pending') . '</option>';
-	} else {
-		echo '<option value="Pending">' . _('Pending') . '</option>';
+	if(isset($_POST['Status'])){
+		if ($_POST['Status'] == 'Pending') {
+			echo '<option selected="selected" value="Pending">' . _('Pending') . '</option>';
+		} else {
+			echo '<option value="Pending">' . _('Pending') . '</option>';
+		}
+		if ($_POST['Status'] == 'Authorised') {
+			echo '<option selected="selected" value="Authorised">' . _('Authorised') . '</option>';
+		} else {
+			echo '<option value="Authorised">' . _('Authorised') . '</option>';
+		}
+		if ($_POST['Status'] == 'Cancelled') {
+			echo '<option selected="selected" value="Cancelled">' . _('Cancelled') . '</option>';
+		} else {
+			echo '<option value="Cancelled">' . _('Cancelled') . '</option>';
+		}
+		if ($_POST['Status'] == 'Rejected') {
+			echo '<option selected="selected" value="Rejected">' . _('Rejected') . '</option>';
+		} else {
+			echo '<option value="Rejected">' . _('Rejected') . '</option>';
+		}
 	}
-	if ($_POST['Status'] == 'Authorised') {
-		echo '<option selected="selected" value="Authorised">' . _('Authorised') . '</option>';
-	} else {
-		echo '<option value="Authorised">' . _('Authorised') . '</option>';
-	}
-	if ($_POST['Status'] == 'Cancelled') {
-		echo '<option selected="selected" value="Cancelled">' . _('Cancelled') . '</option>';
-	} else {
-		echo '<option value="Cancelled">' . _('Cancelled') . '</option>';
-	}
-	if ($_POST['Status'] == 'Rejected') {
-		echo '<option selected="selected" value="Rejected">' . _('Rejected') . '</option>';
-	} else {
-		echo '<option value="Rejected">' . _('Rejected') . '</option>';
-	}
 	echo '</select> <input type="submit" name="SearchOrders" value="' . _('Search Purchase Orders') . '" />
 		</td>
 		</tr>
@@ -211,11 +213,11 @@
 	}
 } //end loop through categories
 echo '</select></td>';
-echo '<td>' . _('Enter text extracts in the') . '<b>' . _('description') . '</b>:</td>';
+echo '<td>' . _('Enter text extracts in the') .' '. '<b>' . _('description') . '</b>:</td>';
 echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
 		</tr>
 		<tr><td></td>';
-echo '<td><b>' . _('OR') . '</b>' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</td>';
+echo '<td><b>' . _('OR').' '. '</b>' . _('Enter extract of the') .' '. '<b>' . _('Stock Code') . '</b>:</td>';
 echo '<td><input type="text" name="StockCode" size="15" maxlength="18" /></td>
 	</tr>
 	</table>

[Web-erp-svn] SF.net SVN: web-erp:[6574] trunk/PO_SelectOSPurchOrder.php

[<vv...@us...>]

Revision: 6574
          http://sourceforge.net/p/web-erp/reponame/6574
Author:   vvs2012
Date:     2014-02-14 23:13:15 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Show all POs when enter PO_SelectOSPurchOrder.php page. Then allow filter by date range

Modified Paths:
--------------
    trunk/PO_SelectOSPurchOrder.php

Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php	2014-02-14 23:09:45 UTC (rev 6573)
+++ trunk/PO_SelectOSPurchOrder.php	2014-02-14 23:13:15 UTC (rev 6574)
@@ -320,8 +320,8 @@
 				INNER JOIN currencies
 				ON suppliers.currcode=currencies.currabrev
 				WHERE purchorderdetails.completed=0
-				AND orddate>='" . FormatDateForSQL($_POST['DateFrom']) . "'
-				AND orddate<='" . FormatDateForSQL($_POST['DateTo']) . "'
+				AND orddate>='" . $DateFrom . "'
+				AND orddate<='" . $DateTo . "'
 				AND purchorders.orderno='" . $OrderNumber . "'
 				GROUP BY purchorders.orderno ASC,
 					suppliers.suppname,
@@ -358,8 +358,8 @@
 						INNER JOIN currencies
 						ON suppliers.currcode=currencies.currabrev
 						WHERE purchorderdetails.completed=0
-						AND orddate>='" . FormatDateForSQL($_POST['DateFrom']) . "'
-						AND orddate<='" . FormatDateForSQL($_POST['DateTo']) . "'
+						AND orddate>='" . $DateFrom . "'
+						AND orddate<='" . $DateTo . "'
 						AND purchorderdetails.itemcode='" . $SelectedStockItem . "'
 						AND purchorders.supplierno='" . $SelectedSupplier . "'
 						AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
@@ -394,8 +394,8 @@
 						INNER JOIN currencies
 						ON suppliers.currcode=currencies.currabrev
 						WHERE purchorderdetails.completed=0
-						AND orddate>='" . FormatDateForSQL($_POST['DateFrom']) . "'
-						AND orddate<='" . FormatDateForSQL($_POST['DateTo']) . "'
+						AND orddate>='" . $DateFrom . "'
+						AND orddate<='" . $DateTo . "'
 						AND purchorders.supplierno='" . $SelectedSupplier . "'
 						AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
 						" . $StatusCriteria . "
@@ -435,8 +435,8 @@
 						INNER JOIN currencies
 						ON suppliers.currcode=currencies.currabrev
 						WHERE purchorderdetails.completed=0
-						AND orddate>='" . FormatDateForSQL($_POST['DateFrom']) . "'
-						AND orddate<='" . FormatDateForSQL($_POST['DateTo']) . "'
+						AND orddate>='" . $DateFrom . "'
+						AND orddate<='" . $DateTo . "'
 						AND purchorderdetails.itemcode='" . $SelectedStockItem . "'
 						AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
 						" . $StatusCriteria . "
@@ -470,8 +470,8 @@
 						INNER JOIN currencies
 						ON suppliers.currcode=currencies.currabrev
 						WHERE purchorderdetails.completed=0
-						AND orddate>='" . FormatDateForSQL($_POST['DateFrom']) . "'
-						AND orddate<='" . FormatDateForSQL($_POST['DateTo']) . "'
+						AND orddate>='" . $DateFrom . "'
+						AND orddate<='" . $DateTo . "'
 						AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
 						" . $StatusCriteria . "
 						GROUP BY purchorders.orderno ASC,

[Web-erp-svn] SF.net SVN: web-erp:[6967] trunk/PO_SelectOSPurchOrder.php

[<ex...@us...>]

Revision: 6967
          http://sourceforge.net/p/web-erp/reponame/6967
Author:   exsonqu
Date:     2014-11-07 09:39:42 +0000 (Fri, 07 Nov 2014)
Log Message:
-----------
7/11/14 Exson: Remove date range from sql when users input the PO number in PO_SelectOSPurchOrder.php.

Modified Paths:
--------------
    trunk/PO_SelectOSPurchOrder.php

Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php	2014-11-06 09:15:09 UTC (rev 6966)
+++ trunk/PO_SelectOSPurchOrder.php	2014-11-07 09:39:42 UTC (rev 6967)
@@ -327,8 +327,6 @@
 				INNER JOIN currencies
 				ON suppliers.currcode=currencies.currabrev
 				WHERE purchorderdetails.completed=0
-				AND orddate>='" . $DateFrom . "'
-				AND orddate<='" . $DateTo . "'
 				AND purchorders.orderno='" . $OrderNumber . "'
 				GROUP BY purchorders.orderno ASC,
 					suppliers.suppname,
@@ -581,4 +579,4 @@
 echo '</div>
       </form>';
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

[Web-erp-svn] SF.net SVN: web-erp:[7286] trunk/PO_SelectOSPurchOrder.php

[<ex...@us...>]

Revision: 7286
          http://sourceforge.net/p/web-erp/reponame/7286
Author:   exsonqu
Date:     2015-05-04 03:25:24 +0000 (Mon, 04 May 2015)
Log Message:
-----------
04/05/15 Exson: Make all option available for users who have authority for all locations and all option available for all stock categories in PO_SelectOSPurchOrder.php.

Modified Paths:
--------------
    trunk/PO_SelectOSPurchOrder.php

Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php	2015-05-02 21:28:39 UTC (rev 7285)
+++ trunk/PO_SelectOSPurchOrder.php	2015-05-04 03:25:24 UTC (rev 7286)
@@ -64,6 +64,11 @@
 	if (isset($_POST['Keywords']) AND isset($_POST['StockCode'])) {
 		echo '<div class="page_help_text">' . _('Stock description keywords have been used in preference to the Stock code extract entered') . '.</div>';
 	}
+	if (isset($_POST['StockCat']) AND $_POST['StockCat'] == 'All'){
+		$WhereStockCat = ' ';
+	} else {
+		$WhereStockCat = " AND stockmaster.categoryid='" . $_POST['StockCat'] . "'";
+	}
 	if ($_POST['Keywords']) {
 		//insert wildcard characters in spaces
 		$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
@@ -81,7 +86,7 @@
 					INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" .  $_SESSION['UserID'] . "' AND locationusers.canview=1
 				WHERE purchorderdetails.completed=0
 				AND stockmaster.description " . LIKE . " '" . $SearchString . "'
-				AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+				" . $WhereStockCat . "
 				GROUP BY stockmaster.stockid,
 					stockmaster.description,
 					stockmaster.units
@@ -103,7 +108,7 @@
 				INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" .  $_SESSION['UserID'] . "' AND locationusers.canview=1
 				WHERE purchorderdetails.completed=0
 				AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
-				AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+				" . $WhereStockCat . "
 				GROUP BY stockmaster.stockid,
 					stockmaster.description,
 					stockmaster.units
@@ -122,7 +127,7 @@
 				INNER JOIN purchorders on purchorders.orderno=purchorderdetails.orderno
 				INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" .  $_SESSION['UserID'] . "' AND locationusers.canview=1
 				WHERE purchorderdetails.completed=0
-				AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+				" . $WhereStockCat . "
 				GROUP BY stockmaster.stockid,
 					stockmaster.description,
 					stockmaster.units
@@ -164,21 +169,56 @@
 		$DateTo = FormatDateForSQL($_POST['DateTo']);
 	}
 
-	$sql = "SELECT locations.loccode, locationname FROM locations
+	$sql = "SELECT locations.loccode, locationname,(SELECT count(*) FROM locations) AS total FROM locations
 				INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" .  $_SESSION['UserID'] . "' AND locationusers.canview=1";
-	$resultStkLocs = DB_query($sql);
+	$ErrMsg = _('Failed to retrieve location data');
+	$resultStkLocs = DB_query($sql,$ErrMsg);
+	$UserLocations = DB_num_rows($resultStkLocs);
+	$AllListed = false;
 	while ($myrow = DB_fetch_array($resultStkLocs)) {
-		if (isset($_POST['StockLocation'])) {
-			if ($myrow['loccode'] == $_POST['StockLocation']) {
-				echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
-			} else {
-				echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+		if (isset($_POST['StockLocation'])) {//The user has selected location
+			if ($_POST['StockLocation'] == 'ALLLOC'){//user have selected all locations
+				if($AllListed === false) {//it's the first loop
+					echo '<option selected="selected" value="ALLLOC">' . _('All') . '</option>';
+					echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+					$AllListed = true;
+				} else { //it's not the first loop
+					echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+				}
+			
+			} else {//user have not selected all locations; There are two possibilities that users have right, but not choose all; or vice visa
+				if ($myrow['total'] == $UserLocations) { //user have allloc right
+					if($AllListed === false){//first loop
+						echo '<option value="ALLLOC">' . _('All') . '</option>';
+						$AllListed = true;
+					}
+				}
+				if ($myrow['loccode'] == $_POST['StockLocation']){
+					echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+				} else {
+					echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+				}
 			}
-		} elseif ($myrow['loccode'] == $_SESSION['UserStockLocation']) {
-			echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
-		} else {
-			echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+		} else {//users have not selected locations
+			if($myrow['total'] == $UserLocations){//users have right to submit All locations
+				if($AllListed === false){//first loop
+					echo '<option selected="selected" value="ALLLOC">' . _('All') . '</option>';//default value is all 
+					echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+					$AllListed = true;
+				} else {//not first loop
+					echo '<option value="' . $myrow['loccode'] . '" >' . $myrow['locationname'] . '</option>';
+				}
+			} else {//no right to submit all locations
+				if ($myrow['loccode'] == $_SESSION['UserStockLocation']) {
+					echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+				} else {
+					echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+				}
+			
+			}
+
 		}
+	
 	}
 	echo '</select> ' . _('Order Status:') . ' <select name="Status">';
 	if (!isset($_POST['Status']) OR $_POST['Status'] == 'Pending_Authorised') {
@@ -229,7 +269,9 @@
 
 echo '<td>' . _('Select a stock category') . ':
 		<select name="StockCat">';
-
+if (DB_num_rows($result1)>0){
+	echo '<option value="All">' . _('All') . '</option>';
+}
 while ($myrow1 = DB_fetch_array($result1)) {
 	if (isset($_POST['StockCat']) and $myrow1['categoryid'] == $_POST['StockCat']) {
 		echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
@@ -341,6 +383,13 @@
 		if (isset($SelectedSupplier)) {
 			if (!isset($_POST['StockLocation'])) {
 				$_POST['StockLocation'] = $_SESSION['UserStockLocation'];
+				$WhereStockLocation = " AND purchorders.intostocklocation ='" . $_POST['StockLocation'] . "' ";
+			} else {
+				if ($_POST['StockLocation'] == 'ALLLOC'){
+					$WhereStockLocation = ' ';
+				} else {
+					$WhereStockLocation = " AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "' ";
+				}
 			}
 
 			if (isset($SelectedStockItem)) {
@@ -368,8 +417,8 @@
 						AND orddate<='" . $DateTo . "'
 						AND purchorderdetails.itemcode='" . $SelectedStockItem . "'
 						AND purchorders.supplierno='" . $SelectedSupplier . "'
-						AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
-						" . $StatusCriteria . "
+						" . $WhereStockLocation 
+						 . $StatusCriteria . "
 						GROUP BY purchorders.orderno ASC,
 							purchorders.realorderno,
 							suppliers.suppname,
@@ -404,8 +453,8 @@
 						AND orddate>='" . $DateFrom . "'
 						AND orddate<='" . $DateTo . "'
 						AND purchorders.supplierno='" . $SelectedSupplier . "'
-						AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
-						" . $StatusCriteria . "
+						" . $WhereStockLocation  
+						 . $StatusCriteria . "
 						GROUP BY purchorders.orderno ASC,
 							purchorders.realorderno,
 							suppliers.suppname,
@@ -421,6 +470,13 @@
 		else { //no supplier selected
 			if (!isset($_POST['StockLocation'])) {
 				$_POST['StockLocation'] = $_SESSION['UserStockLocation'];
+				$WhereStockLocation = " AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'";
+			} else {
+				if ($_POST['StockLocation'] == 'ALLLOC'){
+					$WhereStockLocation = ' ';
+				} else {
+					$WhereStockLocation = " AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'";
+				}
 			}
 			if (isset($SelectedStockItem) AND isset($_POST['StockLocation'])) {
 				$SQL = "SELECT purchorders.realorderno,
@@ -446,8 +502,8 @@
 						AND orddate>='" . $DateFrom . "'
 						AND orddate<='" . $DateTo . "'
 						AND purchorderdetails.itemcode='" . $SelectedStockItem . "'
-						AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
-						" . $StatusCriteria . "
+						" . $WhereStockLocation . 
+						 $StatusCriteria . "
 						GROUP BY purchorders.orderno ASC,
 							purchorders.realorderno,
 							suppliers.suppname,
@@ -481,8 +537,8 @@
 						WHERE purchorderdetails.completed=0
 						AND orddate>='" . $DateFrom . "'
 						AND orddate<='" . $DateTo . "'
-						AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
-						" . $StatusCriteria . "
+						" . $WhereStockLocation .  
+						  $StatusCriteria . "
 						GROUP BY purchorders.orderno ASC,
 							purchorders.realorderno,
 							suppliers.suppname,

[Web-erp-svn] SF.net SVN: web-erp:[7288] trunk/PO_SelectOSPurchOrder.php

[<ex...@us...>]

Revision: 7288
          http://sourceforge.net/p/web-erp/reponame/7288
Author:   exsonqu
Date:     2015-05-04 06:54:44 +0000 (Mon, 04 May 2015)
Log Message:
-----------
04/05/15 Exson: Make PO number searching also in compliance with location authority rules and make default search result as all if users have full location authority.

Modified Paths:
--------------
    trunk/PO_SelectOSPurchOrder.php

Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php	2015-05-04 03:26:00 UTC (rev 7287)
+++ trunk/PO_SelectOSPurchOrder.php	2015-05-04 06:54:44 UTC (rev 7288)
@@ -176,6 +176,9 @@
 	$UserLocations = DB_num_rows($resultStkLocs);
 	$AllListed = false;
 	while ($myrow = DB_fetch_array($resultStkLocs)) {
+		if(!isset($LocQty)){
+			$LocQty = $myrow['total'];
+		}
 		if (isset($_POST['StockLocation'])) {//The user has selected location
 			if ($_POST['StockLocation'] == 'ALLLOC'){//user have selected all locations
 				if($AllListed === false) {//it's the first loop
@@ -364,6 +367,9 @@
 						SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
 				FROM purchorders INNER JOIN purchorderdetails
 				ON purchorders.orderno=purchorderdetails.orderno
+				INNER JOIN locationusers 
+				ON purchorders.intostocklocation=locationusers.loccode
+				AND userid='" . $_SESSION['UserID'] . "' AND canview = 1
 				INNER JOIN suppliers
 				ON purchorders.supplierno = suppliers.supplierid
 				INNER JOIN currencies
@@ -382,8 +388,12 @@
 		//$OrderNumber is not set
 		if (isset($SelectedSupplier)) {
 			if (!isset($_POST['StockLocation'])) {
-				$_POST['StockLocation'] = $_SESSION['UserStockLocation'];
-				$WhereStockLocation = " AND purchorders.intostocklocation ='" . $_POST['StockLocation'] . "' ";
+				if (isset($UserLocations) AND isset($LocQty) AND $UserLocations == $LocQty) {
+					$WhereStockLocation = " AND purchorders.intostocklocation ='" . $_POST['StockLocation'] . "' ";
+				} else {
+					$_POST['StockLocation'] = $_SESSION['UserStockLocation'];
+					$WhereStockLocation = " AND purchorders.intostocklocation ='" . $_POST['StockLocation'] . "' ";
+				}
 			} else {
 				if ($_POST['StockLocation'] == 'ALLLOC'){
 					$WhereStockLocation = ' ';
@@ -469,8 +479,13 @@
 		} //isset($SelectedSupplier)
 		else { //no supplier selected
 			if (!isset($_POST['StockLocation'])) {
-				$_POST['StockLocation'] = $_SESSION['UserStockLocation'];
-				$WhereStockLocation = " AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'";
+				if (isset($UserLocations) AND isset($LocQty) AND $UserLocations == $LocQty) {
+					$WhereStockLocation = " ";
+					$_POST['StockLocation'] = 'ALLLOC';
+				} else {
+					$_POST['StockLocation'] = $_SESSION['UserStockLocation'];
+					$WhereStockLocation = " AND purchorders.intostocklocation ='" . $_POST['StockLocation'] . "' ";
+				}
 			} else {
 				if ($_POST['StockLocation'] == 'ALLLOC'){
 					$WhereStockLocation = ' ';

[Web-erp-svn] SF.net SVN: web-erp:[7425] trunk/PO_SelectOSPurchOrder.php

[<ex...@us...>]

Revision: 7425
          http://sourceforge.net/p/web-erp/reponame/7425
Author:   exsonqu
Date:     2015-12-26 10:38:17 +0000 (Sat, 26 Dec 2015)
Log Message:
-----------
26/12/2015 Exson: Add items not received information on outstanding po inquiry screen in PO_SelectOSPurchOrder.php.

Modified Paths:
--------------
    trunk/PO_SelectOSPurchOrder.php

Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php	2015-12-24 10:13:34 UTC (rev 7424)
+++ trunk/PO_SelectOSPurchOrder.php	2015-12-26 10:38:17 UTC (rev 7425)
@@ -364,6 +364,7 @@
 						purchorders.allowprint,
 						suppliers.currcode,
 						currencies.decimalplaces AS currdecimalplaces,
+						group_concat(CASE WHEN quantityord>quantityrecd THEN CONCAT(itemcode,'--',round(quantityord-quantityrecd)) ELSE '' END) as bal,
 						SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
 				FROM purchorders INNER JOIN purchorderdetails
 				ON purchorders.orderno=purchorderdetails.orderno
@@ -414,6 +415,7 @@
 							purchorders.allowprint,
 							suppliers.currcode,
 							currencies.decimalplaces AS currdecimalplaces,
+							group_concat(CASE WHEN quantityord>quantityrecd THEN CONCAT(itemcode,'--',round(quantityord-quantityrecd)) ELSE '' END) as bal,
 							SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
 						FROM purchorders INNER JOIN purchorderdetails
 						ON purchorders.orderno = purchorderdetails.orderno
@@ -451,6 +453,7 @@
 							purchorders.allowprint,
 							suppliers.currcode,
 							currencies.decimalplaces AS currdecimalplaces,
+							group_concat(CASE WHEN quantityord>quantityrecd THEN CONCAT(itemcode,'--',round(quantityord-quantityrecd)) ELSE '' END) as bal,
 							SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
 						FROM purchorders INNER JOIN purchorderdetails
 						ON purchorders.orderno = purchorderdetails.orderno
@@ -505,6 +508,7 @@
 							purchorders.allowprint,
 							suppliers.currcode,
 							currencies.decimalplaces AS currdecimalplaces,
+							group_concat(CASE WHEN quantityord>quantityrecd THEN CONCAT(itemcode,'--',round(quantityord-quantityrecd)) ELSE '' END) as bal,
 							SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
 						FROM purchorders INNER JOIN purchorderdetails
 						ON purchorders.orderno = purchorderdetails.orderno
@@ -541,6 +545,7 @@
 							purchorders.allowprint,
 							suppliers.currcode,
 							currencies.decimalplaces AS currdecimalplaces,
+							group_concat(CASE WHEN quantityord>quantityrecd THEN CONCAT(itemcode,'--',round(quantityord-quantityrecd)) ELSE '' END) as bal,
 							SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
 						FROM purchorders INNER JOIN purchorderdetails
 						ON purchorders.orderno = purchorderdetails.orderno
@@ -582,6 +587,7 @@
 			<th class="ascending">' . _('Delivery Date') . '</th>
 			<th class="ascending">' . _('Initiated by') . '</th>
 			<th class="ascending">' . _('Supplier') . '</th>
+			<th class="ascending">' . _('Balance') .' ('. _('Stock ID') . '--' . _('Quantity') . ' )</th>
 			<th class="ascending">' . _('Currency') . '</th>';
 
 	if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) {
@@ -635,6 +641,7 @@
 			<td>' . $FormatedDeliveryDate . '</td>
 			<td>' . $InitiatorName . '</td>
 			<td>' . $myrow['suppname'] . '</td>
+			<td width="250" style="word-break:break-all">' . $myrow['bal'] . '</td>
 			<td>' . $myrow['currcode'] . '</td>';
 		if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) {
 			echo '<td class="number">' . $FormatedOrderValue . '</td>';

[Web-erp-svn] SF.net SVN: web-erp:[7468] trunk/PO_SelectOSPurchOrder.php

[<ex...@us...>]

Revision: 7468
          http://sourceforge.net/p/web-erp/reponame/7468
Author:   exsonqu
Date:     2016-03-09 02:59:37 +0000 (Wed, 09 Mar 2016)
Log Message:
-----------
03/09/16 Exson: Add PO details option to show balance of each outstanding PO in PO_SelectOSPurchOrder.php.

Modified Paths:
--------------
    trunk/PO_SelectOSPurchOrder.php

Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php	2016-03-09 01:55:34 UTC (rev 7467)
+++ trunk/PO_SelectOSPurchOrder.php	2016-03-09 02:59:37 UTC (rev 7468)
@@ -251,6 +251,7 @@
 			echo '<option value="Rejected">' . _('Rejected') . '</option>';
 		}
 	}
+	$Checked = (isset($_POST['PODetails']))?'checked="checked"':'';
 	echo '</select>
 		' . _('Orders Between') . ':&nbsp;
 			<input type="text" name="DateFrom" value="' . ConvertSQLDate($DateFrom) . '"  class="date" size="10" alt="' . $_SESSION['DefaultDateFormat'] . '"  />
@@ -259,6 +260,7 @@
 		<input type="submit" name="SearchOrders" value="' . _('Search Purchase Orders') . '" />
 		</td>
 		</tr>
+		<tr><td>' . _('Show PO Details') . '<input type="checkbox" name="PODetails" ' . $Checked . ' /></td></tr>
 		</table>';
 } //!isset($OrderNumber) or $OrderNumber == ''
 
@@ -580,14 +582,18 @@
 
 	echo '<table cellpadding="2" width="97%" class="selection">';
 
-
+	if (isset($_POST['PODetails'])) {
+		$BalHead = '<th class="ascending">' . _('Balance') .' (' . _('Stock ID') . '--' . _('Quantity') . ' )</th>';
+	} else {
+		$BalHead = '';
+	}
 	echo '<tr>
 			<th class="ascending">' . _('Order #') . '</th>
 			<th class="ascending">' . _('Order Date') . '</th>
 			<th class="ascending">' . _('Delivery Date') . '</th>
 			<th class="ascending">' . _('Initiated by') . '</th>
 			<th class="ascending">' . _('Supplier') . '</th>
-			<th class="ascending">' . _('Balance') .' ('. _('Stock ID') . '--' . _('Quantity') . ' )</th>
+			' . $BalHead . '
 			<th class="ascending">' . _('Currency') . '</th>';
 
 	if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) {
@@ -600,6 +606,24 @@
 	$j = 1;
 	$k = 0; //row colour counter
 	while ($myrow = DB_fetch_array($PurchOrdersResult)) {
+		$Bal = '';
+		if (isset($_POST['PODetails'])) {
+			//lets retrieve the PO balance here to make it a standard sql query.
+			$BalSql = "SELECT itemcode, quantityord - quantityrecd as balance FROM purchorderdetails WHERE orderno = '" . $myrow['orderno'] . "'";
+			$ErrMsg = _('Failed to retrieve purchorder details');
+			$BalResult  = DB_query($BalSql,$ErrMsg);
+			if (DB_num_rows($BalResult)>0) {
+				while ($BalRow = DB_fetch_array($BalResult)) {
+					$Bal .= '<br/>' . $BalRow['itemcode'] . ' -- ' . $BalRow['balance'];
+				}
+			}
+		}
+		if (isset($_POST['PODetails'])) {
+			$BalRow = '<td width="250" style="word-break:break-all">' . $Bal . '</td>';
+		} else {
+			$BalRow = '';
+		}
+
 		if ($k == 1) {
 			/*alternate bgcolour of row for highlighting */
 			echo '<tr class="EvenTableRows">';
@@ -641,7 +665,7 @@
 			<td>' . $FormatedDeliveryDate . '</td>
 			<td>' . $InitiatorName . '</td>
 			<td>' . $myrow['suppname'] . '</td>
-			<td width="250" style="word-break:break-all">' . $myrow['bal'] . '</td>
+			' . $BalRow . '
 			<td>' . $myrow['currcode'] . '</td>';
 		if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) {
 			echo '<td class="number">' . $FormatedOrderValue . '</td>';