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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
f6a7838c
Commit
f6a7838c
authored
8 years ago
by
Charles Benke
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update actioncomm.class.php
the variable name defined on the class is type_color
parent
223eed0c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/comm/action/class/actioncomm.class.php
+2
-2
2 additions, 2 deletions
htdocs/comm/action/class/actioncomm.class.php
with
2 additions
and
2 deletions
htdocs/comm/action/class/actioncomm.class.php
+
2
−
2
View file @
f6a7838c
...
...
@@ -513,7 +513,7 @@ class ActionComm extends CommonObject
$sql
.
=
" a.fk_contact, a.percent as percentage,"
;
$sql
.
=
" a.fk_element, a.elementtype,"
;
$sql
.
=
" a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,"
;
$sql
.
=
" c.id as type_id, c.code as type_code, c.libelle, c.color,"
;
$sql
.
=
" c.id as type_id, c.code as type_code, c.libelle, c.color
as type_color
,"
;
$sql
.
=
" s.nom as socname,"
;
$sql
.
=
" u.firstname, u.lastname as lastname"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"actioncomm as a "
;
...
...
@@ -541,7 +541,7 @@ class ActionComm extends CommonObject
// Properties of parent table llx_c_actioncomm (will be deprecated in future)
$this
->
type_id
=
$obj
->
type_id
;
$this
->
type_code
=
$obj
->
type_code
;
$this
->
color
=
$obj
->
color
;
$this
->
type_
color
=
$obj
->
type_
color
;
$transcode
=
$langs
->
trans
(
"Action"
.
$obj
->
type_code
);
$type_libelle
=
(
$transcode
!=
"Action"
.
$obj
->
type_code
?
$transcode
:
$obj
->
libelle
);
$this
->
type
=
$type_libelle
;
...
...
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