[Weberp-svn] SF.net SVN: weberp:[9479] trunk/GLJournal.php

[<tim...@us...>]

Revision: 9479
          http://weberp.svn.sourceforge.net/weberp/?rev=9479&view=rev
Author:   tim_schofield
Date:     2012-08-07 21:05:31 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Updates for new interface

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

Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php	2012-08-07 13:56:25 UTC (rev 9478)
+++ trunk/GLJournal.php	2012-08-07 21:05:31 UTC (rev 9479)
@@ -223,11 +223,9 @@
 	unset($_POST['GLManualCode']);
 }
 
-echo '<form onsubmit="return SubmitForm(this)" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" name="form">';
+echo '<form onsubmit="return SubmitForm(this, \'\')" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" name="form">';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
-
 // A new table in the first column of the main table
 
 if (!Is_Date($_SESSION['JournalDetail']->JnlDate)){
@@ -235,9 +233,10 @@
 	$_SESSION['JournalDetail']->JnlDate = Date($_SESSION['DefaultDateFormat'],mktime(0,0,0,date('m'),0,date('Y')));
 }
 
+echo '<br />';
 echo '<table class="selection">
 		<tr>
-			<th colspan="5" class="header">' . _('Journal Header') . '</th>
+			<th colspan="5" class="header"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Journal Header') . '</th>
 		</tr>
 		<tr>
 			<td></td><td>'._('Date to Process Journal').':</td>
@@ -258,11 +257,14 @@
 	</table>';
 /* close off the table in the first column  */
 
-echo '<br />';
 echo '<table class="selection" width="70%">';
 /* Set upthe form for the transaction entry for a GL Payment Analysis item */
 
-echo '<tr><th colspan="3" class="header">' . _('Journal Line Entry') . '</th></tr>';
+echo '<tr>
+		<th colspan="3" class="header">
+			<img src="'.$rootpath.'/css/'.$theme.'/images/journal.png" title="' . _('Search') . '" alt="" />' . _('Journal Line Entry') . '
+		</th>
+	</tr>';
 
 /*now set up a GLCode field to select from avaialble GL accounts */
 echo '<tr><th>' . _('GL Tag') . '</th>';
@@ -330,18 +332,20 @@
 			<th>' . _('Credit') . '</th>
 			<td><input type="text" class="number" Name = "Credit" onChange="eitherOr(this, '.'Debit'.')"  maxlength="12" size="10" value="' . $_POST['Credit'] . '" /></td>';
 echo '</tr><tr><td></td><td></td><th>'. _('Narrative'). '</th>';
-echo '</tr><tr><th></th><th>' . _('GL Narrative') . '</th>';
+echo '</tr><tr><th colspan="2">' . _('GL Narrative') . '</th>';
 
 echo '<td><input type="text" name="GLNarrative" maxlength="100" size="100" value="' . $_POST['GLNarrative'] . '" /></td>';
 
-echo '</tr></table><br />'; /*Close the main table */
-echo '<div class="centre"><button type="submit" name="Process">' . _('Accept') . '</button></div><br /><br />';
+echo '</tr></table>'; /*Close the main table */
+echo '<div class="centre"><button type="submit" name="Process">' . _('Accept') . '</button></div>';
 
 
 echo '<table class="selection" width="85%">';
 
-echo '<tr><th colspan="6" class="header">' . _('Journal Summary') . '</th></tr>';
 echo '<tr>
+		<th colspan="6" class="header"><img src="'.$rootpath.'/css/'.$theme.'/images/summary.png" title="' . _('Search') . '" alt="" />' . _('Journal Summary') . '</th>
+	</tr>';
+echo '<tr>
 		<th>'._('GL Tag').'</th>
 		<th>'._('GL Account').'</th>
 		<th>'._('Debit').'</th>
@@ -405,7 +409,7 @@
 if (ABS($_SESSION['JournalDetail']->JournalTotal)<0.001 AND $_SESSION['JournalDetail']->GLItemCounter > 0){
 	echo '<br /><br /><div class="centre"><button type="submit" name="CommitBatch">'._('Accept and Process Journal').'</button></div>';
 } elseif(count($_SESSION['JournalDetail']->GLEntries)>0) {
-	echo '<br /><br />';
+	echo '';
 	prnMsg(_('The journal must balance ie debits equal to credits before it can be processed'),'warn');
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.