alxarafe / alixar

dolibarr/htdocs/user/perms.php

Braces +4 added lines, -4 removed lines

@@ -211,14 +211,14 @@
     $i = 0;
     while ($i < $num) {
         $obj = $db->fetch_object($result);
-        if (!isset($permsgroupbyentity[$obj->entity]))
-            $permsgroupbyentity[$obj->entity] = array();
+        if (!isset($permsgroupbyentity[$obj->entity])) {
+                    $permsgroupbyentity[$obj->entity] = array();
+        }
         array_push($permsgroupbyentity[$obj->entity], $obj->fk_id);
         $i++;
     }
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 

dolibarr/htdocs/margin/lib/margins.lib.php

Indentation +4 added lines, -4 removed lines

@@ -73,10 +73,10 @@
 
     if ($user->rights->societe->lire) {
         $head[$h][0] = BASE_URI . '?controller=margin&method=customerMargins';
-		$head[$h][1] = $langs->trans("CustomerMargins");
-		$head[$h][2] = 'customerMargins';
-		$h++;
-	}
+        $head[$h][1] = $langs->trans("CustomerMargins");
+        $head[$h][2] = 'customerMargins';
+        $h++;
+    }
 
     if ($user->rights->margins->read->all) {
         $title = 'UserMargins';

dolibarr/htdocs/master.inc.php

Indentation +66 added lines, -66 removed lines

@@ -68,33 +68,33 @@ 
 $conf->file->dol_url_root				= array('main' => (string) DOL_URL_ROOT);									// Define array of url root path ('' or '/dolibarr')
 if (! empty($dolibarr_main_document_root_alt))
 {
-	// dolibarr_main_document_root_alt can contains several directories
-	$values=preg_split('/[;,]/',$dolibarr_main_document_root_alt);
-	$i=0;
+    // dolibarr_main_document_root_alt can contains several directories
+    $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt);
+    $i=0;
     foreach ($values as $value)
         $conf->file->dol_document_root['alt' . ($i++)] = (string)$value;
-	$values=preg_split('/[;,]/',$dolibarr_main_url_root_alt);
-	$i=0;
-	foreach($values as $value)
-	{
-		if (preg_match('/^http(s)?:/',$value))
-		{
-			// Show error message
-			$correct_value = str_replace($dolibarr_main_url_root, '', $value);
-			print '<b>Error:</b><br>'."\n";
-			print 'Wrong <b>$dolibarr_main_url_root_alt</b> value in <b>conf.php</b> file.<br>'."\n";
-			print 'We now use a relative path to $dolibarr_main_url_root to build alternate URLs.<br>'."\n";
-			print 'Value found: '.$value.'<br>'."\n";
-			print 'Should be replaced by: '.$correct_value.'<br>'."\n";
-			print "Or something like following examples:<br>\n";
-			print "\"/extensions\"<br>\n";
-			print "\"/extensions1,/extensions2,...\"<br>\n";
-			print "\"/../extensions\"<br>\n";
-			print "\"/custom\"<br>\n";
-			exit;
-		}
-		$conf->file->dol_url_root['alt'.($i++)]=(string) $value;
-	}
+    $values=preg_split('/[;,]/',$dolibarr_main_url_root_alt);
+    $i=0;
+    foreach($values as $value)
+    {
+        if (preg_match('/^http(s)?:/',$value))
+        {
+            // Show error message
+            $correct_value = str_replace($dolibarr_main_url_root, '', $value);
+            print '<b>Error:</b><br>'."\n";
+            print 'Wrong <b>$dolibarr_main_url_root_alt</b> value in <b>conf.php</b> file.<br>'."\n";
+            print 'We now use a relative path to $dolibarr_main_url_root to build alternate URLs.<br>'."\n";
+            print 'Value found: '.$value.'<br>'."\n";
+            print 'Should be replaced by: '.$correct_value.'<br>'."\n";
+            print "Or something like following examples:<br>\n";
+            print "\"/extensions\"<br>\n";
+            print "\"/extensions1,/extensions2,...\"<br>\n";
+            print "\"/../extensions\"<br>\n";
+            print "\"/custom\"<br>\n";
+            exit;
+        }
+        $conf->file->dol_url_root['alt'.($i++)]=(string) $value;
+    }
 }
 
 // Chargement des includes principaux de librairies communes
@@ -108,7 +108,7 @@ 
  */
 if (! defined('NOREQUIRETRAN'))
 {
-	$langs = new Translate('',$conf);	// Must be after reading conf
+    $langs = new Translate('',$conf);	// Must be after reading conf
 }
 
 /*
@@ -118,11 +118,11 @@ 
 {
     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
 
-	if ($db->error)
-	{
-		dol_print_error($db,"host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);
-		exit;
-	}
+    if ($db->error)
+    {
+        dol_print_error($db,"host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);
+        exit;
+    }
 }
 
 // Now database connexion is known, so we can forget password
@@ -134,7 +134,7 @@ 
  */
 if (! defined('NOREQUIREUSER'))
 {
-	$user = new User($db);
+    $user = new User($db);
 }
 
 /*
@@ -145,19 +145,19 @@ 
 // By default conf->entity is 1, but we change this if we ask another value.
 if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session
 {
-	$conf->entity = $_SESSION["dol_entity"];
+    $conf->entity = $_SESSION["dol_entity"];
 }
 else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script
 {
-	$conf->entity = $_ENV["dol_entity"];
+    $conf->entity = $_ENV["dol_entity"];
 }
 else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int'))	// Just after a login page
 {
-	$conf->entity = GETPOST("entity",'int');
+    $conf->entity = GETPOST("entity",'int');
 }
 else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
 {
-	$conf->entity = DOLENTITY;
+    $conf->entity = DOLENTITY;
 }
 
 // Sanitize entity
@@ -165,16 +165,16 @@ 
 
 if (! defined('NOREQUIREDB'))
 {
-	//print "Will work with data into entity instance number '".$conf->entity."'";
+    //print "Will work with data into entity instance number '".$conf->entity."'";
 
-	// Here we read database (llx_const table) and define $conf->global->XXX var.
-	$conf->setValues($db);
+    // Here we read database (llx_const table) and define $conf->global->XXX var.
+    $conf->setValues($db);
 }
 
 // Overwrite database value
 if (! empty($conf->file->mailing_limit_sendbyweb))
 {
-	$conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;
+    $conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;
 }
 if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
 {
@@ -192,41 +192,41 @@ 
 // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 {
-	$ok=0;
-	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)
-	elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)
-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)
-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin
-	if (! $ok)
-	{
-		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
-		{
-			print 'Sorry, your application is offline.'."\n";
-			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
+    $ok=0;
+    if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
+    elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)
+    elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)
+    elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)
+    elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin
+    if (! $ok)
+    {
+        if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
+        {
+            print 'Sorry, your application is offline.'."\n";
+            print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
             $nexturl = BASE_URI . '?controller=user&method=logout';
-			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		}
-		else
-		{
-			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
+            print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
+        }
+        else
+        {
+            print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
             $nexturl = BASE_URI . '/';
-			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
-		}
-		exit;
-	}
+            print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
+        }
+        exit;
+    }
 }
 
 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
 if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
 {
-	require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+    require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
 
-	$mysoc=new Societe($db);
-	$mysoc->setMysoc($conf);
+    $mysoc=new Societe($db);
+    $mysoc->setMysoc($conf);
 
-	// For some countries, we need to invert our address with customer address
-	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
+    // For some countries, we need to invert our address with customer address
+    if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
 }
 
 

Braces +60 added lines, -22 removed lines

@@ -54,7 +54,10 @@ 
 $conf->db->dolibarr_main_db_collation	= $dolibarr_main_db_collation;
 $conf->db->dolibarr_main_db_encryption	= $dolibarr_main_db_encryption;
 $conf->db->dolibarr_main_db_cryptkey	= $dolibarr_main_db_cryptkey;
-if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type=constant('TEST_DB_FORCE_TYPE');	// Force db type (for test purpose, by PHP unit for example)
+if (defined('TEST_DB_FORCE_TYPE')) {
+    $conf->db->type=constant('TEST_DB_FORCE_TYPE');
+}
+// Force db type (for test purpose, by PHP unit for example)
 
 // Set properties specific to conf file
 $conf->file->main_limit_users			= $dolibarr_main_limit_users;
@@ -71,8 +74,9 @@ 
 	// dolibarr_main_document_root_alt can contains several directories
 	$values=preg_split('/[;,]/',$dolibarr_main_document_root_alt);
 	$i=0;
-    foreach ($values as $value)
-        $conf->file->dol_document_root['alt' . ($i++)] = (string)$value;
+    foreach ($values as $value) {
+            $conf->file->dol_document_root['alt' . ($i++)] = (string)$value;
+    }
 	$values=preg_split('/[;,]/',$dolibarr_main_url_root_alt);
 	$i=0;
 	foreach($values as $value)
@@ -98,9 +102,16 @@ 
 }
 
 // Chargement des includes principaux de librairies communes
-if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';		// Need 500ko memory
-if (! defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
-if (! defined('NOREQUIRESOC'))  require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+if (! defined('NOREQUIREUSER')) {
+    require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
+}
+// Need 500ko memory
+if (! defined('NOREQUIRETRAN')) {
+    require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
+}
+if (! defined('NOREQUIRESOC')) {
+    require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+}
 
 
 /*
@@ -143,25 +154,32 @@ 
  */
 
 // By default conf->entity is 1, but we change this if we ask another value.
-if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session
+if (session_id() && ! empty($_SESSION["dol_entity"])) {
+    // Entity inside an opened session
 {
 	$conf->entity = $_SESSION["dol_entity"];
 }
-else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script
+} else if (! empty($_ENV["dol_entity"])) {
+    // Entity inside a CLI script
 {
 	$conf->entity = $_ENV["dol_entity"];
 }
-else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int'))	// Just after a login page
+} else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int')) {
+    // Just after a login page
 {
 	$conf->entity = GETPOST("entity",'int');
 }
