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
14704c97
Commit
14704c97
authored
15 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Nb of orders to process was wrong
parent
cf474fb2
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
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/commande/commande.class.php
+4
-4
4 additions, 4 deletions
htdocs/commande/commande.class.php
with
5 additions
and
4 deletions
ChangeLog
+
1
−
0
View file @
14704c97
...
...
@@ -18,6 +18,7 @@ For users:
- New: Add stock in product lists.
- New: Can filter list of stock movement on date or product.
- New: Added a link from product list to their stock movements.
- Fix: Nb of orders to process was wrong.
- Fix: Customer code was not correct on PDF it if contains special
characters.
- Fix: Can update price even with "NPR" VAT rates.
...
...
This diff is collapsed.
Click to expand it.
htdocs/commande/commande.class.php
+
4
−
4
View file @
14704c97
...
...
@@ -53,7 +53,7 @@ class Commande extends CommonObject
var
$contactid
;
var
$projet_id
;
var
$statut
;
// -1=Annulee, 0=Brouillon, 1=Validee, 2=Acceptee, 3=Envoyee/Recue (facturee ou non)
var
$facturee
;
var
$facturee
;
// Facturee ou non
var
$brouillon
;
var
$cond_reglement_id
;
var
$cond_reglement_code
;
...
...
@@ -278,7 +278,7 @@ class Commande extends CommonObject
{
$mouvP
=
new
MouvementStock
(
$this
->
db
);
// We decrement stock of product (and sub-products)
$entrepot_id
=
"1"
;
// TODO ajouter possibilit de choisir l'entrepot
$entrepot_id
=
"1"
;
// TODO ajouter possibilit
�
de choisir l'entrepot
// TODO Add price of product in method or '' to update PMP
$result
=
$mouvP
->
livraison
(
$user
,
$this
->
lignes
[
$i
]
->
fk_product
,
$entrepot_id
,
$this
->
lignes
[
$i
]
->
qty
);
if
(
$result
<
0
)
{
$error
++
;
}
...
...
@@ -1889,7 +1889,7 @@ class Commande extends CommonObject
$this
->
nbtodo
=
$this
->
nbtodolate
=
0
;
$clause
=
" WHERE"
;
$sql
=
"SELECT c.rowid, c.date_creation as datec"
;
$sql
=
"SELECT c.rowid, c.date_creation as datec
, c.fk_statut
"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"commande as c"
;
if
(
!
$user
->
rights
->
societe
->
client
->
voir
&&
!
$user
->
societe_id
)
{
...
...
@@ -1907,7 +1907,7 @@ class Commande extends CommonObject
while
(
$obj
=
$this
->
db
->
fetch_object
(
$resql
))
{
$this
->
nbtodo
++
;
if
(
$this
->
db
->
jdate
(
$obj
->
datec
)
<
(
$now
-
$conf
->
commande
->
traitement
->
warning_delay
))
$this
->
nbtodolate
++
;
if
(
$obj
->
fk_statut
!=
3
&&
$this
->
db
->
jdate
(
$obj
->
datec
)
<
(
$now
-
$conf
->
commande
->
traitement
->
warning_delay
))
$this
->
nbtodolate
++
;
}
return
1
;
}
...
...
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