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
206a453c
Commit
206a453c
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Solve confusion into number of order or qty into order.
parent
c727e2b8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/langs/en_US/orders.lang
+2
-0
2 additions, 0 deletions
htdocs/langs/en_US/orders.lang
htdocs/product/stock/product.php
+2
-2
2 additions, 2 deletions
htdocs/product/stock/product.php
with
4 additions
and
2 deletions
htdocs/langs/en_US/orders.lang
+
2
−
0
View file @
206a453c
...
...
@@ -50,6 +50,8 @@ StatusOrderRefused=Refused
StatusOrderReceivedPartially=Partially received
StatusOrderReceivedAll=Everything received
ShippingExist=A shipment exists
ProductQtyInDraft=Product quantity into draft orders
ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
DraftOrWaitingApproved=Draft or approved not yet ordered
DraftOrWaitingShipped=Draft or validated not yet shipped
MenuOrdersToBill=Orders delivered
...
...
This diff is collapsed.
Click to expand it.
htdocs/product/stock/product.php
+
2
−
2
View file @
206a453c
...
...
@@ -438,7 +438,7 @@ if ($id > 0 || $ref)
print
$langs
->
trans
(
"ProductQtyInCustomersOrdersRunning"
)
.
': '
.
$product
->
stats_commande
[
'qty'
];
$result
=
$product
->
load_stats_commande
(
0
,
'0'
);
if
(
$result
<
0
)
dol_print_error
(
$db
,
$product
->
error
);
print
' ('
.
$langs
->
trans
(
"Draft"
)
.
': '
.
$product
->
stats_commande
[
'qty'
]
.
')'
;
print
' ('
.
$langs
->
trans
(
"
ProductQtyIn
Draft"
)
.
': '
.
$product
->
stats_commande
[
'qty'
]
.
')'
;
}
// Number of product from customer order already sent (partial shipping)
...
...
@@ -456,7 +456,7 @@ if ($id > 0 || $ref)
print
$langs
->
trans
(
"ProductQtyInSuppliersOrdersRunning"
)
.
': '
.
$product
->
stats_commande_fournisseur
[
'qty'
];
$result
=
$product
->
load_stats_commande_fournisseur
(
0
,
'0,1,2'
);
if
(
$result
<
0
)
dol_print_error
(
$db
,
$product
->
error
);
print
' ('
.
$langs
->
trans
(
"DraftOrWaitingApproved"
)
.
': '
.
$product
->
stats_commande_fournisseur
[
'qty'
]
.
')'
;
print
' ('
.
$langs
->
trans
(
"
ProductQtyIn
DraftOrWaitingApproved"
)
.
': '
.
$product
->
stats_commande_fournisseur
[
'qty'
]
.
')'
;
}
// Number of product from supplier order already received (partial receipt)
...
...
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