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
c6081f0f
Commit
c6081f0f
authored
9 years ago
by
Maxime Kohlhaas
Browse files
Options
Downloads
Patches
Plain Diff
Fix multientity stock management (F.Henry followup)
parent
70df5538
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/product/class/product.class.php
+1
-1
1 addition, 1 deletion
htdocs/product/class/product.class.php
htdocs/product/stock/class/entrepot.class.php
+1
-1
1 addition, 1 deletion
htdocs/product/stock/class/entrepot.class.php
with
2 additions
and
2 deletions
htdocs/product/class/product.class.php
+
1
−
1
View file @
c6081f0f
...
@@ -2994,7 +2994,7 @@ class Product extends CommonObject
...
@@ -2994,7 +2994,7 @@ class Product extends CommonObject
$sql
=
"SELECT ps.reel, ps.fk_entrepot, ps.pmp, ps.rowid"
;
$sql
=
"SELECT ps.reel, ps.fk_entrepot, ps.pmp, ps.rowid"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"product_stock as ps"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"product_stock as ps"
;
$sql
.
=
", "
.
MAIN_DB_PREFIX
.
"entrepot as w"
;
$sql
.
=
", "
.
MAIN_DB_PREFIX
.
"entrepot as w"
;
$sql
.
=
" WHERE w.entity IN ("
.
getEntity
(
'
warehouse
'
,
1
)
.
")"
;
$sql
.
=
" WHERE w.entity IN ("
.
getEntity
(
'
stock
'
,
1
)
.
")"
;
$sql
.
=
" AND w.rowid = ps.fk_entrepot"
;
$sql
.
=
" AND w.rowid = ps.fk_entrepot"
;
$sql
.
=
" AND ps.fk_product = "
.
$this
->
id
;
$sql
.
=
" AND ps.fk_product = "
.
$this
->
id
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/product/stock/class/entrepot.class.php
+
1
−
1
View file @
c6081f0f
...
@@ -358,7 +358,7 @@ class Entrepot extends CommonObject
...
@@ -358,7 +358,7 @@ class Entrepot extends CommonObject
$sql
=
"SELECT rowid, label"
;
$sql
=
"SELECT rowid, label"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"entrepot"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"entrepot"
;
$sql
.
=
" WHERE entity IN ("
.
getEntity
(
'
warehouse
'
,
1
)
.
")"
;
$sql
.
=
" WHERE entity IN ("
.
getEntity
(
'
stock
'
,
1
)
.
")"
;
$sql
.
=
" AND statut = "
.
$status
;
$sql
.
=
" AND statut = "
.
$status
;
$result
=
$this
->
db
->
query
(
$sql
);
$result
=
$this
->
db
->
query
(
$sql
);
...
...
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