Thread: [Weberp-svn] SF.net SVN: weberp:[4171] trunk/GLJournal.php
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
weberp-svn
|
From: <tim...@us...> - 2011-01-09 09:57:50
|
Revision: 4171
http://weberp.svn.sourceforge.net/weberp/?rev=4171&view=rev
Author: tim_schofield
Date: 2011-01-09 09:57:44 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Correct the quotes in the sql literals
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2011-01-09 09:57:34 UTC (rev 4170)
+++ trunk/GLJournal.php 2011-01-09 09:57:44 UTC (rev 4171)
@@ -203,7 +203,7 @@
if (!isset($_POST['GLAmount'])) {
$_POST['GLAmount']=0;
}
- $SQL = 'SELECT accountname FROM chartmaster WHERE accountcode=' . $_POST['GLCode'];
+ $SQL = "SELECT accountname FROM chartmaster WHERE accountcode='" . $_POST['GLCode'] . "'";
$Result=DB_query($SQL,$db);
$myrow=DB_fetch_array($Result);
$_SESSION['JournalDetail']->add_to_glanalysis($_POST['GLAmount'], $_POST['GLNarrative'], $_POST['GLCode'], $myrow['accountname'], $_POST['tag']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-28 13:12:51
|
Revision: 4961
http://weberp.svn.sourceforge.net/weberp/?rev=4961&view=rev
Author: tim_schofield
Date: 2011-03-28 13:12:45 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
Fix typos in htmlentities function calls
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2011-03-27 20:50:24 UTC (rev 4960)
+++ trunk/GLJournal.php 2011-03-28 13:12:45 UTC (rev 4961)
@@ -319,9 +319,9 @@
echo '<option value="">' . _('Select a general ledger account code') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['accountcode']){
- echo '<option selected value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8'))."</option>";
+ echo '<option selected value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8')."</option>";
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8'))."</option>";
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8')."</option>";
}
}
echo '</select></td>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-04-04 21:28:45
|
Revision: 5088
http://weberp.svn.sourceforge.net/weberp/?rev=5088&view=rev
Author: tim_schofield
Date: 2011-04-04 21:28:39 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
Phil: SQL fixing quotes - not many, fixing gettext a few strings
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2011-04-04 20:39:29 UTC (rev 5087)
+++ trunk/GLJournal.php 2011-04-04 21:28:39 UTC (rev 5088)
@@ -1,11 +1,9 @@
<?php
/* $Id$*/
-/* $Revision: 1.27 $ */
include('includes/DefineJournalClass.php');
-//$PageSecurity = 10;
include('includes/session.inc');
$title = _('Journal Entry');
@@ -68,15 +66,15 @@
account,
narrative,
amount,
- tag) ";
- $SQL= $SQL . "VALUES (0,
- '" . $TransNo . "',
- '" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "',
- '" . $PeriodNo . "',
- '" . $JournalItem->GLCode . "',
- '" . $JournalItem->Narrative . "',
- '" . $JournalItem->Amount . "',
- '" . $JournalItem->tag."'
+ tag)
+ VALUES (0,
+ '" . $TransNo . "',
+ '" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "',
+ '" . $PeriodNo . "',
+ '" . $JournalItem->GLCode . "',
+ '" . $JournalItem->Narrative . "',
+ '" . $JournalItem->Amount . "',
+ '" . $JournalItem->tag."'
)";
$ErrMsg = _('Cannot insert a GL entry for the journal line because');
$DbgMsg = _('The SQL that failed to insert the GL Trans record was');
@@ -90,15 +88,15 @@
account,
narrative,
amount,
- tag) ";
- $SQL= $SQL . "VALUES (0,
- '" . $TransNo . "',
- '" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "',
- '" . ($PeriodNo + 1) . "',
- '" . $JournalItem->GLCode . "',
- 'Reversal - " . $JournalItem->Narrative . "',
- '" . -($JournalItem->Amount) ."',
- '".$JournalItem->tag."'
+ tag)
+ VALUES (0,
+ '" . $TransNo . "',
+ '" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "',
+ '" . ($PeriodNo + 1) . "',
+ '" . $JournalItem->GLCode . "',
+ 'Reversal - " . $JournalItem->Narrative . "',
+ '" . -($JournalItem->Amount) ."',
+ '".$JournalItem->tag."'
)";
$ErrMsg =_('Cannot insert a GL entry for the reversing journal because');
@@ -108,7 +106,6 @@
}
}
-
$ErrMsg = _('Cannot commit the changes');
$result= DB_Txn_Begin($db);
@@ -120,7 +117,7 @@
unset($_SESSION['JournalDetail']);
/*Set up a newy in case user wishes to enter another */
- echo "<br /><a href='" . $_SERVER['PHP_SELF'] . '?' . SID . "&NewJournal=Yes'>"._('Enter Another General Ledger Journal').'</a>';
+ echo '<br /><a href="' . $_SERVER['PHP_SELF'] . '?NewJournal=Yes">'._('Enter Another General Ledger Journal').'</a>';
/*And post the journal too */
include ('includes/GLPostings.inc');
include ('includes/footer.inc');
@@ -132,21 +129,17 @@
$_SESSION['JournalDetail']->Remove_GLEntry($_GET['Delete']);
} elseif (isset($_POST['Process']) and $_POST['Process']==_('Accept')){ //user hit submit a new GL Analysis line into the journal
- if($_POST['GLCode']!='')
- {
+ if($_POST['GLCode']!='') {
$extract = explode(' - ',$_POST['GLCode']);
$_POST['GLCode'] = $extract[0];
}
- if($_POST['Debit']>0)
- {
+ if($_POST['Debit']>0) {
$_POST['GLAmount'] = $_POST['Debit'];
- }
- elseif($_POST['Credit']>0)
- {
+ } elseif($_POST['Credit']>0) {
$_POST['GLAmount'] = '-' . $_POST['Credit'];
}
if ($_POST['GLManualCode'] != '' AND is_numeric($_POST['GLManualCode'])){
- // If a manual code was entered need to check it exists and isnt a bank account
+ // If a manual code was entered need to check it exists and isnt a bank account
$AllowThisPosting = true; //by default
if ($_SESSION['ProhibitJournalsToControlAccounts'] == 1){
if ($_SESSION['CompanyRecord']['gllink_debtors'] == '1' AND $_POST['GLManualCode'] == $_SESSION['CompanyRecord']['debtorsact']){
@@ -228,18 +221,9 @@
unset($_POST['GLManualCode']);
}
-// set up the form whatever
-/*
-if (!isset($_SESSION['JournalDetail']->JnlDate)){
- $_POST['JournalProcessDate']= Date($_SESSION['DefaultDateFormat']);
- $_SESSION['JournalDetail']->JnlDate = $_POST['JournalProcessDate'];
-}
-*/
-
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method="post" name="form">';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" 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
@@ -287,8 +271,8 @@
$SQL = "SELECT tagref,
tagdescription
- FROM tags
- ORDER BY tagref";
+ FROM tags
+ ORDER BY tagref";
$result=DB_query($SQL,$db);
echo '<option value="0">0 - None</option>';
@@ -336,15 +320,14 @@
$_POST['Debit'] = '';
}
-
echo '</tr><tr><th>' . _('Debit') . "</th>".'<td><input type="text" class="number" Name = "Debit" ' .
'onChange="eitherOr(this, '.'Credit'.')"'.
' Maxlength="12" size="10" value="' . $_POST['Debit'] . '" /></td>';
-echo '</tr><tr><th>' . _('Credit') . "</th>".'<td><input type="text" class="number" Name = "Credit" ' .
+echo '</tr><tr><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></th><th>' . _('GL Narrative') . '</th>';
echo '<td><input type="text" name="GLNarrative" maxlength="100" size="100" value="' . $_POST['GLNarrative'] . '" /></td>';
@@ -397,22 +380,22 @@
}
echo '<td>' . $JournalItem->Narrative . "</td>
- <td><a href='" . $_SERVER['PHP_SELF'] . '?' . SID . '&Delete=' . $JournalItem->ID . "'>"._('Delete').'</a></td>
+ <td><a href='" . $_SERVER['PHP_SELF'] . '?Delete=' . $JournalItem->ID . "'>"._('Delete').'</a></td>
</tr>';
}
echo '<tr class="EvenTableRows"><td></td>
- <td class="number"><b> Total </b></td>
+ <td class="number"><b>' . _('Total') . '</b></td>
<td class="number"><b>' . number_format($debittotal,2) . '</b></td>
<td class="number"><b>' . number_format($credittotal,2) . '</b></td></tr>';
if ($debittotal!=$credittotal) {
- echo '<td align="center" style="background-color: #fddbdb"><b>Required to balance - </b>' .
+ echo '<td align="center" style="background-color: #fddbdb"><b>' . _('Required to balance') .' - </b>' .
number_format(abs($debittotal-$credittotal),2);
}
if ($debittotal>$credittotal) {
- echo ' Credit</td></tr>';
+ echo ' ' . _('Credit') . '</td></tr>';
} else if ($debittotal<$credittotal) {
- echo ' Debit</td></tr>';
+ echo ' ' . _('Debit') . '</td></tr>';
}
echo '</table>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-04-24 09:50:55
|
Revision: 5226
http://weberp.svn.sourceforge.net/weberp/?rev=5226&view=rev
Author: tim_schofield
Date: 2011-04-24 09:50:49 +0000 (Sun, 24 Apr 2011)
Log Message:
-----------
XHTML and quoting changes
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2011-04-24 09:46:44 UTC (rev 5225)
+++ trunk/GLJournal.php 2011-04-24 09:50:49 UTC (rev 5226)
@@ -335,7 +335,7 @@
echo '<div class="centre"><input type="submit" name="Process" value="' . _('Accept') . '" /></div><br /><br />';
-echo '<table class="selection" width='85%'>';
+echo '<table class="selection" width="85%">';
echo '<tr><th colspan="6"><div class="centre"><font size="3" color="blue"><b>' . _('Journal Summary') . '</b></font></div></th></tr>';
echo '<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-04-24 11:25:09
|
Revision: 5227
http://weberp.svn.sourceforge.net/weberp/?rev=5227&view=rev
Author: tim_schofield
Date: 2011-04-24 11:25:02 +0000 (Sun, 24 Apr 2011)
Log Message:
-----------
XHTML and quoting changes
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2011-04-24 09:50:49 UTC (rev 5226)
+++ trunk/GLJournal.php 2011-04-24 11:25:02 UTC (rev 5227)
@@ -234,18 +234,18 @@
}
echo '<table><tr>
- <td colspan="5"><table class="selection"><tr><td>'._('Date to Process Journal').":</td>
- <td><input type='text' class='date' alt='".$_SESSION['DefaultDateFormat']."' name='JournalProcessDate' maxlength='10' size='11' value='" .
- $_SESSION['JournalDetail']->JnlDate . "' /></td>";
+ <td colspan="5"><table class="selection"><tr><td>'._('Date to Process Journal').':</td>
+ <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="JournalProcessDate" maxlength="10" size="11" value="' .
+ $_SESSION['JournalDetail']->JnlDate . '" /></td>';
echo '<td>' . _('Type') . ':</td>
<td><select name="JournalType">';
if ($_POST['JournalType'] == 'Reversing'){
- echo "<option selected='True' value = 'Reversing'>" . _('Reversing')."</option>";
- echo "<option value = 'Normal'>" . _('Normal')."</option>";
+ echo '<option selected="True" value = "Reversing">' . _('Reversing').'</option>';
+ echo '<option value = "Normal">' . _('Normal').'</option>';
} else {
- echo "<option value = 'Reversing'>" . _('Reversing')."</option>";
- echo "<option selected='True' value = 'Normal'>" . _('Normal')."</option>";
+ echo '<option value = "Reversing">' . _('Reversing').'</option>';
+ echo '<option selected="True" value = "Normal">' . _('Normal').'</option>';
}
echo '</select></td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-20 19:15:06
|
Revision: 6808
http://weberp.svn.sourceforge.net/weberp/?rev=6808&view=rev
Author: tim_schofield
Date: 2011-07-20 19:15:00 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2011-07-20 19:14:44 UTC (rev 6807)
+++ trunk/GLJournal.php 2011-07-20 19:15:00 UTC (rev 6808)
@@ -289,7 +289,7 @@
if (!isset($_POST['GLManualCode'])) {
$_POST['GLManualCode']='';
}
-echo '<td><input class="number" type="text" Name="GLManualCode" Maxlength="12" size="12" onChange="inArray(this.value, GLCode.options,'.
+echo '<td><input class="number" type="text" name="GLManualCode" Maxlength="12" size="12" onChange="inArray(this.value, GLCode.options,'.
"'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')"' .
' value="'. $_POST['GLManualCode'] .'" /></td>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-07-26 13:58:30
|
Revision: 6960
http://weberp.svn.sourceforge.net/weberp/?rev=6960&view=rev
Author: tim_schofield
Date: 2011-07-26 13:58:24 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2011-07-26 13:58:14 UTC (rev 6959)
+++ trunk/GLJournal.php 2011-07-26 13:58:24 UTC (rev 6960)
@@ -278,7 +278,7 @@
echo '<option value="0">0 - None</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
- echo '<option selected value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription']."</option>";
+ echo '<option selected="True" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription']."</option>";
} else {
echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription']."</option>";
}
@@ -303,7 +303,7 @@
echo '<option value="">' . _('Select a general ledger account code') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['accountcode']){
- echo '<option selected value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8')."</option>";
+ echo '<option selected="True" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8')."</option>";
} else {
echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8')."</option>";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-08-17 10:52:50
|
Revision: 7784
http://weberp.svn.sourceforge.net/weberp/?rev=7784&view=rev
Author: tim_schofield
Date: 2011-08-17 10:52:44 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
XHTML corrections to code
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2011-08-17 10:52:32 UTC (rev 7783)
+++ trunk/GLJournal.php 2011-08-17 10:52:44 UTC (rev 7784)
@@ -237,8 +237,7 @@
echo '<table><tr>
<td colspan="5"><table class="selection"><tr><td>'._('Date to Process Journal').':</td>
- <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="JournalProcessDate" maxlength="10" size="11" value="' .
- $_SESSION['JournalDetail']->JnlDate . '" /></td>';
+ <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="JournalProcessDate" maxlength="10" size="11" value="' . $_SESSION['JournalDetail']->JnlDate . '" /></td>';
echo '<td>' . _('Type') . ':</td>
<td><select name="JournalType">';
@@ -291,9 +290,7 @@
if (!isset($_POST['GLManualCode'])) {
$_POST['GLManualCode']='';
}
-echo '<td><input class="number" type="text" name="GLManualCode" Maxlength="12" size="12" onChange="inArray(this.value, GLCode.options,'.
- "'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')"' .
- ' value="'. $_POST['GLManualCode'] .'" /></td>';
+echo '<td><input class="number" type="text" name="GLManualCode" Maxlength="12" size="12" onChange="inArray(this.value, GLCode.options,'. "'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')"' . ' value="'. $_POST['GLManualCode'] .'" /></td>';
$sql="SELECT accountcode,
accountname
@@ -322,12 +319,12 @@
$_POST['Debit'] = '';
}
-echo '</tr><tr><th>' . _('Debit') . '</th><td><input type="text" class="number" Name = "Debit" ' .
- 'onChange="eitherOr(this, '.'Credit'.')"'.
- ' Maxlength="12" size="10" value="' . $_POST['Debit'] . '" /></td>';
-echo '</tr><tr><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>
+ <th>' . _('Debit') . '</th>
+ <td><input type="text" class="number" Name = "Debit" onChange="eitherOr(this, '.'Credit'.')" maxlength="12" size="10" value="' . $_POST['Debit'] . '" /></td>';
+echo '</tr><tr>
+ <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>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-28 10:50:09
|
Revision: 8482
http://weberp.svn.sourceforge.net/weberp/?rev=8482&view=rev
Author: tim_schofield
Date: 2012-01-28 10:50:03 +0000 (Sat, 28 Jan 2012)
Log Message:
-----------
Quoting corrections
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-01-28 10:49:50 UTC (rev 8481)
+++ trunk/GLJournal.php 2012-01-28 10:50:03 UTC (rev 8482)
@@ -241,7 +241,7 @@
echo '<td>' . _('Type') . ':</td>
<td><select name="JournalType">';
-if ($_POST['JournalType'] == 'Reversing'){
+if (isset($_POST['JournalType'] ) and $_POST['JournalType'] == 'Reversing'){
echo '<option selected="True" value = "Reversing">' . _('Reversing').'</option>';
echo '<option value = "Normal">' . _('Normal').'</option>';
} else {
@@ -279,9 +279,9 @@
echo '<option value="0">0 - None</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
- echo '<option selected="True" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription']."</option>";
+ echo '<option selected="True" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'].'</option>';
} else {
- echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription']."</option>";
+ echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'].'</option>';
}
}
echo '</select></td>';
@@ -302,9 +302,9 @@
echo '<option value="">' . _('Select a general ledger account code') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['accountcode']){
- echo '<option selected="True" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8')."</option>";
+ echo '<option selected="True" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8').'</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8')."</option>";
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'].' - ' .htmlentities($myrow['accountname'], ENT_QUOTES,'UTF-8').'</option>';
}
}
echo '</select></td>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-02-18 20:47:12
|
Revision: 8522
http://weberp.svn.sourceforge.net/weberp/?rev=8522&view=rev
Author: tim_schofield
Date: 2012-02-18 20:47:06 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
Correction to html remove extra <table tag
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-02-16 16:10:35 UTC (rev 8521)
+++ trunk/GLJournal.php 2012-02-18 20:47:06 UTC (rev 8522)
@@ -236,7 +236,7 @@
}
echo '<table><tr>
- <td colspan="5"><table class="selection"><tr><td>'._('Date to Process Journal').':</td>
+ <td colspan="5"><td>'._('Date to Process Journal').':</td>
<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="JournalProcessDate" maxlength="10" size="11" value="' . $_SESSION['JournalDetail']->JnlDate . '" /></td>';
echo '<td>' . _('Type') . ':</td>
<td><select name="JournalType">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-05-08 10:12:19
|
Revision: 8831
http://weberp.svn.sourceforge.net/weberp/?rev=8831&view=rev
Author: tim_schofield
Date: 2012-05-08 10:12:13 +0000 (Tue, 08 May 2012)
Log Message:
-----------
Layout improvements
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-05-08 10:12:02 UTC (rev 8830)
+++ trunk/GLJournal.php 2012-05-08 10:12:13 UTC (rev 8831)
@@ -235,9 +235,13 @@
$_SESSION['JournalDetail']->JnlDate = Date($_SESSION['DefaultDateFormat'],mktime(0,0,0,date('m'),0,date('Y')));
}
-echo '<table><tr>
- <td colspan="5"><td>'._('Date to Process Journal').':</td>
- <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="JournalProcessDate" maxlength="10" size="11" value="' . $_SESSION['JournalDetail']->JnlDate . '" /></td>';
+echo '<table class="selection">
+ <tr>
+ <th colspan="5" class="header">' . _('Journal Header') . '</th>
+ </tr>
+ <tr>
+ <td></td><td>'._('Date to Process Journal').':</td>
+ <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="JournalProcessDate" maxlength="10" size="11" value="' . $_SESSION['JournalDetail']->JnlDate . '" /></td>';
echo '<td>' . _('Type') . ':</td>
<td><select name="JournalType">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-06-29 21:36:39
|
Revision: 9280
http://weberp.svn.sourceforge.net/weberp/?rev=9280&view=rev
Author: tim_schofield
Date: 2012-06-29 21:36:33 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Provide event handler for new Ajax functionality
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-06-29 21:36:23 UTC (rev 9279)
+++ trunk/GLJournal.php 2012-06-29 21:36:33 UTC (rev 9280)
@@ -223,7 +223,7 @@
unset($_POST['GLManualCode']);
}
-echo '<form 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>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-08-07 21:05:38
|
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.
|
|
From: <tim...@us...> - 2012-08-07 22:23:07
|
Revision: 9482
http://weberp.svn.sourceforge.net/weberp/?rev=9482&view=rev
Author: tim_schofield
Date: 2012-08-07 22:23:01 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Use new link function and use new separate form to post the journal
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-08-07 22:22:49 UTC (rev 9481)
+++ trunk/GLJournal.php 2012-08-07 22:23:01 UTC (rev 9482)
@@ -14,7 +14,6 @@
unset($_SESSION['JournalDetail']->GLEntries);
unset($_SESSION['JournalDetail']);
}
-
if (!isset($_SESSION['JournalDetail'])){
$_SESSION['JournalDetail'] = new Journal;
@@ -44,7 +43,7 @@
$_SESSION['JournalDetail']->JournalType = $_POST['JournalType'];
}
-if (isset($_POST['CommitBatch'])){
+if (isset($_POST['CommitBatch']) and $_POST['CommitBatch']=='CommitBatch'){
/* once the GL analysis of the journal is entered
process all the data in the session cookie into the DB
@@ -80,7 +79,7 @@
$DbgMsg = _('The SQL that failed to insert the GL Trans record was');
$result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
- if ($_POST['JournalType']=='Reversing'){
+ if ($_SESSION['JournalDetail']->JournalType=='Reversing'){
$SQL = "INSERT INTO gltrans (type,
typeno,
trandate,
@@ -111,7 +110,8 @@
prnMsg(_('Journal').' ' . $TransNo . ' '._('has been successfully entered'),'success');
- echo '<br /><div class="centre"><a href="PDFGLJournal.php?JournalNo='.$TransNo.'">'._('Print this Journal').'</a>';
+ echo '<br /><div class="centre">';
+ echo InternalLink('', 'PDFGLJournal.php?JournalNo='.$TransNo, _('Print this Journal'));
unset($_POST['JournalProcessDate']);
unset($_POST['JournalType']);
@@ -119,7 +119,7 @@
unset($_SESSION['JournalDetail']);
/*Set up a newy in case user wishes to enter another */
- echo '<br /><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?NewJournal=Yes">'._('Enter Another General Ledger Journal').'</a></div>';
+ echo '<br />' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?NewJournal=Yes', _('Enter Another General Ledger Journal')).'</div>';
/*And post the journal too */
include ('includes/GLPostings.inc');
include ('includes/footer.inc');
@@ -339,6 +339,7 @@
echo '</tr></table>'; /*Close the main table */
echo '<div class="centre"><button type="submit" name="Process">' . _('Accept') . '</button></div>';
+echo '</form>';
echo '<table class="selection" width="85%">';
@@ -406,19 +407,20 @@
}
echo '</table>';
+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'] . '" />';
+
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>';
+ echo '<br /><br /><div class="centre"><button type="submit" name="CommitBatch" value="CommitBatch">'._('Accept and Process Journal').'</button></div>';
} elseif(count($_SESSION['JournalDetail']->GLEntries)>0) {
echo '';
prnMsg(_('The journal must balance ie debits equal to credits before it can be processed'),'warn');
}
-
+echo '</form>';
if (!isset($_GET['NewJournal']) or $_GET['NewJournal']=='') {
echo '<script>defaultControl(document.form.GLManualCode);</script>';
} else {
echo '<script>defaultControl(document.form.JournalProcessDate);</script>';
}
-
-echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-08-07 22:58:04
|
Revision: 9485
http://weberp.svn.sourceforge.net/weberp/?rev=9485&view=rev
Author: tim_schofield
Date: 2012-08-07 22:57:58 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Show correct hints on images
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-08-07 22:57:46 UTC (rev 9484)
+++ trunk/GLJournal.php 2012-08-07 22:57:58 UTC (rev 9485)
@@ -236,7 +236,7 @@
echo '<br />';
echo '<table class="selection">
<tr>
- <th colspan="5" class="header"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Journal Header') . '</th>
+ <th colspan="5" class="header"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Journal Header') . '" alt="" />' . _('Journal Header') . '</th>
</tr>
<tr>
<td></td><td>'._('Date to Process Journal').':</td>
@@ -262,7 +262,7 @@
echo '<tr>
<th colspan="3" class="header">
- <img src="'.$rootpath.'/css/'.$theme.'/images/journal.png" title="' . _('Search') . '" alt="" />' . _('Journal Line Entry') . '
+ <img src="'.$rootpath.'/css/'.$theme.'/images/journal.png" title="' . _('Journal Line Entry') . '" alt="" />' . _('Journal Line Entry') . '
</th>
</tr>';
@@ -344,7 +344,7 @@
echo '<table class="selection" width="85%">';
echo '<tr>
- <th colspan="6" class="header"><img src="'.$rootpath.'/css/'.$theme.'/images/summary.png" title="' . _('Search') . '" alt="" />' . _('Journal Summary') . '</th>
+ <th colspan="6" class="header"><img src="'.$rootpath.'/css/'.$theme.'/images/summary.png" title="' . _('Journal Summary') . '" alt="" />' . _('Journal Summary') . '</th>
</tr>';
echo '<tr>
<th>'._('GL Tag').'</th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-09-06 09:17:34
|
Revision: 9587
http://weberp.svn.sourceforge.net/weberp/?rev=9587&view=rev
Author: tim_schofield
Date: 2012-09-06 09:17:23 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Improvements for new layout
Modified Paths:
--------------
trunk/GLJournal.php
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-09-06 09:17:13 UTC (rev 9586)
+++ trunk/GLJournal.php 2012-09-06 09:17:23 UTC (rev 9587)
@@ -233,7 +233,6 @@
$_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"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Journal Header') . '" alt="" />' . _('Journal Header') . '</th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X