alxarafe / alixar

dolibarr/htdocs/user/card.php

Spacing +334 added lines, -334 removed lines

@@ -36,25 +36,25 @@ 
  *       \file       htdocs/user/card.php
  *       \brief      Tab of user card
  */
-require DOL_BASE_PATH . '/main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT . '/user/class/usergroup.class.php';
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 if (!empty($conf->ldap->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/core/class/ldap.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 }
 if (!empty($conf->adherent->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
 if (!empty($conf->categorie->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
 $id = GETPOST('id', 'int');
@@ -64,7 +64,7 @@ 
 $subaction = GETPOST('subaction', 'alpha');
 $group = GETPOST("group", "int", 3);
 $cancel = GETPOST('cancel', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'useracard';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'useracard'; // To manage different context of search
 // Define value to know what current user can do on users
 $canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
 $canreaduser = (!empty($user->admin) || $user->rights->user->user->lire);
@@ -117,7 +117,7 @@ 
  * Actions
  */
 $parameters = array('id' => $id, 'socid' => $socid, 'group' => $group, 'caneditgroup' => $caneditgroup);
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -128,7 +128,7 @@ 
         if ($id <> $user->id) {
             $object->fetch($id);
             $object->setstatus(0);
-            header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $id);
+            header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
             exit;
         }
     }
@@ -141,14 +141,14 @@ 
             if (!empty($conf->file->main_limit_users)) {
                 $nb = $object->getNbOfUsers("active");
                 if ($nb >= $conf->file->main_limit_users) {
-                    $error ++;
+                    $error++;
                     setEventMessages($langs->trans("YourQuotaOfUsersIsReached"), null, 'errors');
                 }
             }
 
             if (!$error) {
                 $object->setstatus(1);
-                header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $id);
+                header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
                 exit;
             }
         }
@@ -163,7 +163,7 @@ 
                 $langs->load("errors");
                 setEventMessages($langs->trans("ErrorUserCannotBeDelete"), null, 'errors');
             } else {
-                header("Location: " . BASE_URI . "?controller=user&method=list&restore_lastsearch_values=1");
+                header("Location: ".BASE_URI."?controller=user&method=list&restore_lastsearch_values=1");
                 exit;
             }
         }
@@ -174,22 +174,22 @@ 
         $error = 0;
 
         if (!$_POST["lastname"]) {
-            $error ++;
+            $error++;
             setEventMessages($langs->trans("NameNotDefined"), null, 'errors');
-            $action = "create";       // Go back to create page
+            $action = "create"; // Go back to create page
         }
         if (!$_POST["login"]) {
-            $error ++;
+            $error++;
             setEventMessages($langs->trans("LoginNotDefined"), null, 'errors');
-            $action = "create";       // Go back to create page
+            $action = "create"; // Go back to create page
         }
 
         if (!empty($conf->file->main_limit_users)) { // If option to limit users is set
             $nb = $object->getNbOfUsers("active");
             if ($nb >= $conf->file->main_limit_users) {
-                $error ++;
+                $error++;
                 setEventMessages($langs->trans("YourQuotaOfUsersIsReached"), null, 'errors');
-                $action = "create";       // Go back to create page
+                $action = "create"; // Go back to create page
             }
         }
 
@@ -238,7 +238,7 @@ 
             // Fill array 'array_options' with data from add form
             $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
             if ($ret < 0) {
-                $error ++;
+                $error++;
             }
 
             // Set entity property
@@ -274,13 +274,13 @@ 
                 }
                 $db->commit();
 
-                header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $id);
+                header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
                 exit;
             } else {
                 $langs->load("errors");
                 $db->rollback();
                 setEventMessages($object->error, $object->errors, 'errors');
-                $action = "create";       // Go back to create page
+                $action = "create"; // Go back to create page
             }
         }
     }
@@ -301,7 +301,7 @@ 
             }
 
             if ($result > 0) {
-                header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $id);
+                header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
                 exit;
             } else {
                 setEventMessages($object->error, $object->errors, 'errors');
@@ -310,20 +310,20 @@ 
     }
 
     if ($action == 'update' && !$cancel) {
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         if ($caneditfield) {    // Case we can edit all field
             $error = 0;
 
             if (!$_POST["lastname"]) {
                 setEventMessages($langs->trans("NameNotDefined"), null, 'errors');
-                $action = "edit";       // Go back to create page
-                $error ++;
+                $action = "edit"; // Go back to create page
+                $error++;
             }
             if (!$_POST["login"]) {
                 setEventMessages($langs->trans("LoginNotDefined"), null, 'errors');
-                $action = "edit";       // Go back to create page
-                $error ++;
+                $action = "edit"; // Go back to create page
+                $error++;
             }
 
             if (!$error) {
@@ -342,7 +342,7 @@ 
                 $object->pass = GETPOST("password", 'none');
                 $object->api_key = (GETPOST("api_key", 'alpha')) ? GETPOST("api_key", 'alpha') : $object->api_key;
                 if (!empty($user->admin)) {
-                    $object->admin = GETPOST("admin");  // admin flag can only be set/unset by an admin user. A test is also done later when forging sql request
+                    $object->admin = GETPOST("admin"); // admin flag can only be set/unset by an admin user. A test is also done later when forging sql request
                 }
                 $object->address = GETPOST('address', 'alphanohtml');
                 $object->zip = GETPOST('zipcode', 'alpha');
@@ -390,7 +390,7 @@ 
                 // Fill array 'array_options' with data from add form
                 $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
                 if ($ret < 0) {
-                    $error ++;
+                    $error++;
                 }
 
                 if (GETPOST('deletephoto')) {
@@ -420,40 +420,40 @@ 
                         $contact = new Contact($db);
                         $contact->fetch($contactid);
 
-                        $sql = "UPDATE " . MAIN_DB_PREFIX . "user";
-                        $sql .= " SET fk_socpeople=" . $db->escape($contactid);
+                        $sql = "UPDATE ".MAIN_DB_PREFIX."user";
+                        $sql .= " SET fk_socpeople=".$db->escape($contactid);
                         if (!empty($contact->socid)) {
-                            $sql .= ", fk_soc=" . $db->escape($contact->socid);
+                            $sql .= ", fk_soc=".$db->escape($contact->socid);
                         }
-                        $sql .= " WHERE rowid=" . $object->id;
+                        $sql .= " WHERE rowid=".$object->id;
                     } else {
-                        $sql = "UPDATE " . MAIN_DB_PREFIX . "user";
+                        $sql = "UPDATE ".MAIN_DB_PREFIX."user";
                         $sql .= " SET fk_socpeople=NULL, fk_soc=NULL";
-                        $sql .= " WHERE rowid=" . $object->id;
+                        $sql .= " WHERE rowid=".$object->id;
                     }
                     dol_syslog("usercard::update", LOG_DEBUG);
                     $resql = $db->query($sql);
                     if (!$resql) {
-                        $error ++;
+                        $error++;
                         setEventMessages($db->lasterror(), null, 'errors');
                     }
                 }
 
                 if (!$error && !count($object->errors)) {
                     if (GETPOST('deletephoto') && $object->photo) {
-                        $fileimg = $conf->user->dir_output . '/' . get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/logos/' . $object->photo;
-                        $dirthumbs = $conf->user->dir_output . '/' . get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/logos/thumbs';
+                        $fileimg = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/logos/'.$object->photo;
+                        $dirthumbs = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/logos/thumbs';
                         dol_delete_file($fileimg);
                         dol_delete_dir_recursive($dirthumbs);
                     }
 
                     if (isset($_FILES['photo']['tmp_name']) && trim($_FILES['photo']['tmp_name'])) {
-                        $dir = $conf->user->dir_output . '/' . get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id;
+                        $dir = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id;
 
                         dol_mkdir($dir);
 
                         if (@is_dir($dir)) {
-                            $newfile = $dir . '/' . dol_sanitizeFileName($_FILES['photo']['name']);
+                            $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
                             $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']);
 
                             if (!$result > 0) {
@@ -463,7 +463,7 @@ 
                                 $object->addThumbs($newfile);
                             }
                         } else {
-                            $error ++;
+                            $error++;
                             $langs->load("errors");
                             setEventMessages($langs->trans("ErrorFailedToCreateDir", $dir), $mesgs, 'errors');
                         }
@@ -585,15 +585,15 @@ 
 
     // Actions to send emails
     $trigger_name = 'USER_SENTBYMAIL';
-    $paramname = 'id';    // Name of param key to open the card
+    $paramname = 'id'; // Name of param key to open the card
     $mode = 'emailfromuser';
-    $trackid = 'use' . $id;
-    include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+    $trackid = 'use'.$id;
+    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
     // Actions to build doc
     $upload_dir = $conf->user->dir_output;
     $permissioncreate = $user->rights->user->user->creer;
-    include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -617,7 +617,7 @@ 
 
     print load_fiche_titre($langs->trans("NewUser"));
 
-    print $langs->trans("CreateInternalUserDesc") . "<br>\n";
+    print $langs->trans("CreateInternalUserDesc")."<br>\n";
     print "<br>";
 
 
@@ -662,7 +662,7 @@ 
                     $label = '';
                     foreach ($required_fields as $value) {
                         if ($value) {
-                            $label .= $value . "=" . $ldapuser[$value] . " ";
+                            $label .= $value."=".$ldapuser[$value]." ";
                         }
                     }
                     $liste[$key] = $label;
@@ -678,8 +678,8 @@ 
         print "\n\n<!-- Form liste LDAP debut -->\n";
 
         // print '<form name="add_user_ldap" action="' . $_SERVER["PHP_SELF"] . '" method="post">';
-        print '<form name="add_user_ldap" href="' . BASE_URI . '?controller=user&method=card" method="post">';
-        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+        print '<form name="add_user_ldap" href="'.BASE_URI.'?controller=user&method=card" method="post">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<table width="100%" class="border"><tr>';
         print '<td width="160">';
         print $langs->trans("LDAPUsers");
@@ -691,7 +691,7 @@ 
             print ajax_combobox('users');
         }
         print '</td><td align="center">';
-        print '<input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Get')) . '"' . (count($liste) ? '' : ' disabled') . '>';
+        print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Get')).'"'.(count($liste) ? '' : ' disabled').'>';
         print '</td></tr></table>';
         print '</form>';
 
@@ -701,13 +701,13 @@ 
 
 
     // print '<form action="' . $_SERVER['PHP_SELF'] . '" method="POST" name="createuser">';
-    print '<form href="' . BASE_URI . '?controller=user&method=card" method="POST" name="createuser">';
-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+    print '<form href="'.BASE_URI.'?controller=user&method=card" method="POST" name="createuser">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
     if (!empty($ldap_sid)) {
-        print '<input type="hidden" name="ldap_sid" value="' . dol_escape_htmltag($ldap_sid) . '">';
+        print '<input type="hidden" name="ldap_sid" value="'.dol_escape_htmltag($ldap_sid).'">';
     }
-    print '<input type="hidden" name="entity" value="' . $conf->entity . '">';
+    print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 
     dol_fiche_head('', '', '', 0, '');
 
@@ -717,75 +717,75 @@ 
 
     // Lastname
     print '<tr>';
-    print '<td class="titlefieldcreate"><span class="fieldrequired">' . $langs->trans("Lastname") . '</span></td>';
+    print '<td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
     print '<td>';
     if (!empty($ldap_lastname)) {
-        print '<input type="hidden" id="lastname" name="lastname" value="' . $ldap_lastname . '">';
+        print '<input type="hidden" id="lastname" name="lastname" value="'.$ldap_lastname.'">';
         print $ldap_lastname;
     } else {
-        print '<input class="minwidth100" type="text" id="lastname" name="lastname" value="' . GETPOST('lastname') . '">';
+        print '<input class="minwidth100" type="text" id="lastname" name="lastname" value="'.GETPOST('lastname').'">';
     }
     print '</td></tr>';
 
     // Firstname
-    print '<tr><td>' . $langs->trans("Firstname") . '</td>';
+    print '<tr><td>'.$langs->trans("Firstname").'</td>';
     print '<td>';
     if (!empty($ldap_firstname)) {
-        print '<input type="hidden" name="firstname" value="' . $ldap_firstname . '">';
+        print '<input type="hidden" name="firstname" value="'.$ldap_firstname.'">';
         print $ldap_firstname;
     } else {
-        print '<input class="minwidth100" type="text" name="firstname" value="' . GETPOST('firstname') . '">';
+        print '<input class="minwidth100" type="text" name="firstname" value="'.GETPOST('firstname').'">';
     }
     print '</td></tr>';
 
     // Login
-    print '<tr><td><span class="fieldrequired">' . $langs->trans("Login") . '</span></td>';
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
     print '<td>';
     if (!empty($ldap_login)) {
-        print '<input type="hidden" name="login" value="' . $ldap_login . '">';
+        print '<input type="hidden" name="login" value="'.$ldap_login.'">';
         print $ldap_login;
     } elseif (!empty($ldap_loginsmb)) {
-        print '<input type="hidden" name="login" value="' . $ldap_loginsmb . '">';
+        print '<input type="hidden" name="login" value="'.$ldap_loginsmb.'">';
         print $ldap_loginsmb;
     } else {
-        print '<input class="maxwidth200" maxsize="24" type="text" name="login" value="' . dol_escape_htmltag(GETPOST('login', 'alpha')) . '">';
+        print '<input class="maxwidth200" maxsize="24" type="text" name="login" value="'.dol_escape_htmltag(GETPOST('login', 'alpha')).'">';
     }
     print '</td></tr>';
 
     $generated_password = '';
     if (empty($ldap_sid)) {    // ldap_sid is for activedirectory
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
         $generated_password = getRandomPassword(false);
     }
     $password = $generated_password;
 
     // Password
-    print '<tr><td class="fieldrequired">' . $langs->trans("Password") . '</td>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td>';
     print '<td>';
     $valuetoshow = '';
     if (preg_match('/ldap/', $dolibarr_main_authentication)) {
-        $valuetoshow .= ($valuetoshow ? ', ' : '') . $langs->trans("PasswordOfUserInLDAP");
+        $valuetoshow .= ($valuetoshow ? ', ' : '').$langs->trans("PasswordOfUserInLDAP");
     }
     if (preg_match('/http/', $dolibarr_main_authentication)) {
-        $valuetoshow .= ($valuetoshow ? ', ' : '') . $langs->trans("HTTPBasicPassword");
+        $valuetoshow .= ($valuetoshow ? ', ' : '').$langs->trans("HTTPBasicPassword");
     }
     if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
         if (!empty($ldap_pass)) { // For very old system comaptibilty. Now clear password can't be viewed from LDAP read
-            $valuetoshow .= ($valuetoshow ? ', ' : '') . '<input type="hidden" name="password" value="' . $ldap_pass . '">'; // Dolibarr password is preffiled with LDAP known password
+            $valuetoshow .= ($valuetoshow ? ', ' : '').'<input type="hidden" name="password" value="'.$ldap_pass.'">'; // Dolibarr password is preffiled with LDAP known password
             $valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
         } else {
             // We do not use a field password but a field text to show new password to use.
-            $valuetoshow .= ($valuetoshow ? ', ' : '') . '<input size="30" maxsize="32" type="text" name="password" value="' . $password . '" autocomplete="new-password">';
+            $valuetoshow .= ($valuetoshow ? ', ' : '').'<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
         }
     }
 
     // Other form for user password
     $parameters = array('valuetoshow' => $valuetoshow, 'password' => $password);
-    $reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+    $reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     if ($reshook > 0) {
         $valuetoshow = $hookmanager->resPrint; // to replace
     } else {
-        $valuetoshow .= $hookmanager->resPrint;    // to add
+        $valuetoshow .= $hookmanager->resPrint; // to add
     }
     print $valuetoshow;
     print '</td></tr>';
@@ -793,25 +793,25 @@ 
     if (!empty($conf->api->enabled)) {
         // API key
         $generated_api_key = '';
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
         $generated_password = getRandomPassword(false);
-        print '<tr><td>' . $langs->trans("ApiKey") . '</td>';
+        print '<tr><td>'.$langs->trans("ApiKey").'</td>';
         print '<td>';
-        print '<input size="30" maxsize="32" type="text" id="api_key" name="api_key" value="' . $api_key . '" autocomplete="off">';
+        print '<input size="30" maxsize="32" type="text" id="api_key" name="api_key" value="'.$api_key.'" autocomplete="off">';
         if (!empty($conf->use_javascript_ajax)) {
-            print '&nbsp;' . img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
+            print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
         }
         print '</td></tr>';
     } else {
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
         // PARTIAL WORKAROUND
         $generated_fake_api_key = getRandomPassword(false);
-        print '<input type="hidden" name="api_key" value="' . $generated_fake_api_key . '">';
+        print '<input type="hidden" name="api_key" value="'.$generated_fake_api_key.'">';
     }
 
     // Administrator
     if (!empty($user->admin)) {
-        print '<tr><td>' . $langs->trans("Administrator") . '</td>';
+        print '<tr><td>'.$langs->trans("Administrator").'</td>';
         print '<td>';
         print $form->selectyesno('admin', GETPOST('admin'), 1);
 
@@ -845,19 +845,19 @@ 
             }
             $checked = (GETPOST('superadmin', 'int') ? ' checked' : '');
             $disabled = (GETPOST('superadmin', 'int') ? '' : ' disabled');
-            print '<input type="checkbox" name="superadmin" value="1"' . $checked . $disabled . ' /> ' . $langs->trans("SuperAdministrator");
+            print '<input type="checkbox" name="superadmin" value="1"'.$checked.$disabled.' /> '.$langs->trans("SuperAdministrator");
         }
         print "</td></tr>\n";
     }
 
     // Type
-    print '<tr><td>' . $langs->trans("Type") . '</td>';
+    print '<tr><td>'.$langs->trans("Type").'</td>';
     print '<td>';
     print $form->textwithpicto($langs->trans("Internal"), $langs->trans("InternalExternalDesc"), 1, 'help', '', 0, 2);
     print '</td></tr>';
 
     // Gender
-    print '<tr><td>' . $langs->trans("Gender") . '</td>';
+    print '<tr><td>'.$langs->trans("Gender").'</td>';
     print '<td>';
     $arraygender = array('man' => $langs->trans("Genderman"), 'woman' => $langs->trans("Genderwoman"));
     print $form->selectarray('gender', $arraygender, GETPOST('gender'), 1);
@@ -866,12 +866,12 @@ 
     // Employee
     $defaultemployee = 1;
     print '<tr>';
-    print '<td>' . $langs->trans('Employee') . '</td><td>';
+    print '<td>'.$langs->trans('Employee').'</td><td>';
     print $form->selectyesno("employee", (GETPOST('employee') != '' ? GETPOST('employee') : $defaultemployee), 1);
     print '</td></tr>';
 
     // Hierarchy
-    print '<tr><td class="titlefieldcreate">' . $langs->trans("HierarchicalResponsible") . '</td>';
+    print '<tr><td class="titlefieldcreate">'.$langs->trans("HierarchicalResponsible").'</td>';
     print '<td>';
     print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
     print '</td>';
@@ -882,23 +882,23 @@ 
 
 
     // Address
