Menu
▾
▴
web-erp-svn
|
From: <tim...@us...> - 2012-01-19 11:58:14
|
Revision: 4811
http://web-erp.svn.sourceforge.net/web-erp/?rev=4811&view=rev
Author: tim_schofield
Date: 2012-01-19 11:58:08 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/TaxGroups.php
Modified: trunk/TaxGroups.php
===================================================================
--- trunk/TaxGroups.php 2012-01-19 10:56:55 UTC (rev 4810)
+++ trunk/TaxGroups.php 2012-01-19 11:58:08 UTC (rev 4811)
@@ -38,14 +38,14 @@
$SuccessMsg = _('The tax group description was updated to') . ' ' . $_POST['GroupName'];
} else { // Add new tax group
- $result = DB_query("SELECT taxgroupid
- FROM taxgroups
+ $result = DB_query("SELECT taxgroupid
+ FROM taxgroups
WHERE taxgroupdescription='" . $_POST['GroupName'] . "'",$db);
if (DB_num_rows($result)==1){
prnMsg( _('A new tax group could not be added because a tax group already exists for') . ' ' . $_POST['GroupName'],'warn');
unset($sql);
} else {
- $sql = "INSERT INTO taxgroups (taxgroupdescription)
+ $sql = "INSERT INTO taxgroups (taxgroupdescription)
VALUES ('". $_POST['GroupName'] . "')";
$ErrMsg = _('The addition of the group failed because');
$SuccessMsg = _('Added the new tax group') . ' ' . $_POST['GroupName'];
@@ -115,8 +115,8 @@
$myrow=DB_fetch_array($Result);
if ($myrow['taxontax']==1){
prnMsg(_('It is inappropriate to set tax on tax where the tax is the first in the calculation order. The system has changed it back to no tax on tax for this tax authority'),'warning');
- $Result = DB_query("UPDATE taxgrouptaxes SET taxontax=0
- WHERE taxgroupid='" . $SelectedGroup . "'
+ $Result = DB_query("UPDATE taxgrouptaxes SET taxontax=0
+ WHERE taxgroupid='" . $SelectedGroup . "'
AND taxauthid='" . $myrow['taxauthid'] . "'",$db);
}
}
@@ -131,7 +131,7 @@
prnMsg( _('Cannot delete this tax group because some customer branches are setup using it'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer branches referring to this tax group');
} else {
- $sql= "SELECT COUNT(*) FROM suppliers
+ $sql= "SELECT COUNT(*) FROM suppliers
WHERE taxgroupid='" . $_GET['SelectedGroup'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -140,10 +140,10 @@
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('suppliers referring to this tax group');
} else {
- $sql="DELETE FROM taxgrouptaxes
+ $sql="DELETE FROM taxgrouptaxes
WHERE taxgroupid='" . $_GET['SelectedGroup'] . "'";
$result = DB_query($sql,$db);
- $sql="DELETE FROM taxgroups
+ $sql="DELETE FROM taxgroups
WHERE taxgroupid='" . $_GET['SelectedGroup'] . "'";
$result = DB_query($sql,$db);
prnMsg( $_GET['GroupID'] . ' ' . _('tax group has been deleted') . '!','success');
@@ -236,7 +236,7 @@
$_POST['GroupName']='';
}
echo '<tr><td>' . _('Tax Group') . ':</td>
- <td><input type="text" name="GroupName" size=40 maxlength=40 value="' . $_POST['GroupName'] . '" /></td>';
+ <td><input type="text" name="GroupName" size="40" maxlength="40" value="' . $_POST['GroupName'] . '" /></td>';
echo '<td><input type="submit" name="submit" value="' . _('Enter Group') . '"></td>
</tr>
</form>';
@@ -276,10 +276,10 @@
if (count($TaxAuthsUsed)>0) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <input type=hidden name="SelectedGroup" value="' . $SelectedGroup .'" />';
+ <input type="hidden" name="SelectedGroup" value="' . $SelectedGroup .'" />';
echo '<table class="selection">
<tr>
- <th colspan=3><font size="3" color="navy">'._('Calculation Order').'</font></th>
+ <th colspan="3"><font size="3" color="navy">'._('Calculation Order').'</font></th>
</tr>
<tr>
<th>'._('Tax Authority').'</th>
@@ -343,7 +343,7 @@
} else {
echo '<br />
- <div class="centre">' .
+ <div class="centre">' .
_('There are no tax authorities defined to allocate to this tax group').'
</div>';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 11:58:19
|
Revision: 4811
http://web-erp.svn.sourceforge.net/web-erp/?rev=4811&view=rev
Author: tim_schofield
Date: 2012-01-19 11:58:08 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/TaxGroups.php
Modified: trunk/TaxGroups.php
===================================================================
--- trunk/TaxGroups.php 2012-01-19 10:56:55 UTC (rev 4810)
+++ trunk/TaxGroups.php 2012-01-19 11:58:08 UTC (rev 4811)
@@ -38,14 +38,14 @@
$SuccessMsg = _('The tax group description was updated to') . ' ' . $_POST['GroupName'];
} else { // Add new tax group
- $result = DB_query("SELECT taxgroupid
- FROM taxgroups
+ $result = DB_query("SELECT taxgroupid
+ FROM taxgroups
WHERE taxgroupdescription='" . $_POST['GroupName'] . "'",$db);
if (DB_num_rows($result)==1){
prnMsg( _('A new tax group could not be added because a tax group already exists for') . ' ' . $_POST['GroupName'],'warn');
unset($sql);
} else {
- $sql = "INSERT INTO taxgroups (taxgroupdescription)
+ $sql = "INSERT INTO taxgroups (taxgroupdescription)
VALUES ('". $_POST['GroupName'] . "')";
$ErrMsg = _('The addition of the group failed because');
$SuccessMsg = _('Added the new tax group') . ' ' . $_POST['GroupName'];
@@ -115,8 +115,8 @@
$myrow=DB_fetch_array($Result);
if ($myrow['taxontax']==1){
prnMsg(_('It is inappropriate to set tax on tax where the tax is the first in the calculation order. The system has changed it back to no tax on tax for this tax authority'),'warning');
- $Result = DB_query("UPDATE taxgrouptaxes SET taxontax=0
- WHERE taxgroupid='" . $SelectedGroup . "'
+ $Result = DB_query("UPDATE taxgrouptaxes SET taxontax=0
+ WHERE taxgroupid='" . $SelectedGroup . "'
AND taxauthid='" . $myrow['taxauthid'] . "'",$db);
}
}
@@ -131,7 +131,7 @@
prnMsg( _('Cannot delete this tax group because some customer branches are setup using it'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer branches referring to this tax group');
} else {
- $sql= "SELECT COUNT(*) FROM suppliers
+ $sql= "SELECT COUNT(*) FROM suppliers
WHERE taxgroupid='" . $_GET['SelectedGroup'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -140,10 +140,10 @@
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('suppliers referring to this tax group');
} else {
- $sql="DELETE FROM taxgrouptaxes
+ $sql="DELETE FROM taxgrouptaxes
WHERE taxgroupid='" . $_GET['SelectedGroup'] . "'";
$result = DB_query($sql,$db);
- $sql="DELETE FROM taxgroups
+ $sql="DELETE FROM taxgroups
WHERE taxgroupid='" . $_GET['SelectedGroup'] . "'";
$result = DB_query($sql,$db);
prnMsg( $_GET['GroupID'] . ' ' . _('tax group has been deleted') . '!','success');
@@ -236,7 +236,7 @@
$_POST['GroupName']='';
}
echo '<tr><td>' . _('Tax Group') . ':</td>
- <td><input type="text" name="GroupName" size=40 maxlength=40 value="' . $_POST['GroupName'] . '" /></td>';
+ <td><input type="text" name="GroupName" size="40" maxlength="40" value="' . $_POST['GroupName'] . '" /></td>';
echo '<td><input type="submit" name="submit" value="' . _('Enter Group') . '"></td>
</tr>
</form>';
@@ -276,10 +276,10 @@
if (count($TaxAuthsUsed)>0) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <input type=hidden name="SelectedGroup" value="' . $SelectedGroup .'" />';
+ <input type="hidden" name="SelectedGroup" value="' . $SelectedGroup .'" />';
echo '<table class="selection">
<tr>
- <th colspan=3><font size="3" color="navy">'._('Calculation Order').'</font></th>
+ <th colspan="3"><font size="3" color="navy">'._('Calculation Order').'</font></th>
</tr>
<tr>
<th>'._('Tax Authority').'</th>
@@ -343,7 +343,7 @@
} else {
echo '<br />
- <div class="centre">' .
+ <div class="centre">' .
_('There are no tax authorities defined to allocate to this tax group').'
</div>';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 12:57:11
|
Revision: 4814
http://web-erp.svn.sourceforge.net/web-erp/?rev=4814&view=rev
Author: tim_schofield
Date: 2012-01-19 12:57:05 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/TaxGroups.php
Modified: trunk/TaxGroups.php
===================================================================
--- trunk/TaxGroups.php 2012-01-19 12:56:30 UTC (rev 4813)
+++ trunk/TaxGroups.php 2012-01-19 12:57:05 UTC (rev 4814)
@@ -237,7 +237,7 @@
}
echo '<tr><td>' . _('Tax Group') . ':</td>
<td><input type="text" name="GroupName" size="40" maxlength="40" value="' . $_POST['GroupName'] . '" /></td>';
-echo '<td><input type="submit" name="submit" value="' . _('Enter Group') . '"></td>
+echo '<td><input type="submit" name="submit" value="' . _('Enter Group') . '" /></td>
</tr>
</form>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 12:57:15
|
Revision: 4814
http://web-erp.svn.sourceforge.net/web-erp/?rev=4814&view=rev
Author: tim_schofield
Date: 2012-01-19 12:57:05 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/TaxGroups.php
Modified: trunk/TaxGroups.php
===================================================================
--- trunk/TaxGroups.php 2012-01-19 12:56:30 UTC (rev 4813)
+++ trunk/TaxGroups.php 2012-01-19 12:57:05 UTC (rev 4814)
@@ -237,7 +237,7 @@
}
echo '<tr><td>' . _('Tax Group') . ':</td>
<td><input type="text" name="GroupName" size="40" maxlength="40" value="' . $_POST['GroupName'] . '" /></td>';
-echo '<td><input type="submit" name="submit" value="' . _('Enter Group') . '"></td>
+echo '<td><input type="submit" name="submit" value="' . _('Enter Group') . '" /></td>
</tr>
</form>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ex...@us...> - 2013-08-15 04:59:10
|
Revision: 6224
http://sourceforge.net/p/web-erp/reponame/6224
Author: exsonqu
Date: 2013-08-15 04:59:04 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
15/8/2013 Exson: Make TaxGroups.php html5 compatible.
Modified Paths:
--------------
trunk/TaxGroups.php
Modified: trunk/TaxGroups.php
===================================================================
--- trunk/TaxGroups.php 2013-08-15 04:24:28 UTC (rev 6223)
+++ trunk/TaxGroups.php 2013-08-15 04:59:04 UTC (rev 6224)
@@ -169,8 +169,8 @@
} else {
echo '<table class="selection">
<tr>
- <th>' . _('Group No') . '</th>
- <th>' . _('Tax Group') . '</th>
+ <th class="assending" onclick="SortSelect(this)" >' . _('Group No') . '</th>
+ <th class="assending" onclick="SortSelect(this)" >' . _('Tax Group') . '</th>
</tr>';
$k=0; //row colour counter
@@ -237,7 +237,7 @@
$_POST['GroupName']='';
}
echo '<tr><td>' . _('Tax Group') . ':</td>
- <td><input type="text" name="GroupName" size="40" maxlength="40" value="' . $_POST['GroupName'] . '" /></td>';
+ <td><input pattern="(?!^ +$)[^><+-]{4,}" title="'._('The group name must be more 4 and less than 40 characters and cannot be left blank').'" placeholder="'._('4 to 40 legal characters').'" type="text" name="GroupName" size="40" maxlength="40" value="' . $_POST['GroupName'] . '" /></td>';
echo '<td><input type="submit" name="submit" value="' . _('Enter Group') . '" /></td>
</tr>
</table>
@@ -305,7 +305,7 @@
}
echo '<td>' . $TaxAuthRow[$i]['taxname'] . '</td>
- <td><input type="text" class="number" name="CalcOrder_' . $TaxAuthRow[$i]['taxauthid'] . '" value="' . $TaxAuthRow[$i]['calculationorder'] . '" size="2" maxlength="2" style="width: 100%" /></td>
+ <td><input type="text" class="integer" pattern="[1-4]{1}" title="'._('The input must be positive integer and less than 5').'" name="CalcOrder_' . $TaxAuthRow[$i]['taxauthid'] . '" value="' . $TaxAuthRow[$i]['calculationorder'] . '" size="2" maxlength="2" style="width: 100%" /></td>
<td><select name="TaxOnTax_' . $TaxAuthRow[$i]['taxauthid'] . '" style="width: 100%">';
if ($TaxAuthRow[$i]['taxontax']==1){
echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
@@ -412,4 +412,4 @@
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2014-10-24 12:54:45
|
Revision: 6934
http://sourceforge.net/p/web-erp/reponame/6934
Author: exsonqu
Date: 2014-10-24 12:54:40 +0000 (Fri, 24 Oct 2014)
Log Message:
-----------
24/10/14 Exson: Fixed the extra blank in pattern in TaxGroups.php which leads to input failure.
Modified Paths:
--------------
trunk/TaxGroups.php
Modified: trunk/TaxGroups.php
===================================================================
--- trunk/TaxGroups.php 2014-10-24 12:47:56 UTC (rev 6933)
+++ trunk/TaxGroups.php 2014-10-24 12:54:40 UTC (rev 6934)
@@ -238,7 +238,7 @@
$_POST['GroupName']='';
}
echo '<tr><td>' . _('Tax Group') . ':</td>
- <td><input pattern="(?!^ +$)[^><+-] {4,}" title="'._('The group name must be more 4 and less than 40 characters and cannot be left blank').'" placeholder="'._('4 to 40 legal characters').'" type="text" name="GroupName" size="40" maxlength="40" value="' . $_POST['GroupName'] . '" /></td>';
+ <td><input pattern="(?!^ +$)[^><+-]{4,}" title="'._('The group name must be more 4 and less than 40 characters and cannot be left blank').'" placeholder="'._('4 to 40 legal characters').'" type="text" name="GroupName" size="40" maxlength="40" value="' . $_POST['GroupName'] . '" /></td>';
echo '<td><input type="submit" name="submit" value="' . _('Enter Group') . '" /></td>
</tr>
</table>
|
|
From: <vv...@us...> - 2015-03-30 21:32:52
|
Revision: 7244
http://sourceforge.net/p/web-erp/reponame/7244
Author: vvs2012
Date: 2015-03-30 21:32:49 +0000 (Mon, 30 Mar 2015)
Log Message:
-----------
Update Order did not work in Firefox. Error in pattern attribute.
Modified Paths:
--------------
trunk/TaxGroups.php
Modified: trunk/TaxGroups.php
===================================================================
--- trunk/TaxGroups.php 2015-03-30 21:12:13 UTC (rev 7243)
+++ trunk/TaxGroups.php 2015-03-30 21:32:49 UTC (rev 7244)
@@ -93,7 +93,7 @@
while($myrow=DB_fetch_row($Result)) {
- if(is_numeric($_POST['CalcOrder_' . $myrow[0]]) AND $_POST['CalcOrder_' . $myrow[0]] <5) {
+ if(is_numeric($_POST['CalcOrder_' . $myrow[0]]) AND $_POST['CalcOrder_' . $myrow[0]] < 10) {
$sql = "UPDATE taxgrouptaxes
SET calculationorder='" . $_POST['CalcOrder_' . $myrow[0]] . "',
@@ -304,7 +304,7 @@
$j++;
}
echo '<td>' . $TaxAuthRow[$i]['taxname'] . '</td>
- <td><input type="text" class="integer" pattern="[1-4] {1}" title="'._('The input must be positive integer and less than 5').'" name="CalcOrder_' . $TaxAuthRow[$i]['taxauthid'] . '" value="' . $TaxAuthRow[$i]['calculationorder'] . '" size="2" maxlength="2" style="width: 100%" /></td>
+ <td><input type="text" class="integer" pattern="(?!^0*$)(\d+)" title="'._('The input must be positive integer and less than 10').'" name="CalcOrder_' . $TaxAuthRow[$i]['taxauthid'] . '" value="' . $TaxAuthRow[$i]['calculationorder'] . '" size="1" maxlength="1" style="width: 90%" /></td>
<td><select name="TaxOnTax_' . $TaxAuthRow[$i]['taxauthid'] . '" style="width: 100%">';
if($TaxAuthRow[$i]['taxontax']==1) {
echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
|
×
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