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
a47f3cb0
Commit
a47f3cb0
authored
8 years ago
by
Laurent Destailleur
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #6309 from atm-arnaud/FIX_calcul_marge_by_user_with_multicompany
FIX bug margin calcul by user with multicompany
parents
c953ae2a
2cedcfec
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/margin/agentMargins.php
+1
-0
1 addition, 0 deletions
htdocs/margin/agentMargins.php
with
1 addition
and
0 deletions
htdocs/margin/agentMargins.php
+
1
−
0
View file @
a47f3cb0
...
...
@@ -126,6 +126,7 @@ $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
$sql
.
=
", "
.
MAIN_DB_PREFIX
.
"societe_commerciaux as sc"
;
$sql
.
=
", "
.
MAIN_DB_PREFIX
.
"user as u"
;
$sql
.
=
" WHERE f.fk_soc = s.rowid"
;
$sql
.
=
" AND f.entity = "
.
$conf
->
entity
;
$sql
.
=
" AND sc.fk_soc = f.fk_soc"
;
$sql
.
=
" AND (d.product_type = 0 OR d.product_type = 1)"
;
if
(
!
empty
(
$conf
->
global
->
AGENT_CONTACT_TYPE
))
...
...
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