-else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
+} else if (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
+    // For public page with MultiCompany module
 {
 	$conf->entity = DOLENTITY;
 }
+}
 
 // Sanitize entity
-if (! is_numeric($conf->entity)) $conf->entity=1;
+if (! is_numeric($conf->entity)) {
+    $conf->entity=1;
+}
 
 if (! defined('NOREQUIREDB'))
 {
@@ -193,11 +211,26 @@ 
 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 {
 	$ok=0;
-	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)
-	elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)
-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)
-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin
+	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) {
+	    $ok=1;
+	}
+	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
+	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+	    $ok=1;
+	}
+	// We let working pages that is a login submission (login submit, to allow login by admin)
+	elseif (defined('NOREQUIREDB')) {
+	    $ok=1;
+	}
+	// We let working pages that don't need database access (xxx.css.php)
+	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) {
+	    $ok=1;
+	}
+	// We let working pages that ask to work even if only login enabled (logout.php)
+	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+	    $ok=1;
+	}
+	// We let working if user is allowed admin
 	if (! $ok)
 	{
 		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
@@ -206,8 +239,7 @@ 
 			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
             $nexturl = BASE_URI . '?controller=user&method=logout';
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		}
-		else
+		} else
 		{
 			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
             $nexturl = BASE_URI . '/';
@@ -226,15 +258,19 @@ 
 	$mysoc->setMysoc($conf);
 
 	// For some countries, we need to invert our address with customer address
-	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
-}
+	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+	    $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
+	}
+	}
 
 
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (! defined('NOREQUIRETRAN'))
 {
     $langcode=(GETPOST('lang','aZ09')?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
-    if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
+    if (defined('MAIN_LANG_DEFAULT')) {
+        $langcode=constant('MAIN_LANG_DEFAULT');
+    }
     $langs->setDefaultLang($langcode);
 }
 
@@ -244,5 +280,7 @@ 
 $hookmanager=new HookManager($db);
 
 
-if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');
+if (! defined('MAIN_LABEL_MENTION_NPR') ) {
+    define('MAIN_LABEL_MENTION_NPR','NPR');
+}
 

dolibarr/htdocs/core/lib/product.lib.php

Indentation +292 added lines, -292 removed lines

@@ -34,88 +34,88 @@ 
  */
 function product_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-	$langs->load("products");
+    global $db, $langs, $conf, $user;
+    $langs->load("products");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
     $head[$h][0] = BASE_URI . "?controller=product&method=card&id=" . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	if (! empty($object->status))
-	{
+    if (! empty($object->status))
+    {
         $head[$h][0] = BASE_URI . "?controller=product&method=price&id=" . $object->id;
-    	$head[$h][1] = $langs->trans("SellingPrices");
-    	$head[$h][2] = 'price';
-    	$h++;
-	}
-
-	if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
-	{
-    	if ((! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
-    	|| (! empty($conf->margin->enabled) && $user->rights->margin->liretous)
-    	)
-    	{
+        $head[$h][1] = $langs->trans("SellingPrices");
+        $head[$h][2] = 'price';
+        $h++;
+    }
+
+    if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
+    {
+        if ((! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
+        || (! empty($conf->margin->enabled) && $user->rights->margin->liretous)
+        )
+        {
             $head[$h][0] = BASE_URI . "?controller=product&method=fournisseurs&id=" . $object->id;
-    		$head[$h][1] = $langs->trans("BuyingPrices");
-    		$head[$h][2] = 'suppliers';
-    		$h++;
-    	}
-	}
-
-	// Multilangs
-	if (! empty($conf->global->MAIN_MULTILANGS))
-	{
+            $head[$h][1] = $langs->trans("BuyingPrices");
+            $head[$h][2] = 'suppliers';
+            $h++;
+        }
+    }
+
+    // Multilangs
+    if (! empty($conf->global->MAIN_MULTILANGS))
+    {
         $head[$h][0] = BASE_URI . "?controller=product&method=traduction&id=" . $object->id;
-		$head[$h][1] = $langs->trans("Translation");
-		$head[$h][2] = 'translation';
-		$h++;
-	}
-
-	// Sub products
-	if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
-	{
+        $head[$h][1] = $langs->trans("Translation");
+        $head[$h][2] = 'translation';
+        $h++;
+    }
+
+    // Sub products
+    if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
+    {
         $head[$h][0] = BASE_URI . "?controller=product/composition&method=card&id=" . $object->id;
-		$head[$h][1] = $langs->trans('AssociatedProducts');
+        $head[$h][1] = $langs->trans('AssociatedProducts');
 
-		$nbFatherAndChild = $object->hasFatherOrChild();
-		if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
-		$head[$h][2] = 'subproduct';
-		$h++;
-	}
+        $nbFatherAndChild = $object->hasFatherOrChild();
+        if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
+        $head[$h][2] = 'subproduct';
+        $h++;
+    }
 
     $head[$h][0] = BASE_URI . "?controller=product/stats&method=card&id=" . $object->id;
-	$head[$h][1] = $langs->trans('Statistics');
-	$head[$h][2] = 'stats';
-	$h++;
+    $head[$h][1] = $langs->trans('Statistics');
+    $head[$h][2] = 'stats';
+    $h++;
 
     $head[$h][0] = BASE_URI . "?controller=product/stats&method=facture&showmessage=1&id=" . $object->id;
-	$head[$h][1] = $langs->trans('Referers');
-	$head[$h][2] = 'referers';
-	$h++;
+    $head[$h][1] = $langs->trans('Referers');
+    $head[$h][2] = 'referers';
+    $h++;
 
-	if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
+    if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
 
-		global $db;
+        global $db;
 
-		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 
-		$prodcomb = new ProductCombination($db);
+        $prodcomb = new ProductCombination($db);
 
-		if ($prodcomb->fetchByFkProductChild($object->id) == -1)
-		{
+        if ($prodcomb->fetchByFkProductChild($object->id) == -1)
+        {
             $head[$h][0] = BASE_URI . "?controller=variants&method=combinations&id=" . $object->id;
-			$head[$h][1] = $langs->trans('ProductCombinations');
-			$head[$h][2] = 'combinations';
-			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
+            $head[$h][1] = $langs->trans('ProductCombinations');
+            $head[$h][2] = 'combinations';
+            $nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
             if ($nbVariant > 0) $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
-		}
+        }
 
-		$h++;
-	}
+        $h++;
+    }
 
     if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
     {
@@ -148,7 +148,7 @@ 
     }
 
     // Attachments
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
     if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
@@ -160,10 +160,10 @@ 
     }
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = BASE_URI . '?controller=product&method=document&id=' . $object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'product', 'remove');
 
@@ -172,13 +172,13 @@ 
     $head[$h][1] = $langs->trans("Events");
     if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
     {
-    	$head[$h][1].= '/';
-    	$head[$h][1].= $langs->trans("Agenda");
+        $head[$h][1].= '/';
+        $head[$h][1].= $langs->trans("Agenda");
     }
     $head[$h][2] = 'agenda';
     $h++;
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -200,19 +200,19 @@ 
     $head[$h][0] = BASE_URI . "?controller=product/stock&method=productlot_card&id=" . $object->id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'card';
-	$h++;
+    $h++;
 
-	// Attachments
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    // Attachments
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
     $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = BASE_URI . "?controller=product/stock&method=productlot_document&id=" . $object->id;
-	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][1] = $langs->trans("Documents");
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
     $head[$h][2] = 'documents';
-	$h++;
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -242,40 +242,40 @@ 
 */
 function product_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
     $head[$h][0] = BASE_URI . "?controller=product/admin&method=product";
-	$head[$h][1] = $langs->trans('Parameters');
-	$head[$h][2] = 'general';
-	$h++;
+    $head[$h][1] = $langs->trans('Parameters');
+    $head[$h][2] = 'general';
+    $h++;
 