-    print '<tr><td class="tdtop titlefieldcreate">' . $form->editfieldkey('Address', 'address', '', $object, 0) . '</td>';
+    print '<tr><td class="tdtop titlefieldcreate">'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
     print '<td><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
     print $object->address;
     print '</textarea></td></tr>';
 
     // Zip
-    print '<tr><td>' . $form->editfieldkey('Zip', 'zipcode', '', $object, 0) . '</td><td>';
+    print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
     print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
     print '</td></tr>';
 
     // Town
-    print '<tr><td>' . $form->editfieldkey('Town', 'town', '', $object, 0) . '</td><td>';
+    print '<tr><td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
     print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
     print '</td></tr>';
 
     // Country
-    print '<tr><td>' . $form->editfieldkey('Country', 'selectcountry_id', '', $object, 0) . '</td><td class="maxwidthonsmartphone">';
+    print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</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);
@@ -907,105 +907,105 @@ 
 
     // State
     if (empty($conf->global->USER_DISABLE_STATE)) {
-        print '<tr><td>' . $form->editfieldkey('State', 'state_id', '', $object, 0) . '</td><td class="maxwidthonsmartphone">';
+        print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
         print $formcompany->select_state($object->state_id, $object->country_code, 'state_id');
         print '</td></tr>';
     }
 
     // Tel
-    print '<tr><td>' . $langs->trans("PhonePro") . '</td>';
+    print '<tr><td>'.$langs->trans("PhonePro").'</td>';
     print '<td>';
     if (!empty($ldap_phone)) {
-        print '<input type="hidden" name="office_phone" value="' . $ldap_phone . '">';
+        print '<input type="hidden" name="office_phone" value="'.$ldap_phone.'">';
         print $ldap_phone;
     } else {
-        print '<input size="20" type="text" name="office_phone" value="' . GETPOST('office_phone') . '">';
+        print '<input size="20" type="text" name="office_phone" value="'.GETPOST('office_phone').'">';
     }
     print '</td></tr>';
 
     // Tel portable
-    print '<tr><td>' . $langs->trans("PhoneMobile") . '</td>';
+    print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
     print '<td>';
     if (!empty($ldap_mobile)) {
-        print '<input type="hidden" name="user_mobile" value="' . $ldap_mobile . '">';
+        print '<input type="hidden" name="user_mobile" value="'.$ldap_mobile.'">';
         print $ldap_mobile;
     } else {
-        print '<input size="20" type="text" name="user_mobile" value="' . GETPOST('user_mobile') . '">';
+        print '<input size="20" type="text" name="user_mobile" value="'.GETPOST('user_mobile').'">';
     }
     print '</td></tr>';
 
     // Fax
-    print '<tr><td>' . $langs->trans("Fax") . '</td>';
+    print '<tr><td>'.$langs->trans("Fax").'</td>';
     print '<td>';
     if (!empty($ldap_fax)) {
-        print '<input type="hidden" name="office_fax" value="' . $ldap_fax . '">';
+        print '<input type="hidden" name="office_fax" value="'.$ldap_fax.'">';
         print $ldap_fax;
     } else {
-        print '<input size="20" type="text" name="office_fax" value="' . GETPOST('office_fax') . '">';
+        print '<input size="20" type="text" name="office_fax" value="'.GETPOST('office_fax').'">';
     }
     print '</td></tr>';
 
     // Skype
     if (!empty($conf->socialnetworks->enabled)) {
-        print '<tr><td>' . $langs->trans("Skype") . '</td>';
+        print '<tr><td>'.$langs->trans("Skype").'</td>';
         print '<td>';
         if (!empty($ldap_skype)) {
-            print '<input type="hidden" name="skype" value="' . $ldap_skype . '">';
+            print '<input type="hidden" name="skype" value="'.$ldap_skype.'">';
             print $ldap_skype;
         } else {
-            print '<input class="maxwidth200" type="text" name="skype" value="' . GETPOST('skype', 'alpha') . '">';
+            print '<input class="maxwidth200" type="text" name="skype" value="'.GETPOST('skype', 'alpha').'">';
         }
         print '</td></tr>';
     }
 
     // Twitter
     if (!empty($conf->socialnetworks->enabled)) {
-        print '<tr><td>' . $langs->trans("Twitter") . '</td>';
+        print '<tr><td>'.$langs->trans("Twitter").'</td>';
         print '<td>';
         if (!empty($ldap_twitter)) {
-            print '<input type="hidden" name="twitter" value="' . $ldap_twitter . '">';
+            print '<input type="hidden" name="twitter" value="'.$ldap_twitter.'">';
             print $ldap_twitter;
         } else {
-            print '<input class="maxwidth200" type="text" name="twitter" value="' . GETPOST('twitter', 'alpha') . '">';
+            print '<input class="maxwidth200" type="text" name="twitter" value="'.GETPOST('twitter', 'alpha').'">';
         }
         print '</td></tr>';
     }
 
     // Facebook
     if (!empty($conf->socialnetworks->enabled)) {
-        print '<tr><td>' . $langs->trans("Facebook") . '</td>';
+        print '<tr><td>'.$langs->trans("Facebook").'</td>';
         print '<td>';
         if (!empty($ldap_facebook)) {
-            print '<input type="hidden" name="facebook" value="' . $ldap_facebook . '">';
+            print '<input type="hidden" name="facebook" value="'.$ldap_facebook.'">';
             print $ldap_facebook;
         } else {
-            print '<input class="maxwidth200" type="text" name="facebook" value="' . GETPOST('facebook', 'alpha') . '">';
+            print '<input class="maxwidth200" type="text" name="facebook" value="'.GETPOST('facebook', 'alpha').'">';
         }
         print '</td></tr>';
     }
 
     // EMail
