Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Qual: Et encore de la suppression de fonction inutiles

Browse Source
This commit is contained in:
Laurent Destailleur
2006-06-24 20:58:22 +00:00
parent 03cb6b10dd
commit 1764e203b5
4 changed files with 82 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/admin/expedition.php
View File

@@ -95,6 +95,25 @@ if ($_GET["action"] == 'setdoc')
}
}
// \todo A quoi servent les methode d'expedition ?
if ($_GET["action"] == 'setmethod')
{
$db->begin();
$value=$_GET["value"];
$sql = "INSERT INTO ".MAIN_DB_PREFIX."expedition_methode (code,libelle,description,statut)";
$sql.= " VALUES ('".$_GET["value"]."','".$_GET["value"]."','',1)";
$result=$db->query($sql);
if ($result)
{
$db->commit();
}
else
{
$db->rollback();
}
}
if ($_GET["action"] == 'setmod')
{
// \todo Verifier si module numerotation choisi peut etre activ<69>
@@ -141,8 +160,20 @@ if ($conf->global->MAIN_SUBMODULE_LIVRAISON)
dolibarr_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
// M<>thode de livraison
$mods=array();
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition_methode WHERE statut = 1";
$db->fetch_all_rows($sql, $mods);
$resql = $db->query($sql);
if ($resql)
{
$i = 0;
$num = $db->num_rows($resql);
while ($i < $num)
{
$obj = $db->fetch_object($resql);
$mods[$i]=$obj->rowid;
$i++;
}
}
print_titre($langs->trans("SendingMethod"));
@@ -184,13 +215,13 @@ if(is_dir($dir))
{
print img_tick();
print '</td><td align="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;statut=0&amp;value='.$name.'">'.$langs->trans("Disable").'</a>';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmethod&amp;statut=0&amp;value='.$name.'">'.$langs->trans("Disable").'</a>';
}
else
{
print '&nbsp;</td><td align="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;statut=1&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmethod&amp;statut=1&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
}
print '</td>';

2
htdocs/html.form.class.php
View File

@@ -1102,7 +1102,7 @@ class Form
{
global $langs;
dolibarr_syslog("html.form.class.php::select_type_paiements $selected, $htmlname, $filtertype, $format",LOG_DEBUG);
// dolibarr_syslog("html.form.class.php::select_type_paiements $selected, $htmlname, $filtertype, $format",LOG_DEBUG);
$filterarray=array();
if ($filtertype == 'CRDT') $filterarray=array(0,2);

9
htdocs/lib/mysql.lib.php
View File

@@ -689,7 +689,6 @@ class DoliDb
\param tab Nom de la table concern<72>e par l'insert. Ne sert pas sous MySql mais requis pour compatibilit<69> avec Postgresql
\return int id
*/
function last_insert_id($tab)
{
return mysql_insert_id($this->db);
@@ -699,7 +698,6 @@ class DoliDb
\brief Retourne le dsn pear
\return dsn
*/
function getdsn($db_type,$db_user,$db_pass,$db_host,$db_name)
{
return $db_type.'://'.$db_user.':'.$db_pass.'@'.$db_host.'/'.$db_name;
@@ -710,7 +708,6 @@ class DoliDb
\param database Nom de la database
\return resource
*/
function list_tables($database)
{
$this->results = mysql_list_tables($database, $this->db);
@@ -729,12 +726,6 @@ class DoliDb
return $this->results;
}
function setLastQuery($s)
{
$this->lastquery=$s;
}
}
?>

10
htdocs/lib/pgsql.lib.php
View File

@@ -517,7 +517,6 @@ class DoliDb
\brief Renvoie le texte de l'erreur pgsql de l'operation precedente.
\return error_text
*/
function error()
{
return pg_last_error($this->db);
@@ -528,7 +527,6 @@ class DoliDb
\param tab Nom de la table concern<72>e par l'insert. Ne sert pas sous MySql mais requis pour compatibilit<69> avec Postgresql
\return int id
*/
function last_insert_id($tab)
{
$result = pg_query($this->db,"SELECT MAX(rowid) FROM ".$tab." ;");
@@ -541,7 +539,6 @@ class DoliDb
\brief Retourne le dsn pear
\return dsn
*/
function getdsn($db_type,$db_user,$db_pass,$db_host,$db_name)
{
return $db_type.'://'.$db_user.':'.$db_pass.'@'.$db_host.'/'.$db_name;
@@ -552,19 +549,12 @@ class DoliDb
\param database Nom de la database
\return resource
*/
function list_tables($database)
{
$this->results = pg_query($this->db, "SHOW TABLES;");
return $this->results;
}
function setLastQuery($s)
{
$this->lastquery=$s;
}
}
?>