Dolibarr / dolibarr

htdocs/core/js/lib_notification.js.php

Braces +21 added lines, -7 removed lines

@@ -18,13 +18,27 @@
  * Library javascript to enable Browser notifications
  */
 
-if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1');
-if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN')) define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
 
 require_once '../../main.inc.php';
 

Indentation +7 added lines, -7 removed lines

@@ -30,16 +30,16 @@
 require_once '../../main.inc.php';
 
 if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/index.php'
-    || preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER'])))
+	|| preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER'])))
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    top_httphead('text/javascript; charset=UTF-8');
+	top_httphead('text/javascript; charset=UTF-8');
 
-    print 'var login = \''.$_SESSION['dol_login'].'\';'."\n";
-    print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
-    print 'var time_js_next_test = (Date.now() + time_auto_update);'."\n";
-    ?>
+	print 'var login = \''.$_SESSION['dol_login'].'\';'."\n";
+	print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
+	print 'var time_js_next_test = (Date.now() + time_auto_update);'."\n";
+	?>
 
 	/* Check if permission ok */
 	if (Notification.permission !== "granted") {

htdocs/core/modules/project/task/modules_task.php

Braces +9 added lines, -3 removed lines

@@ -133,9 +133,15 @@
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

Indentation +13 added lines, -13 removed lines

@@ -38,17 +38,17 @@ 
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'project_task';
@@ -78,7 +78,7 @@ 
 	 *
 	 *  @return		boolean     true if module can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -88,7 +88,7 @@ 
 	 *
 	 *  @return     string      Texte descripif
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("projects");
@@ -100,7 +100,7 @@ 
 	 *
 	 *  @return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("projects");
@@ -113,7 +113,7 @@ 
 	 *
 	 *  @return     boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -125,7 +125,7 @@ 
 	 *	@param	Project		$project	Object project
 	 *	@return	string					Valeur
 	 */
-    public function getNextValue($objsoc, $project)
+	public function getNextValue($objsoc, $project)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -136,7 +136,7 @@ 
 	 *
 	 *  @return     string      Valeur
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		global $langs;
 		$langs->load("admin");

htdocs/core/modules/modMultiCurrency.class.php

Braces +3 added lines, -1 removed lines

@@ -309,7 +309,9 @@
 			$multicurrency->name = $langs->cache_currencies[$conf->currency]['label'].' ('.$langs->getCurrencySymbol($conf->currency).')';
 			$r = $multicurrency->create($user);
 			
-			if ($r > 0)	$multicurrency->addRate(1);
+			if ($r > 0) {
+				$multicurrency->addRate(1);
+			}
 		}
 	}
 }

Indentation +20 added lines, -20 removed lines

@@ -38,11 +38,11 @@ 
 	 *
 	 * @param DoliDB $db Database handler
 	 */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
@@ -101,8 +101,8 @@ 
 
 		// Array to add new pages in new tabs
 		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@multicurrency:$user->rights->multicurrency->read:/multicurrency/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@multicurrency:$user->rights->othermodule->read:/multicurrency/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@multicurrency:$user->rights->othermodule->read:/multicurrency/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		//                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
 		// where objecttype can be
 		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
 		// 'contact'          to add a tab in contact view
@@ -123,16 +123,16 @@ 
 		// 'stock'            to add a tab in stock view
 		// 'thirdparty'       to add a tab in third party view
 		// 'user'             to add a tab in user view
-        $this->tabs = array();
-
-        // Dictionaries
-	    if (!isset($conf->multicurrency->enabled))
-        {
-        	$conf->multicurrency = new stdClass();
-        	$conf->multicurrency->enabled = 0;
-        }
+		$this->tabs = array();
+
+		// Dictionaries
+		if (!isset($conf->multicurrency->enabled))
+		{
+			$conf->multicurrency = new stdClass();
+			$conf->multicurrency->enabled = 0;
+		}
 		$this->dictionaries = array();
-        /* Example:
+		/* Example:
         if (! isset($conf->multicurrency->enabled)) $conf->multicurrency->enabled=0;	// This is to avoid warnings
         $this->dictionaries=array(
             'langs'=>'mylangfile@multicurrency',
@@ -149,9 +149,9 @@ 
         );
         */
 
-        // Boxes
+		// Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array(); // List of boxes
+		$this->boxes = array(); // List of boxes
 		// Example:
 		//$this->boxes=array(
 		//    0=>array('file'=>'myboxa.php@multicurrency','note'=>'','enabledbydefaulton'=>'Home'),
