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

[<afc...@us...>]

Revision: 7856
          http://sourceforge.net/p/web-erp/reponame/7856
Author:   afcouling
Date:     2017-10-15 23:16:12 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php

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

Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php	2017-10-15 22:27:58 UTC (rev 7855)
+++ trunk/PcAssignCashToTab.php	2017-10-15 23:16:12 UTC (rev 7856)
@@ -262,7 +262,7 @@
 				$AuthorisedDate = ConvertSQLDate($MyRow['authorized']);
 			}
 			
-			if (($MyRow['authorized'] == '0000-00-00') and ($Description['0'] == 'ASSIGNCASH')) {
+			if (($MyRow['authorized'] == '0000-00-00') and ($ExpenseCodeDes == 'ASSIGNCASH')) {
 				// only cash assignations NOT authorized can be modified or deleted
 				echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
 					<td>', $ExpenseCodeDes, '</td>
@@ -271,7 +271,7 @@
 					<td>', $MyRow['receipt'], '</td>
 					<td>', $AuthorisedDate, '</td>
 					<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&amp;SelectedTabs=', $SelectedTabs, '&amp;Days=', $Days, '&amp;edit=yes">', _('Edit'), '</a></td>
-					<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&amp;SelectedTabs=', $SelectedTabs, '&amp;Days=', $Days, '&amp;delete=yes" onclick="return confirm(\'', _('Are you sure you wish to delete this code and the expense it may have set up?'), '\', \'Confirm Delete\', this);">', _('Delete'), '</a></td>
+					<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&amp;SelectedTabs=', $SelectedTabs, '&amp;Days=', $Days, '&amp;delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this assigned cash?') . '");\'>' . _('Delete') . '</a></td>
 				</tr>';
 			} else {
 				echo '<td>', ConvertSQLDate($MyRow['date']), '</td>

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2017-10-15 22:27:58 UTC (rev 7855)
+++ trunk/doc/Change.log	2017-10-15 23:16:12 UTC (rev 7856)
@@ -1,4 +1,5 @@
 webERP Change Log
+15/10/17 Andy Couling: Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
 15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
 15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
 15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.