Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 17:31:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Lastname

Browse Source
This commit is contained in:
Laurent Destailleur
2012-02-01 09:29:26 +01:00
parent feb220587a
commit 2f2cb46622
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/class/html.form.class.php
View File

@@ -353,12 +353,12 @@ class Form
/** /**
* Show a text with a picto and a tooltip on picto * Show a text with a picto and a tooltip on picto
* *
* @param text Text to show * @param string $text Text to show
* @param htmltooltip Content of tooltip * @param string $htmltooltip Content of tooltip
* @param direction 1=Icon is after text, -1=Icon is before text, 0=no icon * @param int $direction 1=Icon is after text, -1=Icon is before text, 0=no icon
* @param type Type of picto (info, help, warning, superadmin...) * @param string $type Type of picto (info, help, warning, superadmin...)
* @param extracss Add a CSS style to td tags * @param string $extracss Add a CSS style to td tags
* @param noencodehtmltext Do not encode into html entity the htmltext * @param int $noencodehtmltext Do not encode into html entity the htmltext
* @return string HTML code of text, picto, tooltip * @return string HTML code of text, picto, tooltip
*/ */
function textwithpicto($text,$htmltext,$direction=1,$type='help',$extracss='',$noencodehtmltext=0) function textwithpicto($text,$htmltext,$direction=1,$type='help',$extracss='',$noencodehtmltext=0)
@@ -885,13 +885,13 @@ class Form
global $conf,$langs; global $conf,$langs;
// On recherche les societes // On recherche les societes
$sql = "SELECT s.rowid, s.name, s.firstname, s.poste FROM"; $sql = "SELECT s.rowid, s.name as name, s.firstname, s.poste FROM";
$sql.= " ".MAIN_DB_PREFIX ."socpeople as s"; $sql.= " ".MAIN_DB_PREFIX ."socpeople as s";
$sql.= " WHERE entity = ".$conf->entity; $sql.= " WHERE entity = ".$conf->entity;
if ($socid > 0) $sql.= " AND fk_soc=".$socid; if ($socid > 0) $sql.= " AND fk_soc=".$socid;
$sql.= " ORDER BY s.name ASC"; $sql.= " ORDER BY s.name ASC";
dol_syslog("Form::select_contacts sql=".$sql); dol_syslog(get_class($this)."::select_contacts sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@@ -913,6 +913,7 @@ class Form
$contactstatic->id=$obj->rowid; $contactstatic->id=$obj->rowid;
$contactstatic->name=$obj->name; $contactstatic->name=$obj->name;
$contactstatic->lastname=$obj->name;
$contactstatic->firstname=$obj->firstname; $contactstatic->firstname=$obj->firstname;
if ($htmlname != 'none') if ($htmlname != 'none')