@@ -215,8 +215,8 @@ 
 		// Example:
 		// $this->export_code[$r]=$this->rights_class.'_'.$r;
 		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-        // $this->export_icon[$r]='generic:MyModule';
+		// $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+		// $this->export_icon[$r]='generic:MyModule';
 		// $this->export_permission[$r]=array(array("multicurrency","level1","level2"));
 		// $this->export_fields_array[$r]=array(
 		//	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
@@ -259,7 +259,7 @@ 
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')

htdocs/core/lib/parsemd.lib.php

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
         include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
         $Parsedown = new Parsedown();
         $content = $Parsedown->text($content);
-    }
-    else
+    } else
     {
         $content = nl2br($content);
     }

Indentation +38 added lines, -38 removed lines

@@ -31,27 +31,27 @@ 
  */
 function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
 {
-    if (is_array($replaceimagepath))
-    {
-        foreach ($replaceimagepath as $key => $val)
-        {
-            $keytoreplace = ']('.$key;
-            $valafter = ']('.$val;
-            $content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
-        }
-    }
-    if ($parser == 'parsedown')
-    {
-        include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
-        $Parsedown = new Parsedown();
-        $content = $Parsedown->text($content);
-    }
-    else
-    {
-        $content = nl2br($content);
-    }
+	if (is_array($replaceimagepath))
+	{
+		foreach ($replaceimagepath as $key => $val)
+		{
+			$keytoreplace = ']('.$key;
+			$valafter = ']('.$val;
+			$content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
+		}
+	}
+	if ($parser == 'parsedown')
+	{
+		include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
+		$Parsedown = new Parsedown();
+		$content = $Parsedown->text($content);
+	}
+	else
+	{
+		$content = nl2br($content);
+	}
 
-    return $content;
+	return $content;
 }
 
 
@@ -65,23 +65,23 @@ 
  */
 function dolMd2Asciidoc($content, $parser = 'dolibarr', $replaceimagepath = null)
 {
-    if (is_array($replaceimagepath))
-    {
-        foreach ($replaceimagepath as $key => $val)
-        {
-            $keytoreplace = ']('.$key;
-            $valafter = ']('.$val;
-            $content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
-        }
-    }
-    //if ($parser == 'dolibarr')
-    //{
-        $content = preg_replace('/<!--.*-->/msU', '', $content);
-    //}
-    //else
-    //{
-    //    $content = $content;
-    //}
+	if (is_array($replaceimagepath))
+	{
+		foreach ($replaceimagepath as $key => $val)
+		{
+			$keytoreplace = ']('.$key;
+			$valafter = ']('.$val;
+			$content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
+		}
+	}
+	//if ($parser == 'dolibarr')
+	//{
+		$content = preg_replace('/<!--.*-->/msU', '', $content);
+	//}
+	//else
+	//{
+	//    $content = $content;
+	//}
 
-    return $content;
+	return $content;
 }

htdocs/don/payment/payment.php

Braces +2 added lines, -4 removed lines

@@ -132,8 +132,7 @@ 
                 $loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
                 header('Location: '.$loc);
                 exit;
-            }
-            else
+            } else
             {
                 $db->rollback();
             }
@@ -272,8 +271,7 @@ 
 		{
 			$namef = "amount_".$objp->id;
 			print '<input type="text" size="8" name="'.$namef.'">';
-		}
-		else
+		} else
 		{
 			print '-';
 		}

Indentation +61 added lines, -61 removed lines

@@ -69,11 +69,11 @@ 
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-    if (!empty($conf->banque->enabled) && !$_POST["accountid"] > 0)
-    {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
-        $error++;
-    }
+	if (!empty($conf->banque->enabled) && !$_POST["accountid"] > 0)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
+		$error++;
+	}
 
 	if (!$error)
 	{
@@ -89,60 +89,60 @@ 
 			}
 		}
 
