Fix setup was not clear

htdocs/langs/am_ET/products.lang

@@ -108,7 +108,7 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product

htdocs/langs/en_US/admin.lang

@@ -56,6 +56,7 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=Module <b>%s</b> must be enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.

htdocs/langs/en_US/products.lang

@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product

htdocs/product/admin/product.php

@@ -127,8 +127,8 @@ if ($action == 'other')
 	$value = GETPOST('price_base_type', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUCT_PRICE_BASE_TYPE", $value, 'chaine', 0, '', $conf->entity);
 
-	$value = GETPOST('PRODUIT_SOUSPRODUITS', 'alpha');
+	/*$value = GETPOST('PRODUIT_SOUSPRODUITS', 'alpha');
-	$res = dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $value, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $value, 'chaine', 0, '', $conf->entity);*/
 
 	$value = GETPOST('activate_viewProdDescInForm', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_DESC_IN_FORM", $value, 'chaine', 0, '', $conf->entity);
@@ -312,7 +312,6 @@ print '  <td class="center" width="80">'.$langs->trans("Status").'</td>';
 print '  <td class="center" width="60">'.$langs->trans("ShortInfo").'</td>';
 print "</tr>\n";
 
-$var = true;
 foreach ($dirproduct as $dirroot)
 {
 	$dir = dol_buildpath($dirroot, 0);
@@ -340,7 +339,6 @@ foreach ($dirproduct as $dirroot)
 				if ($modCodeProduct->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 				if ($modCodeProduct->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-				$var = !$var;
 				print '<tr class="oddeven">'."\n";
 				print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";
 				print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
@@ -537,17 +535,35 @@ print '<td class="right" width="60">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>'."\n";
 
 
-/*
+// Enable kits (subproducts)
- * Other parameters
- */
 
-$rowspan = 4;
+print '<tr class="oddeven">';
-if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $rowspan++;
+print '<td>'.$langs->trans("AssociatedProductsAbility").'</td>';
-if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) $rowspan++;
+print '<td class="right">';
-if (!empty($conf->global->MAIN_MULTILANGS)) $rowspan++;
+print ajax_constantonoff("PRODUIT_SOUSPRODUITS", array(), $conf->entity, 0, 0, 1, 0);
-if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $rowspan++;
+//print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1);
+print '</td>';
+print '</tr>';
 
 
+// Enable variants
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("VariantsAbility").'</td>';
+print '<td class="right">';
+//print ajax_constantonoff("PRODUIT_SOUSPRODUITS", array(), $conf->entity, 0, 0, 1, 0);
+//print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1);
+if (empty($conf->variants->enabled)) {
+	print '<span class="opacitymedium">'.$langs->trans("ModuleMustBeEnabled", $langs->transnoentitiesnoconv("Module610Name")).'</span>';
+} else {
+	print yn(1).' <span class="opacitymedium">('.$langs->trans("ModuleIsEnabled", $langs->transnoentitiesnoconv("Module610Name")).')</span>';
+}
+print '</td>';
+print '</tr>';
+
+
+// Rule for price
+
 print '<tr class="oddeven">';
 if (empty($conf->multicompany->enabled))
 {
@@ -583,16 +599,7 @@ print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_
 print '</td>';
 print '</tr>';
 
-// sousproduits activation/desactivation
+// Use Ajax form to select a product
-
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("AssociatedProductsAbility").'</td>';
-print '<td class="right">';
-print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1);
-print '</td>';
-print '</tr>';
-
-// Utilisation formulaire Ajax sur choix produit
 
 print '<tr class="oddeven">';
 print '<td>'.$form->textwithpicto($langs->trans("UseSearchToSelectProduct"), $langs->trans('UseSearchToSelectProductTooltip'), 1).'</td>';