From a73275b9c1be2057a752b70e4e8aa602a6bf9773 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Wed, 13 Nov 2013 13:17:32 +0100
Subject: [PATCH] Add prospect code client into prospect list
---
htdocs/comm/prospect/list.php | 4 +++-
htdocs/societe/class/societe.class.php | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 75ace1c4acd..7284827e657 100644
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -177,7 +177,7 @@ if ($action == 'cstc')
$formother=new FormOther($db);
$form=new Form($db);
-$sql = "SELECT s.rowid, s.nom, s.zip, s.town, s.datec, s.datea, s.status as status,";
+$sql = "SELECT s.rowid, s.nom, s.zip, s.town, s.datec, s.datea, s.status as status, s.code_client, s.client,";
$sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,";
$sql.= " d.nom as departement";
// Updated by Matelli
@@ -405,6 +405,8 @@ if ($resql)
$prospectstatic->id=$obj->rowid;
$prospectstatic->nom=$obj->nom;
$prospectstatic->status=$obj->status;
+ $prospectstatic->code_client=$obj->code_client;
+ $prospectstatic->client=$obj->client;
$prospectstatic->fk_prospectlevel=$obj->fk_prospectlevel;
print $prospectstatic->getNomUrl(1,'prospect');
print '</td>';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index effc67b004d..3ed53f2692e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1438,7 +1438,7 @@ class Societe extends CommonObject
$name=$this->name?$this->name:$this->nom;
- if ($conf->global->SOCIETE_ADD_REF_IN_LIST && empty($option)) {
+ if ($conf->global->SOCIETE_ADD_REF_IN_LIST && (!empty($withpicto))) {
if (($this->client) && (! empty ( $this->code_client ))) {
$code = $this->code_client . ' - ';
}
--
GitLab