-        if (count($amounts) <= 0)
-        {
-            $error++;
-            $errmsg = 'ErrorNoPaymentDefined';
-            setEventMessages($errmsg, null, 'errors');
-        }
-
-        if (!$error)
-        {
-    		$db->begin();
-
-    		// Create a line of payments
-    		$payment = new PaymentDonation($db);
-    		$payment->chid         = $chid;
-    		$payment->datepaid     = $datepaid;
-    		$payment->amounts      = $amounts; // Tableau de montant
-    		$payment->paymenttype  = GETPOST("paymenttype", 'int');
-    		$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
-    		$payment->note_public  = GETPOST("note_public", 'none');
-
-    		if (!$error)
-    		{
-    		    $paymentid = $payment->create($user);
-                if ($paymentid < 0)
-                {
-                    $errmsg = $payment->error;
-                    setEventMessages($errmsg, null, 'errors');
-                    $error++;
-                }
-    		}
-
-            if (!$error)
-            {
-                $result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', $_POST['accountid'], '', '');
-                if (!$result > 0)
-                {
-                    $errmsg = $payment->error;
-                    setEventMessages($errmsg, null, 'errors');
-                    $error++;
-                }
-            }
-
-    	    if (!$error)
-            {
-                $db->commit();
-                $loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
-                header('Location: '.$loc);
-                exit;
-            }
-            else
-            {
-                $db->rollback();
-            }
-        }
+		if (count($amounts) <= 0)
+		{
+			$error++;
+			$errmsg = 'ErrorNoPaymentDefined';
+			setEventMessages($errmsg, null, 'errors');
+		}
+
+		if (!$error)
+		{
+			$db->begin();
+
+			// Create a line of payments
+			$payment = new PaymentDonation($db);
+			$payment->chid         = $chid;
+			$payment->datepaid     = $datepaid;
+			$payment->amounts      = $amounts; // Tableau de montant
+			$payment->paymenttype  = GETPOST("paymenttype", 'int');
+			$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
+			$payment->note_public  = GETPOST("note_public", 'none');
+
+			if (!$error)
+			{
+				$paymentid = $payment->create($user);
+				if ($paymentid < 0)
+				{
+					$errmsg = $payment->error;
+					setEventMessages($errmsg, null, 'errors');
+					$error++;
+				}
+			}
+
+			if (!$error)
+			{
+				$result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', $_POST['accountid'], '', '');
+				if (!$result > 0)
+				{
+					$errmsg = $payment->error;
+					setEventMessages($errmsg, null, 'errors');
+					$error++;
+				}
+			}
+
+			if (!$error)
+			{
+				$db->commit();
+				$loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
+				header('Location: '.$loc);
+				exit;
+			}
+			else
+			{
+				$db->rollback();
+			}
+		}
 	}
 
 	$action = 'create';
