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
95c30de0
Commit
95c30de0
authored
12 years ago
by
Regis Houssin
Browse files
Options
Downloads
Patches
Plain Diff
Fix: wrong sql request
parent
c69fa495
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/expedition/index.php
+2
-2
2 additions, 2 deletions
htdocs/expedition/index.php
with
2 additions
and
2 deletions
htdocs/expedition/index.php
+
2
−
2
View file @
95c30de0
...
...
@@ -226,8 +226,8 @@ $sql = "SELECT e.rowid, e.ref";
$sql
.
=
", s.nom, s.rowid as socid"
;
$sql
.
=
", c.ref as commande_ref, c.rowid as commande_id"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"expedition as e"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"element_element as el ON e.rowid = el.fk_target AND el.sourcetype IN ('commande')"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"commande as c ON el.fk_source = c.rowid AND el.targettype
IN (
'shipping'
)
"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"element_element as el ON e.rowid = el.fk_target AND
el.targettype = 'shipping' AND
el.sourcetype IN ('commande')"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"commande as c ON el.fk_source = c.rowid AND
el.sourcetype IN ('commande') AND
el.targettype
=
'shipping'"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"societe as s ON s.rowid = e.fk_soc"
;
if
(
!
$user
->
rights
->
societe
->
client
->
voir
&&
!
$socid
)
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"societe_commerciaux as sc ON e.fk_soc = sc.fk_soc"
;
$sql
.
=
" WHERE e.entity = "
.
$conf
->
entity
;
...
...
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