[Web-erp-svn] SF.net SVN: web-erp:[7278] trunk/StockAdjustments.php

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

Revision: 7278
          http://sourceforge.net/p/web-erp/reponame/7278
Author:   exsonqu
Date:     2015-04-26 02:56:08 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------
26/04/15 Exson: Add adjustment reason to the mail text and fixed the notice noise in StockAdjustments.php.

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

Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php	2015-04-26 02:44:26 UTC (rev 7277)
+++ trunk/StockAdjustments.php	2015-04-26 02:56:08 UTC (rev 7278)
@@ -367,8 +367,8 @@
 		EnsureGLEntriesBalance(17, $AdjustmentNumber,$db);
 
 		$Result = DB_Txn_Commit();
-
-		$ConfirmationText = _('A stock adjustment for'). ' ' . $_SESSION['Adjustment' . $identifier]->StockID . ' -  ' . $_SESSION['Adjustment' . $identifier]->ItemDescription . ' '._('has been created from location').' ' . $_SESSION['Adjustment' . $identifier]->StockLocation .' '. _('for a quantity of') . ' ' . locale_number_format($_SESSION['Adjustment' . $identifier]->Quantity,$_SESSION['Adjustment' . $identifier]->DecimalPlaces) ;
+		$AdjustReason = $_SESSION['Adjustment' . $identifier]->Narrative?  _('Narrative') . ' ' . $_SESSION['Adjustment' . $identifier]->Narrative:'';
+		$ConfirmationText = _('A stock adjustment for'). ' ' . $_SESSION['Adjustment' . $identifier]->StockID . ' -  ' . $_SESSION['Adjustment' . $identifier]->ItemDescription . ' '._('has been created from location').' ' . $_SESSION['Adjustment' . $identifier]->StockLocation .' '. _('for a quantity of') . ' ' . locale_number_format($_SESSION['Adjustment' . $identifier]->Quantity,$_SESSION['Adjustment' . $identifier]->DecimalPlaces) . ' ' . $AdjustReason;
 		prnMsg( $ConfirmationText,'success');
 
 		if ($_SESSION['InventoryManagerEmail']!=''){
@@ -454,7 +454,7 @@
 echo '<tr><td>'. _('Adjustment to Stock At Location').':</td>
 		<td><select name="StockLocation" onchange="submit();"> ';
 foreach ($LocationList as $Loccode=>$Locationname){
-	if ($Loccode == $_SESSION['Adjustment' . $identifier]->StockLocation){
+	if (isset($_SESSION['Adjustment'.$identifier]->StockLocation) AND $Loccode == $_SESSION['Adjustment' . $identifier]->StockLocation){
 		 echo '<option selected="selected" value="' . $Loccode . '">' . $Locationname . '</option>';
 	} else {
 		 echo '<option value="' . $Loccode . '">' . $Locationname . '</option>';
@@ -536,4 +536,4 @@
       </div>
       </form>';
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>