From 272c4384319f8d3411ff293e15c72dd5aba5b47e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 6 Aug 2014 10:49:22 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/3.4' into 3.5 --- dev/initdata/mysqldump_dolibarr_3.5.0.sql | 109 ---------------------- 1 file changed, 109 deletions(-) diff --git a/dev/initdata/mysqldump_dolibarr_3.5.0.sql b/dev/initdata/mysqldump_dolibarr_3.5.0.sql index 62eabd2da79..67b4a219b13 100644 --- a/dev/initdata/mysqldump_dolibarr_3.5.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.5.0.sql @@ -6646,115 +6646,6 @@ INSERT INTO `llx_stock_mouvement` VALUES (1,'2010-07-08 22:43:51','2010-07-09 00 /*!40000 ALTER TABLE `llx_stock_mouvement` ENABLE KEYS */; UNLOCK TABLES; --- --- Table structure for table `llx_submitew_message` --- - -DROP TABLE IF EXISTS `llx_submitew_message`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_submitew_message` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `statut` smallint(6) DEFAULT '0', - `label` varchar(60) DEFAULT NULL, - `entity` int(11) NOT NULL DEFAULT '1', - `title` varchar(60) DEFAULT NULL, - `body_short` text, - `body_long` text, - `url` varchar(255) DEFAULT NULL, - `cible` varchar(60) DEFAULT NULL, - `nbemail` int(11) DEFAULT NULL, - `email_from` varchar(160) DEFAULT NULL, - `email_replyto` varchar(160) DEFAULT NULL, - `email_errorsto` varchar(160) DEFAULT NULL, - `tag` varchar(128) DEFAULT NULL, - `date_creat` datetime DEFAULT NULL, - `date_valid` datetime DEFAULT NULL, - `date_appro` datetime DEFAULT NULL, - `date_envoi` datetime DEFAULT NULL, - `fk_user_creat` int(11) DEFAULT NULL, - `fk_user_valid` int(11) DEFAULT NULL, - `fk_user_appro` int(11) DEFAULT NULL, - `joined_file1` varchar(255) DEFAULT NULL, - `joined_file2` varchar(255) DEFAULT NULL, - `joined_file3` varchar(255) DEFAULT NULL, - `joined_file4` varchar(255) DEFAULT NULL, - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_submitew_message` --- - -LOCK TABLES `llx_submitew_message` WRITE; -/*!40000 ALTER TABLE `llx_submitew_message` DISABLE KEYS */; -/*!40000 ALTER TABLE `llx_submitew_message` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_submitew_targets` --- - -DROP TABLE IF EXISTS `llx_submitew_targets`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_submitew_targets` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `label` varchar(64) NOT NULL, - `targetcode` varchar(16) NOT NULL, - `langcode` varchar(5) DEFAULT 'en_US', - `url` varchar(250) DEFAULT NULL, - `login` varchar(128) DEFAULT NULL, - `pass` varchar(128) DEFAULT NULL, - `comment` varchar(250) DEFAULT NULL, - `position` int(11) DEFAULT '0', - `titlelength` int(11) DEFAULT '32', - `descshortlength` int(11) DEFAULT '256', - `desclonglength` int(11) DEFAULT '2000', - PRIMARY KEY (`rowid`), - UNIQUE KEY `uk_submitewtargets` (`label`,`langcode`) -) ENGINE=InnoDB AUTO_INCREMENT=72 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_submitew_targets` --- - -LOCK TABLES `llx_submitew_targets` WRITE; -/*!40000 ALTER TABLE `llx_submitew_targets` DISABLE KEYS */; -INSERT INTO `llx_submitew_targets` VALUES (17,'hhho','email','fr_FR','',NULL,NULL,NULL,0,0,-1,0),(34,'pppp','facebook','fr_FR',NULL,'eldy','ld101010-fk',NULL,0,-1,-1,-1),(35,'hfghfgh','web','de_DE','http://wwww','ffffmmm','null',NULL,0,-1,-1,-1),(37,'llll','linkedin','fr_FR','',NULL,NULL,NULL,0,32,256,2000),(55,'fff','dig','fr_FR',NULL,'hfgh','hfghgf',NULL,0,-1,-1,-1),(56,'aaaaaaa','linkedin','da_DK',NULL,'aa','aaa',NULL,0,32,256,2000),(57,'ddd','dig','en_US',NULL,'dd',NULL,NULL,0,32,256,2000),(59,'dddff','dig','en_US',NULL,NULL,NULL,NULL,0,32,256,2000),(68,'dddffe','dig','en_US',NULL,NULL,NULL,NULL,0,32,256,2000),(70,'dddffef','dig','en_US','http://www.dig.com',NULL,NULL,NULL,0,32,256,2000),(71,'ffff','dig','en_US','http://www.dig.com',NULL,NULL,NULL,0,32,256,2000); -/*!40000 ALTER TABLE `llx_submitew_targets` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_submitew_targets_params` --- - -DROP TABLE IF EXISTS `llx_submitew_targets_params`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_submitew_targets_params` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `fk_target` int(11) NOT NULL, - `paramkey` varchar(16) NOT NULL, - `paramvalue` varchar(128) DEFAULT '', - PRIMARY KEY (`rowid`), - UNIQUE KEY `idx_submitewtargets_fk_target` (`fk_target`), - UNIQUE KEY `uk_submitewtargets_params` (`fk_target`,`paramkey`,`paramvalue`), - CONSTRAINT `fk_submitewtargets_fk_target` FOREIGN KEY (`fk_target`) REFERENCES `llx_submitew_targets` (`rowid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_submitew_targets_params` --- - -LOCK TABLES `llx_submitew_targets_params` WRITE; -/*!40000 ALTER TABLE `llx_submitew_targets_params` DISABLE KEYS */; -/*!40000 ALTER TABLE `llx_submitew_targets_params` ENABLE KEYS */; -UNLOCK TABLES; - -- -- Table structure for table `llx_texts` --