lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Corrections register_globals

Browse Source 
Ajout lien rendez-vous sur liste contacts des fiches client et compta.
Meilleur gestion des fiches de cration d'action. Code mieux comment.
This commit is contained in:
Laurent Destailleur 2004-08-06 23:39:22 +00:00
parent 35b39ae399
commit f6c563b395
5 changed files with 126 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/actioncomm.class.php
View File

@ -1,5 +1,6 @@
<?PHP
/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
*
* $Id$
* $Source$
@ -56,17 +57,26 @@ class ActionComm
*/
Function add($author)
{
if (!strlen($this->contact))
if (! $this->contact)
{
$this->contact = 0;
}
if (!strlen($this->propalrowid))
if (! $this->propalrowid)
{
$this->propalrowid = 0;
}
if (! $this->percent)
{
$this->percent = 0;
}
if (! $this->priority)
{
$this->priority = 0;
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm (datea, fk_action, fk_soc, fk_user_author, fk_user_action, fk_contact, percent, note,priority,propalrowid) ";
$sql .= " VALUES ('$this->date', $this->type, $this->societe, $author->id,";
$sql .= $this->user->id . ", $this->contact, $this->percent, '$this->note', $this->priority, $this->propalrowid);";
$sql .= $this->user->id . ", $this->contact, '$this->percent', '$this->note', $this->priority, $this->propalrowid);";
if ($this->db->query($sql) )
{
@ -74,7 +84,7 @@ class ActionComm
}
else
{
print $this->db->error() . "<br>" . $sql;
dolibarr_print_error($this->db);
}
}
/*
@ -117,7 +127,7 @@ class ActionComm
}
else
{
print $this->db->error();
dolibarr_print_error($this->db);
}
}
/**
@ -162,5 +172,6 @@ class ActionComm
return 1;
}
}
}
?>

29
htdocs/cactioncomm.class.php
View File

@ -96,5 +96,34 @@ class CActioncomm {
print $this->db->error();
}
}
/*
* Renvoie le nom d'une action a partir d'un id
*
*/
Function get_nom($id)
{
$sql = "SELECT libelle nom FROM ".MAIN_DB_PREFIX."c_actioncomm WHERE id='$id';";
$result = $this->db->query($sql);
if ($result)
{
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object($result , 0);
return $obj->nom;
}
$this->db->free();
}
else {
dolibarr_print_error($db);
}
}
}
?>

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

