Merge remote-tracking branch 'origin/3.6' into develop

This commit is contained in:
Laurent Destailleur 2014-08-06 11:01:43 +02:00
commit e52d8a609f
6 changed files with 3 additions and 517 deletions

View File

@ -5619,68 +5619,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_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`

View File

@ -5528,68 +5528,6 @@ INSERT INTO `llx_stock_mouvement` (`rowid`, `tms`, `datem`, `fk_product`, `fk_en
/*!40000 ALTER TABLE `llx_stock_mouvement` 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` (`rowid`, `label`, `targetcode`, `langcode`, `url`, `login`, `pass`, `comment`, `position`, `titlelength`, `descshortlength`, `desclonglength`) 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`

View File

@ -5677,69 +5677,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_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`
--

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long