Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/admin/system/database-tables.php

htdocs/admin/system/database-tables.php

@@ -114,7 +114,7 @@ if (!$base)
 				print '<td>'.$obj->Engine.'</td>';
 				if (isset($obj->Engine) && $obj->Engine == "MyISAM")
 				{
-				    print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDB</a></td>';
+				    print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDb</a></td>';
 				} else {
 					print '<td>&nbsp;</td>';
 				}

htdocs/admin/tools/dolibarr_export.php

@@ -237,7 +237,8 @@ if (in_array($type, array('mysql', 'mysqli'))) {
     print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
     print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
     print '</legend>';
-    print '<input type="checkbox" name="drop"'.(((!isset($_GET["drop"]) && !isset($_POST["drop"])) || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
+
+    print '<input type="checkbox" name="drop"'.((! GETPOSTISSET("drop") || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
     print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
     print '<br>';
     print '</fieldset>';

htdocs/install/mysql/tables/llx_c_format_cards.sql

@@ -36,4 +36,4 @@ CREATE TABLE llx_c_format_cards
   custom_x double(24,8) NOT NULL,
   custom_y double(24,8) NOT NULL,
   active integer NOT NULL
-) ENGINE=InnoDB;
+) ENGINE=innodb;

htdocs/install/mysql/tables/llx_establishment.sql

@@ -38,5 +38,5 @@ CREATE TABLE llx_establishment (
   datec				datetime NOT NULL,
   tms				timestamp NOT NULL,
   status            tinyint DEFAULT 1
-) ENGINE=InnoDB;
+) ENGINE=innodb;
 

htdocs/install/mysql/tables/llx_expeditiondet_batch.sql

@@ -23,5 +23,5 @@ CREATE TABLE llx_expeditiondet_batch (
   batch varchar(128) DEFAULT NULL,
   qty double NOT NULL DEFAULT '0',
   fk_origin_stock integer NOT NULL
-) ENGINE=InnoDB;
+) ENGINE=innodb;
 

htdocs/install/mysql/tables/llx_expensereport_rules.sql

@@ -31,4 +31,4 @@ CREATE TABLE llx_expensereport_rules (
   code_expense_rules_type	varchar(50) NOT NULL,
   is_for_all				tinyint DEFAULT 0,
   entity					integer DEFAULT 1
-) ENGINE=InnoDB;
+) ENGINE=innodb;

htdocs/install/mysql/tables/llx_inventory.sql

@@ -35,4 +35,4 @@ CREATE TABLE llx_inventory
   date_validation datetime DEFAULT NULL,
   import_key               varchar(14)       	-- import key
 ) 
-ENGINE=InnoDB;
+ENGINE=innodb;

htdocs/install/mysql/tables/llx_inventorydet.sql

@@ -30,4 +30,4 @@ qty_stock double DEFAULT NULL,   -- The targeted value. can be filled during dra
 qty_view double DEFAULT NULL, 	   -- must be filled once regulation is done
 qty_regulated double DEFAULT NULL  -- must be filled once regulation is done
 ) 
-ENGINE=InnoDB;
+ENGINE=innodb;

htdocs/install/mysql/tables/llx_oauth_state.sql

@@ -22,4 +22,4 @@ CREATE TABLE llx_oauth_state (
     fk_user integer,
     fk_adherent integer,
     entity integer DEFAULT 1
-)ENGINE=InnoDB;
+)ENGINE=innodb;

htdocs/install/mysql/tables/llx_oauth_token.sql

@@ -24,4 +24,4 @@ CREATE TABLE llx_oauth_token (
     fk_user integer,
     fk_adherent integer,
     entity integer DEFAULT 1
-)ENGINE=InnoDB;
+)ENGINE=innodb;

htdocs/install/mysql/tables/llx_opensurvey_comments.sql

@@ -21,5 +21,5 @@ CREATE TABLE llx_opensurvey_comments (
     comment text NOT NULL,
     tms timestamp,
     usercomment text
-) ENGINE=InnoDB;
+) ENGINE=innodb;
 

htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql

@@ -20,5 +20,5 @@ CREATE TABLE llx_opensurvey_formquestions (
 	id_sondage VARCHAR(16),
 	question TEXT,
     available_answers TEXT								-- List of available answers
-) ENGINE=InnoDB;
+) ENGINE=innodb;
 

htdocs/install/mysql/tables/llx_opensurvey_sondage.sql

@@ -31,4 +31,4 @@ CREATE TABLE llx_opensurvey_sondage (
 	allow_spy tinyint NOT NULL DEFAULT 1,
 	tms TIMESTAMP,
 	sujet TEXT									-- Not filled if format = 'F'. Question are into table llx_opensurvey_formquestions
-) ENGINE=InnoDB;
+) ENGINE=innodb;

htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql

@@ -19,4 +19,4 @@ CREATE TABLE llx_opensurvey_user_formanswers (
     fk_user_survey INTEGER NOT NULL,
     fk_question INTEGER NOT NULL,
     reponses TEXT
-) ENGINE=InnoDB;
+) ENGINE=innodb;

htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql

@@ -21,4 +21,4 @@ CREATE TABLE llx_opensurvey_user_studs (
     id_sondage VARCHAR(16) NOT NULL,
     reponses VARCHAR(100) NOT NULL,		-- Not used for 'F' surveys
     tms timestamp
-) ENGINE=InnoDB;
+) ENGINE=innodb;

htdocs/install/mysql/tables/llx_product_batch.sql

@@ -27,5 +27,5 @@ CREATE TABLE llx_product_batch (
   batch varchar(128) NOT NULL,
   qty double NOT NULL DEFAULT 0,
   import_key varchar(14) DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=innodb;
 

htdocs/install/mysql/tables/llx_product_lot.sql

@@ -29,4 +29,4 @@ CREATE TABLE llx_product_lot (
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer
-) ENGINE=InnoDB;
+) ENGINE=innodb;

htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql

@@ -24,5 +24,5 @@ CREATE TABLE llx_propal_merge_pdf_product (
   datec datetime NOT NULL,
   tms timestamp NOT NULL,
   import_key varchar(14) DEFAULT NULL
-) ENGINE=InnoDB;
+) ENGINE=innodb;