diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 0bef19dde56..d3da7ad8278 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -221,7 +221,6 @@ print '
| ';
-
global->MYSQL_OLD_OPTION_DISABLE_FK)) { ?>
@@ -244,6 +243,14 @@ print ' |
';
+
+
+
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 6cd98f00e48..0d4cfe9b5bb 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -740,7 +740,10 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
$lines[$i]->fk_fournprice,
$lines[$i]->pa_ht,
$lines[$i]->label,
- $array_options
+ $array_options,
+ 100,
+ 0,
+ $lines[$i]->fk_unit
);
if ($result > 0)
{
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 86eff6613c1..61fc845d7dc 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -262,6 +262,7 @@ class Utils
if (GETPOST("disable_fk", "alpha") || $usedefault) $param.=" -K";
if (GETPOST("sql_compat", "alpha") && GETPOST("sql_compat", "alpha") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat", "alpha"));
if (GETPOST("drop_database", "alpha")) $param.=" --add-drop-database";
+ if (GETPOST("use_mysql_quick_param", "alpha"))$param.=" --quick";
if (GETPOST("sql_structure", "alpha") || $usedefault)
{
if (GETPOST("drop", "alpha") || $usedefault) $param.=" --add-drop-table=TRUE";
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index ece9f4b3d06..64dac1f39e5 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -178,6 +178,8 @@ Compression=Compression
CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
ExportCompatibility=Compatibility of generated export file
+ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
MySqlExportParameters=MySQL export parameters
PostgreSqlExportParameters= PostgreSQL export parameters
UseTransactionnalMode=Use transactional mode
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 7407396835b..c92a8f5da1d 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -178,6 +178,8 @@ Compression=Compression
CommandsToDisableForeignKeysForImport=Commande pour désactiver les clés étrangères à l'importation
CommandsToDisableForeignKeysForImportWarning=Requis si vous voulez être en mesure de restaurer votre « dump » SQL plus tard
ExportCompatibility=Compatibilité du fichier d'exportation généré
+ExportUseMySQLQuickParameter=Utiliser le paramètre --quick
+ExportUseMySQLQuickParameterHelp=permet de limiter la consommation de mémoire vive (utile en cas de tables volumineuses)
MySqlExportParameters=Paramètres de l'exportation MySQL
PostgreSqlExportParameters= Paramètres de l'exportation PostgreSQL
UseTransactionnalMode=Utiliser le mode transactionnel
|