-    print '<tr><td' . (!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '') . '>' . $langs->trans("EMail") . '</td>';
+    print '<tr><td'.(!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").'</td>';
     print '<td>';
     if (!empty($ldap_mail)) {
-        print '<input type="hidden" name="email" value="' . $ldap_mail . '">';
+        print '<input type="hidden" name="email" value="'.$ldap_mail.'">';
         print $ldap_mail;
     } else {
-        print '<input size="40" type="text" name="email" value="' . GETPOST('email') . '">';
+        print '<input size="40" type="text" name="email" value="'.GETPOST('email').'">';
     }
     print '</td></tr>';
 
     // Accountancy code
     if ($conf->accounting->enabled) {
-        print '<tr><td>' . $langs->trans("AccountancyCode") . '</td>';
+        print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
         print '<td>';
-        print '<input size="30" type="text" name="accountancy_code" value="' . GETPOST('accountancy_code') . '">';
+        print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">';
         print '</td></tr>';
     }
 
     // User color
     if (!empty($conf->agenda->enabled)) {
-        print '<tr><td>' . $langs->trans("ColorUser") . '</td>';
+        print '<tr><td>'.$langs->trans("ColorUser").'</td>';
         print '<td>';
         print $formother->selectColor(GETPOST('color') ? GETPOST('color') : $object->color, 'color', null, 1, '', 'hideifnotset');
         print '</td></tr>';
@@ -1013,7 +1013,7 @@ 
 
     // Categories
     if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
-        print '<tr><td>' . $form->editfieldkey('Categories', 'usercats', '', $object, 0) . '</td><td colspan="3">';
+        print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td><td colspan="3">';
         $cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
         print $form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, null, '90%');
         print "</td></tr>";
@@ -1024,18 +1024,18 @@ 
         // This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
         if (!method_exists($mc, 'formObjectOptions')) {
             if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) { // condition must be same for create and edit mode
-                print "<tr>" . '<td>' . $langs->trans("Entity") . '</td>';
-                print "<td>" . $mc->select_entities($conf->entity);
+                print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
+                print "<td>".$mc->select_entities($conf->entity);
                 print "</td></tr>\n";
             } else {
-                print '<input type="hidden" name="entity" value="' . $conf->entity . '" />';
+                print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
             }
         }
     }
 
     // Other attributes
     $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
     if (empty($reshook)) {
         print $object->showOptionals($extrafields, 'edit');
@@ -1045,15 +1045,15 @@ 
     print '<tr><td class="tdtop">';
     print $langs->trans("Note");
     print '</td><td>';
-    require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor('note', '', '', 120, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
     $doleditor->Create();
     print "</td></tr>\n";
 
     // Signature
-    print '<tr><td class="tdtop">' . $langs->trans("Signature") . '</td>';
+    print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>';
     print '<td>';
-    require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor('signature', GETPOST('signature'), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
     print $doleditor->Create(1);
     print '</td></tr>';
@@ -1064,9 +1064,9 @@ 
 
     // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
     // Position/Job
-    print '<tr><td class="titlefieldcreate">' . $langs->trans("PostOrFunction") . '</td>';
+    print '<tr><td class="titlefieldcreate">'.$langs->trans("PostOrFunction").'</td>';
     print '<td>';
-    print '<input class="maxwidth200" type="text" name="job" value="' . GETPOST('job') . '">';
+    print '<input class="maxwidth200" type="text" name="job" value="'.GETPOST('job').'">';
     print '</td></tr>';
 
 
@@ -1079,7 +1079,7 @@ 
         print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
         print '</td>';
         print '<td>';
-        print '<input size="8" type="text" name="thm" value="' . GETPOST('thm') . '">';
+        print '<input size="8" type="text" name="thm" value="'.GETPOST('thm').'">';
         print '</td>';
         print "</tr>\n";
 
@@ -1089,41 +1089,41 @@ 
         print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
         print '</td>';
         print '<td>';
-        print '<input size="8" type="text" name="tjm" value="' . GETPOST('tjm') . '">';
+        print '<input size="8" type="text" name="tjm" value="'.GETPOST('tjm').'">';
         print '</td>';
         print "</tr>\n";
 
         // Salary
-        print '<tr><td>' . $langs->trans("Salary") . '</td>';
+        print '<tr><td>'.$langs->trans("Salary").'</td>';
         print '<td>';
-        print '<input size="8" type="text" name="salary" value="' . GETPOST('salary') . '">';
+        print '<input size="8" type="text" name="salary" value="'.GETPOST('salary').'">';
         print '</td>';
         print "</tr>\n";
     }
 
     // Weeklyhours
-    print '<tr><td>' . $langs->trans("WeeklyHours") . '</td>';
+    print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
     print '<td>';
-    print '<input size="8" type="text" name="weeklyhours" value="' . GETPOST('weeklyhours') . '">';
+    print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">';
     print '</td>';
     print "</tr>\n";
 
     // Date employment
-    print '<tr><td>' . $langs->trans("DateEmployment") . '</td>';
+    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
     print '<td>';
     print $form->selectDate(GETPOST('dateemployment'), 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 0);
     print '</td>';
     print "</tr>\n";
 
     // Date employment END
-    print '<tr><td>' . $langs->trans("DateEmploymentEnd") . '</td>';
+    print '<tr><td>'.$langs->trans("DateEmploymentEnd").'</td>';
     print '<td>';
     print $form->selectDate(GETPOST('dateemploymentend'), 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0);
     print '</td>';
     print "</tr>\n";
 
     // Date birth
-    print '<tr><td>' . $langs->trans("DateToBirth") . '</td>';
+    print '<tr><td>'.$langs->trans("DateToBirth").'</td>';
     print '<td>';
     print $form->selectDate(GETPOST('birth'), 'birth', 0, 0, 1, 'createuser', 1, 0);
     print '</td>';
@@ -1134,7 +1134,7 @@ 
     dol_fiche_end();
 
     print '<div align="center">';
-    print '<input class="button" value="' . $langs->trans("CreateUser") . '" name="create" type="submit">';
+    print '<input class="button" value="'.$langs->trans("CreateUser").'" name="create" type="submit">';
     //print '&nbsp; &nbsp; &nbsp;';
     //print '<input value="'.$langs->trans("Cancel").'" class="button" type="submit" name="cancel">';
     print '</div>';
@@ -1169,7 +1169,7 @@ 
             $ldap = new Ldap();
             $result = $ldap->connect_bind();
             if ($result > 0) {
-                $userSearchFilter = '(' . $conf->global->LDAP_FILTER_CONNECTION . '(' . $ldap->getUserIdentifier() . '=' . $object->login . '))';
+                $userSearchFilter = '('.$conf->global->LDAP_FILTER_CONNECTION.'('.$ldap->getUserIdentifier().'='.$object->login.'))';
                 $entries = $ldap->fetch($object->login, $userSearchFilter);
                 if (!$entries) {
                     setEventMessages($ldap->error, $ldap->errors, 'errors');
@@ -1202,13 +1202,13 @@ 
         // Show tabs
         if ($mode == 'employee') { // For HRM module development
             $title = $langs->trans("Employee");
-            $linkback = '<a href="' . BASE_URI . '?controller=hrm/employee&method=list&restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+            $linkback = '<a href="'.BASE_URI.'?controller=hrm/employee&method=list&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
         } else {
             $title = $langs->trans("User");
             $linkback = '';
 
             if ($user->rights->user->user->lire || $user->admin) {
-                $linkback = '<a href="' . BASE_URI . '?controller=user&method=list&restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+                $linkback = '<a href="'.BASE_URI.'?controller=user&method=list&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
             }
         }
 
@@ -1218,35 +1218,35 @@ 
          * Confirmation reinitialisation mot de passe
          */
         if ($action == 'password') {
-            print $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("ReinitPassword"), $langs->trans("ConfirmReinitPassword", $object->login), "confirm_password", '', 0, 1);
+            print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("ReinitPassword"), $langs->trans("ConfirmReinitPassword", $object->login), "confirm_password", '', 0, 1);
         }
 
         /*
          * Confirmation envoi mot de passe
          */
         if ($action == 'passwordsend') {
-            print $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("SendNewPassword"), $langs->trans("ConfirmSendNewPassword", $object->login), "confirm_passwordsend", '', 0, 1);
+            print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("SendNewPassword"), $langs->trans("ConfirmSendNewPassword", $object->login), "confirm_passwordsend", '', 0, 1);
         }
 
         /*
          * Confirm deactivation
          */
         if ($action == 'disable') {
-            print $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("DisableAUser"), $langs->trans("ConfirmDisableUser", $object->login), "confirm_disable", '', 0, 1);
+            print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DisableAUser"), $langs->trans("ConfirmDisableUser", $object->login), "confirm_disable", '', 0, 1);
         }
 
         /*
          * Confirm activation
          */
         if ($action == 'enable') {
-            print $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("EnableAUser"), $langs->trans("ConfirmEnableUser", $object->login), "confirm_enable", '', 0, 1);
+            print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("EnableAUser"), $langs->trans("ConfirmEnableUser", $object->login), "confirm_enable", '', 0, 1);
         }
 
         /*
          * Confirmation suppression
          */
         if ($action == 'delete') {
-            print $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("DeleteAUser"), $langs->trans("ConfirmDeleteUser", $object->login), "confirm_delete", '', 0, 1);
+            print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DeleteAUser"), $langs->trans("ConfirmDeleteUser", $object->login), "confirm_delete", '', 0, 1);
         }
 
         /*
@@ -1264,64 +1264,64 @@ 
             print '<table class="border tableforfield" width="100%">';
 
             // Login
-            print '<tr><td class="titlefield">' . $langs->trans("Login") . '</td>';
+            print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
             if (!empty($object->ldap_sid) && $object->statut == 0) {
-                print '<td class="error">' . $langs->trans("LoginAccountDisableInDolibarr") . '</td>';
+                print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
             } else {
-                print '<td>' . $object->login . '</td>';
+                print '<td>'.$object->login.'</td>';
             }
-            print '</tr>' . "\n";
+            print '</tr>'."\n";
 
             // Password
-            print '<tr><td>' . $langs->trans("Password") . '</td>';
+            print '<tr><td>'.$langs->trans("Password").'</td>';
 
             print '<td class="wordbreak">';
             $valuetoshow = '';
             if (preg_match('/ldap/', $dolibarr_main_authentication)) {
                 if (!empty($object->ldap_sid)) {
                     if ($passDoNotExpire) {
-                        $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . $langs->trans("LdapUacf_" . $statutUACF);
+                        $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("LdapUacf_".$statutUACF);
                     } else if ($userChangePassNextLogon) {
-                        $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . '<span class="warning">' . $langs->trans("UserMustChangePassNextLogon", $ldap->domainFQDN) . '</span>';
+                        $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("UserMustChangePassNextLogon", $ldap->domainFQDN).'</span>';
                     } else if ($userDisabled) {
-                        $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . '<span class="warning">' . $langs->trans("LdapUacf_" . $statutUACF, $ldap->domainFQDN) . '</span>';
+                        $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("LdapUacf_".$statutUACF, $ldap->domainFQDN).'</span>';
                     } else {
-                        $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . $langs->trans("PasswordOfUserInLDAP");
+                        $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
                     }
                 } else {
-                    $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . $langs->trans("PasswordOfUserInLDAP");
+                    $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
                 }
             }
             if (preg_match('/http/', $dolibarr_main_authentication)) {
-                $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . $langs->trans("HTTPBasicPassword");
+                $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("HTTPBasicPassword");
             }
             if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
                 if ($object->pass) {
-                    $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . preg_replace('/./i', '*', $object->pass);
+                    $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
                 } else {
                     if ($user->admin) {
-                        $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . $langs->trans("Crypted") . ': ' . $object->pass_indatabase_crypted;
+                        $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
                     } else {
-                        $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . $langs->trans("Hidden");
+                        $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("Hidden");
                     }
                 }
             }
 
             // Other form for user password
             $parameters = array('valuetoshow' => $valuetoshow);
-            $reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+            $reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             if ($reshook > 0) {
                 $valuetoshow = $hookmanager->resPrint; // to replace
             } else {
-                $valuetoshow .= $hookmanager->resPrint;    // to add
+                $valuetoshow .= $hookmanager->resPrint; // to add
             }
             print $valuetoshow;
             print "</td>";
-            print '</tr>' . "\n";
+            print '</tr>'."\n";
 
             // API key
             if (!empty($conf->api->enabled) && $user->admin) {
-                print '<tr><td>' . $langs->trans("ApiKey") . '</td>';
+                print '<tr><td>'.$langs->trans("ApiKey").'</td>';
                 print '<td>';
                 if (!empty($object->api_key)) {
                     print preg_replace('/./', '*', $object->api_key);
@@ -1330,7 +1330,7 @@ 
             }
 
             // Administrator
-            print '<tr><td>' . $langs->trans("Administrator") . '</td><td>';
+            print '<tr><td>'.$langs->trans("Administrator").'</td><td>';
             if (!empty($conf->multicompany->enabled) && $object->admin && !$object->entity) {
                 print $form->textwithpicto(yn($object->admin), $langs->trans("SuperAdministratorDesc"), 1, "superadmin");
             } else if ($object->admin) {
@@ -1338,7 +1338,7 @@ 
             } else {
                 print yn($object->admin);
             }
-            print '</td></tr>' . "\n";
+            print '</td></tr>'."\n";
 
             // Type
             print '<tr><td>';
@@ -1351,33 +1351,33 @@ 
             }
             print $type;
             if ($object->ldap_sid) {
-                print ' (' . $langs->trans("DomainUser") . ')';
+                print ' ('.$langs->trans("DomainUser").')';
             }
-            print '</td></tr>' . "\n";
+            print '</td></tr>'."\n";
 
             // Ldap sid
             if ($object->ldap_sid) {
-                print '<tr><td>' . $langs->trans("Type") . '</td><td>';
+                print '<tr><td>'.$langs->trans("Type").'</td><td>';
                 print $langs->trans("DomainUser", $ldap->domainFQDN);
-                print '</td></tr>' . "\n";
+                print '</td></tr>'."\n";
             }
 
             // Gender
-            print '<tr><td>' . $langs->trans("Gender") . '</td>';
+            print '<tr><td>'.$langs->trans("Gender").'</td>';
             print '<td>';
             if ($object->gender) {
-                print $langs->trans("Gender" . $object->gender);
+                print $langs->trans("Gender".$object->gender);
             }
             print '</td></tr>';
 
             // Employee
-            print '<tr><td>' . $langs->trans("Employee") . '</td><td colspan="2">';
+            print '<tr><td>'.$langs->trans("Employee").'</td><td colspan="2">';
             print yn($object->employee);
-            print '</td></tr>' . "\n";
+            print '</td></tr>'."\n";
 
             // TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
             // Hierarchy
-            print '<tr><td>' . $langs->trans("HierarchicalResponsible") . '</td>';
+            print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
             if (empty($object->fk_user)) {
                 print $langs->trans("None");
@@ -1390,9 +1390,9 @@ 
             print "</tr>\n";
 
             // Position/Job
-            print '<tr><td>' . $langs->trans("PostOrFunction") . '</td>';
-            print '<td>' . $object->job . '</td>';
-            print '</tr>' . "\n";
+            print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
+            print '<td>'.$object->job.'</td>';
+            print '</tr>'."\n";
 
             //$childids = $user->getAllChildIds(1);
 
@@ -1422,7 +1422,7 @@ 
                 print "</tr>\n";
 
                 // Salary
-                print '<tr><td>' . $langs->trans("Salary") . '</td>';
+                print '<tr><td>'.$langs->trans("Salary").'</td>';
                 print '<td>';
                 print ($object->salary != '' ? price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '');
                 print '</td>';
@@ -1430,28 +1430,28 @@ 
             }
 
             // Weeklyhours
-            print '<tr><td>' . $langs->trans("WeeklyHours") . '</td>';
+            print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
             print '<td>';
             print price2num($object->weeklyhours);
             print '</td>';
             print "</tr>\n";
 
             // Date employment
-            print '<tr><td>' . $langs->trans("DateEmployment") . '</td>';
+            print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
             print '<td>';
             print dol_print_date($object->dateemployment, 'day');
             print '</td>';
             print "</tr>\n";
 
             // Date employment
-            print '<tr><td>' . $langs->trans("DateEmploymentEnd") . '</td>';
+            print '<tr><td>'.$langs->trans("DateEmploymentEnd").'</td>';
             print '<td>';
             print dol_print_date($object->dateemploymentend);
             print '</td>';
             print "</tr>\n";
 
             // Date of birth
-            print '<tr><td>' . $langs->trans("DateToBirth") . '</td>';
+            print '<tr><td>'.$langs->trans("DateToBirth").'</td>';
             print '<td>';
             print dol_print_date($object->birth, 'day');
             print '</td>';
@@ -1459,8 +1459,8 @@ 
 
             // Accountancy code
             if ($conf->accounting->enabled) {
-                print '<tr><td>' . $langs->trans("AccountancyCode") . '</td>';
-                print '<td>' . $object->accountancy_code . '</td></tr>';
+                print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
+                print '<td>'.$object->accountancy_code.'</td></tr>';
             }
 
             print '</table>';
@@ -1473,7 +1473,7 @@ 
 
             // Color user
             if (!empty($conf->agenda->enabled)) {
-                print '<tr><td>' . $langs->trans("ColorUser") . '</td>';
+                print '<tr><td>'.$langs->trans("ColorUser").'</td>';
                 print '<td>';
                 print $formother->showColor($object->color, '');
                 print '</td>';
@@ -1482,24 +1482,24 @@ 
 
             // Categories
             if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
-                print '<tr><td>' . $langs->trans("Categories") . '</td>';
+                print '<tr><td>'.$langs->trans("Categories").'</td>';
                 print '<td colspan="3">';
                 print $form->showCategories($object->id, 'user', 1);
                 print '</td></tr>';
             }
 
             if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication) && !empty($conf->global->MAIN_OPENIDURL_PERUSER)) {
-                print '<tr><td>' . $langs->trans("OpenIDURL") . '</td>';
-                print '<td>' . $object->openid . '</td>';
+                print '<tr><td>'.$langs->trans("OpenIDURL").'</td>';
+                print '<td>'.$object->openid.'</td>';
                 print "</tr>\n";
             }
 
-            print '<tr><td class="titlefield">' . $langs->trans("LastConnexion") . '</td>';
-            print '<td>' . dol_print_date($object->datelastlogin, "dayhour") . '</td>';
+            print '<tr><td class="titlefield">'.$langs->trans("LastConnexion").'</td>';
+            print '<td>'.dol_print_date($object->datelastlogin, "dayhour").'</td>';
             print "</tr>\n";
 
-            print '<tr><td>' . $langs->trans("PreviousConnexion") . '</td>';
-            print '<td>' . dol_print_date($object->datepreviouslogin, "dayhour") . '</td>';
+            print '<tr><td>'.$langs->trans("PreviousConnexion").'</td>';
+            print '<td>'.dol_print_date($object->datepreviouslogin, "dayhour").'</td>';
             print "</tr>\n";
 
             // Multicompany
@@ -1507,7 +1507,7 @@ 
                 // This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
                 if (!method_exists($mc, 'formObjectOptions')) {
                     if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
-                        print '<tr><td>' . $langs->trans("Entity") . '</td><td>';
+                        print '<tr><td>'.$langs->trans("Entity").'</td><td>';
                         if (empty($object->entity)) {
                             print $langs->trans("AllEntities");
                         } else {
@@ -1520,11 +1520,11 @@ 
             }
 
             // Other attributes
-            include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
             // Company / Contact
             if (!empty($conf->societe->enabled)) {
-                print '<tr><td>' . $langs->trans("LinkToCompanyContact") . '</td>';
+                print '<tr><td>'.$langs->trans("LinkToCompanyContact").'</td>';
                 print '<td>';
                 if (isset($object->socid) && $object->socid > 0) {
                     $societe = new Societe($db);
@@ -1541,16 +1541,16 @@ 
                     } else {
                         print '<br>';
                     }
-                    print '<a href="' . BASE_URI . '?controller=contact&method=card&id=' . $object->contactid . '">' . img_object($langs->trans("ShowContact"), 'contact') . ' ' . dol_trunc($contact->getFullName($langs), 32) . '</a>';
+                    print '<a href="'.BASE_URI.'?controller=contact&method=card&id='.$object->contactid.'">'.img_object($langs->trans("ShowContact"), 'contact').' '.dol_trunc($contact->getFullName($langs), 32).'</a>';
                 }
                 print '</td>';
-                print '</tr>' . "\n";
+                print '</tr>'."\n";
             }
 
             // Module Adherent
             if (!empty($conf->adherent->enabled)) {
                 $langs->load("members");
-                print '<tr><td>' . $langs->trans("LinkedToDolibarrMember") . '</td>';
+                print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
                 print '<td>';
                 if ($object->fk_member) {
                     $adh = new Adherent($db);
@@ -1561,11 +1561,11 @@ 
                     print $langs->trans("UserNotLinkedToMember");
                 }
                 print '</td>';
-                print '</tr>' . "\n";
+                print '</tr>'."\n";
             }
 
             // Signature
-            print '<tr><td class="tdtop">' . $langs->trans('Signature') . '</td><td>';
+            print '<tr><td class="tdtop">'.$langs->trans('Signature').'</td><td>';
             print dol_htmlentitiesbr($object->signature);
             print "</td></tr>\n";
 
@@ -1586,49 +1586,49 @@ 
             print '<div class="tabsAction">';
 
             $parameters = array();
-            $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+            $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             if (empty($reshook)) {
                 if (!empty($object->email)) {
                     $langs->load("mails");
                     // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init#presend">' . $langs->trans('SendMail') . '</a></div>';
-                    print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=user&method=card&id=' . $object->id . '&amp;action=presend&amp;mode=init#presend">' . $langs->trans('SendMail') . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=user&method=card&id='.$object->id.'&amp;action=presend&amp;mode=init#presend">'.$langs->trans('SendMail').'</a></div>';
                 } else {
                     $langs->load("mails");
-                    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("NoEMail")) . '">' . $langs->trans('SendMail') . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
                 }
 
                 if ($caneditfield && (empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
                     if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")) . '">' . $langs->trans("Modify") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
                     } else {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=edit">' . $langs->trans("Modify") . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=user&method=card&id=' . $object->id . '&amp;action=edit">' . $langs->trans("Modify") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=user&method=card&id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
                     }
                 } elseif ($caneditpassword && !$object->ldap_sid &&
                     (empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
                     // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=edit">' . $langs->trans("EditPassword") . '</a></div>';
-                    print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=user&method=card&id=' . $object->id . '&amp;action=edit">' . $langs->trans("EditPassword") . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=user&method=card&id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a></div>';
                 }
 
                 // Si on a un gestionnaire de generation de mot de passe actif
                 if ($conf->global->USER_PASSWORD_GENERATED != 'none') {
                     if ($object->statut == 0) {
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("UserDisabled")) . '">' . $langs->trans("ReinitPassword") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
                     } elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
                         ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=password">' . $langs->trans("ReinitPassword") . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=user&method=card&id=' . $object->id . '&amp;action=password">' . $langs->trans("ReinitPassword") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=user&method=card&id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a></div>';
                     }
 
                     if ($object->statut == 0) {
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("UserDisabled")) . '">' . $langs->trans("SendNewPassword") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
                     } else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
                         ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
                         if ($object->email) {
                             // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=passwordsend">' . $langs->trans("SendNewPassword") . '</a></div>';
-                            print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=user&method=card&id=' . $object->id . '&amp;action=passwordsend">' . $langs->trans("SendNewPassword") . '</a></div>';
+                            print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=user&method=card&id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
                         } else {
-                            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("NoEMail")) . '">' . $langs->trans("SendNewPassword") . '</a></div>';
+                            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a></div>';
                         }
                     }
                 }
@@ -1637,22 +1637,22 @@ 
                 if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
                     ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
                     // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=enable">' . $langs->trans("Reactivate") . '</a></div>';
-                    print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=user&method=card&id=' . $object->id . '&amp;action=enable">' . $langs->trans("Reactivate") . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=user&method=card&id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a></div>';
                 }
                 // Desactiver
                 if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
                     ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
                     // print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?action=disable&amp;id=' . $object->id . '">' . $langs->trans("DisableUser") . '</a></div>';
-                    print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . BASE_URI . '?controller=user&method=card&action=disable&amp;id=' . $object->id . '">' . $langs->trans("DisableUser") . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.BASE_URI.'?controller=user&method=card&action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
                 }
                 // Delete
                 if ($user->id <> $id && $candisableuser &&
                     ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
                     if ($user->admin || !$object->admin) { // If user edited is admin, delete is possible on for an admin
                         // print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?action=delete&amp;id=' . $object->id . '">' . $langs->trans("DeleteUser") . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . BASE_URI . '?controller=user&method=card&action=delete&amp;id=' . $object->id . '">' . $langs->trans("DeleteUser") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.BASE_URI.'?controller=user&method=card&action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
                     } else {
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")) . '">' . $langs->trans("DeleteUser") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
                     }
                 }
             }
@@ -1670,9 +1670,9 @@ 
             $modelmail = 'user';
             $defaulttopic = 'Information';
             $diroutput = $conf->user->dir_output;
-            $trackid = 'use' . $object->id;
+            $trackid = 'use'.$object->id;
 
-            include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php';
+            include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 
             if ($action != 'presend' && $action != 'send') {
                 /*
@@ -1696,28 +1696,28 @@ 
 
                     if ($caneditgroup) {
                         // print '<form action="' . $_SERVER['PHP_SELF'] . '?id=' . $id . '" method="POST">' . "\n";
-                        print '<form href="' . BASE_URI . '?controller=user&method=card&id=' . $id . '" method="POST">' . "\n";
-                        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '" />';
+                        print '<form href="'.BASE_URI.'?controller=user&method=card&id='.$id.'" method="POST">'."\n";
+                        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
                         print '<input type="hidden" name="action" value="addgroup" />';
                     }
 
-                    print '<table class="noborder" width="100%">' . "\n";
+                    print '<table class="noborder" width="100%">'."\n";
 
                     // Other form for add user to group
                     $parameters = array('caneditgroup' => $caneditgroup, 'groupslist' => $groupslist, 'exclude' => $exclude);
-                    $reshook = $hookmanager->executeHooks('formAddUserToGroup', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+                    $reshook = $hookmanager->executeHooks('formAddUserToGroup', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
                     print $hookmanager->resPrint;
 
                     if (empty($reshook)) {
-                        print '<tr class="liste_titre"><th class="liste_titre">' . $langs->trans("Groups") . '</th>' . "\n";
+                        print '<tr class="liste_titre"><th class="liste_titre">'.$langs->trans("Groups").'</th>'."\n";
                         print '<th class="liste_titre" align="right">';
                         if ($caneditgroup) {
                             print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
                             print ' &nbsp; ';
-                            print '<input type="hidden" name="entity" value="' . $conf->entity . '" />';
-                            print '<input type="submit" class="button" value="' . $langs->trans("Add") . '" />';
+                            print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                            print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
                         }
-                        print '</th></tr>' . "\n";
+                        print '</th></tr>'."\n";
 
                         /*
                          * Groups assigned to user
@@ -1727,14 +1727,14 @@ 
                                 print '<tr class="oddeven">';
                                 print '<td>';
                                 if ($caneditgroup) {
-                                    print '<a href="' . BASE_URI . '?controller=user&method=card&id=' . $group->id . '">' . img_object($langs->trans("ShowGroup"), "group") . ' ' . $group->name . '</a>';
+                                    print '<a href="'.BASE_URI.'?controller=user&method=card&id='.$group->id.'">'.img_object($langs->trans("ShowGroup"), "group").' '.$group->name.'</a>';
                                 } else {
-                                    print img_object($langs->trans("ShowGroup"), "group") . ' ' . $group->name;
+                                    print img_object($langs->trans("ShowGroup"), "group").' '.$group->name;
                                 }
                                 print '</td>';
                                 print '<td align="right">';
                                 if ($caneditgroup) {
-                                    print '<a href="' . BASE_URI . '?controller=user&method=card&id=' . $object->id . '&amp;action=removegroup&amp;group=' . $group->id . '">';
+                                    print '<a href="'.BASE_URI.'?controller=user&method=card&id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
                                     print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
                                     print '</a>';
                                 } else {
@@ -1743,7 +1743,7 @@ 
                                 print "</td></tr>\n";
                             }
                         } else {
-                            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
+                            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
                         }
                     }
 
@@ -1762,10 +1762,10 @@ 
          */
         if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id))) {
             // print '<form action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '" method="POST" name="updateuser" enctype="multipart/form-data">';
-            print '<form href="' . BASE_URI . '?controller=user&method=card&id=' . $object->id . '" method="POST" name="updateuser" enctype="multipart/form-data">';
-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+            print '<form href="'.BASE_URI.'?controller=user&method=card&id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="entity" value="' . $object->entity . '">';
+            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
 
             dol_fiche_head($head, 'user', $title, 0, 'user');
 
@@ -1773,7 +1773,7 @@ 
 
             // Ref/ID
             if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
-                print '<tr><td class="titlefield">' . $langs->trans("Ref") . '</td>';
+                print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
                 print '<td>';
                 print $object->id;
                 print '</td>';
@@ -1782,87 +1782,87 @@ 
 
             // Lastname
             print "<tr>";
-            print '<td class="titlefield fieldrequired">' . $langs->trans("Lastname") . '</td>';
+            print '<td class="titlefield fieldrequired">'.$langs->trans("Lastname").'</td>';
             print '<td>';
             if ($caneditfield && !$object->ldap_sid) {
-                print '<input class="minwidth100" type="text" class="flat" name="lastname" value="' . $object->lastname . '">';
+                print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
             } else {
-                print '<input type="hidden" name="lastname" value="' . $object->lastname . '">';
+                print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
                 print $object->lastname;
             }
             print '</td>';
             print '</tr>';
 
             // Firstname
-            print "<tr>" . '<td>' . $langs->trans("Firstname") . '</td>';
+            print "<tr>".'<td>'.$langs->trans("Firstname").'</td>';
             print '<td>';
             if ($caneditfield && !$object->ldap_sid) {
-                print '<input class="minwidth100" type="text" class="flat" name="firstname" value="' . $object->firstname . '">';
+                print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
             } else {
-                print '<input type="hidden" name="firstname" value="' . $object->firstname . '">';
+                print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
                 print $object->firstname;
             }
             print '</td></tr>';
 
             // Login
-            print "<tr>" . '<td><span class="fieldrequired">' . $langs->trans("Login") . '</span></td>';
+            print "<tr>".'<td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
             print '<td>';
             if ($user->admin && !$object->ldap_sid) {
-                print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="' . $object->login . '">';
+                print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
             } else {
-                print '<input type="hidden" name="login" value="' . $object->login . '">';
+                print '<input type="hidden" name="login" value="'.$object->login.'">';
                 print $object->login;
             }
             print '</td>';
             print '</tr>';
 
             // Pass
-            print '<tr><td>' . $langs->trans("Password") . '</td>';
+            print '<tr><td>'.$langs->trans("Password").'</td>';
             print '<td>';
             $valuetoshow = '';
             if (preg_match('/ldap/', $dolibarr_main_authentication)) {
-                $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . $langs->trans("PasswordOfUserInLDAP");
+                $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
             }
             if (preg_match('/http/', $dolibarr_main_authentication)) {
-                $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . $form->textwithpicto($text, $langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless", $dolibarr_main_authentication), 1, 'warning');
+                $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$form->textwithpicto($text, $langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless", $dolibarr_main_authentication), 1, 'warning');
             }
             if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
                 if ($caneditpassword) {
-                    $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . '<input size="12" maxlength="32" type="password" class="flat" name="password" value="' . $object->pass . '" autocomplete="new-password">';
+                    $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="new-password">';
                 } else {
-                    $valuetoshow .= ($valuetoshow ? (' ' . $langs->trans("or") . ' ') : '') . preg_replace('/./i', '*', $object->pass);
+                    $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
                 }
             }
 
             // Other form for user password
             $parameters = array('valuetoshow' => $valuetoshow, 'caneditpassword' => $caneditpassword);
-            $reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+            $reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             if ($reshook > 0) {
                 $valuetoshow = $hookmanager->resPrint; // to replace
             } else {
-                $valuetoshow .= $hookmanager->resPrint;    // to add
+                $valuetoshow .= $hookmanager->resPrint; // to add
             }
             print $valuetoshow;
             print "</td></tr>\n";
 
             // API key
             if (!empty($conf->api->enabled) && $user->admin) {
-                print '<tr><td>' . $langs->trans("ApiKey") . '</td>';
+                print '<tr><td>'.$langs->trans("ApiKey").'</td>';
                 print '<td>';
-                print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="' . $object->api_key . '" autocomplete="off">';
+                print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
                 if (!empty($conf->use_javascript_ajax)) {
-                    print '&nbsp;' . img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
+                    print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
                 }
                 print '</td></tr>';
             }
 
             // Administrator
-            print '<tr><td>' . $langs->trans("Administrator") . '</td>';
+            print '<tr><td>'.$langs->trans("Administrator").'</td>';
             if ($object->socid > 0) {
                 $langs->load("admin");
                 print '<td>';
-                print '<input type="hidden" name="admin" value="' . $object->admin . '">' . yn($object->admin);
-                print ' (' . $langs->trans("ExternalUser") . ')';
+                print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
+                print ' ('.$langs->trans("ExternalUser").')';
                 print '</td></tr>';
             } else {
                 print '<td>';
@@ -1918,12 +1918,12 @@ 
                         }
 
                         $checked = (($object->admin && !$object->entity) ? ' checked' : '');
-                        print '<input type="checkbox" name="superadmin" value="1"' . $checked . ' /> ' . $langs->trans("SuperAdministrator");
+                        print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
                     }
                 } else {
                     $yn = yn($object->admin);
-                    print '<input type="hidden" name="admin" value="' . $object->admin . '">';
-                    print '<input type="hidden" name="superadmin" value="' . (empty($object->entity) ? 1 : 0) . '">';
+                    print '<input type="hidden" name="admin" value="'.$object->admin.'">';
+                    print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
                     if (!empty($conf->multicompany->enabled) && empty($object->entity)) {
                         print $form->textwithpicto($yn, $langs->trans("DontDowngradeSuperAdmin"), 1, 'warning');
                     } else {
@@ -1934,7 +1934,7 @@ 
             }
 
             // Type
-            print '<tr><td>' . $langs->trans("Type") . '</td>';
+            print '<tr><td>'.$langs->trans("Type").'</td>';
             print '<td>';
             if ($user->id == $object->id || !$user->admin) {
                 $type = $langs->trans("Internal");
@@ -1943,7 +1943,7 @@ 
                 }
                 print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
                 if ($object->ldap_sid) {
-                    print ' (' . $langs->trans("DomainUser") . ')';
+                    print ' ('.$langs->trans("DomainUser").')';
                 }
             } else {
                 $type = 0;
@@ -1952,13 +1952,13 @@ 
                 }
                 print $form->selectcontacts(0, $type, 'contactid', 2, '', '', 1, '', false, 1);
                 if ($object->ldap_sid) {
-                    print ' (' . $langs->trans("DomainUser") . ')';
+                    print ' ('.$langs->trans("DomainUser").')';
                 }
             }
             print '</td></tr>';
 
             // Gender