@@ -185,7 +185,7 @@ 
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 
-    dol_fiche_head();
+	dol_fiche_head();
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
@@ -220,7 +220,7 @@ 
 
 	print '</table>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
 	/*
  	 * List of payments on donation

htdocs/variants/class/ProductAttribute.class.php

Braces +2 added lines, -1 removed lines

@@ -115,8 +115,9 @@
     
     			$return[] = $tmp;
     		}
+		} else {
+			dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 		
 		return $return;
 	}

Indentation +14 added lines, -14 removed lines

@@ -53,11 +53,11 @@ 
 	 */
 	public $rang;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
 	public function __construct(DoliDB $db)
 	{
 		global $conf;
@@ -110,15 +110,15 @@ 
 		$query = $this->db->query($sql);
 		if ($query)
 		{
-    		while ($result = $this->db->fetch_object($query)) {
-    			$tmp = new ProductAttribute($this->db);
-    			$tmp->id = $result->rowid;
-    			$tmp->ref = $result->ref;
-    			$tmp->label = $result->label;
-    			$tmp->rang = $result->rang;
-
-    			$return[] = $tmp;
-    		}
+			while ($result = $this->db->fetch_object($query)) {
+				$tmp = new ProductAttribute($this->db);
+				$tmp->id = $result->rowid;
+				$tmp->ref = $result->ref;
+				$tmp->label = $result->label;
+				$tmp->rang = $result->rang;
+
+				$return[] = $tmp;
+			}
 		}
 		else dol_print_error($this->db);
 

htdocs/variants/class/ProductCombination.class.php

Braces +3 added lines, -1 removed lines

@@ -190,7 +190,9 @@
 	    $resql = $this->db->query($sql);
 	    if ($resql) {
 	        $obj = $this->db->fetch_object($resql);
-	        if ($obj) $nb = $obj->nb;
+	        if ($obj) {
+	        	$nb = $obj->nb;
+	        }
 	    }
 
 	    return $nb;

Indentation +83 added lines, -83 removed lines

@@ -71,12 +71,12 @@ 
 	 */
 	public $entity;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
-    public function __construct(DoliDB $db)
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
+	public function __construct(DoliDB $db)
 	{
 		global $conf;
 
@@ -189,16 +189,16 @@ 
 	 */
 	public function countNbOfCombinationForFkProductParent($fk_product_parent)
 	{
-	    $nb = 0;
-	    $sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
+		$nb = 0;
+		$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
 
-	    $resql = $this->db->query($sql);
-	    if ($resql) {
-	        $obj = $this->db->fetch_object($resql);
-	        if ($obj) $nb = $obj->nb;
-	    }
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) $nb = $obj->nb;
+		}
 
-	    return $nb;
+		return $nb;
 	}
 
 	/**
@@ -527,9 +527,9 @@ 
 				$newproduct->ref = $forced_refvar;
 			}
 		} else {
-		    $forced_refvar = false;
-		    $existingProduct = false;
-            $newproduct = clone $product;
+			$forced_refvar = false;
+			$existingProduct = false;
+			$newproduct = clone $product;
 		}
 
 		//Final weight impact
@@ -590,11 +590,11 @@ 
 			}
 
 			if ($forced_refvar === false) {
-    			if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
+				if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
 					$newproduct->ref .= $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR.$prodattrval->ref;
-    			} else {
+				} else {
 					$newproduct->ref .= '_'.$prodattrval->ref;
-    			}
+				}
 			}
 
 			//The first one should not contain a linebreak
@@ -613,62 +613,62 @@ 
 		// Now create the product
 		//print 'Create prod '.$newproduct->ref.'<br>'."\n";
 		if ($existingProduct === false) {
-    		//To avoid wrong information in price history log
-    		$newproduct->price = 0;
-    		$newproduct->price_ttc = 0;
-    		$newproduct->price_min = 0;
-    		$newproduct->price_min_ttc = 0;
-
-    		// A new variant must use a new barcode (not same product)
-    		$newproduct->barcode = -1;
-		    $result = $newproduct->create($user);
-
-    		if ($result < 0)
-    		{
-    			//In case the error is not related with an already existing product
-    			if ($newproduct->error != 'ErrorProductAlreadyExists') {
-    			    $this->error[] = $newproduct->error;
-    			    $this->errors = $newproduct->errors;
-    				$db->rollback();
-    				return -1;
-    			}
-
-    			/**
-    			 * If there is an existing combination, then we update the prices and weight
-    			 * Otherwise, we try adding a random number to the ref
-    			 */
-
-    			if ($newcomb->fk_product_child) {
-    				$res = $newproduct->fetch($existingCombination->fk_product_child);
-    			} else {
-    				$orig_prod_ref = $newproduct->ref;
-    				$i = 1;
-
-    				do {
-    					$newproduct->ref = $orig_prod_ref.$i;
-    					$res = $newproduct->create($user);
-
-    					if ($newproduct->error != 'ErrorProductAlreadyExists') {
-    					    $this->errors[] = $newproduct->error;
-    						break;
-    					}
-
-    					$i++;
-    				} while ($res < 0);
-    			}
-
-    			if ($res < 0) {
-    				$db->rollback();
-    				return -1;
-    			}
-    		}
+			//To avoid wrong information in price history log
+			$newproduct->price = 0;
+			$newproduct->price_ttc = 0;
+			$newproduct->price_min = 0;
+			$newproduct->price_min_ttc = 0;
+
+			// A new variant must use a new barcode (not same product)
+			$newproduct->barcode = -1;
+			$result = $newproduct->create($user);
+
+			if ($result < 0)
+			{
+				//In case the error is not related with an already existing product
+				if ($newproduct->error != 'ErrorProductAlreadyExists') {
+					$this->error[] = $newproduct->error;
+					$this->errors = $newproduct->errors;
+					$db->rollback();
+					return -1;
+				}
+
+				/**
+				 * If there is an existing combination, then we update the prices and weight
+				 * Otherwise, we try adding a random number to the ref
+				 */
+
+				if ($newcomb->fk_product_child) {
+					$res = $newproduct->fetch($existingCombination->fk_product_child);
+				} else {
+					$orig_prod_ref = $newproduct->ref;
+					$i = 1;
+
+					do {
+						$newproduct->ref = $orig_prod_ref.$i;
+						$res = $newproduct->create($user);
+
+						if ($newproduct->error != 'ErrorProductAlreadyExists') {
+							$this->errors[] = $newproduct->error;
+							break;
+						}
+
+						$i++;
+					} while ($res < 0);
+				}
+
+				if ($res < 0) {
+					$db->rollback();
+					return -1;
+				}
+			}
 		} else {
-		    $result = $newproduct->update($newproduct->id, $user);
-		    if ($result < 0)
-		    {
-		        $db->rollback();
-		        return -1;
-		    }
+			$result = $newproduct->update($newproduct->id, $user);
+			if ($result < 0)
+			{
+				$db->rollback();
+				return -1;
+			}
 		}
 
 		$newcomb->fk_product_child = $newproduct->id;