@ -42,8 +42,6 @@ class Form
*/
Function select_departement($selected='')
{
print '<select name="departement_id">';
// On recherche les départements/cantons/province active d'une region et pays actif
$sql = "SELECT d.rowid, d.code_departement as code , d.nom, d.active, p.libelle as libelle_pays, p.code as code_pays FROM ";
$sql .= MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_pays as p";
@ -53,6 +51,7 @@ class Form
if ($this->db->query($sql))
{
print '<select name="departement_id">';
$num = $this->db->num_rows();
$i = 0;
if ($num)
@ -83,11 +82,11 @@ class Form
$i++;
}
}
print '</select>';
}
else {
print "Erreur : $sql : ".$this->db->error();
dolibarr_print_error($this->db);
}
print '</select>';
}
/*
@ -96,13 +95,12 @@ class Form
*/
Function select_pays($selected='')
{
print '<select name="pays_id">';
$sql = "SELECT rowid, libelle, active FROM ".MAIN_DB_PREFIX."c_pays";
$sql .= " WHERE active = 1 ORDER BY libelle ASC";
if ($this->db->query($sql))
{
print '<select name="pays_id">';
$num = $this->db->num_rows();
$i = 0;
if ($num)
@ -121,24 +119,24 @@ class Form
$i++;
}
}
}
print '</select>';
}
}
/*
* Retourne la liste déroulante des sociétés
*
*/
Function select_societes($selected='')
Function select_societes($selected='',$htmlname='soc_id')
{
// On recherche les societes
$sql = "SELECT s.idp, s.nom FROM ";
$sql .= MAIN_DB_PREFIX ."societe as s ";
$sql .= "ORDER BY nom ASC";
print '<select name="soc_id">';
if ($this->db->query($sql))
{
print '<select name="'.$htmlname.'">';
$num = $this->db->num_rows();
$i = 0;
if ($num)
@ -157,13 +155,55 @@ class Form
$i++;
}
}
print '</select>';
}
else {
print "Erreur : $sql : ".$this->db->error();
dolibarr_print_error($this->db);
}
print '</select>';
}
/*
* Retourne la liste déroulante des contacts d'une société donnée
*
*/
Function select_contacts($socid,$selected='',$htmlname='contactid')
{
// On recherche les societes
$sql = "SELECT s.idp, s.name, s.firstname FROM ";
$sql .= MAIN_DB_PREFIX ."socpeople as s";
$sql .= " WHERE fk_soc=".$socid;
$sql .= " ORDER BY s.name ASC";
if ($this->db->query($sql))
{
print '<select name="'.$htmlname.'">';
$num = $this->db->num_rows();
$i = 0;
if ($num)
{
while ($i < $num)
{
$obj = $this->db->fetch_object($i);
if ($selected && $selected == $obj->idp)
{
print '<option value="'.$obj->idp.'" selected>'.$obj->name.' '.$obj->firstname.'</option>';
}
else
{
print '<option value="'.$obj->idp.'">'.$obj->name.' '.$obj->firstname.'</option>';
}
$i++;
}
}
print '</select>';
}
else {
dolibarr_print_error($this->db);
}
}
/*
* Retourne le nom d'un pays
*
@ -180,15 +220,14 @@ class Form
if ($num)
{
$obj = $this->db->fetch_object(0);
print $obj->libelle;
return $obj->libelle;
}
else
{
print "Non définit";
return "Non définit";
}
}
print '</select>';
}
@ -200,13 +239,12 @@ class Form
Function select_civilite($selected='')
{
print '<select name="civilite_id">';
$sql = "SELECT rowid, civilite, active FROM ".MAIN_DB_PREFIX."c_civilite";
$sql .= " WHERE active = 1";
if ($this->db->query($sql))
{
print '<select name="civilite_id">';
$num = $this->db->num_rows();
$i = 0;
if ($num)
@ -225,8 +263,12 @@ class Form
$i++;
}
}
}
print '</select>';
}
else {
dolibarr_print_error($this->db);
}
}
/*
@ -236,8 +278,6 @@ class Form
*/
Function select_forme_juridique($selected='')
{
print '<select name="forme_juridique_code">';
// On recherche les formes juridiques actives des pays actifs
$sql = "SELECT f.rowid, f.code as code , f.libelle as nom, f.active, p.libelle as libelle_pays, p.code as code_pays FROM llx_c_forme_juridique as f, llx_c_pays as p";
$sql .= " WHERE f.fk_pays=p.rowid";
@ -245,6 +285,7 @@ class Form
if ($this->db->query($sql))
{
print '<select name="forme_juridique_code">';
$num = $this->db->num_rows();
$i = 0;
if ($num)
@ -275,11 +316,11 @@ class Form
$i++;
}
}
}
else {
print "Erreur : $sql : ".$this->db->error();
}
print '</select>';
}
else {
dolibarr_print_error($this->db);
}
}
/*

28
htdocs/societe.class.php
View File

@ -409,12 +409,11 @@ class Societe {
return $this->db->query($sql);
}
}
/*
*
*
* Renvoie le nom d'une societe a partir d'un id
*
*/
Function get_nom($id)
{
@ -424,16 +423,19 @@ class Societe {
if ($result)
{
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object($result , 0);
$this->nom = $obj->nom;
}
$this->db->free();
}
}
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object($result , 0);
return $obj->nom;
}
$this->db->free();
}
else {
dolibarr_print_error($db);
}
}
/*
*
*

4
htdocs/socnote.php
View File

@ -73,7 +73,7 @@ if ($_GET["socid"] > 0) {
$head[$h][0] = DOL_URL_ROOT.'/socnote.php?socid='.$societe->id;
$head[$h][1] = 'Note';
$a = $h;
$hselected = $h;
$h++;
if ($user->societe_id == 0)
@ -86,7 +86,7 @@ if ($_GET["socid"] > 0) {
$head[$h][0] = DOL_URL_ROOT.'/societe/notify/fiche.php?socid='.$societe->id;
$head[$h][1] = 'Notifications';
dolibarr_fiche_head($head, $a);
dolibarr_fiche_head($head, $hselected, $societe->nom);
print_titre($societe->nom);