-            print '<tr><td>' . $langs->trans("Gender") . '</td>';
+            print '<tr><td>'.$langs->trans("Gender").'</td>';
             print '<td>';
             $arraygender = array('man' => $langs->trans("Genderman"), 'woman' => $langs->trans("Genderwoman"));
             print $form->selectarray('gender', $arraygender, GETPOST('gender') ? GETPOST('gender') : $object->gender, 1);
@@ -1966,7 +1966,7 @@ 
 
             // Employee
             print '<tr>';
-            print '<td>' . $form->editfieldkey('Employee', 'employee', '', $object, 0) . '</td><td>';
+            print '<td>'.$form->editfieldkey('Employee', 'employee', '', $object, 0).'</td><td>';
             if ($caneditfield) {
                 print $form->selectyesno("employee", $object->employee, 1);
             } else {
@@ -1979,12 +1979,12 @@ 
             print '</td></tr>';
 
             // Hierarchy
-            print '<tr><td class="titlefield">' . $langs->trans("HierarchicalResponsible") . '</td>';
+            print '<tr><td class="titlefield">'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
             if ($caneditfield) {
                 print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
             } else {
-                print '<input type="hidden" name="fk_user" value="' . $object->fk_user . '">';
+                print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
                 $huser = new User($db);
                 $huser->fetch($object->fk_user);
                 print $huser->getNomUrl(1);
@@ -1997,23 +1997,23 @@ 
 
 
             // Address
-            print '<tr><td class="tdtop titlefield">' . $form->editfieldkey('Address', 'address', '', $object, 0) . '</td>';
+            print '<tr><td class="tdtop titlefield">'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
             print '<td><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
             print $object->address;
             print '</textarea></td></tr>';
 
             // Zip
-            print '<tr><td>' . $form->editfieldkey('Zip', 'zipcode', '', $object, 0) . '</td><td>';
+            print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
             print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
             print '</td></tr>';
 
             // Town
-            print '<tr><td>' . $form->editfieldkey('Town', 'town', '', $object, 0) . '</td><td>';
+            print '<tr><td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
             print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
             print '</td></tr>';
 
             // Country
-            print '<tr><td>' . $form->editfieldkey('Country', 'selectcounty_id', '', $object, 0) . '</td><td>';
+            print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td>';
             print $form->select_country((GETPOST('country_id') != '' ? GETPOST('country_id') : $object->country_id), 'country_id');
             if ($user->admin) {
                 print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -2022,52 +2022,52 @@ 
 
             // State
             if (empty($conf->global->USER_DISABLE_STATE)) {
-                print '<tr><td class="tdoverflow">' . $form->editfieldkey('State', 'state_id', '', $object, 0) . '</td><td>';
+                print '<tr><td class="tdoverflow">'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td>';
                 print $formcompany->select_state($object->state_id, $object->country_code, 'state_id');
                 print '</td></tr>';
             }
 
             // Tel pro
-            print "<tr>" . '<td>' . $langs->trans("PhonePro") . '</td>';
+            print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
             print '<td>';
             if ($caneditfield && empty($object->ldap_sid)) {
-                print '<input size="20" type="text" name="office_phone" class="flat" value="' . $object->office_phone . '">';
+                print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
             } else {
-                print '<input type="hidden" name="office_phone" value="' . $object->office_phone . '">';
+                print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
                 print $object->office_phone;
             }
             print '</td></tr>';
 
             // Tel mobile
-            print "<tr>" . '<td>' . $langs->trans("PhoneMobile") . '</td>';
+            print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
             print '<td>';
             if ($caneditfield && empty($object->ldap_sid)) {
-                print '<input size="20" type="text" name="user_mobile" class="flat" value="' . $object->user_mobile . '">';
+                print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
             } else {
-                print '<input type="hidden" name="user_mobile" value="' . $object->user_mobile . '">';
+                print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
                 print $object->user_mobile;
             }
             print '</td></tr>';
 
             // Fax
-            print "<tr>" . '<td>' . $langs->trans("Fax") . '</td>';
+            print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
             print '<td>';
             if ($caneditfield && empty($object->ldap_sid)) {
-                print '<input size="20" type="text" name="office_fax" class="flat" value="' . $object->office_fax . '">';
+                print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
             } else {
-                print '<input type="hidden" name="office_fax" value="' . $object->office_fax . '">';
+                print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
                 print $object->office_fax;
             }
             print '</td></tr>';
 
             // Skype
             if (!empty($conf->socialnetworks->enabled)) {
-                print '<tr><td>' . $langs->trans("Skype") . '</td>';
+                print '<tr><td>'.$langs->trans("Skype").'</td>';
                 print '<td>';
                 if ($caneditfield && empty($object->ldap_sid)) {
-                    print '<input size="40" type="text" name="skype" class="flat" value="' . $object->skype . '">';
+                    print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
                 } else {
-                    print '<input type="hidden" name="skype" value="' . $object->skype . '">';
+                    print '<input type="hidden" name="skype" value="'.$object->skype.'">';
                     print $object->skype;
                 }
                 print '</td></tr>';
@@ -2075,12 +2075,12 @@ 
 
             // Twitter
             if (!empty($conf->socialnetworks->enabled)) {
-                print '<tr><td>' . $langs->trans("Twitter") . '</td>';
+                print '<tr><td>'.$langs->trans("Twitter").'</td>';
                 print '<td>';
                 if ($caneditfield && empty($object->ldap_sid)) {
-                    print '<input size="40" type="text" name="twitter" class="flat" value="' . $object->twitter . '">';
+                    print '<input size="40" type="text" name="twitter" class="flat" value="'.$object->twitter.'">';
                 } else {
-                    print '<input type="hidden" name="twitter" value="' . $object->twitter . '">';
+                    print '<input type="hidden" name="twitter" value="'.$object->twitter.'">';
                     print $object->twitter;
                 }
                 print '</td></tr>';
@@ -2088,36 +2088,36 @@ 
 
             // Skype
             if (!empty($conf->socialnetworks->enabled)) {
-                print '<tr><td>' . $langs->trans("Facebook") . '</td>';
+                print '<tr><td>'.$langs->trans("Facebook").'</td>';
                 print '<td>';
                 if ($caneditfield && empty($object->ldap_sid)) {
-                    print '<input size="40" type="text" name="facebook" class="flat" value="' . $object->facebook . '">';
+                    print '<input size="40" type="text" name="facebook" class="flat" value="'.$object->facebook.'">';
                 } else {
-                    print '<input type="hidden" name="facebook" value="' . $object->facebook . '">';
+                    print '<input type="hidden" name="facebook" value="'.$object->facebook.'">';
                     print $object->facebook;
                 }
                 print '</td></tr>';
             }
 
             // EMail
-            print "<tr>" . '<td' . (!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '') . '>' . $langs->trans("EMail") . '</td>';
+            print "<tr>".'<td'.(!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").'</td>';
             print '<td>';
             if ($caneditfield && empty($object->ldap_sid)) {
-                print '<input class="minwidth100" type="text" name="email" class="flat" value="' . $object->email . '">';
+                print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
             } else {
-                print '<input type="hidden" name="email" value="' . $object->email . '">';
+                print '<input type="hidden" name="email" value="'.$object->email.'">';
                 print $object->email;
             }
             print '</td></tr>';
 
             // OpenID url
             if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication) && !empty($conf->global->MAIN_OPENIDURL_PERUSER)) {
-                print "<tr>" . '<td>' . $langs->trans("OpenIDURL") . '</td>';
+                print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
                 print '<td>';
                 if ($caneditfield) {
-                    print '<input class="minwidth100" type="url" name="openid" class="flat" value="' . $object->openid . '">';
+                    print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
                 } else {
-                    print '<input type="hidden" name="openid" value="' . $object->openid . '">';
+                    print '<input type="hidden" name="openid" value="'.$object->openid.'">';
                     print $object->openid;
                 }
                 print '</td></tr>';
@@ -2128,12 +2128,12 @@ 
             // Accountancy code
             if ($conf->accounting->enabled) {
                 print "<tr>";
-                print '<td>' . $langs->trans("AccountancyCode") . '</td>';
+                print '<td>'.$langs->trans("AccountancyCode").'</td>';
                 print '<td>';
                 if ($caneditfield) {
-                    print '<input size="30" type="text" class="flat" name="accountancy_code" value="' . $object->accountancy_code . '">';
+                    print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
                 } else {
-                    print '<input type="hidden" name="accountancy_code" value="' . $object->accountancy_code . '">';
+                    print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
                     print $object->accountancy_code;
                 }
                 print '</td>';
@@ -2142,7 +2142,7 @@ 
 
             // User color
             if (!empty($conf->agenda->enabled)) {
-                print '<tr><td>' . $langs->trans("ColorUser") . '</td>';
+                print '<tr><td>'.$langs->trans("ColorUser").'</td>';
                 print '<td>';
                 if ($caneditfield) {
                     print $formother->selectColor(GETPOST('color') ? GETPOST('color') : $object->color, 'color', null, 1, '', 'hideifnotset');
@@ -2154,7 +2154,7 @@ 
 
             // Photo
             print '<tr>';
-            print '<td>' . $langs->trans("Photo") . '</td>';
+            print '<td>'.$langs->trans("Photo").'</td>';
             print '<td>';
             print $form->showphoto('userphoto', $object, 60, 0, $caneditfield, 'photowithmargin', 'small');
             print '</td>';
@@ -2162,7 +2162,7 @@ 
 
             // Categories
             if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
-                print '<tr><td>' . $form->editfieldkey('Categories', 'usercats', '', $object, 0) . '</td>';
+                print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td>';
                 print '<td>';
                 $cate_arbo = $form->select_all_categories(Categorie::TYPE_USER, null, null, null, null, 1);
                 $c = new Categorie($db);
@@ -2179,14 +2179,14 @@ 
             }
 
             // Status
-            print '<tr><td>' . $langs->trans("Status") . '</td>';
+            print '<tr><td>'.$langs->trans("Status").'</td>';
             print '<td>';
             print $object->getLibStatut(4);
             print '</td></tr>';
 
             // Company / Contact
             if (!empty($conf->societe->enabled)) {
-                print '<tr><td width="25%">' . $langs->trans("LinkToCompanyContact") . '</td>';
+                print '<tr><td width="25%">'.$langs->trans("LinkToCompanyContact").'</td>';
                 print '<td>';
                 if ($object->socid > 0) {
                     $societe = new Societe($db);
@@ -2195,12 +2195,12 @@ 
                     if ($object->contactid) {
                         $contact = new Contact($db);
                         $contact->fetch($object->contactid);
-                        print ' / <a href="' . BASE_URI . '?controller=contact&method=card&id=' . $object->contactid . '">' . img_object($langs->trans("ShowContact"), 'contact') . ' ' . dol_trunc($contact->getFullName($langs), 32) . '</a>';
+                        print ' / <a href="'.BASE_URI.'?controller=contact&method=card&id='.$object->contactid.'">'.img_object($langs->trans("ShowContact"), 'contact').' '.dol_trunc($contact->getFullName($langs), 32).'</a>';
                     }
                 } else {
                     print $langs->trans("ThisUserIsNot");
                 }
-                print ' (' . $langs->trans("UseTypeFieldToChange") . ')';
+                print ' ('.$langs->trans("UseTypeFieldToChange").')';
                 print '</td>';
                 print "</tr>\n";
             }
@@ -2208,7 +2208,7 @@ 
             // Module Adherent
             if (!empty($conf->adherent->enabled)) {
                 $langs->load("members");
-                print '<tr><td width="25%">' . $langs->trans("LinkedToDolibarrMember") . '</td>';
+                print '<tr><td width="25%">'.$langs->trans("LinkedToDolibarrMember").'</td>';
                 print '<td>';
                 if ($object->fk_member) {
                     $adh = new Adherent($db);
@@ -2228,18 +2228,18 @@ 
                 // This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
                 if (!method_exists($mc, 'formObjectOptions')) {
                     if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && !$user->entity) {
-                        print "<tr>" . '<td>' . $langs->trans("Entity") . '</td>';
-                        print "<td>" . $mc->select_entities($object->entity, 'entity', '', 0, 1);  // last parameter 1 means, show also a choice 0=>'all entities'
+                        print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
+                        print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1); // last parameter 1 means, show also a choice 0=>'all entities'
                         print "</td></tr>\n";
                     } else {
-                        print '<input type="hidden" name="entity" value="' . $conf->entity . '" />';
+                        print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
                     }
                 }
             }
 
             // Other attributes
             $parameters = array('colspan' => ' colspan="2"');
-            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
             if (empty($reshook)) {
                 if ($caneditfield) {
@@ -2250,10 +2250,10 @@ 
             }
 
             // Signature
-            print "<tr>" . '<td class="tdtop">' . $langs->trans("Signature") . '</td>';
+            print "<tr>".'<td class="tdtop">'.$langs->trans("Signature").'</td>';
             print '<td>';
             if ($caneditfield) {
-                require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
                 $doleditor = new DolEditor('signature', $object->signature, '', 138, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
                 print $doleditor->Create(1);
             } else {
@@ -2267,12 +2267,12 @@ 
 
             // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
             // Position/Job
-            print '<tr><td class="titlefield">' . $langs->trans("PostOrFunction") . '</td>';
+            print '<tr><td class="titlefield">'.$langs->trans("PostOrFunction").'</td>';
             print '<td>';
             if ($caneditfield) {
-                print '<input size="30" type="text" name="job" value="' . $object->job . '">';
+                print '<input size="30" type="text" name="job" value="'.$object->job.'">';
             } else {
-                print '<input type="hidden" name="job" value="' . $object->job . '">';
+                print '<input type="hidden" name="job" value="'.$object->job.'">';
                 print $object->job;
             }
             print '</td></tr>';
@@ -2287,7 +2287,7 @@ 
                 print '</td>';
                 print '<td>';
                 if ($caneditfield) {
-                    print '<input size="8" type="text" name="thm" value="' . price2num(GETPOST('thm') ? GETPOST('thm') : $object->thm) . '">';
+                    print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm') ? GETPOST('thm') : $object->thm).'">';
                 } else {
                     print ($object->thm != '' ? price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
                 }
@@ -2301,7 +2301,7 @@ 
                 print '</td>';
                 print '<td>';
                 if ($caneditfield) {
-                    print '<input size="8" type="text" name="tjm" value="' . price2num(GETPOST('tjm') ? GETPOST('tjm') : $object->tjm) . '">';
+                    print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm') ? GETPOST('tjm') : $object->tjm).'">';
                 } else {
                     print ($object->tjm != '' ? price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
                 }
@@ -2309,18 +2309,18 @@ 
                 print "</tr>\n";
 
                 // Salary
-                print '<tr><td>' . $langs->trans("Salary") . '</td>';
+                print '<tr><td>'.$langs->trans("Salary").'</td>';
                 print '<td>';
-                print '<input size="8" type="text" name="salary" value="' . price2num(GETPOST('salary') ? GETPOST('salary') : $object->salary) . '">';
+                print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary') ? GETPOST('salary') : $object->salary).'">';
                 print '</td>';
                 print "</tr>\n";
             }
 
             // Weeklyhours
-            print '<tr><td>' . $langs->trans("WeeklyHours") . '</td>';
+            print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
             print '<td>';
             if ($caneditfield) {
-                print '<input size="8" type="text" name="weeklyhours" value="' . price2num(GETPOST('weeklyhours') ? GETPOST('weeklyhours') : $object->weeklyhours) . '">';
+                print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours') ? GETPOST('weeklyhours') : $object->weeklyhours).'">';
             } else {
                 print price2num($object->weeklyhours);
             }
@@ -2328,7 +2328,7 @@ 
             print "</tr>\n";
 
             // Date employment
-            print '<tr><td>' . $langs->trans("DateEmployment") . '</td>';
+            print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
             print '<td>';
             if ($caneditfield) {
                 print $form->selectDate(GETPOST('dateemployment') ? GETPOST('dateemployment') : $object->dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 0);
@@ -2339,7 +2339,7 @@ 
             print "</tr>\n";
 
             // Date employmentEnd
-            print '<tr><td>' . $langs->trans("DateEmploymentEnd") . '</td>';
+            print '<tr><td>'.$langs->trans("DateEmploymentEnd").'</td>';
             print '<td>';
             if ($caneditfield) {
                 print $form->selectDate(GETPOST('dateemploymentend') ? GETPOST('dateemploymentend') : $object->dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0);
@@ -2351,7 +2351,7 @@ 
 
 
             // Date birth
-            print '<tr><td>' . $langs->trans("DateToBirth") . '</td>';
+            print '<tr><td>'.$langs->trans("DateToBirth").'</td>';
             print '<td>';
             if ($caneditfield) {
                 echo $form->selectDate(GETPOST('birth') ? GETPOST('birth') : $object->birth, 'birth', 0, 0, 1, 'updateuser', 1, 0);
@@ -2366,9 +2366,9 @@ 
             dol_fiche_end();
 
             print '<div align="center">';
-            print '<input value="' . $langs->trans("Save") . '" class="button" type="submit" name="save">';
+            print '<input value="'.$langs->trans("Save").'" class="button" type="submit" name="save">';
             print '&nbsp; &nbsp; &nbsp;';
-            print '<input value="' . $langs->trans("Cancel") . '" class="button" type="submit" name="cancel">';
+            print '<input value="'.$langs->trans("Cancel").'" class="button" type="submit" name="cancel">';
             print '</div>';
 
             print '</form>';
@@ -2380,8 +2380,8 @@ 
              * Documents generes
              */
             $filename = dol_sanitizeFileName($object->ref);
-            $filedir = $conf->user->dir_output . "/" . dol_sanitizeFileName($object->ref);
-            $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+            $filedir = $conf->user->dir_output."/".dol_sanitizeFileName($object->ref);
+            $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
             $genallowed = $user->rights->user->user->lire;
             $delallowed = $user->rights->user->user->creer;
 
@@ -2395,7 +2395,7 @@ 
             print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
             // List of actions on element
-            include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
             $formactions = new FormActions($db);
             $somethingshown = $formactions->showactions($object, 'user', $socid, 1);
 
@@ -2410,10 +2410,10 @@ 
 }
 
 if (!empty($conf->api->enabled) && !empty($conf->use_javascript_ajax)) {
-    print "\n" . '<script type="text/javascript">';
+    print "\n".'<script type="text/javascript">';
     print '$(document).ready(function () {
             $("#generate_api_key").click(function() {
-                $.get( "' . BASE_URI . '?controller=core/ajax&method=security", {
+                $.get( "' . BASE_URI.'?controller=core/ajax&method=security", {
                     action: \'getrandompassword\',
                     generic: true
                 },

dolibarr/htdocs/user/perms.php

Spacing +41 added lines, -41 removed lines

@@ -26,11 +26,11 @@ 
  *       \file       htdocs/user/perms.php
  *       \brief      Onglet user et permissions de la fiche utilisateur
  */
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 // Load translation files required by page
 $langs->loadLangs(array('users', 'admin'));
@@ -40,7 +40,7 @@ 
 $confirm = GETPOST('confirm', 'alpha');
 $module = GETPOST('module', 'alpha');
 $rights = GETPOST('rights', 'int');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userperms';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userperms'; // To manage different context of search
 
 if (!isset($id) || empty($id)) {
     accessforbidden();
@@ -87,7 +87,7 @@ 
  * Actions
  */
 $parameters = array('id' => $socid);
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -144,11 +144,11 @@ 
     $handle = @opendir(dol_osencode($dir));
     if (is_resource($handle)) {
         while (($file = readdir($handle)) !== false) {
-            if (is_readable($dir . $file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
+            if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
                 $modName = substr($file, 0, dol_strlen($file) - 10);
 
                 if ($modName) {
-                    include_once $dir . $file;
+                    include_once $dir.$file;
                     $objMod = new $modName($db);
 
                     // Load all lang files of module
@@ -175,9 +175,9 @@ 
 $permsuser = array();
 
 $sql = "SELECT DISTINCT ur.fk_id";
-$sql .= " FROM " . MAIN_DB_PREFIX . "user_rights as ur";
-$sql .= " WHERE ur.entity = " . $entity;
-$sql .= " AND ur.fk_user = " . $object->id;
+$sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur";
+$sql .= " WHERE ur.entity = ".$entity;
+$sql .= " AND ur.fk_user = ".$object->id;
 
 dol_syslog("get user perms", LOG_DEBUG);
 $result = $db->query($sql);
@@ -198,11 +198,11 @@ 
 $permsgroupbyentity = array();
 
 $sql = "SELECT DISTINCT gr.fk_id, gu.entity";
-$sql .= " FROM " . MAIN_DB_PREFIX . "usergroup_rights as gr,";
-$sql .= " " . MAIN_DB_PREFIX . "usergroup_user as gu";
-$sql .= " WHERE gr.entity = " . $entity;
+$sql .= " FROM ".MAIN_DB_PREFIX."usergroup_rights as gr,";
+$sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu";
+$sql .= " WHERE gr.entity = ".$entity;
 $sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
-$sql .= " AND gu.fk_user = " . $object->id;
+$sql .= " AND gu.fk_user = ".$object->id;
 
 dol_syslog("get user perms", LOG_DEBUG);
 $result = $db->query($sql);
@@ -230,7 +230,7 @@ 
 $linkback = '';
 
 if ($user->rights->user->user->lire || $user->admin) {
-    $linkback = '<a href="' . BASE_URI . '?controller=user&method=list&restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+    $linkback = '<a href="'.BASE_URI.'?controller=user&method=list&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 }
 
 dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
@@ -242,11 +242,11 @@ 
 }
 // Show warning about external users
 if (empty($user->societe_id)) {
-    print info_admin(showModulesExludedForExternal($modules)) . "\n";
+    print info_admin(showModulesExludedForExternal($modules))."\n";
 }
 
 $parameters = array('permsgroupbyentity' => $permsgroupbyentity);
-$reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -256,27 +256,27 @@ 
 print '<div class="div-table-responsive">';
 print '<table width="100%" class="noborder">';
 print '<tr class="liste_titre">';
-print '<td>' . $langs->trans("Module") . '</td>';
+print '<td>'.$langs->trans("Module").'</td>';
 if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin)) {
     if ($caneditperms) {
         print '<td align="center" class="nowrap">';
-        print '<a class="reposition" title="' . dol_escape_htmltag($langs->trans("All")) . '" alt="' . dol_escape_htmltag($langs->trans("All")) . '" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=addrights&amp;entity=' . $entity . '&amp;module=allmodules">' . $langs->trans("All") . "</a>";
+        print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("All")."</a>";
         print '/';
-        print '<a class="reposition" title="' . dol_escape_htmltag($langs->trans("None")) . '" alt="' . dol_escape_htmltag($langs->trans("None")) . '" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delrights&amp;entity=' . $entity . '&amp;module=allmodules">' . $langs->trans("None") . "</a>";
+        print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("None")."</a>";
         print '</td>';
     }
     print '<td align="center" width="24">&nbsp;</td>';
 }
-print '<td>' . $langs->trans("Permissions") . '</td>';
-print '</tr>' . "\n";
+print '<td>'.$langs->trans("Permissions").'</td>';
+print '</tr>'."\n";
 
 //print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS;
 $sql = "SELECT r.id, r.libelle, r.module";
-$sql .= " FROM " . MAIN_DB_PREFIX . "rights_def as r";
-$sql .= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-$sql .= " AND r.entity = " . $entity;
+$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
+$sql .= " AND r.entity = ".$entity;
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-    $sql .= " AND r.perms NOT LIKE '%_advance'";  // Hide advanced perms if option is disable
+    $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is disable
 }
 $sql .= " ORDER BY r.module, r.id";
 
@@ -303,14 +303,14 @@ 
 
             // Show break line
             print '<tr class="oddeven trforbreak">';
-            print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">' . img_object('', $picto, 'class="pictoobjectwidth"') . ' ' . $objMod->getName();
-            print '<a name="' . $objMod->getName() . '"></a></td>';
+            print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('', $picto, 'class="pictoobjectwidth"').' '.$objMod->getName();
+            print '<a name="'.$objMod->getName().'"></a></td>';
             if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin)) {
                 if ($caneditperms) {
                     print '<td align="center" class="nowrap">';
-                    print '<a class="reposition" title="' . dol_escape_htmltag($langs->trans("All")) . '" alt="' . dol_escape_htmltag($langs->trans("All")) . '" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=addrights&amp;entity=' . $entity . '&amp;module=' . $obj->module . '">' . $langs->trans("All") . "</a>";
+                    print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
                     print '/';
-                    print '<a class="reposition" title="' . dol_escape_htmltag($langs->trans("None")) . '" alt="' . dol_escape_htmltag($langs->trans("None")) . '" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delrights&amp;entity=' . $entity . '&amp;module=' . $obj->module . '">' . $langs->trans("None") . "</a>";
+                    print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("None")."</a>";
                     print '</td>';
                 }
             } else {
@@ -319,25 +319,25 @@ 
                 }
             }
             print '<td colspan="2">&nbsp;</td>';
-            print '</tr>' . "\n";
+            print '</tr>'."\n";
         }
 
         print '<tr class="oddeven">';
 
         // Picto and label of module
-        print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">' . img_object('', $picto, 'class="pictoobjectwidth"') . ' ' . $objMod->getName() . '</td>';
+        print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('', $picto, 'class="pictoobjectwidth"').' '.$objMod->getName().'</td>';
 
         // Permission and tick
         if (!empty($object->admin) && !empty($objMod->rights_admin_allowed)) {    // Permission granted because admin
             if ($caneditperms) {
-                print '<td align="center">' . img_picto($langs->trans("Administrator"), 'star') . '</td>';
+                print '<td align="center">'.img_picto($langs->trans("Administrator"), 'star').'</td>';
             }
             print '<td align="center" class="nowrap">';
             print img_picto($langs->trans("Active"), 'tick');
             print '</td>';
         } else if (in_array($obj->id, $permsuser)) {     // Permission granted by user
             if ($caneditperms) {
-                print '<td align="center"><a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delrights&amp;entity=' . $entity . '&amp;rights=' . $obj->id . '">' . img_edit_remove($langs->trans("Remove")) . '</a></td>';
+                print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
             }
             print '<td align="center" class="nowrap">';
             print img_picto($langs->trans("Active"), 'tick');
@@ -355,23 +355,23 @@ 
             } else {
                 // Do not own permission
                 if ($caneditperms) {
-                    print '<td align="center"><a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=addrights&amp;entity=' . $entity . '&amp;rights=' . $obj->id . '">' . img_edit_add($langs->trans("Add")) . '</a></td>';
+                    print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
                 }
                 print '<td>&nbsp</td>';
             }
         } else {
             // Do not own permission
             if ($caneditperms) {
-                print '<td align="center"><a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=addrights&amp;entity=' . $entity . '&amp;rights=' . $obj->id . '">' . img_edit_add($langs->trans("Add")) . '</a></td>';
+                print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
             }
             print '<td>&nbsp</td>';
         }
 
         // Label
-        $permlabel = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced" . $obj->id) != ("PermissionAdvanced" . $obj->id)) ? $langs->trans("PermissionAdvanced" . $obj->id) : (($langs->trans("Permission" . $obj->id) != ("Permission" . $obj->id)) ? $langs->trans("Permission" . $obj->id) : $langs->trans($obj->libelle)));
-        print '<td class="maxwidthonsmartphone">' . $permlabel . '</td>';
+        $permlabel = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->libelle)));
+        print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>';
 
-        print '</tr>' . "\n";
+        print '</tr>'."\n";
 
         $i++;
     }
@@ -382,7 +382,7 @@ 
 print '</div>';
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('insertExtraFooter', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('insertExtraFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }

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';

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT . "/margin/admin/margin.php";
+    $head[$h][0] = DOL_URL_ROOT."/margin/admin/margin.php";
     $head[$h][1] = $langs->trans("Parameters");
     $head[$h][2] = 'parameters';
     $h++;
@@ -65,14 +65,14 @@ 
     $head = array();
 
     if ($user->rights->produit->lire) {
-        $head[$h][0] = BASE_URI . '?controller=margin&method=productMargins';
+        $head[$h][0] = BASE_URI.'?controller=margin&method=productMargins';
         $head[$h][1] = $langs->trans("ProductMargins");
         $head[$h][2] = 'productMargins';
         $h++;
     }
 
     if ($user->rights->societe->lire) {
-        $head[$h][0] = BASE_URI . '?controller=margin&method=customerMargins';
+        $head[$h][0] = BASE_URI.'?controller=margin&method=customerMargins';
 		$head[$h][1] = $langs->trans("CustomerMargins");
 		$head[$h][2] = 'customerMargins';
 		$h++;
@@ -85,7 +85,7 @@ 
     }
 
     //$head[$h][0] = DOL_URL_ROOT."/margin/agentMargins.php";
-    $head[$h][0] = BASE_URI . '?controller=margin&method=agentMargins';
+    $head[$h][0] = BASE_URI.'?controller=margin&method=agentMargins';
     $head[$h][1] = $langs->trans($title);
     $head[$h][2] = 'agentMargins';
 
@@ -93,7 +93,7 @@ 
     if ($user->rights->margins->creer) {
         $h++;
         //$head[$h][0] = DOL_URL_ROOT."/margin/checkMargins.php";
-        $head[$h][0] = BASE_URI . '?controller=margin&method=checkMargins';
+        $head[$h][0] = BASE_URI.'?controller=margin&method=checkMargins';
         $head[$h][1] = $langs->trans('CheckMargins');
         $head[$h][2] = 'checkMargins';
     }
@@ -121,7 +121,7 @@ 
     $marque_tx_ret = '';
 
     if ($fk_pa > 0 && empty($paht)) {
-        require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
         $product = new ProductFournisseur($db);
         if ($product->fetch_product_fournisseur_price($fk_pa)) {
             $paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);

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;
 }
 
 

Spacing +61 added lines, -61 removed lines

@@ -32,7 +32,7 @@ 
  * 				This script reads the conf file, init $lang, $db and and empty $user
  */
 
-require_once 'filefunc.inc.php';	// May have been already require by main.inc.php. But may not by scripts.
+require_once 'filefunc.inc.php'; // May have been already require by main.inc.php. But may not by scripts.
 
 /*
  * Create $conf object
@@ -49,35 +49,35 @@ 
 $conf->db->user							= $dolibarr_main_db_user;
 $conf->db->pass							= $dolibarr_main_db_pass;
 $conf->db->type							= $dolibarr_main_db_type;
-$conf->db->prefix						= $dolibarr_main_db_prefix;
-$conf->db->character_set				= $dolibarr_main_db_character_set;
-$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)
+$conf->db->prefix = $dolibarr_main_db_prefix;
+$conf->db->character_set = $dolibarr_main_db_character_set;
+$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)
 
 // Set properties specific to conf file
-$conf->file->main_limit_users			= $dolibarr_main_limit_users;
+$conf->file->main_limit_users = $dolibarr_main_limit_users;
 $conf->file->mailing_limit_sendbyweb	= $dolibarr_mailing_limit_sendbyweb;
 $conf->file->mailing_limit_sendbycli	= $dolibarr_mailing_limit_sendbycli;
-$conf->file->main_authentication		= empty($dolibarr_main_authentication)?'':$dolibarr_main_authentication;	// Identification mode
-$conf->file->main_force_https			= empty($dolibarr_main_force_https)?'':$dolibarr_main_force_https;			// Force https
-$conf->file->strict_mode 				= empty($dolibarr_strict_mode)?'':$dolibarr_strict_mode;					// Force php strict mode (for debug)
-$conf->file->cookie_cryptkey			= empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey;	// Cookie cryptkey
-$conf->file->dol_document_root			= array('main' => (string) DOL_DOCUMENT_ROOT);								// Define array of document root directories ('/home/htdocs')
-$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))
+$conf->file->main_authentication = empty($dolibarr_main_authentication) ? '' : $dolibarr_main_authentication; // Identification mode
+$conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https
+$conf->file->strict_mode 				= empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)
+$conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey; // Cookie cryptkey
+$conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define array of document root directories ('/home/htdocs')
+$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;
+	$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)
+        $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))
+		if (preg_match('/^http(s)?:/', $value))
 		{
 			// Show error message
 			$correct_value = str_replace($dolibarr_main_url_root, '', $value);
@@ -93,46 +93,46 @@ 
 			print "\"/custom\"<br>\n";
 			exit;
 		}
-		$conf->file->dol_url_root['alt'.($i++)]=(string) $value;
+		$conf->file->dol_url_root['alt'.($i++)] = (string) $value;
 	}
 }
 
 // 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';
 
 
 /*
  * Creation objet $langs (must be before all other code)
  */
-if (! defined('NOREQUIRETRAN'))
+if (!defined('NOREQUIRETRAN'))
 {
-	$langs = new Translate('',$conf);	// Must be after reading conf
+	$langs = new Translate('', $conf); // Must be after reading conf
 }
 
 /*
  * Object $db
  */
-if (! defined('NOREQUIREDB'))
+if (!defined('NOREQUIREDB'))
 {
-    $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
+    $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);
+		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
 //unset($dolibarr_main_db_pass); 	// We comment this because this constant is used in a lot of pages
-unset($conf->db->pass);				// This is to avoid password to be shown in memory/swap dump
+unset($conf->db->pass); // This is to avoid password to be shown in memory/swap dump
 
 /*
  * Object $user
  */
-if (! defined('NOREQUIREUSER'))
+if (!defined('NOREQUIREUSER'))
 {
 	$user = new User($db);
 }
@@ -143,17 +143,17 @@ 
  */
 
 // 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');
+	$conf->entity = GETPOST("entity", 'int');
 }
 else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
 {
@@ -161,9 +161,9 @@ 
 }
 
 // Sanitize entity
-if (! is_numeric($conf->entity)) $conf->entity=1;
+if (!is_numeric($conf->entity)) $conf->entity = 1;
 
-if (! defined('NOREQUIREDB'))
+if (!defined('NOREQUIREDB'))
 {
 	//print "Will work with data into entity instance number '".$conf->entity."'";
 
@@ -172,7 +172,7 @@ 
 }
 
 // Overwrite database value
-if (! empty($conf->file->mailing_limit_sendbyweb))
+if (!empty($conf->file->mailing_limit_sendbyweb))
 {
 	$conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;
 }
@@ -180,7 +180,7 @@ 
 {
     $conf->global->MAILING_LIMIT_SENDBYWEB = 25;
 }
-if (! empty($conf->file->mailing_limit_sendbycli))
+if (!empty($conf->file->mailing_limit_sendbycli))
 {
     $conf->global->MAILING_LIMIT_SENDBYCLI = $conf->file->mailing_limit_sendbycli;
 }
@@ -190,27 +190,27 @@ 
 }
 
 // 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 (!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";
-            $nexturl = BASE_URI . '?controller=user&method=logout';
+            $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";
-            $nexturl = BASE_URI . '/';
+            $nexturl = BASE_URI.'/';
 			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
 		}
 		exit;
@@ -218,31 +218,31 @@ 
 }
 
 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
-if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
+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 = 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;
+	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'))
+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');
+    $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');
     $langs->setDefaultLang($langcode);
 }
 
 
 // Create the global $hookmanager object
 include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
+$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');
 

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];
 }

Spacing +85 added lines, -85 removed lines

@@ -40,26 +40,26 @@ 
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = BASE_URI . "?controller=product&method=card&id=" . $object->id;
+    $head[$h][0] = BASE_URI."?controller=product&method=card&id=".$object->id;
 	$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][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($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)
+    	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][0] = BASE_URI."?controller=product&method=fournisseurs&id=".$object->id;
     		$head[$h][1] = $langs->trans("BuyingPrices");
     		$head[$h][2] = 'suppliers';
     		$h++;
@@ -67,32 +67,32 @@ 
 	}
 
 	// Multilangs
-	if (! empty($conf->global->MAIN_MULTILANGS))
+	if (!empty($conf->global->MAIN_MULTILANGS))
 	{
-        $head[$h][0] = BASE_URI . "?controller=product&method=traduction&id=" . $object->id;
+        $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))
+	if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
 	{
-        $head[$h][0] = BASE_URI . "?controller=product/composition&method=card&id=" . $object->id;
+        $head[$h][0] = BASE_URI."?controller=product/composition&method=card&id=".$object->id;
 		$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++;
 	}
 
-    $head[$h][0] = BASE_URI . "?controller=product/stats&method=card&id=" . $object->id;
+    $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][0] = BASE_URI . "?controller=product/stats&method=facture&showmessage=1&id=" . $object->id;
+    $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++;
@@ -107,21 +107,21 @@ 
 
 		if ($prodcomb->fetchByFkProductChild($object->id) == -1)
 		{
-            $head[$h][0] = BASE_URI . "?controller=variants&method=combinations&id=" . $object->id;
+            $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);
-            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)
+        if (!empty($conf->stock->enabled) && $user->rights->stock->lire)
         {
-            $head[$h][0] = BASE_URI . "?controller=product/stock&method=product&id=" . $object->id;
+            $head[$h][0] = BASE_URI."?controller=product/stock&method=product&id=".$object->id;
             $head[$h][1] = $langs->trans("Stock");
             $head[$h][2] = 'stock';
             $h++;
@@ -132,17 +132,17 @@ 
     // 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,$object,$head,$h,'product');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'product');
 
     // Notes
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
         $nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-        if(!empty($object->note_public)) $nbNote++;
-        $head[$h][0] = BASE_URI . '?controller=product&method=note&id=' . $object->id;
+        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,30 +150,30 @@ 
     // 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);
-    $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';
-        $nbFiles += count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    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';
+        $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;
+    $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++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'product', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'remove');
 
     // Log
-    $head[$h][0] = BASE_URI . '?controller=product&method=agenda&id=' . $object->id;
+    $head[$h][0] = BASE_URI.'?controller=product&method=agenda&id='.$object->id;
     $head[$h][1] = $langs->trans("Events");
-    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+    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++;
@@ -192,12 +192,12 @@ 
     global $db, $langs, $conf, $user;
 
     // Load translation files required by the page
-    $langs->loadLangs(array("products","productbatch"));
+    $langs->loadLangs(array("products", "productbatch"));
 
     $h = 0;
     $head = array();
 
-    $head[$h][0] = BASE_URI . "?controller=product/stock&method=productlot_card&id=" . $object->id;
+    $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++;
@@ -206,11 +206,11 @@ 
 	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;
+    $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>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
     $head[$h][2] = 'documents';
 	$h++;
 
@@ -218,9 +218,9 @@ 
     // 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,$object,$head,$h,'productlot');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot');
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'productlot', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot', 'remove');
 
     // Log
     /*
@@ -247,15 +247,15 @@ 
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = BASE_URI . "?controller=product/admin&method=product";
+    $head[$h][0] = BASE_URI."?controller=product/admin&method=product";
 	$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))
+	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",
+            0 => BASE_URI."?controller=product/admin&method=price_rules",
 			1 => $langs->trans('MultipriceRules'),
 			2 => 'generator'
 		);
@@ -266,14 +266,14 @@ 
 	// 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][0] = BASE_URI.'?controller=product/admin&method=product_extrafields';
 	$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;
 }
@@ -296,14 +296,14 @@ 
     // 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_lot_admin');
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin');
 
-    $head[$h][0] = BASE_URI . '?controller=product/admin&method=product_lot_extrafields';
+    $head[$h][0] = BASE_URI.'?controller=product/admin&method=product_lot_extrafields';
     $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
-    complete_head_from_modules($conf,$langs,null,$head,$h,'product_lot_admin','remove');
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin', 'remove');
 
     return $head;
 }
@@ -317,9 +317,9 @@ 
  * @param 	int			$socid		Thirdparty id
  * @return	integer					NB of lines shown into array
  */
-function show_stats_for_company($product,$socid)
+function show_stats_for_company($product, $socid)
 {
-	global $conf,$langs,$user,$db;
+	global $conf, $langs, $user, $db;
 
 	$nblines = 0;
 
@@ -331,14 +331,14 @@ 
 	print '</tr>';
 
 	// Customer proposals
-	if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+	if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_propale($socid);
+		$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 '<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">';
@@ -349,14 +349,14 @@ 
 		print '</tr>';
 	}
 	// Supplier proposals
-	if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_proposal_supplier($socid);
+		$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 '<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">';
@@ -367,14 +367,14 @@ 
 		print '</tr>';
 	}
 	// Customer orders
-	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_commande($socid);
+		$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 '<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">';
@@ -385,14 +385,14 @@ 
 		print '</tr>';
 	}
 	// Supplier orders
