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

[<tu...@us...>]

Revision: 7284
          http://sourceforge.net/p/web-erp/reponame/7284
Author:   turbopt
Date:     2015-05-01 02:42:51 +0000 (Fri, 01 May 2015)
Log Message:
-----------
Add Delivery Date in GoodsReceived.php output [forum feature request], plus some very minor cleanup.

Modified Paths:
--------------
    trunk/GoodsReceived.php
    trunk/doc/Change.log

Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php	2015-04-30 10:31:08 UTC (rev 7283)
+++ trunk/GoodsReceived.php	2015-05-01 02:42:51 UTC (rev 7284)
@@ -92,9 +92,9 @@
 
 	echo '<table cellpadding="2" class="selection">
 			<tr><th colspan="2"></th>
-				<th align="center" colspan="3"><b>' . _('Supplier Units') . '</b></th>
+				<th class="centre" colspan="3"><b>' . _('Supplier Units') . '</b></th>
 				<th></th>
-				<th align="center" colspan="5"><b>' . _('Our Receiving Units') . '</b></th>
+				<th class="centre" colspan="5"><b>' . _('Our Receiving Units') . '</b></th>
 			</tr>
 			<tr>
 				<th>' . _('Item Code') . '</th>
@@ -106,6 +106,7 @@
 				<th>' . _('Quantity') . '<br />' . _('Ordered') . '</th>
 				<th>' . _('Units') . '</th>
 				<th>' . _('Already') . '<br />' . _('Received') . '</th>
+				<th>' . _('Delivery') . '<br />' . _('Date') . '</th>
 				<th>' . _('This Delivery') . '<br />' . _('Quantity') . '</th>
 				<th>' . _('Completed') . '</th>';
 
@@ -170,6 +171,7 @@
 			<td class="number">' . $DisplayQtyOrd . '</td>
 			<td>' . $LnItm->Units . '</td>
 			<td class="number">' . $DisplayQtyRec . '</td>
+			<td>' . $LnItm->ReqDelDate . '</td>
 			<td class="number">';
 
 		if ($LnItm->Controlled == 1) {
@@ -206,7 +208,7 @@
 	$DisplayTotal = locale_number_format($_SESSION['PO'.$identifier]->Total,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
 	if ($_SESSION['ShowValueOnGRN']==1) {
 		echo '<tr>
-				<td colspan="11" class="number"><b>' . _('Total value of goods received'). '</b></td>
+				<td colspan="13" class="number"><b>' . _('Total value of goods received'). '</b></td>
 				<td class="number"><b>' .  $DisplayTotal. '</b></td>
 			</tr>
 			</table>';
@@ -422,7 +424,7 @@
 					$_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = (($CurrentStandardCost * $OrderLine->ReceiveQty) + ($_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost * $OrderLine->QtyReceived)) / ($OrderLine->ReceiveQty + $OrderLine->QtyReceived);
 				} elseif ($myrow[1] == 'D') { //it's a dummy part which without stock.
 					$Dummy = true;
-					if($OrderLine->QtyReceived == 0){//There is 
+					if($OrderLine->QtyReceived == 0){//There is
 						$_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = $LocalCurrencyPrice;
 					}
 				}
@@ -612,7 +614,7 @@
 							$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
 							if ($_SESSION['QualityLogSamples']==1) {
 								CreateQASample($OrderLine->StockID,$Item->BundleRef, '', 'Created from Purchase Order', 0, 0,$db);
-							}	
+							}
 						}//non blank BundleRef
 					} //end foreach
 				}

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-30 10:31:08 UTC (rev 7283)
+++ trunk/doc/Change.log	2015-05-01 02:42:51 UTC (rev 7284)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+30/04/15 TurboPT: Add Delivery Date in GoodsReceived.php output. Forum feature request by giusba71. 
 30/04/15 Exson: Fixed the notice noise in SupplierCredit.php and SupplierInvoice.php.
 30/04/15 Exson: Fixed the properties initial bug and tidy code up by fix typo.
 26/04/15 Exson: Add adjustment reason to the mail text and fixed the notice noise in StockAdjustments.php.