diff --git a/htdocs/asset/admin/assets_extrafields.php b/htdocs/asset/admin/assets_extrafields.php
index 0d134a675c1..1cdf78df4bf 100644
--- a/htdocs/asset/admin/assets_extrafields.php
+++ b/htdocs/asset/admin/assets_extrafields.php
@@ -23,7 +23,7 @@
*/
require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
// Load translation files required by the page
diff --git a/htdocs/asset/admin/assets_type_extrafields.php b/htdocs/asset/admin/assets_type_extrafields.php
index 96557b6acd5..d828bffa4de 100644
--- a/htdocs/asset/admin/assets_type_extrafields.php
+++ b/htdocs/asset/admin/assets_type_extrafields.php
@@ -16,14 +16,13 @@
* or see http://www.gnu.org/
*/
-/**
/**
* \file htdocs/asset/admin/assets_type_extrafields.php
* \ingroup asset
* \brief Page to setup extra fields type of assets
*/
require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
// Load translation files required by the page
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 432e2a0fd0d..c240f350590 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -17,13 +17,13 @@
*/
/**
- * \file htdocs/assets/admin/setup.php
+ * \file htdocs/asset/admin/setup.php
* \ingroup assets
* \brief Assets setup page.
*/
require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/assets.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
global $langs, $user;
diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
index 44481449f39..5bfcda6051c 100644
--- a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
+++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
@@ -484,9 +484,6 @@ ALTER TABLE llx_entrepot ADD COLUMN model_pdf VARCHAR(255) AFTER fk_user_author;
ALTER TABLE llx_stock_mouvement ADD COLUMN model_pdf VARCHAR(255) AFTER origintype;
-
-
-
insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 118, 11801, '', 0, 'Indonesia', 1);
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BA', 11801, NULL, 0, 'BA', 'Bali', 1);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ffa3d59c373..5139c49674a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1160,6 +1160,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print "\n";
if (GETPOST('dol_basehref','alpha')) print ''."\n";
// Displays meta
+ print ''."\n";
print ''."\n"; // Do not index
print ''."\n"; // Scale for mobile device
print ''."\n";
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index b5ede482f99..93474b16554 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -944,6 +944,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUI
}
print '';
+ print '(' . $langs->trans("DisablePriceByQty").')';
} else {
print $langs->trans("No");
print ' (' . $langs->trans("Activate") . ')';
diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php
index 57d4640633e..dc039bf6d5f 100644
--- a/htdocs/variants/admin/admin.php
+++ b/htdocs/variants/admin/admin.php
@@ -20,8 +20,7 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-$langs->load("admin");
-$langs->load("products");
+$langs->loadLangs(array("admin", "products"));
// Security check
if (! $user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled)))
@@ -59,9 +58,9 @@ print '';
print '| '.$langs->trans("Parameters").' | '."\n";
print ''.$langs->trans("Value").' | '."\n";
print ' |
'."\n";
-print '| '.$langs->trans('HideProductCombinations').' | ';
+print ' |
| '.$langs->trans('HideProductCombinations').' | ';
print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD",$conf->global->PRODUIT_ATTRIBUTES_HIDECHILD,1).' |
';
-print '| '.$langs->trans('CombinationsSeparator').' | ';
+print ' |
| '.$langs->trans('CombinationsSeparator').' | ';
if(isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
$separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;
} else {