Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
2f2cb466
Commit
2f2cb466
authored
Feb 1, 2012
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Lastname
parent
feb22058
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/core/class/html.form.class.php
+10
-9
10 additions, 9 deletions
htdocs/core/class/html.form.class.php
with
10 additions
and
9 deletions
htdocs/core/class/html.form.class.php
+
10
−
9
View file @
2f2cb466
...
@@ -353,12 +353,12 @@ class Form
...
@@ -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
...
@@ -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
...
@@ -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'
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment