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

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

Revision: 7857
          http://sourceforge.net/p/web-erp/reponame/7857
Author:   afcouling
Date:     2017-10-15 23:18:52 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
New Expenses/Update Expense table header in PcClaimExpensesFromTab.php

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

Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php	2017-10-15 23:16:12 UTC (rev 7856)
+++ trunk/PcClaimExpensesFromTab.php	2017-10-15 23:18:52 UTC (rev 7857)
@@ -330,7 +330,7 @@
 							<td>', $MyRow['receipt'], '</td>
 							<td>', $AuthorisedDate, '</td>
 							<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&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 expenses it may have set up?') . '");\'>' . _('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 expense?') . '");\'>' . _('Delete') . '</a></td>
 						</tr>';
 				} else {
 					echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
@@ -392,16 +392,25 @@
 		if (!isset($_POST['Date'])) {
 			$_POST['Date'] = Date($_SESSION['DefaultDateFormat']);
 		}
-		echo '<table class="selection">
-				<tr>
-					<td>', _('Date of Expense'), ':</td>
-					<td>
-						<input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="Date" size="10" required="required" maxlength="10" value="', $_POST['Date'], '" />
-					</td>
-				</tr>
-				<tr>
-					<td>', _('Code of Expense'), ':</td>
-					<td>
+		echo '<table class="selection">';
+		if (isset($_GET['SelectedIndex'])) {
+			echo '<tr>
+					<th colspan="2"><h3>', _('Update Expense'), '</h3></th>
+				</tr>';
+		} else {
+			echo '<tr>
+					<th colspan="2"><h3>', _('New Expense'), '</h3></th>
+				</tr>';
+		}
+		echo '<tr>
+				<td>', _('Date of Expense'), ':</td>
+				<td>
+					<input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="Date" size="10" required="required" maxlength="10" value="', $_POST['Date'], '" />
+				</td>
+			</tr>
+			<tr>
+				<td>', _('Code of Expense'), ':</td>
+				<td>
 						<select required="required" name="SelectedExpense">';
 		DB_free_result($Result);
 		$SQL = "SELECT pcexpenses.codeexpense,

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2017-10-15 23:16:12 UTC (rev 7856)
+++ trunk/doc/Change.log	2017-10-15 23:18:52 UTC (rev 7857)
@@ -1,4 +1,5 @@
 webERP Change Log
+15/10/17 Andy Couling: New Expenses/Update Expense table header in PcClaimExpensesFromTab.php
 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.