-	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_commande_fournisseur($socid);
+		$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 '<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">';
@@ -403,14 +403,14 @@ 
 		print '</tr>';
 	}
 	// Customer invoices
-	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_facture($socid);
+		$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 '<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">';
@@ -421,14 +421,14 @@ 
 		print '</tr>';
 	}
 	// Supplier invoices
-	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
+	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_facture_fournisseur($socid);
+		$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 '<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">';
@@ -440,14 +440,14 @@ 
 	}
 
 	// Contracts
-	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_contrat($socid);
+		$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 '<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">';
@@ -470,11 +470,11 @@ 
  *	@return	string	   			         Unit string
  * 	@see	formproduct->load_measuring_units
  */
-function measuring_units_string($unit,$measuring_style='')
+function measuring_units_string($unit, $measuring_style = '')
 {
 	global $langs;
 
-	$measuring_units=array();
+	$measuring_units = array();
 	if ($measuring_style == 'weight')
 	{
 		$measuring_units[3] = $langs->transnoentitiesnoconv("WeightUnitton");
@@ -527,8 +527,8 @@ 
  */
 function measuring_units_squared($unit)
 {
-	$measuring_units=array();
-	$measuring_units[0] = 0;   // m -> m3
+	$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
@@ -547,8 +547,8 @@ 
  */
 function measuring_units_cubed($unit)
 {
-	$measuring_units=array();
-	$measuring_units[0] = 0;   // m -> m2
+	$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

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';
+    }
 }
 

Spacing +23 added lines, -23 removed lines

@@ -22,7 +22,7 @@ 
  *      \ingroup    margin
  *      \brief      Description and activation file for module Margin
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -50,7 +50,7 @@ 
 		$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));