@@ -683,14 +683,14 @@ 
 		return $newproduct->id;
 	}
 
-    /**
-     * Copies all product combinations from the origin product to the destination product
-     *
+	/**
+	 * Copies all product combinations from the origin product to the destination product
+	 *
 	 * @param 	User 	$user	Object user
-     * @param   int     $origProductId  Origin product id
-     * @param   Product $destProduct    Destination product
-     * @return  int                     >0 OK <0 KO
-     */
+	 * @param   int     $origProductId  Origin product id
+	 * @param   Product $destProduct    Destination product
+	 * @return  int                     >0 OK <0 KO
+	 */
 	public function copyAll(User $user, $origProductId, Product $destProduct)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
@@ -712,7 +712,7 @@ 
 				$variations[$tmp_pc2v->fk_prod_attr] = $tmp_pc2v->fk_prod_attr_val;
 			}
 
-            if ($this->createProductCombination(
+			if ($this->createProductCombination(
 				$user,
 				$destProduct,
 				$variations,

htdocs/margin/lib/margins.lib.php

Braces +13 added lines, -12 removed lines

@@ -124,13 +124,11 @@ 
 		if ($product->fetch_product_fournisseur_price($fk_pa))
 		{
 			$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-		}
-		else
+		} else
 		{
 			$paht_ret = $paht;
 		}
-	}
-	else
+	} else
 	{
 		$paht_ret = $paht;
 	}
@@ -142,17 +140,20 @@ 
 	$pu_ht_remise = price2num($pu_ht_remise, 'MU');
 
 	// calcul marge
-	if ($pu_ht_remise < 0)
-		$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
-	else
-		$marge = $pu_ht_remise - $paht_ret;
+	if ($pu_ht_remise < 0) {
+			$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
+	} else {
+			$marge = $pu_ht_remise - $paht_ret;
+	}
 
 	// calcul taux marge
-	if ($paht_ret != 0)
-		$marge_tx_ret = (100 * $marge) / $paht_ret;
+	if ($paht_ret != 0) {
+			$marge_tx_ret = (100 * $marge) / $paht_ret;
+	}
 	// calcul taux marque
-	if ($pu_ht_remise != 0)
-		$marque_tx_ret = (100 * $marge) / $pu_ht_remise;
+	if ($pu_ht_remise != 0) {
+			$marque_tx_ret = (100 * $marge) / $pu_ht_remise;
+	}
 
 	return array($paht_ret, $marge_tx_ret, $marque_tx_ret);
 }

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, '', $head, $h, 'margesadmin');
 
 	complete_head_from_modules($conf, $langs, '', $head, $h, 'margesadmin', 'remove');

htdocs/cashdesk/affContenu.php

Indentation +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
 // Recuperation, s'il existe, de l'objet contenant les infos de la vente en cours ...
 if (isset($_SESSION['serObjFacturation']))
 {
-    $obj_facturation = unserialize($_SESSION['serObjFacturation']);
-    unset($_SESSION['serObjFacturation']);
+	$obj_facturation = unserialize($_SESSION['serObjFacturation']);
+	unset($_SESSION['serObjFacturation']);
 }
 else
 {

Braces +5 added lines, -5 removed lines

@@ -36,8 +36,7 @@ 
 {
     $obj_facturation = unserialize($_SESSION['serObjFacturation']);
     unset($_SESSION['serObjFacturation']);
-}
-else
+} else
 {
 	// ... sinon, c'est une nouvelle vente
 	$obj_facturation = new Facturation();
@@ -60,7 +59,9 @@ 
 print '<div class="principal">';
 
 $page = GETPOST('menutpl', 'alpha');
-if (empty($page)) $page = 'facturation';
+if (empty($page)) {
+	$page = 'facturation';
+}
 
 if (in_array(
 		$page,
@@ -72,8 +73,7 @@ 
 	))
 {
 	include $page.'.php';
-}
-else
+} else
 {
 	dol_print_error('', 'menu param '.$page.' is not inside allowed list');
 }