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

Fix: conflict with cvs

Browse Source
This commit is contained in:
Regis Houssin 2011-06-30 17:21:21 +02:00
parent 661ef186e2
commit f085258243
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,5 @@
-- --
<<<<<<< HEAD -- $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.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 $
>>>>>>> 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
@ -425,12 +421,6 @@ ALTER TABLE llx_propal MODIFY ref_client varchar(50);
ALTER TABLE llx_propal ADD COLUMN ref_int varchar(50) AFTER ref_ext; ALTER TABLE llx_propal ADD COLUMN ref_int varchar(50) AFTER ref_ext;
-- Add module field to allow external modules to set their name when they add a new record during init/remove. -- Add module field to allow external modules to set their name when they add a new record during init/remove.
<<<<<<< HEAD
ALTER TABLE llx_c_type_contact ADD COLUMN module varchar(32) NULL;
ALTER TABLE llx_c_typent ADD COLUMN module varchar(32) NULL;
ALTER TABLE llx_c_effectif ADD COLUMN module varchar(32) NULL;
ALTER TABLE llx_c_forme_juridique ADD COLUMN module varchar(32) NULL;
=======
ALTER TABLE llx_c_chargesociales ADD COLUMN module varchar(32) NULL; ALTER TABLE llx_c_chargesociales ADD COLUMN module varchar(32) NULL;
ALTER TABLE llx_c_civilite ADD COLUMN module varchar(32) NULL; ALTER TABLE llx_c_civilite ADD COLUMN module varchar(32) NULL;
ALTER TABLE llx_c_effectif ADD COLUMN module varchar(32) NULL; ALTER TABLE llx_c_effectif ADD COLUMN module varchar(32) NULL;
@ -448,4 +438,5 @@ 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;
>>>>>>> refs/heads/origin ALTER TABLE llx_don ADD phone_mobile varchar(24) after email;
ALTER TABLE llx_don ADD phone varchar(24) after email;