diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 3bca42e3cfdbc09186a4b081fd287275d985e998..9f342f500faf0eb8fe92cc41fc349b0b96a87116 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -60,6 +60,8 @@ $pagenext = $page + 1; llxHeader(); +$thirdpartystatic=new Societe($db); + if ($action == 'attribute_prefix') { $societe = new Societe($db, $socid); @@ -96,7 +98,7 @@ if ($mode == 'search') { * */ -$sql = "SELECT s.rowid, s.nom, s.ville, s.datec, s.datea"; +$sql = "SELECT s.rowid, s.nom, s.client, s.ville, s.datec, s.datea"; $sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta "; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st"; @@ -199,9 +201,12 @@ if ($resql) $var=!$var; print "<tr $bc[$var]>"; - print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->rowid.'">'; - print img_object($langs->trans("ShowCustomer"),"company"); - print ' <a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->rowid.'">'.$obj->nom.'</a></td>'; + print '<td>'; + $thirdpartystatic->id=$obj->rowid; + $thirdpartystatic->nom=$obj->nom; + $thirdpartystatic->client=$obj->client; + print $thirdpartystatic->getNomUrl(1,'compta'); + print '</td>'; print '<td>'.$obj->ville.' </td>'; print '<td align="left">'.$obj->code_client.' </td>'; print '<td align="left">'.$obj->code_compta.' </td>'; diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 96f2d9706664721bf48e0cf184ab34fd14528633..2768b7a24f238f47751d84ed95603ac7c2b6a73d 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1307,7 +1307,7 @@ class Societe extends CommonObject $result=''; $lien=$lienfin=''; - if ($option == 'customer') + if ($option == 'customer' || $option == 'compta') { if ($this->client == 1) { @@ -1325,11 +1325,6 @@ class Societe extends CommonObject $lien = '<a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$this->id.'">'; $lienfin='</a>'; } - if ($option == 'compta') - { - $lien = '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$this->id.'">'; - $lienfin='</a>'; - } if (empty($lien)) { $lien = '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$this->id.'">';