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
0916d2cf
Commit
0916d2cf
authored
Jun 13, 2014
by
Florian Henry
Browse files
Options
Downloads
Patches
Plain Diff
Fix link element from project "associates object" pages
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
parent
aecede08
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/core/class/html.formprojet.class.php
+6
-1
6 additions, 1 deletion
htdocs/core/class/html.formprojet.class.php
htdocs/projet/element.php
+6
-1
6 additions, 1 deletion
htdocs/projet/element.php
with
13 additions
and
2 deletions
ChangeLog
+
1
−
0
View file @
0916d2cf
...
...
@@ -13,6 +13,7 @@ Fix: Filter on status was not visible when selected from url.
Fix: Filtering on status was last when asking to sort.
Fix: [ bug #1454 ] Mention de bas de page erroné
Fix: Do not display dictionnay for non activated module
Fix: Link element from element project pages
***** ChangeLog for 3.5.3 compared to 3.5.2 *****
Fix: Error on field accountancy code for export profile of invoices.
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/class/html.formprojet.class.php
+
6
−
1
View file @
0916d2cf
...
...
@@ -168,6 +168,7 @@ class FormProjets
*/
function
select_element
(
$table_element
)
{
global
$conf
;
$projectkey
=
"fk_projet"
;
switch
(
$table_element
)
...
...
@@ -195,7 +196,7 @@ class FormProjets
if
(
!
empty
(
$this
->
societe
->
id
))
{
$sql
.
=
" AND fk_soc="
.
$this
->
societe
->
id
;
}
$sql
.
=
' AND entity='
.
$conf
->
entity
;
$sql
.
=
' AND entity='
.
getEntity
(
'project'
)
;
$sql
.
=
" ORDER BY ref DESC"
;
dol_syslog
(
get_class
(
$this
)
.
'::select_element sql='
.
$sql
,
LOG_DEBUG
);
...
...
@@ -219,6 +220,10 @@ class FormProjets
return
$sellist
;
$this
->
db
->
free
(
$resql
);
}
else
{
$this
->
error
=
$this
->
db
->
lasterror
();
dol_syslog
(
get_class
(
$this
)
.
"::select_element "
.
$errmsg
,
LOG_ERR
);
return
-
1
;
}
}
...
...
This diff is collapsed.
Click to expand it.
htdocs/projet/element.php
+
6
−
1
View file @
0916d2cf
...
...
@@ -209,6 +209,7 @@ foreach ($listofreferent as $key => $value)
$classname
=
$value
[
'class'
];
$tablename
=
$value
[
'table'
];
$qualified
=
$value
[
'test'
];
if
(
$qualified
)
{
print
'<br>'
;
...
...
@@ -216,6 +217,10 @@ foreach ($listofreferent as $key => $value)
print_titre
(
$langs
->
trans
(
$title
));
$selectList
=
$formproject
->
select_element
(
$tablename
);
if
(
$selectList
<
0
)
{
setEventMessage
(
$formproject
->
error
,
'errors'
);
}
if
(
$selectList
)
{
print
'<form action="'
.
$_SERVER
[
"PHP_SELF"
]
.
'?id='
.
$projectid
.
'" method="post">'
;
...
...
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