diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php
index 5fe7da7608e..dc5e9d11136 100644
--- a/htdocs/comm/clients.php
+++ b/htdocs/comm/clients.php
@@ -80,7 +80,7 @@ if (GETPOST("button_removefilter_x"))
$search_idprof4='';
}
-$sql = "SELECT s.rowid, s.nom, s.client, s.ville, st.libelle as stcomm, s.prefix_comm, s.code_client,";
+$sql = "SELECT s.rowid, s.nom as name, s.client, s.ville, st.libelle as stcomm, s.prefix_comm, s.code_client,";
$sql.= " s.datec, s.datea, s.canvas";
// We'll need these fields in order to filter by sale (including the case where the user can only see his prospects)
if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
@@ -200,7 +200,7 @@ if ($result)
print "";
print '| ';
$thirdpartystatic->id=$obj->rowid;
- $thirdpartystatic->nom=$obj->nom;
+ $thirdpartystatic->name=$obj->name;
$thirdpartystatic->client=$obj->client;
$thirdpartystatic->canvas=$obj->canvas;
print $thirdpartystatic->getNomUrl(1);
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index bf7566784b4..aac872cd2f2 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/comm/index.php
* \ingroup commercial
- * \brief Page accueil de la zone commerciale cliente
+ * \brief Home page of commercial area
* \version $Id$
*/
@@ -140,7 +140,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire)
*/
if ($conf->propal->enabled && $user->rights->propale->lire)
{
- $sql = "SELECT p.rowid, p.ref, p.total_ht, s.rowid as socid, s.nom, s.client";
+ $sql = "SELECT p.rowid, p.ref, p.total_ht, s.rowid as socid, s.nom as name, s.client, s.canvas";
$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -174,8 +174,9 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print ' | ';
print '';
$companystatic->id=$obj->socid;
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->client=$obj->client;
+ $companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1,'customer',16);
print ' | ';
print ''.price($obj->total_ht).' |
';
@@ -205,7 +206,7 @@ if ($conf->commande->enabled && $user->rights->commande->lire)
{
$langs->load("orders");
- $sql = "SELECT c.rowid, c.ref, c.total_ttc, s.rowid as socid, s.nom, s.client";
+ $sql = "SELECT c.rowid, c.ref, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -235,8 +236,9 @@ if ($conf->commande->enabled && $user->rights->commande->lire)
print '| '.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.' | ';
print '';
$companystatic->id=$obj->socid;
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->client=$obj->client;
+ $companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1,'customer',16);
print ' | ';
print ''.price($obj->total_ttc).' |
';
@@ -277,7 +279,7 @@ $max=3;
if ($conf->propal->enabled && $user->rights->propale->lire)
{
- $sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.total_ht, p.ref, p.fk_statut, p.datep as dp";
+ $sql = "SELECT s.nom as name, s.rowid, s.canvas, p.rowid as propalid, p.total_ht, p.ref, p.fk_statut, p.datep as dp";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."propal as p";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -326,7 +328,13 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print '';
- print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).' | ';
+ print '';
+ $companystatic->id=$obj->socid;
+ $companystatic->name=$obj->name;
+ $companystatic->client=$obj->client;
+ $companystatic->canvas=$obj->canvas;
+ print $companystatic->getNomUrl(1,'customer',44);
+ print ' | ';
print "";
print dol_print_date($db->jdate($objp->dp),'day')." | \n";
print "".price($objp->total_ht)." | \n";
@@ -352,7 +360,7 @@ if ($conf->societe->enabled && $user->rights->societe->lire)
{
$langs->load("boxes");
- $sql = "SELECT s.rowid,s.nom,s.client,s.datec,s.tms";
+ $sql = "SELECT s.rowid, s.nom as name, s.client, s.datec,s.tms";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.client IN (1, 2, 3)";
@@ -376,15 +384,15 @@ if ($conf->societe->enabled && $user->rights->societe->lire)
print '';
if ($num)
{
- $company=new Societe($db);
while ($i < $num)
{
$objp = $db->fetch_object($resql);
- $company->id=$objp->rowid;
- $company->nom=$objp->nom;
- $company->client=$objp->client;
+ $companystatic->id=$objp->rowid;
+ $companystatic->name=$objp->name;
+ $companystatic->client=$objp->client;
+ $companystatic->canvas=$objp->canvas;
print '';
- print '| '.$company->getNomUrl(1,'customer',48).' | ';
+ print ''.$companystatic->getNomUrl(1,'customer',48).' | ';
print '';
if ($objp->client == 2 || $objp->client == 3) print $langs->trans("Prospect");
if ($objp->client == 3) print ' / ';
@@ -412,7 +420,7 @@ if ($conf->fournisseur->enabled && $user->rights->societe->lire)
{
$langs->load("boxes");
- $sql = "SELECT s.nom, s.rowid, s.datec as dc, s.tms as dm";
+ $sql = "SELECT s.nom as name, s.rowid, s.datec as dc, s.canvas, s.tms as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fournisseur = 1";
@@ -435,14 +443,14 @@ if ($conf->fournisseur->enabled && $user->rights->societe->lire)
print ' |
';
if ($num)
{
- $company=new Societe($db);
while ($i < $num && $i < $max)
{
$objp = $db->fetch_object($result);
- $company->id=$objp->rowid;
- $company->nom=$objp->nom;
- print '';
- print '| '.$company->getNomUrl(1,'supplier',48).' | ';
+ $companystatic->id=$objp->rowid;
+ $companystatic->name=$objp->name;
+ $companystatic->canvas=$objp->canvas;
+ print '
';
+ print '| '.$companystatic->getNomUrl(1,'supplier',44).' | ';
print ''.dol_print_date($db->jdate($objp->dm),'day').' | ';
print '
';
$var=!$var;
@@ -485,7 +493,8 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire && 0) // TODO A REFA
{
$langs->load("contracts");
- $sql = "SELECT s.nom, s.rowid, c.statut, c.rowid as contratid, p.ref, c.mise_en_service as datemes, c.fin_validite as datefin, c.date_cloture as dateclo";
+ $sql = "SELECT s.nom as name, s.rowid, s.canvas, ";
+ $sql.= " c.statut, c.rowid as contratid, p.ref, c.mise_en_service as datemes, c.fin_validite as datefin, c.date_cloture as dateclo";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
$sql.= ", ".MAIN_DB_PREFIX."product as p";
@@ -517,7 +526,12 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire && 0) // TODO A REFA
{
$obj = $db->fetch_object($resql);
print "| contratid."\">".img_object($langs->trans("ShowContract","contract"))." ".$obj->ref." | ";
- print "rowid."\">".img_object($langs->trans("ShowCompany","company"))." ".$obj->nom." | \n";
+ print '';
+ $companystatic->id=$objp->rowid;
+ $companystatic->name=$objp->name;
+ $companystatic->canvas=$objp->canvas;
+ print $companystatic->getNomUrl(1,'customer',44);
+ print ' | '."\n";
print "".$staticcontrat->LibStatut($obj->statut,3)." |
\n";
$var=!$var;
$i++;
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index cd01e2eabdb..3c1d84432ca 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2008 Laurent Destailleur
+ * Copyright (C) 2004-2011 Laurent Destailleur
* Copyright (C) 2005-2009 Regis Houssin
*
* This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
/**
* \file htdocs/comm/prospect/index.php
* \ingroup commercial
- * \brief Page accueil de la zone prospection
+ * \brief Home page of propest area
* \version $Id$
*/
@@ -42,6 +42,8 @@ if ($user->societe_id > 0)
* View
*/
+$companystatic=new Societe($db);
+
llxHeader();
print_fiche_titre($langs->trans("ProspectionArea"));
@@ -112,7 +114,7 @@ if ($resql)
*/
if ($conf->propal->enabled && $user->rights->propale->lire)
{
- $sql = "SELECT p.rowid, p.ref, p.price, s.nom";
+ $sql = "SELECT p.rowid, p.ref, p.price, s.nom as sname";
$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -171,7 +173,8 @@ if ($conf->agenda->enabled) show_array_actions_to_do(10);
*/
if ($conf->propal->enabled && $user->rights->propale->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.total as total_ttc, p.ref, p.datep as dp, c.label as statut, c.id as statutid";
+ $sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas,";
+ $sql.= " p.rowid as propalid, p.total as total_ttc, p.ref, p.datep as dp, c.label as statut, c.id as statutid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."propal as p";
$sql.= ", ".MAIN_DB_PREFIX."c_propalst as c";
@@ -205,7 +208,13 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print "| propalid."\">";
print img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.' | ';
- print "socid."\">".img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom." | \n";
+ print "";
+ $companystatic->id=$obj->socid;
+ $companystatic->name=$obj->name;
+ $companystatic->client=$obj->client;
+ $companystatic->canvas=$obj->canvas;
+ print $companystatic->getNomUrl(1,'',44);
+ print " | \n";
print "";
print dol_print_date($db->jdate($obj->dp),'day')." | \n";
print "".price($obj->total_ttc)." |
\n";
@@ -228,7 +237,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
* Societes a contacter
*
*/
-$sql = "SELECT s.nom, s.rowid";
+$sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fk_stcomm = 1";
@@ -253,9 +262,13 @@ if ($resql)
{
$obj = $db->fetch_object($resql);
$var=!$var;
- print "| rowid."\">";
- print img_object($langs->trans("ShowCompany"),"company");
- print ' '.$obj->nom.' |
';
+ print "| ";
+ $companystatic->id=$obj->socid;
+ $companystatic->name=$obj->name;
+ $companystatic->client=$obj->client;
+ $companystatic->canvas=$obj->canvas;
+ print $companystatic->getNomUrl(1,'prospect',44);
+ print ' |
';
$i++;
}
print "
";
diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php
index c55b0491089..65366fab7dc 100644
--- a/htdocs/lib/agenda.lib.php
+++ b/htdocs/lib/agenda.lib.php
@@ -173,7 +173,7 @@ function show_array_actions_to_do($max=5)
print ''.dol_trunc($obj->label,22).' | ';
$customerstatic->id=$obj->rowid;
- $customerstatic->nom=$obj->sname;
+ $customerstatic->name=$obj->sname;
$customerstatic->client=$obj->client;
print ''.$customerstatic->getNomUrl(1,'',16).' | ';
@@ -262,7 +262,7 @@ function show_array_last_actions_done($max=5)
print ''.dol_trunc($obj->label,24).' | ';
$customerstatic->id=$obj->rowid;
- $customerstatic->nom=$obj->sname;
+ $customerstatic->name=$obj->sname;
$customerstatic->client=$obj->client;
print ''.$customerstatic->getNomUrl(1,'',24).' | ';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 4cf83793815..9b84dd33e11 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1384,11 +1384,12 @@ class Societe extends CommonObject
$lien.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'">';
$lienfin='';
- if (empty($this->name)) $this->name=$this->nom;
-
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$this->name,'company').$lienfin);
+ $name=$this->name;
+ if (empty($name)) $name=$this->nom;
+
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
- $result.=$lien.($maxlen?dol_trunc($this->name,$maxlen):$this->name).$lienfin;
+ $result.=$lien.($maxlen?dol_trunc($name,$maxlen):$name).$lienfin;
return $result;
}
@@ -2190,11 +2191,11 @@ class Societe extends CommonObject
$this->country_id=$member->pays_id;
$this->tel=$member->phone; // Prof phone
$this->email=$member->email;
-
+
$this->client = 1; // A member is a customer by default
$this->code_client = -1;
$this->code_fournisseur = -1;
-
+
$this->db->begin();
// Cree et positionne $this->id
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 0480dbf6e19..e48b8098e48 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -131,8 +131,7 @@ print '';
* Last third parties modified
*/
$max=15;
-$sql = "SELECT s.rowid, s.nom, s.client, s.fournisseur,";
-$sql.= " s.tms as datem";
+$sql = "SELECT s.rowid, s.nom as name, s.client, s.fournisseur, s.canvas, s.tms as datem";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.entity = ".$conf->entity;
@@ -171,10 +170,11 @@ if ($result)
// Name
print ' | ';
$thirdparty_static->id=$objp->rowid;
- $thirdparty_static->nom=$objp->nom;
+ $thirdparty_static->name=$objp->name;
$thirdparty_static->client=$objp->client;
$thirdparty_static->fournisseur=$objp->fournisseur;
$thirdparty_static->datem=$db->jdate($objp->datem);
+ $thirdparty_static->canvas=$objp->canvas;
print $thirdparty_static->getNomUrl(1,'',16);
print " | \n";
// Type