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
b4ae479a
Commit
b4ae479a
authored
12 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge pull request #988 from FHenry/3.3
Fix [ bug #911 ] Reorder intervention do not work and PgSQL
parents
2e8d2b88
f543f000
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
htdocs/comm/action/listactions.php
+2
-2
2 additions, 2 deletions
htdocs/comm/action/listactions.php
htdocs/core/class/commonobject.class.php
+7
-1
7 additions, 1 deletion
htdocs/core/class/commonobject.class.php
htdocs/core/lib/agenda.lib.php
+2
-4
2 additions, 4 deletions
htdocs/core/lib/agenda.lib.php
with
11 additions
and
7 deletions
htdocs/comm/action/listactions.php
+
2
−
2
View file @
b4ae479a
...
...
@@ -153,9 +153,9 @@ $sql.= " ua.login as loginauthor, ua.rowid as useridauthor,";
$sql
.
=
" ut.login as logintodo, ut.rowid as useridtodo,"
;
$sql
.
=
" ud.login as logindone, ud.rowid as useriddone,"
;
$sql
.
=
" sp.name, sp.firstname"
;
$sql
.
=
" FROM
(
"
.
MAIN_DB_PREFIX
.
"c_actioncomm as c,"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"c_actioncomm as c,"
;
$sql
.
=
" "
.
MAIN_DB_PREFIX
.
'user as u,'
;
$sql
.
=
" "
.
MAIN_DB_PREFIX
.
"actioncomm as a
)
"
;
$sql
.
=
" "
.
MAIN_DB_PREFIX
.
"actioncomm as a"
;
if
(
!
$user
->
rights
->
societe
->
client
->
voir
&&
!
$socid
)
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"societe_commerciaux as sc ON a.fk_soc = sc.fk_soc"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"societe as s ON a.fk_soc = s.rowid"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"socpeople as sp ON a.fk_contact = sp.rowid"
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/class/commonobject.class.php
+
7
−
1
View file @
b4ae479a
...
...
@@ -1068,7 +1068,13 @@ abstract class CommonObject
// We frist search all lines that are parent lines (for multilevel details lines)
$sql
=
'SELECT rowid FROM '
.
MAIN_DB_PREFIX
.
$this
->
table_element_line
;
$sql
.
=
' WHERE '
.
$this
->
fk_element
.
' = '
.
$this
->
id
;
//This test is to fix Fix [ bug #911 ] Reorder intervention do not work in 3.3
//Do not merge in 3.4 'table column fk_parent_line already added into 3.4
if
(
$this
->
table_element_line
!=
'fichinterdet'
)
{
$sql
.
=
' AND fk_parent_line IS NULL'
;
}
$sql
.
=
' ORDER BY rang ASC, rowid '
.
$rowidorder
;
dol_syslog
(
get_class
(
$this
)
.
"::line_order search all parent lines sql="
.
$sql
,
LOG_DEBUG
);
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/lib/agenda.lib.php
+
2
−
4
View file @
b4ae479a
...
...
@@ -184,11 +184,10 @@ function show_array_actions_to_do($max=5)
$sql
=
"SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,"
;
$sql
.
=
" c.code, c.libelle,"
;
$sql
.
=
" s.nom as sname, s.rowid, s.client"
;
$sql
.
=
" FROM
(
"
.
MAIN_DB_PREFIX
.
"c_actioncomm as c,"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"c_actioncomm as c,"
;
$sql
.
=
" "
.
MAIN_DB_PREFIX
.
"actioncomm as a"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"societe as s ON a.fk_soc = s.rowid"
;
if
(
!
$user
->
rights
->
societe
->
client
->
voir
&&
!
$socid
)
$sql
.
=
", "
.
MAIN_DB_PREFIX
.
"societe_commerciaux as sc"
;
$sql
.
=
")"
;
$sql
.
=
" WHERE c.id = a.fk_action"
;
$sql
.
=
" AND a.entity = "
.
$conf
->
entity
;
$sql
.
=
" AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '"
.
$db
->
idate
(
$now
)
.
"'))"
;
...
...
@@ -283,11 +282,10 @@ function show_array_last_actions_done($max=5)
$sql
=
"SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label,"
;
$sql
.
=
" c.code, c.libelle,"
;
$sql
.
=
" s.rowid, s.nom as sname, s.client"
;
$sql
.
=
" FROM
(
"
.
MAIN_DB_PREFIX
.
"c_actioncomm as c,"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"c_actioncomm as c,"
;
$sql
.
=
" "
.
MAIN_DB_PREFIX
.
"actioncomm as a"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"societe as s ON a.fk_soc = s.rowid"
;
if
(
!
$user
->
rights
->
societe
->
client
->
voir
&&
!
$socid
)
$sql
.
=
", "
.
MAIN_DB_PREFIX
.
"societe_commerciaux as sc"
;
$sql
.
=
")"
;
$sql
.
=
" WHERE c.id = a.fk_action"
;
$sql
.
=
" AND a.entity = "
.
$conf
->
entity
;
$sql
.
=
" AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '"
.
$db
->
idate
(
$now
)
.
"'))"
;
...
...
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