+		$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
@@ -59,7 +59,7 @@ 
 		$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';
+		$this->picto = 'margin';
 
 		// Data directories to create when module is enabled.
 		$this->dirs = array('/margin/temp');
@@ -68,12 +68,12 @@ 
 		$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->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
@@ -81,7 +81,7 @@ 
 		// 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
+		$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(
@@ -91,36 +91,36 @@ 
 
 
 		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 		// Main menu entries
-		$this->menu = array();			// List of menus to add
+		$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
+		$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.
+    			'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
+    			'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
+    			'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 
 		// Permissions
 		$this->rights = array();
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 59001; // id de la permission

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();

Spacing +165 added lines, -165 removed lines

@@ -30,19 +30,19 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT . '/core/modules/dons/modules_don.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/donation.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/don/class/don.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-if (! empty($conf->projet->enabled)) {
+require DOL_BASE_PATH.'/main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+if (!empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -50,11 +50,11 @@ 
 
 $langs->loadLangs(array("bills", "companies", "donations"));
 
-$id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
-$action=GETPOST('action','alpha');
-$cancel=GETPOST('cancel','alpha');
-$amount=GETPOST('amount');
-$donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+$id = GETPOST('rowid') ?GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
+$amount = GETPOST('amount');
+$donation_date = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 $object = new Don($db);
@@ -64,10 +64,10 @@ 
 $result = restrictedArea($user, 'don', $id);
 
 // fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('doncard','globalcard'));
+$hookmanager->initHooks(array('doncard', 'globalcard'));
 
 /*
  * Actions
@@ -78,13 +78,13 @@ 
 
 if ($action == 'update')
 {
-	if (! empty($cancel))
+	if (!empty($cancel))
 	{
-        header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
+        header("Location: ".$_SERVER['PHP_SELF']."&id=".$id);
 		exit;
 	}
 
-	$error=0;
+	$error = 0;
 
     if (empty($donation_date))
     {
@@ -100,33 +100,33 @@ 
 		$error++;
 	}
 
-	if (! $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');
+		$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->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');
+		$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);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 		if ($ret < 0) $error++;
 
 		if ($object->update($user) > 0)
 		{
-            header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $object->id);
+            header("Location: ".$_SERVER['PHP_SELF']."&id=".$object->id);
 			exit;
 		}
 	}
@@ -134,13 +134,13 @@ 
 
 if ($action == 'add')
 {
-	if (! empty($cancel))
+	if (!empty($cancel))
 	{
 		header("Location: index.php");
 		exit;
 	}
 
-	$error=0;
+	$error = 0;
 
     if (empty($donation_date))
     {
@@ -156,32 +156,32 @@ 
 		$error++;
 	}
 
-	if (! $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');
+		$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->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');
+		$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);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 		if ($ret < 0) $error++;
 
 		$res = $object->create($user);
 		if ($res > 0)
 		{
-            header("Location: " . $_SERVER['PHP_SELF'] . '&id=' . $res);
+            header("Location: ".$_SERVER['PHP_SELF'].'&id='.$res);
 			exit;
 		}
 		else
@@ -193,7 +193,7 @@ 
 if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer)
 {
     $object->fetch($id);
-    $result=$object->delete($user);
+    $result = $object->delete($user);
     if ($result > 0)
     {
         header("Location: index.php");
@@ -201,7 +201,7 @@ 
     }
     else
     {
-        dol_syslog($object->error,LOG_DEBUG);
+        dol_syslog($object->error, LOG_DEBUG);
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -212,7 +212,7 @@ 
 	{
 		setEventMessages($langs->trans("DonationValidated", $object->ref), null);
 
-        header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
+        header("Location: ".$_SERVER['PHP_SELF']."&id=".$id);
 		exit;
 	}
     else {
@@ -224,7 +224,7 @@ 
 	$object->fetch($id);
 	if ($object->set_cancel($id) >= 0)
     {
-        header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
+        header("Location: ".$_SERVER['PHP_SELF']."&id=".$id);
         exit;
     }
     else {
@@ -236,7 +236,7 @@ 
 	$object->fetch($id);
 	if ($object->set_paid($id, $modepayment) >= 0)
 	{
-        header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
+        header("Location: ".$_SERVER['PHP_SELF']."&id=".$id);
 		exit;
 	}
     else {
@@ -312,18 +312,18 @@ 
  * View
  */
 
-llxHeader('',$langs->trans("Donation"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
+llxHeader('', $langs->trans("Donation"), 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
 
-$form=new Form($db);
+$form = new Form($db);
 $formfile = new FormFile($db);
 $formcompany = new FormCompany($db);
-if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
 if ($action == 'create')
 {
 	print load_fiche_titre($langs->trans("AddDonation"));
 
-	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+	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">';
 
@@ -333,26 +333,26 @@ 
 	print '<tbody>';
 
 	// Ref
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
+	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))
+	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>'.$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 . '">';
+			print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 			// Outstanding Bill
 			$outstandingBills = $soc->get_OutstandingBill();
-			print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
+			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 ' / '.price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
 			}
 			print ')';
 			print '</td>';
@@ -370,21 +370,21 @@ 
 						var socid = $(this).val();
 				        var fac_rec = $(\'#fac_rec\').val();
 						// reload page
-						window.location.href = "' . $_SERVER["PHP_SELF"] . '&action=create&socid="+socid+"&fac_rec="+fac_rec;
+						window.location.href = "' . $_SERVER["PHP_SELF"].'&action=create&socid="+socid+"&fac_rec="+fac_rec;
 					});
 				});
 				</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 ' <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 '</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 $form->selectDate($donation_date ? $donation_date : -1, '', '', '', '', "add", 1, 1);
 	print '</td>';
 
 	// Amount
@@ -392,7 +392,7 @@ 
 
 	// Public donation
 	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
+	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))
@@ -405,15 +405,15 @@ 
 
 		// 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 $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 $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>';
@@ -421,13 +421,13 @@ 
 
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-	$selected = GETPOST('modepayment','int');
+	$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 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%');
@@ -437,7 +437,7 @@ 
 	// Private note
 	if (empty($user->societe_id)) {
 		print '<tr>';
-		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
+		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%');
@@ -445,20 +445,20 @@ 
 		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);
+        $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
 		print "</td></tr>\n";
     }
 
     // Other attributes
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    $parameters = array();
+    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
     if (empty($reshook))
     {
-		print $object->showOptionals($extrafields,'edit',$parameters);
+		print $object->showOptionals($extrafields, 'edit', $parameters);
     }
 
     print '</tbody>';
@@ -482,21 +482,21 @@ 
 /*                                                              */
 /* ************************************************************ */
 
-if (! empty($id) && $action == 'edit')
+if (!empty($id) && $action == 'edit')
 {
-	$result=$object->fetch($id);
+	$result = $object->fetch($id);
 	if ($result < 0) {
-		dol_print_error($db,$object->error); exit;
+		dol_print_error($db, $object->error); exit;
 	}
-	$result=$object->fetch_optionals();
+	$result = $object->fetch_optionals();
 	if ($result < 0) {
 		dol_print_error($db); exit;
 	}
 
-	$hselected='card';
+	$hselected = 'card';
 	$head = donation_prepare_head($object);
 
-	print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+	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.'">';
@@ -515,7 +515,7 @@ 
 
 	// Date
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Date").'</td><td>';
-	print $form->selectDate($object->date,'','','','',"update");
+	print $form->selectDate($object->date, '', '', '', '', "update");
 	print '</td>';
 
 	// Amount
@@ -526,12 +526,12 @@ 
 	else
 	{
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
-		print price($object->amount,0,$langs,0,0,-1,$conf->currency);
+		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 $form->selectyesno("public", 1, 1);
 	print "</td>";
 	print "</tr>\n";
 
@@ -544,15 +544,15 @@ 
 
     // 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 $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 $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>';
@@ -568,23 +568,23 @@ 
 	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
     // Project
-    if (! empty($conf->projet->enabled))
+    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>';
     }
 
     // Other attributes
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    $parameters = array();
+    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
     if (empty($reshook))
     {
-      	print $object->showOptionals($extrafields,'edit');
+      	print $object->showOptionals($extrafields, 'edit');
     }
 
 	print "</table>\n";
@@ -603,25 +603,25 @@ 
 /* Donation card in view mode                                   */
 /*                                                              */
 /* ************************************************************ */
-if (! empty($id) && $action != 'edit')
+if (!empty($id) && $action != 'edit')
 {
 	// 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);
+        $text = $langs->trans("ConfirmDeleteADonation");
+        print $form->formconfirm($_SERVER["PHP_SELF"]."&id=".$object->id, $langs->trans("DeleteADonation"), $text, "confirm_delete", '', '', 1);
     }
 
-	$result=$object->fetch($id);
+	$result = $object->fetch($id);
 	if ($result < 0) {
-		dol_print_error($db,$object->error); exit;
+		dol_print_error($db, $object->error); exit;
 	}
-	$result=$object->fetch_optionals();
+	$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');
@@ -630,41 +630,41 @@ 
 	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>';
+    $linkback = '<a href="'.BASE_URI.'?controller=don&method=list'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
+	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 	    $langs->load("projects");
-	    $morehtmlref.=$langs->trans('Project') . ' ';
+	    $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> : ';
+	            $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>';
+                    $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 .= $form->form_project($_SERVER['PHP_SELF'] . '&id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                    $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)) {
+	        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>';
+                $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 .= '';
 	        }
 	    }
 	}
-	$morehtmlref.='</div>';
+	$morehtmlref .= '</div>';
 
 
     dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
@@ -678,11 +678,11 @@ 
 
 	// Date
 	print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td colspan="2">';
-	print dol_print_date($object->date,"day");
+	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 price($object->amount, 0, $langs, 0, 0, -1, $conf->currency);
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("PublicDonation").'</td><td colspan="2">';
@@ -695,12 +695,12 @@ 
 
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
-	$form->form_modes_reglement(null, $object->modepaymentid,'none');
+	$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';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 
@@ -712,15 +712,15 @@ 
 	 * 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";
+	$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);
@@ -741,9 +741,9 @@ 
 			$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 '<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>".$labeltype.' '.$objp->num_payment."</td>\n";
 			print '<td align="right">'.price($objp->amount)."</td>\n";
 			print "</tr>";
@@ -759,7 +759,7 @@ 
 			$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 '<td align="right"'.($resteapayeraffiche ? ' class="amountremaintopay"' : '').'><b>'.price($remaintopay)."</b></td></tr>\n";
 		}
 		print "</table>";
 		$db->free($resql);
@@ -783,16 +783,16 @@ 
 
 	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>';
