From 0ffffa3019b51e92fc1c6b20a6b98a055a900c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Peccatte?= <benoit.peccatte@normation.com>
Date: Mon, 25 Sep 2017 12:05:12 +0200
Subject: [PATCH] Add a parameter to specify variant identifier separator

---
 htdocs/variants/admin/admin.php                    | 13 +++++++++++++
 htdocs/variants/class/ProductCombination.class.php | 10 +++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php
index eedacb086b3..f3752469538 100644
--- a/htdocs/variants/admin/admin.php
+++ b/htdocs/variants/admin/admin.php
@@ -37,6 +37,12 @@ if ($_POST) {
 		setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
 	}
 
+       if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) {
+               setEventMessage($langs->trans('RecordSaved'));
+       } else {
+               setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+       }
+
 }
 
 $title = $langs->trans('ModuleSetup').' '.$langs->trans('ProductAttributes');
@@ -55,6 +61,13 @@ print '<td align="right" width="60">'.$langs->trans("Value").'</td>'."\n";
 print '<td width="80">&nbsp;</td></tr>'."\n";
 print '<tr><td>'.$langs->trans('HideProductCombinations').'</td><td>';
 print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD",$conf->global->PRODUIT_ATTRIBUTES_HIDECHILD,1).'</td></tr>';
+print '<tr><td>'.$langs->trans('CombinationsSeparator').'</td><td>';
+if(isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
+       $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;
+} else {
+       $separator = "_";
+}
+print '<td align="right"><input size="3" type="text" class="flat" name="PRODUIT_ATTRIBUTES_SEPARATOR" value="'.$separator.'"></td></tr>';
 print '</table>';
 print '<br><div style="text-align: center"><input type="submit" value="'.$langs->trans('Save').'" class="button"></div>';
 print '</form>';
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index d3e6964aea6..04b987192e1 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -476,7 +476,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 	 */
 	public function createProductCombination(Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false)
 	{
-		global $db, $user;
+		global $db, $user, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
@@ -542,7 +542,11 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				$price_impact += (float) price2num($variations[$currcombattr][$currcombval]['price']);
 			}
 
-			$newproduct->ref .= '_'.$prodattrval->ref;
+			if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
+			  $newproduct->ref .= $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR . $prodattrval->ref;
+			} else {
+			  $newproduct->ref .= '_'.$prodattrval->ref;
+			}
 
 			//The first one should not contain a linebreak
 			if ($newproduct->description) {
@@ -660,4 +664,4 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 
 		return 1;
 	}
-}
\ No newline at end of file
+}