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
0d6546e1
Commit
0d6546e1
authored
9 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
NEW Add an explanation message on shipment page to explain you can't
make shipment if order is not validated
parent
7fc58dda
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/expedition/shipment.php
+7
-1
7 additions, 1 deletion
htdocs/expedition/shipment.php
htdocs/langs/en_US/sendings.lang
+1
-0
1 addition, 0 deletions
htdocs/langs/en_US/sendings.lang
with
8 additions
and
1 deletion
htdocs/expedition/shipment.php
+
7
−
1
View file @
0d6546e1
...
@@ -701,6 +701,12 @@ if ($id > 0 || ! empty($ref))
...
@@ -701,6 +701,12 @@ if ($id > 0 || ! empty($ref))
// Bouton expedier avec gestion des stocks
// Bouton expedier avec gestion des stocks
if
(
!
empty
(
$conf
->
stock
->
enabled
)
&&
$commande
->
statut
==
Commande
::
STATUS_DRAFT
)
{
print
$langs
->
trans
(
"ValidateOrderFirstBeforeShipment"
);
}
if
(
!
empty
(
$conf
->
stock
->
enabled
)
&&
(
$commande
->
statut
>
Commande
::
STATUS_DRAFT
&&
$commande
->
statut
<
Commande
::
STATUS_CLOSED
))
if
(
!
empty
(
$conf
->
stock
->
enabled
)
&&
(
$commande
->
statut
>
Commande
::
STATUS_DRAFT
&&
$commande
->
statut
<
Commande
::
STATUS_CLOSED
))
{
{
if
(
$user
->
rights
->
expedition
->
creer
)
if
(
$user
->
rights
->
expedition
->
creer
)
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/en_US/sendings.lang
+
1
−
0
View file @
0d6546e1
...
@@ -71,6 +71,7 @@ ProductQtyInShipmentAlreadySent=Product quantity from opened customer order alre
...
@@ -71,6 +71,7 @@ ProductQtyInShipmentAlreadySent=Product quantity from opened customer order alre
ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
WeightVolShort=Weight/Vol.
WeightVolShort=Weight/Vol.
ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
# Sending methods
# Sending methods
SendingMethodCATCH=Catch by customer
SendingMethodCATCH=Catch by customer
...
...
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