+    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)
 	{
-        print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '&rowid=' . $object->id . '&action=valid_promesse">' . $langs->trans("ValidPromess") . '</a></div>';
+        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>";
+        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
@@ -800,18 +800,18 @@ 
 	{
 		if ($remaintopay == 0)
 		{
-			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
+			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>';
+            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>";
+		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
@@ -820,7 +820,7 @@ 
 		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>";
+            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
 		{
@@ -840,20 +840,20 @@ 
 	/*
 	 * Documents generes
 	 */
-	$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;
+	$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;
 
-	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 online payment link
-		$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
+		$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
 		if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
 		{

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/don.class.php

Spacing +230 added lines, -230 removed lines

@@ -26,7 +26,7 @@ 
  *		\brief      File of class to manage donations
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -37,12 +37,12 @@ 
     /**
 	 * @var string ID to identify managed object
 	 */
-	public $element='don';
+	public $element = 'don';
 
     /**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='don';
+	public $table_element = 'don';
 
 	/**
 	 * @var int Field with ID of parent key if this field has a parent
@@ -109,9 +109,9 @@ 
      *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
      *  @return string        		Libelle
      */
-    function getLibStatut($mode=0)
+    function getLibStatut($mode = 0)
     {
-        return $this->LibStatut($this->statut,$mode);
+        return $this->LibStatut($this->statut, $mode);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -122,21 +122,21 @@ 
      *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
      *  @return string 			       	Libelle du statut
      */
-    function LibStatut($statut,$mode=0)
+    function LibStatut($statut, $mode = 0)
     {
         // phpcs:enable
     	if (empty($this->labelstatut) || empty($this->labelstatutshort))
     	{
 	    	global $langs;
 	    	$langs->load("donations");
-	    	$this->labelstatut[-1]=$langs->trans("Canceled");
-	    	$this->labelstatut[0]=$langs->trans("DonationStatusPromiseNotValidated");
-	    	$this->labelstatut[1]=$langs->trans("DonationStatusPromiseValidated");
-	    	$this->labelstatut[2]=$langs->trans("DonationStatusPaid");
-	    	$this->labelstatutshort[-1]=$langs->trans("Canceled");
-	    	$this->labelstatutshort[0]=$langs->trans("DonationStatusPromiseNotValidatedShort");
-	    	$this->labelstatutshort[1]=$langs->trans("DonationStatusPromiseValidatedShort");
-	    	$this->labelstatutshort[2]=$langs->trans("DonationStatusPaidShort");
+	    	$this->labelstatut[-1] = $langs->trans("Canceled");
+	    	$this->labelstatut[0] = $langs->trans("DonationStatusPromiseNotValidated");
+	    	$this->labelstatut[1] = $langs->trans("DonationStatusPromiseValidated");
+	    	$this->labelstatut[2] = $langs->trans("DonationStatusPaid");
+	    	$this->labelstatutshort[-1] = $langs->trans("Canceled");
+	    	$this->labelstatutshort[0] = $langs->trans("DonationStatusPromiseNotValidatedShort");
+	    	$this->labelstatutshort[1] = $langs->trans("DonationStatusPromiseValidatedShort");
+	    	$this->labelstatutshort[2] = $langs->trans("DonationStatusPaidShort");
     	}
 
         if ($mode == 0)
@@ -149,38 +149,38 @@ 
         }
         elseif ($mode == 2)
         {
-            if ($statut == -1) return img_picto($this->labelstatut[$statut],'statut5').' '.$this->labelstatutshort[$statut];
-            elseif ($statut == 0)  return img_picto($this->labelstatut[$statut],'statut0').' '.$this->labelstatutshort[$statut];
-            elseif ($statut == 1)  return img_picto($this->labelstatut[$statut],'statut1').' '.$this->labelstatutshort[$statut];
-            elseif ($statut == 2)  return img_picto($this->labelstatut[$statut],'statut6').' '.$this->labelstatutshort[$statut];
+            if ($statut == -1) return img_picto($this->labelstatut[$statut], 'statut5').' '.$this->labelstatutshort[$statut];
+            elseif ($statut == 0)  return img_picto($this->labelstatut[$statut], 'statut0').' '.$this->labelstatutshort[$statut];
+            elseif ($statut == 1)  return img_picto($this->labelstatut[$statut], 'statut1').' '.$this->labelstatutshort[$statut];
+            elseif ($statut == 2)  return img_picto($this->labelstatut[$statut], 'statut6').' '.$this->labelstatutshort[$statut];
         }
         elseif ($mode == 3)
         {
-            if ($statut == -1) return img_picto($this->labelstatut[$statut],'statut5');
-            elseif ($statut == 0)  return img_picto($this->labelstatut[$statut],'statut0');
-            elseif ($statut == 1)  return img_picto($this->labelstatut[$statut],'statut1');
-            elseif ($statut == 2)  return img_picto($this->labelstatut[$statut],'statut6');
+            if ($statut == -1) return img_picto($this->labelstatut[$statut], 'statut5');
+            elseif ($statut == 0)  return img_picto($this->labelstatut[$statut], 'statut0');
+            elseif ($statut == 1)  return img_picto($this->labelstatut[$statut], 'statut1');
+            elseif ($statut == 2)  return img_picto($this->labelstatut[$statut], 'statut6');
         }
         elseif ($mode == 4)
         {
-            if ($statut == -1) return img_picto($this->labelstatut[$statut],'statut5').' '.$this->labelstatut[$statut];
-            elseif ($statut == 0)  return img_picto($this->labelstatut[$statut],'statut0').' '.$this->labelstatut[$statut];
-            elseif ($statut == 1)  return img_picto($this->labelstatut[$statut],'statut1').' '.$this->labelstatut[$statut];
-            elseif ($statut == 2)  return img_picto($this->labelstatut[$statut],'statut6').' '.$this->labelstatut[$statut];
+            if ($statut == -1) return img_picto($this->labelstatut[$statut], 'statut5').' '.$this->labelstatut[$statut];
+            elseif ($statut == 0)  return img_picto($this->labelstatut[$statut], 'statut0').' '.$this->labelstatut[$statut];
+            elseif ($statut == 1)  return img_picto($this->labelstatut[$statut], 'statut1').' '.$this->labelstatut[$statut];
+            elseif ($statut == 2)  return img_picto($this->labelstatut[$statut], 'statut6').' '.$this->labelstatut[$statut];
         }
         elseif ($mode == 5)
         {
-            if ($statut == -1) return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut],'statut5');
-            elseif ($statut == 0)  return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut],'statut0');
-            elseif ($statut == 1)  return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut],'statut1');
-            elseif ($statut == 2)  return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut],'statut6');
+            if ($statut == -1) return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut], 'statut5');
+            elseif ($statut == 0)  return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut], 'statut0');
+            elseif ($statut == 1)  return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut], 'statut1');
+            elseif ($statut == 2)  return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut], 'statut6');
         }
         elseif ($mode == 6)
         {
-            if ($statut == -1) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut5');
-            elseif ($statut == 0)  return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut0');
-            elseif ($statut == 1)  return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut1');
-            elseif ($statut == 2)  return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6');
+            if ($statut == -1) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut5');
+            elseif ($statut == 0)  return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut0');
+            elseif ($statut == 1)  return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut1');
+            elseif ($statut == 2)  return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut6');
         }
     }
 
@@ -194,7 +194,7 @@ 
      */
     function initAsSpecimen()
     {
-        global $conf, $user,$langs;
+        global $conf, $user, $langs;
 
         $now = dol_now();
 
@@ -202,10 +202,10 @@ 
         $socids = array();
 
         $sql = "SELECT rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe";
-        $sql.= " WHERE client IN (1, 3)";
-        $sql.= " AND entity = ".$conf->entity;
-        $sql.= " LIMIT 10";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe";
+        $sql .= " WHERE client IN (1, 3)";
+        $sql .= " AND entity = ".$conf->entity;
+        $sql .= " LIMIT 10";
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -222,9 +222,9 @@ 
         }
 
         // Initialise parametres
-        $this->id=0;
+        $this->id = 0;
         $this->ref = 'SPECIMEN';
-        $this->specimen=1;
+        $this->specimen = 1;
         $this->lastname = 'Doe';
         $this->firstname = 'John';
         $this->socid = 1;
@@ -236,11 +236,11 @@ 
         $this->address = 'Twist road';
         $this->zip = '99999';
         $this->town = 'Town';
-        $this->note_private='Private note';
-        $this->note_public='Public note';
-        $this->email='email@email.com';
-        $this->note='';
-        $this->statut=1;
+        $this->note_private = 'Private note';
+        $this->note_public = 'Public note';
+        $this->email = 'email@email.com';
+        $this->note = '';
+        $this->statut = 1;
     }
 
 
@@ -251,7 +251,7 @@ 
      *	@param	int	$minimum	Minimum
      *	@return	int				0 if KO, >0 if OK
      */
-    function check($minimum=0)
+    function check($minimum = 0)
     {
     	global $langs;
     	$langs->load('main');
@@ -264,62 +264,62 @@ 
         {
             if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0)
             {
-                $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Company').'/'.$langs->trans('Firstname').'-'.$langs->trans('Lastname'));
+                $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Company').'/'.$langs->trans('Firstname').'-'.$langs->trans('Lastname'));
                 $err++;
             }
         }
 
         if (dol_strlen(trim($this->address)) == 0)
         {
-            $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Address'));
+            $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Address'));
             $err++;
         }
 
         if (dol_strlen(trim($this->zip)) == 0)
         {
-            $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Zip'));
+            $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Zip'));
             $err++;
         }
 
         if (dol_strlen(trim($this->town)) == 0)
         {
-            $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Town'));
+            $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Town'));
             $err++;
         }
 
         if (dol_strlen(trim($this->email)) == 0)
         {
-            $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('EMail'));
+            $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('EMail'));
             $err++;
         }
 
         $this->amount = trim($this->amount);
 
-        $map = range(0,9);
-        $len=dol_strlen($this->amount);
+        $map = range(0, 9);
+        $len = dol_strlen($this->amount);
         for ($i = 0; $i < $len; $i++)
         {
-            if (!isset($map[substr($this->amount, $i, 1)] ))
+            if (!isset($map[substr($this->amount, $i, 1)]))
             {
-                $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount'));
+                $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Amount'));
                 $err++;
                 $amount_invalid = 1;
                 break;
             }
         }
 
