Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5445] trunk
|
From: <dai...@us...> - 2012-06-21 19:36:26
|
Revision: 5445
http://web-erp.svn.sourceforge.net/web-erp/?rev=5445&view=rev
Author: daintree
Date: 2012-06-21 19:36:19 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
tooltip of long description
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/TaxCategories.php
trunk/api/api_stock.php
trunk/api/api_taxgroups.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/includes/MiscFunctions.php
trunk/sql/mysql/weberp-demo.sql
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/SelectProduct.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -560,6 +560,7 @@
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
SUM(locstock.quantity) AS qoh,
stockmaster.units,
stockmaster.mbflag,
@@ -573,6 +574,7 @@
AND stockmaster.description " . LIKE . " '$SearchString'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -581,6 +583,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
SUM(locstock.quantity) AS qoh,
stockmaster.units,
stockmaster.mbflag,
@@ -593,6 +596,7 @@
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -604,6 +608,7 @@
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
SUM(locstock.quantity) AS qoh,
@@ -617,6 +622,7 @@
AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -625,6 +631,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
sum(locstock.quantity) as qoh,
@@ -637,6 +644,7 @@
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -647,6 +655,7 @@
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
SUM(locstock.quantity) AS qoh,
@@ -659,6 +668,7 @@
WHERE stockmaster.stockid=locstock.stockid
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -667,6 +677,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
SUM(locstock.quantity) AS qoh,
@@ -678,6 +689,7 @@
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -773,7 +785,7 @@
}
echo '<td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
- <td>'.$myrow['description'].'</td>
+ <td title="'. $myrow['longdescription'] . '">' . $myrow['description'] . '</td>
<td class="number">' . $qoh . '</td>
<td>' . $myrow['units'] . '</td>
<td>' . $ItemStatus . '</td>
Modified: trunk/TaxCategories.php
===================================================================
--- trunk/TaxCategories.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/TaxCategories.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -121,9 +121,9 @@
// This is probably the safest way there is
prnMsg( _('Cannot delete this tax category because it no longer exists'),'warn');
} else {
- $myrow = DB_fetch_row($result);
- $OldTaxCategoryName = $myrow[0];
- $sql= "SELECT COUNT(*) FROM stockmaster WHERE taxcatid ".LIKE." '" . $OldTaxCategoryName . "'";
+ $myrow = DB_fetch_array($result);
+ $TaxCatName = $myrow['taxcatname'];
+ $sql= "SELECT COUNT(*) FROM stockmaster WHERE taxcatid = '" . $SelectedTaxCategory . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
@@ -134,7 +134,7 @@
$result = DB_query($sql,$db);
$sql = "DELETE FROM taxcategories WHERE taxcatid = '" . $SelectedTaxCategory . "'";
$result = DB_query($sql,$db);
- prnMsg( $OldTaxCategoryName . ' ' . _('tax category and any tax rates set for it have been deleted'),'success');
+ prnMsg( $TaxCatName . ' ' . _('tax category and any tax rates set for it have been deleted'),'success');
}
} //end if
unset ($SelectedTaxCategory);
Modified: trunk/api/api_stock.php
===================================================================
--- trunk/api/api_stock.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/api/api_stock.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -563,7 +563,7 @@
$sql="SELECT quantity,
loccode
FROM locstock WHERE stockid='" . $StockID."'";
- $result = DB_Query($sql, $db);
+ $result = DB_query($sql, $db);
if (sizeof($Errors)==0) {
$i=0;
while ($myrow=DB_fetch_array($result)) {
Modified: trunk/api/api_taxgroups.php
===================================================================
--- trunk/api/api_taxgroups.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/api/api_taxgroups.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -5,7 +5,7 @@
* currently setup on webERP
*/
- function GetTaxgroupList($user, $password) {
+ function GetTaxGroupList($user, $password) {
$Errors = array();
$db = db($user, $password);
if (gettype($db)=='integer') {
@@ -27,7 +27,7 @@
* tax group.
*/
- function GetTaxgroupDetails($taxgroup, $user, $password) {
+ function GetTaxGroupDetails($taxgroup, $user, $password) {
$Errors = array();
$db = db($user, $password);
if (gettype($db)=='integer') {
@@ -51,9 +51,20 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $sql = "SELECT * FROM taxgrouptaxes WHERE taxgroupid='".$TaxGroup."'";
+ $sql = "SELECT taxgroupid, taxauthid, calculationorder, taxontax FROM taxgrouptaxes WHERE taxgroupid='".$TaxGroup."'";
$result = DB_query($sql, $db);
- return DB_fetch_array($result);
+ $i=0;
+ $Answer = array();
+ while ($myrow=DB_fetch_array($result)){
+ $Answer[$i]['taxgroupid'] = $myrow['taxgroupid'];
+ $Answer[$i]['taxauthid'] = $myrow['taxauthid'];
+ $Answer[$i]['calculationorder'] = $myrow['calculationorder'];
+ $Answer[$i]['taxontax'] = $myrow['taxontax'];
+ $i++;
+ }
+ $Errors[0]=0;
+ $Errors[1]=$Answer;
+ return $Errors;
}
/* This function returns a list of the tax authority ids
@@ -90,20 +101,9 @@
}
$sql = "SELECT * FROM taxauthorities WHERE taxid='".$TaxAuthority."'";
$result = DB_query($sql, $db);
- $i=0;
- while ($myrow=DB_fetch_array($result)){
- $Answer[$i]['taxcatid'] = $myrow['taxcatid'];
- $Answer[$i]['dispatchtaxprovince'] = $myrow['dispatchtaxprovince'];
- $Answer[$i]['taxrate'] = $myrow['taxrate'];
- }
- $Errors[0]=0;
- $Errors[1]=$Answer;
- return $Errors;
+ return DB_fetch_array($result);
}
-
-/
-
/* This function takes as a parameter a tax authority id and a tax category id
* and returns an array containing the rate of tax for the selected
* tax authority and tax category
@@ -116,11 +116,19 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $sql = "SELECT taxcatid, dispatchtaxprovince, taxrate FROM taxauthrates WHERE taxauthority='".$TaxAuthority."' AND taxcatid='" . $TaxCatID . "'";
+ $sql = "SELECT taxcatid, dispatchtaxprovince, taxrate FROM taxauthrates WHERE taxauthority='".$TaxAuthority."'";
$result = DB_query($sql, $db);
- $TaxRateRow = DB_fetch_row($result);
- return $TaxRateRow[0];
+ $i=0;
+ $Answer = array();
+ while ($myrow=DB_fetch_array($result)){
+ $Answer[$i]['taxcatid'] = $myrow['taxcatid'];
+ $Answer[$i]['dispatchtaxprovince'] = $myrow['dispatchtaxprovince'];
+ $Answer[$i]['taxrate'] = $myrow['taxrate'];
+ $i++;
+ }
+ $Errors[0]=0;
+ $Errors[1]=$Answer;
+ return $Errors;
}
-
?>
\ No newline at end of file
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/api/api_xml-rpc.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -1844,16 +1844,16 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/$GetTaxgroupList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxGroupList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
- $GetTaxgroupList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+ $GetTaxGroupList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
- function xmlrpc_GetTaxgroupList($xmlrpcmsg){
+ function xmlrpc_GetTaxGroupList($xmlrpcmsg){
ob_start('ob_file_callback');
/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupList( '', '')));
/*x*/ }
ob_end_flush();
return $rtn;
@@ -1873,18 +1873,18 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group details.');
-/*E*/$GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxGroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
- $GetTaxgroupDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+ $GetTaxGroupDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
- function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
+ function xmlrpc_GetTaxGroupDetails($xmlrpcmsg){
ob_start('ob_file_callback');
/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
/*x*/ }
ob_end_flush();
return $rtn;
@@ -1932,7 +1932,7 @@
function xmlrpc_GetTaxAuthorityDetails($xmlrpcmsg){
ob_start('ob_file_callback');
/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
/*x*/ }
@@ -3240,18 +3240,14 @@
"function" => "xmlrpc_InsertSalesman",
"signature" => $InsertSalesman_sig,
"docstring" => $InsertSalesman_doc),
- "weberp.xmlrpc_GetTaxgroupList" => array(
- "function" => "xmlrpc_GetTaxgroupList",
- "signature" => $GetTaxgroupList_sig,
- "docstring" => $GetTaxgroupList_doc),
- "weberp.xmlrpc_GetTaxCategoryList" => array(
- "function" => "xmlrpc_GetTaxCategoryList",
- "signature" => $GetTaxCategoryList_sig,
- "docstring" => $GetTaxCategoryList_doc),
- "weberp.xmlrpc_GetTaxgroupDetails" => array(
- "function" => "xmlrpc_GetTaxgroupDetails",
- "signature" => $GetTaxgroupDetails_sig,
- "docstring" => $GetTaxgroupDetails_doc),
+ "weberp.xmlrpc_GetTaxGroupList" => array(
+ "function" => "xmlrpc_GetTaxGroupList",
+ "signature" => $GetTaxGroupList_sig,
+ "docstring" => $GetTaxGroupList_doc),
+ "weberp.xmlrpc_GetTaxGroupDetails" => array(
+ "function" => "xmlrpc_GetTaxGroupDetails",
+ "signature" => $GetTaxGroupDetails_sig,
+ "docstring" => $GetTaxGroupDetails_doc),
"weberp.xmlrpc_GetTaxGroupTaxes" => array(
"function" => "xmlrpc_GetTaxGroupTaxes",
"signature" => $GetTaxGroupTaxes_sig,
@@ -3264,10 +3260,10 @@
"function" => "xmlrpc_GetTaxAuthorityDetails",
"signature" => $GetTaxAuthorityDetails_sig,
"docstring" => $GetTaxAuthorityDetails_doc),
- "weberp.xmlrpc_GetTaxAuthorityRate" => array(
- "function" => "xmlrpc_GetTaxAuthorityRate",
- "signature" => $GetTaxAuthorityRate_sig,
- "docstring" => $GetTaxAuthorityRate_doc),
+ "weberp.xmlrpc_GetTaxAuthorityRates" => array(
+ "function" => "xmlrpc_GetTaxAuthorityRates",
+ "signature" => $GetTaxAuthorityRates_sig,
+ "docstring" => $GetTaxAuthorityRates_doc),
"weberp.xmlrpc_GetCustomerTypeList" => array(
"function" => "xmlrpc_GetCustomerTypeList",
"signature" => $GetCustomerTypeList_sig,
@@ -3409,4 +3405,4 @@
return $doc;
}
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/doc/Change.log 2012-06-21 19:36:19 UTC (rev 5445)
@@ -1,4 +1,6 @@
webERP Change Log
+
+21/06/2012 Phil: Added tooltip of long description to SelectProduct.php
20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/doc/Manual/ManualContributors.html 2012-06-21 19:36:19 UTC (rev 5445)
@@ -13,6 +13,8 @@
<br /><br />
Shane Barnaby
<br /><br />
+Klaus Beucher
+<br /><br />
Chris Bice
<br /><br />
Danie Brink
@@ -33,10 +35,14 @@
<br /><br />
Edd Dumbill (phpxmlrpc)
<br /><br />
+Ahmed Fawzy
+<br /><br />
Tom Fox
<br /><br />
Braian Gomez
<br /><br />
+Paul Harness
+<br /><br />
Lindsay Harris
<br /><br />
David Hawke
@@ -45,6 +51,8 @@
<br /><br />
High-Tech Bridge SA Security Research Lab
<br /><br />
+Tomáš Horáček (barcodepack)
+<br /><br />
Hindra Joshua
<br /><br />
Alan Jones
@@ -53,6 +61,8 @@
<br /><br />
Nico Kaiser (php-gettext)
<br /><br />
+CQZ,KE
+<br /><br />
Mo Kelly - due dates and customer po by sales order line
<br /><br />
Meraj Khattak - database diagram
@@ -83,6 +93,8 @@
<br /><br />
Afan Ottenheimer (phplot)
<br /><br />
+Kunshan-Ouhai
+<br /><br />
Ricardo Pedroso
<br /><br />
Jesse Peterson
@@ -136,12 +148,16 @@
<td valign="top">
<b>Translation </b>
<br /><br />
+Billy Chang,劉世琪 - Taiwanese
+<br /><br />
Csillag Péter Hungarian
<br /><br />
Danu Satrio Pratomo Djojosoemarto and his cousin - Indonesian
<br /><br />
Janusz Dobrowolski - Polish
<br /><br />
+James Dupin - French
+<br /><br />
Matt Elbrecht - Estonian
<br /><br />
Igor Felix - Portuguese Brazilian
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/includes/MiscFunctions.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -160,8 +160,12 @@
if ($tag['type'] == 'complete' OR $tag['type'] == 'open') {
$elements[$index] = new XmlElement;
$elements[$index]->name = $tag['tag'];
- $elements[$index]->attributes = $tag['attributes'];
- $elements[$index]->content = $tag['value'];
+ if (isset($tag['attributes'])){
+ $elements[$index]->attributes = $tag['attributes'];
+ }
+ if (isset($tag['value'])){
+ $elements[$index]->content = $tag['value'];
+ }
if ($tag['type'] == 'open') { // push
$elements[$index]->children = array();
$stack[count($stack)] = &$elements;
Modified: trunk/sql/mysql/weberp-demo.sql
===================================================================
--- trunk/sql/mysql/weberp-demo.sql 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/sql/mysql/weberp-demo.sql 2012-06-21 19:36:19 UTC (rev 5445)
@@ -17,8 +17,6 @@
-- Table structure for table `accountgroups`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `accountgroups` (
`groupname` char(30) NOT NULL DEFAULT '',
`sectioninaccounts` int(11) NOT NULL DEFAULT '0',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
