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

Fix: bug #32920 : Commercial -> Customers area (missing customer and suppliers name

Browse Source
This commit is contained in:
Laurent Destailleur 2011-04-03 18:53:31 +00:00
parent 8cbdcb9c20
commit 5b74a5aa9a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/societe/class/societe.class.php
View File

@ -815,14 +815,14 @@ class Societe extends CommonObject
dol_syslog("Societe::Delete erreur -1 ".$this->error, LOG_ERR); dol_syslog("Societe::Delete erreur -1 ".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
if ($haschild > 0) if ($haschild > 0)
{ {
$this->error="ErrorRecordHasChildren"; $this->error="ErrorRecordHasChildren";
return -1; return -1;
} }
if ($this->db->begin()) if ($this->db->begin())
{ {
// Added by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-third-party-deleting.html) // Added by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-third-party-deleting.html)
@ -1340,9 +1340,12 @@ class Societe extends CommonObject
$lien.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'">'; $lien.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'">';
$lienfin='</a>'; $lienfin='</a>';
if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$this->nom,'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.=' '; if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.($maxlen?dol_trunc($this->nom,$maxlen):$this->nom).$lienfin; $result.=$lien.($maxlen?dol_trunc($name,$maxlen):$name).$lienfin;
return $result; return $result;
} }