-        if (! $amount_invalid)
+        if (!$amount_invalid)
         {
             if ($this->amount == 0)
             {
-                $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount'));
+                $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Amount'));
                 $err++;
             }
             else
             {
                 if ($this->amount < $minimum && $minimum > 0)
                 {
-                    $error_string[] = $langs->trans('MinimumAmount',$langs->trans('$minimum'));
+                    $error_string[] = $langs->trans('MinimumAmount', $langs->trans('$minimum'));
                     $err++;
                 }
             }
@@ -344,68 +344,68 @@ 
      * @return  int  		        <0 if KO, id of created donation if OK
      * TODO    add numbering module for Ref
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
         global $conf, $langs;
 
 		$error = 0;
 		$ret = 0;
-        $now=dol_now();
+        $now = dol_now();
 
         // Clean parameters
-        $this->address=($this->address>0?$this->address:$this->address);
-        $this->zip=($this->zip>0?$this->zip:$this->zip);
-        $this->town=($this->town>0?$this->town:$this->town);
-        $this->country_id=($this->country_id>0?$this->country_id:$this->country_id);
-        $this->country=($this->country?$this->country:$this->country);
+        $this->address = ($this->address > 0 ? $this->address : $this->address);
+        $this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
+        $this->town = ($this->town > 0 ? $this->town : $this->town);
+        $this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+        $this->country = ($this->country ? $this->country : $this->country);
 
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."don (";
-        $sql.= "datec";
-        $sql.= ", entity";
-        $sql.= ", amount";
-        $sql.= ", fk_payment";
-        $sql.= ", firstname";
-        $sql.= ", lastname";
-        $sql.= ", societe";
-        $sql.= ", address";
-        $sql.= ", zip";
-        $sql.= ", town";
-        $sql.= ", fk_country";
-        $sql.= ", public";
-        $sql.= ", fk_projet";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", fk_user_author";
-        $sql.= ", fk_user_valid";
-        $sql.= ", datedon";
-        $sql.= ", email";
-        $sql.= ", phone";
-        $sql.= ", phone_mobile";
-        $sql.= ") VALUES (";
-        $sql.= " '".$this->db->idate($now)."'";
-        $sql.= ", ".$conf->entity;
-        $sql.= ", ".price2num($this->amount);
-        $sql.= ", ".($this->modepaymentid?$this->modepaymentid:"null");
-        $sql.= ", '".$this->db->escape($this->firstname)."'";
-        $sql.= ", '".$this->db->escape($this->lastname)."'";
-        $sql.= ", '".$this->db->escape($this->societe)."'";
-        $sql.= ", '".$this->db->escape($this->address)."'";
-        $sql.= ", '".$this->db->escape($this->zip)."'";
-        $sql.= ", '".$this->db->escape($this->town)."'";
-        $sql.= ", ".($this->country_id > 0 ? $this->country_id : '0');
-        $sql.= ", ".((int) $this->public);
-        $sql.= ", ".($this->fk_project > 0?$this->fk_project:"null");
-       	$sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
-		$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
-        $sql.= ", ".$user->id;
-        $sql.= ", null";
-        $sql.= ", '".$this->db->idate($this->date)."'";
-        $sql.= ", '".$this->db->escape($this->email)."'";
-        $sql.= ", '".$this->db->escape($this->phone)."'";
-        $sql.= ", '".$this->db->escape($this->phone_mobile)."'";
-        $sql.= ")";
+        $sql .= "datec";
+        $sql .= ", entity";
+        $sql .= ", amount";
+        $sql .= ", fk_payment";
+        $sql .= ", firstname";
+        $sql .= ", lastname";
+        $sql .= ", societe";
+        $sql .= ", address";
+        $sql .= ", zip";
+        $sql .= ", town";
+        $sql .= ", fk_country";
+        $sql .= ", public";
+        $sql .= ", fk_projet";
+        $sql .= ", note_private";
+        $sql .= ", note_public";
+        $sql .= ", fk_user_author";
+        $sql .= ", fk_user_valid";
+        $sql .= ", datedon";
+        $sql .= ", email";
+        $sql .= ", phone";
+        $sql .= ", phone_mobile";
+        $sql .= ") VALUES (";
+        $sql .= " '".$this->db->idate($now)."'";
+        $sql .= ", ".$conf->entity;
+        $sql .= ", ".price2num($this->amount);
+        $sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");
+        $sql .= ", '".$this->db->escape($this->firstname)."'";
+        $sql .= ", '".$this->db->escape($this->lastname)."'";
+        $sql .= ", '".$this->db->escape($this->societe)."'";
+        $sql .= ", '".$this->db->escape($this->address)."'";
+        $sql .= ", '".$this->db->escape($this->zip)."'";
+        $sql .= ", '".$this->db->escape($this->town)."'";
+        $sql .= ", ".($this->country_id > 0 ? $this->country_id : '0');
+        $sql .= ", ".((int) $this->public);
+        $sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
+       	$sql .= ", ".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
+		$sql .= ", ".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
+        $sql .= ", ".$user->id;
+        $sql .= ", null";
+        $sql .= ", '".$this->db->idate($this->date)."'";
+        $sql .= ", '".$this->db->escape($this->email)."'";
+        $sql .= ", '".$this->db->escape($this->phone)."'";
+        $sql .= ", '".$this->db->escape($this->phone_mobile)."'";
+        $sql .= ")";
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -416,7 +416,7 @@ 
             if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('DON_CREATE',$user);
+                $result = $this->call_trigger('DON_CREATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
@@ -429,10 +429,10 @@ 
         }
 
 		// Update extrafield
-        if (! $error) {
+        if (!$error) {
         	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
         	{
-        		$result=$this->insertExtraFields();
+        		$result = $this->insertExtraFields();
         		if ($result < 0)
         		{
         			$error++;
@@ -465,24 +465,24 @@ 
      *  @param      int		$notrigger	Disable triggers
      *  @return     int      		>0 if OK, <0 if KO
      */
-    function update($user, $notrigger=0)
+    function update($user, $notrigger = 0)
     {
         global $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
         // Clean parameters
-        $this->address=($this->address>0?$this->address:$this->address);
-        $this->zip=($this->zip>0?$this->zip:$this->zip);
-        $this->town=($this->town>0?$this->town:$this->town);
-        $this->country_id=($this->country_id>0?$this->country_id:$this->country_id);
-        $this->country=($this->country?$this->country:$this->country);
+        $this->address = ($this->address > 0 ? $this->address : $this->address);
+        $this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
+        $this->town = ($this->town > 0 ? $this->town : $this->town);
+        $this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+        $this->country = ($this->country ? $this->country : $this->country);
 
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."don SET ";
-        $sql .= "amount = " . price2num($this->amount);
-        $sql .= ",fk_payment = ".($this->modepaymentid?$this->modepaymentid:"null");
+        $sql .= "amount = ".price2num($this->amount);
+        $sql .= ",fk_payment = ".($this->modepaymentid ? $this->modepaymentid : "null");
         $sql .= ",firstname = '".$this->db->escape($this->firstname)."'";
         $sql .= ",lastname='".$this->db->escape($this->lastname)."'";
         $sql .= ",societe='".$this->db->escape($this->societe)."'";
@@ -491,11 +491,11 @@ 
         $sql .= ",town='".$this->db->escape($this->town)."'";
         $sql .= ",fk_country = ".$this->country_id;
         $sql .= ",public=".$this->public;
-        $sql .= ",fk_projet=".($this->fk_project>0?$this->fk_project:'null');
-        $sql .= ",note_private=".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
-        $sql .= ",note_public=".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
+        $sql .= ",fk_projet=".($this->fk_project > 0 ? $this->fk_project : 'null');
+        $sql .= ",note_private=".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
+        $sql .= ",note_public=".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
         $sql .= ",datedon='".$this->db->idate($this->date)."'";
-        $sql .= ",date_valid=".($this->date_valid?"'".$this->db->idate($this->date)."'":"null");
+        $sql .= ",date_valid=".($this->date_valid ? "'".$this->db->idate($this->date)."'" : "null");
         $sql .= ",email='".$this->db->escape($this->email)."'";
         $sql .= ",phone='".$this->db->escape($this->phone)."'";
         $sql .= ",phone_mobile='".$this->db->escape($this->phone_mobile)."'";
@@ -503,23 +503,23 @@ 
         $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::Update", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if (!$notrigger)
             {
 				// Call trigger
-                $result=$this->call_trigger('DON_MODIFY',$user);
+                $result = $this->call_trigger('DON_MODIFY', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
 
             // Update extrafield
-            if (! $error)
+            if (!$error)
 			{
               	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
                	{
-               		$result=$this->insertExtraFields();
+               		$result = $this->insertExtraFields();
                		if ($result < 0)
                		{
                			$error++;
@@ -527,7 +527,7 @@ 
                	}
             }
 
-			if (! $error )
+			if (!$error)
             {
                 $this->db->commit();
                 $result = 1;
@@ -543,7 +543,7 @@ 
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
             $this->db->rollback();
-            dol_syslog(get_class($this)."::Update error -2 " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::Update error -2 ".$this->error, LOG_ERR);
             $result = -2;
         }
 		return $result;
@@ -556,21 +556,21 @@ 
      *    @param       int		$notrigger       Disable triggers
      *    @return      int       			      <0 if KO, 0 if not possible, >0 if OK
      */
-    function delete($user, $notrigger=0)
+    function delete($user, $notrigger = 0)
     {
 		global $user, $conf, $langs;
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$error = 0;
 
 		$this->db->begin();
 
-   		if (! $error)
+   		if (!$error)
         {
             if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('DON_DELETE',$user);
+                $result = $this->call_trigger('DON_DELETE', $user);
 
                 if ($result < 0) {
                     $error++;
@@ -580,23 +580,23 @@ 
         }
 
         // Delete donation
-        if (! $error)
+        if (!$error)
         {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "don_extrafields";
-	        $sql.= " WHERE fk_object=" . $this->id;
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."don_extrafields";
+	        $sql .= " WHERE fk_object=".$this->id;
 
 	        $resql = $this->db->query($sql);
-	        if (! $resql)
+	        if (!$resql)
 	        {
 	        	$this->errors[] = $this->db->lasterror();
 	        	$error++;
 	        }
         }
 
-		if (! $error)
+		if (!$error)
         {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "don";
-	        $sql.= " WHERE rowid=" . $this->id;
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."don";
+	        $sql .= " WHERE rowid=".$this->id;
 
 	        $resql = $this->db->query($sql);
 	        if (!$resql)
@@ -606,19 +606,19 @@ 
 	        }
         }
 
-    	if (! $error)
+    	if (!$error)
     	{
             $this->db->commit();
             return 1;
         }
         else
        {
-        	foreach($this->errors as $errmsg)
+        	foreach ($this->errors as $errmsg)
         	{
-				dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
-            dol_syslog(get_class($this) . "::delete " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -1;
         }
@@ -631,33 +631,33 @@ 
      *      @param      string	$ref        Ref of donation to load
      *      @return     int      			<0 if KO, >0 if OK
      */
-    function fetch($id, $ref='')
+    function fetch($id, $ref = '')
     {
         global $conf;
 
         $sql = "SELECT d.rowid, d.datec, d.date_valid, d.tms as datem, d.datedon,";
-        $sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, ";
-        $sql.= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, d.email, d.phone, ";
-        $sql.= " d.phone_mobile, d.fk_projet as fk_project, d.model_pdf,";
-        $sql.= " p.ref as project_ref,";
-        $sql.= " cp.libelle as payment_label, cp.code as payment_code,";
-        $sql.= " c.code as country_code, c.label as country";
-        $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_projet";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid";
-        $sql.= " WHERE d.entity IN (".getEntity('donation').")";
-        if (! empty($id))
+        $sql .= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, ";
+        $sql .= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, d.email, d.phone, ";
+        $sql .= " d.phone_mobile, d.fk_projet as fk_project, d.model_pdf,";
+        $sql .= " p.ref as project_ref,";
+        $sql .= " cp.libelle as payment_label, cp.code as payment_code,";
+        $sql .= " c.code as country_code, c.label as country";
+        $sql .= " FROM ".MAIN_DB_PREFIX."don as d";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_projet";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid";
+        $sql .= " WHERE d.entity IN (".getEntity('donation').")";
+        if (!empty($id))
         {
-        	$sql.= " AND d.rowid=".$id;
+        	$sql .= " AND d.rowid=".$id;
         }
-        else if (! empty($ref))
+        else if (!empty($ref))
         {
-        	$sql.= " AND d.ref='".$this->db->escape($ref)."'";
+        	$sql .= " AND d.ref='".$this->db->escape($ref)."'";
         }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
@@ -681,21 +681,21 @@ 
                 $this->country_id     = $obj->fk_country;
                 $this->country_code   = $obj->country_code;
                 $this->country        = $obj->country;
-                $this->country_olddata= $obj->country_olddata;	// deprecated
-				$this->email          = $obj->email;
+                $this->country_olddata = $obj->country_olddata; // deprecated
+				$this->email = $obj->email;
                 $this->phone          = $obj->phone;
                 $this->phone_mobile   = $obj->phone_mobile;
                 $this->project        = $obj->project_ref;
-                $this->fk_projet      = $obj->fk_project;   // deprecated
+                $this->fk_projet      = $obj->fk_project; // deprecated
                 $this->fk_project     = $obj->fk_project;
                 $this->public         = $obj->public;
                 $this->modepaymentid  = $obj->fk_payment;
                 $this->modepaymentcode = $obj->payment_code;
                 $this->modepayment    = $obj->payment_label;
-				$this->paid			  = $obj->paid;
+				$this->paid = $obj->paid;
                 $this->amount         = $obj->amount;
                 $this->note_private	  = $obj->note_private;
-                $this->note_public	  = $obj->note_public;
+                $this->note_public = $obj->note_public;
                 $this->modelpdf       = $obj->model_pdf;
 
                 // Retreive all extrafield
@@ -718,7 +718,7 @@ 
      *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return		int						<0 if KO, >0 if OK
      */
-	function setValid($user, $notrigger=0)
+	function setValid($user, $notrigger = 0)
 	{
 		return $this->valid_promesse($this->id, $user->id, $notrigger);
 	}
@@ -732,18 +732,18 @@ 
      *    @param	int		$notrigger	Disable triggers
      *    @return   int     			<0 if KO, >0 if OK
      */
-	function valid_promesse($id, $userid, $notrigger=0)
+	function valid_promesse($id, $userid, $notrigger = 0)
 	{
 		// phpcs:enable
 		global $langs, $user;
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = ".$userid." WHERE rowid = ".$id." AND fk_statut = 0";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->affected_rows($resql))
@@ -751,7 +751,7 @@ 
             	if (!$notrigger)
             	{
             		// Call trigger
-            		$result=$this->call_trigger('DON_VALIDATE',$user);
+            		$result = $this->call_trigger('DON_VALIDATE', $user);
             		if ($result < 0) { $error++; }
             		// End call triggers
             	}
@@ -783,7 +783,7 @@ 
      *    @param    int		$modepayment   	    mode of payment
      *    @return   int      					<0 if KO, >0 if OK
      */
-    function set_paid($id, $modepayment=0)
+    function set_paid($id, $modepayment = 0)
     {
         // phpcs:enable
         $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
@@ -791,9 +791,9 @@ 
         {
             $sql .= ", fk_payment=".$modepayment;
         }
-        $sql .=  " WHERE rowid = ".$id." AND fk_statut = 1";
+        $sql .= " WHERE rowid = ".$id." AND fk_statut = 1";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->affected_rows($resql))
@@ -824,10 +824,10 @@ 
         // phpcs:enable
         $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = -1 WHERE rowid = ".$id;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            if ( $this->db->affected_rows($resql) )
+            if ($this->db->affected_rows($resql))
             {
                 return 1;
             }
@@ -855,18 +855,18 @@ 
         // phpcs:enable
         global $conf;
 
-        $result=0;
+        $result = 0;
 
         $sql = "SELECT sum(amount) as total";
-        $sql.= " FROM ".MAIN_DB_PREFIX."don";
-        $sql.= " WHERE fk_statut = ".$param;
-        $sql.= " AND entity = ".$conf->entity;
+        $sql .= " FROM ".MAIN_DB_PREFIX."don";
+        $sql .= " WHERE fk_statut = ".$param;
+        $sql .= " AND entity = ".$conf->entity;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            $result=$obj->total;
+            $result = $obj->total;
         }
 
         return $result;
@@ -883,19 +883,19 @@ 
         // phpcs:enable
         global $conf;
 
-        $this->nb=array();
+        $this->nb = array();
 
         $sql = "SELECT count(d.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
-        $sql.= " WHERE d.fk_statut > 0";
-        $sql.= " AND d.entity IN (".getEntity('donation').")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."don as d";
+        $sql .= " WHERE d.fk_statut > 0";
+        $sql .= " AND d.entity IN (".getEntity('donation').")";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
-                $this->nb["donations"]=$obj->nb;
+                $this->nb["donations"] = $obj->nb;
             }
             $this->db->free($resql);
             return 1;
@@ -903,7 +903,7 @@ 
         else
         {
             dol_print_error($this->db);
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -915,19 +915,19 @@ 
      *	@param	int  	$notooltip		1=Disable tooltip
      *	@return	string					Chaine avec URL
      */
-    function getNomUrl($withpicto=0, $notooltip=0)
+    function getNomUrl($withpicto = 0, $notooltip = 0)
     {
         global $langs;
 
-        $result='';
-        $label=$langs->trans("ShowDonation").': '.$this->id;
+        $result = '';
+        $label = $langs->trans("ShowDonation").': '.$this->id;
 
-        $linkstart = '<a href="' . BASE_URL . '?controller=don&method=card&id=' . $this->id . '" title="' . dol_escape_htmltag($label, 1) . '" class="classfortooltip">';
-        $linkend='</a>';
+        $linkstart = '<a href="'.BASE_URL.'?controller=don&method=card&id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $linkend = '</a>';
 
         $result .= $linkstart;
-        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-        if ($withpicto != 2) $result.= $this->ref;
+        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+        if ($withpicto != 2) $result .= $this->ref;
         $result .= $linkend;
 
         return $result;
@@ -942,9 +942,9 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT d.rowid, d.datec, d.fk_user_author, d.fk_user_valid,';
-		$sql.= ' d.tms';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'don as d';
-		$sql.= ' WHERE d.rowid = '.$id;
+		$sql .= ' d.tms';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'don as d';
+		$sql .= ' WHERE d.rowid = '.$id;
 
 		dol_syslog(get_class($this).'::info', LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -989,19 +989,19 @@ 
 	 *  @param      int			$hideref        Hide ref
 	 *  @return     int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("bills");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'html_cerfafr';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->DON_ADDON_MODEL)) {
+			} elseif (!empty($conf->global->DON_ADDON_MODEL)) {
 				$modele = $conf->global->DON_ADDON_MODEL;
 			}
 		}
@@ -1012,37 +1012,37 @@ 
 		//return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 		// Increase limit for PDF build
-		$err=error_reporting();
+		$err = error_reporting();
 		error_reporting(0);
 		@set_time_limit(120);
 		error_reporting($err);
 
-		$srctemplatepath='';
+		$srctemplatepath = '';
 
 		// If selected modele is a filename template (then $modele="modelname:filename")
-		$tmp=explode(':',$modele,2);
-		if (! empty($tmp[1]))
+		$tmp = explode(':', $modele, 2);
+		if (!empty($tmp[1]))
 		{
-			$modele=$tmp[0];
-			$srctemplatepath=$tmp[1];
+			$modele = $tmp[0];
+			$srctemplatepath = $tmp[1];
 		}
 
 		// Search template files
-		$file=''; $classname=''; $filefound=0;
-		$dirmodels=array('/');
-		if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-		foreach($dirmodels as $reldir)
+		$file = ''; $classname = ''; $filefound = 0;
+		$dirmodels = array('/');
+		if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir)
 		{
-			foreach(array('html','doc','pdf') as $prefix)
+			foreach (array('html', 'doc', 'pdf') as $prefix)
 			{
-				$file = $prefix."_".preg_replace('/^html_/','',$modele).".modules.php";
+				$file = $prefix."_".preg_replace('/^html_/', '', $modele).".modules.php";
 
 				// On verifie l'emplacement du modele
-				$file=dol_buildpath($reldir."core/modules/dons/".$file,0);
+				$file = dol_buildpath($reldir."core/modules/dons/".$file, 0);
 				if (file_exists($file))
 				{
-					$filefound=1;
-					$classname=$prefix.'_'.$modele;
+					$filefound = 1;
+					$classname = $prefix.'_'.$modele;
 					break;
 				}
 			}
@@ -1054,17 +1054,17 @@ 
 		{
 			require_once $file;
 
-			$object=$this;
+			$object = $this;
 
 			$classname = $modele;
 			$obj = new $classname($this->db);
 
 			// We save charset_output to restore it because write_file can change it if needed for
 			// output format that does not support UTF8.
-			$sav_charset_output=$outputlangs->charset_output;
-			if ($obj->write_file($object,$outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
+			$sav_charset_output = $outputlangs->charset_output;
+			if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 			{
-				$outputlangs->charset_output=$sav_charset_output;
+				$outputlangs->charset_output = $sav_charset_output;
 
 				// we delete preview files
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -1073,15 +1073,15 @@ 
 			}
 			else
 			{
-				$outputlangs->charset_output=$sav_charset_output;
+				$outputlangs->charset_output = $sav_charset_output;
 				dol_syslog("Erreur dans don_create");
-				dol_print_error($this->db,$obj->error);
+				dol_print_error($this->db, $obj->error);
 				return 0;
 			}
 		}
 		else
 		{
-			print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
+			print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			return 0;
 		}
 	}

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

Spacing +53 added lines, -53 removed lines

@@ -21,7 +21,7 @@ 
  *  \brief      File of class to manage payment of donations
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -57,8 +57,8 @@ 
     public $datec = '';
     public $tms = '';
     public $datep = '';
-    public $amount;            // Total amount of payment
-    public $amounts = array();   // Array of amounts
+    public $amount; // Total amount of payment
+    public $amounts = array(); // Array of amounts
     public $typepayment;
     public $num_payment;
 
@@ -141,18 +141,18 @@ 
         $this->db->begin();
 
         if ($totalamount != 0) {
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "payment_donation (fk_donation, datec, datep, amount,";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_donation (fk_donation, datec, datep, amount,";
             $sql .= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)";
-            $sql .= " VALUES ($this->chid, '" . $this->db->idate($now) . "',";
-            $sql .= " '" . $this->db->idate($this->datepaid) . "',";
-            $sql .= " " . $totalamount . ",";
-            $sql .= " " . $this->paymenttype . ", '" . $this->db->escape($this->num_payment) . "', '" . $this->db->escape($this->note) . "', " . $user->id . ",";
+            $sql .= " VALUES ($this->chid, '".$this->db->idate($now)."',";
+            $sql .= " '".$this->db->idate($this->datepaid)."',";
+            $sql .= " ".$totalamount.",";
+            $sql .= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.",";
             $sql .= " 0)";
 
-            dol_syslog(get_class($this) . "::create", LOG_DEBUG);
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql) {
-                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "payment_donation");
+                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_donation");
                 $this->ref = $this->id;
             } else {
                 $error++;
@@ -170,7 +170,7 @@ 
 
         if ($totalamount != 0 && !$error) {
             $this->amount = $totalamount;
-            $this->total = $totalamount;    // deprecated
+            $this->total = $totalamount; // deprecated
             $this->db->commit();
             return $this->id;
         } else {
@@ -204,12 +204,12 @@ 
         $sql .= " t.fk_user_modif,";
         $sql .= " pt.code as type_code, pt.libelle as type_libelle,";
         $sql .= ' b.fk_account';
-        $sql .= " FROM " . MAIN_DB_PREFIX . "payment_donation as t";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_paiement as pt ON t.fk_typepayment = pt.id";
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON t.fk_bank = b.rowid';
-        $sql .= " WHERE t.rowid = " . $id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."payment_donation as t";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepayment = pt.id";
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+        $sql .= " WHERE t.rowid = ".$id;
 
-        dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             if ($this->db->num_rows($resql)) {
@@ -240,7 +240,7 @@ 
 
             return 1;
         } else {
-            $this->error = "Error " . $this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -273,27 +273,27 @@ 
         // Put here code to add control on parameters values
 
         // Update request
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "payment_donation SET";
-        $sql .= " fk_donation=" . (isset($this->fk_donation) ? $this->fk_donation : "null") . ",";
-        $sql .= " datec=" . (dol_strlen($this->datec) != 0 ? "'" . $this->db->idate($this->datec) . "'" : 'null') . ",";
-        $sql .= " tms=" . (dol_strlen($this->tms) != 0 ? "'" . $this->db->idate($this->tms) . "'" : 'null') . ",";
-        $sql .= " datep=" . (dol_strlen($this->datep) != 0 ? "'" . $this->db->idate($this->datep) . "'" : 'null') . ",";
-        $sql .= " amount=" . (isset($this->amount) ? $this->amount : "null") . ",";
-        $sql .= " fk_typepayment=" . (isset($this->fk_typepayment) ? $this->fk_typepayment : "null") . ",";
-        $sql .= " num_payment=" . (isset($this->num_payment) ? "'" . $this->db->escape($this->num_payment) . "'" : "null") . ",";
-        $sql .= " note=" . (isset($this->note) ? "'" . $this->db->escape($this->note) . "'" : "null") . ",";
-        $sql .= " fk_bank=" . (isset($this->fk_bank) ? $this->fk_bank : "null") . ",";
-        $sql .= " fk_user_creat=" . (isset($this->fk_user_creat) ? $this->fk_user_creat : "null") . ",";
-        $sql .= " fk_user_modif=" . (isset($this->fk_user_modif) ? $this->fk_user_modif : "null") . "";
-        $sql .= " WHERE rowid=" . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."payment_donation SET";
+        $sql .= " fk_donation=".(isset($this->fk_donation) ? $this->fk_donation : "null").",";
+        $sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+        $sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+        $sql .= " datep=".(dol_strlen($this->datep) != 0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
+        $sql .= " amount=".(isset($this->amount) ? $this->amount : "null").",";
+        $sql .= " fk_typepayment=".(isset($this->fk_typepayment) ? $this->fk_typepayment : "null").",";
+        $sql .= " num_payment=".(isset($this->num_payment) ? "'".$this->db->escape($this->num_payment)."'" : "null").",";
+        $sql .= " note=".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : "null").",";
+        $sql .= " fk_bank=".(isset($this->fk_bank) ? $this->fk_bank : "null").",";
+        $sql .= " fk_user_creat=".(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").",";
+        $sql .= " fk_user_modif=".(isset($this->fk_user_modif) ? $this->fk_user_modif : "null")."";
+        $sql .= " WHERE rowid=".$this->id;
 
         $this->db->begin();
 
-        dol_syslog(get_class($this) . "::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             $error++;
-            $this->errors[] = "Error " . $this->db->lasterror();
+            $this->errors[] = "Error ".$this->db->lasterror();
         }
 
         if (!$error) {
@@ -312,8 +312,8 @@ 
         // Commit or rollback
         if ($error) {
             foreach ($this->errors as $errmsg) {
-                dol_syslog(get_class($this) . "::update " . $errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
             return -1 * $error;
@@ -339,26 +339,26 @@ 
         $this->db->begin();
 
         if (!$error) {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "bank_url";
-            $sql .= " WHERE type='payment_donation' AND url_id=" . $this->id;
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
+            $sql .= " WHERE type='payment_donation' AND url_id=".$this->id;
 
-            dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
+            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $error++;
-                $this->errors[] = "Error " . $this->db->lasterror();
+                $this->errors[] = "Error ".$this->db->lasterror();
             }
         }
 
         if (!$error) {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "payment_donation";
-            $sql .= " WHERE rowid=" . $this->id;
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_donation";
+            $sql .= " WHERE rowid=".$this->id;
 
-            dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
+            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $error++;
-                $this->errors[] = "Error " . $this->db->lasterror();
+                $this->errors[] = "Error ".$this->db->lasterror();
             }
         }
 
@@ -378,8 +378,8 @@ 
         // Commit or rollback
         if ($error) {
             foreach ($this->errors as $errmsg) {
-                dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
             return -1 * $error;
@@ -516,7 +516,7 @@ 
         $error = 0;
 
         if (!empty($conf->banque->enabled)) {
-            require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
             $acc = new Account($this->db);
             $acc->fetch($accountid);
@@ -527,7 +527,7 @@ 
             // Insert payment into llx_bank
             $bank_line_id = $acc->addline(
                 $this->datepaid,
-                $this->paymenttype,  // Payment mode id or code ("CHQ or VIR for example")
+                $this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
                 $label,
                 $amount,
                 $this->num_payment,
@@ -548,7 +548,7 @@ 
 
                 // 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) {
@@ -581,9 +581,9 @@ 
     function update_fk_bank($id_bank)
     {
         // phpcs:enable
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "payment_donation SET fk_bank = " . $id_bank . " WHERE rowid = " . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."payment_donation SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this) . "::update_fk_bank", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result) {
             return 1;
@@ -607,15 +607,15 @@ 
         $result = '';
 
         if (empty($this->ref)) $this->ref = $this->lib;
-        $label = $langs->trans("ShowPayment") . ': ' . $this->ref;
+        $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">';
+            $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) $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 != 2) $result .= $link.($maxlen ? dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
         }
 
         return $result;

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;