-	if (!empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))
-	{
-		$head[$h] = array(
+    if (!empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))
+    {
+        $head[$h] = array(
             0 => BASE_URI . "?controller=product/admin&method=price_rules",
-			1 => $langs->trans('MultipriceRules'),
-			2 => 'generator'
-		);
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+            1 => $langs->trans('MultipriceRules'),
+            2 => 'generator'
+        );
+        $h++;
+    }
+
+    // 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
-	complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin');
 
     $head[$h][0] = BASE_URI . '?controller=product/admin&method=product_extrafields';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -319,146 +319,146 @@ 
  */
 function show_stats_for_company($product,$socid)
 {
-	global $conf,$langs,$user,$db;
-
-	$nblines = 0;
-
-	print '<tr class="liste_titre">';
-	print '<td align="left" width="25%">'.$langs->trans("Referers").'</td>';
-	print '<td align="right" width="25%">'.$langs->trans("NbOfThirdParties").'</td>';
-	print '<td align="right" width="25%">'.$langs->trans("NbOfObjectReferers").'</td>';
-	print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
-	print '</tr>';
-
-	// Customer proposals
-	if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_propale($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("propal");
-		print '<tr><td>';
-		print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_propale['customers'];
-		print '</td><td align="right">';
-		print $product->stats_propale['nb'];
-		print '</td><td align="right">';
-		print $product->stats_propale['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Supplier proposals
-	if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_proposal_supplier($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("propal");
-		print '<tr><td>';
-		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_proposal_supplier['suppliers'];
-		print '</td><td align="right">';
-		print $product->stats_proposal_supplier['nb'];
-		print '</td><td align="right">';
-		print $product->stats_proposal_supplier['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Customer orders
-	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_commande($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("orders");
-		print '<tr><td>';
-		print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("CustomersOrders").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_commande['customers'];
-		print '</td><td align="right">';
-		print $product->stats_commande['nb'];
-		print '</td><td align="right">';
-		print $product->stats_commande['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Supplier orders
-	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_commande_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("orders");
-		print '<tr><td>';
-		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("SuppliersOrders").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_commande_fournisseur['suppliers'];
-		print '</td><td align="right">';
-		print $product->stats_commande_fournisseur['nb'];
-		print '</td><td align="right">';
-		print $product->stats_commande_fournisseur['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Customer invoices
-	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_facture($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("bills");
-		print '<tr><td>';
-		print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("CustomersInvoices").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_facture['customers'];
-		print '</td><td align="right">';
-		print $product->stats_facture['nb'];
-		print '</td><td align="right">';
-		print $product->stats_facture['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Supplier invoices
-	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_facture_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("bills");
-		print '<tr><td>';
-		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("SuppliersInvoices").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_facture_fournisseur['suppliers'];
-		print '</td><td align="right">';
-		print $product->stats_facture_fournisseur['nb'];
-		print '</td><td align="right">';
-		print $product->stats_facture_fournisseur['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Contracts
-	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_contrat($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("contracts");
-		print '<tr><td>';
-		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_contrat['customers'];
-		print '</td><td align="right">';
-		print $product->stats_contrat['nb'];
-		print '</td><td align="right">';
-		print $product->stats_contrat['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-
-	return $nblines++;
+    global $conf,$langs,$user,$db;
+
+    $nblines = 0;
+
+    print '<tr class="liste_titre">';
+    print '<td align="left" width="25%">'.$langs->trans("Referers").'</td>';
+    print '<td align="right" width="25%">'.$langs->trans("NbOfThirdParties").'</td>';
+    print '<td align="right" width="25%">'.$langs->trans("NbOfObjectReferers").'</td>';
+    print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
+    print '</tr>';
+
+    // Customer proposals
+    if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_propale($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("propal");
+        print '<tr><td>';
+        print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_propale['customers'];
+        print '</td><td align="right">';
+        print $product->stats_propale['nb'];
+        print '</td><td align="right">';
+        print $product->stats_propale['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Supplier proposals
+    if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_proposal_supplier($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("propal");
+        print '<tr><td>';
+        print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_proposal_supplier['suppliers'];
+        print '</td><td align="right">';
+        print $product->stats_proposal_supplier['nb'];
+        print '</td><td align="right">';
+        print $product->stats_proposal_supplier['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Customer orders
+    if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_commande($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("orders");
+        print '<tr><td>';
+        print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("CustomersOrders").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_commande['customers'];
+        print '</td><td align="right">';
+        print $product->stats_commande['nb'];
+        print '</td><td align="right">';
+        print $product->stats_commande['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Supplier orders
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_commande_fournisseur($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("orders");
+        print '<tr><td>';
+        print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("SuppliersOrders").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_commande_fournisseur['suppliers'];
+        print '</td><td align="right">';
+        print $product->stats_commande_fournisseur['nb'];
+        print '</td><td align="right">';
+        print $product->stats_commande_fournisseur['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Customer invoices
+    if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_facture($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("bills");
+        print '<tr><td>';
+        print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("CustomersInvoices").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_facture['customers'];
+        print '</td><td align="right">';
+        print $product->stats_facture['nb'];
+        print '</td><td align="right">';
+        print $product->stats_facture['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Supplier invoices
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_facture_fournisseur($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("bills");
+        print '<tr><td>';
+        print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("SuppliersInvoices").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_facture_fournisseur['suppliers'];
+        print '</td><td align="right">';
+        print $product->stats_facture_fournisseur['nb'];
+        print '</td><td align="right">';
+        print $product->stats_facture_fournisseur['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+
+    // Contracts
+    if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_contrat($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("contracts");
+        print '<tr><td>';
+        print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_contrat['customers'];
+        print '</td><td align="right">';
+        print $product->stats_contrat['nb'];
+        print '</td><td align="right">';
+        print $product->stats_contrat['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+
+    return $nblines++;
 }
 
 
@@ -472,50 +472,50 @@ 
  */
 function measuring_units_string($unit,$measuring_style='')
 {
-	global $langs;
-
-	$measuring_units=array();
-	if ($measuring_style == 'weight')
-	{
-		$measuring_units[3] = $langs->transnoentitiesnoconv("WeightUnitton");
-		$measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
-		$measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
-		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
-		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
-		$measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
-	}
-	else if ($measuring_style == 'size')
-	{
-		$measuring_units[0] = $langs->transnoentitiesnoconv("SizeUnitm");
-		$measuring_units[-1] = $langs->transnoentitiesnoconv("SizeUnitdm");
-		$measuring_units[-2] = $langs->transnoentitiesnoconv("SizeUnitcm");
-		$measuring_units[-3] = $langs->transnoentitiesnoconv("SizeUnitmm");
+    global $langs;
+
+    $measuring_units=array();
+    if ($measuring_style == 'weight')
+    {
+        $measuring_units[3] = $langs->transnoentitiesnoconv("WeightUnitton");
+        $measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
+        $measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
+        $measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
+        $measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
+    }
+    else if ($measuring_style == 'size')
+    {
+        $measuring_units[0] = $langs->transnoentitiesnoconv("SizeUnitm");
+        $measuring_units[-1] = $langs->transnoentitiesnoconv("SizeUnitdm");
+        $measuring_units[-2] = $langs->transnoentitiesnoconv("SizeUnitcm");
+        $measuring_units[-3] = $langs->transnoentitiesnoconv("SizeUnitmm");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SizeUnitfoot");
-		$measuring_units[99] = $langs->transnoentitiesnoconv("SizeUnitinch");
-	}
-	else if ($measuring_style == 'surface')
-	{
-		$measuring_units[0] = $langs->transnoentitiesnoconv("SurfaceUnitm2");
-		$measuring_units[-2] = $langs->transnoentitiesnoconv("SurfaceUnitdm2");
-		$measuring_units[-4] = $langs->transnoentitiesnoconv("SurfaceUnitcm2");
-		$measuring_units[-6] = $langs->transnoentitiesnoconv("SurfaceUnitmm2");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("SizeUnitinch");
+    }
+    else if ($measuring_style == 'surface')
+    {
+        $measuring_units[0] = $langs->transnoentitiesnoconv("SurfaceUnitm2");
+        $measuring_units[-2] = $langs->transnoentitiesnoconv("SurfaceUnitdm2");
+        $measuring_units[-4] = $langs->transnoentitiesnoconv("SurfaceUnitcm2");
+        $measuring_units[-6] = $langs->transnoentitiesnoconv("SurfaceUnitmm2");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SurfaceUnitfoot2");
-		$measuring_units[99] = $langs->transnoentitiesnoconv("SurfaceUnitinch2");
-	}
-	else if ($measuring_style == 'volume')
-	{
-		$measuring_units[0] = $langs->transnoentitiesnoconv("VolumeUnitm3");
-		$measuring_units[-3] = $langs->transnoentitiesnoconv("VolumeUnitdm3");
-		$measuring_units[-6] = $langs->transnoentitiesnoconv("VolumeUnitcm3");
-		$measuring_units[-9] = $langs->transnoentitiesnoconv("VolumeUnitmm3");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("SurfaceUnitinch2");
+    }
+    else if ($measuring_style == 'volume')
+    {
+        $measuring_units[0] = $langs->transnoentitiesnoconv("VolumeUnitm3");
+        $measuring_units[-3] = $langs->transnoentitiesnoconv("VolumeUnitdm3");
+        $measuring_units[-6] = $langs->transnoentitiesnoconv("VolumeUnitcm3");
+        $measuring_units[-9] = $langs->transnoentitiesnoconv("VolumeUnitmm3");
         $measuring_units[88] = $langs->transnoentitiesnoconv("VolumeUnitfoot3");
         $measuring_units[89] = $langs->transnoentitiesnoconv("VolumeUnitinch3");
-		$measuring_units[97] = $langs->transnoentitiesnoconv("VolumeUnitounce");
-		$measuring_units[98] = $langs->transnoentitiesnoconv("VolumeUnitlitre");
+        $measuring_units[97] = $langs->transnoentitiesnoconv("VolumeUnitounce");
+        $measuring_units[98] = $langs->transnoentitiesnoconv("VolumeUnitlitre");
         $measuring_units[99] = $langs->transnoentitiesnoconv("VolumeUnitgallon");
-	}
+    }
 
-	return $measuring_units[$unit];
+    return $measuring_units[$unit];
 }
 
 /**
@@ -527,14 +527,14 @@ 
  */
 function measuring_units_squared($unit)
 {
-	$measuring_units=array();
-	$measuring_units[0] = 0;   // m -> m3
-	$measuring_units[-1] = -2; // dm-> dm2
-	$measuring_units[-2] = -4; // cm -> cm2
-	$measuring_units[-3] = -6; // mm -> mm2
-	$measuring_units[98] = 98; // foot -> foot2
-	$measuring_units[99] = 99; // inch -> inch2
-	return $measuring_units[$unit];
+    $measuring_units=array();
+    $measuring_units[0] = 0;   // m -> m3
+    $measuring_units[-1] = -2; // dm-> dm2
+    $measuring_units[-2] = -4; // cm -> cm2
+    $measuring_units[-3] = -6; // mm -> mm2
+    $measuring_units[98] = 98; // foot -> foot2
+    $measuring_units[99] = 99; // inch -> inch2
+    return $measuring_units[$unit];
 }
 
 
@@ -547,12 +547,12 @@ 
  */
 function measuring_units_cubed($unit)
 {
-	$measuring_units=array();
-	$measuring_units[0] = 0;   // m -> m2
-	$measuring_units[-1] = -3; // dm-> dm3
-	$measuring_units[-2] = -6; // cm -> cm3
-	$measuring_units[-3] = -9; // mm -> mm3
-	$measuring_units[98] = 88; // foot -> foot3
-	$measuring_units[99] = 89; // inch -> inch3
-	return $measuring_units[$unit];
+    $measuring_units=array();
+    $measuring_units[0] = 0;   // m -> m2
+    $measuring_units[-1] = -3; // dm-> dm3
+    $measuring_units[-2] = -6; // cm -> cm3
+    $measuring_units[-3] = -9; // mm -> mm3
+    $measuring_units[98] = 88; // foot -> foot3
+    $measuring_units[99] = 89; // inch -> inch3
+    return $measuring_units[$unit];
 }

Braces +63 added lines, -26 removed lines

@@ -53,13 +53,15 @@ 
     	$h++;
 	}
 
-	if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
+	if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status))) {
+	    // If margin is on and product on sell, we may need the cost price even if product os not on purchase
 	{
     	if ((! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
     	|| (! empty($conf->margin->enabled) && $user->rights->margin->liretous)
     	)
     	{
             $head[$h][0] = BASE_URI . "?controller=product&method=fournisseurs&id=" . $object->id;
+	}
     		$head[$h][1] = $langs->trans("BuyingPrices");
     		$head[$h][2] = 'suppliers';
     		$h++;
@@ -82,7 +84,9 @@ 
 		$head[$h][1] = $langs->trans('AssociatedProducts');
 
 		$nbFatherAndChild = $object->hasFatherOrChild();
-		if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
+		if ($nbFatherAndChild > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
+		}
 		$head[$h][2] = 'subproduct';
 		$h++;
 	}
@@ -111,17 +115,21 @@ 
 			$head[$h][1] = $langs->trans('ProductCombinations');
 			$head[$h][2] = 'combinations';
 			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
-            if ($nbVariant > 0) $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
+            if ($nbVariant > 0) {
+                $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
+            }
 		}
 
 		$h++;
 	}
 
-    if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
+    if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
+        // If physical product we can stock (or service with option)
     {
         if (! empty($conf->stock->enabled) && $user->rights->stock->lire)
         {
             $head[$h][0] = BASE_URI . "?controller=product/stock&method=product&id=" . $object->id;
+    }
             $head[$h][1] = $langs->trans("Stock");
             $head[$h][2] = 'stock';
             $h++;
@@ -138,11 +146,17 @@ 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
         $nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-        if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+        if(!empty($object->note_public)) {
+            $nbNote++;
+        }
         $head[$h][0] = BASE_URI . '?controller=product&method=note&id=' . $object->id;
         $head[$h][1] = $langs->trans('Notes');
-        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        if ($nbNote > 0) {
+            $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        }
         $head[$h][2] = 'note';
         $h++;
     }
@@ -150,18 +164,28 @@ 
     // Attachments
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) {
+        $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    }
+    if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) {
+        $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    }
     $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-        if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->produit->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
-        if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) {
+            $upload_dir = $conf->produit->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        }
+        if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) {
+            $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        }
         $nbFiles += count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     }
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = BASE_URI . '?controller=product&method=document&id=' . $object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -210,7 +234,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = BASE_URI . "?controller=product/stock&method=productlot_document&id=" . $object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
     $head[$h][2] = 'documents';
 	$h++;
 
@@ -335,7 +361,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_propale($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("propal");
 		print '<tr><td>';
 		print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
@@ -353,7 +381,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_proposal_supplier($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("propal");
 		print '<tr><td>';
 		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
@@ -371,7 +401,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_commande($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("orders");
 		print '<tr><td>';
 		print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("CustomersOrders").'</a>';
@@ -389,7 +421,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_commande_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("orders");
 		print '<tr><td>';
 		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("SuppliersOrders").'</a>';
@@ -407,7 +441,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_facture($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("bills");
 		print '<tr><td>';
 		print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("CustomersInvoices").'</a>';
@@ -425,7 +461,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_facture_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("bills");
 		print '<tr><td>';
 		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("SuppliersInvoices").'</a>';
@@ -444,7 +482,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_contrat($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("contracts");
 		print '<tr><td>';
 		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
@@ -483,8 +523,7 @@ 
 		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
 		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
-	}
-	else if ($measuring_style == 'size')
+	} else if ($measuring_style == 'size')
 	{
 		$measuring_units[0] = $langs->transnoentitiesnoconv("SizeUnitm");
 		$measuring_units[-1] = $langs->transnoentitiesnoconv("SizeUnitdm");
@@ -492,8 +531,7 @@ 
 		$measuring_units[-3] = $langs->transnoentitiesnoconv("SizeUnitmm");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SizeUnitfoot");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("SizeUnitinch");
-	}
-	else if ($measuring_style == 'surface')
+	} else if ($measuring_style == 'surface')
 	{
 		$measuring_units[0] = $langs->transnoentitiesnoconv("SurfaceUnitm2");
 		$measuring_units[-2] = $langs->transnoentitiesnoconv("SurfaceUnitdm2");
@@ -501,8 +539,7 @@ 
 		$measuring_units[-6] = $langs->transnoentitiesnoconv("SurfaceUnitmm2");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SurfaceUnitfoot2");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("SurfaceUnitinch2");
-	}
-	else if ($measuring_style == 'volume')
+	} else if ($measuring_style == 'volume')
 	{
 		$measuring_units[0] = $langs->transnoentitiesnoconv("VolumeUnitm3");
 		$measuring_units[-3] = $langs->transnoentitiesnoconv("VolumeUnitdm3");

dolibarr/htdocs/core/modules/modMargin.class.php

Indentation +106 added lines, -106 removed lines

@@ -30,119 +30,119 @@
  */
 class modMargin extends DolibarrModules
 {
-	/**
-	 * 	Constructor
-	 *
-	 * 	@param	DoliDB	$db		Database handler
-	 */
-	function __construct($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).
-		$this->numero = 59000;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'margins';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "financial";
-		$this->module_position = '55';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Margin management";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of png file (without png) used for this module.
-		// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
-		$this->picto='margin';
-
-		// Data directories to create when module is enabled.
-		$this->dirs = array('/margin/temp');
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		$this->config_page_url = array("margin.php@margin");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modPropale", "modProduct");		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,2);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("margins");
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array(0=>array('MARGIN_TYPE','chaine','costprice','Rule for margin calculation by default',0,'current',0));			// List of particular constants to add when module is enabled
-
-		// New pages on tabs
-		$this->tabs = array(
+    /**
+     * 	Constructor
+     *
+     * 	@param	DoliDB	$db		Database handler
+     */
+    function __construct($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).
+        $this->numero = 59000;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'margins';
+
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
+        $this->family = "financial";
+        $this->module_position = '55';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Margin management";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Name of png file (without png) used for this module.
+        // Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
+        $this->picto='margin';
+
+        // Data directories to create when module is enabled.
+        $this->dirs = array('/margin/temp');
+
+        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        $this->config_page_url = array("margin.php@margin");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array("modPropale", "modProduct");		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3,2);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("margins");
+
+        // Constants
+        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+        //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+        // );
+        $this->const = array(0=>array('MARGIN_TYPE','chaine','costprice','Rule for margin calculation by default',0,'current',0));			// List of particular constants to add when module is enabled
+
+        // New pages on tabs
+        $this->tabs = array(
             'product:+margin:Margins:margins:$user->rights->margins->liretous:?controller=margin/tabs&method=productMargins&id=__ID__',
             'thirdparty:+margin:Margins:margins:empty($user->societe_id) && $user->rights->margins->liretous && ($object->client > 0):?controller=margin/tabs&method=thirdpartyMargins&socid=__ID__'
-		);
+        );
 
 
-		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
+        // Boxes
+        $this->boxes = array();			// List of boxes
+        $r=0;
 
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
 
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r = 0;
+        // Main menu entries
+        $this->menu = array();			// List of menus to add
+        $r = 0;
 
-		// left menu entry
-		$this->menu[$r]=array(
-				'fk_menu'=>'fk_mainmenu=billing',			// Put 0 if this is a top menu
-    			'type'=>'left',			// This is a Top menu entry
-    			'titre'=>'Margins',
-    			'mainmenu'=>'billing',
-    			'leftmenu'=>'margins',
+        // left menu entry
+        $this->menu[$r]=array(
+                'fk_menu'=>'fk_mainmenu=billing',			// Put 0 if this is a top menu
+                'type'=>'left',			// This is a Top menu entry
+                'titre'=>'Margins',
+                'mainmenu'=>'billing',
+                'leftmenu'=>'margins',
             'url' => '?controller=margin&method=index',
-    			'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-    			'position'=>100,
-    			'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
-    			'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
-    			'target'=>'',
-    			'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-
-		// Permissions
-		$this->rights = array();
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 59001; // id de la permission
-		$this->rights[$r][1] = 'Visualiser les marges'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'liretous';
-
-		$r++;
-		$this->rights[$r][0] = 59002; // id de la permission
-		$this->rights[$r][1] = 'Définir les marges'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 59003; // id de la permission
-		$this->rights[$r][1] = 'Read every user margin'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'read';
-		$this->rights[$r][5] = 'all';
-	}
+                'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+                'position'=>100,
+                'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
+                'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
+                'target'=>'',
+                'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+        $r++;
+
+        // Permissions
+        $this->rights = array();
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 59001; // id de la permission
+        $this->rights[$r][1] = 'Visualiser les marges'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'liretous';
+
+        $r++;
+        $this->rights[$r][0] = 59002; // id de la permission
+        $this->rights[$r][1] = 'Définir les marges'; // libelle de la permission
+        $this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 59003; // id de la permission
+        $this->rights[$r][1] = 'Read every user margin'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'read';
+        $this->rights[$r][5] = 'all';
+    }
 }
 

dolibarr/htdocs/don/card.php

Indentation +455 added lines, -455 removed lines

@@ -78,117 +78,117 @@ 
 
 if ($action == 'update')
 {
-	if (! empty($cancel))
-	{
+    if (! empty($cancel))
+    {
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
-		exit;
-	}
+        exit;
+    }
 
-	$error=0;
+    $error=0;
 
     if (empty($donation_date))
     {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
         $action = "create";
         $error++;
     }
 
-	if (empty($amount))
-	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
-		$action = "create";
-		$error++;
-	}
+    if (empty($amount))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
+        $action = "create";
+        $error++;
+    }
 
-	if (! $error)
-	{
-		$object->fetch($id);
-
-		$object->firstname   = GETPOST("firstname",'alpha');
-		$object->lastname    = GETPOST("lastname",'alpha');
-		$object->societe     = GETPOST("societe",'alpha');
-		$object->address     = GETPOST("address",'alpha');
-		$object->amount      = price2num(GETPOST("amount",'alpha'));
-		$object->town        = GETPOST("town",'alpha');
-		$object->zip         = GETPOST("zipcode",'alpha');
+    if (! $error)
+    {
+        $object->fetch($id);
+
+        $object->firstname   = GETPOST("firstname",'alpha');
+        $object->lastname    = GETPOST("lastname",'alpha');
+        $object->societe     = GETPOST("societe",'alpha');
+        $object->address     = GETPOST("address",'alpha');
+        $object->amount      = price2num(GETPOST("amount",'alpha'));
+        $object->town        = GETPOST("town",'alpha');
+        $object->zip         = GETPOST("zipcode",'alpha');
         $object->country_id  = GETPOST('country_id', 'int');
         $object->email       = GETPOST("email",'alpha');
-		$object->date        = $donation_date;
-		$object->public      = GETPOST("public",'alpha');
-		$object->fk_project  = GETPOST("fk_project",'alpha');
-		$object->note_private= GETPOST("note_private",'none');
-		$object->note_public = GETPOST("note_public",'none');
-		$object->modepaymentid = GETPOST('modepayment','int');
-
-		// Fill array 'array_options' with data from add form
+        $object->date        = $donation_date;
+        $object->public      = GETPOST("public",'alpha');
+        $object->fk_project  = GETPOST("fk_project",'alpha');
+        $object->note_private= GETPOST("note_private",'none');
+        $object->note_public = GETPOST("note_public",'none');
+        $object->modepaymentid = GETPOST('modepayment','int');
+
+        // Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+        if ($ret < 0) $error++;
 
-		if ($object->update($user) > 0)
-		{
+        if ($object->update($user) > 0)
+        {
             header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $object->id);
-			exit;
-		}
-	}
+            exit;
+        }
+    }
 }
 
 if ($action == 'add')
 {
-	if (! empty($cancel))
-	{
-		header("Location: index.php");
-		exit;
-	}
+    if (! empty($cancel))
+    {
+        header("Location: index.php");
+        exit;
+    }
 
-	$error=0;
+    $error=0;
 
     if (empty($donation_date))
     {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
         $action = "create";
         $error++;
     }
 
-	if (empty($amount))
-	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
-		$action = "create";
-		$error++;
-	}
+    if (empty($amount))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
+        $action = "create";
+        $error++;
+    }
 
-	if (! $error)
-	{
-		$object->firstname   = GETPOST("firstname",'alpha');
-		$object->lastname    = GETPOST("lastname",'alpha');
-		$object->societe     = GETPOST("societe",'alpha');
-		$object->address     = GETPOST("address",'alpha');
-		$object->amount      = price2num(GETPOST("amount",'alpha'));
-		$object->zip         = GETPOST("zipcode",'alpha');
-		$object->town        = GETPOST("town",'alpha');
+    if (! $error)
+    {
+        $object->firstname   = GETPOST("firstname",'alpha');
+        $object->lastname    = GETPOST("lastname",'alpha');
+        $object->societe     = GETPOST("societe",'alpha');
+        $object->address     = GETPOST("address",'alpha');
+        $object->amount      = price2num(GETPOST("amount",'alpha'));
+        $object->zip         = GETPOST("zipcode",'alpha');
+        $object->town        = GETPOST("town",'alpha');
         $object->country_id  = GETPOST('country_id', 'int');
         $object->email       = GETPOST("email",'alpha');
-		$object->date        = $donation_date;
-		$object->note_private= GETPOST("note_private",'none');
-		$object->note_public = GETPOST("note_public",'none');
-		$object->public      = GETPOST("public",'alpha');
-		$object->fk_project  = GETPOST("fk_project",'alpha');
-		$object->modepaymentid = GETPOST('modepayment','int');
-
-		// Fill array 'array_options' with data from add form
+        $object->date        = $donation_date;
+        $object->note_private= GETPOST("note_private",'none');
+        $object->note_public = GETPOST("note_public",'none');
+        $object->public      = GETPOST("public",'alpha');
+        $object->fk_project  = GETPOST("fk_project",'alpha');
+        $object->modepaymentid = GETPOST('modepayment','int');
+
+        // Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+        if ($ret < 0) $error++;
 
-		$res = $object->create($user);
-		if ($res > 0)
-		{
+        $res = $object->create($user);
+        if ($res > 0)
+        {
             header("Location: " . $_SERVER['PHP_SELF'] . '&id=' . $res);
-			exit;
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+            exit;
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
 }
 if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer)
 {
@@ -207,46 +207,46 @@ 
 }
 if ($action == 'valid_promesse')
 {
-	$object->fetch($id);
-	if ($object->valid_promesse($id, $user->id) >= 0)
-	{
-		setEventMessages($langs->trans("DonationValidated", $object->ref), null);
+    $object->fetch($id);
+    if ($object->valid_promesse($id, $user->id) >= 0)
+    {
+        setEventMessages($langs->trans("DonationValidated", $object->ref), null);
 
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
-		exit;
-	}
+        exit;
+    }
     else {
-	    setEventMessages($object->error, $object->errors, 'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 if ($action == 'set_cancel')
 {
-	$object->fetch($id);
-	if ($object->set_cancel($id) >= 0)
+    $object->fetch($id);
+    if ($object->set_cancel($id) >= 0)
     {
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
         exit;
     }
     else {
-	    setEventMessages($object->error, $object->errors, 'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 if ($action == 'set_paid')
 {
-	$object->fetch($id);
-	if ($object->set_paid($id, $modepayment) >= 0)
-	{
+    $object->fetch($id);
+    if ($object->set_paid($id, $modepayment) >= 0)
+    {
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
-		exit;
-	}
+        exit;
+    }
     else {
-	    setEventMessages($object->error, $object->errors, 'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 else if ($action == 'classin' && $user->rights->don->creer)
 {
-	$object->fetch($id);
-	$object->setProject($projectid);
+    $object->fetch($id);
+    $object->setProject($projectid);
 }
 
 // Actions to build doc
@@ -321,50 +321,50 @@ 
 
 if ($action == 'create')
 {
-	print load_fiche_titre($langs->trans("AddDonation"));
+    print load_fiche_titre($langs->trans("AddDonation"));
 
-	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
+    print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head('');
+    dol_fiche_head('');
 
-	print '<table class="border" width="100%">';
-	print '<tbody>';
+    print '<table class="border" width="100%">';
+    print '<tbody>';
 
-	// Ref
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
+    // Ref
+    print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
 
-	// Company
-	if (! empty($conf->societe->enabled) && ! empty($conf->global->DONATION_USE_THIRDPARTIES))
-	{
-		// Thirdparty
-		print '<td>' . $langs->trans('Customer') . '</td>';
-		if ($soc->id > 0 && ! GETPOST('fac_rec','alpha'))
-		{
-			print '<td colspan="2">';
-			print $soc->getNomUrl(1);
-			print '<input type="hidden" name="socid" value="' . $soc->id . '">';
-			// Outstanding Bill
-			$outstandingBills = $soc->get_OutstandingBill();
-			print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
-			print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
-			if ($soc->outstanding_limit != '')
-			{
-				if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
-				print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
-			}
-			print ')';
-			print '</td>';
-		}
-		else
-		{
-			print '<td colspan="2">';
-			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
-			// Option to reload page to retrieve customer informations. Note, this clear other input
-			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
-			{
-				print '<script type="text/javascript">
+    // Company
+    if (! empty($conf->societe->enabled) && ! empty($conf->global->DONATION_USE_THIRDPARTIES))
+    {
+        // Thirdparty
+        print '<td>' . $langs->trans('Customer') . '</td>';
+        if ($soc->id > 0 && ! GETPOST('fac_rec','alpha'))
+        {
+            print '<td colspan="2">';
+            print $soc->getNomUrl(1);
+            print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+            // Outstanding Bill
+            $outstandingBills = $soc->get_OutstandingBill();
+            print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
+            print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
+            if ($soc->outstanding_limit != '')
+            {
+                if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+                print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
+            }
+            print ')';
+            print '</td>';
+        }
+        else
+        {
+            print '<td colspan="2">';
+            print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+            // Option to reload page to retrieve customer informations. Note, this clear other input
+            if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+            {
+                print '<script type="text/javascript">
 				$(document).ready(function() {
 					$("#socid").change(function() {
 						var socid = $(this).val();
@@ -374,82 +374,82 @@ 
 					});
 				});
 				</script>';
-			}
+            }
             //print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=3&fournisseur=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">'.$langs->trans("AddThirdParty").'</a>';
             print ' <a href="' . BASE_URI . '?controller=societe&method=card&action=create&client=3&fournisseur=0&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create') . '">' . $langs->trans("AddThirdParty") . '</a>';
-			print '</td>';
-		}
-		print '</tr>' . "\n";
-	}
+            print '</td>';
+        }
+        print '</tr>' . "\n";
+    }
 
-	// Date
-	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Date").'</td><td>';
-	print $form->selectDate($donation_date?$donation_date:-1, '', '', '', '', "add", 1, 1);
-	print '</td>';
+    // Date
+    print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Date").'</td><td>';
+    print $form->selectDate($donation_date?$donation_date:-1, '', '', '', '', "add", 1, 1);
+    print '</td>';
 
-	// Amount
-	print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.dol_escape_htmltag(GETPOST("amount")).'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+    // Amount
+    print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.dol_escape_htmltag(GETPOST("amount")).'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
-	// Public donation
-	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
-	print "</td></tr>\n";
+    // Public donation
+    print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
+    print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
+    print "</td></tr>\n";
 
-	if (empty($conf->societe->enabled) || empty($conf->global->DONATION_USE_THIRDPARTIES))
-	{
-		print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" class="maxwidth200"></td></tr>';
-		print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" class="maxwidth200"></td></tr>';
-		print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" class="maxwidth200"></td></tr>';
-		print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="3">'.dol_escape_htmltag(GETPOST("address")).'</textarea></td></tr>';
-
-		// Zip / Town
-		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-		print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-		print ' ';
-		print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-		print '</tr>';
-
-		// Country
-		print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
-		print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '</td></tr>';
-
-		print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" class="maxwidth200"></td></tr>';
-	}
+    if (empty($conf->societe->enabled) || empty($conf->global->DONATION_USE_THIRDPARTIES))
+    {
+        print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" class="maxwidth200"></td></tr>';
+        print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" class="maxwidth200"></td></tr>';
+        print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" class="maxwidth200"></td></tr>';
+        print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
+        print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="3">'.dol_escape_htmltag(GETPOST("address")).'</textarea></td></tr>';
+
+        // Zip / Town
+        print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+        print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+        print ' ';
+        print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+        print '</tr>';
+
+        // Country
+        print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
+        print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        print '</td></tr>';
+
+        print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" class="maxwidth200"></td></tr>';
+    }
 
-	// Payment mode
-	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-	$selected = GETPOST('modepayment','int');
-	$form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
-	print "</td></tr>\n";
+    // Payment mode
+    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
+    $selected = GETPOST('modepayment','int');
+    $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
+    print "</td></tr>\n";
 
-	// Public note
-	print '<tr>';
-	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
-	print '<td>';
+    // Public note
+    print '<tr>';
+    print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
+    print '<td>';
 
     $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-	print $doleditor->Create(1);
-	print '</td></tr>';
-
-	// Private note
-	if (empty($user->societe_id)) {
-		print '<tr>';
-		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td>';
-
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-		print $doleditor->Create(1);
-		print '</td></tr>';
-	}
+    print $doleditor->Create(1);
+    print '</td></tr>';
+
+    // Private note
+    if (empty($user->societe_id)) {
+        print '<tr>';
+        print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
+        print '<td>';
+
+        $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+        print $doleditor->Create(1);
+        print '</td></tr>';
+    }
 
-	if (! empty($conf->projet->enabled))
+    if (! empty($conf->projet->enabled))
     {
         print "<tr><td>".$langs->trans("Project")."</td><td>";
         $formproject->select_projects(-1, $projectid,'fk_project', 0, 0, 1, 1);
-		print "</td></tr>\n";
+        print "</td></tr>\n";
     }
 
     // Other attributes
@@ -458,21 +458,21 @@ 
     print $hookmanager->resPrint;
     if (empty($reshook))
     {
-		print $object->showOptionals($extrafields,'edit',$parameters);
+        print $object->showOptionals($extrafields,'edit',$parameters);
     }
 
     print '</tbody>';
-	print "</table>\n";
+    print "</table>\n";
 
-	dol_fiche_end();
+    dol_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+    print '<div class="center">';
+    print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    print '<input type="button" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" onClick="javascript:history.go(-1)">';
+    print '</div>';
 
-	print "</form>\n";
+    print "</form>\n";
 }
 
 
@@ -484,80 +484,80 @@ 
 
 if (! empty($id) && $action == 'edit')
 {
-	$result=$object->fetch($id);
-	if ($result < 0) {
-		dol_print_error($db,$object->error); exit;
-	}
-	$result=$object->fetch_optionals();
-	if ($result < 0) {
-		dol_print_error($db); exit;
-	}
+    $result=$object->fetch($id);
+    if ($result < 0) {
+        dol_print_error($db,$object->error); exit;
+    }
+    $result=$object->fetch_optionals();
+    if ($result < 0) {
+        dol_print_error($db); exit;
+    }
 
-	$hselected='card';
-	$head = donation_prepare_head($object);
+    $hselected='card';
+    $head = donation_prepare_head($object);
 
-	print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
-	print '<input type="hidden" name="amount" value="'.$object->amount.'">';
+    print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="update">';
+    print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+    print '<input type="hidden" name="amount" value="'.$object->amount.'">';
 
 
-	dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
+    dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
 
-	print '<table class="border" width="100%">';
+    print '<table class="border" width="100%">';
 
-	// Ref
-	print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2">';
-	print $object->getNomUrl();
-	print '</td>';
-	print '</tr>';
+    // Ref
+    print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2">';
+    print $object->getNomUrl();
+    print '</td>';
+    print '</tr>';
 
-	// Date
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Date").'</td><td>';
-	print $form->selectDate($object->date,'','','','',"update");
-	print '</td>';
+    // Date
+    print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Date").'</td><td>';
+    print $form->selectDate($object->date,'','','','',"update");
+    print '</td>';
 
-	// Amount
-	if ($object->statut == 0)
-	{
-		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.dol_escape_htmltag($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
-	else
-	{
-		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
-		print price($object->amount,0,$langs,0,0,-1,$conf->currency);
-		print '</td></tr>';
-	}
+    // Amount
+    if ($object->statut == 0)
+    {
+        print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.dol_escape_htmltag($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+    }
+    else
+    {
+        print '<tr><td>'.$langs->trans("Amount").'</td><td>';
+        print price($object->amount,0,$langs,0,0,-1,$conf->currency);
+        print '</td></tr>';
+    }
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public",1,1);
-	print "</td>";
-	print "</tr>\n";
+    print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
+    print $form->selectyesno("public",1,1);
+    print "</td>";
+    print "</tr>\n";
 
-	$langs->load("companies");
-	print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="maxwidth200" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="maxwidth200" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="maxwidth200" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Address").'</td><td>';
-	print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address).'</textarea></td></tr>';
+    $langs->load("companies");
+    print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="maxwidth200" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="maxwidth200" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="maxwidth200" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Address").'</td><td>';
+    print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address).'</textarea></td></tr>';
 
     // Zip / Town
     print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-	print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+    print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
     print ' ';
-	print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-	print '</tr>';
+    print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+    print '</tr>';
 
-	// Country
-	print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
-	print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	print '</td></tr>';
+    // Country
+    print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
+    print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
+    if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    print '</td></tr>';
 
-	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
+    print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
 
-	// Payment mode
+    // Payment mode
     print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
     if ($object->modepaymentid) $selected = $object->modepaymentid;
     else $selected = '';
@@ -565,16 +565,16 @@ 
     print "</td></tr>\n";
 
     // Status
-	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+    print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
     // Project
     if (! empty($conf->projet->enabled))
     {
-    	$formproject=new FormProjets($db);
+        $formproject=new FormProjets($db);
 
         $langs->load('projects');
         print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$formproject->select_projects(-1, $object->fk_project,'fk_project', 0, 0, 1, 1);
+        $formproject->select_projects(-1, $object->fk_project,'fk_project', 0, 0, 1, 1);
         print '</td></tr>';
     }
 
@@ -584,16 +584,16 @@ 
     print $hookmanager->resPrint;
     if (empty($reshook))
     {
-      	print $object->showOptionals($extrafields,'edit');
+            print $object->showOptionals($extrafields,'edit');
     }
 
-	print "</table>\n";
+    print "</table>\n";
 
-	dol_fiche_end();
+    dol_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+    print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 
-	print "</form>\n";
+    print "</form>\n";
 }
 
 
@@ -605,66 +605,66 @@ 
 /* ************************************************************ */
 if (! empty($id) && $action != 'edit')
 {
-	// Confirmation delete
+    // Confirmation delete
     if ($action == 'delete')
     {
         $text=$langs->trans("ConfirmDeleteADonation");
         print $form->formconfirm($_SERVER["PHP_SELF"] . "&id=" . $object->id, $langs->trans("DeleteADonation"), $text, "confirm_delete", '', '', 1);
     }
 
-	$result=$object->fetch($id);
-	if ($result < 0) {
-		dol_print_error($db,$object->error); exit;
-	}
-	$result=$object->fetch_optionals();
-	if ($result < 0) {
-		dol_print_error($db); exit;
-	}
+    $result=$object->fetch($id);
+    if ($result < 0) {
+        dol_print_error($db,$object->error); exit;
+    }
+    $result=$object->fetch_optionals();
+    if ($result < 0) {
+        dol_print_error($db); exit;
+    }
 
-	$hselected='card';
+    $hselected='card';
 
-	$head = donation_prepare_head($object);
-	dol_fiche_head($head, $hselected, $langs->trans("Donation"), -1, 'generic');
+    $head = donation_prepare_head($object);
+    dol_fiche_head($head, $hselected, $langs->trans("Donation"), -1, 'generic');
 
-	// Print form confirm
-	print $formconfirm;
+    // Print form confirm
+    print $formconfirm;
 
     // $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
     $linkback = '<a href="' . BASE_URI . '?controller=don&method=list' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.=$langs->trans('Project') . ' ';
-	    if ($user->rights->don->creer)
-	    {
-	        if ($action != 'classify')
-	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
+    $morehtmlref='<div class="refidno">';
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.=$langs->trans('Project') . ' ';
+        if ($user->rights->don->creer)
+        {
+            if ($action != 'classify')
+                $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                if ($action == 'classify') {
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
                     $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '&id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
+                }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
                 $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&methos=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	$morehtmlref.='</div>';
+                $morehtmlref.=$proj->ref;
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
 
 
     dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
@@ -676,195 +676,195 @@ 
 
     print '<table class="border" width="100%">';
 
-	// Date
-	print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td colspan="2">';
-	print dol_print_date($object->date,"day");
-	print "</td>";
+    // Date
+    print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td colspan="2">';
+    print dol_print_date($object->date,"day");
+    print "</td>";
 
     print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">';
-	print price($object->amount,0,$langs,0,0,-1,$conf->currency);
-	print '</td></tr>';
+    print price($object->amount,0,$langs,0,0,-1,$conf->currency);
+    print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("PublicDonation").'</td><td colspan="2">';
-	print yn($object->public);
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("PublicDonation").'</td><td colspan="2">';
+    print yn($object->public);
+    print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
-	print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
-	print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
+    print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
+    print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
 
-	// Payment mode
-	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
-	$form->form_modes_reglement(null, $object->modepaymentid,'none');
-	print "</td></tr>\n";
+    // Payment mode
+    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
+    $form->form_modes_reglement(null, $object->modepaymentid,'none');
+    print "</td></tr>\n";
 
-	// Other attributes
-	$cols = 2;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+    // Other attributes
+    $cols = 2;
+    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-	print '</table>';
+    print '</table>';
 
-	print '</div>';
-	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
+    print '</div>';
+    print '<div class="fichehalfright">';
+    print '<div class="ficheaddleft">';
 
-	/*
+    /*
 	 * Payments
 	 */
-	$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount,";
-	$sql.= "c.code as type_code,c.libelle as paiement_type";
-	$sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p";
-	$sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
-	$sql.= ", ".MAIN_DB_PREFIX."don as d";
-	$sql.= " WHERE d.rowid = '".$id."'";
-	$sql.= " AND p.fk_donation = d.rowid";
-	$sql.= " AND d.entity IN (".getEntity('donation').")";
-	$sql.= " AND p.fk_typepayment = c.id";
-	$sql.= " ORDER BY dp";
-
-	//print $sql;
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0; $total = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("RefPayment").'</td>';
-		print '<td>'.$langs->trans("Date").'</td>';
-		print '<td>'.$langs->trans("Type").'</td>';
-   		print '<td align="right">'.$langs->trans("Amount").'</td>';
-   		print '</tr>';
-
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-
-			print '<tr class="oddeven"><td>';
+    $sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount,";
+    $sql.= "c.code as type_code,c.libelle as paiement_type";
+    $sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p";
+    $sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
+    $sql.= ", ".MAIN_DB_PREFIX."don as d";
+    $sql.= " WHERE d.rowid = '".$id."'";
+    $sql.= " AND p.fk_donation = d.rowid";
+    $sql.= " AND d.entity IN (".getEntity('donation').")";
+    $sql.= " AND p.fk_typepayment = c.id";
+    $sql.= " ORDER BY dp";
+
+    //print $sql;
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0; $total = 0;
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td>'.$langs->trans("RefPayment").'</td>';
+        print '<td>'.$langs->trans("Date").'</td>';
+        print '<td>'.$langs->trans("Type").'</td>';
+            print '<td align="right">'.$langs->trans("Amount").'</td>';
+            print '</tr>';
+
+        while ($i < $num)
+        {
+            $objp = $db->fetch_object($resql);
+
+            print '<tr class="oddeven"><td>';
             print '<a href="' . BASE_URI . '?controller=don/payment&method=card&id=' . $objp->rowid . '">' . img_object($langs->trans("Payment"), "payment") . ' ' . $objp->rowid . '</a></td>';
-			print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-		    $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+            print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
+            $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
             print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-			print '<td align="right">'.price($objp->amount)."</td>\n";
-			print "</tr>";
-			$totalpaid += $objp->amount;
-			$i++;
-		}
-
-		if ($object->paid == 0)
-		{
-			print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaid)."</td></tr>\n";
-			print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td></tr>\n";
-
-			$remaintopay = $object->amount - $totalpaid;
-
-			print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
-			print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':'').'><b>'.price($remaintopay)."</b></td></tr>\n";
-		}
-		print "</table>";
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+            print '<td align="right">'.price($objp->amount)."</td>\n";
+            print "</tr>";
+            $totalpaid += $objp->amount;
+            $i++;
+        }
+
+        if ($object->paid == 0)
+        {
+            print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaid)."</td></tr>\n";
+            print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td></tr>\n";
+
+            $remaintopay = $object->amount - $totalpaid;
+
+            print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
+            print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':'').'><b>'.price($remaintopay)."</b></td></tr>\n";
+        }
+        print "</table>";
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 
-	print '</div>';
-	print '</div>';
-	print '</div>';
+    print '</div>';
+    print '</div>';
+    print '</div>';
 
-	print '<div class="clearboth"></div>';
+    print '<div class="clearboth"></div>';
 
     dol_fiche_end();
 
-	$remaintopay = $object->amount - $totalpaid;
+    $remaintopay = $object->amount - $totalpaid;
 
-	// Actions buttons
+    // Actions buttons
 
-	print '<div class="tabsAction">';
+    print '<div class="tabsAction">';
 
     print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '&action=edit&rowid=' . $object->id . '">' . $langs->trans('Modify') . '</a></div>';
 
-	if ($object->statut == 0)
-	{
+    if ($object->statut == 0)
+    {
         print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '&rowid=' . $object->id . '&action=valid_promesse">' . $langs->trans("ValidPromess") . '</a></div>';
-	}
+    }
 
     if (($object->statut == 0 || $object->statut == 1) && $totalpaid == 0 && $object->paid == 0)
     {
         print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '&rowid=' . $object->id . '&action=set_cancel">' . $langs->trans("ClassifyCanceled") . "</a></div>";
     }
 
-	// Create payment
-	if ($object->statut == 1 && $object->paid == 0 && $user->rights->don->creer)
-	{
-		if ($remaintopay == 0)
-		{
-			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
-		}
-		else
-		{
+    // Create payment
+    if ($object->statut == 1 && $object->paid == 0 && $user->rights->don->creer)
+    {
+        if ($remaintopay == 0)
+        {
+            print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
+        }
+        else
+        {
             print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=don/payment&method=payment&rowid=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
-		}
-	}
+        }
+    }
 
-	// Classify 'paid'
-	if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
-	{
-		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
-	}
+    // Classify 'paid'
+    if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
+    {
+        print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
+    }
 
-	// Delete
-	if ($user->rights->don->supprimer)
-	{
-		if ($object->statut == -1 || $object->statut == 0)
-		{
+    // Delete
+    if ($user->rights->don->supprimer)
+    {
+        if ($object->statut == -1 || $object->statut == 0)
+        {
             // TODO: Original href="card.php?rowid='.$object->id.'&action=delete"
             print '<div class="inline-block divButAction"><a class="butActionDelete" href="?controller=don&method=card&rowid=' . $object->id . '&action=delete">' . $langs->trans("Delete") . "</a></div>";
-		}
-		else
-		{
-			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
-		}
-	}
-	else
-	{
-		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
-	}
+        }
+        else
+        {
+            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
+        }
+    }
+    else
+    {
+        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
+    }
 
-	print "</div>";
+    print "</div>";
 
 
     print '<div class="fichecenter"><div class="fichehalfleft">';
 
-	/*
+    /*
 	 * Documents generes
 	 */
-	$filename	=	dol_sanitizeFileName($object->id);
-	$filedir	=	$conf->don->dir_output . "/" . dol_sanitizeFileName($object->id);
+    $filename	=	dol_sanitizeFileName($object->id);
+    $filedir	=	$conf->don->dir_output . "/" . dol_sanitizeFileName($object->id);
     $urlsource = $_SERVER['PHP_SELF'] . '&rowid=' . $object->id;
-	$genallowed	=	(($object->paid == 0 || $user->admin) && $user->rights->don->lire);
-	$delallowed	=	$user->rights->don->creer;
+    $genallowed	=	(($object->paid == 0 || $user->admin) && $user->rights->don->lire);
+    $delallowed	=	$user->rights->don->creer;
 
-	print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
+    print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
 
-	// Show links to link elements
-	$linktoelem = $form->showLinkToObjectBlock($object, null, array('don'));
-	$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+    // Show links to link elements
+    $linktoelem = $form->showLinkToObjectBlock($object, null, array('don'));
+    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-		// Show online payment link
-		$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
+        // Show online payment link
+        $useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
 
-		if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
-		{
-			print '<br><!-- Link to pay -->'."\n";
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-			print showOnlinePaymentUrl('donation', $object->ref).'<br>';
-		}
+        if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
+        {
+            print '<br><!-- Link to pay -->'."\n";
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+            print showOnlinePaymentUrl('donation', $object->ref).'<br>';
+        }
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	print '</div></div></div>';
+    print '</div></div></div>';
 }
 
 llxFooter();

Braces +41 added lines, -35 removed lines

@@ -74,7 +74,9 @@ 
  */
 
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if ($action == 'update')
 {
@@ -122,7 +124,9 @@ 
 
 		// Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+		    $error++;
+		}
 
 		if ($object->update($user) > 0)
 		{
@@ -176,15 +180,16 @@ 
 
 		// Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+		    $error++;
+		}
 
 		$res = $object->create($user);
 		if ($res > 0)
 		{
             header("Location: " . $_SERVER['PHP_SELF'] . '&id=' . $res);
 			exit;
-		}
-		else
+		} else
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -198,8 +203,7 @@ 
     {
         header("Location: index.php");
         exit;
-    }
-    else
+    } else
     {
         dol_syslog($object->error,LOG_DEBUG);
         setEventMessages($object->error, $object->errors, 'errors');
@@ -214,8 +218,7 @@ 
 
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -226,8 +229,7 @@ 
     {
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
         exit;
-    }
-    else {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -238,12 +240,10 @@ 
 	{
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
-}
-else if ($action == 'classin' && $user->rights->don->creer)
+} else if ($action == 'classin' && $user->rights->don->creer)
 {
 	$object->fetch($id);
 	$object->setProject($projectid);
@@ -351,13 +351,14 @@ 
 			print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
 			if ($soc->outstanding_limit != '')
 			{
-				if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+				if ($outstandingBills > $soc->outstanding_limit) {
+				    print img_warning($langs->trans("OutstandingBillReached"));
+				}
 				print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
 			}
 			print ')';
 			print '</td>';
-		}
-		else
+		} else
 		{
 			print '<td colspan="2">';
 			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
@@ -413,7 +414,9 @@ 
 		// Country
 		print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
 		print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		if ($user->admin) {
+		    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		}
 		print '</td></tr>';
 
 		print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" class="maxwidth200"></td></tr>';
@@ -522,8 +525,7 @@ 
 	if ($object->statut == 0)
 	{
 		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.dol_escape_htmltag($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
-	else
+	} else
 	{
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print price($object->amount,0,$langs,0,0,-1,$conf->currency);
@@ -552,15 +554,20 @@ 
 	// Country
 	print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
 	print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	if ($user->admin) {
+	    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	}
 	print '</td></tr>';
 
 	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
 
 	// Payment mode
     print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-    if ($object->modepaymentid) $selected = $object->modepaymentid;
-    else $selected = '';
+    if ($object->modepaymentid) {
+        $selected = $object->modepaymentid;
+    } else {
+        $selected = '';
+    }
     $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
     print "</td></tr>\n";
 
@@ -640,8 +647,9 @@ 
 	    $morehtmlref.=$langs->trans('Project') . ' ';
 	    if ($user->rights->don->creer)
 	    {
-	        if ($action != 'classify')
-	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        if ($action != 'classify') {
+	        	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        }
 	            if ($action == 'classify') {
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
 	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
@@ -763,8 +771,7 @@ 
 		}
 		print "</table>";
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -801,8 +808,7 @@ 
 		if ($remaintopay == 0)
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
-		}
-		else
+		} else
 		{
             print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=don/payment&method=payment&rowid=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
 		}
@@ -821,13 +827,11 @@ 
 		{
             // TODO: Original href="card.php?rowid='.$object->id.'&action=delete"
             print '<div class="inline-block divButAction"><a class="butActionDelete" href="?controller=don&method=card&rowid=' . $object->id . '&action=delete">' . $langs->trans("Delete") . "</a></div>";
-		}
-		else
+		} else
 		{
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 		}
-	}
-	else
+	} else
 	{
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 	}
@@ -855,9 +859,11 @@ 
 		// Show online payment link
 		$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
 
-		if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
+		if ($useonlinepayment) {
+		    //$object->statut != Facture::STATUS_DRAFT &&
 		{
 			print '<br><!-- Link to pay -->'."\n";
+		}
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 			print showOnlinePaymentUrl('donation', $object->ref).'<br>';
 		}

dolibarr/htdocs/don/class/paymentdonation.class.php

Braces +73 added lines, -24 removed lines

@@ -116,26 +116,47 @@ 
         }
 
         // Clean parameters
-        if (isset($this->fk_donation)) $this->fk_donation = trim($this->fk_donation);
-        if (isset($this->amount)) $this->amount = trim($this->amount);
-        if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment);
-        if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-        if (isset($this->note)) $this->note = trim($this->note);
-        if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
-        if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat);
-        if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif);
+        if (isset($this->fk_donation)) {
+            $this->fk_donation = trim($this->fk_donation);
+        }
+        if (isset($this->amount)) {
+            $this->amount = trim($this->amount);
+        }
+        if (isset($this->fk_typepayment)) {
+            $this->fk_typepayment = trim($this->fk_typepayment);
+        }
+        if (isset($this->num_payment)) {
+            $this->num_payment = trim($this->num_payment);
+        }
+        if (isset($this->note)) {
+            $this->note = trim($this->note);
+        }
+        if (isset($this->fk_bank)) {
+            $this->fk_bank = trim($this->fk_bank);
+        }
+        if (isset($this->fk_user_creat)) {
+            $this->fk_user_creat = trim($this->fk_user_creat);
+        }
+        if (isset($this->fk_user_modif)) {
+            $this->fk_user_modif = trim($this->fk_user_modif);
+        }
 
         $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
+        foreach ($this->amounts as $key => $value) {
+            // How payment is dispatch
         {
             $newvalue = price2num($value, 'MT');
+        }
             $this->amounts[$key] = $newvalue;
             $totalamount += $newvalue;
         }
         $totalamount = price2num($totalamount);
 
         // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+        if ($totalamount == 0) {
+            return -1;
+        }
+        // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
         $this->db->begin();
@@ -260,14 +281,30 @@ 
 
         // Clean parameters
 
-        if (isset($this->fk_donation)) $this->fk_donation = trim($this->fk_donation);
-        if (isset($this->amount)) $this->amount = trim($this->amount);
-        if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment);
-        if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-        if (isset($this->note)) $this->note = trim($this->note);
-        if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
-        if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat);
-        if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif);
+        if (isset($this->fk_donation)) {
+            $this->fk_donation = trim($this->fk_donation);
+        }
+        if (isset($this->amount)) {
+            $this->amount = trim($this->amount);
+        }
+        if (isset($this->fk_typepayment)) {
+            $this->fk_typepayment = trim($this->fk_typepayment);
+        }
+        if (isset($this->num_payment)) {
+            $this->num_payment = trim($this->num_payment);
+        }
+        if (isset($this->note)) {
+            $this->note = trim($this->note);
+        }
+        if (isset($this->fk_bank)) {
+            $this->fk_bank = trim($this->fk_bank);
+        }
+        if (isset($this->fk_user_creat)) {
+            $this->fk_user_creat = trim($this->fk_user_creat);
+        }
+        if (isset($this->fk_user_modif)) {
+            $this->fk_user_modif = trim($this->fk_user_modif);
+        }
 
         // Check parameters
         // Put here code to add control on parameters values
@@ -522,7 +559,9 @@ 
             $acc->fetch($accountid);
 
             $total = $this->total;
-            if ($mode == 'payment_donation') $amount = $total;
+            if ($mode == 'payment_donation') {
+                $amount = $total;
+            }
 
             // Insert payment into llx_bank
             $bank_line_id = $acc->addline(
@@ -548,7 +587,9 @@ 
 
                 // Add link 'payment', 'payment_supplier', 'payment_donation' in bank_url between payment and bank transaction
                 $url = '';
-                if ($mode == 'payment_donation') $url = DOL_URL_ROOT . '/don/payment/card.php?rowid=';
+                if ($mode == 'payment_donation') {
+                    $url = DOL_URL_ROOT . '/don/payment/card.php?rowid=';
+                }
                 if ($url) {
                     $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
                     if ($result <= 0) {
@@ -606,16 +647,24 @@ 
 
         $result = '';
 
-        if (empty($this->ref)) $this->ref = $this->lib;
+        if (empty($this->ref)) {
+            $this->ref = $this->lib;
+        }
         $label = $langs->trans("ShowPayment") . ': ' . $this->ref;
 
         if (!empty($this->id)) {
             $link = '<a href="' . DOL_URL_ROOT . '/don/payment/card.php?id=' . $this->id . '" title="' . dol_escape_htmltag($label, 1) . '" class="classfortooltip">';
             $linkend = '</a>';
 
-            if ($withpicto) $result .= ($link . img_object($label, 'payment', 'class="classfortooltip"') . $linkend . ' ');
-            if ($withpicto && $withpicto != 2) $result .= ' ';
-            if ($withpicto != 2) $result .= $link . ($maxlen ? dol_trunc($this->ref, $maxlen) : $this->ref) . $linkend;
+            if ($withpicto) {
+                $result .= ($link . img_object($label, 'payment', 'class="classfortooltip"') . $linkend . ' ');
+            }
+            if ($withpicto && $withpicto != 2) {
+                $result .= ' ';
+            }
+            if ($withpicto != 2) {
+                $result .= $link . ($maxlen ? dol_trunc($this->ref, $maxlen) : $this->ref) . $linkend;
+            }
         }
 
         return $result;

dolibarr/htdocs/don/note.php

Indentation +42 added lines, -42 removed lines

@@ -63,8 +63,8 @@ 
 
 if ($action == 'classin' && $user->rights->don->creer)
 {
-	$object->fetch($id);
-	$object->setProject($projectid);
+    $object->fetch($id);
+    $object->setProject($projectid);
 }
 
 /*
@@ -80,59 +80,59 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	$object = new Don($db);
-	$object->fetch($id,$ref);
+    $object = new Don($db);
+    $object->fetch($id,$ref);
 
-	$head = donation_prepare_head($object);
+    $head = donation_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("Donation"), -1, 'generic');
+    dol_fiche_head($head, 'note', $langs->trans("Donation"), -1, 'generic');
 
     // $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
     $linkback = '<a href="' . BASE_URI . '?controller=don&method=list' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.=$langs->trans('Project') . ' ';
-	    if ($user->rights->don->creer)
-	    {
-	        if ($action != 'classify')
-	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
+    $morehtmlref='<div class="refidno">';
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.=$langs->trans('Project') . ' ';
+        if ($user->rights->don->creer)
+        {
+            if ($action != 'classify')
+                // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                if ($action == 'classify') {
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
                     $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '&id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
+                }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
                 $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	$morehtmlref.='</div>';
+                $morehtmlref.=$proj->ref;
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
 
-	dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+    dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
 
-	$cssclass="titlefield";
-	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+    $cssclass="titlefield";
+    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 
 llxFooter();

Braces +6 added lines, -3 removed lines

@@ -47,7 +47,9 @@ 
 
 // Security check
 $socid=0;
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'don',$id,'');
 
 $object = new Don($db);
@@ -98,10 +100,11 @@ 
 	    $morehtmlref.=$langs->trans('Project') . ' ';
 	    if ($user->rights->don->creer)
 	    {
-	        if ($action != 'classify')
-	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        if ($action != 'classify') {
+	        	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 	            if ($action == 'classify') {
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
+	        }
 	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
 	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

dolibarr/htdocs/don/info.php

Braces +6 added lines, -3 removed lines

@@ -40,7 +40,9 @@ 
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->societe_id) $socid = $user->societe_id;
+if ($user->societe_id) {
+    $socid = $user->societe_id;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 $object = new Don($db);
@@ -79,10 +81,11 @@ 
     $langs->load("projects");
     $morehtmlref .= $langs->trans('Project') . ' ';
     if ($user->rights->don->creer) {
-        if ($action != 'classify')
-            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+        if ($action != 'classify') {
+                    // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
             if ($action == 'classify') {
                 $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
+        }
                 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
                 $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
                 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);