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
c52794ce
Commit
c52794ce
authored
Aug 7, 2014
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts: htdocs/projet/class/project.class.php
parents
159d0c70
e8ffb0da
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/projet/class/project.class.php
+5
-5
5 additions, 5 deletions
htdocs/projet/class/project.class.php
htdocs/projet/element.php
+2
-2
2 additions, 2 deletions
htdocs/projet/element.php
with
7 additions
and
7 deletions
htdocs/projet/class/project.class.php
+
5
−
5
View file @
c52794ce
...
@@ -204,9 +204,9 @@ class Project extends CommonObject
...
@@ -204,9 +204,9 @@ class Project extends CommonObject
$sql
.
=
", fk_soc = "
.
(
$this
->
socid
>
0
?
$this
->
socid
:
"null"
);
$sql
.
=
", fk_soc = "
.
(
$this
->
socid
>
0
?
$this
->
socid
:
"null"
);
$sql
.
=
", fk_statut = "
.
$this
->
statut
;
$sql
.
=
", fk_statut = "
.
$this
->
statut
;
$sql
.
=
", public = "
.
(
$this
->
public
?
1
:
0
);
$sql
.
=
", public = "
.
(
$this
->
public
?
1
:
0
);
$sql
.
=
", datec="
.
(
$this
->
date_c
!=
''
?
$this
->
db
->
idate
(
$this
->
date_c
)
:
'null'
);
$sql
.
=
", datec="
.
(
$this
->
date_c
!=
''
?
"'"
.
$this
->
db
->
idate
(
$this
->
date_c
)
.
"'"
:
'null'
);
$sql
.
=
", dateo="
.
(
$this
->
date_start
!=
''
?
$this
->
db
->
idate
(
$this
->
date_start
)
:
'null'
);
$sql
.
=
", dateo="
.
(
$this
->
date_start
!=
''
?
"'"
.
$this
->
db
->
idate
(
$this
->
date_start
)
.
"'"
:
'null'
);
$sql
.
=
", datee="
.
(
$this
->
date_end
!=
''
?
$this
->
db
->
idate
(
$this
->
date_end
)
:
'null'
);
$sql
.
=
", datee="
.
(
$this
->
date_end
!=
''
?
"'"
.
$this
->
db
->
idate
(
$this
->
date_end
)
.
"'"
:
'null'
);
$sql
.
=
" WHERE rowid = "
.
$this
->
id
;
$sql
.
=
" WHERE rowid = "
.
$this
->
id
;
dol_syslog
(
get_class
(
$this
)
.
"::Update sql="
.
$sql
,
LOG_DEBUG
);
dol_syslog
(
get_class
(
$this
)
.
"::Update sql="
.
$sql
,
LOG_DEBUG
);
...
@@ -263,6 +263,7 @@ class Project extends CommonObject
...
@@ -263,6 +263,7 @@ class Project extends CommonObject
else
else
{
{
$this
->
error
=
$this
->
db
->
lasterror
();
$this
->
error
=
$this
->
db
->
lasterror
();
$this
->
errors
[]
=
$this
->
error
;
dol_syslog
(
get_class
(
$this
)
.
"::Update error -2 "
.
$this
->
error
,
LOG_ERR
);
dol_syslog
(
get_class
(
$this
)
.
"::Update error -2 "
.
$this
->
error
,
LOG_ERR
);
$result
=
-
2
;
$result
=
-
2
;
}
}
...
@@ -513,7 +514,6 @@ class Project extends CommonObject
...
@@ -513,7 +514,6 @@ class Project extends CommonObject
$sql
=
"DELETE FROM "
.
MAIN_DB_PREFIX
.
"projet_extrafields"
;
$sql
=
"DELETE FROM "
.
MAIN_DB_PREFIX
.
"projet_extrafields"
;
$sql
.
=
" WHERE fk_object="
.
$this
->
id
;
$sql
.
=
" WHERE fk_object="
.
$this
->
id
;
dol_syslog
(
get_class
(
$this
)
.
"::delete sql="
.
$sql
,
LOG_DEBUG
);
dol_syslog
(
get_class
(
$this
)
.
"::delete sql="
.
$sql
,
LOG_DEBUG
);
$resql
=
$this
->
db
->
query
(
$sql
);
$resql
=
$this
->
db
->
query
(
$sql
);
if
(
!
$resql
)
if
(
!
$resql
)
...
...
This diff is collapsed.
Click to expand it.
htdocs/projet/element.php
+
2
−
2
View file @
c52794ce
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