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
b58e155a
Commit
b58e155a
authored
9 years ago
by
Florian Henry
Browse files
Options
Downloads
Patches
Plain Diff
FIX : #4785
parent
4bf2da4a
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/install/mysql/migration/3.7.0-3.8.0.sql
+13
-1
13 additions, 1 deletion
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/install/mysql/tables/llx_holiday_users.sql
+2
-2
2 additions, 2 deletions
htdocs/install/mysql/tables/llx_holiday_users.sql
with
15 additions
and
3 deletions
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+
13
−
1
View file @
b58e155a
...
...
@@ -795,4 +795,16 @@ ALTER TABLE llx_societe_remise_except MODIFY COLUMN description text NOT NULL;
-- Fix bad data
update
llx_opensurvey_sondage
set
format
=
'D'
where
format
=
'D+'
;
update
llx_opensurvey_sondage
set
format
=
'A'
where
format
=
'A+'
;
\ No newline at end of file
update
llx_opensurvey_sondage
set
format
=
'A'
where
format
=
'A+'
;
--Deal with holidays_user that do not have rowid
CREATE
TABLE
llx_holiday_users_tmp
(
rowid
integer
NOT
NULL
AUTO_INCREMENT
PRIMARY
KEY
,
fk_user
integer
NOT
NULL
,
fk_type
integer
NOT
NULL
,
nb_holiday
real
NOT
NULL
DEFAULT
'0'
)
ENGINE
=
innodb
;
INSERT
INTO
llx_holiday_users_tmp
(
fk_user
,
fk_type
,
nb_holiday
)
SELECT
fk_user
,
fk_type
,
nb_holiday
FROM
llx_holiday_users
;
DROP
TABLE
llx_holiday_users
;
ALTER
TABLE
llx_holiday_users_tmp
RENAME
TO
llx_holiday_users
;
\ No newline at end of file
This diff is collapsed.
Click to expand it.
htdocs/install/mysql/tables/llx_holiday_users.sql
+
2
−
2
View file @
b58e155a
...
...
@@ -18,8 +18,8 @@
CREATE
TABLE
llx_holiday_users
(
rowid
integer
NOT
NULL
AUTO_INCREMENT
PRIMARY
KEY
,
fk_user
integer
NOT
NULL
,
fk_type
integer
NOT
NULL
,
nb_holiday
real
NOT
NULL
DEFAULT
'0'
)
ENGINE
=
innodb
;
\ No newline at end of file
)
ENGINE
=
innodb
;
\ No newline at end of file
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