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
c49c23df
Commit
c49c23df
authored
8 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix debug project categories
parent
64351f34
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/categories/class/categorie.class.php
+2
-2
2 additions, 2 deletions
htdocs/categories/class/categorie.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+17
-1
17 additions, 1 deletion
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
with
19 additions
and
3 deletions
htdocs/categories/class/categorie.class.php
+
2
−
2
View file @
c49c23df
...
@@ -458,7 +458,7 @@ class Categorie extends CommonObject
...
@@ -458,7 +458,7 @@ class Categorie extends CommonObject
$this
->
db
->
begin
();
$this
->
db
->
begin
();
/* FIX #1317 : Check for child cat and move up 1 level*/
/* FIX #1317 : Check for child cat
egory
and move up 1 level*/
if
(
!
$error
)
if
(
!
$error
)
{
{
$sql
=
"UPDATE "
.
MAIN_DB_PREFIX
.
"categorie"
;
$sql
=
"UPDATE "
.
MAIN_DB_PREFIX
.
"categorie"
;
...
@@ -524,7 +524,7 @@ class Categorie extends CommonObject
...
@@ -524,7 +524,7 @@ class Categorie extends CommonObject
if
(
!
$error
)
if
(
!
$error
)
{
{
$sql
=
"DELETE FROM "
.
MAIN_DB_PREFIX
.
"categorie_project"
;
$sql
=
"DELETE FROM "
.
MAIN_DB_PREFIX
.
"categorie_project"
;
$sql
.
=
" WHERE fk_categor
y
= "
.
$this
->
id
;
$sql
.
=
" WHERE fk_categor
ie
= "
.
$this
->
id
;
if
(
!
$this
->
db
->
query
(
$sql
))
if
(
!
$this
->
db
->
query
(
$sql
))
{
{
$this
->
error
=
$this
->
db
->
lasterror
();
$this
->
error
=
$this
->
db
->
lasterror
();
...
...
This diff is collapsed.
Click to expand it.
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+
17
−
1
View file @
c49c23df
...
@@ -46,4 +46,20 @@ ALTER TABLE llx_notify ADD COLUMN type_target varchar(16) NULL;
...
@@ -46,4 +46,20 @@ ALTER TABLE llx_notify ADD COLUMN type_target varchar(16) NULL;
ALTER
TABLE
llx_entrepot
DROP
COLUMN
valo_pmp
;
ALTER
TABLE
llx_entrepot
DROP
COLUMN
valo_pmp
;
ALTER
TABLE
llx_notify_def
MODIFY
COLUMN
fk_soc
integer
NULL
;
ALTER
TABLE
llx_notify_def
MODIFY
COLUMN
fk_soc
integer
NULL
;
-- VPGSQL8.2 ALTER TABLE llx_notify_def ALTER COLUMN fk_soc SET DEFAULT NULL;
-- VPGSQL8.2 ALTER TABLE llx_notify_def ALTER COLUMN fk_soc SET DEFAULT NULL;
\ No newline at end of file
create
table
llx_categorie_project
(
fk_categorie
integer
NOT
NULL
,
fk_project
integer
NOT
NULL
,
import_key
varchar
(
14
)
)
ENGINE
=
innodb
;
ALTER
TABLE
llx_categorie_project
ADD
PRIMARY
KEY
pk_categorie_project
(
fk_categorie
,
fk_project
);
ALTER
TABLE
llx_categorie_project
ADD
INDEX
idx_categorie_project_fk_categorie
(
fk_categorie
);
ALTER
TABLE
llx_categorie_project
ADD
INDEX
idx_categorie_project_fk_project
(
fk_project
);
ALTER
TABLE
llx_categorie_project
ADD
CONSTRAINT
fk_categorie_project_categorie_rowid
FOREIGN
KEY
(
fk_categorie
)
REFERENCES
llx_categorie
(
rowid
);
ALTER
TABLE
llx_categorie_project
ADD
CONSTRAINT
fk_categorie_project_fk_project_rowid
FOREIGN
KEY
(
fk_project
)
REFERENCES
llx_projet
(
rowid
);
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