diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index eedb994baed..731f8859eba 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -97,7 +97,7 @@ function product_prepare_head($object)
 	$head[$h][2] = 'referers';
 	$h++;
 
-	if (!empty($conf->variants->enabled) && $object->isProduct()) {
+	if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
 
 		global $db;
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 549eca022b0..a0ab4508d9c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1771,7 +1771,7 @@ else
             }
 
             //Parent product.
-            if (!empty($conf->variants->enabled) && $object->isProduct()) {
+            if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
 
                 $combination = new ProductCombination($db);
 
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 04f53e55d21..3460718c680 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -71,7 +71,7 @@ if ($cancel) {
     unset($_SESSION['addvariant_'.$object->id]);
 }
 
-if (! $object->isProduct()) {
+if (! $object->isProduct() && ! $object->isService()) {
 	header('Location: '.dol_buildpath('/product/card.php?id='.$object->id, 2));
 	exit();
 }
@@ -523,12 +523,13 @@ if (! empty($id) || ! empty($ref))
 				<td><input type="text" id="price_impact" name="price_impact" value="<?php echo price($price_impact) ?>">
 				<input type="checkbox" id="price_impact_percent" name="price_impact_percent" <?php echo $price_impact_percent ? ' checked' : '' ?>> <label for="price_impact_percent"><?php echo $langs->trans('PercentageVariation') ?></label></td>
 			</tr>
-			<tr>
-				<td><label for="weight_impact"><?php echo $langs->trans('WeightImpact') ?></label></td>
-				<td><input type="text" id="weight_impact" name="weight_impact" value="<?php echo price($weight_impact) ?>"></td>
-			</tr>
-		</table>
-		<?php
+<?php   	if ($object->isProduct()) {
+				print '<tr>';
+				print '<td><label for="weight_impact">'.$langs->trans('WeightImpact').'</label></td>';
+				print '<td><input type="text" id="weight_impact" name="weight_impact" value="'.price($weight_impact).'"></td>';
+				print '</tr>';
+			}
+			print '</table>';
 		}
 
 		print dol_fiche_end();
@@ -678,7 +679,7 @@ if (! empty($id) || ! empty($ref))
 				<td class="liste_titre"><?php echo $langs->trans('Product') ?></td>
 				<td class="liste_titre"><?php echo $langs->trans('Combination') ?></td>
 				<td class="liste_titre right"><?php echo $langs->trans('PriceImpact') ?></td>
-				<td class="liste_titre right"><?php echo $langs->trans('WeightImpact') ?></td>
+                <?php if ($object->isProduct()) print'<td class="liste_titre right">'.$langs->trans('WeightImpact').'</td>'; ?>
 				<td class="liste_titre center"><?php echo $langs->trans('OnSell') ?></td>
 				<td class="liste_titre center"><?php echo $langs->trans('OnBuy') ?></td>
 				<td class="liste_titre"></td>
@@ -714,7 +715,7 @@ if (! empty($id) || ! empty($ref))
     					} ?>
     				</td>
     				<td class="right"><?php echo ($currcomb->variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?></td>
-    				<td class="right"><?php echo ($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight') ?></td>
+                    <?php if ($object->isProduct()) print '<td class="right">'.($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight').'</td>'; ?>
     				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 0) ?></td>
     				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 1) ?></td>
     				<td class="right">