Merge pull request #9729 from simnandez/develop

New: works with variants

htdocs/langs/en_US/products.lang

@@ -330,6 +330,7 @@ NbOfDifferentValues=No. of different values
 NbProducts=No. of products
 ParentProduct=Parent product
 HideChildProducts=Hide variant products
+ShowChildProducts=Show variant products
 ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
 CloneDestinationReference=Destination product reference
 ErrorCopyProductCombinations=There was an error while copying the product variants

htdocs/product/class/product.class.php

@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2015	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2007-2011	Jean Heimburger			<jean@tiaris.info>
- * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2018	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013-2014	Cedric GROSS			<c.gross@kreiz-it.fr>
  * Copyright (C) 2013-2016	Marcos García			<marcosgdf@gmail.com>
@@ -3496,6 +3496,26 @@ class Product extends CommonObject
 		return $nb;
 	}
 
+	/**
+	 * Return if a product has variants or not
+	 *
+	 * @return 	int		Number of variants
+	 */
+	function hasVariants()
+	{
+		$nb = 0;
+		$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".$this->id;
+		$sql.= " AND entity IN (".getEntity('product').")";
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) $nb = $obj->nb;
+		}
+
+		return $nb;
+	}
+
 	/**
 	 *  Return all parent products for current product (first level only)
 	 *

htdocs/product/list.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2013-2016	Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2013-2018	Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013       Jean Heimburger         <jean@tiaris.info>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
@@ -66,11 +66,11 @@ $search_accountancy_code_buy = GETPOST("search_accountancy_code_buy",'alpha');
 $optioncss = GETPOST('optioncss','alpha');
 $type=GETPOST("type","int");
 
-//Show/hide child products. Hidden by default
+//Show/hide child products
-if (!$_POST) {
+if (!empty($conf->variants->enabled) && ! empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
-	$search_hidechildproducts = 'on';
+	$show_childproducts = GETPOST('search_show_childproducts');
 } else {
-	$search_hidechildproducts = GETPOST('search_hidechildproducts');
+	$show_childproducts = '';
 }
 
 $diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
@@ -219,6 +219,8 @@ if (empty($reshook))
 		$search_tobuy="";
 		$search_tobatch='';
 		//$search_type='';						// There is 2 types of list: a list of product and a list of services. No list with both. So when we clear search criteria, we must keep the filter on type.
+
+		$show_childproducts = '';
 		$search_accountancy_code_sell='';
 		$search_accountancy_code_buy='';
 		$search_array_options=array();
@@ -265,7 +267,7 @@ $sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte,
 $sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy,';
 $sql.= ' p.datec as date_creation, p.tms as date_update, p.pmp,';
 $sql.= ' MIN(pfp.unitprice) as minsellprice';
-if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
+if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && ! $show_childproducts )) {
 	$sql .= ', pac.rowid prod_comb_id';
 }
 // Add fields from extrafields
@@ -282,10 +284,12 @@ if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREF
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 // multilang
 if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang() ."'";
-if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
+
+if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && ! $show_childproducts )) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
 }
 
+
 $sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 // if the type is not 1, we show all products (type = 0,2,3)
@@ -294,6 +298,11 @@ if (dol_strlen($search_type) && $search_type != '-1')
 	if ($search_type == 1) $sql.= " AND p.fk_product_type = 1";
 	else $sql.= " AND p.fk_product_type <> 1";
 }
+
+if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && ! $show_childproducts )) {
+	$sql .= " AND pac.rowid IS NULL";
+}
+
 if ($search_ref)     $sql .= natural_search('p.ref', $search_ref);
 if ($search_label)   $sql .= natural_search('p.label', $search_label);
 if ($search_barcode) $sql .= natural_search('p.barcode', $search_barcode);
@@ -308,7 +317,7 @@ if ($fourn_id > 0)  $sql.= " AND pfp.fk_soc = ".$fourn_id;
 if ($search_tobatch != '' && $search_tobatch >= 0)   $sql.= " AND p.tobatch = ".$db->escape($search_tobatch);
 if ($search_accountancy_code_sell) $sql.= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);
 if ($search_accountancy_code_buy)  $sql.= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);
-if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) $sql .= " AND pac.rowid IS NULL";
+
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -318,7 +327,10 @@ $sql.=$hookmanager->resPrint;
 $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
 $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
 $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy, p.pmp';
-if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) $sql .= ', pac.rowid';
+
+if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && ! $show_childproducts )) {
+	$sql .= ', pac.rowid';
+}
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
@@ -392,6 +404,7 @@ if ($resql)
 	if ($search_tobuy != '') $param.="&search_tobuy=".urlencode($search_tobuy);
 	if ($fourn_id > 0) $param.=($fourn_id?"&fourn_id=".$fourn_id:"");
 	if ($seach_categ) $param.=($search_categ?"&search_categ=".urlencode($search_categ):"");
+	if ($show_childproducts) $param.=($show_childproducts?"&search_show_childproducts=".urlencode($show_childproducts):"");
 	if ($type != '') $param.='&type='.urlencode($type);
 	if ($search_type != '') $param.='&search_type='.urlencode($search_type);
 	if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
@@ -467,10 +480,10 @@ if ($resql)
 	}
 
 	//Show/hide child products. Hidden by default
-	if (!empty($conf->variants->enabled) && $search_type === 0) {
+	if (!empty($conf->variants->enabled) && !empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD )) {
 		$moreforfilter.='<div class="divsearchfield">';
-		$moreforfilter.= '<input type="checkbox" id="search_hidechildproducts" name="search_hidechildproducts" value="on"'.($search_hidechildproducts ? 'checked="checked"' : '').'>';
+		$moreforfilter.= '<input type="checkbox" id="search_show_childproducts" name="search_show_childproducts"'.($show_childproducts ? 'checked="checked"':'').'>';
-		$moreforfilter.= ' <label for="search_hidechildproducts">'.$langs->trans('HideChildProducts').'</label>';
+		$moreforfilter.= ' <label for="search_show_childproducts">'.$langs->trans('ShowChildProducts').'</label>';
 		$moreforfilter.='</div>';
 	}
 

htdocs/product/stock/product.php

@@ -5,7 +5,7 @@
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Cédric Salvador      <csalvador.gpcsolutions.fr>
- * Copyright (C) 2013-2015 Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2013-2018 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2014-2015 Cédric Gross         <c.gross@kreiz-it.fr>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
@@ -45,6 +45,13 @@ if (! empty($conf->projet->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
+if (! empty($conf->variants->enabled)) {
+	require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
+	require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttributeValue.class.php';
+	require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductCombination.class.php';
+	require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductCombination2ValuePair.class.php';
+}
+
 // Load translation files required by the page
 $langs->loadlangs(array('products', 'orders', 'bills', 'stocks', 'sendings'));
 if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
@@ -518,6 +525,8 @@ if ($id > 0 || $ref)
 	$object = new Product($db);
 	$result = $object->fetch($id,$ref);
 
+	$variants = $object->hasVariants();
+
 	$object->load_stock();
 
 	$title = $langs->trans('ProductServiceCard');
@@ -558,8 +567,9 @@ if ($id > 0 || $ref)
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
-		if ($conf->productbatch->enabled)
+		if (! $variants) {
-		{
+
+			if ($conf->productbatch->enabled) {
 				print '<tr><td class="titlefield">' . $langs->trans("ManageLotSerial") . '</td><td>';
 				print $object->getLibStatut(0, 2);
 				print '</td></tr>';
@@ -576,15 +586,13 @@ if ($id > 0 || $ref)
 			print '<tr><td>' . $langs->trans("BuyingPriceMin") . '</td>';
 			print '<td>';
 			$product_fourn = new ProductFournisseur($db);
-		if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
+			if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0) {
-		{
 				if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
 				else print $langs->trans("NotDefined");
 			}
 			print '</td></tr>';
 
-		if (empty($conf->global->PRODUIT_MULTIPRICES))
+			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-		{
 				// Price
 				print '<tr><td>' . $langs->trans("SellingPrice") . '</td><td>';
 				if ($object->price_base_type == 'TTC') {
@@ -602,9 +610,7 @@ if ($id > 0 || $ref)
 					print price($object->price_min) . ' ' . $langs->trans($object->price_base_type);
 				}
 				print '</td></tr>';
-		}
+			} else {
-		else
-		{
 				// Price
 				print '<tr><td>' . $langs->trans("SellingPrice") . '</td><td>';
 				print $langs->trans("Variable");
@@ -654,8 +660,7 @@ if ($id > 0 || $ref)
 			$found = 0;
 			$helpondiff = '<strong>' . $langs->trans("StockDiffPhysicTeoric") . ':</strong><br>';
 			// Number of customer orders running
-		if (! empty($conf->commande->enabled))
+			if (!empty($conf->commande->enabled)) {
-		{
 				if ($found) $helpondiff .= '<br>'; else $found = 1;
 				$helpondiff .= $langs->trans("ProductQtyInCustomersOrdersRunning") . ': ' . $object->stats_commande['qty'];
 				$result = $object->load_stats_commande(0, '0', 1);
@@ -664,16 +669,14 @@ if ($id > 0 || $ref)
 			}
 
 			// Number of product from customer order already sent (partial shipping)
-		if (! empty($conf->expedition->enabled))
+			if (!empty($conf->expedition->enabled)) {
-		{
 				if ($found) $helpondiff .= '<br>'; else $found = 1;
 				$result = $object->load_stats_sending(0, '2', 1);
 				$helpondiff .= $langs->trans("ProductQtyInShipmentAlreadySent") . ': ' . $object->stats_expedition['qty'];
 			}
 
 			// Number of supplier order running
-		if (! empty($conf->fournisseur->enabled))
+			if (!empty($conf->fournisseur->enabled)) {
-		{
 				if ($found) $helpondiff .= '<br>'; else $found = 1;
 				$result = $object->load_stats_commande_fournisseur(0, '3,4', 1);
 				$helpondiff .= $langs->trans("ProductQtyInSuppliersOrdersRunning") . ': ' . $object->stats_commande_fournisseur['qty'];
@@ -683,8 +686,7 @@ if ($id > 0 || $ref)
 			}
 
 			// Number of product from supplier order already received (partial receipt)
-		if (! empty($conf->fournisseur->enabled))
+			if (!empty($conf->fournisseur->enabled)) {
-		{
 				if ($found) $helpondiff .= '<br>'; else $found = 1;
 				$helpondiff .= $langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied") . ': ' . $object->stats_reception['qty'];
 			}
@@ -705,27 +707,21 @@ if ($id > 0 || $ref)
 			$sql .= " FROM " . MAIN_DB_PREFIX . "stock_mouvement as m";
 			$sql .= " WHERE m.fk_product = '" . $object->id . "'";
 			$resqlbis = $db->query($sql);
-		if ($resqlbis)
+			if ($resqlbis) {
-		{
 				$obj = $db->fetch_object($resqlbis);
 				$lastmovementdate = $db->jdate($obj->datem);
-		}
+			} else {
-		else
-		{
 				dol_print_error($db);
 			}
 			print '<tr><td class="tdtop">' . $langs->trans("LastMovement") . '</td><td>';
-		if ($lastmovementdate)
+			if ($lastmovementdate) {
-		{
 				print dol_print_date($lastmovementdate, 'dayhour') . ' ';
 				print '(<a href="' . DOL_URL_ROOT . '/product/stock/mouvement.php?idproduct=' . $object->id . '">' . $langs->trans("FullList") . '</a>)';
-		}
+			} else {
-		else
-		{
 				print '<a href="' . DOL_URL_ROOT . '/product/stock/mouvement.php?idproduct=' . $object->id . '">' . $langs->trans("None") . '</a>';
 			}
 			print "</td></tr>";
-
+		}
 		print "</table>";
 
         print '</div>';
@@ -770,23 +766,24 @@ if (empty($reshook))
 	{
 	    print "<div class=\"tabsAction\">\n";
 
-	    if ($user->rights->stock->mouvement->creer)
+		if (! $variants) {
-	    {
+
+			if ($user->rights->stock->mouvement->creer) {
 				print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=correction">' . $langs->trans("CorrectStock") . '</a>';
 			}
 
 			//if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch())
-	    if ($user->rights->stock->mouvement->creer)
+			if ($user->rights->stock->mouvement->creer) {
-		{
 				print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=transfert">' . $langs->trans("TransferStock") . '</a>';
 			}
-
+		}
 		print '</div>';
 	}
 
 }
 
 
+if (! $variants) {
 	/*
 	 * Stock detail (by warehouse). May go down into batch details.
 	 */
