lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsimport

Browse Source 
Conflicts:
	htdocs/install/mysql/migration/3.0.0-3.1.0.sql
This commit is contained in:
Regis Houssin 2011-06-30 17:14:45 +02:00
commit 9359373fc4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/install/mysql/migration/3.0.0-3.1.0.sql
View File

@ -1,6 +1,7 @@
-- --
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
-- $Id: 3.0.0-3.1.0.sql,v 1.75 2011/06/28 07:47:10 eldy Exp $ -- $Id: 3.0.0-3.1.0.sql,v 1.75 2011/06/28 07:47:10 eldy Exp $
======= =======
-- $Id: 3.0.0-3.1.0.sql,v 1.77 2011/06/29 11:22:35 eldy Exp $ -- $Id: 3.0.0-3.1.0.sql,v 1.77 2011/06/29 11:22:35 eldy Exp $
@ -8,6 +9,9 @@
======= =======
-- $Id: 3.0.0-3.1.0.sql,v 1.78 2011/06/29 17:55:32 eldy Exp $ -- $Id: 3.0.0-3.1.0.sql,v 1.78 2011/06/29 17:55:32 eldy Exp $
>>>>>>> refs/heads/origin >>>>>>> refs/heads/origin
=======
-- $Id: 3.0.0-3.1.0.sql,v 1.78 2011/06/29 17:55:32 eldy Exp $
>>>>>>> refs/heads/origin
-- --
-- Be carefull to requests order. -- Be carefull to requests order.
-- This file must be loaded by calling /install/index.php page -- This file must be loaded by calling /install/index.php page
@ -452,9 +456,14 @@ ALTER TABLE llx_c_typent ADD COLUMN module varchar(32) NULL;
ALTER TABLE llx_user ADD signature text DEFAULT NULL AFTER email; ALTER TABLE llx_user ADD signature text DEFAULT NULL AFTER email;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
>>>>>>> refs/heads/origin >>>>>>> refs/heads/origin
======= =======
ALTER TABLE llx_don ADD phone_mobile varchar(24) after email; ALTER TABLE llx_don ADD phone_mobile varchar(24) after email;
ALTER TABLE llx_don ADD phone varchar(24) after email; ALTER TABLE llx_don ADD phone varchar(24) after email;
>>>>>>> refs/heads/origin >>>>>>> refs/heads/origin
=======
ALTER TABLE llx_don ADD phone_mobile varchar(24) after email;
ALTER TABLE llx_don ADD phone varchar(24) after email;
>>>>>>> refs/heads/origin