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

Fix initdata 3.6 for CommandeFournisseurTest.php run correctly

Browse Source
This commit is contained in:
Florian HENRY 2014-05-14 14:17:03 +02:00
parent ff454130de
commit 26b74a53a2
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dev/initdata/mysqldump_dolibarr_3.6.0.sql
View File

@ -7023,6 +7023,7 @@ CREATE TABLE `llx_user` (
`lang` varchar(6) DEFAULT NULL,
`openid` varchar(255) DEFAULT NULL,
`fk_user` int(11) DEFAULT NULL,
`thm` double(24,8),
`address` varchar(255) DEFAULT NULL,
`zip` varchar(25) DEFAULT NULL,
`town` varchar(50) DEFAULT NULL,
@ -7044,7 +7045,15 @@ CREATE TABLE `llx_user` (
LOCK TABLES `llx_user` WRITE;
/*!40000 ALTER TABLE `llx_user` DISABLE KEYS */;
INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2012-12-12 17:54:10','admin',0,NULL,NULL,NULL,'admin','21232f297a57a5a743894a0e4a801fc3',NULL,'SuperAdminName','Firstname','',NULL,'','','','eldy@destailleur.fr','',1,'','','',1,1,NULL,NULL,NULL,'','2014-03-03 19:19:24','2014-03-02 20:11:17',NULL,'',1,'01.jpg',NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(2,'2010-07-08 13:54:48','2010-07-08 11:54:48','demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,'John','Doe',NULL,NULL,'09123123','','','johndoe@mycompany.com',NULL,0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(3,'2010-07-11 16:18:59','2013-02-20 19:07:21','adupont',1,NULL,NULL,NULL,'adupont','00856ab2bbb748aa29aa335a6e3a2407',NULL,'Dupont','Alain','',NULL,'','','','toto@aa.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,NULL,NULL,NULL,2,NULL,NULL,NULL,0,0,NULL,NULL),(4,'2013-01-23 17:52:27','2013-02-20 19:48:01','aaa',1,NULL,NULL,NULL,'aaa','47bce5c74f589f4867dbd57e9ca9f808',NULL,'aaa','','',NULL,'','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,5,NULL,NULL,NULL,0,0,NULL,NULL),(5,'2013-01-23 17:52:37','2013-01-23 16:52:37','bbb',0,NULL,NULL,NULL,'bbb','08f8e0260c64418510cefb2b06eee5cd',NULL,'bbb','','',NULL,'','','','','',1,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(6,'2013-02-16 20:22:40','2013-02-16 19:22:40','aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 19:48:15','zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 16:10:14','zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf<br />\r\nfsdfsd<br />\r\n<strong>fsdfs</strong>',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,'','','',NULL,NULL,NULL,NULL);
INSERT INTO `llx_user` (`rowid`, `datec`, `tms`, `login`, `entity`, `civilite`, `ref_ext`, `ref_int`, `pass`, `pass_crypted`, `pass_temp`, `lastname`, `firstname`, `job`, `skype`, `office_phone`, `office_fax`, `user_mobile`, `email`, `signature`, `admin`, `webcal_login`, `phenix_login`, `phenix_pass`, `module_comm`, `module_compta`, `fk_societe`, `fk_socpeople`, `fk_member`, `note`, `datelastlogin`, `datepreviouslogin`, `egroupware_id`, `ldap_sid`, `statut`, `photo`, `lang`, `openid`, `fk_user`, `thm`, `address`, `zip`, `town`, `fk_state`, `fk_country`, `color`, `accountancy_code`) VALUES
(1, '2010-07-08 13:20:11', '2012-12-12 16:54:10', 'admin', 0, NULL, NULL, NULL, 'admin', '21232f297a57a5a743894a0e4a801fc3', NULL, 'SuperAdminName', 'Firstname', '', NULL, '', '', '', 'eldy@destailleur.fr', '', 1, '', '', '', 1, 1, NULL, NULL, NULL, '', '2014-03-03 19:19:24', '2014-03-02 20:11:17', NULL, '', 1, '01.jpg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL),
(2, '2010-07-08 13:54:48', '2010-07-08 09:54:48', 'demo', 1, NULL, NULL, NULL, 'demo', 'fe01ce2a7fbac8fafaed7c982a04e229', NULL, 'John', 'Doe', NULL, NULL, '09123123', '', '', 'johndoe@mycompany.com', NULL, 0, '', '', '', 1, 1, NULL, NULL, NULL, '', '2013-03-24 16:30:29', '2010-07-08 14:12:02', NULL, '', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL),
(3, '2010-07-11 16:18:59', '2013-02-20 18:07:21', 'adupont', 1, NULL, NULL, NULL, 'adupont', '00856ab2bbb748aa29aa335a6e3a2407', NULL, 'Dupont', 'Alain', '', NULL, '', '', '', 'toto@aa.com', '', 0, '', '', '', 1, 1, NULL, NULL, 2, '', '2012-12-21 17:38:55', NULL, NULL, '', 1, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL),
(4, '2013-01-23 17:52:27', '2013-02-20 18:48:01', 'aaa', 1, NULL, NULL, NULL, 'aaa', '47bce5c74f589f4867dbd57e9ca9f808', NULL, 'aaa', '', '', NULL, '', '', '', '', '', 0, '', '', '', 1, 1, 17, 6, NULL, '', '2013-02-25 10:18:41', '2013-01-23 17:53:20', NULL, '', 1, NULL, NULL, NULL, 5, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL),
(5, '2013-01-23 17:52:37', '2013-01-23 15:52:37', 'bbb', 0, NULL, NULL, NULL, 'bbb', '08f8e0260c64418510cefb2b06eee5cd', NULL, 'bbb', '', '', NULL, '', '', '', '', '', 1, '', '', '', 1, 1, NULL, NULL, NULL, '', NULL, NULL, NULL, '', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL),
(6, '2013-02-16 20:22:40', '2013-02-16 18:22:40', 'aaab', 2, NULL, NULL, NULL, 'aaab', '4c189b020ceb022e0ecc42482802e2b8', NULL, 'aaab', '', '', NULL, '', '', '', '', '', 0, '', '', '', 1, 1, NULL, NULL, NULL, '', NULL, NULL, NULL, '', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL),
(7, '2013-02-16 20:48:15', '2013-02-16 18:48:15', 'zzz', 2, NULL, NULL, NULL, 'zzz', 'f3abb86bd34cf4d52698f14c0da1dc60', NULL, 'zzz', '', '', NULL, '', '', '', '', '', 0, '', '', '', 1, 1, NULL, NULL, NULL, '', NULL, NULL, NULL, '', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL),
(9, '2013-02-16 20:50:07', '2013-03-24 15:10:14', 'zzzg', 2, NULL, NULL, NULL, 'jc28fg4h', '93d789524fd223cf05eecea3f59cbe86', NULL, 'zzzg', '', '', NULL, '', '', '', '', 'fsdkkfsdf<br />\r\nfsdfsd<br />\r\n<strong>fsdfs</strong>', 0, '', '', '', 1, 1, NULL, NULL, NULL, '', NULL, NULL, NULL, '', 1, NULL, NULL, NULL, 5, NULL, '', '', '', NULL, NULL, NULL, NULL);
/*!40000 ALTER TABLE `llx_user` ENABLE KEYS */;
UNLOCK TABLES;

4
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
View File

@ -1104,8 +1104,8 @@ ALTER TABLE llx_stock_mouvement ADD fk_origin integer;
ALTER TABLE llx_stock_mouvement ADD origintype VARCHAR(32);
-- New 1300 : Add THM on user
ALTER TABLE llx_user ADD thm double(24,8);
ALTER TABLE llx_projet_task_time ADD thm double(24,8);
ALTER TABLE llx_user ADD thm double(24,8) AFTER fk_user;
ALTER TABLE llx_projet_task_time ADD thm double(24,8) AFTER fk_user;
-- New : extrafield on categories