@@ -801,8 +798,7 @@ print '<td align="right">'.$langs->trans("EstimatedStockValueShort").'</td>';
 	print '<td align="right">' . $langs->trans("SellPriceMin") . '</td>';
 	print '<td align="right">' . $langs->trans("EstimatedStockValueSellShort") . '</td>';
 	print '</tr>';
-if ((! empty($conf->productbatch->enabled)) && $object->hasbatch())
+	if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
-{
 		print '<tr class="liste_titre"><td width="10%"></td>';
 		print '<td align="right" width="10%">' . $langs->trans("batch_number") . '</td>';
 		print '<td align="center" width="10%">' . $langs->trans("EatByDate") . '</td>';
@@ -832,13 +828,12 @@ $total=0;
 	$totalvalue = $totalvaluesell = 0;
 
 	$resql = $db->query($sql);
-if ($resql)
+	if ($resql) {
-{
 		$num = $db->num_rows($resql);
 		$total = $totalwithpmp;
-	$i=0; $var=false;
+		$i = 0;
-	while ($i < $num)
+		$var = false;
-	{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			$entrepotstatic->id = $obj->rowid;
 			$entrepotstatic->libelle = $obj->label;
@@ -866,19 +861,16 @@ if ($resql)
 			$totalvalue = $totalvalue + ($object->pmp * $obj->reel);
 			$totalvaluesell = $totalvaluesell + ($object->price * $obj->reel);
 			// Batch Detail
-		if ((! empty($conf->productbatch->enabled)) && $object->hasbatch())
+			if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
-		{
 				$details = Productbatch::findAll($db, $obj->product_stock_id, 0, $object->id);
 				if ($details < 0) dol_print_error($db);
-			foreach ($details as $pdluo)
+				foreach ($details as $pdluo) {
-			{
 					$product_lot_static->id = $pdluo->lotid;
 					$product_lot_static->batch = $pdluo->batch;
 					$product_lot_static->eatby = $pdluo->eatby;
 					$product_lot_static->sellby = $pdluo->sellby;
 
-			    if ($action == 'editline' && GETPOST('lineid','int') == $pdluo->id)
+					if ($action == 'editline' && GETPOST('lineid', 'int') == $pdluo->id) { //Current line edit
-			    { //Current line edit
 						print "\n" . '<tr>';
 						print '<td colspan="9">';
 						print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
@@ -896,9 +888,7 @@ if ($resql)
 						print '</table>';
 						print '</form>';
 						print '</td></tr>';
-			    }
+					} else {
-			    else
-				{
 						print "\n" . '<tr><td align="right">';
 						print img_picto($langs->trans("Tranfer"), 'uparrow', 'class="hideonsmartphone"') . ' ';
 						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;id_entrepot=' . $entrepotstatic->id . '&amp;action=transfert&amp;pdluoid=' . $pdluo->id . '">' . $langs->trans("TransferStock") . '</a>';
@@ -919,8 +909,7 @@ if ($resql)
 			$i++;
 
 		}
-}
+	} else dol_print_error($db);
-else dol_print_error($db);
 
 	print '<tr class="liste_total"><td align="right" class="liste_total" colspan="4">' . $langs->trans("Total") . ':</td>';
 	print '<td class="liste_total" align="right">' . price2num($total, 'MS') . '</td>';
@@ -944,8 +933,7 @@ print "</tr>";
 	print "</table>";
 	print '</div>';
 
-if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
+	if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
-{
 		print '<br><br>';
 		print_titre($langs->trans('AddNewProductStockWarehouse'));
 
@@ -971,11 +959,9 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 		$pse = new ProductStockEntrepot($db);
 		$lines = $pse->fetchAll($id);
 
-	if (!empty($lines))
+		if (!empty($lines)) {
-	{
 			$var = false;
-		foreach($lines as $line)
+			foreach ($lines as $line) {
-		{
 				$ent = new Entrepot($db);
 				$ent->fetch($line['fk_entrepot']);
 				print '<tr class="oddeven"><td width="40%">' . $ent->getNomUrl(3) . '</td>';
@@ -994,6 +980,92 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 			print '</form>';
 		}
 	}
+} else {
+	// List of variants
+
+	$prodstatic = new Product($db);
+	$prodcomb = new ProductCombination($db);
+	$comb2val = new ProductCombination2ValuePair($db);
+	$productCombinations = $prodcomb->fetchAllByFkProductParent($object->id);
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="massaction">';
+	print '<input type="hidden" name="id" value="'.$id.'">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+	// load variants
+	$title = $langs->trans("ProductCombinations");
+
+	print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0);
+
+	print '<div class="div-table-responsive">';
+	?>
+	<table class="liste">
+		<tr class="liste_titre">
+			<td class="liste_titre"><?php echo $langs->trans('Product') ?></td>
+			<td class="liste_titre"><?php echo $langs->trans('Combination') ?></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 right"><?php echo $langs->trans('Stock') ?></td>
+			<td class="liste_titre"></td>
+		</tr>
+		<?php
+
+		if (count($productCombinations))
+		{
+			$stock_total= 0;
+			foreach ($productCombinations as $currcomb)
+			{
+				$prodstatic->fetch($currcomb->fk_product_child);
+				$prodstatic->load_stock();
+				$stock_total+=$prodstatic->stock_reel;
+				?>
+				<tr class="oddeven">
+					<td><?php echo $prodstatic->getNomUrl(1) ?></td>
+					<td>
+						<?php
+
+						$productCombination2ValuePairs = $comb2val->fetchByFkCombination($currcomb->id);
+						$iMax = count($productCombination2ValuePairs);
+
+						for ($i = 0; $i < $iMax; $i++) {
+							echo dol_htmlentities($productCombination2ValuePairs[$i]);
+
+							if ($i !== ($iMax - 1)) {
+								echo ', ';
+							}
+						} ?>
+					</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"><?php echo $prodstatic->stock_reel ?></td>
+					<td class="right">
+						<a class="paddingleft paddingright" href="<?php echo dol_buildpath('/product/stock/product.php?id='.$currcomb->fk_product_child, 2) ?>"><?php echo img_edit() ?></a>
+					</td>
+					<?php
+					?>
+				</tr>
+				<?php
+			}
+
+			print '<tr class="liste_total">';
+			print '<td colspan="4" align="left">'.$langs->trans("Total").'</td>';
+			print '<td align="right">'.$stock_total.'</td>';
+			print '</tr>';
+		}
+		else
+		{
+			print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+		}
+		?>
+	</table>
+
+	<?php
+	print '</div>';
+
+	print '</form>';
+}
 
 // End of page
 llxFooter();

htdocs/variants/class/ProductCombination.class.php

@@ -1,6 +1,7 @@
 <?php
 
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ * Copyright (C) 2018	Juanjo Menent	<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -634,7 +635,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		}
 
 		$db->commit();
-		return 1;
+		return $newproduct->id;
 	}
 
 	/**