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
63a817c3
Commit
63a817c3
authored
9 years ago
by
Florian Henry
Browse files
Options
Downloads
Patches
Plain Diff
Fix wahrehouse multientty management
parent
52cb9581
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/product/stock/index.php
+2
-2
2 additions, 2 deletions
htdocs/product/stock/index.php
htdocs/product/stock/mouvement.php
+1
-1
1 addition, 1 deletion
htdocs/product/stock/mouvement.php
htdocs/product/stock/valo.php
+1
-1
1 addition, 1 deletion
htdocs/product/stock/valo.php
with
4 additions
and
4 deletions
htdocs/product/stock/index.php
+
2
−
2
View file @
63a817c3
...
@@ -64,7 +64,7 @@ print "</table></form><br>";
...
@@ -64,7 +64,7 @@ print "</table></form><br>";
$sql
=
"SELECT e.label, e.rowid, e.statut"
;
$sql
=
"SELECT e.label, e.rowid, e.statut"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"entrepot as e"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"entrepot as e"
;
$sql
.
=
" WHERE e.statut in (0,1)"
;
$sql
.
=
" WHERE e.statut in (0,1)"
;
$sql
.
=
" AND e.entity
= "
.
$conf
->
entity
;
$sql
.
=
" AND e.entity
IN ("
.
getEntity
(
'stock'
,
1
)
.
")"
;
$sql
.
=
$db
->
order
(
'e.statut'
,
'DESC'
);
$sql
.
=
$db
->
order
(
'e.statut'
,
'DESC'
);
$sql
.
=
$db
->
plimit
(
15
,
0
);
$sql
.
=
$db
->
plimit
(
15
,
0
);
...
@@ -119,7 +119,7 @@ $sql.= ", ".MAIN_DB_PREFIX."stock_mouvement as m";
...
@@ -119,7 +119,7 @@ $sql.= ", ".MAIN_DB_PREFIX."stock_mouvement as m";
$sql
.
=
", "
.
MAIN_DB_PREFIX
.
"product as p"
;
$sql
.
=
", "
.
MAIN_DB_PREFIX
.
"product as p"
;
$sql
.
=
" WHERE m.fk_product = p.rowid"
;
$sql
.
=
" WHERE m.fk_product = p.rowid"
;
$sql
.
=
" AND m.fk_entrepot = e.rowid"
;
$sql
.
=
" AND m.fk_entrepot = e.rowid"
;
$sql
.
=
" AND e.entity
= "
.
$conf
->
entity
;
$sql
.
=
" AND e.entity
IN ("
.
getEntity
(
'stock'
,
1
)
.
")"
;
if
(
empty
(
$conf
->
global
->
STOCK_SUPPORTS_SERVICES
))
$sql
.
=
" AND p.fk_product_type = 0"
;
if
(
empty
(
$conf
->
global
->
STOCK_SUPPORTS_SERVICES
))
$sql
.
=
" AND p.fk_product_type = 0"
;
$sql
.
=
$db
->
order
(
"datem"
,
"DESC"
);
$sql
.
=
$db
->
order
(
"datem"
,
"DESC"
);
$sql
.
=
$db
->
plimit
(
$max
,
0
);
$sql
.
=
$db
->
plimit
(
$max
,
0
);
...
...
This diff is collapsed.
Click to expand it.
htdocs/product/stock/mouvement.php
+
1
−
1
View file @
63a817c3
...
@@ -129,7 +129,7 @@ $sql.= " ".MAIN_DB_PREFIX."stock_mouvement as m)";
...
@@ -129,7 +129,7 @@ $sql.= " ".MAIN_DB_PREFIX."stock_mouvement as m)";
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"user as u ON m.fk_user_author = u.rowid"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"user as u ON m.fk_user_author = u.rowid"
;
$sql
.
=
" WHERE m.fk_product = p.rowid"
;
$sql
.
=
" WHERE m.fk_product = p.rowid"
;
$sql
.
=
" AND m.fk_entrepot = e.rowid"
;
$sql
.
=
" AND m.fk_entrepot = e.rowid"
;
$sql
.
=
" AND e.entity
= "
.
$conf
->
entity
;
$sql
.
=
" AND e.entity
IN ("
.
getEntity
(
'stock'
,
1
)
.
")"
;
if
(
empty
(
$conf
->
global
->
STOCK_SUPPORTS_SERVICES
))
$sql
.
=
" AND p.fk_product_type = 0"
;
if
(
empty
(
$conf
->
global
->
STOCK_SUPPORTS_SERVICES
))
$sql
.
=
" AND p.fk_product_type = 0"
;
if
(
$id
)
if
(
$id
)
{
{
...
...
This diff is collapsed.
Click to expand it.
htdocs/product/stock/valo.php
+
1
−
1
View file @
63a817c3
...
@@ -57,7 +57,7 @@ $sql.= " SUM(ps.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sell
...
@@ -57,7 +57,7 @@ $sql.= " SUM(ps.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sell
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"entrepot as e"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"entrepot as e"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"product_stock as ps ON e.rowid = ps.fk_entrepot"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"product_stock as ps ON e.rowid = ps.fk_entrepot"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"product as p ON ps.fk_product = p.rowid"
;
$sql
.
=
" LEFT JOIN "
.
MAIN_DB_PREFIX
.
"product as p ON ps.fk_product = p.rowid"
;
$sql
.
=
" WHERE e.entity
= "
.
$conf
->
entity
;
$sql
.
=
" WHERE e.entity
IN ("
.
getEntity
(
'stock'
,
1
)
.
")"
;
if
(
$sref
)
if
(
$sref
)
{
{
$sql
.
=
" AND e.ref LIKE '%"
.
$sref
.
"%'"
;
$sql
.
=
" AND e.ref LIKE '%"
.
$sref
.
"%'"
;
...
...
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