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
ba15e00b
Commit
ba15e00b
authored
15 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: SQL Error
parent
7813ef32
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/stock/class/entrepot.class.php
+5
-6
5 additions, 6 deletions
htdocs/product/stock/class/entrepot.class.php
htdocs/product/stock/fiche.php
+3
-3
3 additions, 3 deletions
htdocs/product/stock/fiche.php
with
8 additions
and
9 deletions
htdocs/product/stock/class/entrepot.class.php
+
5
−
6
View file @
ba15e00b
<?php
<?php
/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-200
5
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-20
1
0 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2008 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2008 Regis Houssin <regis@dolibarr.fr>
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
...
@@ -276,12 +276,11 @@ class Entrepot extends CommonObject
...
@@ -276,12 +276,11 @@ class Entrepot extends CommonObject
*/
*/
function
info
(
$id
)
function
info
(
$id
)
{
{
$sql
=
"SELECT e.rowid, e.datec,"
;
$sql
=
"SELECT e.rowid, e.datec, e.tms as datem, e.fk_user_author"
;
$sql
.
=
" e.datem,"
;
$sql
.
=
" fk_user_author"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"entrepot as e"
;
$sql
.
=
" FROM "
.
MAIN_DB_PREFIX
.
"entrepot as e"
;
$sql
.
=
" WHERE e.rowid = "
.
$id
;
$sql
.
=
" WHERE e.rowid = "
.
$id
;
dol_syslog
(
"Entrepot::info sql="
.
$sql
);
$result
=
$this
->
db
->
query
(
$sql
);
$result
=
$this
->
db
->
query
(
$sql
);
if
(
$result
)
if
(
$result
)
{
{
...
...
This diff is collapsed.
Click to expand it.
htdocs/product/stock/fiche.php
+
3
−
3
View file @
ba15e00b
<?php
<?php
/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-200
9
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-20
1
0 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Simon Tosser <simon@kornog-computing.com>
* Copyright (C) 2005 Simon Tosser <simon@kornog-computing.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
*
*
...
@@ -124,14 +124,14 @@ if ($_POST["action"] == 'update' && $_POST["cancel"] <> $langs->trans("Cancel"))
...
@@ -124,14 +124,14 @@ if ($_POST["action"] == 'update' && $_POST["cancel"] <> $langs->trans("Cancel"))
{
{
$_GET
[
"action"
]
=
'edit'
;
$_GET
[
"action"
]
=
'edit'
;
$_GET
[
"id"
]
=
$_POST
[
"id"
];
$_GET
[
"id"
]
=
$_POST
[
"id"
];
$mesg
=
'<div class="error">
Fiche non mise � jour !'
.
"<br>"
.
$entrepot
->
error
.
'</div>'
;
$mesg
=
'<div class="error">
'
.
$entrepot
->
error
.
'</div>'
;
}
}
}
}
else
else
{
{
$_GET
[
"action"
]
=
'edit'
;
$_GET
[
"action"
]
=
'edit'
;
$_GET
[
"id"
]
=
$_POST
[
"id"
];
$_GET
[
"id"
]
=
$_POST
[
"id"
];
$mesg
=
'<div class="error">
Fiche non mise � jour !'
.
"<br>"
.
$entrepot
->
error
.
'</div>'
;
$mesg
=
'<div class="error">
'
.
$entrepot
->
error
.
'</div>'
;
}
}
}
}
...
...
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