Menu
▾
▴
web-erp-svn — SVN commits
This list is closed, nobody may subscribe to it.
| 2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
| 2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
| 2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
| 2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
| 2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
| 2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
| 2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tim...@us...> - 2012-01-19 12:56:41
|
Revision: 4813
http://web-erp.svn.sourceforge.net/web-erp/?rev=4813&view=rev
Author: tim_schofield
Date: 2012-01-19 12:56:30 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/Labels.php
Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php 2012-01-19 12:10:59 UTC (rev 4812)
+++ trunk/Labels.php 2012-01-19 12:56:30 UTC (rev 4813)
@@ -276,7 +276,7 @@
<table border="2" cellspacing="4" class="selection">
<tbody>
<tr>
- <td align="center"><img src="'.$rootpath.'/css/paramsLabel.png" align="top" border="0" ></td>
+ <td align="center"><img src="'.$rootpath.'/css/paramsLabel.png" align="top" border="0" /></td>
<td>'.$tableGD.'</td>
</tr>
<tr>/
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:11:10
|
Revision: 4812
http://web-erp.svn.sourceforge.net/web-erp/?rev=4812&view=rev
Author: tim_schofield
Date: 2012-01-19 12:10:59 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/Labels.php
Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php 2012-01-19 11:58:08 UTC (rev 4811)
+++ trunk/Labels.php 2012-01-19 12:10:59 UTC (rev 4812)
@@ -276,17 +276,17 @@
<table border="2" cellspacing="4" class="selection">
<tbody>
<tr>
- <td align="center"><img src="'.$rootpath.'/css/paramsLabel.png" align="top" border="0"></td>
+ <td align="center"><img src="'.$rootpath.'/css/paramsLabel.png" align="top" border="0" ></td>
<td>'.$tableGD.'</td>
</tr>
- <tr>
- <td align="center"><IMG src="'.$rootpath.'/css/labelsDim.png" align="top" border="0"></td>
+ <tr>/
+ <td align="center"><IMG src="'.$rootpath.'/css/labelsDim.png" align="top" border="0" /></td>
<td>'.$tableLines.'</td>
</tr>
</tbody>
</table>
- <br /><input type="submit" name="'.$name.'" value="'.$value.'">
- <input type="submit" name="Cancel" value="'.$vCancel.'">
+ <br /><input type="submit" name="'.$name.'" value="'.$value.'" />
+ <input type="submit" name="Cancel" value="'.$vCancel.'" />
</form>';
}
@@ -319,8 +319,7 @@
$ro='';
if ($readonly AND $specialTag==$iTag)
$ro='readonly ';
- $input = '<input type="text" name="'. $iTag .'" value="'. $vDat .'"
- size="'. $tag['sz'] .'" maxlength="'. $tag['maxsz'] .'"'. $ro .'>';
+ $input = '<input type="text" name="'. $iTag .'" value="'. $vDat .'" size="'. $tag['sz'] .'" maxlength="'. $tag['maxsz'] .'"'. $ro .' />';
}
if (!$iCol++) // when zero begins a line
$html .= '
@@ -386,8 +385,7 @@
$input .= '
</select>';
} else {
- $input = '<INPUT type="text" name="'. $iTag .'[]" value="'. $vDat .'"
- size="'. $tag['sz'] .'" maxlength="'. $tag['maxsz'] .'">';
+ $input = '<input type="text" name="'. $iTag .'[]" value="'. $vDat .'" size="'. $tag['sz'] .'" maxlength="'. $tag['maxsz'] .'" />';
}
$html .= '
<td align="center">' . $input . '</td>';
@@ -437,7 +435,7 @@
<th>'.$txt[0].'</th>
<th>'.$txt[1].'</th>
<th>'.$txt[2].'</th>
- <th><input type="submit" name="new" onclick="submitForm(\'form1\',\'New\',\'\');" value="'.$txt[3].'">
+ <th><input type="submit" name="new" onclick="submitForm(\'form1\',\'New\',\'\');" value="'.$txt[3].'" />
</th>
</tr>
</thead>
@@ -448,12 +446,9 @@
<tr><td>'. $label->id . '</td>
<td>'. $label->description . '</td>
<td><div class="centre">'. $dim . '</div></td>
- <td><input type="submit" onclick="submitForm('. "'form1','Edit','". $label->id . "');" .'" value="' .
- $txt[4]. '">
- <input type="submit" onclick="submitForm('. "'form1','Copy','". $label->id . "');" .'" value="' .
- $txt[5]. '">
- <input type="submit" onclick="areYouSure('. "'form1','Delete','". $label->id . "');" .'" value="' .
- $txt[6]. '">
+ <td><input type="submit" onclick="submitForm('. "'form1','Edit','". $label->id . "');" .'" value="' . $txt[4]. '" />
+ <input type="submit" onclick="submitForm('. "'form1','Copy','". $label->id . "');" .'" value="' . $txt[5]. '" />
+ <input type="submit" onclick="areYouSure('. "'form1','Delete','". $label->id . "');" .'" value="' . $txt[6]. '" />
</td>
</tr>';
}
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:11:08
|
Revision: 4812
http://web-erp.svn.sourceforge.net/web-erp/?rev=4812&view=rev
Author: tim_schofield
Date: 2012-01-19 12:10:59 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/Labels.php
Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php 2012-01-19 11:58:08 UTC (rev 4811)
+++ trunk/Labels.php 2012-01-19 12:10:59 UTC (rev 4812)
@@ -276,17 +276,17 @@
<table border="2" cellspacing="4" class="selection">
<tbody>
<tr>
- <td align="center"><img src="'.$rootpath.'/css/paramsLabel.png" align="top" border="0"></td>
+ <td align="center"><img src="'.$rootpath.'/css/paramsLabel.png" align="top" border="0" ></td>
<td>'.$tableGD.'</td>
</tr>
- <tr>
- <td align="center"><IMG src="'.$rootpath.'/css/labelsDim.png" align="top" border="0"></td>
+ <tr>/
+ <td align="center"><IMG src="'.$rootpath.'/css/labelsDim.png" align="top" border="0" /></td>
<td>'.$tableLines.'</td>
</tr>
</tbody>
</table>
- <br /><input type="submit" name="'.$name.'" value="'.$value.'">
- <input type="submit" name="Cancel" value="'.$vCancel.'">
+ <br /><input type="submit" name="'.$name.'" value="'.$value.'" />
+ <input type="submit" name="Cancel" value="'.$vCancel.'" />
</form>';
}
@@ -319,8 +319,7 @@
$ro='';
if ($readonly AND $specialTag==$iTag)
$ro='readonly ';
- $input = '<input type="text" name="'. $iTag .'" value="'. $vDat .'"
- size="'. $tag['sz'] .'" maxlength="'. $tag['maxsz'] .'"'. $ro .'>';
+ $input = '<input type="text" name="'. $iTag .'" value="'. $vDat .'" size="'. $tag['sz'] .'" maxlength="'. $tag['maxsz'] .'"'. $ro .' />';
}
if (!$iCol++) // when zero begins a line
$html .= '
@@ -386,8 +385,7 @@
$input .= '
</select>';
} else {
- $input = '<INPUT type="text" name="'. $iTag .'[]" value="'. $vDat .'"
- size="'. $tag['sz'] .'" maxlength="'. $tag['maxsz'] .'">';
+ $input = '<input type="text" name="'. $iTag .'[]" value="'. $vDat .'" size="'. $tag['sz'] .'" maxlength="'. $tag['maxsz'] .'" />';
}
$html .= '
<td align="center">' . $input . '</td>';
@@ -437,7 +435,7 @@
<th>'.$txt[0].'</th>
<th>'.$txt[1].'</th>
<th>'.$txt[2].'</th>
- <th><input type="submit" name="new" onclick="submitForm(\'form1\',\'New\',\'\');" value="'.$txt[3].'">
+ <th><input type="submit" name="new" onclick="submitForm(\'form1\',\'New\',\'\');" value="'.$txt[3].'" />
</th>
</tr>
</thead>
@@ -448,12 +446,9 @@
<tr><td>'. $label->id . '</td>
<td>'. $label->description . '</td>
<td><div class="centre">'. $dim . '</div></td>
- <td><input type="submit" onclick="submitForm('. "'form1','Edit','". $label->id . "');" .'" value="' .
- $txt[4]. '">
- <input type="submit" onclick="submitForm('. "'form1','Copy','". $label->id . "');" .'" value="' .
- $txt[5]. '">
- <input type="submit" onclick="areYouSure('. "'form1','Delete','". $label->id . "');" .'" value="' .
- $txt[6]. '">
+ <td><input type="submit" onclick="submitForm('. "'form1','Edit','". $label->id . "');" .'" value="' . $txt[4]. '" />
+ <input type="submit" onclick="submitForm('. "'form1','Copy','". $label->id . "');" .'" value="' . $txt[5]. '" />
+ <input type="submit" onclick="areYouSure('. "'form1','Delete','". $label->id . "');" .'" value="' . $txt[6]. '" />
</td>
</tr>';
}
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 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 10:57:06
|
Revision: 4810
http://web-erp.svn.sourceforge.net/web-erp/?rev=4810&view=rev
Author: tim_schofield
Date: 2012-01-19 10:56:55 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/ContractBOM.php
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-01-19 10:53:00 UTC (rev 4809)
+++ trunk/ContractBOM.php 2012-01-19 10:56:55 UTC (rev 4810)
@@ -165,9 +165,9 @@
$AlreadyOnThisBOM = 0;
if (filter_number_format($_POST['Qty'.$i])>0){
if (count($_SESSION['Contract'.$identifier]->ContractBOM)!=0){
-
+
foreach ($_SESSION['Contract'.$identifier]->ContractBOM AS $Component) {
-
+
/* do a loop round the items on the order to see that the item
is not already on this order */
if ($Component->StockID == trim($_POST['StockID'.$i])) {
@@ -176,9 +176,9 @@
}
} /* end of the foreach loop to look for preexisting items of the same code */
}
-
+
if ($AlreadyOnThisBOM!=1){
-
+
$sql = "SELECT stockmaster.description,
stockmaster.stockid,
stockmaster.units,
@@ -186,13 +186,13 @@
stockmaster.materialcost+labourcost+overheadcost AS unitcost
FROM stockmaster
WHERE stockmaster.stockid = '". trim($_POST['StockID'.$i]) . "'";
-
+
$ErrMsg = _('The item details could not be retrieved');
$DbgMsg = _('The SQL used to retrieve the item details but failed was');
$result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
+
if ($myrow = DB_fetch_array($result1)){
-
+
$_SESSION['Contract'.$identifier]->Add_To_ContractBOM (trim($_POST['StockID'.$i]),
$myrow['description'],
'',
@@ -289,8 +289,9 @@
$ErrMsg = _('The supplier category details could not be retrieved because');
$DbgMsg = _('The SQL used to retrieve the category details but failed was');
$result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' .
- _('Print') . '" alt="" />' . ' ' . _('Search For Stock Items') . '</p>';
+ echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Search For Stock Items') .
+ '</p>';
echo '<table class="selection">
<tr></tr>
<tr><td><select name="StockCat">';
@@ -363,7 +364,7 @@
}
if (file_exists( $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg') ) {
- $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50">';
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50" />';
} else {
$ImageSource = '<i>'._('No Image').'</i>';
}
@@ -382,7 +383,7 @@
}
#end of page full new headings if
}
-
+
#end of while loop
echo '</table>
<input type="hidden" name="CountOfItems" value="'. $i . '" />';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:57:06
|
Revision: 4810
http://web-erp.svn.sourceforge.net/web-erp/?rev=4810&view=rev
Author: tim_schofield
Date: 2012-01-19 10:56:55 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/ContractBOM.php
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-01-19 10:53:00 UTC (rev 4809)
+++ trunk/ContractBOM.php 2012-01-19 10:56:55 UTC (rev 4810)
@@ -165,9 +165,9 @@
$AlreadyOnThisBOM = 0;
if (filter_number_format($_POST['Qty'.$i])>0){
if (count($_SESSION['Contract'.$identifier]->ContractBOM)!=0){
-
+
foreach ($_SESSION['Contract'.$identifier]->ContractBOM AS $Component) {
-
+
/* do a loop round the items on the order to see that the item
is not already on this order */
if ($Component->StockID == trim($_POST['StockID'.$i])) {
@@ -176,9 +176,9 @@
}
} /* end of the foreach loop to look for preexisting items of the same code */
}
-
+
if ($AlreadyOnThisBOM!=1){
-
+
$sql = "SELECT stockmaster.description,
stockmaster.stockid,
stockmaster.units,
@@ -186,13 +186,13 @@
stockmaster.materialcost+labourcost+overheadcost AS unitcost
FROM stockmaster
WHERE stockmaster.stockid = '". trim($_POST['StockID'.$i]) . "'";
-
+
$ErrMsg = _('The item details could not be retrieved');
$DbgMsg = _('The SQL used to retrieve the item details but failed was');
$result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
+
if ($myrow = DB_fetch_array($result1)){
-
+
$_SESSION['Contract'.$identifier]->Add_To_ContractBOM (trim($_POST['StockID'.$i]),
$myrow['description'],
'',
@@ -289,8 +289,9 @@
$ErrMsg = _('The supplier category details could not be retrieved because');
$DbgMsg = _('The SQL used to retrieve the category details but failed was');
$result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' .
- _('Print') . '" alt="" />' . ' ' . _('Search For Stock Items') . '</p>';
+ echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Search For Stock Items') .
+ '</p>';
echo '<table class="selection">
<tr></tr>
<tr><td><select name="StockCat">';
@@ -363,7 +364,7 @@
}
if (file_exists( $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg') ) {
- $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50">';
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $myrow['stockid']. '&text=&width=50&height=50" />';
} else {
$ImageSource = '<i>'._('No Image').'</i>';
}
@@ -382,7 +383,7 @@
}
#end of page full new headings if
}
-
+
#end of while loop
echo '</table>
<input type="hidden" name="CountOfItems" value="'. $i . '" />';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:53:11
|
Revision: 4809
http://web-erp.svn.sourceforge.net/web-erp/?rev=4809&view=rev
Author: tim_schofield
Date: 2012-01-19 10:53:00 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/SalesByTypePeriodInquiry.php
Modified: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php 2012-01-19 10:17:22 UTC (rev 4808)
+++ trunk/SalesByTypePeriodInquiry.php 2012-01-19 10:53:00 UTC (rev 4809)
@@ -22,7 +22,7 @@
echo '<form name="Form1" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<table cellpadding=2 class="selection">
+echo '<table cellpadding="2" class="selection">
<tr><td valign=top>
<table>';
@@ -77,7 +77,7 @@
echo '</table>
</td><td valign="top">
<table>';
-
+
echo '<tr><th colspan="2" class="centre">' . _('Display Data') . '</th>
</tr>
<tr>
@@ -185,20 +185,20 @@
case 'Daily':
$sql = "SELECT debtortrans.trandate,
debtortrans.tpe,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
price*(1-discountpercent)* -qty
ELSE 0 END)
as salesvalue,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
1 ELSE 0 END)
as nooforders,
- SUM(CASE WHEN stockmoves.type=11 THEN
+ SUM(CASE WHEN stockmoves.type=11 THEN
price*(1-discountpercent)* (-qty)
ELSE 0 END)
as returnvalue,
SUM((standardcost * -qty)) as cost
FROM stockmoves
- INNER JOIN custbranch
+ INNER JOIN custbranch
ON stockmoves.debtorno=custbranch.debtorno
AND stockmoves.branchcode=custbranch.branchcode
INNER JOIN debtortrans
@@ -212,26 +212,26 @@
tpe
ORDER BY debtortrans.trandate,
tpe";
-
+
break;
case 'Weekly':
$sql = "SELECT WEEKOFYEAR(debtortrans.trandate) as week_no,
YEAR(debtortrans.trandate) as transyear,
debtortrans.tpe,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
price*(1-discountpercent)* -qty
ELSE 0 END)
as salesvalue,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
1 ELSE 0 END)
as nooforders,
- SUM(CASE WHEN stockmoves.type=11 THEN
+ SUM(CASE WHEN stockmoves.type=11 THEN
price*(1-discountpercent)* (-qty)
ELSE 0 END)
as returnvalue,
SUM((standardcost * -qty)) as cost
FROM stockmoves
- INNER JOIN custbranch
+ INNER JOIN custbranch
ON stockmoves.debtorno=custbranch.debtorno
AND stockmoves.branchcode=custbranch.branchcode
INNER JOIN debtortrans
@@ -247,27 +247,27 @@
ORDER BY transyear,
week_no,
tpe";
-
+
break;
case 'Monthly':
$sql = "SELECT MONTH(debtortrans.trandate) as month_no,
MONTHNAME(debtortrans.trandate) as month_name,
YEAR(debtortrans.trandate) as transyear,
debtortrans.tpe,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
price*(1-discountpercent)* -qty
ELSE 0 END)
as salesvalue,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
1 ELSE 0 END)
as nooforders,
- SUM(CASE WHEN stockmoves.type=11 THEN
+ SUM(CASE WHEN stockmoves.type=11 THEN
price*(1-discountpercent)* (-qty)
ELSE 0 END)
as returnvalue,
SUM((standardcost * -qty)) as cost
FROM stockmoves
- INNER JOIN custbranch
+ INNER JOIN custbranch
ON stockmoves.debtorno=custbranch.debtorno
AND stockmoves.branchcode=custbranch.branchcode
INNER JOIN debtortrans
@@ -284,26 +284,26 @@
ORDER BY transyear,
month_no,
tpe";
-
+
break;
case 'Quarterly':
$sql = "SELECT QUARTER(debtortrans.trandate) as quarter_no,
YEAR(debtortrans.trandate) as transyear,
debtortrans.tpe,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
price*(1-discountpercent)* -qty
ELSE 0 END)
as salesvalue,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
1 ELSE 0 END)
as nooforders,
- SUM(CASE WHEN stockmoves.type=11 THEN
+ SUM(CASE WHEN stockmoves.type=11 THEN
price*(1-discountpercent)* (-qty)
ELSE 0 END)
as returnvalue,
SUM((standardcost * -qty)) as cost
FROM stockmoves
- INNER JOIN custbranch
+ INNER JOIN custbranch
ON stockmoves.debtorno=custbranch.debtorno
AND stockmoves.branchcode=custbranch.branchcode
INNER JOIN debtortrans
@@ -315,20 +315,20 @@
AND debtortrans.trandate<='" . $ToDate . "'
GROUP BY quarter_no,
transyear,
- tpe
+ tpe
ORDER BY transyear,
quarter_no,
tpe";
-
+
break;
}
-
+
$ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
$SalesResult = DB_query($sql,$db,$ErrMsg);
-
- echo '<table cellpadding=2 class="selection">';
-
+
+ echo '<table cellpadding="2" class="selection">';
+
echo'<tr>
<th>' . _('Period') . '</th>
<th>' . _('Sales') . '<br />' . _('Type') . '</th>
@@ -339,21 +339,21 @@
<th>' . _('Cost of Sales') . '</th>
<th>' . _('Gross Profit') . '</th>
</tr>';
-
+
$CumulativeTotalSales = 0;
$CumulativeTotalOrders = 0;
$CumulativeTotalRefunds = 0;
$CumulativeTotalNetSales = 0;
$CumulativeTotalCost = 0;
$CumulativeTotalGP = 0;
-
+
$PrdTotalOrders =0;
$PrdTotalSales=0;
$PrdTotalRefunds=0;
$PrdTotalNetSales=0;
$PrdTotalCost=0;
$PrdTotalGP=0;
-
+
$PeriodHeadingDone = false;
$LastPeriodHeading = 'First Run Through';
$k=0;
@@ -399,7 +399,7 @@
$PeriodHeadingDone = true;
} else {
echo '<td></td>';
- }
+ }
break;
case 'Weekly':
if ($LastPeriodHeading != _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear']) {
@@ -434,7 +434,7 @@
$PeriodHeadingDone = true;
} else {
echo '<td></td>';
- }
+ }
break;
case 'Monthly':
if ($LastPeriodHeading != $SalesRow['month_name'] . ' ' . $SalesRow['transyear']) {
@@ -521,7 +521,7 @@
$PrdTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
$PrdTotalCost += $SalesRow['cost'];
$PrdTotalGP += ($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']);
-
+
$CumulativeTotalSales += $SalesRow['salesvalue'];
$CumulativeTotalOrders = $SalesRow['nooforders'];
$CumulativeTotalRefunds += $SalesRow['returnvalue'];
@@ -559,7 +559,7 @@
<td class="number">' . locale_number_format($CumulativeTotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format($CumulativeTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
-
+
echo '</table>';
} //end of if user hit show sales
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:53:11
|
Revision: 4809
http://web-erp.svn.sourceforge.net/web-erp/?rev=4809&view=rev
Author: tim_schofield
Date: 2012-01-19 10:53:00 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/SalesByTypePeriodInquiry.php
Modified: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php 2012-01-19 10:17:22 UTC (rev 4808)
+++ trunk/SalesByTypePeriodInquiry.php 2012-01-19 10:53:00 UTC (rev 4809)
@@ -22,7 +22,7 @@
echo '<form name="Form1" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<table cellpadding=2 class="selection">
+echo '<table cellpadding="2" class="selection">
<tr><td valign=top>
<table>';
@@ -77,7 +77,7 @@
echo '</table>
</td><td valign="top">
<table>';
-
+
echo '<tr><th colspan="2" class="centre">' . _('Display Data') . '</th>
</tr>
<tr>
@@ -185,20 +185,20 @@
case 'Daily':
$sql = "SELECT debtortrans.trandate,
debtortrans.tpe,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
price*(1-discountpercent)* -qty
ELSE 0 END)
as salesvalue,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
1 ELSE 0 END)
as nooforders,
- SUM(CASE WHEN stockmoves.type=11 THEN
+ SUM(CASE WHEN stockmoves.type=11 THEN
price*(1-discountpercent)* (-qty)
ELSE 0 END)
as returnvalue,
SUM((standardcost * -qty)) as cost
FROM stockmoves
- INNER JOIN custbranch
+ INNER JOIN custbranch
ON stockmoves.debtorno=custbranch.debtorno
AND stockmoves.branchcode=custbranch.branchcode
INNER JOIN debtortrans
@@ -212,26 +212,26 @@
tpe
ORDER BY debtortrans.trandate,
tpe";
-
+
break;
case 'Weekly':
$sql = "SELECT WEEKOFYEAR(debtortrans.trandate) as week_no,
YEAR(debtortrans.trandate) as transyear,
debtortrans.tpe,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
price*(1-discountpercent)* -qty
ELSE 0 END)
as salesvalue,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
1 ELSE 0 END)
as nooforders,
- SUM(CASE WHEN stockmoves.type=11 THEN
+ SUM(CASE WHEN stockmoves.type=11 THEN
price*(1-discountpercent)* (-qty)
ELSE 0 END)
as returnvalue,
SUM((standardcost * -qty)) as cost
FROM stockmoves
- INNER JOIN custbranch
+ INNER JOIN custbranch
ON stockmoves.debtorno=custbranch.debtorno
AND stockmoves.branchcode=custbranch.branchcode
INNER JOIN debtortrans
@@ -247,27 +247,27 @@
ORDER BY transyear,
week_no,
tpe";
-
+
break;
case 'Monthly':
$sql = "SELECT MONTH(debtortrans.trandate) as month_no,
MONTHNAME(debtortrans.trandate) as month_name,
YEAR(debtortrans.trandate) as transyear,
debtortrans.tpe,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
price*(1-discountpercent)* -qty
ELSE 0 END)
as salesvalue,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
1 ELSE 0 END)
as nooforders,
- SUM(CASE WHEN stockmoves.type=11 THEN
+ SUM(CASE WHEN stockmoves.type=11 THEN
price*(1-discountpercent)* (-qty)
ELSE 0 END)
as returnvalue,
SUM((standardcost * -qty)) as cost
FROM stockmoves
- INNER JOIN custbranch
+ INNER JOIN custbranch
ON stockmoves.debtorno=custbranch.debtorno
AND stockmoves.branchcode=custbranch.branchcode
INNER JOIN debtortrans
@@ -284,26 +284,26 @@
ORDER BY transyear,
month_no,
tpe";
-
+
break;
case 'Quarterly':
$sql = "SELECT QUARTER(debtortrans.trandate) as quarter_no,
YEAR(debtortrans.trandate) as transyear,
debtortrans.tpe,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
price*(1-discountpercent)* -qty
ELSE 0 END)
as salesvalue,
- SUM(CASE WHEN stockmoves.type=10 THEN
+ SUM(CASE WHEN stockmoves.type=10 THEN
1 ELSE 0 END)
as nooforders,
- SUM(CASE WHEN stockmoves.type=11 THEN
+ SUM(CASE WHEN stockmoves.type=11 THEN
price*(1-discountpercent)* (-qty)
ELSE 0 END)
as returnvalue,
SUM((standardcost * -qty)) as cost
FROM stockmoves
- INNER JOIN custbranch
+ INNER JOIN custbranch
ON stockmoves.debtorno=custbranch.debtorno
AND stockmoves.branchcode=custbranch.branchcode
INNER JOIN debtortrans
@@ -315,20 +315,20 @@
AND debtortrans.trandate<='" . $ToDate . "'
GROUP BY quarter_no,
transyear,
- tpe
+ tpe
ORDER BY transyear,
quarter_no,
tpe";
-
+
break;
}
-
+
$ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
$SalesResult = DB_query($sql,$db,$ErrMsg);
-
- echo '<table cellpadding=2 class="selection">';
-
+
+ echo '<table cellpadding="2" class="selection">';
+
echo'<tr>
<th>' . _('Period') . '</th>
<th>' . _('Sales') . '<br />' . _('Type') . '</th>
@@ -339,21 +339,21 @@
<th>' . _('Cost of Sales') . '</th>
<th>' . _('Gross Profit') . '</th>
</tr>';
-
+
$CumulativeTotalSales = 0;
$CumulativeTotalOrders = 0;
$CumulativeTotalRefunds = 0;
$CumulativeTotalNetSales = 0;
$CumulativeTotalCost = 0;
$CumulativeTotalGP = 0;
-
+
$PrdTotalOrders =0;
$PrdTotalSales=0;
$PrdTotalRefunds=0;
$PrdTotalNetSales=0;
$PrdTotalCost=0;
$PrdTotalGP=0;
-
+
$PeriodHeadingDone = false;
$LastPeriodHeading = 'First Run Through';
$k=0;
@@ -399,7 +399,7 @@
$PeriodHeadingDone = true;
} else {
echo '<td></td>';
- }
+ }
break;
case 'Weekly':
if ($LastPeriodHeading != _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear']) {
@@ -434,7 +434,7 @@
$PeriodHeadingDone = true;
} else {
echo '<td></td>';
- }
+ }
break;
case 'Monthly':
if ($LastPeriodHeading != $SalesRow['month_name'] . ' ' . $SalesRow['transyear']) {
@@ -521,7 +521,7 @@
$PrdTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
$PrdTotalCost += $SalesRow['cost'];
$PrdTotalGP += ($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']);
-
+
$CumulativeTotalSales += $SalesRow['salesvalue'];
$CumulativeTotalOrders = $SalesRow['nooforders'];
$CumulativeTotalRefunds += $SalesRow['returnvalue'];
@@ -559,7 +559,7 @@
<td class="number">' . locale_number_format($CumulativeTotalCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format($CumulativeTotalGP,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
-
+
echo '</table>';
} //end of if user hit show sales
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:17:32
|
Revision: 4808
http://web-erp.svn.sourceforge.net/web-erp/?rev=4808&view=rev
Author: tim_schofield
Date: 2012-01-19 10:17:22 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Fix typing error in sql to check the existance of purchase orders before deletion
Modified Paths:
--------------
trunk/Locations.php
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2012-01-19 10:15:26 UTC (rev 4807)
+++ trunk/Locations.php 2012-01-19 10:17:22 UTC (rev 4808)
@@ -36,7 +36,7 @@
$sql = "SELECT * FROM custbranch
WHERE debtorno='" . $_POST['CashSaleCustomer'] . "'
AND branchcode='" . $_POST['CashSaleBranch'] . "'";
-
+
$result = DB_query($sql,$db);
if (DB_num_rows($result)==0){
$InputError = 1;
@@ -71,7 +71,7 @@
cashsalebranch ='" . $_POST['CashSaleBranch'] . "',
managed = '" . $_POST['Managed'] . "'
WHERE loccode = '" . $SelectedLocation . "'";
-
+
$ErrMsg = _('An error occurred updating the') . ' ' . $SelectedLocation . ' ' . _('location record because');
$DbgMsg = _('The SQL used to update the location record was');
@@ -245,8 +245,8 @@
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('stock movements with this Location code');
} else {
- $sql= "SELECT COUNT(*) FROM locstock
- WHERE locstock.loccode='". $SelectedLocation . "'
+ $sql= "SELECT COUNT(*) FROM locstock
+ WHERE locstock.loccode='". $SelectedLocation . "'
AND locstock.quantity !=0";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -255,7 +255,7 @@
prnMsg(_('Cannot delete this location because location stock records exist that use this location and have a quantity on hand not equal to 0'),'warn');
echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('stock items with stock on hand at this location code');
} else {
- $sql= "SELECT COUNT(*) FROM www_users
+ $sql= "SELECT COUNT(*) FROM www_users
WHERE www_users.defaultlocation='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -264,7 +264,7 @@
prnMsg(_('Cannot delete this location because it is the default location for a user') . '. ' . _('The user record must be modified first'),'warn');
echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('users using this location as their default location');
} else {
- $sql= "SELECT COUNT(*) FROM bom
+ $sql= "SELECT COUNT(*) FROM bom
WHERE bom.loccode='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -273,7 +273,7 @@
prnMsg(_('Cannot delete this location because it is the default location for a bill of material') . '. ' . _('The bill of materials must be modified first'),'warn');
echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('bom components using this location');
} else {
- $sql= "SELECT COUNT(*) FROM workcentres
+ $sql= "SELECT COUNT(*) FROM workcentres
WHERE workcentres.location='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -282,7 +282,7 @@
prnMsg( _('Cannot delete this location because it is used by some work centre records'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('works centres using this location');
} else {
- $sql= "SELECT COUNT(*) FROM workorders
+ $sql= "SELECT COUNT(*) FROM workorders
WHERE workorders.loccode='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -291,7 +291,7 @@
prnMsg( _('Cannot delete this location because it is used by some work order records'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('work orders using this location');
} else {
- $sql= "SELECT COUNT(*) FROM custbranch
+ $sql= "SELECT COUNT(*) FROM custbranch
WHERE custbranch.defaultlocation='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -300,7 +300,7 @@
prnMsg(_('Cannot delete this location because it is used by some branch records as the default location to deliver from'),'warn');
echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('branches set up to use this location by default');
} else {
- $sql= "SELECT COUNT(*) FROM purchorders WHERE intostocklocation='" . $SelectedLocation . '";
+ $sql= "SELECT COUNT(*) FROM purchorders WHERE intostocklocation='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
@@ -319,15 +319,15 @@
if (! $CancelDelete) {
/* need to figure out if this location is the only one in the same tax province */
- $result = DB_query("SELECT taxprovinceid FROM locations
+ $result = DB_query("SELECT taxprovinceid FROM locations
WHERE loccode='" . $SelectedLocation . "'",$db);
$TaxProvinceRow = DB_fetch_row($result);
- $result = DB_query("SELECT COUNT(taxprovinceid) FROM locations
+ $result = DB_query("SELECT COUNT(taxprovinceid) FROM locations
WHERE taxprovinceid='" .$TaxProvinceRow[0] . "'",$db);
$TaxProvinceCount = DB_fetch_row($result);
if ($TaxProvinceCount[0]==1){
/* if its the only location in this tax authority then delete the appropriate records in TaxAuthLevels */
- $result = DB_query("DELETE FROM taxauthrates
+ $result = DB_query("DELETE FROM taxauthrates
WHERE dispatchtaxprovince='" . $TaxProvinceRow[0] . "'",$db);
}
@@ -352,7 +352,7 @@
locationname,
taxprovinces.taxprovincename as description,
managed
- FROM locations INNER JOIN taxprovinces
+ FROM locations INNER JOIN taxprovinces
ON locations.taxprovinceid=taxprovinces.taxprovinceid";
$result = DB_query($sql,$db);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:17:29
|
Revision: 4808
http://web-erp.svn.sourceforge.net/web-erp/?rev=4808&view=rev
Author: tim_schofield
Date: 2012-01-19 10:17:22 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Fix typing error in sql to check the existance of purchase orders before deletion
Modified Paths:
--------------
trunk/Locations.php
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2012-01-19 10:15:26 UTC (rev 4807)
+++ trunk/Locations.php 2012-01-19 10:17:22 UTC (rev 4808)
@@ -36,7 +36,7 @@
$sql = "SELECT * FROM custbranch
WHERE debtorno='" . $_POST['CashSaleCustomer'] . "'
AND branchcode='" . $_POST['CashSaleBranch'] . "'";
-
+
$result = DB_query($sql,$db);
if (DB_num_rows($result)==0){
$InputError = 1;
@@ -71,7 +71,7 @@
cashsalebranch ='" . $_POST['CashSaleBranch'] . "',
managed = '" . $_POST['Managed'] . "'
WHERE loccode = '" . $SelectedLocation . "'";
-
+
$ErrMsg = _('An error occurred updating the') . ' ' . $SelectedLocation . ' ' . _('location record because');
$DbgMsg = _('The SQL used to update the location record was');
@@ -245,8 +245,8 @@
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('stock movements with this Location code');
} else {
- $sql= "SELECT COUNT(*) FROM locstock
- WHERE locstock.loccode='". $SelectedLocation . "'
+ $sql= "SELECT COUNT(*) FROM locstock
+ WHERE locstock.loccode='". $SelectedLocation . "'
AND locstock.quantity !=0";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -255,7 +255,7 @@
prnMsg(_('Cannot delete this location because location stock records exist that use this location and have a quantity on hand not equal to 0'),'warn');
echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('stock items with stock on hand at this location code');
} else {
- $sql= "SELECT COUNT(*) FROM www_users
+ $sql= "SELECT COUNT(*) FROM www_users
WHERE www_users.defaultlocation='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -264,7 +264,7 @@
prnMsg(_('Cannot delete this location because it is the default location for a user') . '. ' . _('The user record must be modified first'),'warn');
echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('users using this location as their default location');
} else {
- $sql= "SELECT COUNT(*) FROM bom
+ $sql= "SELECT COUNT(*) FROM bom
WHERE bom.loccode='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -273,7 +273,7 @@
prnMsg(_('Cannot delete this location because it is the default location for a bill of material') . '. ' . _('The bill of materials must be modified first'),'warn');
echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('bom components using this location');
} else {
- $sql= "SELECT COUNT(*) FROM workcentres
+ $sql= "SELECT COUNT(*) FROM workcentres
WHERE workcentres.location='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -282,7 +282,7 @@
prnMsg( _('Cannot delete this location because it is used by some work centre records'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('works centres using this location');
} else {
- $sql= "SELECT COUNT(*) FROM workorders
+ $sql= "SELECT COUNT(*) FROM workorders
WHERE workorders.loccode='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -291,7 +291,7 @@
prnMsg( _('Cannot delete this location because it is used by some work order records'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('work orders using this location');
} else {
- $sql= "SELECT COUNT(*) FROM custbranch
+ $sql= "SELECT COUNT(*) FROM custbranch
WHERE custbranch.defaultlocation='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -300,7 +300,7 @@
prnMsg(_('Cannot delete this location because it is used by some branch records as the default location to deliver from'),'warn');
echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('branches set up to use this location by default');
} else {
- $sql= "SELECT COUNT(*) FROM purchorders WHERE intostocklocation='" . $SelectedLocation . '";
+ $sql= "SELECT COUNT(*) FROM purchorders WHERE intostocklocation='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
@@ -319,15 +319,15 @@
if (! $CancelDelete) {
/* need to figure out if this location is the only one in the same tax province */
- $result = DB_query("SELECT taxprovinceid FROM locations
+ $result = DB_query("SELECT taxprovinceid FROM locations
WHERE loccode='" . $SelectedLocation . "'",$db);
$TaxProvinceRow = DB_fetch_row($result);
- $result = DB_query("SELECT COUNT(taxprovinceid) FROM locations
+ $result = DB_query("SELECT COUNT(taxprovinceid) FROM locations
WHERE taxprovinceid='" .$TaxProvinceRow[0] . "'",$db);
$TaxProvinceCount = DB_fetch_row($result);
if ($TaxProvinceCount[0]==1){
/* if its the only location in this tax authority then delete the appropriate records in TaxAuthLevels */
- $result = DB_query("DELETE FROM taxauthrates
+ $result = DB_query("DELETE FROM taxauthrates
WHERE dispatchtaxprovince='" . $TaxProvinceRow[0] . "'",$db);
}
@@ -352,7 +352,7 @@
locationname,
taxprovinces.taxprovincename as description,
managed
- FROM locations INNER JOIN taxprovinces
+ FROM locations INNER JOIN taxprovinces
ON locations.taxprovinceid=taxprovinces.taxprovinceid";
$result = DB_query($sql,$db);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:15:37
|
Revision: 4807
http://web-erp.svn.sourceforge.net/web-erp/?rev=4807&view=rev
Author: tim_schofield
Date: 2012-01-19 10:15:26 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/MRPPlannedWorkOrders.php
Modified: trunk/MRPPlannedWorkOrders.php
===================================================================
--- trunk/MRPPlannedWorkOrders.php 2012-01-19 10:10:43 UTC (rev 4806)
+++ trunk/MRPPlannedWorkOrders.php 2012-01-19 10:15:26 UTC (rev 4807)
@@ -38,7 +38,7 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
AND stockmaster.mbflag = 'M'
ORDER BY mrpplannedorders.part,mrpplannedorders.duedate";
} elseif ($_POST['Consolidation'] == 'Weekly') {
@@ -56,7 +56,7 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
AND stockmaster.mbflag = 'M'
GROUP BY mrpplannedorders.part,
weekindex,
@@ -85,7 +85,7 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
AND stockmaster.mbflag = 'M'
GROUP BY mrpplannedorders.part,
yearmonth,
@@ -243,8 +243,8 @@
$title = _('Review/Convert MRP Planned Work Orders');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
- _('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form action="MRPConvertWorkOrders.php" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -287,7 +287,7 @@
<td class=number>' . locale_number_format($myrow['supplyquantity'],$myrow['decimalplaces']) . '</td>
<td class=number>' . locale_number_format($myrow['computedcost'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class=number>' . locale_number_format($myrow['supplyquantity'] * $myrow['computedcost'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>';
-
+
if ($_POST['Consolidation']!='None') {
echo '<td class="number">' . $myrow['consolidatedcount'] . '</td>';
}
@@ -314,27 +314,27 @@
$title=_('MRP Planned Work Orders Reporting');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
- _('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
echo '<br /><br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post"><table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
+
echo '<tr><td>' . _('Consolidation') . ':</td><td><select name="Consolidation">';
echo '<option selected value="None">' . _('None') . '</option>';
echo '<option value="Weekly">' . _('Weekly') . '</option>';
echo '<option value="Monthly">' . _('Monthly') . '</option>';
echo '</select></td></tr>';
-
+
echo '<tr><td>' . _('Print Option') . ':</td><td><select name="Fill">';
echo '<option selected value="yes">' . _('Print With Alternating Highlighted Lines') . '</option>';
echo '<option value="no">' . _('Plain Print') . '</option>';
echo '</select></td></tr>';
-
+
echo '<tr><td>' . _('Cut Off Date') . ':</td>
- <td><input type ="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="cutoffdate" size="10" value="' .date($_SESSION['DefaultDateFormat']).'"></td>
+ <td><input type ="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="cutoffdate" size="10" value="' .date($_SESSION['DefaultDateFormat']).'" /></td>
</tr>';
- echo '</table><p><div class="centre"><input type="submit" name="Review" value="' . _('Review') . '"> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '"></div>';
+ echo '</table><div class="centre"><input type="submit" name="Review" value="' . _('Review') . '"> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
include('includes/footer.inc');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:15:35
|
Revision: 4807
http://web-erp.svn.sourceforge.net/web-erp/?rev=4807&view=rev
Author: tim_schofield
Date: 2012-01-19 10:15:26 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/MRPPlannedWorkOrders.php
Modified: trunk/MRPPlannedWorkOrders.php
===================================================================
--- trunk/MRPPlannedWorkOrders.php 2012-01-19 10:10:43 UTC (rev 4806)
+++ trunk/MRPPlannedWorkOrders.php 2012-01-19 10:15:26 UTC (rev 4807)
@@ -38,7 +38,7 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
AND stockmaster.mbflag = 'M'
ORDER BY mrpplannedorders.part,mrpplannedorders.duedate";
} elseif ($_POST['Consolidation'] == 'Weekly') {
@@ -56,7 +56,7 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
AND stockmaster.mbflag = 'M'
GROUP BY mrpplannedorders.part,
weekindex,
@@ -85,7 +85,7 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
AND stockmaster.mbflag = 'M'
GROUP BY mrpplannedorders.part,
yearmonth,
@@ -243,8 +243,8 @@
$title = _('Review/Convert MRP Planned Work Orders');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
- _('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form action="MRPConvertWorkOrders.php" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -287,7 +287,7 @@
<td class=number>' . locale_number_format($myrow['supplyquantity'],$myrow['decimalplaces']) . '</td>
<td class=number>' . locale_number_format($myrow['computedcost'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class=number>' . locale_number_format($myrow['supplyquantity'] * $myrow['computedcost'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>';
-
+
if ($_POST['Consolidation']!='None') {
echo '<td class="number">' . $myrow['consolidatedcount'] . '</td>';
}
@@ -314,27 +314,27 @@
$title=_('MRP Planned Work Orders Reporting');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
- _('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
echo '<br /><br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post"><table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
+
echo '<tr><td>' . _('Consolidation') . ':</td><td><select name="Consolidation">';
echo '<option selected value="None">' . _('None') . '</option>';
echo '<option value="Weekly">' . _('Weekly') . '</option>';
echo '<option value="Monthly">' . _('Monthly') . '</option>';
echo '</select></td></tr>';
-
+
echo '<tr><td>' . _('Print Option') . ':</td><td><select name="Fill">';
echo '<option selected value="yes">' . _('Print With Alternating Highlighted Lines') . '</option>';
echo '<option value="no">' . _('Plain Print') . '</option>';
echo '</select></td></tr>';
-
+
echo '<tr><td>' . _('Cut Off Date') . ':</td>
- <td><input type ="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="cutoffdate" size="10" value="' .date($_SESSION['DefaultDateFormat']).'"></td>
+ <td><input type ="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="cutoffdate" size="10" value="' .date($_SESSION['DefaultDateFormat']).'" /></td>
</tr>';
- echo '</table><p><div class="centre"><input type="submit" name="Review" value="' . _('Review') . '"> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '"></div>';
+ echo '</table><div class="centre"><input type="submit" name="Review" value="' . _('Review') . '"> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
include('includes/footer.inc');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:10:54
|
Revision: 4806
http://web-erp.svn.sourceforge.net/web-erp/?rev=4806&view=rev
Author: tim_schofield
Date: 2012-01-19 10:10:43 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/CustLoginSetup.php
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2012-01-19 10:08:44 UTC (rev 4805)
+++ trunk/CustLoginSetup.php 2012-01-19 10:10:43 UTC (rev 4806)
@@ -15,7 +15,7 @@
prnMsg(_('A customer must first be selected before logins can be defined for it') . '<br /><br /><a href="' . $rootpath . '/SelectCustomer.php">' . _('Select A Customer') . '</a>','info');
include('includes/footer.inc');
exit;
-}
+}
echo '<a href="' . $rootpath . '/SelectCustomer.php">' . _('Back to Customers') . '</a><br />';
@@ -28,8 +28,8 @@
$myrow=DB_fetch_array($result);
$CustomerName=$myrow['name'];
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') .
- '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') .
+echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') .
'</p>
<br />';
@@ -61,7 +61,7 @@
$InputError = 1;
prnMsg(_('If you enter a Customer Code you must also enter a Branch Code valid for this Customer'),'error');
}
-
+
if ((mb_strlen($_POST['BranchCode'])>0) AND ($InputError !=1)) {
// check that the entered branch is valid for the customer code
$sql = "SELECT defaultlocation
@@ -80,7 +80,7 @@
$myrow = DB_fetch_row($result);
$InventoryLocation = $myrow[0];
}
-
+
if ($InputError !=1) {
$sql = "INSERT INTO www_users (userid,
@@ -111,7 +111,7 @@
'" . $_SESSION['DefaultDisplayRecordsMax'] . "',
'" . $_POST['Theme'] . "',
'". $_POST['UserLanguage'] ."')";
-
+
$ErrMsg = _('The user could not be added because');
$DbgMsg = _('The SQL that was used to insert the new user and failed was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:10:53
|
Revision: 4806
http://web-erp.svn.sourceforge.net/web-erp/?rev=4806&view=rev
Author: tim_schofield
Date: 2012-01-19 10:10:43 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/CustLoginSetup.php
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2012-01-19 10:08:44 UTC (rev 4805)
+++ trunk/CustLoginSetup.php 2012-01-19 10:10:43 UTC (rev 4806)
@@ -15,7 +15,7 @@
prnMsg(_('A customer must first be selected before logins can be defined for it') . '<br /><br /><a href="' . $rootpath . '/SelectCustomer.php">' . _('Select A Customer') . '</a>','info');
include('includes/footer.inc');
exit;
-}
+}
echo '<a href="' . $rootpath . '/SelectCustomer.php">' . _('Back to Customers') . '</a><br />';
@@ -28,8 +28,8 @@
$myrow=DB_fetch_array($result);
$CustomerName=$myrow['name'];
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') .
- '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') .
+echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') .
'</p>
<br />';
@@ -61,7 +61,7 @@
$InputError = 1;
prnMsg(_('If you enter a Customer Code you must also enter a Branch Code valid for this Customer'),'error');
}
-
+
if ((mb_strlen($_POST['BranchCode'])>0) AND ($InputError !=1)) {
// check that the entered branch is valid for the customer code
$sql = "SELECT defaultlocation
@@ -80,7 +80,7 @@
$myrow = DB_fetch_row($result);
$InventoryLocation = $myrow[0];
}
-
+
if ($InputError !=1) {
$sql = "INSERT INTO www_users (userid,
@@ -111,7 +111,7 @@
'" . $_SESSION['DefaultDisplayRecordsMax'] . "',
'" . $_POST['Theme'] . "',
'". $_POST['UserLanguage'] ."')";
-
+
$ErrMsg = _('The user could not be added because');
$DbgMsg = _('The SQL that was used to insert the new user and failed was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:08:55
|
Revision: 4805
http://web-erp.svn.sourceforge.net/web-erp/?rev=4805&view=rev
Author: tim_schofield
Date: 2012-01-19 10:08:44 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/GLCodesInquiry.php
Modified: trunk/GLCodesInquiry.php
===================================================================
--- trunk/GLCodesInquiry.php 2012-01-19 07:01:00 UTC (rev 4804)
+++ trunk/GLCodesInquiry.php 2012-01-19 10:08:44 UTC (rev 4805)
@@ -20,7 +20,7 @@
/*show a table of the orders returned by the SQL */
-echo '<table cellpadding=2 colspan=2>
+echo '<table cellpadding="2" colspan="2">
<tr>
<th>' . _('Group') . '</font></th>
<th>' . _('Code') . '</font></th>
@@ -41,18 +41,18 @@
}
if ($myrow['group_']== $ActGrp){
- printf("<td></td>
- <td><font size=2>%s</font></td>
- <td><font size=2>%s</font></td>
- </tr>",
+ printf('<td></td>
+ <td><font size="2">%s</font></td>
+ <td><font size="2">%s</font></td>
+ </tr>',
$myrow['accountcode'],
$myrow['accountname']);
} else {
$ActGrp = $myrow['group_'];
- printf("<td><font size=2>%s</font></td>
- <td><font size=2>%s</font></td>
- <td><font size=2>%s</font></td>
- </tr>",
+ printf('<td><font size="2">%s</font></td>
+ <td><font size="2">%s</font></td>
+ <td><font size="2">%s</font></td>
+ </tr>',
$myrow['group_'],
$myrow['accountcode'],
$myrow['accountname']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-19 10:08:55
|
Revision: 4805
http://web-erp.svn.sourceforge.net/web-erp/?rev=4805&view=rev
Author: tim_schofield
Date: 2012-01-19 10:08:44 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Merge Tims branch into trunk: Fix xhtml errors
Modified Paths:
--------------
trunk/GLCodesInquiry.php
Modified: trunk/GLCodesInquiry.php
===================================================================
--- trunk/GLCodesInquiry.php 2012-01-19 07:01:00 UTC (rev 4804)
+++ trunk/GLCodesInquiry.php 2012-01-19 10:08:44 UTC (rev 4805)
@@ -20,7 +20,7 @@
/*show a table of the orders returned by the SQL */
-echo '<table cellpadding=2 colspan=2>
+echo '<table cellpadding="2" colspan="2">
<tr>
<th>' . _('Group') . '</font></th>
<th>' . _('Code') . '</font></th>
@@ -41,18 +41,18 @@
}
if ($myrow['group_']== $ActGrp){
- printf("<td></td>
- <td><font size=2>%s</font></td>
- <td><font size=2>%s</font></td>
- </tr>",
+ printf('<td></td>
+ <td><font size="2">%s</font></td>
+ <td><font size="2">%s</font></td>
+ </tr>',
$myrow['accountcode'],
$myrow['accountname']);
} else {
$ActGrp = $myrow['group_'];
- printf("<td><font size=2>%s</font></td>
- <td><font size=2>%s</font></td>
- <td><font size=2>%s</font></td>
- </tr>",
+ printf('<td><font size="2">%s</font></td>
+ <td><font size="2">%s</font></td>
+ <td><font size="2">%s</font></td>
+ </tr>',
$myrow['group_'],
$myrow['accountcode'],
$myrow['accountname']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-19 07:01:06
|
Revision: 4804
http://web-erp.svn.sourceforge.net/web-erp/?rev=4804&view=rev
Author: daintree
Date: 2012-01-19 07:01:00 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Locations.php
trunk/Prices.php
trunk/SelectOrderItems.php
trunk/StockCheck.php
trunk/doc/Change.log
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2012-01-18 23:03:49 UTC (rev 4803)
+++ trunk/Locations.php 2012-01-19 07:01:00 UTC (rev 4804)
@@ -290,7 +290,7 @@
$CancelDelete = 1;
prnMsg( _('Cannot delete this location because it is used by some work order records'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('work orders using this location');
- }else {
+ } else {
$sql= "SELECT COUNT(*) FROM custbranch
WHERE custbranch.defaultlocation='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
@@ -299,6 +299,15 @@
$CancelDelete = 1;
prnMsg(_('Cannot delete this location because it is used by some branch records as the default location to deliver from'),'warn');
echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('branches set up to use this location by default');
+ } else {
+ $sql= "SELECT COUNT(*) FROM purchorders WHERE intostocklocation='" . $SelectedLocation . '";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0]>0) {
+ $CancelDelete = 1;
+ prnMsg(_('Cannot delete this location because it is used by some purchase order records as the location to receive stock into'),'warn');
+ echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('purchase orders set up to use this location as the receiving location');
+ }
}
}
}
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2012-01-18 23:03:49 UTC (rev 4803)
+++ trunk/Prices.php 2012-01-19 07:01:00 UTC (rev 4804)
@@ -346,7 +346,7 @@
if(isset($_POST['Price'])) {
echo $_POST['Price'];
}
- ?>">
+ ?>" />
</td></tr>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-01-18 23:03:49 UTC (rev 4803)
+++ trunk/SelectOrderItems.php 2012-01-19 07:01:00 UTC (rev 4804)
@@ -1593,6 +1593,7 @@
if ($j==1) {
$jsCall = '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.itm'.$myrow['stockid'].');}</script>';
}
+ $i++;
$j++;
#end of page full new headings if
}
Modified: trunk/StockCheck.php
===================================================================
--- trunk/StockCheck.php 2012-01-18 23:03:49 UTC (rev 4803)
+++ trunk/StockCheck.php 2012-01-19 07:01:00 UTC (rev 4804)
@@ -31,8 +31,7 @@
'" . Date('Y-m-d') . "'
FROM locstock,
stockmaster
- WHERE locstock.stockid=stockmaster.stockid and
- locstock.loccode='" . $_POST['Location'] . "' AND
+ WHERE locstock.stockid=stockmaster.stockid AND locstock.loccode='" . $_POST['Location'] . "' AND
stockmaster.categoryid>='" . $_POST['FromCriteria'] . "' AND
stockmaster.categoryid<='" . $_POST['ToCriteria'] . "' AND
stockmaster.mbflag!='A' AND
@@ -212,8 +211,8 @@
INNER JOIN stockmaster
ON stockmaster.stockid=bom.parent
WHERE salesorders.fromstkloc='" . $_POST['Location'] . "'
- AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0 AND
- bom.component='" . $InventoryCheckRow['stockid'] . "' AND
+ AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+ AND bom.component='" . $InventoryCheckRow['stockid'] . "'
AND stockmaster.mbflag='A'";
$DemandResult = DB_query($sql,$db,'','',false,false);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-18 23:03:49 UTC (rev 4803)
+++ trunk/doc/Change.log 2012-01-19 07:01:00 UTC (rev 4804)
@@ -1,5 +1,8 @@
webERP Change Log
+19/1/12 Phil: Check on deletion of a location to see if any purchase orders exist prior to deletion
+19/1/12 Phil:StockCheck.php fixed error in SQL two ANDs in calculating quantity demand reported by Ricard
+19/1/12 Paul Harness: SelectOrderItems.php $i++ - in code for frequently ordered items.
17/1/12 Vitaly: Removed unused .table2 declaration from default.css. Fixed border settings in .table1.
16/1/12 Phil: Made StockReorderLevel.php just update changed fields rather than update all locations even though they may not have changed.
8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-19 07:01:06
|
Revision: 4804
http://web-erp.svn.sourceforge.net/web-erp/?rev=4804&view=rev
Author: daintree
Date: 2012-01-19 07:01:00 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Locations.php
trunk/Prices.php
trunk/SelectOrderItems.php
trunk/StockCheck.php
trunk/doc/Change.log
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2012-01-18 23:03:49 UTC (rev 4803)
+++ trunk/Locations.php 2012-01-19 07:01:00 UTC (rev 4804)
@@ -290,7 +290,7 @@
$CancelDelete = 1;
prnMsg( _('Cannot delete this location because it is used by some work order records'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('work orders using this location');
- }else {
+ } else {
$sql= "SELECT COUNT(*) FROM custbranch
WHERE custbranch.defaultlocation='" . $SelectedLocation . "'";
$result = DB_query($sql,$db);
@@ -299,6 +299,15 @@
$CancelDelete = 1;
prnMsg(_('Cannot delete this location because it is used by some branch records as the default location to deliver from'),'warn');
echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('branches set up to use this location by default');
+ } else {
+ $sql= "SELECT COUNT(*) FROM purchorders WHERE intostocklocation='" . $SelectedLocation . '";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0]>0) {
+ $CancelDelete = 1;
+ prnMsg(_('Cannot delete this location because it is used by some purchase order records as the location to receive stock into'),'warn');
+ echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('purchase orders set up to use this location as the receiving location');
+ }
}
}
}
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2012-01-18 23:03:49 UTC (rev 4803)
+++ trunk/Prices.php 2012-01-19 07:01:00 UTC (rev 4804)
@@ -346,7 +346,7 @@
if(isset($_POST['Price'])) {
echo $_POST['Price'];
}
- ?>">
+ ?>" />
</td></tr>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-01-18 23:03:49 UTC (rev 4803)
+++ trunk/SelectOrderItems.php 2012-01-19 07:01:00 UTC (rev 4804)
@@ -1593,6 +1593,7 @@
if ($j==1) {
$jsCall = '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.itm'.$myrow['stockid'].');}</script>';
}
+ $i++;
$j++;
#end of page full new headings if
}
Modified: trunk/StockCheck.php
===================================================================
--- trunk/StockCheck.php 2012-01-18 23:03:49 UTC (rev 4803)
+++ trunk/StockCheck.php 2012-01-19 07:01:00 UTC (rev 4804)
@@ -31,8 +31,7 @@
'" . Date('Y-m-d') . "'
FROM locstock,
stockmaster
- WHERE locstock.stockid=stockmaster.stockid and
- locstock.loccode='" . $_POST['Location'] . "' AND
+ WHERE locstock.stockid=stockmaster.stockid AND locstock.loccode='" . $_POST['Location'] . "' AND
stockmaster.categoryid>='" . $_POST['FromCriteria'] . "' AND
stockmaster.categoryid<='" . $_POST['ToCriteria'] . "' AND
stockmaster.mbflag!='A' AND
@@ -212,8 +211,8 @@
INNER JOIN stockmaster
ON stockmaster.stockid=bom.parent
WHERE salesorders.fromstkloc='" . $_POST['Location'] . "'
- AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0 AND
- bom.component='" . $InventoryCheckRow['stockid'] . "' AND
+ AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+ AND bom.component='" . $InventoryCheckRow['stockid'] . "'
AND stockmaster.mbflag='A'";
$DemandResult = DB_query($sql,$db,'','',false,false);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-18 23:03:49 UTC (rev 4803)
+++ trunk/doc/Change.log 2012-01-19 07:01:00 UTC (rev 4804)
@@ -1,5 +1,8 @@
webERP Change Log
+19/1/12 Phil: Check on deletion of a location to see if any purchase orders exist prior to deletion
+19/1/12 Phil:StockCheck.php fixed error in SQL two ANDs in calculating quantity demand reported by Ricard
+19/1/12 Paul Harness: SelectOrderItems.php $i++ - in code for frequently ordered items.
17/1/12 Vitaly: Removed unused .table2 declaration from default.css. Fixed border settings in .table1.
16/1/12 Phil: Made StockReorderLevel.php just update changed fields rather than update all locations even though they may not have changed.
8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-01-18 23:03:57
|
Revision: 4803
http://web-erp.svn.sourceforge.net/web-erp/?rev=4803&view=rev
Author: vvs2012
Date: 2012-01-18 23:03:49 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Removed unused .table2 declaration from default.css. Fixed border settings in .table1. Corrected syntax in index.php, Prices.php, SupplierCredit.php
Modified Paths:
--------------
trunk/Prices.php
trunk/SupplierCredit.php
trunk/css/aguapop/default.css
trunk/css/aguapop/default.css_large
trunk/css/default/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/jelly/default.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/doc/Change.log
trunk/index.php
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/Prices.php 2012-01-18 23:03:49 UTC (rev 4803)
@@ -342,11 +342,11 @@
<tr><td><?php echo _('Price'); ?>:</td>
<td>
<input type="text" class="number" name="Price" size=12 maxlength=11 value=
- <?php
+ "<?php
if(isset($_POST['Price'])) {
echo $_POST['Price'];
}
- ?> >
+ ?>">
</td></tr>
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/SupplierCredit.php 2012-01-18 23:03:49 UTC (rev 4803)
@@ -637,7 +637,7 @@
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount' . $Tax->TaxCalculationOrder]);
}
- $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount
+ $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount;
}
$InputError = False;
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/aguapop/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -268,16 +268,9 @@
.table1 {
width:90%;
background: whitesmoke;
- border: 0px 0px 2px 2px darkslategray solid;
+ border: 1px solid darkslategray;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: whitesmoke;
- border: 0px 0px 2px 2px darkslategray solid;
- margin: 0 auto;
-}
input.address3 {
text-transform: uppercase;
Modified: trunk/css/aguapop/default.css_large
===================================================================
--- trunk/css/aguapop/default.css_large 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/aguapop/default.css_large 2012-01-18 23:03:49 UTC (rev 4803)
@@ -268,16 +268,9 @@
.table1 {
width:90%;
background: whitesmoke;
- border: 0px 0px 2px 2px darkslategray solid;
+ border: 1px solid darkslategray;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: whitesmoke;
- border: 0px 0px 2px 2px darkslategray solid;
- margin: 0 auto;
-}
input.address3 {
text-transform: uppercase;
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/default/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -248,16 +248,9 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
-}
input.address3 {
text-transform: uppercase;
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/fresh/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -248,16 +248,10 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
-}
+
input.address3 {
text-transform: uppercase;
}
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/gel/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -277,18 +277,10 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
- margin: 0 auto;
-}
+
input.address3 {
text-transform: uppercase;
}
Modified: trunk/css/jelly/default.css
===================================================================
--- trunk/css/jelly/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/jelly/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -316,18 +316,10 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
-}
-
input.address3 {
text-transform: uppercase;
}
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/professional/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -249,16 +249,10 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
-}
+
input.address3 {
text-transform: uppercase;
}
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/professional-rtl/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -243,18 +243,10 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
- margin: 0 auto;
-}
+
input.address3 {
text-transform: uppercase;
}
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/silverwolf/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
/*--------------------------------------------------\
| | | default.css |
|---------------------------------------------------|
@@ -322,18 +322,9 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
+ border: 1px solid #222;
margin: 0 auto;
}
-// Table type is used for UI tables type 2
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
- margin: 0 auto;
-}
input.address3 {
text-transform: uppercase;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/doc/Change.log 2012-01-18 23:03:49 UTC (rev 4803)
@@ -1,5 +1,6 @@
webERP Change Log
+17/1/12 Vitaly: Removed unused .table2 declaration from default.css. Fixed border settings in .table1.
16/1/12 Phil: Made StockReorderLevel.php just update changed fields rather than update all locations even though they may not have changed.
8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/index.php 2012-01-18 23:03:49 UTC (rev 4803)
@@ -274,7 +274,7 @@
<tr>
<td class="menu_group_items">
- <table width="100%"class="table_index">
+ <table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
<?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php">' . _('Select Order to Invoice') . '</a></p>'; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vv...@us...> - 2012-01-18 23:03:56
|
Revision: 4803
http://web-erp.svn.sourceforge.net/web-erp/?rev=4803&view=rev
Author: vvs2012
Date: 2012-01-18 23:03:49 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Removed unused .table2 declaration from default.css. Fixed border settings in .table1. Corrected syntax in index.php, Prices.php, SupplierCredit.php
Modified Paths:
--------------
trunk/Prices.php
trunk/SupplierCredit.php
trunk/css/aguapop/default.css
trunk/css/aguapop/default.css_large
trunk/css/default/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/jelly/default.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/doc/Change.log
trunk/index.php
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/Prices.php 2012-01-18 23:03:49 UTC (rev 4803)
@@ -342,11 +342,11 @@
<tr><td><?php echo _('Price'); ?>:</td>
<td>
<input type="text" class="number" name="Price" size=12 maxlength=11 value=
- <?php
+ "<?php
if(isset($_POST['Price'])) {
echo $_POST['Price'];
}
- ?> >
+ ?>">
</td></tr>
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/SupplierCredit.php 2012-01-18 23:03:49 UTC (rev 4803)
@@ -637,7 +637,7 @@
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount' . $Tax->TaxCalculationOrder]);
}
- $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount
+ $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount;
}
$InputError = False;
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/aguapop/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -268,16 +268,9 @@
.table1 {
width:90%;
background: whitesmoke;
- border: 0px 0px 2px 2px darkslategray solid;
+ border: 1px solid darkslategray;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: whitesmoke;
- border: 0px 0px 2px 2px darkslategray solid;
- margin: 0 auto;
-}
input.address3 {
text-transform: uppercase;
Modified: trunk/css/aguapop/default.css_large
===================================================================
--- trunk/css/aguapop/default.css_large 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/aguapop/default.css_large 2012-01-18 23:03:49 UTC (rev 4803)
@@ -268,16 +268,9 @@
.table1 {
width:90%;
background: whitesmoke;
- border: 0px 0px 2px 2px darkslategray solid;
+ border: 1px solid darkslategray;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: whitesmoke;
- border: 0px 0px 2px 2px darkslategray solid;
- margin: 0 auto;
-}
input.address3 {
text-transform: uppercase;
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/default/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -248,16 +248,9 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
-}
input.address3 {
text-transform: uppercase;
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/fresh/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -248,16 +248,10 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
-}
+
input.address3 {
text-transform: uppercase;
}
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/gel/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -277,18 +277,10 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
- margin: 0 auto;
-}
+
input.address3 {
text-transform: uppercase;
}
Modified: trunk/css/jelly/default.css
===================================================================
--- trunk/css/jelly/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/jelly/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -316,18 +316,10 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
-}
-
input.address3 {
text-transform: uppercase;
}
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/professional/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -249,16 +249,10 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- margin: 0 auto;
-}
+
input.address3 {
text-transform: uppercase;
}
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/professional-rtl/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -243,18 +243,10 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
+ border: 1px solid #222;
margin: 0 auto;
}
-/* Table type is used for UI tables type 2 */
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
- margin: 0 auto;
-}
+
input.address3 {
text-transform: uppercase;
}
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/css/silverwolf/default.css 2012-01-18 23:03:49 UTC (rev 4803)
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
/*--------------------------------------------------\
| | | default.css |
|---------------------------------------------------|
@@ -322,18 +322,9 @@
.table1 {
width:90%;
background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
+ border: 1px solid #222;
margin: 0 auto;
}
-// Table type is used for UI tables type 2
-.table2 {
- width:90%;
- background: #eee;
- border: 0px 0px 2px 2px #222 solid;
- background: #eee;
- margin: 0 auto;
-}
input.address3 {
text-transform: uppercase;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/doc/Change.log 2012-01-18 23:03:49 UTC (rev 4803)
@@ -1,5 +1,6 @@
webERP Change Log
+17/1/12 Vitaly: Removed unused .table2 declaration from default.css. Fixed border settings in .table1.
16/1/12 Phil: Made StockReorderLevel.php just update changed fields rather than update all locations even though they may not have changed.
8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2012-01-18 21:20:19 UTC (rev 4802)
+++ trunk/index.php 2012-01-18 23:03:49 UTC (rev 4803)
@@ -274,7 +274,7 @@
<tr>
<td class="menu_group_items">
- <table width="100%"class="table_index">
+ <table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
<?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php">' . _('Select Order to Invoice') . '</a></p>'; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-18 21:20:25
|
Revision: 4802
http://web-erp.svn.sourceforge.net/web-erp/?rev=4802&view=rev
Author: tim_schofield
Date: 2012-01-18 21:20:19 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Add the email field to the screen output of the search
Modified Paths:
--------------
trunk/SelectCustomer.php
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-01-18 21:02:16 UTC (rev 4801)
+++ trunk/SelectCustomer.php 2012-01-18 21:20:19 UTC (rev 4802)
@@ -418,6 +418,7 @@
<th>' . _('Type') . '</th>
<th>' . _('Phone') . '</th>
<th>' . _('Fax') . '</th>
+ <th>' . _('Email') . '</th>
</tr>';
echo $TableHeader;
$j = 1;
@@ -454,7 +455,9 @@
<td><font size=1>' . $myrow['contactname'] . '</font></td>
<td><font size=1>' . $myrow['typename'] . '</font></td>
<td><font size=1>' . $myrow['phoneno'] . '</font></td>
- <td><font size=1>' . $myrow['faxno'] . '</font></td></tr>';
+ <td><font size=1>' . $myrow['faxno'] . '</font></td>
+ <td><font size=1>' . $myrow['email'] . '</font></td>
+ </tr>';
$i++;
$j++;//row counter
if ($j == 11 AND ($RowIndex + 1 != $_SESSION['DisplayRecordsMax'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-18 21:20:25
|
Revision: 4802
http://web-erp.svn.sourceforge.net/web-erp/?rev=4802&view=rev
Author: tim_schofield
Date: 2012-01-18 21:20:19 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Add the email field to the screen output of the search
Modified Paths:
--------------
trunk/SelectCustomer.php
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-01-18 21:02:16 UTC (rev 4801)
+++ trunk/SelectCustomer.php 2012-01-18 21:20:19 UTC (rev 4802)
@@ -418,6 +418,7 @@
<th>' . _('Type') . '</th>
<th>' . _('Phone') . '</th>
<th>' . _('Fax') . '</th>
+ <th>' . _('Email') . '</th>
</tr>';
echo $TableHeader;
$j = 1;
@@ -454,7 +455,9 @@
<td><font size=1>' . $myrow['contactname'] . '</font></td>
<td><font size=1>' . $myrow['typename'] . '</font></td>
<td><font size=1>' . $myrow['phoneno'] . '</font></td>
- <td><font size=1>' . $myrow['faxno'] . '</font></td></tr>';
+ <td><font size=1>' . $myrow['faxno'] . '</font></td>
+ <td><font size=1>' . $myrow['email'] . '</font></td>
+ </tr>';
$i++;
$j++;//row counter
if ($j == 11 AND ($RowIndex + 1 != $_SESSION['DisplayRecordsMax'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-18 21:02:23
|
Revision: 4801
http://web-erp.svn.sourceforge.net/web-erp/?rev=4801&view=rev
Author: tim_schofield
Date: 2012-01-18 21:02:16 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Add the email field to the csv output
Modified Paths:
--------------
trunk/SelectCustomer.php
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-01-16 09:24:14 UTC (rev 4800)
+++ trunk/SelectCustomer.php 2012-01-18 21:02:16 UTC (rev 4801)
@@ -85,24 +85,24 @@
$_POST['PageOffset'] = 1;
}
}
-if (isset($_POST['Search'])
- OR isset($_POST['CSV'])
- OR isset($_POST['Go'])
- OR isset($_POST['Next'])
+if (isset($_POST['Search'])
+ OR isset($_POST['CSV'])
+ OR isset($_POST['Go'])
+ OR isset($_POST['Next'])
OR isset($_POST['Previous'])) {
-
+
unset($_POST['JustSelectedACustomer']);
if (isset($_POST['Search'])) {
$_POST['PageOffset'] = 1;
}
-
- if (($_POST['Keywords'] == '')
- AND ($_POST['CustCode'] == '')
- AND ($_POST['CustPhone'] == '')
- AND ($_POST['CustType'] == 'ALL')
- AND ($_POST['Area'] == 'ALL')
+
+ if (($_POST['Keywords'] == '')
+ AND ($_POST['CustCode'] == '')
+ AND ($_POST['CustPhone'] == '')
+ AND ($_POST['CustType'] == 'ALL')
+ AND ($_POST['Area'] == 'ALL')
AND ($_POST['CustAdd'] == '')) {
-
+
//no criteria set then default to all customers
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
@@ -115,7 +115,8 @@
custbranch.contactname,
debtortype.typename,
custbranch.phoneno,
- custbranch.faxno
+ custbranch.faxno,
+ custbranch.email
FROM debtorsmaster LEFT JOIN custbranch
ON debtorsmaster.debtorno = custbranch.debtorno
INNER JOIN debtortype
@@ -136,22 +137,23 @@
custbranch.contactname,
debtortype.typename,
custbranch.phoneno,
- custbranch.faxno
+ custbranch.faxno,
+ custbranch.email
FROM debtorsmaster INNER JOIN debtortype
ON debtorsmaster.typeid = debtortype.typeid
- LEFT JOIN custbranch
+ LEFT JOIN custbranch
ON debtorsmaster.debtorno = custbranch.debtorno
- WHERE debtorsmaster.name " . LIKE . " '%" . $SearchKeywords . "%'
- AND debtorsmaster.debtorno " . LIKE . " '%" . $_POST['CustCode'] . "%'
- AND custbranch.phoneno " . LIKE . " '%" . $_POST['CustPhone'] . "%'
+ WHERE debtorsmaster.name " . LIKE . " '%" . $SearchKeywords . "%'
+ AND debtorsmaster.debtorno " . LIKE . " '%" . $_POST['CustCode'] . "%'
+ AND custbranch.phoneno " . LIKE . " '%" . $_POST['CustPhone'] . "%'
AND (debtorsmaster.address1 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
OR debtorsmaster.address2 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
OR debtorsmaster.address3 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
OR debtorsmaster.address4 " . LIKE . " '%" . $_POST['CustAdd'] . "%')";
-
+
if (mb_strlen($_POST['CustType']) > 0 AND $_POST['CustType']!='ALL') {
$SQL .= " AND debtortype.typename = '" . $_POST['CustType'] . "'";
- }
+ }
if (mb_strlen($_POST['Area']) > 0 AND $_POST['Area']!='ALL') {
$SQL .= " AND custbranch.area = '" . $_POST['Area'] . "'";
}
@@ -428,7 +430,7 @@
echo '<br /><p class="page_title_text"><a href="' . $FileName . '">' . _('Click to view the csv Search Result') . '</p>';
$fp = fopen($FileName, 'w');
while ($myrow2 = DB_fetch_array($result)) {
- fwrite($fp, $myrow2['debtorno'] . ',' . str_replace(',', '', $myrow2['name']) . ',' . str_replace(',', '', $myrow2['address1']) . ',' . str_replace(',', '', $myrow2['address2']) . ',' . str_replace(',', '', $myrow2['address3']) . ',' . str_replace(',', '', $myrow2['address4']) . ',' . str_replace(',', '', $myrow2['contactname']) . ',' . str_replace(',', '', $myrow2['typename']) . ',' . $myrow2['phoneno'] . ',' . $myrow2['faxno'] . "\n");
+ fwrite($fp, $myrow2['debtorno'] . ',' . str_replace(',', '', $myrow2['name']) . ',' . str_replace(',', '', $myrow2['address1']) . ',' . str_replace(',', '', $myrow2['address2']) . ',' . str_replace(',', '', $myrow2['address3']) . ',' . str_replace(',', '', $myrow2['address4']) . ',' . str_replace(',', '', $myrow2['contactname']) . ',' . str_replace(',', '', $myrow2['typename']) . ',' . $myrow2['phoneno'] . ',' . $myrow2['faxno'] . ',' . $myrow2['email'] . "\n");
}
echo '</div>';
}
@@ -517,7 +519,7 @@
// Extended Customer Info only if selected in Configuration
if ($_SESSION['Extended_CustomerInfo'] == 1) {
if ($_SESSION['CustomerID'] != '') {
- $sql = "SELECT debtortype.typeid,
+ $sql = "SELECT debtortype.typeid,
debtortype.typename
FROM debtorsmaster INNER JOIN debtortype
ON debtorsmaster.typeid = debtortype.typeid
@@ -533,11 +535,11 @@
$SQL = "SELECT debtorsmaster.clientsince,
(TO_DAYS(date(now())) - TO_DAYS(date(debtorsmaster.clientsince))) as customersincedays,
(TO_DAYS(date(now())) - TO_DAYS(date(debtorsmaster.lastpaiddate))) as lastpaiddays,
- debtorsmaster.paymentterms,
- debtorsmaster.lastpaid,
+ debtorsmaster.paymentterms,
+ debtorsmaster.lastpaid,
debtorsmaster.lastpaiddate,
currencies.decimalplaces AS currdecimalplaces
- FROM debtorsmaster INNER JOIN currencies
+ FROM debtorsmaster INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtorsmaster.debtorno ='" . $_SESSION['CustomerID'] . "'";
$DataResult = DB_query($SQL, $db);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-01-18 21:02:23
|
Revision: 4801
http://web-erp.svn.sourceforge.net/web-erp/?rev=4801&view=rev
Author: tim_schofield
Date: 2012-01-18 21:02:16 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Add the email field to the csv output
Modified Paths:
--------------
trunk/SelectCustomer.php
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-01-16 09:24:14 UTC (rev 4800)
+++ trunk/SelectCustomer.php 2012-01-18 21:02:16 UTC (rev 4801)
@@ -85,24 +85,24 @@
$_POST['PageOffset'] = 1;
}
}
-if (isset($_POST['Search'])
- OR isset($_POST['CSV'])
- OR isset($_POST['Go'])
- OR isset($_POST['Next'])
+if (isset($_POST['Search'])
+ OR isset($_POST['CSV'])
+ OR isset($_POST['Go'])
+ OR isset($_POST['Next'])
OR isset($_POST['Previous'])) {
-
+
unset($_POST['JustSelectedACustomer']);
if (isset($_POST['Search'])) {
$_POST['PageOffset'] = 1;
}
-
- if (($_POST['Keywords'] == '')
- AND ($_POST['CustCode'] == '')
- AND ($_POST['CustPhone'] == '')
- AND ($_POST['CustType'] == 'ALL')
- AND ($_POST['Area'] == 'ALL')
+
+ if (($_POST['Keywords'] == '')
+ AND ($_POST['CustCode'] == '')
+ AND ($_POST['CustPhone'] == '')
+ AND ($_POST['CustType'] == 'ALL')
+ AND ($_POST['Area'] == 'ALL')
AND ($_POST['CustAdd'] == '')) {
-
+
//no criteria set then default to all customers
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
@@ -115,7 +115,8 @@
custbranch.contactname,
debtortype.typename,
custbranch.phoneno,
- custbranch.faxno
+ custbranch.faxno,
+ custbranch.email
FROM debtorsmaster LEFT JOIN custbranch
ON debtorsmaster.debtorno = custbranch.debtorno
INNER JOIN debtortype
@@ -136,22 +137,23 @@
custbranch.contactname,
debtortype.typename,
custbranch.phoneno,
- custbranch.faxno
+ custbranch.faxno,
+ custbranch.email
FROM debtorsmaster INNER JOIN debtortype
ON debtorsmaster.typeid = debtortype.typeid
- LEFT JOIN custbranch
+ LEFT JOIN custbranch
ON debtorsmaster.debtorno = custbranch.debtorno
- WHERE debtorsmaster.name " . LIKE . " '%" . $SearchKeywords . "%'
- AND debtorsmaster.debtorno " . LIKE . " '%" . $_POST['CustCode'] . "%'
- AND custbranch.phoneno " . LIKE . " '%" . $_POST['CustPhone'] . "%'
+ WHERE debtorsmaster.name " . LIKE . " '%" . $SearchKeywords . "%'
+ AND debtorsmaster.debtorno " . LIKE . " '%" . $_POST['CustCode'] . "%'
+ AND custbranch.phoneno " . LIKE . " '%" . $_POST['CustPhone'] . "%'
AND (debtorsmaster.address1 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
OR debtorsmaster.address2 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
OR debtorsmaster.address3 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
OR debtorsmaster.address4 " . LIKE . " '%" . $_POST['CustAdd'] . "%')";
-
+
if (mb_strlen($_POST['CustType']) > 0 AND $_POST['CustType']!='ALL') {
$SQL .= " AND debtortype.typename = '" . $_POST['CustType'] . "'";
- }
+ }
if (mb_strlen($_POST['Area']) > 0 AND $_POST['Area']!='ALL') {
$SQL .= " AND custbranch.area = '" . $_POST['Area'] . "'";
}
@@ -428,7 +430,7 @@
echo '<br /><p class="page_title_text"><a href="' . $FileName . '">' . _('Click to view the csv Search Result') . '</p>';
$fp = fopen($FileName, 'w');
while ($myrow2 = DB_fetch_array($result)) {
- fwrite($fp, $myrow2['debtorno'] . ',' . str_replace(',', '', $myrow2['name']) . ',' . str_replace(',', '', $myrow2['address1']) . ',' . str_replace(',', '', $myrow2['address2']) . ',' . str_replace(',', '', $myrow2['address3']) . ',' . str_replace(',', '', $myrow2['address4']) . ',' . str_replace(',', '', $myrow2['contactname']) . ',' . str_replace(',', '', $myrow2['typename']) . ',' . $myrow2['phoneno'] . ',' . $myrow2['faxno'] . "\n");
+ fwrite($fp, $myrow2['debtorno'] . ',' . str_replace(',', '', $myrow2['name']) . ',' . str_replace(',', '', $myrow2['address1']) . ',' . str_replace(',', '', $myrow2['address2']) . ',' . str_replace(',', '', $myrow2['address3']) . ',' . str_replace(',', '', $myrow2['address4']) . ',' . str_replace(',', '', $myrow2['contactname']) . ',' . str_replace(',', '', $myrow2['typename']) . ',' . $myrow2['phoneno'] . ',' . $myrow2['faxno'] . ',' . $myrow2['email'] . "\n");
}
echo '</div>';
}
@@ -517,7 +519,7 @@
// Extended Customer Info only if selected in Configuration
if ($_SESSION['Extended_CustomerInfo'] == 1) {
if ($_SESSION['CustomerID'] != '') {
- $sql = "SELECT debtortype.typeid,
+ $sql = "SELECT debtortype.typeid,
debtortype.typename
FROM debtorsmaster INNER JOIN debtortype
ON debtorsmaster.typeid = debtortype.typeid
@@ -533,11 +535,11 @@
$SQL = "SELECT debtorsmaster.clientsince,
(TO_DAYS(date(now())) - TO_DAYS(date(debtorsmaster.clientsince))) as customersincedays,
(TO_DAYS(date(now())) - TO_DAYS(date(debtorsmaster.lastpaiddate))) as lastpaiddays,
- debtorsmaster.paymentterms,
- debtorsmaster.lastpaid,
+ debtorsmaster.paymentterms,
+ debtorsmaster.lastpaid,
debtorsmaster.lastpaiddate,
currencies.decimalplaces AS currdecimalplaces
- FROM debtorsmaster INNER JOIN currencies
+ FROM debtorsmaster INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtorsmaster.debtorno ='" . $_SESSION['CustomerID'] . "'";
$DataResult = DB_query($SQL, $db);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
15 messages has been excluded from this view by a project administrator.
