[Web-erp-svn] SF.net SVN: web-erp:[7621] trunk/OrderDetails.php

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

Revision: 7621
          http://sourceforge.net/p/web-erp/reponame/7621
Author:   exsonqu
Date:     2016-09-14 09:04:41 +0000 (Wed, 14 Sep 2016)
Log Message:
-----------
14/09/16: Exson: Add order line narrative and invoices link to sales order inquiry in OrderDetails.php.

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

Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php	2016-09-13 08:08:29 UTC (rev 7620)
+++ trunk/OrderDetails.php	2016-09-14 09:04:41 UTC (rev 7621)
@@ -64,7 +64,17 @@
 		include('includes/footer.inc');
 		exit;
 	}
+	//retrieve invoice number
+	$Invs = explode(' Inv ',$myrow['comments']);
+	$Inv = '';
+	foreach ($Invs as $value) {
+		if (is_numeric($value)) {
+			$Inv .= '<a href="' . $RootPath . '/PrintCustTrans.php?FromTransNo=' . $value . '&InvOrCredit=Invoice">'.$value.'</a>  ';
+		}
+	}
 
+
+
 	echo '<table class="selection">
 			<tr>
 				<th colspan="4"><h3>' . _('Order Header Details For Order No').' '.$_GET['OrderNumber'] . '</h3></th>
@@ -125,6 +135,9 @@
 				<th style="text-align: left">' . _('Comments'). ': </th>
 				<td colspan="3">' . $myrow['comments'] . '</td>
 			</tr>
+			<tr>	<th style="text-align: left">' . _('Invoices') . ': </th>
+				<td colspan="3">' . $Inv . '</td>
+			</tr>
 			</table>';
 }
 
@@ -146,7 +159,8 @@
 							actualdispatchdate,
 							qtyinvoiced,
 							itemdue,
-							poline
+							poline,
+							narrative
 						FROM salesorderdetails INNER JOIN stockmaster
 						ON salesorderdetails.stkcode = stockmaster.stockid
 						WHERE orderno ='" . $_GET['OrderNumber'] . "'";
@@ -177,6 +191,7 @@
 				<th>' . _('Total') . '</th>
 				<th>' . _('Qty Del') . '</th>
 				<th>' . _('Last Del') . '/' . _('Due Date') . '</th>
+				<th>' . _('Narrative') . '</th>
 			</tr>';
 		$k=0;
 		while ($myrow=DB_fetch_array($LineItemsResult)) {
@@ -205,6 +220,7 @@
 				<td class="number">' . locale_number_format($myrow['quantity'] * $myrow['unitprice'] * (1 - $myrow['discountpercent']),$CurrDecimalPlaces) . '</td>
 				<td class="number">' . locale_number_format($myrow['qtyinvoiced'],$myrow['decimalplaces']) . '</td>
 				<td>' . $DisplayActualDeliveryDate . '</td>
+				<td>' . $myrow['narrative'] . '</td>
 			</tr>';
 
 			$OrderTotal += ($myrow['quantity'] * $myrow['unitprice'] * (1 - $myrow['discountpercent']));