alxarafe / alixar

Views/LoginView.php

Spacing +9 added lines, -9 removed lines

@@ -61,7 +61,7 @@ 
     public function draw()

     {

         header('Cache-Control: Public, must-revalidate');

-        header("Content-type: text/html; charset=" . Globals::$conf->file->character_set_client);

+        header("Content-type: text/html; charset=".Globals::$conf->file->character_set_client);

 

         // Need global variable $title to be defined by caller (like dol_loginfunction)

         // Caller can also set 	$morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);

@@ -93,9 +93,9 @@ 
         }

 

         $php_self = AlDolUtils::dol_escape_htmltag($_SERVER['PHP_SELF']);

-        $php_self .= AlDolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?' . AlDolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';

+        $php_self .= AlDolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.AlDolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';

         if (!preg_match('/mainmenu=/', $php_self)) {

-            $php_self .= (preg_match('/\?/', $php_self) ? '&' : '?') . 'mainmenu=home';

+            $php_self .= (preg_match('/\?/', $php_self) ? '&' : '?').'mainmenu=home';

         }

 

         $this->url = $php_self;

@@ -109,28 +109,28 @@ 
           );

          */

         $arrayofjs = array(

-            DOL_BASE_URI . '/includes/jstz/jstz.min.js' . (empty(Globals::$conf->dol_use_jmobile) ? '' : '?version=' . urlencode(DOL_VERSION)),

-        DOL_BASE_URI . '/core/js/dst.js' . (empty(Globals::$conf->dol_use_jmobile) ? '' : '?version=' . urlencode(DOL_VERSION))

+            DOL_BASE_URI.'/includes/jstz/jstz.min.js'.(empty(Globals::$conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION)),

+        DOL_BASE_URI.'/core/js/dst.js'.(empty(Globals::$conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION))

         );

 

         // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php.

         // We must keep the @, some tools use it to know it is login page and find true dolibarr version.

         // $titleofloginpage = Globals::$langs->trans('Login') . ' @ ' . $titletruedolibarrversion;

-        $titleofloginpage = Globals::$langs->trans('Login') . ' @ ' . DOL_VERSION;

+        $titleofloginpage = Globals::$langs->trans('Login').' @ '.DOL_VERSION;

 

         $disablenofollow = 1;

-        if (!preg_match('/' . constant('DOL_APPLICATION_TITLE') . '/', $this->title)) {

+        if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $this->title)) {

             $disablenofollow = 0;

         }

 

         print $this->top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disablenofollow);

 

 

-        $colorbackhmenu1 = '60,70,100';      // topmenu

+        $colorbackhmenu1 = '60,70,100'; // topmenu

         if (!isset(Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1)) {

             Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;

         }

         $colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty(Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);

-        $colorbackhmenu1 = join(',', AlDolUtils2::colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'

+        $colorbackhmenu1 = join(',', AlDolUtils2::colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'

     }

 }

Views/CategoriesView.php

Spacing +15 added lines, -15 removed lines

@@ -70,21 +70,21 @@ 
             if ($action == 'create' || filter_input(INPUT_POST, "addcat") == 'addcat') {

                 AlDolUtils::dol_set_focus('#label');

 

-                print '<form action="' . $_SERVER['PHP_SELF'] . '?type=' . $type . '" method="POST">';

-                print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

-                print '<input type="hidden" name="urlfrom" value="' . $urlfrom . '">';

+                print '<form action="'.$_SERVER['PHP_SELF'].'?type='.$type.'" method="POST">';

+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

+                print '<input type="hidden" name="urlfrom" value="'.$urlfrom.'">';

                 print '<input type="hidden" name="action" value="add">';

                 print '<input type="hidden" name="addcat" value="addcat">';

-                print '<input type="hidden" name="id" value="' . AlDolUtils::GETPOST('origin', 'alpha') . '">';

-                print '<input type="hidden" name="type" value="' . $type . '">';

-                print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';

+                print '<input type="hidden" name="id" value="'.AlDolUtils::GETPOST('origin', 'alpha').'">';

+                print '<input type="hidden" name="type" value="'.$type.'">';

+                print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';

                 if ($origin)

                 {

-                    print '<input type="hidden" name="origin" value="' . $origin . '">';

+                    print '<input type="hidden" name="origin" value="'.$origin.'">';

                 }

                 if ($catorigin)

                 {

-                    print '<input type="hidden" name="catorigin" value="' . $catorigin . '">';

+                    print '<input type="hidden" name="catorigin" value="'.$catorigin.'">';

                 }

 

                 print load_fiche_titre($langs->trans("CreateCat"));

@@ -95,29 +95,29 @@ 
 

                 // Ref

                 print '<tr>';

-                print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Ref") . '</td><td><input id="label" class="minwidth100" name="label" value="' . $label . '">';

+                print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="minwidth100" name="label" value="'.$label.'">';

                 print'</td></tr>';

 

                 // Description

-                print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';

+                print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';

                 //require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

                 $doleditor = new DolEditor('description', $description, '', 200, 'dolibarr_notes', '', false, true, Globals::$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_6, '90%');

                 $doleditor->Create();

                 print '</td></tr>';

 

                 // Color

-                print '<tr><td>' . $langs->trans("Color") . '</td><td>';

+                print '<tr><td>'.$langs->trans("Color").'</td><td>';

                 print $formother->selectColor($color, 'color');

                 print '</td></tr>';

 

                 // Parent category

-                print '<tr><td>' . $langs->trans("AddIn") . '</td><td>';

+                print '<tr><td>'.$langs->trans("AddIn").'</td><td>';

                 print $form->select_all_categories($type, $catorigin, 'parent');

                 print ajax_combobox('parent');

                 print '</td></tr>';

 

                 $parameters = array();

-                $reshook = Globals::$hookManager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

+                $reshook = Globals::$hookManager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

                 print Globals::$hookManager->resPrint;

                 if (empty($reshook)) {

                     print $object->showOptionals($extrafields, 'edit');

@@ -128,9 +128,9 @@ 
                 AlDolUtils::dol_fiche_end('');

 

                 print '<div class="center">';

-                print '<input type="submit" class="button" value="' . $langs->trans("CreateThisCat") . '" name="creation" />';

+                print '<input type="submit" class="button" value="'.$langs->trans("CreateThisCat").'" name="creation" />';

                 print '&nbsp; &nbsp; &nbsp;';

-                print '<input type="submit" class="button" value="' . $langs->trans("Cancel") . '" name="cancel" />';

+                print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel" />';

                 print '</div>';

 

                 print '</form>';

Base/MenuManager.php

Spacing +21 added lines, -21 removed lines

@@ -39,8 +39,8 @@ 
      * @var DoliDB Database handler.

      */

     // public $db;

-    var $type_user;         // Put 0 for internal users, 1 for external users

-    var $atarget = "";                                // To store default target to use onto links

+    var $type_user; // Put 0 for internal users, 1 for external users

+    var $atarget = ""; // To store default target to use onto links

     var $name = "eldy";

     var $menu_array;

     var $menu_array_after;

@@ -164,16 +164,16 @@ 
 

         if ($mode == 'topnb') {

             //print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);  // no output

-            AlEldyLib::print_eldy_menu(Config::$dbEngine, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);  // no output

+            AlEldyLib::print_eldy_menu(Config::$dbEngine, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output

             return $this->menu->getNbOfVisibleMenuEntries();

         }

 

         if ($mode == 'jmobile') {     // Used to get menu in xml ul/li

-            AlEldyLib::print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);      // Fill this->menu that is empty with top menu

+            AlEldyLib::print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // Fill this->menu that is empty with top menu

             // $this->menu->liste is top menu

             //var_dump($this->menu->liste);exit;

             $lastlevel = array();

-            print '<!-- Generate menu list from menu handler ' . $this->name . ' -->' . "\n";

+            print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";

             foreach ($this->menu->liste as $key => $val) {  // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

                 print '<ul class="ulmenu" data-inset="true">';

                 print '<li class="lilevel0">';

@@ -194,13 +194,13 @@ 
                     }

 

                     print $val['titre'];

-                    print '</a>' . "\n";

+                    print '</a>'."\n";

 

                     // Search submenu fot this mainmenu entry

                     $tmpmainmenu = $val['mainmenu'];

                     $tmpleftmenu = 'all';

                     $submenu = new Menu();

-                    print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu);       // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)

+                    print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)

                     // Note: $submenu contains menu entry with substitution not yet done

                     //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }

                     //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }

@@ -210,21 +210,21 @@ 
                     $canonnexturl = preg_replace('/\?.*$/', '', $nexturl);

                     //var_dump($canonrelurl);

                     //var_dump($canonnexturl);

-                    print '<ul>' . "\n";

+                    print '<ul>'."\n";

                     if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools'))) || (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {

                         // We add sub entry

-                        print str_pad('', 1) . '<li class="lilevel1 ui-btn-icon-right ui-btn">';  // ui-btn to highlight on clic

-                        print '<a href="' . $relurl . '">';

-                        if ($langs->trans(ucfirst($val['mainmenu']) . "Dashboard") == ucfirst($val['mainmenu']) . "Dashboard") {  // No translation

+                        print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic

+                        print '<a href="'.$relurl.'">';

+                        if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation

                             if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) {

                                 print $langs->trans("Access");

                             } else {

                                 print $langs->trans("Dashboard");

                             }

                         } else

-                            print $langs->trans(ucfirst($val['mainmenu']) . "Dashboard");

+                            print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");

                         print '</a>';

-                        print '</li>' . "\n";

+                        print '</li>'."\n";

                     }

 

                     if ($val['level'] == 0) {

@@ -258,7 +258,7 @@ 
                         if ($showmenu) {  // Visible (option to hide when not allowed is off or allowed)

                             $substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

                             $substitarray['__USERID__'] = $user->id; // For backward compatibility

-                            $val2['url'] = make_substitutions($val2['url'], $substitarray);  // Make also substitution of __(XXX)__ and __[XXX]__

+                            $val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__

 

                             if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url'])) {

                                 $relurl2 = dol_buildpath($val2['url'], 1);

@@ -277,14 +277,14 @@ 
                             }

 

                             print str_pad('', $val2['level'] + 1);

-                            print '<li class="lilevel' . ($val2['level'] + 1);

+                            print '<li class="lilevel'.($val2['level'] + 1);

                             if ($val2['level'] == 0) {

-                                print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic

+                                print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic

                             }

-                            print $disabled . '">';  // ui-btn to highlight on clic

+                            print $disabled.'">'; // ui-btn to highlight on clic

                             if ($relurl2) {

                                 if ($val2['enabled']) { // Allowed

-                                    print '<a href="' . $relurl2 . '"';

+                                    print '<a href="'.$relurl2.'"';

                                     //print ' data-ajax="false"';

                                     print '>';

                                     $lastlevel2[$val2['level']] = 'enabled';

@@ -308,17 +308,17 @@ 
                                 else

                                     print '</a>';

                             }

-                            print '</li>' . "\n";

+                            print '</li>'."\n";

                         }

                     }

                     //var_dump($submenu);

                     print '</ul>';

                 }

                 if ($val['enabled'] == 2) {

-                    print '<font class="vsmenudisabled">' . $val['titre'] . '</font>';

+                    print '<font class="vsmenudisabled">'.$val['titre'].'</font>';

                 }

                 print '</li>';

-                print '</ul>' . "\n";

+                print '</ul>'."\n";

             }

         }

 

Base/AlExtraFields.php

Spacing +207 added lines, -207 removed lines

@@ -227,7 +227,7 @@ 
         if ($elementtype == 'contact')

             $elementtype = 'socpeople';

 

-        $table = $elementtype . '_extrafields';

+        $table = $elementtype.'_extrafields';

         if ($elementtype == 'categorie')

             $table = 'categories_extrafields';

 

@@ -272,10 +272,10 @@ 
                 'default' => $default_value

             );

 

-            $result = Config::$dbEngine->DDLAddField(MAIN_DB_PREFIX . $table, $attrname, $field_desc);

+            $result = Config::$dbEngine->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);

             if ($result > 0) {

                 if ($unique) {

-                    $sql = "ALTER TABLE " . MAIN_DB_PREFIX . $table . " ADD UNIQUE INDEX uk_" . $table . "_" . $attrname . " (" . $attrname . ")";

+                    $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";

                     $resql = Config::$dbEngine->query($sql, 1, 'dml');

                 }

                 return 1;

@@ -344,7 +344,7 @@ 
                 $params = '';

             }

 

-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "extrafields(";

+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";

             $sql .= " name,";

             $sql .= " label,";

             $sql .= " type,";

@@ -367,30 +367,30 @@ 
             $sql .= " enabled,";

             $sql .= " help";

             $sql .= " )";

-            $sql .= " VALUES('" . $attrname . "',";

-            $sql .= " '" . Config::$dbEngine->escape($label) . "',";

-            $sql .= " '" . Config::$dbEngine->escape($type) . "',";

-            $sql .= " " . $pos . ",";

-            $sql .= " '" . Config::$dbEngine->escape($size) . "',";

-            $sql .= " " . ($entity === '' ? Globals::$conf->entity : $entity) . ",";

-            $sql .= " '" . Config::$dbEngine->escape($elementtype) . "',";

-            $sql .= " " . $unique . ",";

-            $sql .= " " . $required . ",";

-            $sql .= " '" . Config::$dbEngine->escape($params) . "',";

-            $sql .= " " . $alwayseditable . ",";

-            $sql .= " " . ($perms ? "'" . Config::$dbEngine->escape($perms) . "'" : "null") . ",";

-            $sql .= " " . ($langfile ? "'" . Config::$dbEngine->escape($langfile) . "'" : "null") . ",";

-            $sql .= " '" . Config::$dbEngine->escape($list) . "',";

-            $sql .= " " . ($default ? "'" . Config::$dbEngine->escape($default) . "'" : "null") . ",";

-            $sql .= " " . ($computed ? "'" . Config::$dbEngine->escape($computed) . "'" : "null") . ",";

-            $sql .= " " . (is_object(Globals::$user) ? Globals::$user->id : 0) . ",";

-            $sql .= " " . (is_object(Globals::$user) ? Globals::$user->id : 0) . ",";

-            $sql .= "'" . Config::$dbEngine->idate(dol_now()) . "',";

-            $sql .= " " . ($enabled ? "'" . Config::$dbEngine->escape($enabled) . "'" : "1") . ",";

-            $sql .= " " . ($help ? "'" . Config::$dbEngine->escape($help) . "'" : "null");

+            $sql .= " VALUES('".$attrname."',";

+            $sql .= " '".Config::$dbEngine->escape($label)."',";

+            $sql .= " '".Config::$dbEngine->escape($type)."',";

+            $sql .= " ".$pos.",";

+            $sql .= " '".Config::$dbEngine->escape($size)."',";

+            $sql .= " ".($entity === '' ? Globals::$conf->entity : $entity).",";

+            $sql .= " '".Config::$dbEngine->escape($elementtype)."',";

+            $sql .= " ".$unique.",";

+            $sql .= " ".$required.",";

+            $sql .= " '".Config::$dbEngine->escape($params)."',";

+            $sql .= " ".$alwayseditable.",";

+            $sql .= " ".($perms ? "'".Config::$dbEngine->escape($perms)."'" : "null").",";

+            $sql .= " ".($langfile ? "'".Config::$dbEngine->escape($langfile)."'" : "null").",";

+            $sql .= " '".Config::$dbEngine->escape($list)."',";

+            $sql .= " ".($default ? "'".Config::$dbEngine->escape($default)."'" : "null").",";

+            $sql .= " ".($computed ? "'".Config::$dbEngine->escape($computed)."'" : "null").",";

+            $sql .= " ".(is_object(Globals::$user) ? Globals::$user->id : 0).",";

+            $sql .= " ".(is_object(Globals::$user) ? Globals::$user->id : 0).",";

+            $sql .= "'".Config::$dbEngine->idate(dol_now())."',";

+            $sql .= " ".($enabled ? "'".Config::$dbEngine->escape($enabled)."'" : "1").",";

+            $sql .= " ".($help ? "'".Config::$dbEngine->escape($help)."'" : "null");

             $sql .= ')';

 

-            AlDolUtils::dol_syslog(get_class($this) . "::create_label", LOG_DEBUG);

+            AlDolUtils::dol_syslog(get_class($this)."::create_label", LOG_DEBUG);

             if (Config::$dbEngine->query($sql)) {

                 return 1;

             } else {

@@ -415,7 +415,7 @@ 
         if ($elementtype == 'contact')

             $elementtype = 'socpeople';

 

-        $table = $elementtype . '_extrafields';

+        $table = $elementtype.'_extrafields';

         if ($elementtype == 'categorie')

             $table = 'categories_extrafields';

 

@@ -430,15 +430,15 @@ 
 

             if (!$error) {

                 $sql = "SELECT COUNT(rowid) as nb";

-                $sql .= " FROM " . MAIN_DB_PREFIX . "extrafields";

-                $sql .= " WHERE elementtype = '" . $elementtype . "'";

-                $sql .= " AND name = '" . $attrname . "'";

+                $sql .= " FROM ".MAIN_DB_PREFIX."extrafields";

+                $sql .= " WHERE elementtype = '".$elementtype."'";

+                $sql .= " AND name = '".$attrname."'";

                 //$sql.= " AND entity IN (0,".Globals::$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table

                 $resql = Config::$dbEngine->query($sql);

                 if ($resql) {

                     $obj = Config::$dbEngine->fetch_object($resql);

                     if ($obj->nb <= 0) {

-                        $result = Config::$dbEngine->DDLDropField(MAIN_DB_PREFIX . $table, $attrname); // This also drop the unique key

+                        $result = Config::$dbEngine->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key

                         if ($result < 0) {

                             $this->error = Config::$dbEngine->lasterror();

                             $error++;

@@ -472,12 +472,12 @@ 
             $elementtype = 'socpeople';

 

         if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {

-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "extrafields";

-            $sql .= " WHERE name = '" . $attrname . "'";

-            $sql .= " AND entity IN  (0," . Globals::$conf->entity . ')';

-            $sql .= " AND elementtype = '" . $elementtype . "'";

+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";

+            $sql .= " WHERE name = '".$attrname."'";

+            $sql .= " AND entity IN  (0,".Globals::$conf->entity.')';

+            $sql .= " AND elementtype = '".$elementtype."'";

 

-            AlDolUtils::dol_syslog(get_class($this) . "::delete_label", LOG_DEBUG);

+            AlDolUtils::dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);

             $resql = Config::$dbEngine->query($sql);

             if ($resql) {

                 return 1;

@@ -521,7 +521,7 @@ 
         if ($elementtype == 'contact')

             $elementtype = 'socpeople';

 

-        $table = $elementtype . '_extrafields';

+        $table = $elementtype.'_extrafields';

         if ($elementtype == 'categorie')

             $table = 'categories_extrafields';

 

@@ -559,7 +559,7 @@ 
             $field_desc = array('type' => $typedb, 'value' => $lengthdb, 'null' => ($required ? 'NOT NULL' : 'NULL'), 'default' => $default);

 

             if ($type != 'separate') { // No table update when separate type

-                $result = Config::$dbEngine->DDLUpdateField(MAIN_DB_PREFIX . $table, $attrname, $field_desc);

+                $result = Config::$dbEngine->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);

             }

             if ($result > 0 || $type == 'separate') {

                 if ($label) {

@@ -568,11 +568,11 @@ 
                 if ($result > 0) {

                     $sql = '';

                     if ($unique) {

-                        $sql = "ALTER TABLE " . MAIN_DB_PREFIX . $table . " ADD UNIQUE INDEX uk_" . $table . "_" . $attrname . " (" . $attrname . ")";

+                        $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";

                     } else {

-                        $sql = "ALTER TABLE " . MAIN_DB_PREFIX . $table . " DROP INDEX uk_" . $table . "_" . $attrname;

+                        $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;

                     }

-                    AlDolUtils::dol_syslog(get_class($this) . '::update', LOG_DEBUG);

+                    AlDolUtils::dol_syslog(get_class($this).'::update', LOG_DEBUG);

                     $resql = Config::$dbEngine->query($sql, 1, 'dml');

                     return 1;

                 } else {

@@ -617,7 +617,7 @@ 
     {

         // phpcs:enable

         // global $conf, $user;

-        AlDolUtils::dol_syslog(get_class($this) . "::update_label " . $attrname . ", " . $label . ", " . $type . ", " . $size . ", " . $elementtype . ", " . $unique . ", " . $required . ", " . $pos . ", " . $alwayseditable . ", " . $perms . ", " . $list . ", " . $default . ", " . $computed . ", " . $entity . ", " . $langfile . ", " . $enabled . ", " . $totalizable);

+        AlDolUtils::dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);

 

         // Clean parameters

         if ($elementtype == 'thirdparty')

@@ -652,21 +652,21 @@ 
 

             if ($entity === '' || $entity != '0') {

                 // We dont want on all entities, we delete all and current

-                $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . "extrafields";

-                $sql_del .= " WHERE name = '" . $attrname . "'";

-                $sql_del .= " AND entity IN (0, " . ($entity === '' ? Globals::$conf->entity : $entity) . ")";

-                $sql_del .= " AND elementtype = '" . $elementtype . "'";

+                $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";

+                $sql_del .= " WHERE name = '".$attrname."'";

+                $sql_del .= " AND entity IN (0, ".($entity === '' ? Globals::$conf->entity : $entity).")";

+                $sql_del .= " AND elementtype = '".$elementtype."'";

             } else {

                 // We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)

-                $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . "extrafields";

-                $sql_del .= " WHERE name = '" . $attrname . "'";

+                $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";

+                $sql_del .= " WHERE name = '".$attrname."'";

                 $sql_del .= " AND entity = 0";

-                $sql_del .= " AND elementtype = '" . $elementtype . "'";

+                $sql_del .= " AND elementtype = '".$elementtype."'";

             }

             $resql1 = Config::$dbEngine->query($sql_del);

 

-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "extrafields(";

-            $sql .= " name,";  // This is code

+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";

+            $sql .= " name,"; // This is code

             $sql .= " entity,";

             $sql .= " label,";

             $sql .= " type,";

@@ -689,28 +689,28 @@ 
             $sql .= " enabled,";

             $sql .= " help";

             $sql .= ") VALUES (";

-            $sql .= "'" . $attrname . "',";

-            $sql .= " " . ($entity === '' ? Globals::$conf->entity : $entity) . ",";

-            $sql .= " '" . Config::$dbEngine->escape($label) . "',";

-            $sql .= " '" . Config::$dbEngine->escape($type) . "',";

-            $sql .= " '" . Config::$dbEngine->escape($size) . "',";

-            $sql .= " '" . Config::$dbEngine->escape($elementtype) . "',";

-            $sql .= " " . $unique . ",";

-            $sql .= " " . $required . ",";

-            $sql .= " " . ($perms ? "'" . Config::$dbEngine->escape($perms) . "'" : "null") . ",";

-            $sql .= " " . ($langfile ? "'" . Config::$dbEngine->escape($langfile) . "'" : "null") . ",";

-            $sql .= " " . $pos . ",";

-            $sql .= " '" . Config::$dbEngine->escape($alwayseditable) . "',";

-            $sql .= " '" . Config::$dbEngine->escape($params) . "',";

-            $sql .= " '" . Config::$dbEngine->escape($list) . "', ";

-            $sql .= " " . $totalizable . ",";

-            $sql .= " " . (($default != '') ? "'" . Config::$dbEngine->escape($default) . "'" : "null") . ",";

-            $sql .= " " . ($computed ? "'" . Config::$dbEngine->escape($computed) . "'" : "null") . ",";

-            $sql .= " " . Globals::$user->id . ",";

-            $sql .= " " . Globals::$user->id . ",";

-            $sql .= "'" . Config::$dbEngine->idate(dol_now()) . "',";

-            $sql .= "'" . Config::$dbEngine->escape($enabled) . "',";

-            $sql .= " " . ($help ? "'" . Config::$dbEngine->escape($help) . "'" : "null");

+            $sql .= "'".$attrname."',";

+            $sql .= " ".($entity === '' ? Globals::$conf->entity : $entity).",";

+            $sql .= " '".Config::$dbEngine->escape($label)."',";

+            $sql .= " '".Config::$dbEngine->escape($type)."',";

+            $sql .= " '".Config::$dbEngine->escape($size)."',";

+            $sql .= " '".Config::$dbEngine->escape($elementtype)."',";

+            $sql .= " ".$unique.",";

+            $sql .= " ".$required.",";

+            $sql .= " ".($perms ? "'".Config::$dbEngine->escape($perms)."'" : "null").",";

+            $sql .= " ".($langfile ? "'".Config::$dbEngine->escape($langfile)."'" : "null").",";

+            $sql .= " ".$pos.",";

+            $sql .= " '".Config::$dbEngine->escape($alwayseditable)."',";

+            $sql .= " '".Config::$dbEngine->escape($params)."',";

+            $sql .= " '".Config::$dbEngine->escape($list)."', ";

+            $sql .= " ".$totalizable.",";

+            $sql .= " ".(($default != '') ? "'".Config::$dbEngine->escape($default)."'" : "null").",";

+            $sql .= " ".($computed ? "'".Config::$dbEngine->escape($computed)."'" : "null").",";

+            $sql .= " ".Globals::$user->id.",";

+            $sql .= " ".Globals::$user->id.",";

+            $sql .= "'".Config::$dbEngine->idate(dol_now())."',";

+            $sql .= "'".Config::$dbEngine->escape($enabled)."',";

+            $sql .= " ".($help ? "'".Config::$dbEngine->escape($help)."'" : "null");

             $sql .= ")";

 

             $resql2 = Config::$dbEngine->query($sql);

@@ -754,14 +754,14 @@ 
         $array_name_label = array();

 

         // To avoid conflicts with external modules. TODO Remove this.

-        if (!$forceload &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

+        if (!$forceload && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

         return $array_name_label;

 

         // Set array of label of entity

         // TODO Remove completely loading of label. This should be done by presentation.

         $labelmulticompany = array();

         if (!empty(Globals::$conf->multicompany->enabled)) {

-            $sql_entity_name = 'SELECT rowid, label FROM ' . MAIN_DB_PREFIX . 'entity WHERE rowid in (0,' . Globals::$conf->entity . ')';

+            $sql_entity_name = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.Globals::$conf->entity.')';

             $resql_entity_name = Config::$dbEngine->query($sql_entity_name);

             if ($resql_entity_name) {

                 while ($obj = Config::$dbEngine->fetch_object($resql_entity_name)) {

@@ -771,13 +771,13 @@ 
         }

 

         // We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.

-        AlDolUtils::dol_syslog("fetch_name_optionals_label elementtype=" . $elementtype);

+        AlDolUtils::dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);

 

         $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "extrafields";

-        $sql .= " WHERE entity IN (0," . Globals::$conf->entity . ")";

+        $sql .= " FROM ".MAIN_DB_PREFIX."extrafields";

+        $sql .= " WHERE entity IN (0,".Globals::$conf->entity.")";

         if ($elementtype)

-            $sql .= " AND elementtype = '" . $elementtype . "'"; // Filed with object->table_element

+            $sql .= " AND elementtype = '".$elementtype."'"; // Filed with object->table_element

         $sql .= " ORDER BY pos";

 

         $resql = Config::$dbEngine->select($sql);

@@ -809,7 +809,7 @@ 
                 $this->attribute_list[$tab->name] = $tab->list;

                 $this->attribute_totalizable[$tab->name] = $tab->totalizable;

                 $this->attribute_entityid[$tab->name] = $tab->entity;

-                $this->attribute_entitylabel[$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity' . $tab->entity : $labelmulticompany[$tab->entity]);

+                $this->attribute_entitylabel[$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);

 

                 // New usage

                 $this->attributes[$tab->elementtype]['type'][$tab->name] = $tab->type;

@@ -828,7 +828,7 @@ 
                 $this->attributes[$tab->elementtype]['list'][$tab->name] = $tab->list;

                 $this->attributes[$tab->elementtype]['totalizable'][$tab->name] = $tab->totalizable;

                 $this->attributes[$tab->elementtype]['entityid'][$tab->name] = $tab->entity;

-                $this->attributes[$tab->elementtype]['entitylabel'][$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity' . $tab->entity : $labelmulticompany[$tab->entity]);

+                $this->attributes[$tab->elementtype]['entitylabel'][$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);

                 $this->attributes[$tab->elementtype]['enabled'][$tab->name] = $tab->enabled;

                 $this->attributes[$tab->elementtype]['help'][$tab->name] = $tab->help;

             }

@@ -861,13 +861,13 @@ 
         // global $conf, $langs, $form;

 

         if (!is_object($form)) {

-            require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

             $form = new Form(Config::$dbEngine);

         }

 

         $out = '';

 

-        $keyprefix = $keyprefix . 'options_';  // Because we work on extrafields

+        $keyprefix = $keyprefix.'options_'; // Because we work on extrafields

 

         if (!empty($extrafieldsobjectkey)) {

             $label = $this->attributes[$extrafieldsobjectkey]['label'][$key];

@@ -883,7 +883,7 @@ 
             $list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);

             $totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];

             $help = $this->attributes[$extrafieldsobjectkey]['help'][$key];

-            $hidden = (empty($list) ? 1 : 0);  // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+            $hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

         } else { // Old usage

             $label = $this->attribute_label[$key];

             $type = $this->attribute_type[$key];

@@ -897,12 +897,12 @@ 
             $langfile = $this->attribute_langfile[$key];

             $list = $this->attribute_list[$key];

             $totalizable = $this->attribute_totalizable[$key];

-            $hidden = (empty($list) ? 1 : 0);  // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+            $hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

         }

 

         if ($computed) {

             if (!preg_match('/^search_/', $keyprefix))

-                return '<span class="opacitymedium">' . Globals::$langs->trans("AutomaticallyCalculated") . '</span>';

+                return '<span class="opacitymedium">'.Globals::$langs->trans("AutomaticallyCalculated").'</span>';

             else

                 return '';

         }

@@ -942,31 +942,31 @@ 
                 $value = '-1';

 

             // TODO Must also support $moreparam

-            $out = $form->selectDate($value, $keyprefix . $key . $keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

+            $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

         }

         elseif (in_array($type, array('int', 'integer'))) {

             $tmp = explode(',', $size);

             $newsize = $tmp[0];

-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" maxlength="' . $newsize . '" value="' . dol_escape_htmltag($value) . '"' . ($moreparam ? $moreparam : '') . '>';

+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';

         } elseif (preg_match('/varchar/', $type)) {

-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" maxlength="' . $size . '" value="' . dol_escape_htmltag($value) . '"' . ($moreparam ? $moreparam : '') . '>';

+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';

         } elseif (in_array($type, array('mail', 'phone', 'url'))) {

-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';

+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

         } elseif ($type == 'text') {

             if (!preg_match('/search_/', $keyprefix)) {  // If keyprefix is search_ or search_options_, we must just use a simple text field

-                require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

-                $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');

+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+                $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');

                 $out = $doleditor->Create(1);

             } else {

-                $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';

+                $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

             }

         } elseif ($type == 'html') {

             if (!preg_match('/search_/', $keyprefix)) {  // If keyprefix is search_ or search_options_, we must just use a simple text field

-                require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

-                $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+                $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

                 $out = $doleditor->Create(1);

             } else {

-                $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';

+                $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

             }

         } elseif ($type == 'boolean') {

             $checked = '';

@@ -975,33 +975,33 @@ 
             } else {

                 $checked = ' value="1" ';

             }

-            $out = '<input type="checkbox" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . $checked . ' ' . ($moreparam ? $moreparam : '') . '>';

+            $out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';

         } elseif ($type == 'price') {

             if (!empty($value)) {  // $value in memory is a php numeric, we format it into user number format.

                 $value = price($value);

             }

-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ' . Globals::$langs->getCurrencySymbol(Globals::$conf->currency);

+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.Globals::$langs->getCurrencySymbol(Globals::$conf->currency);

         } elseif ($type == 'double') {

             if (!empty($value)) {  // $value in memory is a php numeric, we format it into user number format.

                 $value = price($value);

             }

-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ';

+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';

         } elseif ($type == 'select') {

             $out = '';

-            if (!empty(Globals::$conf->use_javascript_ajax) &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-                $out .= ajax_combobox($keyprefix . $key . $keysuffix, array(), 0);

+            if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+                $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

             }

 

-            $out .= '<select class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '') . '>';

+            $out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';

             $out .= '<option value="0">&nbsp;</option>';

             foreach ($param['options'] as $key => $val) {

                 if ((string) $key == '')

                     continue;

                 list($val, $parent) = explode('|', $val);

-                $out .= '<option value="' . $key . '"';

+                $out .= '<option value="'.$key.'"';

                 $out .= (((string) $value == (string) $key) ? ' selected' : '');

-                $out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');

+                $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

                 $out .= '>';

                 if ($langfile && $val)

                     $out .= Globals::$langs->trans($val);

@@ -1013,12 +1013,12 @@ 
         }

         elseif ($type == 'sellist') {

             $out = '';

-            if (!empty(Globals::$conf->use_javascript_ajax) &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-                $out .= ajax_combobox($keyprefix . $key . $keysuffix, array(), 0);

+            if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+                $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

             }

 

-            $out .= '<select class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '') . '>';

+            $out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';

             if (is_array($param['options'])) {

                 $param_list = array_keys($param['options']);

                 $InfoFieldList = explode(":", $param_list[0]);

@@ -1029,19 +1029,19 @@ 
                 // 2 : key fields name (if differ of rowid)

                 // 3 : key field parent (for dependent lists)

                 // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');

+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');

 

 

                 if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {

                     if (strpos($InfoFieldList[4], 'extra.') !== false) {

-                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';

+                        $keyList = 'main.'.$InfoFieldList[2].' as rowid';

                     } else {

-                        $keyList = $InfoFieldList[2] . ' as rowid';

+                        $keyList = $InfoFieldList[2].' as rowid';

                     }

                 }

                 if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {

                     list($parentName, $parentField) = explode('|', $InfoFieldList[3]);

-                    $keyList .= ', ' . $parentField;

+                    $keyList .= ', '.$parentField;

                 }

 

                 $fields_label = explode('|', $InfoFieldList[1]);

@@ -1051,8 +1051,8 @@ 
                 }

 

                 $sqlwhere = '';

-                $sql = 'SELECT ' . $keyList;

-                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+                $sql = 'SELECT '.$keyList;

+                $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

                 if (!empty($InfoFieldList[4])) {

                     // can use curent entity filter

                     if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {

@@ -1071,24 +1071,24 @@ 
                     }

                     //We have to join on extrafield table

                     if (strpos($InfoFieldList[4], 'extra') !== false) {

-                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';

-                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];

+                        $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+                        $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

                     } else {

-                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];

+                        $sqlwhere .= ' WHERE '.$InfoFieldList[4];

                     }

                 } else {

                     $sqlwhere .= ' WHERE 1=1';

                 }

                 // Some tables may have field, some other not. For the moment we disable it.

                 if (in_array($InfoFieldList[0], array('tablewithentity'))) {

-                    $sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

+                    $sqlwhere .= ' AND entity = '.Globals::$conf->entity;

                 }

                 $sql .= $sqlwhere;

                 //print $sql;

 

-                $sql .= ' ORDER BY ' . implode(', ', $fields_label);

+                $sql .= ' ORDER BY '.implode(', ', $fields_label);

 

-                AlDolUtils::dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);

+                AlDolUtils::dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

                 $resql = Config::$dbEngine->query($sql);

                 if ($resql) {

                     $out .= '<option value="0">&nbsp;</option>';

@@ -1104,7 +1104,7 @@ 
                         if (is_array($fields_label)) {

                             $notrans = true;

                             foreach ($fields_label as $field_toshow) {

-                                $labeltoshow .= $obj->$field_toshow . ' ';

+                                $labeltoshow .= $obj->$field_toshow.' ';

                             }

                         } else {

                             $labeltoshow = $obj->{$InfoFieldList[1]};

@@ -1115,12 +1115,12 @@ 
                             foreach ($fields_label as $field_toshow) {

                                 $translabel = Globals::$langs->trans($obj->$field_toshow);

                                 if ($translabel != $obj->$field_toshow) {

-                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';

+                                    $labeltoshow = dol_trunc($translabel, 18).' ';

                                 } else {

-                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';

+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

                                 }

                             }

-                            $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';

+                            $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

                         } else {

                             if (!$notrans) {

                                 $translabel = Globals::$langs->trans($obj->{$InfoFieldList[1]});

@@ -1133,38 +1133,38 @@ 
                             if (empty($labeltoshow))

                                 $labeltoshow = '(not defined)';

                             if ($value == $obj->rowid) {

-                                $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';

+                                $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

                             }

 

                             if (!empty($InfoFieldList[3]) && $parentField) {

-                                $parent = $parentName . ':' . $obj->{$parentField};

+                                $parent = $parentName.':'.$obj->{$parentField};

                             }

 

-                            $out .= '<option value="' . $obj->rowid . '"';

+                            $out .= '<option value="'.$obj->rowid.'"';

                             $out .= ($value == $obj->rowid ? ' selected' : '');

-                            $out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');

-                            $out .= '>' . $labeltoshow . '</option>';

+                            $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

+                            $out .= '>'.$labeltoshow.'</option>';

                         }

 

                         $i++;

                     }

                     Config::$dbEngine->free($resql);

                 } else {

-                    print 'Error in request ' . $sql . ' ' . Config::$dbEngine->lasterror() . '. Check setup of extra parameters.<br>';

+                    print 'Error in request '.$sql.' '.Config::$dbEngine->lasterror().'. Check setup of extra parameters.<br>';

                 }

             }

             $out .= '</select>';

         } elseif ($type == 'checkbox') {

             $value_arr = explode(',', $value);

-            $out = $form->multiselectarray($keyprefix . $key . $keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');

+            $out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');

         } elseif ($type == 'radio') {

             $out = '';

             foreach ($param['options'] as $keyopt => $val) {

-                $out .= '<input class="flat ' . $morecss . '" type="radio" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '');

-                $out .= ' value="' . $keyopt . '"';

-                $out .= ' id="' . $keyprefix . $key . $keysuffix . '_' . $keyopt . '"';

+                $out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');

+                $out .= ' value="'.$keyopt.'"';

+                $out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';

                 $out .= ($value == $keyopt ? 'checked' : '');

-                $out .= '/><label for="' . $keyprefix . $key . $keysuffix . '_' . $keyopt . '">' . $val . '</label><br>';

+                $out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

             }

         } elseif ($type == 'chkbxlst') {

             if (is_array($value)) {

@@ -1183,17 +1183,17 @@ 
                 // 2 : key fields name (if differ of rowid)

                 // 3 : key field parent (for dependent lists)

                 // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');

+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');

 

                 if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {

-                    list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);

-                    $keyList .= ', ' . $parentField;

+                    list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);

+                    $keyList .= ', '.$parentField;

                 }

                 if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {

                     if (strpos($InfoFieldList[4], 'extra.') !== false) {

-                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';

+                        $keyList = 'main.'.$InfoFieldList[2].' as rowid';

                     } else {

-                        $keyList = $InfoFieldList[2] . ' as rowid';

+                        $keyList = $InfoFieldList[2].' as rowid';

                     }

                 }

 

@@ -1204,8 +1204,8 @@ 
                 }

 

                 $sqlwhere = '';

-                $sql = 'SELECT ' . $keyList;

-                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+                $sql = 'SELECT '.$keyList;

+                $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

                 if (!empty($InfoFieldList[4])) {

 

                     // can use SELECT request

@@ -1229,11 +1229,11 @@ 
                             // Init des compteurs

                             $nbPregRepl = $nbPregSel = 0;

                             // On retire toutes les parenthèses sans = avant

-                            $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*(' . $word . ')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);

+                            $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);

                             // On retire les espaces autour des = et parenthèses

                             $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);

                             // On retire toutes les parenthèses avec = avant

-                            $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word . ')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);

+                            $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);

                             // On retire les espaces autour des = et parenthèses

                             $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);

 

@@ -1242,7 +1242,7 @@ 
                         }

 

                         // Si l'on a un AND ou un OR, avant ou après

-                        preg_match('#(AND|OR|) *(' . $word . ') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

+                        preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

                         while (!empty($matchCondition[0])) {

                             // If the two sides differ but are not empty

                             if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {

@@ -1250,10 +1250,10 @@ 
                                 $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

                             } else {

                                 if (!empty($matchCondition[1])) {

-                                    $boolCond = (( $matchCondition[1] == "AND" ) ? ' AND 1 ' : ' OR 0 ');

-                                    $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond . $matchCondition[3], $InfoFieldList[4]);

+                                    $boolCond = (($matchCondition[1] == "AND") ? ' AND 1 ' : ' OR 0 ');

+                                    $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);

                                 } else if (!empty($matchCondition[3])) {

-                                    $boolCond = (( $matchCondition[3] == "AND" ) ? ' 1 AND ' : ' 0 OR');

+                                    $boolCond = (($matchCondition[3] == "AND") ? ' 1 AND ' : ' 0 OR');

                                     $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);

                                 } else {

                                     $InfoFieldList[4] = 1;

@@ -1261,7 +1261,7 @@ 
                             }

 

                             // Si l'on a un AND ou un OR, avant ou après

-                            preg_match('#(AND|OR|) *(' . $word . ') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

+                            preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

                         }

                     } else {

                         $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

@@ -1269,23 +1269,23 @@ 
 

                     // We have to join on extrafield table

                     if (strpos($InfoFieldList[4], 'extra') !== false) {

-                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';

-                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];

+                        $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+                        $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

                     } else {

-                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];

+                        $sqlwhere .= ' WHERE '.$InfoFieldList[4];

                     }

                 } else {

                     $sqlwhere .= ' WHERE 1=1';

                 }

                 // Some tables may have field, some other not. For the moment we disable it.

                 if (in_array($InfoFieldList[0], array('tablewithentity'))) {

-                    $sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

+                    $sqlwhere .= ' AND entity = '.Globals::$conf->entity;

                 }

                 // $sql.=preg_replace('/^ AND /','',$sqlwhere);

                 // print $sql;

 

                 $sql .= $sqlwhere;

-                AlDolUtils::dol_syslog(get_class($this) . '::showInputField type=chkbxlst', LOG_DEBUG);

+                AlDolUtils::dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);

                 $resql = Config::$dbEngine->query($sql);

                 if ($resql) {

                     $num = Config::$dbEngine->num_rows($resql);

@@ -1303,7 +1303,7 @@ 
                         if (is_array($fields_label)) {

                             $notrans = true;

                             foreach ($fields_label as $field_toshow) {

-                                $labeltoshow .= $obj->$field_toshow . ' ';

+                                $labeltoshow .= $obj->$field_toshow.' ';

                             }

                         } else {

                             $labeltoshow = $obj->{$InfoFieldList[1]};

@@ -1314,9 +1314,9 @@ 
                             foreach ($fields_label as $field_toshow) {

                                 $translabel = Globals::$langs->trans($obj->$field_toshow);

                                 if ($translabel != $obj->$field_toshow) {

-                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';

+                                    $labeltoshow = dol_trunc($translabel, 18).' ';

                                 } else {

-                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';

+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

                                 }

                             }

 

@@ -1338,32 +1338,32 @@ 
                             }

 

                             if (!empty($InfoFieldList[3]) && $parentField) {

-                                $parent = $parentName . ':' . $obj->{$parentField};

+                                $parent = $parentName.':'.$obj->{$parentField};

                             }

 

                             $data[$obj->rowid] = $labeltoshow;

                         }

 

-                        $i ++;

+                        $i++;

                     }

                     Config::$dbEngine->free($resql);

 

-                    $out = $form->multiselectarray($keyprefix . $key . $keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

+                    $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

                 } else {

-                    print 'Error in request ' . $sql . ' ' . Config::$dbEngine->lasterror() . '. Check setup of extra parameters.<br>';

+                    print 'Error in request '.$sql.' '.Config::$dbEngine->lasterror().'. Check setup of extra parameters.<br>';

                 }

             }

         } elseif ($type == 'link') {

-            $param_list = array_keys($param['options']);    // $param_list='ObjectName:classPath'

+            $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

             $showempty = (($required && $default != '') ? 0 : 1);

-            $out = $form->selectForForms($param_list[0], $keyprefix . $key . $keysuffix, $value, $showempty);

+            $out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);

         } elseif ($type == 'password') {

             // If prefix is 'search_', field is used as a filter, we use a common text field.

             $out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.

-            $out .= '<input autocomplete="new-password" type="' . ($keyprefix == 'search_' ? 'text' : 'password') . '" class="flat ' . $morecss . '" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '>';

+            $out .= '<input autocomplete="new-password" type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';

         }

         if (!empty($hidden)) {

-            $out = '<input type="hidden" value="' . $value . '" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '"/>';

+            $out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';

         }

         /* Add comments

           if ($type == 'date') $out.=' (YYYY-MM-DD)';

@@ -1398,7 +1398,7 @@ 
             $langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];

             $list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);

             $help = $this->attributes[$extrafieldsobjectkey]['help'][$key];

-            $hidden = (empty($list) ? 1 : 0);  // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+            $hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

         } else { // Old usage

             $label = $this->attribute_label[$key];

             $type = $this->attribute_type[$key];

@@ -1412,11 +1412,11 @@ 
             $langfile = $this->attribute_langfile[$key];

             $list = dol_eval($this->attribute_list[$key], 1);

             $help = ''; // Not supported with old syntax

-            $hidden = (empty($list) ? 1 : 0);  // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+            $hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

         }

 

         if ($hidden)

-            return '';  // This is a protection. If field is hidden, we should just not call this method.

+            return ''; // This is a protection. If field is hidden, we should just not call this method.

 

 

 

@@ -1447,7 +1447,7 @@ 
             if (!empty($value)) {

                 $checked = ' checked ';

             }

-            $value = '<input type="checkbox" ' . $checked . ' ' . ($moreparam ? $moreparam : '') . ' readonly disabled>';

+            $value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';

         } elseif ($type == 'mail') {

             $value = dol_print_email($value, 0, 0, 0, 64, 1, 1);

         } elseif ($type == 'url') {

@@ -1471,7 +1471,7 @@ 
 

             if (count($InfoFieldList) >= 3) {

                 $selectkey = $InfoFieldList[2];

-                $keyList = $InfoFieldList[2] . ' as rowid';

+                $keyList = $InfoFieldList[2].' as rowid';

             }

 

             $fields_label = explode('|', $InfoFieldList[1]);

@@ -1480,22 +1480,22 @@ 
                 $keyList .= implode(', ', $fields_label);

             }

 

-            $sql = 'SELECT ' . $keyList;

-            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+            $sql = 'SELECT '.$keyList;

+            $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

             if (strpos($InfoFieldList[4], 'extra') !== false) {

                 $sql .= ' as main';

             }

             if ($selectkey == 'rowid' && empty($value)) {

-                $sql .= " WHERE " . $selectkey . "=0";

+                $sql .= " WHERE ".$selectkey."=0";

             } elseif ($selectkey == 'rowid') {

-                $sql .= " WHERE " . $selectkey . "=" . Config::$dbEngine->escape($value);

+                $sql .= " WHERE ".$selectkey."=".Config::$dbEngine->escape($value);

             } else {

-                $sql .= " WHERE " . $selectkey . "='" . Config::$dbEngine->escape($value) . "'";

+                $sql .= " WHERE ".$selectkey."='".Config::$dbEngine->escape($value)."'";

             }

 

             //$sql.= ' AND entity = '.Globals::$conf->entity;

 

-            AlDolUtils::dol_syslog(get_class($this) . ':showOutputField:$type=sellist', LOG_DEBUG);

+            AlDolUtils::dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);

             $resql = Config::$dbEngine->query($sql);

             if ($resql) {

                 $value = ''; // value was used, so now we reste it to use it to build final output

@@ -1512,9 +1512,9 @@ 
                             $translabel = Globals::$langs->trans($obj->$field_toshow);

                         }

                         if ($translabel != $field_toshow) {

-                            $value .= dol_trunc($translabel, 18) . ' ';

+                            $value .= dol_trunc($translabel, 18).' ';

                         } else {

-                            $value .= $obj->$field_toshow . ' ';

+                            $value .= $obj->$field_toshow.' ';

                         }

                     }

                 } else {

@@ -1529,7 +1529,7 @@ 
                     }

                 }

             } else

-                AlDolUtils::dol_syslog(get_class($this) . '::showOutputField error ' . Config::$dbEngine->lasterror(), LOG_WARNING);

+                AlDolUtils::dol_syslog(get_class($this).'::showOutputField error '.Config::$dbEngine->lasterror(), LOG_WARNING);

         }

         elseif ($type == 'radio') {

             $value = $param['options'][$value];

@@ -1539,10 +1539,10 @@ 
             $toprint = array();

             if (is_array($value_arr)) {

                 foreach ($value_arr as $keyval => $valueval) {

-                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $param['options'][$valueval] . '</li>';

+                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';

                 }

             }

-            $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';

+            $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

         } elseif ($type == 'chkbxlst') {

             $value_arr = explode(',', $value);

 

@@ -1554,7 +1554,7 @@ 
 

             if (count($InfoFieldList) >= 3) {

                 $selectkey = $InfoFieldList[2];

-                $keyList = $InfoFieldList[2] . ' as rowid';

+                $keyList = $InfoFieldList[2].' as rowid';

             }

 

             $fields_label = explode('|', $InfoFieldList[1]);

@@ -1563,15 +1563,15 @@ 
                 $keyList .= implode(', ', $fields_label);

             }

 

-            $sql = 'SELECT ' . $keyList;

-            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+            $sql = 'SELECT '.$keyList;

+            $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

             if (strpos($InfoFieldList[4], 'extra') !== false) {

                 $sql .= ' as main';

             }

             // $sql.= " WHERE ".$selectkey."='".Config::$dbEngine->escape($value)."'";

             // $sql.= ' AND entity = '.Globals::$conf->entity;

 

-            AlDolUtils::dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst', LOG_DEBUG);

+            AlDolUtils::dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);

             $resql = Config::$dbEngine->query($sql);

             if ($resql) {

                 $value = ''; // value was used, so now we reste it to use it to build final output

@@ -1588,9 +1588,9 @@ 
                                     $translabel = Globals::$langs->trans($obj->$field_toshow);

                                 }

                                 if ($translabel != $field_toshow) {

-                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . dol_trunc($translabel, 18) . '</li>';

+                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

                                 } else {

-                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $obj->$field_toshow . '</li>';

+                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';

                                 }

                             }

                         } else {

@@ -1599,23 +1599,23 @@ 
                                 $translabel = Globals::$langs->trans($obj->{$InfoFieldList[1]});

                             }

                             if ($translabel != $obj->{$InfoFieldList[1]}) {

-                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . dol_trunc($translabel, 18) . '</li>';

+                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

                             } else {

-                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $obj->{$InfoFieldList[1]} . '</li>';

+                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';

                             }

                         }

                     }

                 }

-                $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';

+                $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

             } else {

-                AlDolUtils::dol_syslog(get_class($this) . '::showOutputField error ' . Config::$dbEngine->lasterror(), LOG_WARNING);

+                AlDolUtils::dol_syslog(get_class($this).'::showOutputField error '.Config::$dbEngine->lasterror(), LOG_WARNING);

             }

         } elseif ($type == 'link') {

             $out = '';

 

             // Only if something to display (perf)

             if ($value) {  // If we have -1 here, pb is into sert, not into ouptu

-                $param_list = array_keys($param['options']);    // $param_list='ObjectName:classPath'

+                $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

 

                 $InfoFieldList = explode(":", $param_list[0]);

                 $classname = $InfoFieldList[0];

@@ -1700,7 +1700,7 @@ 
     {

         // global $langs;

 

-        $out = '<tr class="trextrafieldseparator trextrafieldseparator' . $key . '"><td colspan="2"><strong>';

+        $out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';

         $out .= Globals::$langs->trans($this->attributes[$object->table_element]['label'][$key]);

         $out .= '</strong></td></tr>';

         return $out;

@@ -1748,7 +1748,7 @@ 
 

                 if ($this->attributes[$object->table_element]['required'][$key]) { // Value is required

                     // Check if empty without using GETPOST, value can be alpha, int, array, etc...

-                    if ((!is_array($_POST["options_" . $key]) && empty($_POST["options_" . $key]) && $_POST["options_" . $key] != '0') || (is_array($_POST["options_" . $key]) && empty($_POST["options_" . $key]))) {

+                    if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0') || (is_array($_POST["options_".$key]) && empty($_POST["options_".$key]))) {

                         //print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];

                         $nofillrequired++;

                         $error_field_required[] = Globals::$langs->transnoentitiesnoconv($value);

@@ -1758,31 +1758,31 @@ 
                 if (in_array($key_type, array('date'))) {

                     // Clean parameters

                     // TODO GMT date in memory must be GMT so we should add gm=true in parameters

-                    $value_key = dol_mktime(0, 0, 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]);

+                    $value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);

                 } elseif (in_array($key_type, array('datetime'))) {

                     // Clean parameters

                     // TODO GMT date in memory must be GMT so we should add gm=true in parameters

-                    $value_key = dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]);

+                    $value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);

                 } else if (in_array($key_type, array('checkbox', 'chkbxlst'))) {

-                    $value_arr = GETPOST("options_" . $key, 'array'); // check if an array

+                    $value_arr = GETPOST("options_".$key, 'array'); // check if an array

                     if (!empty($value_arr)) {

                         $value_key = implode($value_arr, ',');

                     } else {

                         $value_key = '';

                     }

                 } else if (in_array($key_type, array('price', 'double'))) {

-                    $value_arr = GETPOST("options_" . $key, 'alpha');

+                    $value_arr = GETPOST("options_".$key, 'alpha');

                     $value_key = price2num($value_arr);

                 } else {

-                    $value_key = GETPOST("options_" . $key);

+                    $value_key = GETPOST("options_".$key);

                 }

 

-                $object->array_options["options_" . $key] = $value_key;

+                $object->array_options["options_".$key] = $value_key;

             }

 

             if ($nofillrequired) {

                 Globals::$langs->load('errors');

-                setEventMessages(Globals::$langs->trans('ErrorFieldsRequired') . ' : ' . implode(', ', $error_field_required), null, 'errors');

+                setEventMessages(Globals::$langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');

                 return -1;

             } else {

                 return 1;

@@ -1822,20 +1822,20 @@ 
 

                 if (in_array($key_type, array('date', 'datetime'))) {

                     // Clean parameters

-                    $value_key = dol_mktime($_POST[$keysuffix . "options_" . $key . $keyprefix . "hour"], $_POST[$keysuffix . "options_" . $key . $keyprefix . "min"], 0, $_POST[$keysuffix . "options_" . $key . $keyprefix . "month"], $_POST[$keysuffix . "options_" . $key . $keyprefix . "day"], $_POST[$keysuffix . "options_" . $key . $keyprefix . "year"]);

+                    $value_key = dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);

                 } else if (in_array($key_type, array('checkbox', 'chkbxlst'))) {

-                    $value_arr = GETPOST($keysuffix . "options_" . $key . $keyprefix);

+                    $value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);

                     // Make sure we get an array even if there's only one checkbox

                     $value_arr = (array) $value_arr;

                     $value_key = implode(',', $value_arr);

                 } else if (in_array($key_type, array('price', 'double'))) {

-                    $value_arr = GETPOST($keysuffix . "options_" . $key . $keyprefix);

+                    $value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);

                     $value_key = price2num($value_arr);

                 } else {

-                    $value_key = GETPOST($keysuffix . "options_" . $key . $keyprefix);

+                    $value_key = GETPOST($keysuffix."options_".$key.$keyprefix);

                 }

 

-                $array_options[$keysuffix . "options_" . $key] = $value_key; // No keyprefix here. keyprefix is used only for read.

+                $array_options[$keysuffix."options_".$key] = $value_key; // No keyprefix here. keyprefix is used only for read.

             }

 

             return $array_options;

Braces +176 added lines, -126 removed lines

@@ -172,15 +172,19 @@ 
      */

     function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1')

     {

-        if (empty($attrname))

-            return -1;

-        if (empty($label))

-            return -1;

-

-        if ($elementtype == 'thirdparty')

-            $elementtype = 'societe';

-        if ($elementtype == 'contact')

-            $elementtype = 'socpeople';

+        if (empty($attrname)) {
+                    return -1;
+        }
+        if (empty($label)) {
+                    return -1;
+        }
+

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
 

         // Create field into database except for separator type which is not stored in database

         if ($type != 'separate') {

@@ -195,10 +199,10 @@ 
                 $this->error = '';

                 $this->errno = 0;

                 return 1;

-            } else

-                return -2;

-        }

-        else {

+            } else {
+                            return -2;
+            }
+        } else {

             return -1;

         }

     }

@@ -222,14 +226,17 @@ 
      */

     private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '')

     {

-        if ($elementtype == 'thirdparty')

-            $elementtype = 'societe';

-        if ($elementtype == 'contact')

-            $elementtype = 'socpeople';

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
 

         $table = $elementtype . '_extrafields';

-        if ($elementtype == 'categorie')

-            $table = 'categories_extrafields';

+        if ($elementtype == 'categorie') {
+                    $table = 'categories_extrafields';
+        }
 

         if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname)) {

             if ($type == 'boolean') {

@@ -262,8 +269,9 @@ 
             } else {

                 $typedb = $type;

                 $lengthdb = $length;

-                if ($type == 'varchar' && empty($lengthdb))

-                    $lengthdb = '255';

+                if ($type == 'varchar' && empty($lengthdb)) {
+                                    $lengthdb = '255';
+                }
             }

             $field_desc = array(

                 'type' => $typedb,

@@ -318,22 +326,29 @@ 
         // phpcs:enable

         // global $conf, $user;

 

-        if ($elementtype == 'thirdparty')

-            $elementtype = 'societe';

-        if ($elementtype == 'contact')

-            $elementtype = 'socpeople';

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
 

         // Clean parameters

-        if (empty($pos))

-            $pos = 0;

-        if (empty($list))

-            $list = '0';

-        if (empty($required))

-            $required = 0;

-        if (empty($unique))

-            $unique = 0;

-        if (empty($alwayseditable))

-            $alwayseditable = 0;

+        if (empty($pos)) {
+                    $pos = 0;
+        }
+        if (empty($list)) {
+                    $list = '0';
+        }
+        if (empty($required)) {
+                    $required = 0;
+        }
+        if (empty($unique)) {
+                    $unique = 0;
+        }
+        if (empty($alwayseditable)) {
+                    $alwayseditable = 0;
+        }
 

         if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname)) {

             if (is_array($param) && count($param) > 0) {

@@ -410,14 +425,17 @@ 
      */

     function delete($attrname, $elementtype = 'member')

     {

-        if ($elementtype == 'thirdparty')

-            $elementtype = 'societe';

-        if ($elementtype == 'contact')

-            $elementtype = 'socpeople';

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
 

         $table = $elementtype . '_extrafields';

-        if ($elementtype == 'categorie')

-            $table = 'categories_extrafields';

+        if ($elementtype == 'categorie') {
+                    $table = 'categories_extrafields';
+        }
 

         $error = 0;

 

@@ -466,10 +484,12 @@ 
         // phpcs:enable

         // global $conf;

 

-        if ($elementtype == 'thirdparty')

-            $elementtype = 'societe';

-        if ($elementtype == 'contact')

-            $elementtype = 'socpeople';

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
 

         if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {

             $sql = "DELETE FROM " . MAIN_DB_PREFIX . "extrafields";

@@ -516,14 +536,17 @@ 
      */

     function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0)

     {

-        if ($elementtype == 'thirdparty')

-            $elementtype = 'societe';

-        if ($elementtype == 'contact')

-            $elementtype = 'socpeople';

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
 

         $table = $elementtype . '_extrafields';

-        if ($elementtype == 'categorie')

-            $table = 'categories_extrafields';

+        if ($elementtype == 'categorie') {
+                    $table = 'categories_extrafields';
+        }
 

         if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {

             if ($type == 'boolean') {

@@ -620,24 +643,31 @@ 
         AlDolUtils::dol_syslog(get_class($this) . "::update_label " . $attrname . ", " . $label . ", " . $type . ", " . $size . ", " . $elementtype . ", " . $unique . ", " . $required . ", " . $pos . ", " . $alwayseditable . ", " . $perms . ", " . $list . ", " . $default . ", " . $computed . ", " . $entity . ", " . $langfile . ", " . $enabled . ", " . $totalizable);

 

         // Clean parameters

-        if ($elementtype == 'thirdparty')

-            $elementtype = 'societe';

-        if ($elementtype == 'contact')

-            $elementtype = 'socpeople';

-

-        if (empty($pos))

-            $pos = 0;

-        if (empty($list))

-            $list = '0';

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
+

+        if (empty($pos)) {
+                    $pos = 0;
+        }
+        if (empty($list)) {
+                    $list = '0';
+        }
         if (empty($totalizable)) {

             $totalizable = 0;

         }

-        if (empty($required))

-            $required = 0;

-        if (empty($unique))

-            $unique = 0;

-        if (empty($alwayseditable))

-            $alwayseditable = 0;

+        if (empty($required)) {
+                    $required = 0;
+        }
+        if (empty($unique)) {
+                    $unique = 0;
+        }
+        if (empty($alwayseditable)) {
+                    $alwayseditable = 0;
+        }
 

         if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {

             Config::$dbEngine->begin();

@@ -741,21 +771,26 @@ 
         // phpcs:enable

         // global $conf;

 

-        if (empty($elementtype))

-            return array();

+        if (empty($elementtype)) {
+                    return array();
+        }
 

-        if ($elementtype == 'thirdparty')

-            $elementtype = 'societe';

-        if ($elementtype == 'contact')

-            $elementtype = 'socpeople';

-        if ($elementtype == 'order_supplier')

-            $elementtype = 'commande_fournisseur';

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
+        if ($elementtype == 'order_supplier') {
+                    $elementtype = 'commande_fournisseur';
+        }
 

         $array_name_label = array();

 

         // To avoid conflicts with external modules. TODO Remove this.

-        if (!$forceload &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

-        return $array_name_label;

+        if (!$forceload &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+                return $array_name_label;
+        }
 

         // Set array of label of entity

         // TODO Remove completely loading of label. This should be done by presentation.

@@ -776,8 +811,10 @@ 
         $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";

         $sql .= " FROM " . MAIN_DB_PREFIX . "extrafields";

         $sql .= " WHERE entity IN (0," . Globals::$conf->entity . ")";

-        if ($elementtype)

-            $sql .= " AND elementtype = '" . $elementtype . "'"; // Filed with object->table_element

+        if ($elementtype) {
+                    $sql .= " AND elementtype = '" . $elementtype . "'";
+        }
+        // Filed with object->table_element

         $sql .= " ORDER BY pos";

 

         $resql = Config::$dbEngine->select($sql);

@@ -901,10 +938,11 @@ 
         }

 

         if ($computed) {

-            if (!preg_match('/^search_/', $keyprefix))

-                return '<span class="opacitymedium">' . Globals::$langs->trans("AutomaticallyCalculated") . '</span>';

-            else

-                return '';

+            if (!preg_match('/^search_/', $keyprefix)) {
+                            return '<span class="opacitymedium">' . Globals::$langs->trans("AutomaticallyCalculated") . '</span>';
+            } else {
+                            return '';
+            }
         }

 

         if (empty($morecss)) {

@@ -938,13 +976,13 @@ 
             $showtime = in_array($type, array('datetime')) ? 1 : 0;

 

             // Do not show current date when field not required (see selectDate() method)

-            if (!$required && $value == '')

-                $value = '-1';

+            if (!$required && $value == '') {
+                            $value = '-1';
+            }
 

             // TODO Must also support $moreparam

             $out = $form->selectDate($value, $keyprefix . $key . $keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

-        }

-        elseif (in_array($type, array('int', 'integer'))) {

+        } elseif (in_array($type, array('int', 'integer'))) {

             $tmp = explode(',', $size);

             $newsize = $tmp[0];

             $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" maxlength="' . $newsize . '" value="' . dol_escape_htmltag($value) . '"' . ($moreparam ? $moreparam : '') . '>';

@@ -996,22 +1034,23 @@ 
             $out .= '<select class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '') . '>';

             $out .= '<option value="0">&nbsp;</option>';

             foreach ($param['options'] as $key => $val) {

-                if ((string) $key == '')

-                    continue;

+                if ((string) $key == '') {
+                                    continue;
+                }
                 list($val, $parent) = explode('|', $val);

                 $out .= '<option value="' . $key . '"';

                 $out .= (((string) $value == (string) $key) ? ' selected' : '');

                 $out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');

                 $out .= '>';

-                if ($langfile && $val)

-                    $out .= Globals::$langs->trans($val);

-                else

-                    $out .= $val;

+                if ($langfile && $val) {
+                                    $out .= Globals::$langs->trans($val);
+                } else {
+                                    $out .= $val;
+                }
                 $out .= '</option>';

             }

             $out .= '</select>';

-        }

-        elseif ($type == 'sellist') {

+        } elseif ($type == 'sellist') {

             $out = '';

             if (!empty(Globals::$conf->use_javascript_ajax) &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

                 include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

@@ -1130,8 +1169,9 @@ 
                                     $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

                                 }

                             }

-                            if (empty($labeltoshow))

-                                $labeltoshow = '(not defined)';

+                            if (empty($labeltoshow)) {
+                                                            $labeltoshow = '(not defined)';
+                            }
                             if ($value == $obj->rowid) {

                                 $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';

                             }

@@ -1330,8 +1370,9 @@ 
                                     $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

                                 }

                             }

-                            if (empty($labeltoshow))

-                                $labeltoshow = '(not defined)';

+                            if (empty($labeltoshow)) {
+                                                            $labeltoshow = '(not defined)';
+                            }
 

                             if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

                                 $data[$obj->rowid] = $labeltoshow;

@@ -1415,8 +1456,10 @@ 
             $hidden = (empty($list) ? 1 : 0);  // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

         }

 

-        if ($hidden)

-            return '';  // This is a protection. If field is hidden, we should just not call this method.

+        if ($hidden) {
+                    return '';
+        }
+        // This is a protection. If field is hidden, we should just not call this method.

 

 

 

@@ -1457,12 +1500,12 @@ 
         } elseif ($type == 'price') {

             $value = price($value, 0, Globals::$langs, 0, 0, -1, Globals::$conf->currency);

         } elseif ($type == 'select') {

-            if ($langfile && $param['options'][$value])

-                $value = Globals::$langs->trans($param['options'][$value]);

-            else

-                $value = $param['options'][$value];

-        }

-        elseif ($type == 'sellist') {

+            if ($langfile && $param['options'][$value]) {
+                            $value = Globals::$langs->trans($param['options'][$value]);
+            } else {
+                            $value = $param['options'][$value];
+            }
+        } elseif ($type == 'sellist') {

             $param_list = array_keys($param['options']);

             $InfoFieldList = explode(":", $param_list[0]);

 

@@ -1528,10 +1571,10 @@ 
                         $value = $obj->{$InfoFieldList[1]};

                     }

                 }

-            } else

-                AlDolUtils::dol_syslog(get_class($this) . '::showOutputField error ' . Config::$dbEngine->lasterror(), LOG_WARNING);

-        }

-        elseif ($type == 'radio') {

+            } else {
+                            AlDolUtils::dol_syslog(get_class($this) . '::showOutputField error ' . Config::$dbEngine->lasterror(), LOG_WARNING);
+            }
+        } elseif ($type == 'radio') {

             $value = $param['options'][$value];

         } elseif ($type == 'checkbox') {

             $value_arr = explode(',', $value);

@@ -1640,8 +1683,9 @@ 
             $value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);

         } else {

             $showsize = round($size);

-            if ($showsize > 48)

-                $showsize = 48;

+            if ($showsize > 48) {
+                            $showsize = 48;
+            }
         }

 

         //print $type.'-'.$size;

@@ -1661,10 +1705,11 @@ 
     {

         // global $conf, $langs;

 

-        if (!empty($extrafieldsobjectkey))

-            $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];

-        else

-            $type = $this->attribute_type[$key];

+        if (!empty($extrafieldsobjectkey)) {
+                    $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+        } else {
+                    $type = $this->attribute_type[$key];
+        }
 

         $align = '';

 

@@ -1720,18 +1765,21 @@ 
         $nofillrequired = ''; // For error when required field left blank

         $error_field_required = array();

 

-        if (is_array($this->attributes[$object->table_element]['label']))

-            $extralabels = $this->attributes[$object->table_element]['label'];

+        if (is_array($this->attributes[$object->table_element]['label'])) {
+                    $extralabels = $this->attributes[$object->table_element]['label'];
+        }
 

         if (is_array($extralabels)) {

             // Get extra fields

             foreach ($extralabels as $key => $value) {

-                if (!empty($onlykey) && $key != $onlykey)

-                    continue;

+                if (!empty($onlykey) && $key != $onlykey) {
+                                    continue;
+                }
 

                 $key_type = $this->attributes[$object->table_element]['type'][$key];

-                if ($key_type == 'separate')

-                    continue;

+                if ($key_type == 'separate') {
+                                    continue;
+                }
 

                 $enabled = 1;

                 if (isset($this->attributes[$object->table_element]['list'][$key])) {

@@ -1741,10 +1789,12 @@ 
                 if (isset($this->attributes[$object->table_element]['perms'][$key])) {

                     $perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);

                 }

-                if (empty($enabled))

-                    continue;

-                if (empty($perms))

-                    continue;

+                if (empty($enabled)) {
+                                    continue;
+                }
+                if (empty($perms)) {
+                                    continue;
+                }
 

                 if ($this->attributes[$object->table_element]['required'][$key]) { // Value is required

                     // Check if empty without using GETPOST, value can be alpha, int, array, etc...

Base/User.php

Spacing +336 added lines, -336 removed lines

@@ -55,7 +55,7 @@ 
     public $skype;

     public $twitter;

     public $facebook;

-    public $job;   // job position

+    public $job; // job position

     public $signature;

 

     /**

@@ -64,7 +64,7 @@ 
     public $address;

     public $zip;

     public $town;

-    public $state_id;  // The state/department

+    public $state_id; // The state/department

     public $state_code;

     public $state;

     public $office_phone;

@@ -118,26 +118,26 @@ 
     public $datepreviouslogin;

     public $photo;

     public $lang;

-    public $rights;                        // Array of permissions user->rights->permx

-    public $all_permissions_are_loaded;    // All permission are loaded

-    public $nb_rights;              // Number of rights granted to the user

-    private $_tab_loaded = array();     // Cache array of already loaded permissions

-    public $conf;             // To store personal config

-    public $default_values;         // To store default values for user

-    public $lastsearch_values_tmp;  // To store current search criterias for user

-    public $lastsearch_values;      // To store last saved search criterias for user

-    public $users = array();  // To store all tree of users hierarchy

-    public $parentof;    // To store an array of all parents for all ids.

+    public $rights; // Array of permissions user->rights->permx

+    public $all_permissions_are_loaded; // All permission are loaded

+    public $nb_rights; // Number of rights granted to the user

+    private $_tab_loaded = array(); // Cache array of already loaded permissions

+    public $conf; // To store personal config

+    public $default_values; // To store default values for user

+    public $lastsearch_values_tmp; // To store current search criterias for user

+    public $lastsearch_values; // To store last saved search criterias for user

+    public $users = array(); // To store all tree of users hierarchy

+    public $parentof; // To store an array of all parents for all ids.

     private $cache_childids;

-    public $accountancy_code;   // Accountancy code in prevision of the complete accountancy module

-    public $thm;     // Average cost of employee - Used for valuation of time spent

-    public $tjm;     // Average cost of employee

-    public $salary;     // Monthly salary       - Denormalized value from llx_user_employment

-    public $salaryextra;    // Monthly salary extra - Denormalized value from llx_user_employment

-    public $weeklyhours;    // Weekly hours         - Denormalized value from llx_user_employment

-    public $color;      // Define background color for user in agenda

-    public $dateemployment;   // Define date of employment by company

-    public $dateemploymentend;  // Define date of employment end by company

+    public $accountancy_code; // Accountancy code in prevision of the complete accountancy module

+    public $thm; // Average cost of employee - Used for valuation of time spent

+    public $tjm; // Average cost of employee

+    public $salary; // Monthly salary       - Denormalized value from llx_user_employment

+    public $salaryextra; // Monthly salary extra - Denormalized value from llx_user_employment

+    public $weeklyhours; // Weekly hours         - Denormalized value from llx_user_employment

+    public $color; // Define background color for user in agenda

+    public $dateemployment; // Define date of employment by company

+    public $dateemploymentend; // Define date of employment end by company

     public $default_c_exp_tax_cat;

     public $default_range;

     public $fields = array(

@@ -212,37 +212,37 @@ 
         $sql .= " u.color,";

         $sql .= " u.dateemployment, u.dateemploymentend,";

         $sql .= " u.ref_int, u.ref_ext,";

-        $sql .= " u.default_range, u.default_c_exp_tax_cat,";   // Expense report default mode

+        $sql .= " u.default_range, u.default_c_exp_tax_cat,"; // Expense report default mode

         $sql .= " c.code as country_code, c.label as country,";

         $sql .= " d.code_departement as state_code, d.nom as state";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as c ON u.fk_country = c.rowid";

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_departements as d ON u.fk_state = d.rowid";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON u.fk_country = c.rowid";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON u.fk_state = d.rowid";

 

         if ($entity < 0) {

             if ((empty(Globals::$conf->multicompany->enabled) || empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty(Globals::$user->entity))) {

-                $sql .= " WHERE u.entity IN (0," . Globals::$conf->entity . ")";

+                $sql .= " WHERE u.entity IN (0,".Globals::$conf->entity.")";

             } else {

-                $sql .= " WHERE u.entity IS NOT NULL";    // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

+                $sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

             }

         } else {  // The fetch was forced on an entity

             if (!empty(Globals::$conf->multicompany->enabled) && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-                $sql .= " WHERE u.entity IS NOT NULL";    // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

+                $sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

             } else {

-                $sql .= " WHERE u.entity IN (0, " . (($entity != '' && $entity >= 0) ? $entity : Globals::$conf->entity) . ")";   // search in entity provided in parameter

+                $sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : Globals::$conf->entity).")"; // search in entity provided in parameter

             }

         }

 

         if ($sid) {    // permet une recherche du user par son SID ActiveDirectory ou Samba

 //$sql .= " AND (u.ldap_sid = '" . Config::$dbEngine->escape($sid) . "' OR u.login = '" . Config::$dbEngine->escape($login) . "') LIMIT 1";

-            $sql .= " AND (u.ldap_sid = '" . $sid . "' OR u.login = '" . Config::$dbEngine->escape($login) . "') LIMIT 1";

+            $sql .= " AND (u.ldap_sid = '".$sid."' OR u.login = '".Config::$dbEngine->escape($login)."') LIMIT 1";

         } else if ($login) {

 // $sql .= " AND u.login = '" . Config::$dbEngine->escape($login) . "'";

-            $sql .= " AND u.login = '" . $login . "'";

+            $sql .= " AND u.login = '".$login."'";

         } else {

-            $sql .= " AND u.rowid = " . $id;

+            $sql .= " AND u.rowid = ".$id;

         }

-        $sql .= " ORDER BY u.entity ASC";    // Avoid random result when there is 2 login in 2 different entities

+        $sql .= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities

 

         $result = Config::$dbEngine->select($sql);

 // echo "<p>SQL in 2477 of User: '$sql'</p>";

@@ -328,7 +328,7 @@ 
                 $this->datelastlogin = $obj->datel;

                 $this->datepreviouslogin = $obj->datep;

 

-                $this->societe_id = $obj->fk_soc;  // deprecated

+                $this->societe_id = $obj->fk_soc; // deprecated

                 $this->contact_id = $obj->fk_socpeople; // deprecated

                 $this->socid = $obj->fk_soc;

                 $this->contactid = $obj->fk_socpeople;

@@ -349,7 +349,7 @@ 
                 $this->fetch_optionals();

             } else {

                 $this->error = "USERNOTFOUND";

-                AlDolUtils::dol_syslog(get_class($this) . "::fetch user not found", LOG_DEBUG);

+                AlDolUtils::dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG);

                 return 0;

             }

         } else {

@@ -360,9 +360,9 @@ 
 // To get back the global configuration unique to the user

         if ($loadpersonalconf) {

 // Load user->conf for user

-            $sql = "SELECT param, value FROM " . MAIN_DB_PREFIX . "user_param";

-            $sql .= " WHERE fk_user = " . $this->id;

-            $sql .= " AND entity = " . Globals::$conf->entity;

+            $sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";

+            $sql .= " WHERE fk_user = ".$this->id;

+            $sql .= " AND entity = ".Globals::$conf->entity;

 //DolUtils::dol_syslog(get_class($this).'::fetch load personalized conf', LOG_DEBUG);

             $resql = Config::$dbEngine->select($sql);

             if (is_array($resql)) {

@@ -400,9 +400,9 @@ 
 // global $conf;

 // Load user->default_values for user. TODO Save this in memcached ?

         $sql = "SELECT rowid, entity, type, page, param, value";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "default_values";

-        $sql .= " WHERE entity IN (" . ($this->entity > 0 ? $this->entity . ", " : "") . Globals::$conf->entity . ")"; // Entity of user (if defined) + current entity

-        $sql .= " AND user_id IN (0" . ($this->id > 0 ? ", " . $this->id : "") . ")";       // User 0 (all) + me (if defined)

+        $sql .= " FROM ".MAIN_DB_PREFIX."default_values";

+        $sql .= " WHERE entity IN (".($this->entity > 0 ? $this->entity.", " : "").Globals::$conf->entity.")"; // Entity of user (if defined) + current entity

+        $sql .= " AND user_id IN (0".($this->id > 0 ? ", ".$this->id : "").")"; // User 0 (all) + me (if defined)

         $resql = Config::$dbEngine->select($sql);

         if (is_array($resql)) {

             foreach ($resql as $array) {

@@ -450,7 +450,7 @@ 
 

         $entity = (!empty($entity) ? $entity : Globals::$conf->entity);

 

-        AlDolUtils::dol_syslog(get_class($this) . "::addrights $rid, $allmodule, $allperms, $entity");

+        AlDolUtils::dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms, $entity");

         $error = 0;

         $whereforadd = '';

 

@@ -460,9 +460,9 @@ 
 // Si on a demande ajout d'un droit en particulier, on recupere

 // les caracteristiques (module, perms et subperms) de ce droit.

             $sql = "SELECT module, perms, subperms";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def";

-            $sql .= " WHERE id = '" . Config::$dbEngine->escape($rid) . "'";

-            $sql .= " AND entity = " . $entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."rights_def";

+            $sql .= " WHERE id = '".Config::$dbEngine->escape($rid)."'";

+            $sql .= " AND entity = ".$entity;

 

             $result = Config::$dbEngine->query($sql);

             if ($result) {

@@ -476,7 +476,7 @@ 
             }

 

 // Where pour la liste des droits a ajouter

-            $whereforadd = "id=" . Config::$dbEngine->escape($rid);

+            $whereforadd = "id=".Config::$dbEngine->escape($rid);

 // Ajout des droits induits

             if (!empty($subperms)) {

                 $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))";

@@ -493,9 +493,9 @@ 
                 if ($allmodule == 'allmodules') {

                     $whereforadd = 'allmodules';

                 } else {

-                    $whereforadd = "module='" . Config::$dbEngine->escape($allmodule) . "'";

+                    $whereforadd = "module='".Config::$dbEngine->escape($allmodule)."'";

                     if (!empty($allperms)) {

-                        $whereforadd .= " AND perms='" . Config::$dbEngine->escape($allperms) . "'";

+                        $whereforadd .= " AND perms='".Config::$dbEngine->escape($allperms)."'";

                     }

                 }

             }

@@ -505,10 +505,10 @@ 
         if (!empty($whereforadd)) {

 //print "$module-$perms-$subperms";

             $sql = "SELECT id";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def";

-            $sql .= " WHERE entity = " . $entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."rights_def";

+            $sql .= " WHERE entity = ".$entity;

             if (!empty($whereforadd) && $whereforadd != 'allmodules') {

-                $sql .= " AND " . $whereforadd;

+                $sql .= " AND ".$whereforadd;

             }

 

             $result = Config::$dbEngine->query($sql);

@@ -519,10 +519,10 @@ 
                     $obj = Config::$dbEngine->fetch_object($result);

                     $nid = $obj->id;

 

-                    $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights WHERE fk_user = " . $this->id . " AND fk_id=" . $nid . " AND entity = " . $entity;

+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id." AND fk_id=".$nid." AND entity = ".$entity;

                     if (!Config::$dbEngine->query($sql))

                         $error++;

-                    $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_rights (entity, fk_user, fk_id) VALUES (" . $entity . ", " . $this->id . ", " . $nid . ")";

+                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (entity, fk_user, fk_id) VALUES (".$entity.", ".$this->id.", ".$nid.")";

                     if (!Config::$dbEngine->query($sql))

                         $error++;

 

@@ -537,7 +537,7 @@ 
 

         if (!$error && !$notrigger) {

             Globals::$langs->load("other");

-            $this->context = array('audit' => Globals::$langs->trans("PermissionsAdd") . ($rid ? ' (id=' . $rid . ')' : ''));

+            $this->context = array('audit' => Globals::$langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : ''));

 

 // Call trigger

             $result = $this->call_trigger('USER_MODIFY', Globals::$user);

@@ -581,9 +581,9 @@ 
 // Si on a demande supression d'un droit en particulier, on recupere

 // les caracteristiques module, perms et subperms de ce droit.

             $sql = "SELECT module, perms, subperms";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def";

-            $sql .= " WHERE id = '" . Config::$dbEngine->escape($rid) . "'";

-            $sql .= " AND entity = " . $entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."rights_def";

+            $sql .= " WHERE id = '".Config::$dbEngine->escape($rid)."'";

+            $sql .= " AND entity = ".$entity;

 

             $result = Config::$dbEngine->query($sql);

             if ($result) {

@@ -597,7 +597,7 @@ 
             }

 

 // Where pour la liste des droits a supprimer

-            $wherefordel = "id=" . Config::$dbEngine->escape($rid);

+            $wherefordel = "id=".Config::$dbEngine->escape($rid);

 // Suppression des droits induits

             if ($subperms == 'lire' || $subperms == 'read') {

                 $wherefordel .= " OR (module='$module' AND perms='$perms' AND subperms IS NOT NULL)";

@@ -612,9 +612,9 @@ 
                 if ($allmodule == 'allmodules') {

                     $wherefordel = 'allmodules';

                 } else {

-                    $wherefordel = "module='" . Config::$dbEngine->escape($allmodule) . "'";

+                    $wherefordel = "module='".Config::$dbEngine->escape($allmodule)."'";

                     if (!empty($allperms)) {

-                        $whereforadd .= " AND perms='" . Config::$dbEngine->escape($allperms) . "'";

+                        $whereforadd .= " AND perms='".Config::$dbEngine->escape($allperms)."'";

                     }

                 }

             }

@@ -624,10 +624,10 @@ 
         if (!empty($wherefordel)) {

 //print "$module-$perms-$subperms";

             $sql = "SELECT id";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def";

-            $sql .= " WHERE entity = " . $entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."rights_def";

+            $sql .= " WHERE entity = ".$entity;

             if (!empty($wherefordel) && $wherefordel != 'allmodules') {

-                $sql .= " AND " . $wherefordel;

+                $sql .= " AND ".$wherefordel;

             }

 

             $result = Config::$dbEngine->query($sql);

@@ -638,9 +638,9 @@ 
                     $obj = Config::$dbEngine->fetch_object($result);

                     $nid = $obj->id;

 

-                    $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights";

-                    $sql .= " WHERE fk_user = " . $this->id . " AND fk_id=" . $nid;

-                    $sql .= " AND entity = " . $entity;

+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights";

+                    $sql .= " WHERE fk_user = ".$this->id." AND fk_id=".$nid;

+                    $sql .= " AND entity = ".$entity;

                     if (!Config::$dbEngine->query($sql)) {

                         $error++;

                     }

@@ -655,7 +655,7 @@ 
 

         if (!$error && !$notrigger) {

             Globals::$langs->load("other");

-            $this->context = array('audit' => Globals::$langs->trans("PermissionsDelete") . ($rid ? ' (id=' . $rid . ')' : ''));

+            $this->context = array('audit' => Globals::$langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : ''));

 

 // Call trigger

             $result = $this->call_trigger('USER_MODIFY', Globals::$user);

@@ -682,7 +682,7 @@ 
      */

     function clearrights()

     {

-        AlDolUtils::dol_syslog(get_class($this) . "::clearrights reset user->rights");

+        AlDolUtils::dol_syslog(get_class($this)."::clearrights reset user->rights");

         $this->rights = '';

         $this->all_permissions_are_loaded = false;

         $this->_tab_loaded = array();

@@ -715,19 +715,19 @@ 
 // Recuperation des droits utilisateurs + recuperation des droits groupes

 // D'abord les droits utilisateurs

         $sql = "SELECT DISTINCT r.module, r.perms, r.subperms";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user_rights as ur";

-        $sql .= ", " . MAIN_DB_PREFIX . "rights_def as r";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur";

+        $sql .= ", ".MAIN_DB_PREFIX."rights_def as r";

         $sql .= " WHERE r.id = ur.fk_id";

         if (!empty(Globals::$conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {

-            $sql .= " AND r.entity IN (0," . (!empty(Globals::$conf->multicompany->enabled) && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "") . Globals::$conf->entity . ")";

+            $sql .= " AND r.entity IN (0,".(!empty(Globals::$conf->multicompany->enabled) && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").Globals::$conf->entity.")";

         } else {

-            $sql .= " AND ur.entity = " . Globals::$conf->entity;

+            $sql .= " AND ur.entity = ".Globals::$conf->entity;

         }

-        $sql .= " AND ur.fk_user= " . $this->id;

+        $sql .= " AND ur.fk_user= ".$this->id;

         $sql .= " AND r.perms IS NOT NULL";

         if ($moduletag) {

 // $sql .= " AND r.module = '" . Config::$dbEngine->escape($moduletag) . "'";

-            $sql .= " AND r.module = '" . $moduletag . "'";

+            $sql .= " AND r.module = '".$moduletag."'";

         }

 

         $resql = Config::$dbEngine->select($sql);

@@ -768,25 +768,25 @@ 
 

 // Maintenant les droits groupes

         $sql = "SELECT DISTINCT r.module, r.perms, r.subperms";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "usergroup_rights as gr,";

-        $sql .= " " . MAIN_DB_PREFIX . "usergroup_user as gu,";

-        $sql .= " " . MAIN_DB_PREFIX . "rights_def as r";

+        $sql .= " FROM ".MAIN_DB_PREFIX."usergroup_rights as gr,";

+        $sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu,";

+        $sql .= " ".MAIN_DB_PREFIX."rights_def as r";

         $sql .= " WHERE r.id = gr.fk_id";

         if (!empty(Globals::$conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {

             if (!empty(Globals::$conf->multicompany->enabled) && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-                $sql .= " AND gu.entity IN (0," . Globals::$conf->entity . ")";

+                $sql .= " AND gu.entity IN (0,".Globals::$conf->entity.")";

             } else {

-                $sql .= " AND r.entity = " . Globals::$conf->entity;

+                $sql .= " AND r.entity = ".Globals::$conf->entity;

             }

         } else {

-            $sql .= " AND gr.entity = " . Globals::$conf->entity;

-            $sql .= " AND r.entity = " . Globals::$conf->entity;

+            $sql .= " AND gr.entity = ".Globals::$conf->entity;

+            $sql .= " AND r.entity = ".Globals::$conf->entity;

         }

         $sql .= " AND gr.fk_usergroup = gu.fk_usergroup";

-        $sql .= " AND gu.fk_user = " . $this->id;

+        $sql .= " AND gu.fk_user = ".$this->id;

         $sql .= " AND r.perms IS NOT NULL";

         if ($moduletag) {

-            $sql .= " AND r.module = '" . $moduletag . "'";

+            $sql .= " AND r.module = '".$moduletag."'";

         }

 

         $resql = Config::$dbEngine->select($sql);

@@ -866,12 +866,12 @@ 
         Config::$dbEngine->begin();

 

 // Deactivate user

-        $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

-        $sql .= " SET statut = " . $this->statut;

-        $sql .= " WHERE rowid = " . $this->id;

+        $sql = "UPDATE ".MAIN_DB_PREFIX."user";

+        $sql .= " SET statut = ".$this->statut;

+        $sql .= " WHERE rowid = ".$this->id;

         $result = Config::$dbEngine->query($sql);

 

-        AlDolUtils::dol_syslog(get_class($this) . "::setstatus", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);

         if ($result) {

 // Call trigger

             $result = $this->call_trigger('USER_ENABLEDISABLE', Globals::$user);

@@ -908,7 +908,7 @@ 
         }

 

 // Get current categories

-        require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

+        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

         $c = new Categorie(Config::$dbEngine);

         $existing = $c->containing($this->id, Categorie::TYPE_USER, 'id');

 

@@ -951,10 +951,10 @@ 
 

         $this->fetch($this->id);

 

-        AlDolUtils::dol_syslog(get_class($this) . "::delete", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::delete", LOG_DEBUG);

 

 // Remove rights

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights WHERE fk_user = " . $this->id;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id;

 

         if (!$error && !Config::$dbEngine->query($sql)) {

             $error++;

@@ -962,7 +962,7 @@ 
         }

 

 // Remove group

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "usergroup_user WHERE fk_user  = " . $this->id;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user WHERE fk_user  = ".$this->id;

         if (!$error && !Config::$dbEngine->query($sql)) {

             $error++;

             $this->error = Config::$dbEngine->lasterror();

@@ -970,7 +970,7 @@ 
 

 // If contact, remove link

         if ($this->contact_id) {

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "socpeople SET fk_user_creat = null WHERE rowid = " . $this->contact_id;

+            $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE rowid = ".$this->contact_id;

             if (!$error && !Config::$dbEngine->query($sql)) {

                 $error++;

                 $this->error = Config::$dbEngine->lasterror();

@@ -982,14 +982,14 @@ 
             $result = $this->deleteExtraFields();

             if ($result < 0) {

                 $error++;

-                AlDolUtils::dol_syslog(get_class($this) . "::delete error -4 " . $this->error, LOG_ERR);

+                AlDolUtils::dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);

             }

         }

 

 // Remove user

         if (!$error) {

-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . $this->id;

-            AlDolUtils::dol_syslog(get_class($this) . "::delete", LOG_DEBUG);

+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->id;

+            AlDolUtils::dol_syslog(get_class($this)."::delete", LOG_DEBUG);

             if (!Config::$dbEngine->query($sql)) {

                 $error++;

                 $this->error = Config::$dbEngine->lasterror();

@@ -1030,7 +1030,7 @@ 
         if (!isset($this->entity)) {

             $this->entity = Globals::$conf->entity; // If not defined, we use default value

         }

-        AlDolUtils::dol_syslog(get_class($this) . "::create login=" . $this->login . ", user=" . (is_object(Globals::$user) ? Globals::$user->id : ''), LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object(Globals::$user) ? Globals::$user->id : ''), LOG_DEBUG);

 

 // Check parameters

         if (!empty(Globals::$conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {

@@ -1049,11 +1049,11 @@ 
         $error = 0;

         Config::$dbEngine->begin();

 

-        $sql = "SELECT login FROM " . MAIN_DB_PREFIX . "user";

-        $sql .= " WHERE login ='" . Config::$dbEngine->escape($this->login) . "'";

-        $sql .= " AND entity IN (0," . Config::$dbEngine->escape(Globals::$conf->entity) . ")";

+        $sql = "SELECT login FROM ".MAIN_DB_PREFIX."user";

+        $sql .= " WHERE login ='".Config::$dbEngine->escape($this->login)."'";

+        $sql .= " AND entity IN (0,".Config::$dbEngine->escape(Globals::$conf->entity).")";

 

-        AlDolUtils::dol_syslog(get_class($this) . "::create", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::create", LOG_DEBUG);

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

             $num = Config::$dbEngine->num_rows($resql);

@@ -1061,17 +1061,17 @@ 
 

             if ($num) {

                 $this->error = 'ErrorLoginAlreadyExists';

-                AlDolUtils::dol_syslog(get_class($this) . "::create " . $this->error, LOG_WARNING);

+                AlDolUtils::dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);

                 Config::$dbEngine->rollback();

                 return -6;

             } else {

-                $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user (datec,login,ldap_sid,entity)";

-                $sql .= " VALUES('" . Config::$dbEngine->idate($this->datec) . "','" . Config::$dbEngine->escape($this->login) . "','" . Config::$dbEngine->escape($this->ldap_sid) . "'," . Config::$dbEngine->escape($this->entity) . ")";

+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid,entity)";

+                $sql .= " VALUES('".Config::$dbEngine->idate($this->datec)."','".Config::$dbEngine->escape($this->login)."','".Config::$dbEngine->escape($this->ldap_sid)."',".Config::$dbEngine->escape($this->entity).")";

                 $result = Config::$dbEngine->query($sql);

 

-                AlDolUtils::dol_syslog(get_class($this) . "::create", LOG_DEBUG);

+                AlDolUtils::dol_syslog(get_class($this)."::create", LOG_DEBUG);

                 if ($result) {

-                    $this->id = Config::$dbEngine->last_insert_id(MAIN_DB_PREFIX . "user");

+                    $this->id = Config::$dbEngine->last_insert_id(MAIN_DB_PREFIX."user");

 

 // Set default rights

                     if ($this->set_default_rights() < 0) {

@@ -1088,7 +1088,7 @@ 
                     }

 

                     if (!empty(Globals::$conf->global->STOCK_USERSTOCK_AUTOCREATE)) {

-                        require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';

+                        require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';

                         Globals::$langs->load("stocks");

                         $entrepot = new Entrepot(Config::$dbEngine);

                         $entrepot->libelle = Globals::$langs->trans("PersonalStock", $this->getFullName(Globals::$langs));

@@ -1112,7 +1112,7 @@ 
                         return $this->id;

                     } else {

 //$this->error=$interface->error;

-                        AlDolUtils::dol_syslog(get_class($this) . "::create " . $this->error, LOG_ERR);

+                        AlDolUtils::dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);

                         Config::$dbEngine->rollback();

                         return -3;

                     }

@@ -1165,7 +1165,7 @@ 
         $this->employee = 0;

 

         if (empty($login)) {

-            $login = strtolower(substr($contact->firstname, 0, 4)) . strtolower(substr($contact->lastname, 0, 4));

+            $login = strtolower(substr($contact->firstname, 0, 4)).strtolower(substr($contact->lastname, 0, 4));

         }

         $this->login = $login;

 

@@ -1174,15 +1174,15 @@ 
 // Cree et positionne $this->id

         $result = $this->create(Globals::$user);

         if ($result > 0) {

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

-            $sql .= " SET fk_socpeople=" . $contact->id;

+            $sql = "UPDATE ".MAIN_DB_PREFIX."user";

+            $sql .= " SET fk_socpeople=".$contact->id;

             if ($contact->socid) {

-                $sql .= ", fk_soc=" . $contact->socid;

+                $sql .= ", fk_soc=".$contact->socid;

             }

-            $sql .= " WHERE rowid=" . $this->id;

+            $sql .= " WHERE rowid=".$this->id;

             $resql = Config::$dbEngine->query($sql);

 

-            AlDolUtils::dol_syslog(get_class($this) . "::create_from_contact", LOG_DEBUG);

+            AlDolUtils::dol_syslog(get_class($this)."::create_from_contact", LOG_DEBUG);

             if ($resql) {

                 $this->context['createfromcontact'] = 'createfromcontact';

 

@@ -1205,7 +1205,7 @@ 
             }

         } else {

 // $this->error deja positionne

-            AlDolUtils::dol_syslog(get_class($this) . "::create_from_contact - 0");

+            AlDolUtils::dol_syslog(get_class($this)."::create_from_contact - 0");

 

             Config::$dbEngine->rollback();

             return $result;

@@ -1239,7 +1239,7 @@ 
         $this->country_id = $member->country_id;

 

         if (empty($login)) {

-            $login = strtolower(substr($member->firstname, 0, 4)) . strtolower(substr($member->lastname, 0, 4));

+            $login = strtolower(substr($member->firstname, 0, 4)).strtolower(substr($member->lastname, 0, 4));

         }

         $this->login = $login;

 

@@ -1254,11 +1254,11 @@ 
             }

 

             if ($result > 0 && $member->fk_soc) { // If member is linked to a thirdparty

-                $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

-                $sql .= " SET fk_soc=" . $member->fk_soc;

-                $sql .= " WHERE rowid=" . $this->id;

+                $sql = "UPDATE ".MAIN_DB_PREFIX."user";

+                $sql .= " SET fk_soc=".$member->fk_soc;

+                $sql .= " WHERE rowid=".$this->id;

 

-                AlDolUtils::dol_syslog(get_class($this) . "::create_from_member", LOG_DEBUG);

+                AlDolUtils::dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);

                 $resql = Config::$dbEngine->query($sql);

                 if ($resql) {

                     Config::$dbEngine->commit();

@@ -1293,9 +1293,9 @@ 
 // phpcs:enable

         global $conf;

 

-        $sql = "SELECT id FROM " . MAIN_DB_PREFIX . "rights_def";

+        $sql = "SELECT id FROM ".MAIN_DB_PREFIX."rights_def";

         $sql .= " WHERE bydefault = 1";

-        $sql .= " AND entity = " . Globals::$conf->entity;

+        $sql .= " AND entity = ".Globals::$conf->entity;

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -1312,10 +1312,10 @@ 
         $i = 0;

         while ($i < $num) {

 

-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights WHERE fk_user = $this->id AND fk_id=$rd[$i]";

+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = $this->id AND fk_id=$rd[$i]";

             $result = Config::$dbEngine->query($sql);

 

-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_rights (fk_user, fk_id) VALUES ($this->id, $rd[$i])";

+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (fk_user, fk_id) VALUES ($this->id, $rd[$i])";

             $result = Config::$dbEngine->query($sql);

             if (!$result) {

                 return -1;

@@ -1343,7 +1343,7 @@ 
         $nbrowsaffected = 0;

         $error = 0;

 

-        AlDolUtils::dol_syslog(get_class($this) . "::update notrigger=" . $notrigger . ", nosyncmember=" . $nosyncmember . ", nosyncmemberpass=" . $nosyncmemberpass);

+        AlDolUtils::dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass);

 

 // Clean parameters

         $this->lastname = trim($this->lastname);

@@ -1371,7 +1371,7 @@ 
         $this->job = trim($this->job);

         $this->signature = trim($this->signature);

         $this->note = trim($this->note);

-        $this->openid = trim(empty($this->openid) ? '' : $this->openid);    // Avoid warning

+        $this->openid = trim(empty($this->openid) ? '' : $this->openid); // Avoid warning

         $this->admin = $this->admin ? $this->admin : 0;

         $this->address = empty($this->address) ? '' : $this->address;

         $this->zip = empty($this->zip) ? '' : $this->zip;

@@ -1396,59 +1396,59 @@ 
         Config::$dbEngine->begin();

 

 // Update datas

-        $sql = "UPDATE " . MAIN_DB_PREFIX . "user SET";

-        $sql .= " lastname = '" . Config::$dbEngine->escape($this->lastname) . "'";

-        $sql .= ", firstname = '" . Config::$dbEngine->escape($this->firstname) . "'";

-        $sql .= ", employee = " . $this->employee;

-        $sql .= ", login = '" . Config::$dbEngine->escape($this->login) . "'";

-        $sql .= ", api_key = " . ($this->api_key ? "'" . Config::$dbEngine->escape($this->api_key) . "'" : "null");

-        $sql .= ", gender = " . ($this->gender != -1 ? "'" . Config::$dbEngine->escape($this->gender) . "'" : "null"); // 'man' or 'woman'

-        $sql .= ", birth=" . (strval($this->birth) != '' ? "'" . Config::$dbEngine->idate($this->birth) . "'" : 'null');

+        $sql = "UPDATE ".MAIN_DB_PREFIX."user SET";

+        $sql .= " lastname = '".Config::$dbEngine->escape($this->lastname)."'";

+        $sql .= ", firstname = '".Config::$dbEngine->escape($this->firstname)."'";

+        $sql .= ", employee = ".$this->employee;

+        $sql .= ", login = '".Config::$dbEngine->escape($this->login)."'";

+        $sql .= ", api_key = ".($this->api_key ? "'".Config::$dbEngine->escape($this->api_key)."'" : "null");

+        $sql .= ", gender = ".($this->gender != -1 ? "'".Config::$dbEngine->escape($this->gender)."'" : "null"); // 'man' or 'woman'

+        $sql .= ", birth=".(strval($this->birth) != '' ? "'".Config::$dbEngine->idate($this->birth)."'" : 'null');

         if (!empty(Globals::$user->admin)) {

-            $sql .= ", admin = " . $this->admin; // admin flag can be set/unset only by an admin user

-        }

-        $sql .= ", address = '" . Config::$dbEngine->escape($this->address) . "'";

-        $sql .= ", zip = '" . Config::$dbEngine->escape($this->zip) . "'";

-        $sql .= ", town = '" . Config::$dbEngine->escape($this->town) . "'";

-        $sql .= ", fk_state = " . ((!empty($this->state_id) && $this->state_id > 0) ? "'" . Config::$dbEngine->escape($this->state_id) . "'" : "null");

-        $sql .= ", fk_country = " . ((!empty($this->country_id) && $this->country_id > 0) ? "'" . Config::$dbEngine->escape($this->country_id) . "'" : "null");

-        $sql .= ", office_phone = '" . Config::$dbEngine->escape($this->office_phone) . "'";

-        $sql .= ", office_fax = '" . Config::$dbEngine->escape($this->office_fax) . "'";

-        $sql .= ", user_mobile = '" . Config::$dbEngine->escape($this->user_mobile) . "'";

-        $sql .= ", email = '" . Config::$dbEngine->escape($this->email) . "'";

-        $sql .= ", skype = '" . Config::$dbEngine->escape($this->skype) . "'";

-        $sql .= ", twitter = '" . Config::$dbEngine->escape($this->twitter) . "'";

-        $sql .= ", facebook = '" . Config::$dbEngine->escape($this->facebook) . "'";

-        $sql .= ", job = '" . Config::$dbEngine->escape($this->job) . "'";

-        $sql .= ", signature = '" . Config::$dbEngine->escape($this->signature) . "'";

-        $sql .= ", accountancy_code = '" . Config::$dbEngine->escape($this->accountancy_code) . "'";

-        $sql .= ", color = '" . Config::$dbEngine->escape($this->color) . "'";

-        $sql .= ", dateemployment=" . (strval($this->dateemployment) != '' ? "'" . Config::$dbEngine->idate($this->dateemployment) . "'" : 'null');

-        $sql .= ", dateemploymentend=" . (strval($this->dateemploymentend) != '' ? "'" . Config::$dbEngine->idate($this->dateemploymentend) . "'" : 'null');

-        $sql .= ", note = '" . Config::$dbEngine->escape($this->note) . "'";

-        $sql .= ", photo = " . ($this->photo ? "'" . Config::$dbEngine->escape($this->photo) . "'" : "null");

-        $sql .= ", openid = " . ($this->openid ? "'" . Config::$dbEngine->escape($this->openid) . "'" : "null");

-        $sql .= ", fk_user = " . ($this->fk_user > 0 ? "'" . Config::$dbEngine->escape($this->fk_user) . "'" : "null");

+            $sql .= ", admin = ".$this->admin; // admin flag can be set/unset only by an admin user

+        }

+        $sql .= ", address = '".Config::$dbEngine->escape($this->address)."'";

+        $sql .= ", zip = '".Config::$dbEngine->escape($this->zip)."'";

+        $sql .= ", town = '".Config::$dbEngine->escape($this->town)."'";

+        $sql .= ", fk_state = ".((!empty($this->state_id) && $this->state_id > 0) ? "'".Config::$dbEngine->escape($this->state_id)."'" : "null");

+        $sql .= ", fk_country = ".((!empty($this->country_id) && $this->country_id > 0) ? "'".Config::$dbEngine->escape($this->country_id)."'" : "null");

+        $sql .= ", office_phone = '".Config::$dbEngine->escape($this->office_phone)."'";

+        $sql .= ", office_fax = '".Config::$dbEngine->escape($this->office_fax)."'";

+        $sql .= ", user_mobile = '".Config::$dbEngine->escape($this->user_mobile)."'";

+        $sql .= ", email = '".Config::$dbEngine->escape($this->email)."'";

+        $sql .= ", skype = '".Config::$dbEngine->escape($this->skype)."'";

+        $sql .= ", twitter = '".Config::$dbEngine->escape($this->twitter)."'";

+        $sql .= ", facebook = '".Config::$dbEngine->escape($this->facebook)."'";

+        $sql .= ", job = '".Config::$dbEngine->escape($this->job)."'";

+        $sql .= ", signature = '".Config::$dbEngine->escape($this->signature)."'";

+        $sql .= ", accountancy_code = '".Config::$dbEngine->escape($this->accountancy_code)."'";

+        $sql .= ", color = '".Config::$dbEngine->escape($this->color)."'";

+        $sql .= ", dateemployment=".(strval($this->dateemployment) != '' ? "'".Config::$dbEngine->idate($this->dateemployment)."'" : 'null');

+        $sql .= ", dateemploymentend=".(strval($this->dateemploymentend) != '' ? "'".Config::$dbEngine->idate($this->dateemploymentend)."'" : 'null');

+        $sql .= ", note = '".Config::$dbEngine->escape($this->note)."'";

+        $sql .= ", photo = ".($this->photo ? "'".Config::$dbEngine->escape($this->photo)."'" : "null");

+        $sql .= ", openid = ".($this->openid ? "'".Config::$dbEngine->escape($this->openid)."'" : "null");

+        $sql .= ", fk_user = ".($this->fk_user > 0 ? "'".Config::$dbEngine->escape($this->fk_user)."'" : "null");

         if (isset($this->thm) || $this->thm != '') {

-            $sql .= ", thm= " . ($this->thm != '' ? "'" . Config::$dbEngine->escape($this->thm) . "'" : "null");

+            $sql .= ", thm= ".($this->thm != '' ? "'".Config::$dbEngine->escape($this->thm)."'" : "null");

         }

         if (isset($this->tjm) || $this->tjm != '') {

-            $sql .= ", tjm= " . ($this->tjm != '' ? "'" . Config::$dbEngine->escape($this->tjm) . "'" : "null");

+            $sql .= ", tjm= ".($this->tjm != '' ? "'".Config::$dbEngine->escape($this->tjm)."'" : "null");

         }

         if (isset($this->salary) || $this->salary != '') {

-            $sql .= ", salary= " . ($this->salary != '' ? "'" . Config::$dbEngine->escape($this->salary) . "'" : "null");

+            $sql .= ", salary= ".($this->salary != '' ? "'".Config::$dbEngine->escape($this->salary)."'" : "null");

         }

         if (isset($this->salaryextra) || $this->salaryextra != '') {

-            $sql .= ", salaryextra= " . ($this->salaryextra != '' ? "'" . Config::$dbEngine->escape($this->salaryextra) . "'" : "null");

+            $sql .= ", salaryextra= ".($this->salaryextra != '' ? "'".Config::$dbEngine->escape($this->salaryextra)."'" : "null");

         }

-        $sql .= ", weeklyhours= " . ($this->weeklyhours != '' ? "'" . Config::$dbEngine->escape($this->weeklyhours) . "'" : "null");

-        $sql .= ", entity = '" . Config::$dbEngine->escape($this->entity) . "'";

-        $sql .= ", default_range = " . ($this->default_range > 0 ? $this->default_range : 'null');

-        $sql .= ", default_c_exp_tax_cat = " . ($this->default_c_exp_tax_cat > 0 ? $this->default_c_exp_tax_cat : 'null');

+        $sql .= ", weeklyhours= ".($this->weeklyhours != '' ? "'".Config::$dbEngine->escape($this->weeklyhours)."'" : "null");

+        $sql .= ", entity = '".Config::$dbEngine->escape($this->entity)."'";

+        $sql .= ", default_range = ".($this->default_range > 0 ? $this->default_range : 'null');

+        $sql .= ", default_c_exp_tax_cat = ".($this->default_c_exp_tax_cat > 0 ? $this->default_c_exp_tax_cat : 'null');

 

-        $sql .= " WHERE rowid = " . $this->id;

+        $sql .= " WHERE rowid = ".$this->id;

 

-        AlDolUtils::dol_syslog(get_class($this) . "::update", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::update", LOG_DEBUG);

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

             $nbrowsaffected += Config::$dbEngine->affected_rows($resql);

@@ -1466,8 +1466,8 @@ 
 

 // If user is linked to a member, remove old link to this member

             if ($this->fk_member > 0) {

-                AlDolUtils::dol_syslog(get_class($this) . "::update remove link with member. We will recreate it later", LOG_DEBUG);

-                $sql = "UPDATE " . MAIN_DB_PREFIX . "user SET fk_member = NULL where fk_member = " . $this->fk_member;

+                AlDolUtils::dol_syslog(get_class($this)."::update remove link with member. We will recreate it later", LOG_DEBUG);

+                $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL where fk_member = ".$this->fk_member;

                 $resql = Config::$dbEngine->query($sql);

                 if (!$resql) {

                     $this->error = Config::$dbEngine->error();

@@ -1476,8 +1476,8 @@ 
                 }

             }

 // Set link to user

-            AlDolUtils::dol_syslog(get_class($this) . "::update set link with member", LOG_DEBUG);

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "user SET fk_member =" . ($this->fk_member > 0 ? $this->fk_member : 'null') . " where rowid = " . $this->id;

+            AlDolUtils::dol_syslog(get_class($this)."::update set link with member", LOG_DEBUG);

+            $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member =".($this->fk_member > 0 ? $this->fk_member : 'null')." where rowid = ".$this->id;

             $resql = Config::$dbEngine->query($sql);

             if (!$resql) {

                 $this->error = Config::$dbEngine->error();

@@ -1487,9 +1487,9 @@ 
 

             if ($nbrowsaffected) { // If something has changed in data

                 if ($this->fk_member > 0 && !$nosyncmember) {

-                    AlDolUtils::dol_syslog(get_class($this) . "::update user is linked with a member. We try to update member too.", LOG_DEBUG);

+                    AlDolUtils::dol_syslog(get_class($this)."::update user is linked with a member. We try to update member too.", LOG_DEBUG);

 

-                    require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';

+                    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';

 

 // This user is linked with a member, so we also update member information

 // if this is an update.

@@ -1529,7 +1529,7 @@ 
                         if ($result < 0) {

                             $this->error = $adh->error;

                             $this->errors = $adh->errors;

-                            AlDolUtils::dol_syslog(get_class($this) . "::update error after calling adh->update to sync it with user: " . $this->error, LOG_ERR);

+                            AlDolUtils::dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);

                             $error++;

                         }

                     } else {

@@ -1540,9 +1540,9 @@ 
                 }

 

                 if ($this->contact_id > 0 && !$nosynccontact) {

-                    AlDolUtils::dol_syslog(get_class($this) . "::update user is linked with a contact. We try to update contact too.", LOG_DEBUG);

+                    AlDolUtils::dol_syslog(get_class($this)."::update user is linked with a contact. We try to update contact too.", LOG_DEBUG);

 

-                    require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';

+                    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

 

 // This user is linked with a contact, so we also update contact information

 // if this is an update.

@@ -1582,7 +1582,7 @@ 
                         if ($result < 0) {

                             $this->error = $tmpobj->error;

                             $this->errors = $tmpobj->errors;

-                            AlDolUtils::dol_syslog(get_class($this) . "::update error after calling adh->update to sync it with user: " . $this->error, LOG_ERR);

+                            AlDolUtils::dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);

                             $error++;

                         }

                     } else {

@@ -1616,7 +1616,7 @@ 
                 Config::$dbEngine->commit();

                 return $nbrowsaffected;

             } else {

-                AlDolUtils::dol_syslog(get_class($this) . "::update error=" . $this->error, LOG_ERR);

+                AlDolUtils::dol_syslog(get_class($this)."::update error=".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -1;

             }

@@ -1640,21 +1640,21 @@ 
         // $now = AlDolUtils::dol_now();

         $now = date("Y-m-d H:i:s");

 

-        $sql = "UPDATE " . MAIN_DB_PREFIX . "user SET";

+        $sql = "UPDATE ".MAIN_DB_PREFIX."user SET";

         $sql .= " datepreviouslogin = datelastlogin,";

         // $sql .= " datelastlogin = '" . Config::$dbEngine->idate($now) . "',";

         $sql .= " datelastlogin = '{$now}',";

-        $sql .= " tms = tms";    // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion

-        $sql .= " WHERE rowid = " . $this->id;

+        $sql .= " tms = tms"; // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion

+        $sql .= " WHERE rowid = ".$this->id;

 

-        AlDolUtils::dol_syslog(get_class($this) . "::update_last_login_date user->id=" . $this->id . " " . $sql, LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::update_last_login_date user->id=".$this->id." ".$sql, LOG_DEBUG);

         $resql = Config::$dbEngine->exec($sql);

         if ($resql) {

             $this->datepreviouslogin = $this->datelastlogin;

             $this->datelastlogin = $now;

             return 1;

         } else {

-            $this->error = Config::$dbEngine->lasterror() . ' sql=' . $sql;

+            $this->error = Config::$dbEngine->lasterror().' sql='.$sql;

             return -1;

         }

     }

@@ -1672,11 +1672,11 @@ 
     function setPassword($user, $password = '', $changelater = 0, $notrigger = 0, $nosyncmember = 0)

     {

 //global $conf, Globals::$langs;

-        require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

 

         $error = 0;

 

-        AlDolUtils::dol_syslog(get_class($this) . "::setPassword user=" . Globals::$user->id . " password=" . preg_replace('/./i', '*', $password) . " changelater=" . $changelater . " notrigger=" . $notrigger . " nosyncmember=" . $nosyncmember, LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::setPassword user=".Globals::$user->id." password=".preg_replace('/./i', '*', $password)." changelater=".$changelater." notrigger=".$notrigger." nosyncmember=".$nosyncmember, LOG_DEBUG);

 

 // If new password not provided, we generate one

         if (!$password) {

@@ -1694,17 +1694,17 @@ 
 

             Config::$dbEngine->begin();

 

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

-            $sql .= " SET pass_crypted = '" . Config::$dbEngine->escape($password_crypted) . "',";

+            $sql = "UPDATE ".MAIN_DB_PREFIX."user";

+            $sql .= " SET pass_crypted = '".Config::$dbEngine->escape($password_crypted)."',";

             $sql .= " pass_temp = null";

             if (!empty(Globals::$conf->global->DATABASE_PWD_ENCRYPTED)) {

                 $sql .= ", pass = null";

             } else {

-                $sql .= ", pass = '" . Config::$dbEngine->escape($password) . "'";

+                $sql .= ", pass = '".Config::$dbEngine->escape($password)."'";

             }

-            $sql .= " WHERE rowid = " . $this->id;

+            $sql .= " WHERE rowid = ".$this->id;

 

-            AlDolUtils::dol_syslog(get_class($this) . "::setPassword", LOG_DEBUG);

+            AlDolUtils::dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);

             $result = Config::$dbEngine->query($sql);

             if ($result) {

                 if (Config::$dbEngine->affected_rows($result)) {

@@ -1713,7 +1713,7 @@ 
                     $this->pass_indatabase_crypted = $password_crypted;

 

                     if ($this->fk_member && !$nosyncmember) {

-                        require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';

+                        require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';

 

 // This user is linked with a member, so we also update members informations

 // if this is an update.

@@ -1724,7 +1724,7 @@ 
                             $result = $adh->setPassword(Globals::$user, $this->pass, (empty(Globals::$conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1), 1); // Cryptage non gere dans module adherent

                             if ($result < 0) {

                                 $this->error = $adh->error;

-                                AlDolUtils::dol_syslog(get_class($this) . "::setPassword " . $this->error, LOG_ERR);

+                                AlDolUtils::dol_syslog(get_class($this)."::setPassword ".$this->error, LOG_ERR);

                                 $error++;

                             }

                         } else {

@@ -1733,7 +1733,7 @@ 
                         }

                     }

 

-                    AlDolUtils::dol_syslog(get_class($this) . "::setPassword notrigger=" . $notrigger . " error=" . $error, LOG_DEBUG);

+                    AlDolUtils::dol_syslog(get_class($this)."::setPassword notrigger=".$notrigger." error=".$error, LOG_DEBUG);

 

                     if (!$error && !$notrigger) {

 // Call trigger

@@ -1760,11 +1760,11 @@ 
         } else {

 // We store clear password in password temporary field.

 // After receiving confirmation link, we will crypt it and store it in pass_crypted

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

-            $sql .= " SET pass_temp = '" . Config::$dbEngine->escape($password) . "'";

-            $sql .= " WHERE rowid = " . $this->id;

+            $sql = "UPDATE ".MAIN_DB_PREFIX."user";

+            $sql .= " SET pass_temp = '".Config::$dbEngine->escape($password)."'";

+            $sql .= " WHERE rowid = ".$this->id;

 

-            AlDolUtils::dol_syslog(get_class($this) . "::setPassword", LOG_DEBUG); // No log

+            AlDolUtils::dol_syslog(get_class($this)."::setPassword", LOG_DEBUG); // No log

             $result = Config::$dbEngine->query($sql);

             if ($result) {

                 return $password;

@@ -1790,7 +1790,7 @@ 
 //global $conf, Globals::$langs;

 //global $dolibarr_main_url_root;

 

-        require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';

 

         $msgishtml = 0;

 

@@ -1815,36 +1815,36 @@ 
         $subject = $outputlangs->transnoentitiesnoconv("SubjectNewPassword", $appli);

 

 // Define $urlwithroot

-        $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));

-        $urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;  // This is to use external domain name found into config file

+        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

+        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

 

         if (!$changelater) {

-            $url = $urlwithroot . '/';

+            $url = $urlwithroot.'/';

 

-            $mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived") . ".\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("NewKeyIs") . " :\n\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("Login") . " = " . $this->login . "\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("Password") . " = " . $password . "\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived").".\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("NewKeyIs")." :\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("Login")." = ".$this->login."\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("Password")." = ".$password."\n\n";

             $mesg .= "\n";

 

-            $mesg .= $outputlangs->transnoentitiesnoconv("ClickHereToGoTo", $appli) . ': ' . $url . "\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("ClickHereToGoTo", $appli).': '.$url."\n\n";

             $mesg .= "--\n";

             $mesg .= Globals::$user->getFullName($outputlangs); // Username that make then sending

 

-            AlDolUtils::dol_syslog(get_class($this) . "::send_password changelater is off, url=" . $url);

+            AlDolUtils::dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);

         } else {

-            $url = $urlwithroot . '/user/passwordforgotten.php?action=validatenewpassword&username=' . $this->login . "&passwordhash=" . dol_hash($password);

+            $url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.$this->login."&passwordhash=".dol_hash($password);

 

-            $mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived") . "\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("NewKeyWillBe") . " :\n\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("Login") . " = " . $this->login . "\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("Password") . " = " . $password . "\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived")."\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("NewKeyWillBe")." :\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("Login")." = ".$this->login."\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("Password")." = ".$password."\n\n";

             $mesg .= "\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("YouMustClickToChange") . " :\n";

-            $mesg .= $url . "\n\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("ForgetIfNothing") . "\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("YouMustClickToChange")." :\n";

+            $mesg .= $url."\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("ForgetIfNothing")."\n\n";

 

-            AlDolUtils::dol_syslog(get_class($this) . "::send_password changelater is on, url=" . $url);

+            AlDolUtils::dol_syslog(get_class($this)."::send_password changelater is on, url=".$url);

         }

 

         $mailfile = new CMailFile(

@@ -1855,7 +1855,7 @@ 
             return 1;

         } else {

             Globals::$langs->trans("errors");

-            $this->error = Globals::$langs->trans("ErrorFailedToSendPassword") . ' ' . $mailfile->error;

+            $this->error = Globals::$langs->trans("ErrorFailedToSendPassword").' '.$mailfile->error;

             return -1;

         }

     }

@@ -1880,8 +1880,8 @@ 
     {

 // phpcs:enable

         $sql = "SELECT url, login, pass, poste ";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user_clicktodial as u";

-        $sql .= " WHERE u.fk_user = " . $this->id;

+        $sql .= " FROM ".MAIN_DB_PREFIX."user_clicktodial as u";

+        $sql .= " WHERE u.fk_user = ".$this->id;

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -1915,21 +1915,21 @@ 
 // phpcs:enable

         Config::$dbEngine->begin();

 

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_clicktodial";

-        $sql .= " WHERE fk_user = " . $this->id;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_clicktodial";

+        $sql .= " WHERE fk_user = ".$this->id;

 

-        AlDolUtils::dol_syslog(get_class($this) . '::update_clicktodial', LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);

         $result = Config::$dbEngine->query($sql);

 

-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_clicktodial";

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_clicktodial";

         $sql .= " (fk_user,url,login,pass,poste)";

-        $sql .= " VALUES (" . $this->id;

-        $sql .= ", '" . Config::$dbEngine->escape($this->clicktodial_url) . "'";

-        $sql .= ", '" . Config::$dbEngine->escape($this->clicktodial_login) . "'";

-        $sql .= ", '" . Config::$dbEngine->escape($this->clicktodial_password) . "'";

-        $sql .= ", '" . Config::$dbEngine->escape($this->clicktodial_poste) . "')";

+        $sql .= " VALUES (".$this->id;

+        $sql .= ", '".Config::$dbEngine->escape($this->clicktodial_url)."'";

+        $sql .= ", '".Config::$dbEngine->escape($this->clicktodial_login)."'";

+        $sql .= ", '".Config::$dbEngine->escape($this->clicktodial_password)."'";

+        $sql .= ", '".Config::$dbEngine->escape($this->clicktodial_poste)."')";

 

-        AlDolUtils::dol_syslog(get_class($this) . '::update_clicktodial', LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);

         $result = Config::$dbEngine->query($sql);

         if ($result) {

             Config::$dbEngine->commit();

@@ -1959,20 +1959,20 @@ 
 

         Config::$dbEngine->begin();

 

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "usergroup_user";

-        $sql .= " WHERE fk_user  = " . $this->id;

-        $sql .= " AND fk_usergroup = " . $group;

-        $sql .= " AND entity = " . $entity;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";

+        $sql .= " WHERE fk_user  = ".$this->id;

+        $sql .= " AND fk_usergroup = ".$group;

+        $sql .= " AND entity = ".$entity;

 

         $result = Config::$dbEngine->query($sql);

 

-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "usergroup_user (entity, fk_user, fk_usergroup)";

-        $sql .= " VALUES (" . $entity . "," . $this->id . "," . $group . ")";

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_user (entity, fk_user, fk_usergroup)";

+        $sql .= " VALUES (".$entity.",".$this->id.",".$group.")";

 

         $result = Config::$dbEngine->query($sql);

         if ($result) {

             if (!$error && !$notrigger) {

-                $this->newgroupid = $group;    // deprecated. Remove this.

+                $this->newgroupid = $group; // deprecated. Remove this.

                 $this->context = array('audit' => Globals::$langs->trans("UserSetInGroup"), 'newgroupid' => $group);

 

 // Call trigger

@@ -1987,7 +1987,7 @@ 
                 Config::$dbEngine->commit();

                 return 1;

             } else {

-                AlDolUtils::dol_syslog(get_class($this) . "::SetInGroup " . $this->error, LOG_ERR);

+                AlDolUtils::dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -2;

             }

@@ -2016,15 +2016,15 @@ 
 

         Config::$dbEngine->begin();

 

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "usergroup_user";

-        $sql .= " WHERE fk_user  = " . $this->id;

-        $sql .= " AND fk_usergroup = " . $group;

-        $sql .= " AND entity = " . $entity;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";

+        $sql .= " WHERE fk_user  = ".$this->id;

+        $sql .= " AND fk_usergroup = ".$group;

+        $sql .= " AND entity = ".$entity;

 

         $result = Config::$dbEngine->query($sql);

         if ($result) {

             if (!$error && !$notrigger) {

-                $this->oldgroupid = $group;    // deprecated. Remove this.

+                $this->oldgroupid = $group; // deprecated. Remove this.

                 $this->context = array('audit' => Globals::$langs->trans("UserRemovedFromGroup"), 'oldgroupid' => $group);

 

 // Call trigger

@@ -2040,7 +2040,7 @@ 
                 return 1;

             } else {

                 $this->error = $interface->error;

-                AlDolUtils::dol_syslog(get_class($this) . "::RemoveFromGroup " . $this->error, LOG_ERR);

+                AlDolUtils::dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -2;

             }

@@ -2064,7 +2064,7 @@ 
     function getPhotoUrl($width, $height, $cssclass = '', $imagesize = '')

     {

 // $result = '<a href="' . DOL_URL_ROOT . '/user/card.php?id=' . $this->id . '">';

-        $result = '<a href="' . BASE_URI . '?controller=user&method=card&id=' . $this->id . '">';

+        $result = '<a href="'.BASE_URI.'?controller=user&method=card&id='.$this->id.'">';

         $result .= AlForm::showphoto('userphoto', $this, $width, $height, 0, $cssclass, $imagesize);

         $result .= '</a>';

 

@@ -2114,49 +2114,49 @@ 
 

 // Info Login

         $label .= '<div class="centpercent">';

-        $label .= '<u>' . Globals::$langs->trans("User") . '</u><br>';

-        $label .= '<b>' . Globals::$langs->trans('Name') . ':</b> ' . $this->getFullName(Globals::$langs, '');

+        $label .= '<u>'.Globals::$langs->trans("User").'</u><br>';

+        $label .= '<b>'.Globals::$langs->trans('Name').':</b> '.$this->getFullName(Globals::$langs, '');

         if (!empty($this->login)) {

-            $label .= '<br><b>' . Globals::$langs->trans('Login') . ':</b> ' . $this->login;

+            $label .= '<br><b>'.Globals::$langs->trans('Login').':</b> '.$this->login;

         }

-        $label .= '<br><b>' . Globals::$langs->trans("EMail") . ':</b> ' . $this->email;

+        $label .= '<br><b>'.Globals::$langs->trans("EMail").':</b> '.$this->email;

         if (!empty($this->admin)) {

-            $label .= '<br><b>' . Globals::$langs->trans("Administrator") . '</b>: ' . AlDolUtils::yn($this->admin);

+            $label .= '<br><b>'.Globals::$langs->trans("Administrator").'</b>: '.AlDolUtils::yn($this->admin);

         }

         if (!empty($this->socid)) { // Add thirdparty for external users

             $thirdpartystatic = new Societe($db);

             $thirdpartystatic->fetch($this->socid);

             if (empty($hidethirdpartylogo)) {

-                $companylink = ' ' . $thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company

+                $companylink = ' '.$thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company

             }

-            $company = ' (' . Globals::$langs->trans("Company") . ': ' . $thirdpartystatic->name . ')';

+            $company = ' ('.Globals::$langs->trans("Company").': '.$thirdpartystatic->name.')';

         }

-        $type = ($this->socid ? Globals::$langs->trans("External") . $company : Globals::$langs->trans("Internal"));

-        $label .= '<br><b>' . Globals::$langs->trans("Type") . ':</b> ' . $type;

-        $label .= '<br><b>' . Globals::$langs->trans("Status") . '</b>: ' . $this->getLibStatut(0);

+        $type = ($this->socid ? Globals::$langs->trans("External").$company : Globals::$langs->trans("Internal"));

+        $label .= '<br><b>'.Globals::$langs->trans("Type").':</b> '.$type;

+        $label .= '<br><b>'.Globals::$langs->trans("Status").'</b>: '.$this->getLibStatut(0);

         $label .= '</div>';

         if ($infologin > 0) {

             $label .= '<br>';

-            $label .= '<br><u>' . Globals::$langs->trans("Connection") . '</u>';

-            $label .= '<br><b>' . Globals::$langs->trans("IPAddress") . '</b>: ' . $_SERVER["REMOTE_ADDR"];

+            $label .= '<br><u>'.Globals::$langs->trans("Connection").'</u>';

+            $label .= '<br><b>'.Globals::$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];

             if (!empty(Globals::$conf->global->MAIN_MODULE_MULTICOMPANY)) {

-                $label .= '<br><b>' . Globals::$langs->trans("ConnectedOnMultiCompany") . ':</b> ' . Globals::$conf->entity . ' (user entity ' . $this->entity . ')';

+                $label .= '<br><b>'.Globals::$langs->trans("ConnectedOnMultiCompany").':</b> '.Globals::$conf->entity.' (user entity '.$this->entity.')';

             }

-            $label .= '<br><b>' . Globals::$langs->trans("AuthenticationMode") . ':</b> ' . $_SESSION["dol_authmode"] . (empty($dolibarr_main_demo) ? '' : ' (demo)');

-            $label .= '<br><b>' . Globals::$langs->trans("ConnectedSince") . ':</b> ' . AlDolUtils::dol_print_date($this->datelastlogin, "dayhour", 'tzuser');

-            $label .= '<br><b>' . Globals::$langs->trans("PreviousConnexion") . ':</b> ' . AlDolUtils::dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');

-            $label .= '<br><b>' . Globals::$langs->trans("CurrentTheme") . ':</b> ' . Globals::$conf->theme;

-            $label .= '<br><b>' . Globals::$langs->trans("CurrentMenuManager") . ':</b> ' . Globals::$menuManager->name;

+            $label .= '<br><b>'.Globals::$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');

+            $label .= '<br><b>'.Globals::$langs->trans("ConnectedSince").':</b> '.AlDolUtils::dol_print_date($this->datelastlogin, "dayhour", 'tzuser');

+            $label .= '<br><b>'.Globals::$langs->trans("PreviousConnexion").':</b> '.AlDolUtils::dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');

+            $label .= '<br><b>'.Globals::$langs->trans("CurrentTheme").':</b> '.Globals::$conf->theme;

+            $label .= '<br><b>'.Globals::$langs->trans("CurrentMenuManager").':</b> '.Globals::$menuManager->name;

             $s = AlDolUtils::picto_from_langcode(Globals::$langs->getDefaultLang());

-            $label .= '<br><b>' . Globals::$langs->trans("CurrentUserLanguage") . ':</b> ' . ($s ? $s . ' ' : '') . Globals::$langs->getDefaultLang();

-            $label .= '<br><b>' . Globals::$langs->trans("Browser") . ':</b> ' . Globals::$conf->browser->name . (Globals::$conf->browser->version ? ' ' . Globals::$conf->browser->version : '') . ' (' . $_SERVER['HTTP_USER_AGENT'] . ')';

-            $label .= '<br><b>' . Globals::$langs->trans("Layout") . ':</b> ' . Globals::$conf->browser->layout;

-            $label .= '<br><b>' . Globals::$langs->trans("Screen") . ':</b> ' . $_SESSION['dol_screenwidth'] . ' x ' . $_SESSION['dol_screenheight'];

+            $label .= '<br><b>'.Globals::$langs->trans("CurrentUserLanguage").':</b> '.($s ? $s.' ' : '').Globals::$langs->getDefaultLang();

+            $label .= '<br><b>'.Globals::$langs->trans("Browser").':</b> '.Globals::$conf->browser->name.(Globals::$conf->browser->version ? ' '.Globals::$conf->browser->version : '').' ('.$_SERVER['HTTP_USER_AGENT'].')';

+            $label .= '<br><b>'.Globals::$langs->trans("Layout").':</b> '.Globals::$conf->browser->layout;

+            $label .= '<br><b>'.Globals::$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];

             if (Globals::$conf->browser->layout == 'phone') {

-                $label .= '<br><b>' . Globals::$langs->trans("Phone") . ':</b> ' . Globals::$langs->trans("Yes");

+                $label .= '<br><b>'.Globals::$langs->trans("Phone").':</b> '.Globals::$langs->trans("Yes");

             }

             if (!empty($_SESSION["disablemodules"])) {

-                $label .= '<br><b>' . Globals::$langs->trans("DisabledModules") . ':</b> <br>' . join(', ', explode(',', $_SESSION["disablemodules"]));

+                $label .= '<br><b>'.Globals::$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));

             }

         }

         if ($infologin < 0) {

@@ -2164,10 +2164,10 @@ 
         }

 

 // $url = DOL_URL_ROOT . '/user/card.php?id=' . $this->id;

-        $url = BASE_URI . '?controller=user&method=card&id=' . $this->id;

+        $url = BASE_URI.'?controller=user&method=card&id='.$this->id;

         if ($option == 'leave') {

 //$url = DOL_URL_ROOT . '/holiday/list.php?id=' . $this->id;

-            $url = BASE_URI . '?controller=holiday&method=list&id=' . $this->id;

+            $url = BASE_URI.'?controller=holiday&method=list&id='.$this->id;

         }

         if ($option != 'nolink') {

 // Add param to save lastsearch_values or not

@@ -2180,16 +2180,16 @@ 
             }

         }

 

-        $linkstart = '<a href="' . $url . '"';

+        $linkstart = '<a href="'.$url.'"';

         $linkclose = "";

         if (empty($notooltip)) {

             if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

                 Globals::$langs->load("users");

                 $label = Globals::$langs->trans("ShowUser");

-                $linkclose .= ' alt="' . AlDolUtils::dol_escape_htmltag($label, 1) . '"';

+                $linkclose .= ' alt="'.AlDolUtils::dol_escape_htmltag($label, 1).'"';

             }

-            $linkclose .= ' title="' . AlDolUtils::dol_escape_htmltag($label, 1) . '"';

-            $linkclose .= ' class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"';

+            $linkclose .= ' title="'.AlDolUtils::dol_escape_htmltag($label, 1).'"';

+            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';

 

             /*

               Globals::$hookManager->initHooks(array('userdao'));

@@ -2199,7 +2199,7 @@ 
              */

         }

 

-        $linkstart .= $linkclose . '>';

+        $linkstart .= $linkclose.'>';

         $linkend = '</a>';

 

 //if ($withpictoimg == -1) $result.='<div class="nowrap">';

@@ -2211,15 +2211,15 @@ 
             }

 // Only picto

             if ($withpictoimg > 0) {

-                $picto = '<!-- picto user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '">' . img_object('', 'user', $paddafterimage . ' ' . ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1) . '</div>';

+                $picto = '<!-- picto user --><div class="inline-block nopadding userimg'.($morecss ? ' '.$morecss : '').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).'</div>';

             } else { // Picto must be a photo

-                $picto = '<!-- picto photo user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '"' . ($paddafterimage ? ' ' . $paddafterimage : '') . '>' . AlForm::showphoto('userphoto', $this, 0, 0, 0, 'userphoto' . ($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1) . '</div>';

+                $picto = '<!-- picto photo user --><div class="inline-block nopadding userimg'.($morecss ? ' '.$morecss : '').'"'.($paddafterimage ? ' '.$paddafterimage : '').'>'.AlForm::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1).'</div>';

             }

             $result .= $picto;

         }

         if ($withpictoimg > -2 && $withpictoimg != 2) {

             if (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

-                $result .= '<div class="inline-block nopadding valignmiddle usertext' . ((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled') . ($morecss ? ' ' . $morecss : '') . '">';

+                $result .= '<div class="inline-block nopadding valignmiddle usertext'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').($morecss ? ' '.$morecss : '').'">';

             }

             if ($mode == 'login') {

                 $result .= dol_trunc($this->login, $maxlen);

@@ -2239,7 +2239,7 @@ 
         global $action;

         Globals::$hookManager->initHooks(array('userdao'));

         $parameters = array('id' => $this->id, 'getnomurl' => $result);

-        $reshook = Globals::$hookManager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+        $reshook = Globals::$hookManager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

         if ($reshook > 0) {

             $result = Globals::$hookManager->resPrint;

         } else {

@@ -2263,7 +2263,7 @@ 
         $result = '';

 

 // $linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';

-        $linkstart = '<a href="' . BASE_URI . '?controller=user&method=card&id=' . $this->id . '">';

+        $linkstart = '<a href="'.BASE_URI.'?controller=user&method=card&id='.$this->id.'">';

         $linkend = '</a>';

 

 //Check user's rights to see an other user

@@ -2273,7 +2273,7 @@ 
 

         if ($option == 'xxx') {

 //$linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';

-            $linkstart = '<a href="' . BASE_URI . '?controller=user&method=card.php&id=' . $this->id . '">';

+            $linkstart = '<a href="'.BASE_URI.'?controller=user&method=card.php&id='.$this->id.'">';

             $linkend = '</a>';

         }

 

@@ -2330,9 +2330,9 @@ 
             }

         } elseif ($mode == 2) {

             if ($statut == 1) {

-                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Enabled');

+                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.Globals::$langs->trans('Enabled');

             } elseif ($statut == 0) {

-                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Disabled');

+                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.Globals::$langs->trans('Disabled');

             }

         } elseif ($mode == 3) {

             if ($statut == 1) {

@@ -2342,15 +2342,15 @@ 
             }

         } elseif ($mode == 4) {

             if ($statut == 1) {

-                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Enabled');

+                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.Globals::$langs->trans('Enabled');

             } elseif ($statut == 0) {

-                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Disabled');

+                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.Globals::$langs->trans('Disabled');

             }

         } elseif ($mode == 5) {

             if ($statut == 1) {

-                return Globals::$langs->trans('Enabled') . ' ' . img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

+                return Globals::$langs->trans('Enabled').' '.img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

             } elseif ($statut == 0) {

-                return Globals::$langs->trans('Disabled') . ' ' . img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

+                return Globals::$langs->trans('Disabled').' '.img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

             }

         }

     }

@@ -2371,11 +2371,11 @@ 
         global $conf;

         $dn = '';

         if ($mode == 0) {

-            $dn = Globals::$conf->global->LDAP_KEY_USERS . "=" . $info[Globals::$conf->global->LDAP_KEY_USERS] . "," . Globals::$conf->global->LDAP_USER_DN;

+            $dn = Globals::$conf->global->LDAP_KEY_USERS."=".$info[Globals::$conf->global->LDAP_KEY_USERS].",".Globals::$conf->global->LDAP_USER_DN;

         } elseif ($mode == 1) {

             $dn = Globals::$conf->global->LDAP_USER_DN;

         } elseif ($mode == 2) {

-            $dn = Globals::$conf->global->LDAP_KEY_USERS . "=" . $info[Globals::$conf->global->LDAP_KEY_USERS];

+            $dn = Globals::$conf->global->LDAP_KEY_USERS."=".$info[Globals::$conf->global->LDAP_KEY_USERS];

         }

         return $dn;

     }

@@ -2573,8 +2573,8 @@ 
     {

         $sql = "SELECT u.rowid, u.login as ref, u.datec,";

         $sql .= " u.tms as date_modification, u.entity";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

-        $sql .= " WHERE u.rowid = " . $id;

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

+        $sql .= " WHERE u.rowid = ".$id;

 

         $result = Config::$dbEngine->query($sql);

         if ($result) {

@@ -2603,9 +2603,9 @@ 
     function getNbOfEMailings()

     {

         $sql = "SELECT count(mc.email) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "mailing_cibles as mc";

-        $sql .= " WHERE mc.email = '" . Config::$dbEngine->escape($this->email) . "'";

-        $sql .= " AND mc.statut NOT IN (-1,0)";      // -1 erreur, 0 non envoye, 1 envoye avec succes

+        $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";

+        $sql .= " WHERE mc.email = '".Config::$dbEngine->escape($this->email)."'";

+        $sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -2633,19 +2633,19 @@ 
         global $conf;

 

         $sql = "SELECT count(rowid) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user";

         if ($option == 'superadmin') {

             $sql .= " WHERE entity = 0";

             if ($admin >= 0) {

-                $sql .= " AND admin = " . $admin;

+                $sql .= " AND admin = ".$admin;

             }

         } else {

-            $sql .= " WHERE entity IN (" . getEntity('user', 0) . ")";

+            $sql .= " WHERE entity IN (".getEntity('user', 0).")";

             if ($limitTo == 'active') {

                 $sql .= " AND statut = 1";

             }

             if ($admin >= 0) {

-                $sql .= " AND admin = " . $admin;

+                $sql .= " AND admin = ".$admin;

             }

         }

 

@@ -2696,7 +2696,7 @@ 
 

         $result = $this->update(Globals::$user);

 

-        AlDolUtils::dol_syslog(get_class($this) . "::update_ldap2dolibarr result=" . $result, LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::update_ldap2dolibarr result=".$result, LOG_DEBUG);

 

         return $result;

     }

@@ -2711,10 +2711,10 @@ 
     function get_children()

     {

 // phpcs:enable

-        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "user";

-        $sql .= " WHERE fk_user = " . $this->id;

+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user";

+        $sql .= " WHERE fk_user = ".$this->id;

 

-        AlDolUtils::dol_syslog(get_class($this) . "::get_children result=" . $result, LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::get_children result=".$result, LOG_DEBUG);

         $res = Config::$dbEngine->query($sql);

         if ($res) {

             $this->users = array();

@@ -2743,11 +2743,11 @@ 
 

 // Load array[child]=parent

         $sql = "SELECT fk_user as id_parent, rowid as id_son";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user";

         $sql .= " WHERE fk_user <> 0";

-        $sql .= " AND entity IN (" . getEntity('user') . ")";

+        $sql .= " AND entity IN (".getEntity('user').")";

 

-        AlDolUtils::dol_syslog(get_class($this) . "::loadParentOf", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::loadParentOf", LOG_DEBUG);

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

             while ($obj = Config::$dbEngine->fetch_object($resql)) {

@@ -2789,20 +2789,20 @@ 
 

 // Init $this->users array

         $sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.photo, u.entity"; // Distinct reduce pb with old tables with duplicates

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

 // Add fields from hooks

         $parameters = array();

-        $reshook = Globals::$hookManager->executeHooks('printUserListWhere', $parameters);    // Note that $action and $object may have been modified by hook

+        $reshook = Globals::$hookManager->executeHooks('printUserListWhere', $parameters); // Note that $action and $object may have been modified by hook

         if ($reshook > 0) {

             $sql .= Globals::$hookManager->resPrint;

         } else {

-            $sql .= " WHERE u.entity IN (" . getEntity('user') . ")";

+            $sql .= " WHERE u.entity IN (".getEntity('user').")";

         }

         if ($filter) {

-            $sql .= " AND " . $filter;

+            $sql .= " AND ".$filter;

         }

 

-        AlDolUtils::dol_syslog(get_class($this) . "::get_full_tree get user list", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::get_full_tree get user list", LOG_DEBUG);

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

             $i = 0;

@@ -2828,7 +2828,7 @@ 
         }

 

 // We add the fullpath property to each elements of first level (no parent exists)

-        AlDolUtils::dol_syslog(get_class($this) . "::get_full_tree call to build_path_from_id_user", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::get_full_tree call to build_path_from_id_user", LOG_DEBUG);

         foreach ($this->users as $key => $val) {

             $result = $this->build_path_from_id_user($key, 0); // Process a branch from the root user key (this user has no parent)

             if ($result < 0) {

@@ -2840,18 +2840,18 @@ 
 // Exclude leaf including $deleteafterid from tree

         if ($deleteafterid) {

 //print "Look to discard user ".$deleteafterid."\n";

-            $keyfilter1 = '^' . $deleteafterid . '$';

-            $keyfilter2 = '_' . $deleteafterid . '$';

-            $keyfilter3 = '^' . $deleteafterid . '_';

-            $keyfilter4 = '_' . $deleteafterid . '_';

+            $keyfilter1 = '^'.$deleteafterid.'$';

+            $keyfilter2 = '_'.$deleteafterid.'$';

+            $keyfilter3 = '^'.$deleteafterid.'_';

+            $keyfilter4 = '_'.$deleteafterid.'_';

             foreach ($this->users as $key => $val) {

-                if (preg_match('/' . $keyfilter1 . '/', $val['fullpath']) || preg_match('/' . $keyfilter2 . '/', $val['fullpath']) || preg_match('/' . $keyfilter3 . '/', $val['fullpath']) || preg_match('/' . $keyfilter4 . '/', $val['fullpath'])) {

+                if (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath']) || preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath'])) {

                     unset($this->users[$key]);

                 }

             }

         }

 

-        AlDolUtils::dol_syslog(get_class($this) . "::get_full_tree dol_sort_array", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::get_full_tree dol_sort_array", LOG_DEBUG);

         $this->users = dol_sort_array($this->users, 'fullname', 'asc', true, false);

 

 //var_dump($this->users);

@@ -2879,10 +2879,10 @@ 
 

             $idtoscan = $this->id;

 

-            AlDolUtils::dol_syslog("Build childid for id = " . $idtoscan);

+            AlDolUtils::dol_syslog("Build childid for id = ".$idtoscan);

             foreach ($this->users as $id => $val) {

 //var_dump($val['fullpath']);

-                if (preg_match('/_' . $idtoscan . '_/', $val['fullpath'])) {

+                if (preg_match('/_'.$idtoscan.'_/', $val['fullpath'])) {

                     $childids[$val['id']] = $val['id'];

                 }

             }

@@ -2908,16 +2908,16 @@ 
     function build_path_from_id_user($id_user, $protection = 0)

     {

 // phpcs:enable

-        AlDolUtils::dol_syslog(get_class($this) . "::build_path_from_id_user id_user=" . $id_user . " protection=" . $protection, LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::build_path_from_id_user id_user=".$id_user." protection=".$protection, LOG_DEBUG);

 

         if (!empty($this->users[$id_user]['fullpath'])) {

 // Already defined

-            AlDolUtils::dol_syslog(get_class($this) . "::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);

+            AlDolUtils::dol_syslog(get_class($this)."::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);

             return 0;

         }

 

 // Define fullpath and fullname

-        $this->users[$id_user]['fullpath'] = '_' . $id_user;

+        $this->users[$id_user]['fullpath'] = '_'.$id_user;

         $this->users[$id_user]['fullname'] = $this->users[$id_user]['lastname'];

         $i = 0;

         $cursor_user = $id_user;

@@ -2926,11 +2926,11 @@ 
         while (!empty($this->parentof[$cursor_user])) {

             if (in_array($this->parentof[$cursor_user], Globals::$useridfound)) {

                 AlDolUtils::dol_syslog("The hierarchy of user has a recursive loop", LOG_WARNING);

-                return -1;     // Should not happen. Protection against looping hierarchy

+                return -1; // Should not happen. Protection against looping hierarchy

             }

             Globals::$useridfound[] = $this->parentof[$cursor_user];

-            $this->users[$id_user]['fullpath'] = '_' . $this->parentof[$cursor_user] . $this->users[$id_user]['fullpath'];

-            $this->users[$id_user]['fullname'] = $this->users[$this->parentof[$cursor_user]]['lastname'] . ' >> ' . $this->users[$id_user]['fullname'];

+            $this->users[$id_user]['fullpath'] = '_'.$this->parentof[$cursor_user].$this->users[$id_user]['fullpath'];

+            $this->users[$id_user]['fullname'] = $this->users[$this->parentof[$cursor_user]]['lastname'].' >> '.$this->users[$id_user]['fullname'];

             $i++;

             $cursor_user = $this->parentof[$cursor_user];

         }

@@ -2972,10 +2972,10 @@ 
         $this->nb = array();

 

         $sql = "SELECT count(u.rowid) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

         $sql .= " WHERE u.statut > 0";

 //$sql.= " AND employee != 0";

-        $sql .= " AND u.entity IN (" . getEntity('user') . ")";

+        $sql .= " AND u.entity IN (".getEntity('user').")";

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -3040,8 +3040,8 @@ 
         }

 

         $sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user";

-        $sql .= " WHERE rowid = '" . $rowid . "'";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user";

+        $sql .= " WHERE rowid = '".$rowid."'";

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -3051,7 +3051,7 @@ 
                 $obj = Config::$dbEngine->fetch_object($resql);

 

                 if ($mode == 'email') {

-                    $this->user_property = dolGetFirstLastname($obj->firstname, $obj->lastname) . " <" . $obj->email . ">";

+                    $this->user_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";

                 } else if ($mode == 'mobile') {

                     $this->user_property = $obj->user_mobile;

                 }

@@ -3078,7 +3078,7 @@ 
         global $conf;

 

         $sql = "SELECT t.rowid";

-        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t ';

+        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t ';

         $sql .= " WHERE 1";

 

 // Manage filter

@@ -3086,25 +3086,25 @@ 
         if (!empty($filter)) {

             foreach ($filter as $key => $value) {

                 if ($key == 't.rowid') {

-                    $sqlwhere[] = $key . '=' . $value;

+                    $sqlwhere[] = $key.'='.$value;

                 } elseif (strpos($key, 'date') !== false) {

-                    $sqlwhere[] = $key . ' = \'' . Config::$dbEngine->idate($value) . '\'';

+                    $sqlwhere[] = $key.' = \''.Config::$dbEngine->idate($value).'\'';

                 } elseif ($key == 'customsql') {

                     $sqlwhere[] = $value;

                 } else {

-                    $sqlwhere[] = $key . ' LIKE \'%' . Config::$dbEngine->escape($value) . '%\'';

+                    $sqlwhere[] = $key.' LIKE \'%'.Config::$dbEngine->escape($value).'%\'';

                 }

             }

         }

         if (count($sqlwhere) > 0) {

-            $sql .= ' AND (' . implode(' ' . $filtermode . ' ', $sqlwhere) . ')';

+            $sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';

         }

         $sql .= Config::$dbEngine->order($sortfield, $sortorder);

         if ($limit) {

             $sql .= Config::$dbEngine->plimit($limit + 1, $offset);

         }

 

-        AlDolUtils::dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

Base/AlInterfaces.php

Spacing +34 added lines, -34 removed lines

@@ -25,7 +25,7 @@ 
 class AlInterfaces

 {

 

-    var $dir;    // Directory with all core and external triggers files

+    var $dir; // Directory with all core and external triggers files

 

     /**

      * @var string[] Error codes (or messages)

@@ -63,13 +63,13 @@ 
         // phpcs:enable

         // Check parameters

         if (!is_object($object) || !is_object($conf)) { // Error

-            $this->error = 'function run_triggers called with wrong parameters action=' . $action . ' object=' . is_object($object) . ' user=' . is_object($user) . ' langs=' . is_object($langs) . ' conf=' . is_object($conf);

-            DolUtils::dol_syslog(get_class($this) . '::run_triggers ' . $this->error, LOG_ERR);

+            $this->error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);

+            DolUtils::dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);

             $this->errors[] = $this->error;

             return -1;

         }

         if (!is_object($langs)) { // Warning

-            DolUtils::dol_syslog(get_class($this) . '::run_triggers was called with wrong parameters action=' . $action . ' object=' . is_object($object) . ' user=' . is_object($user) . ' langs=' . is_object($langs) . ' conf=' . is_object($conf), LOG_WARNING);

+            DolUtils::dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);

         }

         /*

           if (!is_object($user)) {     // Warning

@@ -87,7 +87,7 @@ 
         $i = 0;

 

         // $dirtriggers = array_merge(array('/core/triggers'), Globals::$conf->modules_parts['triggers']);

-        $dirtriggers = array_merge(array(BASE_PATH . '/Helpers/triggers'), Globals::$conf->modules_parts['triggers']);

+        $dirtriggers = array_merge(array(BASE_PATH.'/Helpers/triggers'), Globals::$conf->modules_parts['triggers']);

         foreach ($dirtriggers as $reldir) {

             //$dir = DolUtils::dol_buildpath($reldir, 0);

             //$newdir = DolUtils::dol_osencode($dir);

@@ -100,7 +100,7 @@ 
             $handle = opendir($newdir);

             if (is_resource($handle)) {

                 while (($file = readdir($handle)) !== false) {

-                    if (is_readable($newdir . "/" . $file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg)) {

+                    if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg)) {

                         $part1 = $reg[1];

                         $part2 = $reg[2];

                         $part3 = $reg[3];

@@ -114,7 +114,7 @@ 
                         $qualified = true;

                         if (strtolower($reg[2]) != 'all') {

                             $module = preg_replace('/^mod/i', '', $reg[2]);

-                            $constparam = 'MAIN_MODULE_' . strtoupper($module);

+                            $constparam = 'MAIN_MODULE_'.strtoupper($module);

                             if (empty(Globals::$conf->global->$constparam))

                                 $qualified = false;

                         }

@@ -124,26 +124,26 @@ 
                             continue;

                         }

 

-                        $modName = "Interface" . ucfirst($reg[3]);

+                        $modName = "Interface".ucfirst($reg[3]);

                         //print "file=$file - modName=$modName\n";

                         if (in_array($modName, $modules)) {    // $modules = list of modName already loaded

                             $langs->load("errors");

-                            DolUtils::dol_syslog(get_class($this) . "::run_triggers action=" . $action . " " . $langs->trans("ErrorDuplicateTrigger", $newdir . "/" . $file, $fullpathfiles[$modName]), LOG_WARNING);

+                            DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);

                             continue;

                         }

 

                         try {

                             //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";

-                            include_once $newdir . '/' . $file;

+                            include_once $newdir.'/'.$file;

                             //print 'Done for '.$modName."\n";

                         } catch (Exception $e) {

-                            DolUtils::dol_syslog('ko for ' . $modName . " " . $e->getMessage() . "\n", LOG_ERR);

+                            DolUtils::dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);

                         }

 

                         $modules[$i] = $modName;

                         $files[$i] = $file;

-                        $fullpathfiles[$modName] = $newdir . '/' . $file;

-                        $orders[$i] = $part1 . '_' . $part2 . '_' . $part3;   // Set sort criteria value

+                        $fullpathfiles[$modName] = $newdir.'/'.$file;

+                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value

 

                         $i++;

                     }

@@ -167,10 +167,10 @@ 
                     //DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);

                     $result = $objMod->runTrigger($action, $object, $user, $langs, $conf);

                 } elseif (method_exists($objMod, 'run_trigger')) { // Deprecated method

-                    DolUtils::dol_syslog(get_class($this) . "::run_triggers action=" . $action . " Launch old method run_trigger (rename your trigger into runTrigger) for file '" . $files[$key] . "'", LOG_WARNING);

+                    DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);

                     $result = $objMod->run_trigger($action, $object, $user, $langs, $conf);

                 } else {

-                    DolUtils::dol_syslog(get_class($this) . "::run_triggers action=" . $action . " A trigger was declared for class " . get_class($objMod) . " but method runTrigger was not found", LOG_ERR);

+                    DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);

                 }

 

                 if ($result > 0) {

@@ -195,12 +195,12 @@ 
                 }

             }

             else {

-                DolUtils::dol_syslog(get_class($this) . "::run_triggers action=" . $action . " Failed to instantiate trigger for file '" . $files[$key] . "'", LOG_ERR);

+                DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);

             }

         }

 

         if ($nbko) {

-            DolUtils::dol_syslog(get_class($this) . "::run_triggers action=" . $action . " Files found: " . $nbfile . ", Files launched: " . $nbtotal . ", Done: " . $nbok . ", Failed: " . $nbko . " - Nb of error string returned in this->errors = " . count($this->errors), LOG_ERR);

+            DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);

             return -$nbko;

         } else {

             //DolUtils::dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);

@@ -246,7 +246,7 @@ 
             $handle = opendir($newdir);

             if (is_resource($handle)) {

                 while (($file = readdir($handle)) !== false) {

-                    if (is_readable($newdir . '/' . $file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg)) {

+                    if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg)) {

                         if (preg_match('/\.back$/', $file))

                             continue;

 

@@ -254,21 +254,21 @@ 
                         $part2 = $reg[2];

                         $part3 = $reg[3];

 

-                        $modName = 'Interface' . ucfirst($reg[3]);

+                        $modName = 'Interface'.ucfirst($reg[3]);

                         //print "file=$file"; print "modName=$modName"; exit;

                         if (in_array($modName, $modules)) {

                             $langs->load("errors");

-                            print '<div class="error">' . $langs->trans("Error") . ' : ' . $langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/") . '</div>';

+                            print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';

                         } else {

-                            include_once $newdir . '/' . $file;

+                            include_once $newdir.'/'.$file;

                         }

 

                         $files[$i] = $file;

-                        $fullpath[$i] = $dir . '/' . $file;

-                        $relpath[$i] = preg_replace('/^\//', '', $reldir) . '/' . $file;

+                        $fullpath[$i] = $dir.'/'.$file;

+                        $relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;

                         $iscoreorexternal[$i] = ($reldir == '/core/triggers/' ? 'internal' : 'external');

                         $modules[$i] = $modName;

-                        $orders[$i] = $part1 . '_' . $part2 . '_' . $part3;   // Set sort criteria value

+                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value

 

                         $i++;

                     }

@@ -289,7 +289,7 @@ 
                 continue;

 

             if (!class_exists($modName)) {

-                print 'Error: A trigger file was found but its class "' . $modName . '" was not found.' . "<br>\n";

+                print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";

                 continue;

             }

 

@@ -306,7 +306,7 @@ 
             // Check if trigger file is for a particular module

             if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg)) {

                 $module = preg_replace('/^mod/i', '', $reg[2]);

-                $constparam = 'MAIN_MODULE_' . strtoupper($module);

+                $constparam = 'MAIN_MODULE_'.strtoupper($module);

                 if (strtolower($module) == 'all')

                     $disabledbymodule = 0;

                 else if (empty(Globals::$conf->global->$constparam))

@@ -325,21 +325,21 @@ 
             if ($disabledbyname > 0 || $disabledbymodule > 1)

                 $triggers[$j]['status'] = '';

 

-            $text = '<b>' . $langs->trans("Description") . ':</b><br>';

-            $text .= $objMod->getDesc() . '<br>';

-            $text .= '<br><b>' . $langs->trans("Status") . ':</b><br>';

+            $text = '<b>'.$langs->trans("Description").':</b><br>';

+            $text .= $objMod->getDesc().'<br>';

+            $text .= '<br><b>'.$langs->trans("Status").':</b><br>';

             if ($disabledbyname == 1) {

-                $text .= $langs->trans("TriggerDisabledByName") . '<br>';

+                $text .= $langs->trans("TriggerDisabledByName").'<br>';

                 if ($disabledbymodule == 2)

-                    $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module) . '<br>';

+                    $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';

             }

             else {

                 if ($disabledbymodule == 0)

-                    $text .= $langs->trans("TriggerAlwaysActive") . '<br>';

+                    $text .= $langs->trans("TriggerAlwaysActive").'<br>';

                 if ($disabledbymodule == 1)

-                    $text .= $langs->trans("TriggerActiveAsModuleActive", $module) . '<br>';

+                    $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';

                 if ($disabledbymodule == 2)

-                    $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module) . '<br>';

+                    $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';

             }

 

             $triggers[$j]['info'] = $text;

Base/AlCommonObject.php

Indentation +7062 added lines, -7062 removed lines

@@ -21,7389 +21,7389 @@
 

 abstract class AlCommonObject

 {

-	/**

+    /**

      * @var int The object identifier

      */

-	public $id;

-

-	/**

-	 * @var string 		Error string

-	 * @see             errors

-	 */

-	public $error;

-

-	/**

-	 * @var string[]	Array of error strings

-	 */

-	public $errors=array();

-

-	/**

-	 * @var string ID to identify managed object

-	 */

-	public $element;

-

-	/**

-	 * @var string Name of table without prefix where object is stored

-	 */

-	public $table_element;

-

-	/**

-	 * @var int    Name of subtable line

-	 */

-	public $table_element_line='';

-

-	/**

-	 * @var string		Key value used to track if data is coming from import wizard

-	 */

-	public $import_key;

-

-	/**

-	 * @var mixed		Contains data to manage extrafields

-	 */

-	public $array_options=array();

-

-	/**

-	 * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked

-	 */

-	public $linkedObjectsIds;

-

-	/**

-	 * @var mixed		Array of linked objects. Loaded by ->fetchObjectLinked

-	 */

-	public $linkedObjects;

-

-	/**

-	 * @var Object      To store a cloned copy of object before to edit it and keep track of old properties

-	 */

-	public $oldcopy;

-

-	/**

-	 * @var string		Column name of the ref field.

-	 */

-	protected $table_ref_field = '';

-

-

-

-	// Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.

-

-	/**

-	 * @var array<string,mixed>		Can be used to pass information when only object is provided to method

-	 */

-	public $context=array();

-

-	/**

-	 * @var string		Contains canvas name if record is an alternative canvas record

-	 */

-	public $canvas;

-

-	/**

-	 * @var Project The related project

-	 * @see fetch_projet()

-	 */

-	public $project;

-

-	/**

-	 * @var int The related project ID

-	 * @see setProject(), project

-	 */

-	public $fk_project;

-

-	/**

-	 * @deprecated

-	 * @see project

-	 */

-	public $projet;

-

-	/**

-	 * @var Contact a related contact

-	 * @see fetch_contact()

-	 */

-	public $contact;

-

-	/**

-	 * @var int The related contact ID

-	 * @see fetch_contact()

-	 */

-	public $contact_id;

-

-	/**

-	 * @var Societe A related thirdparty

-	 * @see fetch_thirdparty()

-	 */

-	public $thirdparty;

-

-	/**

-	 * @var User A related user

-	 * @see fetch_user()

-	 */

-	public $user;

-

-	/**

-	 * @var string 	The type of originating object ('commande', 'facture', ...)

-	 * @see fetch_origin()

-	 */

-	public $origin;

-

-	/**

-	 * @var int 	The id of originating object

-	 * @see fetch_origin()

-	 */

-	public $origin_id;

-

-	/**

-	 * @var string The object's reference

-	 */

-	public $ref;

-

-	/**

-	 * @var string The object's previous reference

-	 */

-	public $ref_previous;

-

-	/**

-	 * @var string The object's next reference

-	 */

-	public $ref_next;

-

-	/**

-	 * @var string An external reference for the object

-	 */

-	public $ref_ext;

-

-	/**

-	 * @var int The object's status

-	 * @see setStatut()

-	 */

-	public $statut;

-

-	/**

-	 * @var string

-	 * @see getFullAddress()

-	 */

-	public $country;

-

-	/**

-	 * @var int

-	 * @see getFullAddress(), country

-	 */

-	public $country_id;

-

-	/**

-	 * @var string

-	 * @see getFullAddress(), isInEEC(), country

-	 */

-    public $country_code;

+    public $id;

 

     /**

-	 * @var string

-	 * @see getFullAddress()

-	 */

-	public $state;

-

-	/**

-	 * @var int

-	 * @see getFullAddress(), state

-	 */

-	public $state_id;

+     * @var string 		Error string

+     * @see             errors

+     */

+    public $error;

 

-	/**

-	 * @var string

-	 * @see getFullAddress(), state

-	 */

-    public $state_code;

+    /**

+     * @var string[]	Array of error strings

+     */

+    public $errors=array();

 

     /**

-	 * @var string

-	 * @see getFullAddress(), region

-	 */

-	public $region;

+     * @var string ID to identify managed object

+     */

+    public $element;

 

-	/**

-	 * @var string

-	 * @see getFullAddress(), region

-	 */

-    public $region_code;

+    /**

+     * @var string Name of table without prefix where object is stored

+     */

+    public $table_element;

 

-	/**

-	 * @var int

-	 * @see fetch_barcode()

-	 */

-	public $barcode_type;

-

-	/**

-	 * @var string

-	 * @see fetch_barcode(), barcode_type

-	 */

-	public $barcode_type_code;

-

-	/**

-	 * @var string

-	 * @see fetch_barcode(), barcode_type

-	 */

-	public $barcode_type_label;

-

-	/**

-	 * @var string

-	 * @see fetch_barcode(), barcode_type

-	 */

-	public $barcode_type_coder;

-

-	/**

-	 * @var int Payment method ID (cheque, cash, ...)

-	 * @see setPaymentMethods()

-	 */

-	public $mode_reglement_id;

-

-	/**

-	 * @var int Payment terms ID

-	 * @see setPaymentTerms()

-	 */

-	public $cond_reglement_id;

-

-	/**

-	 * @var int Payment terms ID

-	 * @deprecated Kept for compatibility

-	 * @see cond_reglement_id;

-	 */

-	public $cond_reglement;

-

-	/**

-	 * @var int Delivery address ID

-	 * @deprecated

-	 * @see setDeliveryAddress()

-	 */

-	public $fk_delivery_address;

-

-	/**

-	 * @var int Shipping method ID

-	 * @see setShippingMethod()

-	 */

-	public $shipping_method_id;

-

-	/**

-	 * @var string

-	 * @see SetDocModel()

-	 */

-	public $modelpdf;

-

-	/**

-	 * @var int Bank account ID

-	 * @see SetBankAccount()

-	 */

-	public $fk_account;

-

-	/**

-	 * @var string Public note

-	 * @see update_note()

-	 */

-	public $note_public;

-

-	/**

-	 * @var string Private note

-	 * @see update_note()

-	 */

-	public $note_private;

-

-	/**

-	 * @deprecated

-	 * @see note_public

-	 */

-	public $note;

-

-	/**

-	 * @var float Total amount before taxes

-	 * @see update_price()

-	 */

-	public $total_ht;

-

-	/**

-	 * @var float Total VAT amount

-	 * @see update_price()

-	 */

-	public $total_tva;

-

-	/**

-	 * @var float Total local tax 1 amount

-	 * @see update_price()

-	 */

-	public $total_localtax1;

-

-	/**

-	 * @var float Total local tax 2 amount

-	 * @see update_price()

-	 */

-	public $total_localtax2;

-

-	/**

-	 * @var float Total amount with taxes

-	 * @see update_price()

-	 */

-	public $total_ttc;

-

-	/**

-	 * @var CommonObjectLine[]

-	 */

-	public $lines;

-

-	/**

-	 * @var mixed		Contains comments

-	 * @see fetchComments()

-	 */

-	public $comments=array();

-

-	/**

-	 * @var int

-	 * @see setIncoterms()

-	 */

-	public $fk_incoterms;

-

-	/**

-	 * @var string

-	 * @see SetIncoterms()

-	 */

-	public $libelle_incoterms;

-

-	/**

-	 * @var string

-	 * @see display_incoterms()

-	 */

-	public $location_incoterms;

-

-	public $name;

-	public $lastname;

-	public $firstname;

-	public $civility_id;

-

-	// Dates

-	public $date_creation;			// Date creation

-	public $date_validation;		// Date validation

-	public $date_modification;		// Date last change (tms field)

-

-

-

-	// No constructor as it is an abstract class

-

-	/**

-	 * Check an object id/ref exists

-	 * If you don't need/want to instantiate object and just need to know if object exists, use this method instead of fetch

-	 *

-	 *  @param	string	$element   	String of element ('product', 'facture', ...)

-	 *  @param	int		$id      	Id of object

-	 *  @param  string	$ref     	Ref of object to check

-	 *  @param	string	$ref_ext	Ref ext of object to check

-	 *  @return int     			<0 if KO, 0 if OK but not found, >0 if OK and exists

-	 */

-	static function isExistingObject($element, $id, $ref='', $ref_ext='')

-	{

-		global $db,$conf;

-

-		$sql = "SELECT rowid, ref, ref_ext";

-		$sql.= " FROM ".MAIN_DB_PREFIX.$element;

-		$sql.= " WHERE entity IN (".getEntity($element).")" ;

-

-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);

-		else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";

-		else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";

-		else {

-			$error='ErrorWrongParameters';

-			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);

-			return -1;

-		}

-		if ($ref || $ref_ext)

-            $sql .= " AND entity = " . Globals::$conf->entity;

+    /**

+     * @var int    Name of subtable line

+     */

+    public $table_element_line='';

 

-        dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);

-		$resql = $db->query($sql);

-		if ($resql)

-		{

-			$num=$db->num_rows($resql);

-			if ($num > 0) return 1;

-			else return 0;

-		}

-		return -1;

-	}

-

-	/**

-	 * Method to output saved errors

-	 *

-	 * @return	string		String with errors

-	 */

-	function errorsToString()

-	{

-		return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ',$this->errors)):'');

-	}

-

-	/**

-	 *	Return full name (civility+' '+name+' '+lastname)

-	 *

-	 *	@param	Translate	$langs			Language object for translation of civility (used only if option is 1)

-	 *	@param	int			$option			0=No option, 1=Add civility

-	 * 	@param	int			$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname

-	 * 	@param	int			$maxlen			Maximum length

-	 * 	@return	string						String with full name

-	 */

-	function getFullName($langs,$option=0,$nameorder=-1,$maxlen=0)

-	{

-		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";

-		$lastname=$this->lastname;

-		$firstname=$this->firstname;

-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));

-

-		$ret='';

-		if ($option && $this->civility_id)

-		{

-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';

-			else $ret.=$this->civility_id.' ';

-		}

-

-		$ret .= AlDolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder);

+    /**

+     * @var string		Key value used to track if data is coming from import wizard

+     */

+    public $import_key;

 

-        return AlDolUtils::dol_trunc($ret, $maxlen);

-    }

+    /**

+     * @var mixed		Contains data to manage extrafields

+     */

+    public $array_options=array();

 

-	/**

-	 * 	Return full address of contact

-	 *

-	 * 	@param		int			$withcountry		1=Add country into address string

-	 *  @param		string		$sep				Separator to use to build string

-	 *  @param		int		    $withregion			1=Add region into address string

-	 *	@return		string							Full address string

-	 */

-	function getFullAddress($withcountry=0, $sep="\n", $withregion=0)

-	{

-		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))

-		{

-			require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';

-			$tmparray=getCountry($this->country_id,'all');

-			$this->country_code=$tmparray['code'];

-			$this->country     =$tmparray['label'];

-		}

+    /**

+     * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked

+     */

+    public $linkedObjectsIds;

 

-        if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde)))

-    	{

-    		require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';

-    		$tmparray=getState($this->state_id,'all',0,1);

-			$this->state_code   =$tmparray['code'];

-			$this->state        =$tmparray['label'];

-			$this->region_code  =$tmparray['region_code'];

-			$this->region       =$tmparray['region'];

-        }

-

-		return dol_format_address($this, $withcountry, $sep);

-	}

-

-

-	/**

-	 * 	Return full address for banner

-	 *

-	 * 	@param		string		$htmlkey            HTML id to make banner content unique

-	 *  @param      Object      $object				Object (thirdparty, thirdparty of contact for contact, null for a member)

-	 *	@return		string							Full address string

-	 */

-	function getBannerAddress($htmlkey, $object)

-	{

-		global $conf, $langs;

-

-		$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS

-

-		$contactid=0;

-		$thirdpartyid=0;

-		if ($this->element == 'societe')

-		{

-			$thirdpartyid=$this->id;

-		}

-		if ($this->element == 'contact')

-		{

-			$contactid=$this->id;

-			$thirdpartyid=$object->fk_soc;

-		}

-		if ($this->element == 'user')

-		{

-			$contactid=$this->contact_id;

-			$thirdpartyid=$object->fk_soc;

-		}

-

-		$out='<!-- BEGIN part to show address block -->';

-

-		$outdone=0;

-		$coords = $this->getFullAddress(1, ', ', Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);

-        if ($coords)

-		{

-			if (!empty(Globals::$conf->use_javascript_ajax)) {

-				$namecoords = $this->getFullName($langs,1).'<br>'.$coords;

-				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile

-				$out.='<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';

-				$out.=img_picto($langs->trans("Address"), 'object_address.png');

-				$out.='</a> ';

-			}

-			$out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;

-			$outdone++;

-		}

-

-		if (!in_array($this->country_code, $countriesusingstate) && empty(Globals::$conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress

-            && empty(Globals::$conf->global->SOCIETE_DISABLE_STATE) && $this->state) {

-            if (!empty(Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {

-                $out.=($outdone?' - ':'').$this->region.' - '.$this->state;

-            }

-            else {

-                $out.=($outdone?' - ':'').$this->state;

-            }

-			$outdone++;

-		}

-

-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');

-		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone

-			$out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

-		}

-		if (! empty($this->phone_pro)) {

-			$out.=dol_print_phone($this->phone_pro,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

-		}

-		if (! empty($this->phone_mobile)) {

-			$out.=dol_print_phone($this->phone_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;

-		}

-		if (! empty($this->phone_perso)) {

-			$out.=dol_print_phone($this->phone_perso,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePerso")); $outdone++;

-		}

-		if (! empty($this->office_phone)) {

-			$out.=dol_print_phone($this->office_phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

-		}

-		if (! empty($this->user_mobile)) {

-			$out.=dol_print_phone($this->user_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;

-		}

-		if (! empty($this->fax)) {

-			$out.=dol_print_phone($this->fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;

-		}

-		if (! empty($this->office_fax)) {

-			$out.=dol_print_phone($this->office_fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;

-		}

-

-		$out.='<div style="clear: both;"></div>';

-		$outdone=0;

-		if (! empty($this->email))

-		{

-			$out.=dol_print_email($this->email,$this->id,$object->id,'AC_EMAIL',0,0,1);

-			$outdone++;

-		}

-		if (! empty($this->url))

-		{

-			$out.=dol_print_url($this->url,'_goout',0,1);

-			$outdone++;

-		}

-		$out.='<div style="clear: both;">';

-		if (!empty(Globals::$conf->socialnetworks->enabled)) {

-			if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');

-			$outdone++;

-			if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');

-			$outdone++;

-			if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');

-			$outdone++;

-			if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');

-			$outdone++;

-		}

-		$out.='</div>';

-

-		$out.='<!-- END Part to show address block -->';

-

-		return $out;

-	}

-

-	/**

-	 * Return the link of last main doc file for direct public download.

-	 *

-	 * @param	string	$modulepart			Module related to document

-	 * @param	int		$initsharekey		Init the share key if it was not yet defined

-	 * @param	int		$relativelink		0=Return full external link, 1=Return link relative to root of file

-	 * @return	string						Link or empty string if there is no download link

-	 */

-	function getLastMainDocLink($modulepart, $initsharekey=0, $relativelink=0)

-	{

-		global $user, $dolibarr_main_url_root;

-

-		if (empty($this->last_main_doc))

-		{

-			return '';		// No way to known which document name to use

-		}

-

-		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

-		$ecmfile=new EcmFiles($this->db);

-		$result = $ecmfile->fetch(0, '', $this->last_main_doc);

-		if ($result < 0)

-		{

-			$this->error = $ecmfile->error;

-			$this->errors = $ecmfile->errors;

-			return -1;

-		}

-

-		if (empty($ecmfile->id))

-		{

-			// Add entry into index

-			if ($initsharekey)

-			{

-				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

-				// TODO We can't, we dont' have full path of file, only last_main_doc adn ->element, so we must rebuild full path first

-				/*

-				$ecmfile->filepath = $rel_dir;

-				$ecmfile->filename = $filename;

-				$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content

-				$ecmfile->fullpath_orig = '';

-				$ecmfile->gen_or_uploaded = 'generated';

-				$ecmfile->description = '';    // indexed content

-				$ecmfile->keyword = '';        // keyword content

-				$ecmfile->share = getRandomPassword(true);

-				$result = $ecmfile->create($user);

-				if ($result < 0)

-				{

-					$this->error = $ecmfile->error;

-					$this->errors = $ecmfile->errors;

-				}

-				*/

-			}

-			else return '';

-		}

-		elseif (empty($ecmfile->share))

-		{

-			// Add entry into index

-			if ($initsharekey)

-			{

-				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

-				$ecmfile->share = getRandomPassword(true);

-				$ecmfile->update($user);

-			}

-			else return '';

-		}

-

-		// Define $urlwithroot

-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));

-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file

-		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

-

-		$forcedownload=0;

-

-		$paramlink='';

-		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.

-		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.

-		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash

-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share

-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';

-

-		if ($relativelink)

-		{

-			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');

-		}

-		else

-		{

-			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');

-		}

-

-		// Here $ecmfile->share is defined

-		return $linktoreturn;

-	}

+    /**

+     * @var mixed		Array of linked objects. Loaded by ->fetchObjectLinked

+     */

+    public $linkedObjects;

 

+    /**

+     * @var Object      To store a cloned copy of object before to edit it and keep track of old properties

+     */

+    public $oldcopy;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *  Add a link between element $this->element and a contact

-	 *

-	 *  @param	int		$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link

-	 *  @param 	int		$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL

-	 *  @param  string	$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)

-	 *  @param  int		$notrigger			Disable all triggers

-	 *  @return int                 		<0 if KO, >0 if OK

-	 */

-	function add_contact($fk_socpeople, $type_contact, $source='external',$notrigger=0)

-	{

-        // phpcs:enable

-		global $user,$langs;

-

-

-		dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");

-

-		// Check parameters

-		if ($fk_socpeople <= 0)

-		{

-			$langs->load("errors");

-			$this->error=$langs->trans("ErrorWrongValueForParameterX","1");

-			dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);

-			return -1;

-		}

-		if (! $type_contact)

-		{

-			$langs->load("errors");

-			$this->error=$langs->trans("ErrorWrongValueForParameterX","2");

-			dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);

-			return -2;

-		}

-

-		$id_type_contact=0;

-		if (is_numeric($type_contact))

-		{

-			$id_type_contact=$type_contact;

-		}

-		else

-		{

-			// We look for id type_contact

-			$sql = "SELECT tc.rowid";

-			$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

-			$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";

-			$sql.= " AND tc.source='".$this->db->escape($source)."'";

-			$sql.= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";

-			//print $sql;

-			$resql=$this->db->query($sql);

-			if ($resql)

-			{

-				$obj = $this->db->fetch_object($resql);

-				if ($obj) $id_type_contact=$obj->rowid;

-			}

-		}

-

-		if ($id_type_contact == 0)

-		{

-			$this->error='CODE_NOT_VALID_FOR_THIS_ELEMENT';

-			dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");

-			return -3;

-		}

-

-		$datecreate = dol_now();

-

-		// Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error

-		$TListeContacts=$this->liste_contact(-1, $source);

-		$already_added=false;

-		if(!empty($TListeContacts)) {

-			foreach($TListeContacts as $array_contact) {

-				if($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {

-					$already_added=true;

-					break;

-				}

-			}

-		}

+    /**

+     * @var string		Column name of the ref field.

+     */

+    protected $table_ref_field = '';

 

-		if(!$already_added) {

 

-			$this->db->begin();

 

-			// Insert into database

-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";

-			$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";

-			$sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;

-			$sql.= "'".$this->db->idate($datecreate)."'";

-			$sql.= ", 4, ". $id_type_contact;

-			$sql.= ")";

+    // Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.

 

-			$resql=$this->db->query($sql);

-			if ($resql)

-			{

-				if (! $notrigger)

-				{

-					$result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);

-					if ($result < 0)

-					{

-						$this->db->rollback();

-						return -1;

-					}

-				}

+    /**

+     * @var array<string,mixed>		Can be used to pass information when only object is provided to method

+     */

+    public $context=array();

 

-				$this->db->commit();

-				return 1;

-			}

-			else

-			{

-				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')

-				{

-					$this->error=$this->db->errno();

-					$this->db->rollback();

-					echo 'err rollback';

-					return -2;

-				}

-				else

-				{

-					$this->error=$this->db->error();

-					$this->db->rollback();

-					return -1;

-				}

-			}

-		} else return 0;

-	}

+    /**

+     * @var string		Contains canvas name if record is an alternative canvas record

+     */

+    public $canvas;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *    Copy contact from one element to current

-	 *

-	 *    @param    CommonObject    $objFrom    Source element

-	 *    @param    string          $source     Nature of contact ('internal' or 'external')

-	 *    @return   int                         >0 if OK, <0 if KO

-	 */

-	function copy_linked_contact($objFrom, $source='internal')

-	{

-        // phpcs:enable

-		$contacts = $objFrom->liste_contact(-1, $source);

-		foreach($contacts as $contact)

-		{

-			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)

-			{

-				$this->error=$this->db->lasterror();

-				return -1;

-			}

-		}

-		return 1;

-	}

+    /**

+     * @var Project The related project

+     * @see fetch_projet()

+     */

+    public $project;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *      Update a link to contact line

-	 *

-	 *      @param	int		$rowid              Id of line contact-element

-	 * 		@param	int		$statut	            New status of link

-	 *      @param  int		$type_contact_id    Id of contact type (not modified if 0)

-	 *      @param  int		$fk_socpeople	    Id of soc_people to update (not modified if 0)

-	 *      @return int                 		<0 if KO, >= 0 if OK

-	 */

-	function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0)

-	{

-        // phpcs:enable

-		// Insert into database

-		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";

-		$sql.= " statut = ".$statut;

-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";

-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";

-		$sql.= " where rowid = ".$rowid;

-		$resql=$this->db->query($sql);

-		if ($resql)

-		{

-			return 0;

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			return -1;

-		}

-	}

+    /**

+     * @var int The related project ID

+     * @see setProject(), project

+     */

+    public $fk_project;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *    Delete a link to contact line

-	 *

-	 *    @param	int		$rowid			Id of contact link line to delete

-	 *    @param	int		$notrigger		Disable all triggers

-	 *    @return   int						>0 if OK, <0 if KO

-	 */

-	function delete_contact($rowid, $notrigger=0)

-	{

-        // phpcs:enable

-		global $user;

+    /**

+     * @deprecated

+     * @see project

+     */

+    public $projet;

 

+    /**

+     * @var Contact a related contact

+     * @see fetch_contact()

+     */

+    public $contact;

 

-		$this->db->begin();

+    /**

+     * @var int The related contact ID

+     * @see fetch_contact()

+     */

+    public $contact_id;

 

-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";

-		$sql.= " WHERE rowid =".$rowid;

+    /**

+     * @var Societe A related thirdparty

+     * @see fetch_thirdparty()

+     */

+    public $thirdparty;

 

-		dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);

-		if ($this->db->query($sql))

-		{

-			if (! $notrigger)

-			{

-				$result=$this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);

-				if ($result < 0) { $this->db->rollback(); return -1; }

-			}

-

-			$this->db->commit();

-			return 1;

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			$this->db->rollback();

-			return -1;

-		}

-	}

+    /**

+     * @var User A related user

+     * @see fetch_user()

+     */

+    public $user;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *    Delete all links between an object $this and all its contacts

-	 *

-	 *	  @param	string	$source		'' or 'internal' or 'external'

-	 *	  @param	string	$code		Type of contact (code or id)

-	 *    @return   int					>0 if OK, <0 if KO

-	 */

-	function delete_linked_contact($source='',$code='')

-	{

-        // phpcs:enable

-		$temp = array();

-		$typeContact = $this->liste_type_contact($source,'',0,0,$code);

-

-		foreach($typeContact as $key => $value)

-		{

-			array_push($temp,$key);

-		}

-		$listId = implode(",", $temp);

-

-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";

-		$sql.= " WHERE element_id = ".$this->id;

-		if ($listId)

-			$sql.= " AND fk_c_type_contact IN (".$listId.")";

-

-		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);

-		if ($this->db->query($sql))

-		{

-			return 1;

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			return -1;

-		}

-	}

+    /**

+     * @var string 	The type of originating object ('commande', 'facture', ...)

+     * @see fetch_origin()

+     */

+    public $origin;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *    Get array of all contacts for an object

-	 *

-	 *    @param	int			$statut		Status of links to get (-1=all)

-	 *    @param	string		$source		Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)

-	 *    @param	int         $list       0:Return array contains all properties, 1:Return array contains just id

-	 *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)

-	 *    @return	array|int		        Array of contacts, -1 if error

-	 */

-	function liste_contact($statut=-1,$source='external',$list=0,$code='')

-	{

-        // phpcs:enable

-		global $langs;

-

-		$tab=array();

-

-		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user

-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";

-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";

-		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";

-		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";

-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";

-		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";

-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";

-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";

-		$sql.= " WHERE ec.element_id =".$this->id;

-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";

-		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";

-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";

-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";

-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";

-		$sql.= " AND tc.active=1";

-		if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";

-		$sql.=" ORDER BY t.lastname ASC";

-

-		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);

-		$resql=$this->db->query($sql);

-		if ($resql)

-		{

-			$num=$this->db->num_rows($resql);

-			$i=0;

-			while ($i < $num)

-			{

-				$obj = $this->db->fetch_object($resql);

+    /**

+     * @var int 	The id of originating object

+     * @see fetch_origin()

+     */

+    public $origin_id;

 

-				if (! $list)

-				{

-					$transkey="TypeContact_".$obj->element."_".$obj->source."_".$obj->code;

-					$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);

-					$tab[$i]=array('source'=>$obj->source,'socid'=>$obj->socid,'id'=>$obj->id,

-								   'nom'=>$obj->lastname,      // For backward compatibility

-								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,

-								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);

-				}

-				else

-				{

-					$tab[$i]=$obj->id;

-				}

+    /**

+     * @var string The object's reference

+     */

+    public $ref;

 

-				$i++;

-			}

-

-			return $tab;

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			dol_print_error($this->db);

-			return -1;

-		}

-	}

-

-

-	/**

-	 * 		Update status of a contact linked to object

-	 *

-	 * 		@param	int		$rowid		Id of link between object and contact

-	 * 		@return	int					<0 if KO, >=0 if OK

-	 */

-	function swapContactStatus($rowid)

-	{

-		$sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";

-		$sql.= " tc.code, tc.libelle";

-		//$sql.= ", s.fk_soc";

-		$sql.= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";

-		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe

-		$sql.= " WHERE ec.rowid =".$rowid;

-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";

-		$sql.= " AND tc.element = '".$this->db->escape($this->element)."'";

-

-		dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);

-		$resql=$this->db->query($sql);

-		if ($resql)

-		{

-			$obj = $this->db->fetch_object($resql);

-			$newstatut = ($obj->statut == 4) ? 5 : 4;

-			$result = $this->update_contact($rowid, $newstatut);

-			$this->db->free($resql);

-			return $result;

-		}

-		else

-		{

-			$this->error=$this->db->error();

-			dol_print_error($this->db);

-			return -1;

-		}

-	}

+    /**

+     * @var string The object's previous reference

+     */

+    public $ref_previous;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *      Return array with list of possible values for type of contacts

-	 *

-	 *      @param	string	$source     'internal', 'external' or 'all'

-	 *      @param	string	$order		Sort order by : 'position', 'code', 'rowid'...

-	 *      @param  int		$option     0=Return array id->label, 1=Return array code->label

-	 *      @param  int		$activeonly 0=all status of contact, 1=only the active

-	 *		@param	string	$code		Type of contact (Example: 'CUSTOMER', 'SERVICE')

-	 *      @return array       		Array list of type of contacts (id->label if option=0, code->label if option=1)

-	 */

-	function liste_type_contact($source='internal', $order='position', $option=0, $activeonly=0, $code='')

-	{

-        // phpcs:enable

-		global $langs;

-

-		if (empty($order)) $order='position';

-		if ($order == 'position') $order.=',code';

-

-		$tab = array();

-		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";

-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

-		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";

-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types

-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";

-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";

-		$sql.= $this->db->order($order,'ASC');

-

-		//print "sql=".$sql;

-		$resql=$this->db->query($sql);

-		if ($resql)

-		{

-			$num=$this->db->num_rows($resql);

-			$i=0;

-			while ($i < $num)

-			{

-				$obj = $this->db->fetch_object($resql);

-

-				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;

-				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);

-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;

-				else $tab[$obj->code]=$libelle_type;

-				$i++;

-			}

-			return $tab;

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			//dol_print_error($this->db);

-			return null;

-		}

-	}

-

-	/**

-	 *      Return id of contacts for a source and a contact code.

-	 *      Example: contact client de facturation ('external', 'BILLING')

-	 *      Example: contact client de livraison ('external', 'SHIPPING')

-	 *      Example: contact interne suivi paiement ('internal', 'SALESREPFOLL')

-	 *

-	 *		@param	string	$source		'external' or 'internal'

-	 *		@param	string	$code		'BILLING', 'SHIPPING', 'SALESREPFOLL', ...

-	 *		@param	int		$status		limited to a certain status

-	 *      @return array       		List of id for such contacts

-	 */

-	function getIdContact($source,$code,$status=0)

-	{

-		global $conf;

-

-		$result=array();

-		$i=0;

-		//cas particulier pour les expeditions

-		if($this->element=='shipping' && $this->origin_id != 0) {

-			$id=$this->origin_id;

-			$element='commande';

-        } else if($this->element=='reception' && $this->origin_id != 0) {

-            $id=$this->origin_id;

-            $element='order_supplier';

-		} else {

-			$id=$this->id;

-			$element=$this->element;

-		}

-

-		$sql = "SELECT ec.fk_socpeople";

-		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";

-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";

-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";

-		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";

-		$sql.= " WHERE ec.element_id = ".$id;

-		$sql.= " AND ec.fk_socpeople = c.rowid";

-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";

-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";

-		$sql.= " AND ec.fk_c_type_contact = tc.rowid";

-		$sql.= " AND tc.element = '".$element."'";

-		$sql.= " AND tc.source = '".$source."'";

-		$sql.= " AND tc.code = '".$code."'";

-		$sql.= " AND tc.active = 1";

-		if ($status) $sql.= " AND ec.statut = ".$status;

-

-		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);

-		$resql=$this->db->query($sql);

-		if ($resql)

-		{

-			while ($obj = $this->db->fetch_object($resql))

-			{

-				$result[$i]=$obj->fk_socpeople;

-				$i++;

-			}

-		}

-		else

-		{

-			$this->error=$this->db->error();

-			return null;

-		}

-

-		return $result;

-	}

+    /**

+     * @var string The object's next reference

+     */

+    public $ref_next;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *		Load object contact with id=$this->contactid into $this->contact

-	 *

-	 *		@param	int		$contactid      Id du contact. Use this->contactid if empty.

-	 *		@return	int						<0 if KO, >0 if OK

-	 */

-	function fetch_contact($contactid=null)

-	{

-        // phpcs:enable

-		if (empty($contactid)) $contactid=$this->contactid;

+    /**

+     * @var string An external reference for the object

+     */

+    public $ref_ext;

 

-		if (empty($contactid)) return 0;

+    /**

+     * @var int The object's status

+     * @see setStatut()

+     */

+    public $statut;

 

-		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

-		$contact = new Contact($this->db);

-		$result=$contact->fetch($contactid);

-		$this->contact = $contact;

-		return $result;

-	}

+    /**

+     * @var string

+     * @see getFullAddress()

+     */

+    public $country;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *    	Load the third party of object, from id $this->socid or $this->fk_soc, into this->thirdparty

-	 *

-	 *		@param		int		$force_thirdparty_id	Force thirdparty id

-	 *		@return		int								<0 if KO, >0 if OK

-	 */

-	function fetch_thirdparty($force_thirdparty_id=0)

-	{

-        // phpcs:enable

-		global $conf;

+    /**

+     * @var int

+     * @see getFullAddress(), country

+     */

+    public $country_id;

 

-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))

-			return 0;

+    /**

+     * @var string

+     * @see getFullAddress(), isInEEC(), country

+     */

+    public $country_code;

 

-		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

+    /**

+     * @var string

+     * @see getFullAddress()

+     */

+    public $state;

 

-		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);

-		if ($force_thirdparty_id)

-			$idtofetch = $force_thirdparty_id;

+    /**

+     * @var int

+     * @see getFullAddress(), state

+     */

+    public $state_id;

 

-		if ($idtofetch) {

-			$thirdparty = new Societe($this->db);

-			$result = $thirdparty->fetch($idtofetch);

-			$this->thirdparty = $thirdparty;

+    /**

+     * @var string

+     * @see getFullAddress(), state

+     */

+    public $state_code;

 

-			// Use first price level if level not defined for third party

-			if (!empty(Globals::$conf->global->PRODUIT_MULTIPRICES) && empty($this->thirdparty->price_level)) {

-                $this->thirdparty->price_level = 1;

-			}

+    /**

+     * @var string

+     * @see getFullAddress(), region

+     */

+    public $region;

 

-			return $result;

-		} else

-			return -1;

-	}

+    /**

+     * @var string

+     * @see getFullAddress(), region

+     */

+    public $region_code;

 

+    /**

+     * @var int

+     * @see fetch_barcode()

+     */

+    public $barcode_type;

 

-	/**

-	 * Looks for an object with ref matching the wildcard provided

-	 * It does only work when $this->table_ref_field is set

-	 *

-	 * @param string $ref Wildcard

-	 * @return int >1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO

-	 */

-	public function fetchOneLike($ref)

-	{

-		if (!$this->table_ref_field) {

-			return 0;

-		}

+    /**

+     * @var string

+     * @see fetch_barcode(), barcode_type

+     */

+    public $barcode_type_code;

 

-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';

+    /**

+     * @var string

+     * @see fetch_barcode(), barcode_type

+     */

+    public $barcode_type_label;

 

-		$query = $this->db->query($sql);

+    /**

+     * @var string

+     * @see fetch_barcode(), barcode_type

+     */

+    public $barcode_type_coder;

 

-		if (!$this->db->num_rows($query)) {

-			return 0;

-		}

+    /**

+     * @var int Payment method ID (cheque, cash, ...)

+     * @see setPaymentMethods()

+     */

+    public $mode_reglement_id;

 

-		$result = $this->db->fetch_object($query);

+    /**

+     * @var int Payment terms ID

+     * @see setPaymentTerms()

+     */

+    public $cond_reglement_id;

 

-		return $this->fetch($result->rowid);

-	}

+    /**

+     * @var int Payment terms ID

+     * @deprecated Kept for compatibility

+     * @see cond_reglement_id;

+     */

+    public $cond_reglement;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *	Load data for barcode into properties ->barcode_type*

-	 *	Properties ->barcode_type that is id of barcode. Type is used to find other properties, but

-	 *  if it is not defined, ->element must be defined to know default barcode type.

-	 *

-	 *	@return		int			<0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded)

-	 */

-	function fetch_barcode()

-	{

-        // phpcs:enable

-		global $conf;

+    /**

+     * @var int Delivery address ID

+     * @deprecated

+     * @see setDeliveryAddress()

+     */

+    public $fk_delivery_address;

 

-		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);

+    /**

+     * @var int Shipping method ID

+     * @see setShippingMethod()

+     */

+    public $shipping_method_id;

 

-		$idtype=$this->barcode_type;

-		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined

-		{

-			if ($this->element == 'product')

-                $idtype = Globals::$conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

-            else if ($this->element == 'societe')

-                $idtype = Globals::$conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;

-            else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);

-		}

+    /**

+     * @var string

+     * @see SetDocModel()

+     */

+    public $modelpdf;

 

-		if ($idtype > 0)

-		{

-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded

-			{

-				$sql = "SELECT rowid, code, libelle as label, coder";

-				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";

-				$sql.= " WHERE rowid = ".$idtype;

-				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);

-				$resql = $this->db->query($sql);

-				if ($resql)

-				{

-					$obj = $this->db->fetch_object($resql);

-					$this->barcode_type       = $obj->rowid;

-					$this->barcode_type_code  = $obj->code;

-					$this->barcode_type_label = $obj->label;

-					$this->barcode_type_coder = $obj->coder;

-					return 1;

-				}

-				else

-				{

-					dol_print_error($this->db);

-					return -1;

-				}

-			}

-		}

-		return 0;

-	}

+    /**

+     * @var int Bank account ID

+     * @see SetBankAccount()

+     */

+    public $fk_account;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *		Load the project with id $this->fk_project into this->project

-	 *

-	 *		@return		int			<0 if KO, >=0 if OK

-	 */

-	function fetch_projet()

-	{

-        // phpcs:enable

-		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

+    /**

+     * @var string Public note

+     * @see update_note()

+     */

+    public $note_public;

 

-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility

-		if (empty($this->fk_project)) return 0;

+    /**

+     * @var string Private note

+     * @see update_note()

+     */

+    public $note_private;

 

-		$project = new Project($this->db);

-		$result = $project->fetch($this->fk_project);

+    /**

+     * @deprecated

+     * @see note_public

+     */

+    public $note;

 

-		$this->projet = $project;	// deprecated

-		$this->project = $project;

-		return $result;

-	}

+    /**

+     * @var float Total amount before taxes

+     * @see update_price()

+     */

+    public $total_ht;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *		Load the product with id $this->fk_product into this->product

-	 *

-	 *		@return		int			<0 if KO, >=0 if OK

-	 */

-	function fetch_product()

-	{

-        // phpcs:enable

-		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

+    /**

+     * @var float Total VAT amount

+     * @see update_price()

+     */

+    public $total_tva;

 

-		if (empty($this->fk_product)) return 0;

+    /**

+     * @var float Total local tax 1 amount

+     * @see update_price()

+     */

+    public $total_localtax1;

 

-		$product = new Product($this->db);

-		$result = $product->fetch($this->fk_product);

+    /**

+     * @var float Total local tax 2 amount

+     * @see update_price()

+     */

+    public $total_localtax2;

 

-		$this->product = $product;

-		return $result;

-	}

+    /**

+     * @var float Total amount with taxes

+     * @see update_price()

+     */

+    public $total_ttc;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *		Load the user with id $userid into this->user

-	 *

-	 *		@param	int		$userid 		Id du contact

-	 *		@return	int						<0 if KO, >0 if OK

-	 */

-	function fetch_user($userid)

-	{

-        // phpcs:enable

-		$user = new User($this->db);

-		$result=$user->fetch($userid);

-		$this->user = $user;

-		return $result;

-	}

+    /**

+     * @var CommonObjectLine[]

+     */

+    public $lines;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *	Read linked origin object

-	 *

-	 *	@return		void

-	 */

-	function fetch_origin()

-	{

-        // phpcs:enable

-		if ($this->origin == 'shipping') $this->origin = 'expedition';

-		if ($this->origin == 'delivery') $this->origin = 'livraison';

-        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';

+    /**

+     * @var mixed		Contains comments

+     * @see fetchComments()

+     */

+    public $comments=array();

 

-		$origin = $this->origin;

+    /**

+     * @var int

+     * @see setIncoterms()

+     */

+    public $fk_incoterms;

 

-		$classname = ucfirst($origin);

-		$this->$origin = new $classname($this->db);

-		$this->$origin->fetch($this->origin_id);

-	}

+    /**

+     * @var string

+     * @see SetIncoterms()

+     */

+    public $libelle_incoterms;

 

-	/**

-     *  Load object from specific field

-     *

-     *  @param	string	$table		Table element or element line

-     *  @param	string	$field		Field selected

-     *  @param	string	$key		Import key

-     *  @param	string	$element	Element name

-     *	@return	int					<0 if KO, >0 if OK

+    /**

+     * @var string

+     * @see display_incoterms()

      */

-	function fetchObjectFrom($table, $field, $key, $element = null)

-	{

-		global $conf;

-

-		$result=false;

-

-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;

-		$sql.= " WHERE ".$field." = '".$key."'";

-		if (! empty($element)) {

-			$sql.= " AND entity IN (".getEntity($element).")";

-		} else {

-			$sql .= " AND entity = " . Globals::$conf->entity;

-        }

-

-		dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$row = $this->db->fetch_row($resql);

-			// Test for avoid error -1

-			if ($row[0] > 0) {

-				$result = $this->fetch($row[0]);

-			}

-		}

-

-		return $result;

-	}

-

-	/**

-	 *	Getter generic. Load value from a specific field

-	 *

-	 *	@param	string	$table		Table of element or element line

-	 *	@param	int		$id			Element id

-	 *	@param	string	$field		Field selected

-	 *	@return	int					<0 if KO, >0 if OK

-	 */

-	function getValueFrom($table, $id, $field)

-	{

-		$result=false;

-		if (!empty($id) && !empty($field) && !empty($table)) {

-			$sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;

-			$sql.= " WHERE rowid = ".$id;

-

-			dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);

-			$resql = $this->db->query($sql);

-			if ($resql)

-			{

-				$row = $this->db->fetch_row($resql);

-				$result = $row[0];

-			}

-		}

-		return $result;

-	}

-

-	/**

-	 *	Setter generic. Update a specific field into database.

-	 *  Warning: Trigger is run only if param trigkey is provided.

-	 *

-	 *	@param	string		$field			Field to update

-	 *	@param	mixed		$value			New value

-	 *	@param	string		$table			To force other table element or element line (should not be used)

-	 *	@param	int			$id				To force other object id (should not be used)

-	 *	@param	string		$format			Data format ('text', 'date'). 'text' is used if not defined

-	 *	@param	string		$id_field		To force rowid field name. 'rowid' is used if not defined

-	 *	@param	User|string	$fuser			Update the user of last update field with this user. If not provided, current user is used except if value is 'none'

-	 *  @param  string      $trigkey    	Trigger key to run (in most cases something like 'XXX_MODIFY')

-	 *  @param	string		$fk_user_field	Name of field to save user id making change

-	 *	@return	int							<0 if KO, >0 if OK

-	 *  @see updateExtraField

-	 */

-	function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='', $fk_user_field='fk_user_modif')

-	{

-		global $user,$langs,$conf;

-

-		if (empty($table)) 	  $table=$this->table_element;

-		if (empty($id))    	  $id=$this->id;

-		if (empty($format))   $format='text';

-		if (empty($id_field)) $id_field='rowid';

-

-		$error=0;

-

-		$this->db->begin();

-

-		// Special case

-		if ($table == 'product' && $field == 'note_private') $field='note';

-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';

-

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";

-

-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";

-		else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);

-		else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");

-

-		if ($fk_user_field)

-		{

-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;

-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;

-		}

-

-		$sql.= " WHERE ".$id_field." = ".$id;

-

-		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			if ($trigkey)

-			{

-				// call trigger with updated object values

-				if (empty($this->fields) && method_exists($this, 'fetch'))

-				{

-					$result = $this->fetch($id);

-				}

-				else

-				{

-					$result = $this->fetchCommon($id);

-				}

-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors

-				if ($result < 0) $error++;

-			}

+    public $location_incoterms;

 

-			if (! $error)

-			{

-				if (property_exists($this, $field)) $this->$field = $value;

-				$this->db->commit();

-				return 1;

-			}

-			else

-			{

-				$this->db->rollback();

-				return -2;

-			}

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			$this->db->rollback();

-			return -1;

-		}

-	}

+    public $name;

+    public $lastname;

+    public $firstname;

+    public $civility_id;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *      Load properties id_previous and id_next by comparing $fieldid with $this->ref

-	 *

-	 *      @param	string	$filter		Optional filter. Example: " AND (t.field1 = 'aa' OR t.field2 = 'bb')"

-	 *	 	@param  string	$fieldid   	Name of field to use for the select MAX and MIN

-	 *		@param	int		$nodbprefix	Do not include DB prefix to forge table name

-	 *      @return int         		<0 if KO, >0 if OK

-	 */

-	function load_previous_next_ref($filter, $fieldid, $nodbprefix=0)

-	{

-        // phpcs:enable

-		global $conf, $user;

-

-		if (! $this->table_element)

-		{

-			dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");

-			return -1;

-		}

-		if ($fieldid == 'none') return 1;

-

-		// Security on socid

-		$socid = 0;

-		if ($user->societe_id > 0) $socid = $user->societe_id;

-

-		// this->ismultientitymanaged contains

-		// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

-		$alias = 's';

-		if ($this->element == 'societe') $alias = 'te';

-

-		$sql = "SELECT MAX(te.".$fieldid.")";

-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";

-		if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-            $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";

-		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid

-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid

-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

-		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;

-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';

-		if (! empty($filter))

-		{

-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility

-			$sql.=$filter;

-		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

-			if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-                if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) {

-                    $sql.= " AND te.entity IS NOT NULL"; // Show all users

-				} else {

-					$sql.= " AND ug.fk_user = te.rowid";

-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";

-				}

-			} else {

-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';

-			}

-		}

-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;

-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';

-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;

-		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

-

-		$result = $this->db->query($sql);

-		if (! $result)

-		{

-			$this->error=$this->db->lasterror();

-			return -1;

-		}

-		$row = $this->db->fetch_row($result);

-		$this->ref_previous = $row[0];

-

-

-		$sql = "SELECT MIN(te.".$fieldid.")";

-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";

-		if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-            $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";

-		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid

-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid

-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

-		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;

-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';

-		if (! empty($filter))

-		{

-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility

-			$sql.=$filter;

-		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

-			if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-                if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) {

-                    $sql.= " AND te.entity IS NOT NULL"; // Show all users

-				} else {

-					$sql.= " AND ug.fk_user = te.rowid";

-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";

-				}

-			} else {

-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';

-			}

-		}

-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;

-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';

-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;

-		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

-		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null

-

-		$result = $this->db->query($sql);

-		if (! $result)

-		{

-			$this->error=$this->db->lasterror();

-			return -2;

-		}

-		$row = $this->db->fetch_row($result);

-		$this->ref_next = $row[0];

-

-		return 1;

-	}

-

-

-	/**

-	 *      Return list of id of contacts of object

-	 *

-	 *      @param	string	$source     Source of contact: external (llx_socpeople) or internal (llx_user) or thirdparty (llx_societe)

-	 *      @return array				Array of id of contacts (if source=external or internal)

-	 * 									Array of id of third parties with at least one contact on object (if source=thirdparty)

-	 */

-	function getListContactId($source='external')

-	{

-		$contactAlreadySelected = array();

-		$tab = $this->liste_contact(-1,$source);

-		$num=count($tab);

-		$i = 0;

-		while ($i < $num)

-		{

-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];

-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];

-			$i++;

-		}

-		return $contactAlreadySelected;

-	}

-

-

-	/**

-	 *	Link element with a project

-	 *

-	 *	@param     	int		$projectid		Project id to link element to

-	 *	@return		int						<0 if KO, >0 if OK

-	 */

-	function setProject($projectid)

-	{

-		if (! $this->table_element)

-		{

-			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined",LOG_ERR);

-			return -1;

-		}

-

-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

-		if ($this->table_element == 'actioncomm')

-		{

-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;

-			else $sql.= ' SET fk_project = NULL';

-			$sql.= ' WHERE id = '.$this->id;

-		}

-		else

-		{

-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;

-			else $sql.= ' SET fk_projet = NULL';

-			$sql.= ' WHERE rowid = '.$this->id;

-		}

-

-		dol_syslog(get_class($this)."::setProject", LOG_DEBUG);

-		if ($this->db->query($sql))

-		{

-			$this->fk_project = $projectid;

-			return 1;

-		}

-		else

-		{

-			dol_print_error($this->db);

-			return -1;

-		}

-	}

-

-	/**

-	 *  Change the payments methods

-	 *

-	 *  @param		int		$id		Id of new payment method

-	 *  @return		int				>0 if OK, <0 if KO

-	 */

-	function setPaymentMethods($id)

-	{

-		dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');

-		if ($this->statut >= 0 || $this->element == 'societe')

-		{

-			// TODO uniformize field name

-			$fieldname = 'fk_mode_reglement';

-			if ($this->element == 'societe') $fieldname = 'mode_reglement';

-			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';

-

-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

-			$sql .= ' SET '.$fieldname.' = '.$id;

-			$sql .= ' WHERE rowid='.$this->id;

-

-			if ($this->db->query($sql))

-			{

-				$this->mode_reglement_id = $id;

-				// for supplier

-				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;

-				return 1;

-			}

-			else

-			{

-				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());

-				$this->error=$this->db->error();

-				return -1;

-			}

-		}

-		else

-		{

-			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');

-			$this->error='Status of the object is incompatible '.$this->statut;

-			return -2;

-		}

-	}

-

-	/**

-	 *  Change the multicurrency code

-	 *

-	 *  @param		string	$code	multicurrency code

-	 *  @return		int				>0 if OK, <0 if KO

-	 */

-	function setMulticurrencyCode($code)

-	{

-		dol_syslog(get_class($this).'::setMulticurrencyCode('.$id.')');

-		if ($this->statut >= 0 || $this->element == 'societe')

-		{

-			$fieldname = 'multicurrency_code';

-

-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

-			$sql .= ' SET '.$fieldname." = '".$this->db->escape($code)."'";

-			$sql .= ' WHERE rowid='.$this->id;

-

-			if ($this->db->query($sql))

-			{

-				$this->multicurrency_code = $code;

+    // Dates

+    public $date_creation;			// Date creation

+    public $date_validation;		// Date validation

+    public $date_modification;		// Date last change (tms field)

 

-				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);

-				if ($rate) $this->setMulticurrencyRate($rate,2);

 

-				return 1;

-			}

-			else

-			{

-				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());

-				$this->error=$this->db->error();

-				return -1;

-			}

-		}

-		else

-		{

-			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');

-			$this->error='Status of the object is incompatible '.$this->statut;

-			return -2;

-		}

-	}

-

-	/**

-	 *  Change the multicurrency rate

-	 *

-	 *  @param		double	$rate	multicurrency rate

-	 *  @param		int		$mode	mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency

-	 *  @return		int				>0 if OK, <0 if KO

-	 */

-	function setMulticurrencyRate($rate, $mode=1)

-	{

-		dol_syslog(get_class($this).'::setMulticurrencyRate('.$id.')');

-		if ($this->statut >= 0 || $this->element == 'societe')

-		{

-			$fieldname = 'multicurrency_tx';

-

-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

-			$sql .= ' SET '.$fieldname.' = '.$rate;

-			$sql .= ' WHERE rowid='.$this->id;

-

-			if ($this->db->query($sql))

-			{

-				$this->multicurrency_tx = $rate;

 

-				// Update line price

-				if (!empty($this->lines))

-				{

-					foreach ($this->lines as &$line)

-					{

-						if($mode == 1) {

-							$line->subprice = 0;

-						}

+    // No constructor as it is an abstract class

 

-						switch ($this->element) {

-							case 'propal':

-								$this->updateline(

-									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,

-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

-									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,

-									$line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

-								);

-								break;

-							case 'commande':

-								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

-									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,

-									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,

-									$line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

-								);

-								break;

-							case 'facture':

-								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

-									$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,

-									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,

-									$line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice

-								);

-								break;

-							case 'supplier_proposal':

-								$this->updateline(

-									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,

-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

-									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,

-									$line->ref_fourn, $line->multicurrency_subprice

-								);

-								break;

-							case 'order_supplier':

-								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

-									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,

-									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

-								);

-								break;

-							case 'invoice_supplier':

-								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,

-									$line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,

-									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

-								);

-								break;

-							default:

-								dol_syslog(get_class($this).'::setMulticurrencyRate no updateline defined', LOG_DEBUG);

-								break;

-						}

-					}

-				}

+    /**

+     * Check an object id/ref exists

+     * If you don't need/want to instantiate object and just need to know if object exists, use this method instead of fetch

+     *

+     *  @param	string	$element   	String of element ('product', 'facture', ...)

+     *  @param	int		$id      	Id of object

+     *  @param  string	$ref     	Ref of object to check

+     *  @param	string	$ref_ext	Ref ext of object to check

+     *  @return int     			<0 if KO, 0 if OK but not found, >0 if OK and exists

+     */

+    static function isExistingObject($element, $id, $ref='', $ref_ext='')

+    {

+        global $db,$conf;

+

+        $sql = "SELECT rowid, ref, ref_ext";

+        $sql.= " FROM ".MAIN_DB_PREFIX.$element;

+        $sql.= " WHERE entity IN (".getEntity($element).")" ;

+

+        if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);

+        else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";

+        else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";

+        else {

+            $error='ErrorWrongParameters';

+            dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);

+            return -1;

+        }

+        if ($ref || $ref_ext)

+            $sql .= " AND entity = " . Globals::$conf->entity;

 

-				return 1;

-			}

-			else

-			{

-				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());

-				$this->error=$this->db->error();

-				return -1;

-			}

-		}

-		else

-		{

-			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');

-			$this->error='Status of the object is incompatible '.$this->statut;

-			return -2;

-		}

-	}

-

-	/**

-	 *  Change the payments terms

-	 *

-	 *  @param		int		$id		Id of new payment terms

-	 *  @return		int				>0 if OK, <0 if KO

-	 */

-	function setPaymentTerms($id)

-	{

-		dol_syslog(get_class($this).'::setPaymentTerms('.$id.')');

-		if ($this->statut >= 0 || $this->element == 'societe')

-		{

-			// TODO uniformize field name

-			$fieldname = 'fk_cond_reglement';

-			if ($this->element == 'societe') $fieldname = 'cond_reglement';

-			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';

-

-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

-			$sql .= ' SET '.$fieldname.' = '.$id;

-			$sql .= ' WHERE rowid='.$this->id;

-

-			if ($this->db->query($sql))

-			{

-				$this->cond_reglement_id = $id;

-				// for supplier

-				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;

-				$this->cond_reglement = $id;	// for compatibility

-				return 1;

-			}

-			else

-			{

-				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());

-				$this->error=$this->db->error();

-				return -1;

-			}

-		}

-		else

-		{

-			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');

-			$this->error='Status of the object is incompatible '.$this->statut;

-			return -2;

-		}

-	}

-

-	/**

-	 *	Define delivery address

-	 *  @deprecated

-	 *

-	 *	@param      int		$id		Address id

-	 *	@return     int				<0 si ko, >0 si ok

-	 */

-	function setDeliveryAddress($id)

-	{

-		$fieldname = 'fk_delivery_address';

-		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';

-

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;

-		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";

-

-		if ($this->db->query($sql))

-		{

-			$this->fk_delivery_address = $id;

-			return 1;

-		}

-		else

-		{

-			$this->error=$this->db->error();

-			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);

-			return -1;

-		}

-	}

-

-

-	/**

-	 *  Change the shipping method

-	 *

-	 *  @param      int     $shipping_method_id     Id of shipping method

-     *  @param      bool    $notrigger              false=launch triggers after, true=disable triggers

-     *  @param      User	$userused               Object user

-	 *

-	 *  @return     int              1 if OK, 0 if KO

-	 */

-	function setShippingMethod($shipping_method_id, $notrigger=false, $userused=null)

-	{

-        global $user;

+        dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);

+        $resql = $db->query($sql);

+        if ($resql)

+        {

+            $num=$db->num_rows($resql);

+            if ($num > 0) return 1;

+            else return 0;

+        }

+        return -1;

+    }

 

-        if (empty($userused)) $userused=$user;

+    /**

+     * Method to output saved errors

+     *

+     * @return	string		String with errors

+     */

+    function errorsToString()

+    {

+        return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ',$this->errors)):'');

+    }

 

-        $error = 0;

+    /**

+     *	Return full name (civility+' '+name+' '+lastname)

+     *

+     *	@param	Translate	$langs			Language object for translation of civility (used only if option is 1)

+     *	@param	int			$option			0=No option, 1=Add civility

+     * 	@param	int			$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname

+     * 	@param	int			$maxlen			Maximum length

+     * 	@return	string						String with full name

+     */

+    function getFullName($langs,$option=0,$nameorder=-1,$maxlen=0)

+    {

+        //print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";

+        $lastname=$this->lastname;

+        $firstname=$this->firstname;

+        if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));

 

-		if (! $this->table_element) {

-			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined",LOG_ERR);

-			return -1;

-		}

+        $ret='';

+        if ($option && $this->civility_id)

+        {

+            if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';

+            else $ret.=$this->civility_id.' ';

+        }

 

-        $this->db->begin();

+        $ret .= AlDolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder);

 

-		if ($shipping_method_id<0) $shipping_method_id='NULL';

-		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');

+        return AlDolUtils::dol_trunc($ret, $maxlen);

+    }

 

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET fk_shipping_method = ".$shipping_method_id;

-		$sql.= " WHERE rowid=".$this->id;

-        $resql = $this->db->query($sql);

-		if (! $resql) {

-			dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);

-			$this->error = $this->db->lasterror();

-			$error++;

-        } else {

-            if (!$notrigger)

-            {

-                // Call trigger

-                $this->context=array('shippingmethodupdate'=>1);

-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

-                if ($result < 0) $error++;

-                // End call trigger

-            }

-        }

-        if ($error)

+    /**

+     * 	Return full address of contact

+     *

+     * 	@param		int			$withcountry		1=Add country into address string

+     *  @param		string		$sep				Separator to use to build string

+     *  @param		int		    $withregion			1=Add region into address string

+     *	@return		string							Full address string

+     */

+    function getFullAddress($withcountry=0, $sep="\n", $withregion=0)

+    {

+        if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))

         {

-            $this->db->rollback();

-            return -1;

-        } else {

-            $this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;

-            $this->db->commit();

-            return 1;

+            require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';

+            $tmparray=getCountry($this->country_id,'all');

+            $this->country_code=$tmparray['code'];

+            $this->country     =$tmparray['label'];

         }

-	}

-

-

-	/**

-	 *  Change the warehouse

-	 *

-	 *  @param      int     $warehouse_id     Id of warehouse

-	 *  @return     int              1 if OK, 0 if KO

-	 */

-	function setWarehouse($warehouse_id)

-	{

-		if (! $this->table_element) {

-			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);

-			return -1;

-		}

-		if ($warehouse_id<0) $warehouse_id='NULL';

-		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');

-

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET fk_warehouse = ".$warehouse_id;

-		$sql.= " WHERE rowid=".$this->id;

-

-		if ($this->db->query($sql)) {

-			$this->warehouse_id = ($warehouse_id=='NULL')?null:$warehouse_id;

-			return 1;

-		} else {

-			dol_syslog(get_class($this).'::setWarehouse Error ', LOG_DEBUG);

-			$this->error=$this->db->error();

-			return 0;

-		}

-	}

-

-

-	/**

-	 *		Set last model used by doc generator

-	 *

-	 *		@param		User	$user		User object that make change

-	 *		@param		string	$modelpdf	Modele name

-	 *		@return		int					<0 if KO, >0 if OK

-	 */

-	function setDocModel($user, $modelpdf)

-	{

-		if (! $this->table_element)

-		{

-			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined",LOG_ERR);

-			return -1;

-		}

-

-		$newmodelpdf=dol_trunc($modelpdf,255);

-

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";

-		$sql.= " WHERE rowid = ".$this->id;

-		// if ($this->element == 'facture') $sql.= " AND fk_statut < 2";

-		// if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";

-

-		dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);

-		$resql=$this->db->query($sql);

-		if ($resql)

-		{

-			$this->modelpdf=$modelpdf;

-			return 1;

-		}

-		else

-		{

-			dol_print_error($this->db);

-			return 0;

-		}

-	}

-

-

-	/**

-	 *  Change the bank account

-	 *

-	 *  @param		int		$fk_account		Id of bank account

-	 *  @param      bool    $notrigger      false=launch triggers after, true=disable triggers

-	 *  @param      User	$userused		Object user

-	 *  @return		int				1 if OK, 0 if KO

-	 */

-	function setBankAccount($fk_account, $notrigger=false, $userused=null)

-	{

-        global $user;

 

-        if (empty($userused)) $userused=$user;

+        if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde)))

+        {

+            require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';

+            $tmparray=getState($this->state_id,'all',0,1);

+            $this->state_code   =$tmparray['code'];

+            $this->state        =$tmparray['label'];

+            $this->region_code  =$tmparray['region_code'];

+            $this->region       =$tmparray['region'];

+        }

 

-        $error = 0;

+        return dol_format_address($this, $withcountry, $sep);

+    }

 

-		if (! $this->table_element) {

-			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);

-			return -1;

-		}

-        $this->db->begin();

 

-		if ($fk_account<0) $fk_account='NULL';

-		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');

+    /**

+     * 	Return full address for banner

+     *

+     * 	@param		string		$htmlkey            HTML id to make banner content unique

+     *  @param      Object      $object				Object (thirdparty, thirdparty of contact for contact, null for a member)

+     *	@return		string							Full address string

+     */

+    function getBannerAddress($htmlkey, $object)

+    {

+        global $conf, $langs;

 

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET fk_account = ".$fk_account;

-		$sql.= " WHERE rowid=".$this->id;

+        $countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS

 

-        $resql = $this->db->query($sql);

-        if (! $resql)

+        $contactid=0;

+        $thirdpartyid=0;

+        if ($this->element == 'societe')

         {

-            dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());

-            $this->error = $this->db->lasterror();

-            $error++;

+            $thirdpartyid=$this->id;

         }

-        else

+        if ($this->element == 'contact')

         {

-            if (!$notrigger)

-            {

-                // Call trigger

-                $this->context=array('bankaccountupdate'=>1);

-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

-                if ($result < 0) $error++;

-                // End call trigger

-            }

+            $contactid=$this->id;

+            $thirdpartyid=$object->fk_soc;

         }

-        if ($error)

+        if ($this->element == 'user')

         {

-            $this->db->rollback();

-            return -1;

+            $contactid=$this->contact_id;

+            $thirdpartyid=$object->fk_soc;

         }

-        else

+

+        $out='<!-- BEGIN part to show address block -->';

+

+        $outdone=0;

+        $coords = $this->getFullAddress(1, ', ', Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);

+        if ($coords)

         {

-            $this->fk_account = ($fk_account=='NULL')?null:$fk_account;

-            $this->db->commit();

-            return 1;

+            if (!empty(Globals::$conf->use_javascript_ajax)) {

+                $namecoords = $this->getFullName($langs,1).'<br>'.$coords;

+                // hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile

+                $out.='<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';

+                $out.=img_picto($langs->trans("Address"), 'object_address.png');

+                $out.='</a> ';

+            }

+            $out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;

+            $outdone++;

         }

-    }

 

+        if (!in_array($this->country_code, $countriesusingstate) && empty(Globals::$conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress

+            && empty(Globals::$conf->global->SOCIETE_DISABLE_STATE) && $this->state) {

+            if (!empty(Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {

+                $out.=($outdone?' - ':'').$this->region.' - '.$this->state;

+            }

+            else {

+                $out.=($outdone?' - ':'').$this->state;

+            }

+            $outdone++;

+        }

 

-	// TODO: Move line related operations to CommonObjectLine?

-

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *  Save a new position (field rang) for details lines.

-	 *  You can choose to set position for lines with already a position or lines without any position defined.

-	 *

-	 * 	@param		boolean		$renum			   True to renum all already ordered lines, false to renum only not already ordered lines.

-	 * 	@param		string		$rowidorder		   ASC or DESC

-	 * 	@param		boolean		$fk_parent_line    Table with fk_parent_line field or not

-	 * 	@return		int                            <0 if KO, >0 if OK

-	 */

-	function line_order($renum=false, $rowidorder='ASC', $fk_parent_line=true)

-	{

-        // phpcs:enable

-		if (! $this->table_element_line)

-		{

-			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined",LOG_ERR);

-			return -1;

-		}

-		if (! $this->fk_element)

-		{

-			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined",LOG_ERR);

-			return -1;

-		}

-

-		// Count number of lines to reorder (according to choice $renum)

-		$nl=0;

-		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;

-		if (! $renum) $sql.= ' AND rang = 0';

-		if ($renum) $sql.= ' AND rang <> 0';

-

-		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$row = $this->db->fetch_row($resql);

-			$nl = $row[0];

-		}

-		else dol_print_error($this->db);

-		if ($nl > 0)

-		{

-			// The goal of this part is to reorder all lines, with all children lines sharing the same

-			// counter that parents.

-			$rows=array();

-

-			// We first search all lines that are parent lines (for multilevel details lines)

-			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';

-			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;

-

-			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);

-			$resql = $this->db->query($sql);

-			if ($resql)

-			{

-				$i=0;

-				$num = $this->db->num_rows($resql);

-				while ($i < $num)

-				{

-					$row = $this->db->fetch_row($resql);

-					$rows[] = $row[0];	// Add parent line into array rows

-					$childrens = $this->getChildrenOfLine($row[0]);

-					if (! empty($childrens))

-					{

-						foreach($childrens as $child)

-						{

-							array_push($rows, $child);

-						}

-					}

-					$i++;

-				}

+        if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');

+        if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone

+            $out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

+        }

+        if (! empty($this->phone_pro)) {

+            $out.=dol_print_phone($this->phone_pro,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

+        }

+        if (! empty($this->phone_mobile)) {

+            $out.=dol_print_phone($this->phone_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;

+        }

+        if (! empty($this->phone_perso)) {

+            $out.=dol_print_phone($this->phone_perso,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePerso")); $outdone++;

+        }

+        if (! empty($this->office_phone)) {

+            $out.=dol_print_phone($this->office_phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

+        }

+        if (! empty($this->user_mobile)) {

+            $out.=dol_print_phone($this->user_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;

+        }

+        if (! empty($this->fax)) {

+            $out.=dol_print_phone($this->fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;

+        }

+        if (! empty($this->office_fax)) {

+            $out.=dol_print_phone($this->office_fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;

+        }

 

-				// Now we set a new number for each lines (parent and children with children included into parent tree)

-				if (! empty($rows))

-				{

-					foreach($rows as $key => $row)

-					{

-						$this->updateRangOfLine($row, ($key+1));

-					}

-				}

-			}

-			else

-			{

-				dol_print_error($this->db);

-			}

-		}

-		return 1;

-	}

-

-	/**

-	 * 	Get children of line

-	 *

-	 * 	@param	int		$id		Id of parent line

-	 * 	@return	array			Array with list of children lines id

-	 */

-	function getChildrenOfLine($id)

-	{

-		$rows=array();

-

-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-		$sql.= ' AND fk_parent_line = '.$id;

-		$sql.= ' ORDER BY rang ASC';

-

-		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$i=0;

-			$num = $this->db->num_rows($resql);

-			while ($i < $num)

-			{

-				$row = $this->db->fetch_row($resql);

-				$rows[$i] = $row[0];

-				$i++;

-			}

-		}

+        $out.='<div style="clear: both;"></div>';

+        $outdone=0;

+        if (! empty($this->email))

+        {

+            $out.=dol_print_email($this->email,$this->id,$object->id,'AC_EMAIL',0,0,1);

+            $outdone++;

+        }

+        if (! empty($this->url))

+        {

+            $out.=dol_print_url($this->url,'_goout',0,1);

+            $outdone++;

+        }

+        $out.='<div style="clear: both;">';

+        if (!empty(Globals::$conf->socialnetworks->enabled)) {

+            if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');

+            $outdone++;

+            if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');

+            $outdone++;

+            if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');

+            $outdone++;

+            if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');

+            $outdone++;

+        }

+        $out.='</div>';

 

-		return $rows;

-	}

+        $out.='<!-- END Part to show address block -->';

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 * 	Update a line to have a lower rank

-	 *

-	 * 	@param 	int			$rowid				Id of line

-	 * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not

-	 * 	@return	void

-	 */

-	function line_up($rowid, $fk_parent_line=true)

-	{

-        // phpcs:enable

-		$this->line_order(false, 'ASC', $fk_parent_line);

+        return $out;

+    }

 

-		// Get rang of line

-		$rang = $this->getRangOfLine($rowid);

+    /**

+     * Return the link of last main doc file for direct public download.

+     *

+     * @param	string	$modulepart			Module related to document

+     * @param	int		$initsharekey		Init the share key if it was not yet defined

+     * @param	int		$relativelink		0=Return full external link, 1=Return link relative to root of file

+     * @return	string						Link or empty string if there is no download link

+     */

+    function getLastMainDocLink($modulepart, $initsharekey=0, $relativelink=0)

+    {

+        global $user, $dolibarr_main_url_root;

 

-		// Update position of line

-		$this->updateLineUp($rowid, $rang);

-	}

+        if (empty($this->last_main_doc))

+        {

+            return '';		// No way to known which document name to use

+        }

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 * 	Update a line to have a higher rank

-	 *

-	 * 	@param	int			$rowid				Id of line

-	 * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not

-	 * 	@return	void

-	 */

-	function line_down($rowid, $fk_parent_line=true)

-	{

-        // phpcs:enable

-		$this->line_order(false, 'ASC', $fk_parent_line);

-

-		// Get rang of line

-		$rang = $this->getRangOfLine($rowid);

-

-		// Get max value for rang

-		$max = $this->line_max();

-

-		// Update position of line

-		$this->updateLineDown($rowid, $rang, $max);

-	}

-

-	/**

-	 * 	Update position of line (rang)

-	 *

-	 * 	@param	int		$rowid		Id of line

-	 * 	@param	int		$rang		Position

-	 * 	@return	void

-	 */

-	function updateRangOfLine($rowid,$rang)

-	{

-		$fieldposition = 'rang';

-		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

-

-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

-		$sql.= ' WHERE rowid = '.$rowid;

-

-		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);

-		if (! $this->db->query($sql))

-		{

-			dol_print_error($this->db);

-		}

-	}

+        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

+        $ecmfile=new EcmFiles($this->db);

+        $result = $ecmfile->fetch(0, '', $this->last_main_doc);

+        if ($result < 0)

+        {

+            $this->error = $ecmfile->error;

+            $this->errors = $ecmfile->errors;

+            return -1;

+        }

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 * 	Update position of line with ajax (rang)

-	 *

-	 * 	@param	array	$rows	Array of rows

-	 * 	@return	void

-	 */

-	function line_ajaxorder($rows)

-	{

-        // phpcs:enable

-		$num = count($rows);

-		for ($i = 0 ; $i < $num ; $i++)

-		{

-			$this->updateRangOfLine($rows[$i], ($i+1));

-		}

-	}

-

-	/**

-	 * 	Update position of line up (rang)

-	 *

-	 * 	@param	int		$rowid		Id of line

-	 * 	@param	int		$rang		Position

-	 * 	@return	void

-	 */

-	function updateLineUp($rowid,$rang)

-	{

-		if ($rang > 1)

-		{

-			$fieldposition = 'rang';

-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

-

-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;

-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-			$sql.= ' AND rang = '.($rang - 1);

-			if ($this->db->query($sql) )

-			{

-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);

-				$sql.= ' WHERE rowid = '.$rowid;

-				if (! $this->db->query($sql) )

-				{

-					dol_print_error($this->db);

-				}

-			}

-			else

-			{

-				dol_print_error($this->db);

-			}

-		}

-	}

-

-	/**

-	 * 	Update position of line down (rang)

-	 *

-	 * 	@param	int		$rowid		Id of line

-	 * 	@param	int		$rang		Position

-	 * 	@param	int		$max		Max

-	 * 	@return	void

-	 */

-	function updateLineDown($rowid,$rang,$max)

-	{

-		if ($rang < $max)

-		{

-			$fieldposition = 'rang';

-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

-

-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-			$sql.= ' AND rang = '.($rang+1);

-			if ($this->db->query($sql) )

-			{

-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang+1);

-				$sql.= ' WHERE rowid = '.$rowid;

-				if (! $this->db->query($sql) )

+        if (empty($ecmfile->id))

+        {

+            // Add entry into index

+            if ($initsharekey)

+            {

+                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

+                // TODO We can't, we dont' have full path of file, only last_main_doc adn ->element, so we must rebuild full path first

+                /*

+				$ecmfile->filepath = $rel_dir;

+				$ecmfile->filename = $filename;

+				$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content

+				$ecmfile->fullpath_orig = '';

+				$ecmfile->gen_or_uploaded = 'generated';

+				$ecmfile->description = '';    // indexed content

+				$ecmfile->keyword = '';        // keyword content

+				$ecmfile->share = getRandomPassword(true);

+				$result = $ecmfile->create($user);

+				if ($result < 0)

 				{

-					dol_print_error($this->db);

+					$this->error = $ecmfile->error;

+					$this->errors = $ecmfile->errors;

 				}

-			}

-			else

-			{

-				dol_print_error($this->db);

-			}

-		}

-	}

-

-	/**

-	 * 	Get position of line (rang)

-	 *

-	 * 	@param		int		$rowid		Id of line

-	 *  @return		int     			Value of rang in table of lines

-	 */

-	function getRangOfLine($rowid)

-	{

-		$sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE rowid ='.$rowid;

-

-		dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$row = $this->db->fetch_row($resql);

-			return $row[0];

-		}

-	}

-

-	/**

-	 * 	Get rowid of the line relative to its position

-	 *

-	 * 	@param		int		$rang		Rang value

-	 *  @return     int     			Rowid of the line

-	 */

-	function getIdOfLine($rang)

-	{

-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-		$sql.= ' AND rang = '.$rang;

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$row = $this->db->fetch_row($resql);

-			return $row[0];

-		}

-	}

+				*/

+            }

+            else return '';

+        }

+        elseif (empty($ecmfile->share))

+        {

+            // Add entry into index

+            if ($initsharekey)

+            {

+                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

+                $ecmfile->share = getRandomPassword(true);

+                $ecmfile->update($user);

+            }

+            else return '';

+        }

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 * 	Get max value used for position of line (rang)

-	 *

-	 * 	@param		int		$fk_parent_line		Parent line id

-	 *  @return     int  			   			Max value of rang in table of lines

-	 */

-	function line_max($fk_parent_line=0)

-	{

-        // phpcs:enable

-		// Search the last rang with fk_parent_line

-		if ($fk_parent_line)

-		{

-			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-			$sql.= ' AND fk_parent_line = '.$fk_parent_line;

-

-			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);

-			$resql = $this->db->query($sql);

-			if ($resql)

-			{

-				$row = $this->db->fetch_row($resql);

-				if (! empty($row[0]))

-				{

-					return $row[0];

-				}

-				else

-				{

-					return $this->getRangOfLine($fk_parent_line);

-				}

-			}

-		}

-		// If not, search the last rang of element

-		else

-		{

-			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-

-			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);

-			$resql = $this->db->query($sql);

-			if ($resql)

-			{

-				$row = $this->db->fetch_row($resql);

-				return $row[0];

-			}

-		}

-	}

+        // Define $urlwithroot

+        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));

+        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file

+        //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *  Update external ref of element

-	 *

-	 *  @param      string		$ref_ext	Update field ref_ext

-	 *  @return     int      		   		<0 if KO, >0 if OK

-	 */

-	function update_ref_ext($ref_ext)

-	{

-        // phpcs:enable

-		if (! $this->table_element)

-		{

-			dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);

-			return -1;

-		}

-

-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";

-		$sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;

-

-		dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);

-		if ($this->db->query($sql))

-		{

-			$this->ref_ext = $ref_ext;

-			return 1;

-		}

-		else

-		{

-			$this->error=$this->db->error();

-			return -1;

-		}

-	}

+        $forcedownload=0;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *  Update note of element

-	 *

-	 *  @param      string		$note		New value for note

-	 *  @param		string		$suffix		'', '_public' or '_private'

-	 *  @return     int      		   		<0 if KO, >0 if OK

-	 */

-	function update_note($note, $suffix='')

-	{

-        // phpcs:enable

-		global $user;

-

-		if (! $this->table_element)

-		{

-			$this->error='update_note was called on objet with property table_element not defined';

-			dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);

-			return -1;

-		}

-		if (! in_array($suffix,array('','_public','_private')))

-		{

-			$this->error='update_note Parameter suffix must be empty, \'_private\' or \'_public\'';

-			dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);

-			return -2;

-		}

-		// Special cas

-		//var_dump($this->table_element);exit;

-		if ($this->table_element == 'product') $suffix='';

-

-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");

-		$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;

-		$sql.= " WHERE rowid =". $this->id;

-

-		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);

-		if ($this->db->query($sql))

-		{

-			if ($suffix == '_public') $this->note_public = $note;

-			else if ($suffix == '_private') $this->note_private = $note;

-			else

-			{

-				$this->note = $note;      // deprecated

-				$this->note_private = $note;

-			}

-			return 1;

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			return -1;

-		}

-	}

+        $paramlink='';

+        //if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.

+        //if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.

+        //$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash

+        if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share

+        if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';

+

+        if ($relativelink)

+        {

+            $linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');

+        }

+        else

+        {

+            $linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');

+        }

+

+        // Here $ecmfile->share is defined

+        return $linktoreturn;

+    }

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 * 	Update public note (kept for backward compatibility)

-	 *

-	 * @param      string		$note		New value for note

-	 * @return     int      		   		<0 if KO, >0 if OK

-	 * @deprecated

-	 * @see update_note()

-	 */

-	function update_note_public($note)

-	{

-        // phpcs:enable

-		return $this->update_note($note,'_public');

-	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *	Update total_ht, total_ttc, total_vat, total_localtax1, total_localtax2 for an object (sum of lines).

-	 *  Must be called at end of methods addline or updateline.

-	 *

-	 *	@param	int		$exclspec          	>0 = Exclude special product (product_type=9)

-	 *  @param  string	$roundingadjust    	'none'=Do nothing, 'auto'=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND if defined, or '0'), '0'=Force mode total of rounding, '1'=Force mode rounding of total

-	 *  @param	int		$nodatabaseupdate	1=Do not update database. Update only properties of object.

-	 *  @param	Societe	$seller				If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object.

-	 *	@return	int    			           	<0 if KO, >0 if OK

-	 */

-	function update_price($exclspec=0,$roundingadjust='none',$nodatabaseupdate=0,$seller=null)

-	{

+    /**

+     *  Add a link between element $this->element and a contact

+     *

+     *  @param	int		$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link

+     *  @param 	int		$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL

+     *  @param  string	$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)

+     *  @param  int		$notrigger			Disable all triggers

+     *  @return int                 		<0 if KO, >0 if OK

+     */

+    function add_contact($fk_socpeople, $type_contact, $source='external',$notrigger=0)

+    {

         // phpcs:enable

-		global $conf, $hookmanager, $action;

-

-		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)

-		$MODULE = "";

-		if ($this->element == 'propal')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";

-		elseif ($this->element == 'order')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";

-		elseif ($this->element == 'facture')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";

-		elseif ($this->element == 'facture_fourn')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";

-		elseif ($this->element == 'order_supplier')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";

-		elseif ($this->element == 'supplier_proposal')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";

-

-		if (! empty($MODULE)) {

-			if (!empty(Globals::$conf->global->$MODULE)) {

-                $modsactivated = explode(',', Globals::$conf->global->$MODULE);

-                foreach ($modsactivated as $mod) {

-					if (Globals::$conf->$mod->enabled)

-                        return 1; // update was disabled by specific setup

-				}

-			}

-		}

+        global $user,$langs;

 

-		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';

 

-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility

+        dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");

 

-		$forcedroundingmode=$roundingadjust;

-		if ($forcedroundingmode == 'auto' && isset(Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND))

-            $forcedroundingmode = Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;

-        elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';

+        // Check parameters

+        if ($fk_socpeople <= 0)

+        {

+            $langs->load("errors");

+            $this->error=$langs->trans("ErrorWrongValueForParameterX","1");

+            dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);

+            return -1;

+        }

+        if (! $type_contact)

+        {

+            $langs->load("errors");

+            $this->error=$langs->trans("ErrorWrongValueForParameterX","2");

+            dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);

+            return -2;

+        }

 

-		$error=0;

-

-		$multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;

-

-		// Define constants to find lines to sum

-		$fieldtva='total_tva';

-		$fieldlocaltax1='total_localtax1';

-		$fieldlocaltax2='total_localtax2';

-		$fieldup='subprice';

-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')

-		{

-			$fieldtva='tva';

-			$fieldup='pu_ht';

-		}

-		if ($this->element == 'expensereport')

-		{

-			$fieldup='value_unit';

-		}

-

-		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';

-		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';

-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';

-			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';

-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-		if ($exclspec)

-		{

-			$product_field='product_type';

-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field

-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';

-		}

-		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used

-

-		dol_syslog(get_class($this)."::update_price", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$this->total_ht  = 0;

-			$this->total_tva = 0;

-			$this->total_localtax1 = 0;

-			$this->total_localtax2 = 0;

-			$this->total_ttc = 0;

-			$total_ht_by_vats  = array();

-			$total_tva_by_vats = array();

-			$total_ttc_by_vats = array();

-			$this->multicurrency_total_ht	= 0;

-			$this->multicurrency_total_tva	= 0;

-			$this->multicurrency_total_ttc	= 0;

-

-			$num = $this->db->num_rows($resql);

-			$i = 0;

-			while ($i < $num)

-			{

-				$obj = $this->db->fetch_object($resql);

+        $id_type_contact=0;

+        if (is_numeric($type_contact))

+        {

+            $id_type_contact=$type_contact;

+        }

+        else

+        {

+            // We look for id type_contact

+            $sql = "SELECT tc.rowid";

+            $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

+            $sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";

+            $sql.= " AND tc.source='".$this->db->escape($source)."'";

+            $sql.= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";

+            //print $sql;

+            $resql=$this->db->query($sql);

+            if ($resql)

+            {

+                $obj = $this->db->fetch_object($resql);

+                if ($obj) $id_type_contact=$obj->rowid;

+            }

+        }

 

-				// Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'

-				$parameters=array('fk_element' => $obj->rowid);

-				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

+        if ($id_type_contact == 0)

+        {

+            $this->error='CODE_NOT_VALID_FOR_THIS_ELEMENT';

+            dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");

+            return -3;

+        }

 

-				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'

-				{

-					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);

-					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);

-					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);

-					if ($diff)

-					{

-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;

-						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

-								$resqlfix=$this->db->query($sqlfix);

-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');

-								$obj->total_tva = $tmpcal[1];

-								$obj->total_ttc = $tmpcal[2];

-						//

-					}

-				}

+        $datecreate = dol_now();

 

-				$this->total_ht        += $obj->total_ht;		// The field visible at end of line detail

-				$this->total_tva       += $obj->total_tva;

-				$this->total_localtax1 += $obj->total_localtax1;

-				$this->total_localtax2 += $obj->total_localtax2;

-				$this->total_ttc       += $obj->total_ttc;

-				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht;		// The field visible at end of line detail

-				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;

-				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;

-

-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;

-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;

-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;

-				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;

-				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;

-				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;

-

-				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency

-				{

-					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);

-					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);

-					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";

-					if ($diff)

-					{

-						if (abs($diff) > 0.1) { dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING); exit; }

-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;

-						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

-								$resqlfix=$this->db->query($sqlfix);

-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');

-								$this->total_tva -= $diff;

-								$this->total_ttc -= $diff;

-								$total_tva_by_vats[$obj->vatrate] -= $diff;

-								$total_ttc_by_vats[$obj->vatrate] -= $diff;

-					}

-				}

+        // Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error

+        $TListeContacts=$this->liste_contact(-1, $source);

+        $already_added=false;

+        if(!empty($TListeContacts)) {

+            foreach($TListeContacts as $array_contact) {

+                if($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {

+                    $already_added=true;

+                    break;

+                }

+            }

+        }

 

-				$i++;

-			}

+        if(!$already_added) {

 

-			// Add revenue stamp to total

-			$this->total_ttc       			+= isset($this->revenuestamp)?$this->revenuestamp:0;

-			$this->multicurrency_total_ttc  += isset($this->revenuestamp)?($this->revenuestamp * $multicurrency_tx):0;

+            $this->db->begin();

 

-			// Situations totals

-			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE )

-			{

-				$prev_sits = $this->get_prev_sits();

-

-				foreach ($prev_sits as $sit) {				// $sit is an object Facture loaded with a fetch.

-					$this->total_ht -= $sit->total_ht;

-					$this->total_tva -= $sit->total_tva;

-					$this->total_localtax1 -= $sit->total_localtax1;

-					$this->total_localtax2 -= $sit->total_localtax2;

-					$this->total_ttc -= $sit->total_ttc;

-					$this->multicurrency_total_ht -= $sit->multicurrency_total_ht;

-					$this->multicurrency_total_tva -= $sit->multicurrency_total_tva;

-					$this->multicurrency_total_ttc -= $sit->multicurrency_total_ttc;

-				}

-			}

-

-			$this->db->free($resql);

-

-			// Now update global field total_ht, total_ttc and tva

-			$fieldht='total_ht';

-			$fieldtva='tva';

-			$fieldlocaltax1='localtax1';

-			$fieldlocaltax2='localtax2';

-			$fieldttc='total_ttc';

-			// Specific code for backward compatibility with old field names

-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';

-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';

-			if ($this->element == 'propal')                                                $fieldttc='total';

-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';

-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';

-

-			if (empty($nodatabaseupdate))

-			{

-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';

-				$sql .= " ".$fieldht."='".price2num($this->total_ht)."',";

-				$sql .= " ".$fieldtva."='".price2num($this->total_tva)."',";

-				$sql .= " ".$fieldlocaltax1."='".price2num($this->total_localtax1)."',";

-				$sql .= " ".$fieldlocaltax2."='".price2num($this->total_localtax2)."',";

-				$sql .= " ".$fieldttc."='".price2num($this->total_ttc)."'";

-						$sql .= ", multicurrency_total_ht='".price2num($this->multicurrency_total_ht, 'MT', 1)."'";

-						$sql .= ", multicurrency_total_tva='".price2num($this->multicurrency_total_tva, 'MT', 1)."'";

-						$sql .= ", multicurrency_total_ttc='".price2num($this->multicurrency_total_ttc, 'MT', 1)."'";

-				$sql .= ' WHERE rowid = '.$this->id;

-

-

-				dol_syslog(get_class($this)."::update_price", LOG_DEBUG);

-				$resql=$this->db->query($sql);

-				if (! $resql)

-				{

-					$error++;

-					$this->error=$this->db->lasterror();

-					$this->errors[]=$this->db->lasterror();

-				}

-			}

+            // Insert into database

+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";

+            $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";

+            $sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;

+            $sql.= "'".$this->db->idate($datecreate)."'";

+            $sql.= ", 4, ". $id_type_contact;

+            $sql.= ")";

 

-			if (! $error)

-			{

-				return 1;

-			}

-			else

-			{

-				return -1;

-			}

-		}

-		else

-		{

-			dol_print_error($this->db,'Bad request in update_price');

-			return -1;

-		}

-	}

+            $resql=$this->db->query($sql);

+            if ($resql)

+            {

+                if (! $notrigger)

+                {

+                    $result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);

+                    if ($result < 0)

+                    {

+                        $this->db->rollback();

+                        return -1;

+                    }

+                }

+

+                $this->db->commit();

+                return 1;

+            }

+            else

+            {

+                if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')

+                {

+                    $this->error=$this->db->errno();

+                    $this->db->rollback();

+                    echo 'err rollback';

+                    return -2;

+                }

+                else

+                {

+                    $this->error=$this->db->error();

+                    $this->db->rollback();

+                    return -1;

+                }

+            }

+        } else return 0;

+    }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *	Add objects linked in llx_element_element.

-	 *

-	 *	@param		string	$origin		Linked element type

-	 *	@param		int		$origin_id	Linked element id

-	 *	@return		int					<=0 if KO, >0 if OK

-	 *	@see		fetchObjectLinked, updateObjectLinked, deleteObjectLinked

-	 */

-	function add_object_linked($origin=null, $origin_id=null)

-	{

+    /**

+     *    Copy contact from one element to current

+     *

+     *    @param    CommonObject    $objFrom    Source element

+     *    @param    string          $source     Nature of contact ('internal' or 'external')

+     *    @return   int                         >0 if OK, <0 if KO

+     */

+    function copy_linked_contact($objFrom, $source='internal')

+    {

         // phpcs:enable

-		$origin = (! empty($origin) ? $origin : $this->origin);

-		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);

-

-		// Special case

-		if ($origin == 'order') $origin='commande';

-		if ($origin == 'invoice') $origin='facture';

-		if ($origin == 'invoice_template') $origin='facturerec';

-    	if ($origin == 'supplierorder') $origin='order_supplier';

-		$this->db->begin();

-

-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";

-		$sql.= "fk_source";

-		$sql.= ", sourcetype";

-		$sql.= ", fk_target";

-		$sql.= ", targettype";

-		$sql.= ") VALUES (";

-		$sql.= $origin_id;

-		$sql.= ", '".$this->db->escape($origin)."'";

-		$sql.= ", ".$this->id;

-		$sql.= ", '".$this->db->escape($this->element)."'";

-		$sql.= ")";

-

-		dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);

-		if ($this->db->query($sql))

-	  	{

-	  		$this->db->commit();

-	  		return 1;

-	  	}

-	  	else

-	  	{

-	  		$this->error=$this->db->lasterror();

-	  		$this->db->rollback();

-	  		return 0;

-	  	}

-	}

-

-	/**

-	 *	Fetch array of objects linked to current object (object of enabled modules only). Links are loaded into

-	 *		this->linkedObjectsIds array and

-	 *		this->linkedObjects array if $loadalsoobjects = 1

-	 *  Possible usage for parameters:

-	 *  - all parameters empty -> we look all link to current object (current object can be source or target)

-	 *  - source id+type -> will get target list linked to source

-	 *  - target id+type -> will get source list linked to target

-	 *  - source id+type + target type -> will get target list of the type

-	 *  - target id+type + target source -> will get source list of the type

-	 *

-	 *	@param	int		$sourceid			Object source id (if not defined, id of object)

-	 *	@param  string	$sourcetype			Object source type (if not defined, element name of object)

-	 *	@param  int		$targetid			Object target id (if not defined, id of object)

-	 *	@param  string	$targettype			Object target type (if not defined, elemennt name of object)

-	 *	@param  string	$clause				'OR' or 'AND' clause used when both source id and target id are provided

-	 *  @param  int		$alsosametype		0=Return only links to object that differs from source type. 1=Include also link to objects of same type.

-	 *  @param  string	$orderby			SQL 'ORDER BY' clause

-	 *  @param	int		$loadalsoobjects	Load also array this->linkedObjects (Use 0 to increase performances)

-	 *	@return int							<0 if KO, >0 if OK

-	 *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked

-	 */

-	function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1,$orderby='sourcetype',$loadalsoobjects=1)

-	{

-		global $conf;

-

-		$this->linkedObjectsIds=array();

-		$this->linkedObjects=array();

-

-		$justsource=false;

-		$justtarget=false;

-		$withtargettype=false;

-		$withsourcetype=false;

-

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))

-		{

-			$justsource=true;  // the source (id and type) is a search criteria

-			if (! empty($targettype)) $withtargettype=true;

-		}

-		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))

-		{

-			$justtarget=true;  // the target (id and type) is a search criteria

-			if (! empty($sourcetype)) $withsourcetype=true;

-		}

-

-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);

-		$targetid = (! empty($targetid) ? $targetid : $this->id);

-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);

-		$targettype = (! empty($targettype) ? $targettype : $this->element);

-

-		/*if (empty($sourceid) && empty($targetid))

-		 {

-		 dol_syslog('Bad usage of function. No source nor target id defined (nor as parameter nor as object id)', LOG_ERR);

-		 return -1;

-		 }*/

-

-		// Links between objects are stored in table element_element

-		$sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';

-		$sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';

-		$sql.= " WHERE ";

-		if ($justsource || $justtarget)

-		{

-			if ($justsource)

-			{

-				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";

-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";

-			}

-			else if ($justtarget)

-			{

-				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";

-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";

-			}

-		}

-		else

-		{

-			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";

-			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";

-		}

-		$sql .= ' ORDER BY '.$orderby;

-

-		dol_syslog(get_class($this)."::fetchObjectLink", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$num = $this->db->num_rows($resql);

-			$i = 0;

-			while ($i < $num)

-			{

-				$obj = $this->db->fetch_object($resql);

-				if ($justsource || $justtarget)

-				{

-					if ($justsource)

-					{

-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;

-					}

-					else if ($justtarget)

-					{

-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;

-					}

-				}

-				else

-				{

-					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)

-					{

-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;

-					}

-					if ($obj->fk_target == $targetid && $obj->targettype == $targettype)

-					{

-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;

-					}

-				}

-				$i++;

-			}

+        $contacts = $objFrom->liste_contact(-1, $source);

+        foreach($contacts as $contact)

+        {

+            if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)

+            {

+                $this->error=$this->db->lasterror();

+                return -1;

+            }

+        }

+        return 1;

+    }

 

-			if (! empty($this->linkedObjectsIds))

-			{

-				$tmparray = $this->linkedObjectsIds;

-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)

-				{

-					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)

-					$module = $element = $subelement = $objecttype;

-					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'

-						&& preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))

-					{

-						$module = $element = $regs[1];

-						$subelement = $regs[2];

-					}

-

-					$classpath = $element.'/class';

-					// To work with non standard classpath or module name

-					if ($objecttype == 'facture')			{

-						$classpath = 'compta/facture/class';

-					}

-					else if ($objecttype == 'facturerec')			{

-						$classpath = 'compta/facture/class'; $module = 'facture';

-					}

-					else if ($objecttype == 'propal')			{

-						$classpath = 'comm/propal/class';

-					}

-					else if ($objecttype == 'supplier_proposal')			{

-						$classpath = 'supplier_proposal/class';

-					}

-					else if ($objecttype == 'shipping')			{

-						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';

-					}

-					else if ($objecttype == 'delivery')			{

-						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';

-					}

-					else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{

-						$classpath = 'fourn/class'; $module = 'fournisseur';

-					}

-					else if ($objecttype == 'fichinter')			{

-						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';

-					}

-					else if ($objecttype == 'subscription')			{

-						$classpath = 'adherents/class'; $module = 'adherent';

-					}

-

-					// Set classfile

-					$classfile = strtolower($subelement); $classname = ucfirst($subelement);

-

-					if ($objecttype == 'order') {

-						$classfile = 'commande'; $classname = 'Commande';

-					}

-					else if ($objecttype == 'invoice_supplier') {

-						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';

-					}

-					else if ($objecttype == 'order_supplier')   {

-						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';

-					}

-					else if ($objecttype == 'supplier_proposal')   {

-						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';

-					}

-					else if ($objecttype == 'facturerec')   {

-						$classfile = 'facture-rec'; $classname = 'FactureRec';

-					}

-					else if ($objecttype == 'subscription')   {

-						$classfile = 'subscription'; $classname = 'Subscription';

-					}

-

-					// Here $module, $classfile and $classname are set

-					if (Globals::$conf->$module->enabled && (($element != $this->element) || $alsosametype)) {

-						if ($loadalsoobjects)

-						{

-							dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');

-							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);

-							if (class_exists($classname))

-							{

-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element

-								{

-									$object = new $classname($this->db);

-									$ret = $object->fetch($objectid);

-									if ($ret >= 0)

-									{

-										$this->linkedObjects[$objecttype][$i] = $object;

-									}

-								}

-							}

-						}

-					}

-					else

-					{

-						unset($this->linkedObjectsIds[$objecttype]);

-					}

-				}

-			}

-			return 1;

-		}

-		else

-		{

-			dol_print_error($this->db);

-			return -1;

-		}

-	}

-

-	/**

-	 *	Update object linked of a current object

-	 *

-	 *	@param	int		$sourceid		Object source id

-	 *	@param  string	$sourcetype		Object source type

-	 *	@param  int		$targetid		Object target id

-	 *	@param  string	$targettype		Object target type

-	 *	@return							int	>0 if OK, <0 if KO

-	 *	@see	add_object_linked, fetObjectLinked, deleteObjectLinked

-	 */

-	function updateObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='')

-	{

-		$updatesource=false;

-		$updatetarget=false;

-

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;

-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;

-

-		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";

-		if ($updatesource)

-		{

-			$sql.= "fk_source = ".$sourceid;

-			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";

-			$sql.= " WHERE fk_target = ".$this->id;

-			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";

-		}

-		else if ($updatetarget)

-		{

-			$sql.= "fk_target = ".$targetid;

-			$sql.= ", targettype = '".$this->db->escape($targettype)."'";

-			$sql.= " WHERE fk_source = ".$this->id;

-			$sql.= " AND sourcetype = '".$this->db->escape($this->element)."'";

-		}

-

-		dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);

-		if ($this->db->query($sql))

-		{

-			return 1;

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			return -1;

-		}

-	}

-

-	/**

-	 *	Delete all links between an object $this

-	 *

-	 *	@param	int		$sourceid		Object source id

-	 *	@param  string	$sourcetype		Object source type

-	 *	@param  int		$targetid		Object target id

-	 *	@param  string	$targettype		Object target type

-	 *  @param	int		$rowid			Row id of line to delete. If defined, other parameters are not used.

-	 *	@return     					int	>0 if OK, <0 if KO

-	 *	@see	add_object_linked, updateObjectLinked, fetchObjectLinked

-	 */

-	function deleteObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='', $rowid='')

-	{

-		$deletesource=false;

-		$deletetarget=false;

-

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;

-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;

-

-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);

-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);

-		$targetid = (! empty($targetid) ? $targetid : $this->id);

-		$targettype = (! empty($targettype) ? $targettype : $this->element);

-

-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";

-		$sql.= " WHERE";

-		if ($rowid > 0)

-		{

-			$sql.=" rowid = ".$rowid;

-		}

-		else

-		{

-			if ($deletesource)

-			{

-				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";

-				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";

-			}

-			else if ($deletetarget)

-			{

-				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";

-				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";

-			}

-			else

-			{

-				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";

-				$sql.= " OR";

-				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";

-			}

-		}

-

-		dol_syslog(get_class($this)."::deleteObjectLinked", LOG_DEBUG);

-		if ($this->db->query($sql))

-		{

-			return 1;

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			$this->errors[]=$this->error;

-			return -1;

-		}

-	}

-

-	/**

-	 *      Set status of an object

-	 *

-	 *      @param	int		$status			Status to set

-	 *      @param	int		$elementId		Id of element to force (use this->id by default)

-	 *      @param	string	$elementType	Type of element to force (use this->table_element by default)

-	 *      @param	string	$trigkey		Trigger key to use for trigger

-	 *      @return int						<0 if KO, >0 if OK

-	 */

-	function setStatut($status, $elementId=null, $elementType='', $trigkey='')

-	{

-		global $user,$langs,$conf;

-

-		$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.

-

-		$elementId = (!empty($elementId)?$elementId:$this->id);

-		$elementTable = (!empty($elementType)?$elementType:$this->table_element);

-

-		$this->db->begin();

-

-		$fieldstatus="fk_statut";

-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";

-		if ($elementTable == 'mailing') $fieldstatus="statut";

-		if ($elementTable == 'cronjob') $fieldstatus="status";

-		if ($elementTable == 'user') $fieldstatus="statut";

-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";

-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";

-

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;

-		$sql.= " SET ".$fieldstatus." = ".$status;

-		// If status = 1 = validated, update also fk_user_valid

-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;

-		$sql.= " WHERE rowid=".$elementId;

-

-		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);

-		if ($this->db->query($sql))

-		{

-			$error = 0;

-

-			// Try autoset of trigkey

-			if (empty($trigkey))

-			{

-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';

-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';

-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';

-			}

-

-			if ($trigkey)

-			{

-				// Appel des triggers

-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

-				$interface=new Interfaces($this->db);

-				$result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf);

-				if ($result < 0) {

-					$error++; $this->errors=$interface->errors;

-				}

-				// Fin appel triggers

-			}

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *      Update a link to contact line

+     *

+     *      @param	int		$rowid              Id of line contact-element

+     * 		@param	int		$statut	            New status of link

+     *      @param  int		$type_contact_id    Id of contact type (not modified if 0)

+     *      @param  int		$fk_socpeople	    Id of soc_people to update (not modified if 0)

+     *      @return int                 		<0 if KO, >= 0 if OK

+     */

+    function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0)

+    {

+        // phpcs:enable

+        // Insert into database

+        $sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";

+        $sql.= " statut = ".$statut;

+        if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";

+        if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";

+        $sql.= " where rowid = ".$rowid;

+        $resql=$this->db->query($sql);

+        if ($resql)

+        {

+            return 0;

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            return -1;

+        }

+    }

 

-			if (! $error)

-			{

-				$this->db->commit();

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *    Delete a link to contact line

+     *

+     *    @param	int		$rowid			Id of contact link line to delete

+     *    @param	int		$notrigger		Disable all triggers

+     *    @return   int						>0 if OK, <0 if KO

+     */

+    function delete_contact($rowid, $notrigger=0)

+    {

+        // phpcs:enable

+        global $user;

 

-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)

-				{

-					$this->statut = $status;

-					$this->status = $status;

-				}

 

-				return 1;

-			}

-			else

-			{

-				$this->db->rollback();

-				dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);

-				return -1;

-			}

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			$this->db->rollback();

-			return -1;

-		}

-	}

-

-

-	/**

-	 *  Load type of canvas of an object if it exists

-	 *

-	 *  @param      int		$id     Record id

-	 *  @param      string	$ref    Record ref

-	 *  @return		int				<0 if KO, 0 if nothing done, >0 if OK

-	 */

-	function getCanvas($id=0,$ref='')

-	{

-		global $conf;

-

-		if (empty($id) && empty($ref)) return 0;

-		if (!empty(Globals::$conf->global->MAIN_DISABLE_CANVAS))

-            return 0;    // To increase speed. Not enabled by default.

+        $this->db->begin();

 

-            // Clean parameters

-		$ref = trim($ref);

-

-		$sql = "SELECT rowid, canvas";

-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " WHERE entity IN (".getEntity($this->element).")";

-		if (! empty($id))  $sql.= " AND rowid = ".$id;

-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";

-

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$obj = $this->db->fetch_object($resql);

-			if ($obj)

-			{

-				$this->canvas   = $obj->canvas;

-				return 1;

-			}

-			else return 0;

-		}

-		else

-		{

-			dol_print_error($this->db);

-			return -1;

-		}

-	}

-

-

-	/**

-	 * 	Get special code of a line

-	 *

-	 * 	@param	int		$lineid		Id of line

-	 * 	@return	int					Special code

-	 */

-	function getSpecialCode($lineid)

-	{

-		$sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE rowid = '.$lineid;

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$row = $this->db->fetch_row($resql);

-			return $row[0];

-		}

-	}

-

-	/**

-	 *  Function to check if an object is used by others.

-	 *  Check is done into this->childtables. There is no check into llx_element_element.

-	 *

-	 *  @param	int		$id			Force id of object

-	 *  @return	int					<0 if KO, 0 if not used, >0 if already used

-	 */

-	function isObjectUsed($id=0)

-	{

-		global $langs;

-

-		if (empty($id)) $id=$this->id;

-

-		// Check parameters

-		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)

-		{

-			dol_print_error('Called isObjectUsed on a class with property this->childtables not defined');

-			return -1;

-		}

-

-		$arraytoscan = $this->childtables;

-		// For backward compatibility, we check if array is old format array('table1', 'table2', ...)

-		$tmparray=array_keys($this->childtables);

-		if (is_numeric($tmparray[0]))

-		{

-			$arraytoscan = array_flip($this->childtables);

-		}

-

-		// Test if child exists

-		$haschild=0;

-		foreach($arraytoscan as $table => $elementname)

-		{

-			//print $id.'-'.$table.'-'.$elementname.'<br>';

-			// Check if third party can be deleted

-			$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;

-			$sql.= " WHERE ".$this->fk_element." = ".$id;

-			$resql=$this->db->query($sql);

-			if ($resql)

-			{

-				$obj=$this->db->fetch_object($resql);

-				if ($obj->nb > 0)

-				{

-					$langs->load("errors");

-					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;

-					$haschild += $obj->nb;

-					if (is_numeric($elementname))	// old usage

-					{

-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);

-					}

-					else	// new usage: $elementname=Translation key

-					{

-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));

-					}

-					break;    // We found at least one, we stop here

-				}

-			}

-			else

-			{

-				$this->errors[]=$this->db->lasterror();

-				return -1;

-			}

-		}

-		if ($haschild > 0)

-		{

-			$this->errors[]="ErrorRecordHasChildren";

-			return $haschild;

-		}

-		else return 0;

-	}

-

-	/**

-	 *  Function to say how many lines object contains

-	 *

-	 *	@param	int		$predefined		-1=All, 0=Count free product/service only, 1=Count predefined product/service only, 2=Count predefined product, 3=Count predefined service

-	 *  @return	int						<0 if KO, 0 if no predefined products, nb of lines with predefined products if found

-	 */

-	function hasProductsOrServices($predefined=-1)

-	{

-		$nb=0;

-

-		foreach($this->lines as $key => $val)

-		{

-			$qualified=0;

-			if ($predefined == -1) $qualified=1;

-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;

-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;

-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;

-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;

-			if ($qualified) $nb++;

-		}

-		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');

-		return $nb;

-	}

-

-	/**

-	 * Function that returns the total amount HT of discounts applied for all lines.

-	 *

-	 * @return 	float

-	 */

-	function getTotalDiscount()

-	{

-		$total_discount=0.00;

-

-		$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";

-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";

-		$sql.= " WHERE ".$this->fk_element." = ".$this->id;

-

-		dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$num=$this->db->num_rows($resql);

-			$i=0;

-			while ($i < $num)

-			{

-				$obj = $this->db->fetch_object($resql);

-

-				$pu_ht = $obj->pu_ht;

-				$qty= $obj->qty;

-				$total_ht = $obj->total_ht;

-

-				$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));

-				$total_discount += $total_discount_line;

-

-				$i++;

-			}

-		}

-

-		//print $total_discount; exit;

-		return price2num($total_discount);

-	}

-

-

-	/**

-	 * Return into unit=0, the calculated total of weight and volume of all lines * qty

-	 * Calculate by adding weight and volume of each product line, so properties ->volume/volume_units/weight/weight_units must be loaded on line.

-	 *

-	 * @return  array                           array('weight'=>...,'volume'=>...)

-	 */

-	function getTotalWeightVolume()

-	{

-		$totalWeight = 0;

-		$totalVolume = 0;

-		// defined for shipment only

-		$totalOrdered = '';

-		// defined for shipment only

-		$totalToShip = '';

-

-		foreach ($this->lines as $line)

-		{

-			if (isset($line->qty_asked))

-			{

-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''

-				$totalOrdered+=$line->qty_asked;    // defined for shipment only

-			}

-			if (isset($line->qty_shipped))

-			{

-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''

-				$totalToShip+=$line->qty_shipped;   // defined for shipment only

-            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";

+        $sql.= " WHERE rowid =".$rowid;

+

+        dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);

+        if ($this->db->query($sql))

+        {

+            if (! $notrigger)

             {

-                if (empty($totalToShip)) $totalToShip=0;

-                $totalToShip+=$line->qty;   // defined for reception only

-			}

-

-			// Define qty, weight, volume, weight_units, volume_units

-			if ($this->element == 'shipping') {

-				// for shipments

-				$qty = $line->qty_shipped ? $line->qty_shipped : 0;

-			}

-			else {

-				$qty = $line->qty ? $line->qty : 0;

-			}

-

-			$weight = $line->weight ? $line->weight : 0;

-            ($weight==0 && !empty($line->product->weight))? $weight=$line->product->weight: 0;

-			$volume = $line->volume ? $line->volume : 0;

-			($volume==0 && !empty($line->product->volume))? $volume=$line->product->volume: 0;

+                $result=$this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);

+                if ($result < 0) { $this->db->rollback(); return -1; }

+            }

 

-			$weight_units=$line->weight_units;

-			($weight_units==0 && !empty($line->product->weight_units))? $weight_units=$line->product->weight_units: 0;

-			$volume_units=$line->volume_units;

-			($volume_units==0 && !empty($line->product->volume_units))? $volume_units=$line->product->volume_units: 0;

+            $this->db->commit();

+            return 1;

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            $this->db->rollback();

+            return -1;

+        }

+    }

 

-			$weightUnit=0;

-			$volumeUnit=0;

-			if (! empty($weight_units)) $weightUnit = $weight_units;

-			if (! empty($volume_units)) $volumeUnit = $volume_units;

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *    Delete all links between an object $this and all its contacts

+     *

+     *	  @param	string	$source		'' or 'internal' or 'external'

+     *	  @param	string	$code		Type of contact (code or id)

+     *    @return   int					>0 if OK, <0 if KO

+     */

+    function delete_linked_contact($source='',$code='')

+    {

+        // phpcs:enable

+        $temp = array();

+        $typeContact = $this->liste_type_contact($source,'',0,0,$code);

 

-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''

-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''

+        foreach($typeContact as $key => $value)

+        {

+            array_push($temp,$key);

+        }

+        $listId = implode(",", $temp);

 

-			//var_dump($line->volume_units);

-			if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

-			{

-				$trueWeightUnit=pow(10, $weightUnit);

-				$totalWeight += $weight * $qty * $trueWeightUnit;

-			}

-			else {

-		if ($weight_units == 99) {

-			// conversion 1 Pound = 0.45359237 KG

-			$trueWeightUnit = 0.45359237;

-			$totalWeight += $weight * $qty * $trueWeightUnit;

-		} elseif ($weight_units == 98) {

-			// conversion 1 Ounce = 0.0283495 KG

-			$trueWeightUnit = 0.0283495;

-			$totalWeight += $weight * $qty * $trueWeightUnit;

-		}

-		else

-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units

-			}

-			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

-			{

-				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;

-				$trueVolumeUnit=pow(10, $volumeUnit);

-				//print $line->volume;

-				$totalVolume += $volume * $qty * $trueVolumeUnit;

-			}

-			else

-			{

-				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units

-			}

-		}

-

-		return array('weight'=>$totalWeight, 'volume'=>$totalVolume, 'ordered'=>$totalOrdered, 'toship'=>$totalToShip);

-	}

-

-

-	/**

-	 *	Set extra parameters

-	 *

-	 *	@return	int      <0 if KO, >0 if OK

-	 */

-	function setExtraParameters()

-	{

-		$this->db->begin();

-

-		$extraparams = (! empty($this->extraparams) ? json_encode($this->extraparams) : null);

-

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");

-		$sql.= " WHERE rowid = ".$this->id;

-

-		dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if (! $resql)

-		{

-			$this->error=$this->db->lasterror();

-			$this->db->rollback();

-			return -1;

-		}

-		else

-		{

-			$this->db->commit();

-			return 1;

-		}

-	}

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";

+        $sql.= " WHERE element_id = ".$this->id;

+        if ($listId)

+            $sql.= " AND fk_c_type_contact IN (".$listId.")";

 

+        dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);

+        if ($this->db->query($sql))

+        {

+            return 1;

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            return -1;

+        }

+    }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *    Return incoterms informations

-	 *    TODO Use a cache for label get

-	 *

-	 *    @return	string	incoterms info

-	 */

-	function display_incoterms()

-	{

+    /**

+     *    Get array of all contacts for an object

+     *

+     *    @param	int			$statut		Status of links to get (-1=all)

+     *    @param	string		$source		Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)

+     *    @param	int         $list       0:Return array contains all properties, 1:Return array contains just id

+     *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)

+     *    @return	array|int		        Array of contacts, -1 if error

+     */

+    function liste_contact($statut=-1,$source='external',$list=0,$code='')

+    {

         // phpcs:enable

-		$out = '';

-		$this->libelle_incoterms = '';

-		if (!empty($this->fk_incoterms))

-		{

-			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;

-			$result = $this->db->query($sql);

-			if ($result)

-			{

-				$res = $this->db->fetch_object($result);

-				$out .= $res->code;

-			}

-		}

-

-		$out .= (($res->code && $this->location_incoterms)?' - ':'').$this->location_incoterms;

-

-		return $out;

-	}

-

-	/**

-	 *    Return incoterms informations for pdf display

-	 *

-	 *    @return	string		incoterms info

-	 */

-	function getIncotermsForPDF()

-	{

-		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;

-		$resql = $this->db->query($sql);

-		if ($resql)

-		{

-			$num = $this->db->num_rows($resql);

-			if ($num > 0)

-			{

-				$res = $this->db->fetch_object($resql);

-				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;

-			}

-			else

-			{

-				return '';

-			}

-		}

-		else

-		{

-			$this->errors[] = $this->db->lasterror();

-			return false;

-		}

-	}

-

-	/**

-	 *    Define incoterms values of current object

-	 *

-	 *    @param	int		$id_incoterm     Id of incoterm to set or '' to remove

-	 * 	  @param 	string  $location		 location of incoterm

-	 *    @return	int     		<0 if KO, >0 if OK

-	 */

-	function setIncoterms($id_incoterm, $location)

-	{

-		if ($this->id && $this->table_element)

-		{

-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-			$sql.= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");

-			$sql.= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");

-			$sql.= " WHERE rowid = " . $this->id;

-			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);

-			$resql=$this->db->query($sql);

-			if ($resql)

-			{

-				$this->fk_incoterms = $id_incoterm;

-				$this->location_incoterms = $location;

+        global $langs;

+

+        $tab=array();

+

+        $sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user

+        if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";

+        if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";

+        $sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";

+        $sql.= ", tc.source, tc.element, tc.code, tc.libelle";

+        $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";

+        $sql.= ", ".MAIN_DB_PREFIX."element_contact ec";

+        if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";

+        if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";

+        $sql.= " WHERE ec.element_id =".$this->id;

+        $sql.= " AND ec.fk_c_type_contact=tc.rowid";

+        $sql.= " AND tc.element='".$this->db->escape($this->element)."'";

+        if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";

+        if ($source == 'internal') $sql.= " AND tc.source = 'internal'";

+        if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";

+        $sql.= " AND tc.active=1";

+        if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";

+        $sql.=" ORDER BY t.lastname ASC";

+

+        dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);

+        $resql=$this->db->query($sql);

+        if ($resql)

+        {

+            $num=$this->db->num_rows($resql);

+            $i=0;

+            while ($i < $num)

+            {

+                $obj = $this->db->fetch_object($resql);

+

+                if (! $list)

+                {

+                    $transkey="TypeContact_".$obj->element."_".$obj->source."_".$obj->code;

+                    $libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);

+                    $tab[$i]=array('source'=>$obj->source,'socid'=>$obj->socid,'id'=>$obj->id,

+                                    'nom'=>$obj->lastname,      // For backward compatibility

+                                    'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,

+                                    'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);

+                }

+                else

+                {

+                    $tab[$i]=$obj->id;

+                }

 

-				$sql = 'SELECT libelle FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;

-				$res = $this->db->query($sql);

-				if ($res)

-				{

-					$obj = $this->db->fetch_object($res);

-					$this->libelle_incoterms = $obj->libelle;

-				}

-				return 1;

-			}

-			else

-			{

-				$this->errors[] = $this->db->lasterror();

-				return -1;

-			}

-		}

-		else return -1;

-	}

-

-

-	// --------------------

-	// TODO: All functions here must be redesigned and moved as they are not business functions but output functions

-	// --------------------

-

-	/* This is to show add lines */

-

-	/**

-	 *	Show add free and predefined products/services form

-	 *

-	 *  @param	int		        $dateSelector       1=Show also date range input fields

-	 *  @param	Societe			$seller				Object thirdparty who sell

-	 *  @param	Societe			$buyer				Object thirdparty who buy

-	 *	@return	void

-	 */

-	function formAddObjectLine($dateSelector, $seller, $buyer)

-	{

-		global $conf,$user,$langs,$object,$hookmanager;

-		global $form,$bcnd,$var;

-

-		// Line extrafield

-		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

-		$extrafieldsline = new AlExtraFields($this->db);

-        $extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);

+                $i++;

+            }

 

-		// Output template part (modules that overwrite templates must declare this into descriptor)

-		// Use global variables + $dateSelector + $seller and $buyer

-		$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-        foreach($dirtpls as $reldir)

-		{

-			$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');

-			if (empty(Globals::$conf->file->strict_mode)) {

-                $res=@include $tpl;

-			} else {

-				$res=include $tpl; // for debug

-			}

-			if ($res) break;

-		}

-	}

-

-

-

-	/* This is to show array of line of details */

-

-

-	/**

-	 *	Return HTML table for object lines

-	 *	TODO Move this into an output class file (htmlline.class.php)

-	 *	If lines are into a template, title must also be into a template

-	 *	But for the moment we don't know if it's possible as we keep a method available on overloaded objects.

-	 *

-	 *	@param	string		$action				Action code

-	 *	@param  string		$seller            	Object of seller third party

-	 *	@param  string  	$buyer             	Object of buyer third party

-	 *	@param	int			$selected		   	Object line selected

-	 *	@param  int	    	$dateSelector      	1=Show also date range input fields

-	 *	@return	void

-	 */

-	function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)

-	{

-		global $conf, $hookmanager, $langs, $user;

-		// TODO We should not use global var for this !

-		global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;

-

-		// Define usemargins

-		$usemargins=0;

-		if (!empty(Globals::$conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande')))

-            $usemargins = 1;

+            return $tab;

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            dol_print_error($this->db);

+            return -1;

+        }

+    }

 

-        $num = count($this->lines);

 

-		// Line extrafield

-		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

-		$extrafieldsline = new AlExtraFields($this->db);

-        $extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);

+    /**

+     * 		Update status of a contact linked to object

+     *

+     * 		@param	int		$rowid		Id of link between object and contact

+     * 		@return	int					<0 if KO, >=0 if OK

+     */

+    function swapContactStatus($rowid)

+    {

+        $sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";

+        $sql.= " tc.code, tc.libelle";

+        //$sql.= ", s.fk_soc";

+        $sql.= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";

+        //$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe

+        $sql.= " WHERE ec.rowid =".$rowid;

+        $sql.= " AND ec.fk_c_type_contact=tc.rowid";

+        $sql.= " AND tc.element = '".$this->db->escape($this->element)."'";

+

+        dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);

+        $resql=$this->db->query($sql);

+        if ($resql)

+        {

+            $obj = $this->db->fetch_object($resql);

+            $newstatut = ($obj->statut == 4) ? 5 : 4;

+            $result = $this->update_contact($rowid, $newstatut);

+            $this->db->free($resql);

+            return $result;

+        }

+        else

+        {

+            $this->error=$this->db->error();

+            dol_print_error($this->db);

+            return -1;

+        }

+    }

 

-		$parameters = array('num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

-		$reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

-		if (empty($reshook))

-		{

-			// Title line

-		    print "<thead>\n";

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *      Return array with list of possible values for type of contacts

+     *

+     *      @param	string	$source     'internal', 'external' or 'all'

+     *      @param	string	$order		Sort order by : 'position', 'code', 'rowid'...

+     *      @param  int		$option     0=Return array id->label, 1=Return array code->label

+     *      @param  int		$activeonly 0=all status of contact, 1=only the active

+     *		@param	string	$code		Type of contact (Example: 'CUSTOMER', 'SERVICE')

+     *      @return array       		Array list of type of contacts (id->label if option=0, code->label if option=1)

+     */

+    function liste_type_contact($source='internal', $order='position', $option=0, $activeonly=0, $code='')

+    {

+        // phpcs:enable

+        global $langs;

+

+        if (empty($order)) $order='position';

+        if ($order == 'position') $order.=',code';

+

+        $tab = array();

+        $sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";

+        $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

+        $sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";

+        if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types

+        if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";

+        if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";

+        $sql.= $this->db->order($order,'ASC');

+

+        //print "sql=".$sql;

+        $resql=$this->db->query($sql);

+        if ($resql)

+        {

+            $num=$this->db->num_rows($resql);

+            $i=0;

+            while ($i < $num)

+            {

+                $obj = $this->db->fetch_object($resql);

 

-			print '<tr class="liste_titre nodrag nodrop">';

+                $transkey="TypeContact_".$this->element."_".$source."_".$obj->code;

+                $libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);

+                if (empty($option)) $tab[$obj->rowid]=$libelle_type;

+                else $tab[$obj->code]=$libelle_type;

+                $i++;

+            }

+            return $tab;

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            //dol_print_error($this->db);

+            return null;

+        }

+    }

 

-			// Adds a line numbering column

-			if (!empty(Globals::$conf->global->MAIN_VIEW_LINE_NUMBER))

-                print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';

+    /**

+     *      Return id of contacts for a source and a contact code.

+     *      Example: contact client de facturation ('external', 'BILLING')

+     *      Example: contact client de livraison ('external', 'SHIPPING')

+     *      Example: contact interne suivi paiement ('internal', 'SALESREPFOLL')

+     *

+     *		@param	string	$source		'external' or 'internal'

+     *		@param	string	$code		'BILLING', 'SHIPPING', 'SALESREPFOLL', ...

+     *		@param	int		$status		limited to a certain status

+     *      @return array       		List of id for such contacts

+     */

+    function getIdContact($source,$code,$status=0)

+    {

+        global $conf;

 

-            // Description

-			print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';

+        $result=array();

+        $i=0;

+        //cas particulier pour les expeditions

+        if($this->element=='shipping' && $this->origin_id != 0) {

+            $id=$this->origin_id;

+            $element='commande';

+        } else if($this->element=='reception' && $this->origin_id != 0) {

+            $id=$this->origin_id;

+            $element='order_supplier';

+        } else {

+            $id=$this->id;

+            $element=$this->element;

+        }

 

-			if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier')

-			{

-				print '<td class="linerefsupplier"><span id="title_fourn_ref">'.$langs->trans("SupplierRef").'</span></td>';

-			}

+        $sql = "SELECT ec.fk_socpeople";

+        $sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";

+        if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";

+        if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";

+        $sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";

+        $sql.= " WHERE ec.element_id = ".$id;

+        $sql.= " AND ec.fk_socpeople = c.rowid";

+        if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";

+        if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";

+        $sql.= " AND ec.fk_c_type_contact = tc.rowid";

+        $sql.= " AND tc.element = '".$element."'";

+        $sql.= " AND tc.source = '".$source."'";

+        $sql.= " AND tc.code = '".$code."'";

+        $sql.= " AND tc.active = 1";

+        if ($status) $sql.= " AND ec.statut = ".$status;

+

+        dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);

+        $resql=$this->db->query($sql);

+        if ($resql)

+        {

+            while ($obj = $this->db->fetch_object($resql))

+            {

+                $result[$i]=$obj->fk_socpeople;

+                $i++;

+            }

+        }

+        else

+        {

+            $this->error=$this->db->error();

+            return null;

+        }

 

-			// VAT

-			print '<td class="linecolvat" align="right" width="80">'.$langs->trans('VAT').'</td>';

+        return $result;

+    }

 

-			// Price HT

-			print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *		Load object contact with id=$this->contactid into $this->contact

+     *

+     *		@param	int		$contactid      Id du contact. Use this->contactid if empty.

+     *		@return	int						<0 if KO, >0 if OK

+     */

+    function fetch_contact($contactid=null)

+    {

+        // phpcs:enable

+        if (empty($contactid)) $contactid=$this->contactid;

 

-			// Multicurrency

-			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

-                print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';

+        if (empty($contactid)) return 0;

 

-            if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';

+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

+        $contact = new Contact($this->db);

+        $result=$contact->fetch($contactid);

+        $this->contact = $contact;

+        return $result;

+    }

 

-			// Qty

-			print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *    	Load the third party of object, from id $this->socid or $this->fk_soc, into this->thirdparty

+     *

+     *		@param		int		$force_thirdparty_id	Force thirdparty id

+     *		@return		int								<0 if KO, >0 if OK

+     */

+    function fetch_thirdparty($force_thirdparty_id=0)

+    {

+        // phpcs:enable

+        global $conf;

 

-			if (Globals::$conf->global->PRODUCT_USE_UNITS) {

-				print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';

-			}

+        if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))

+            return 0;

 

-			// Reduction short

-			print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';

+        require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

 

-			if ($this->situation_cycle_ref) {

-				print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';

-			}

+        $idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);

+        if ($force_thirdparty_id)

+            $idtofetch = $force_thirdparty_id;

 

-			if ($usemargins && !empty(Globals::$conf->margin->enabled) && empty($user->societe_id)) {

-				if (!empty($user->rights->margins->creer))

-				{

-					if (Globals::$conf->global->MARGIN_TYPE == "1")

-                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';

-					else

-						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';

-				}

+        if ($idtofetch) {

+            $thirdparty = new Societe($this->db);

+            $result = $thirdparty->fetch($idtofetch);

+            $this->thirdparty = $thirdparty;

 

-				if (!empty(Globals::$conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)

-                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';

-				if (!empty(Globals::$conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)

-                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';

-			}

+            // Use first price level if level not defined for third party

+            if (!empty(Globals::$conf->global->PRODUIT_MULTIPRICES) && empty($this->thirdparty->price_level)) {

+                $this->thirdparty->price_level = 1;

+            }

 

-			// Total HT

-			print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';

+            return $result;

+        } else

+            return -1;

+    }

 

-			// Multicurrency

-			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

-                print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';

 

-            if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';

+    /**

+     * Looks for an object with ref matching the wildcard provided

+     * It does only work when $this->table_ref_field is set

+     *

+     * @param string $ref Wildcard

+     * @return int >1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO

+     */

+    public function fetchOneLike($ref)

+    {

+        if (!$this->table_ref_field) {

+            return 0;

+        }

 

-			print '<td class="linecoledit"></td>';  // No width to allow autodim

+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';

 

-			print '<td class="linecoldelete" width="10"></td>';

+        $query = $this->db->query($sql);

 

-			print '<td class="linecolmove" width="10"></td>';

+        if (!$this->db->num_rows($query)) {

+            return 0;

+        }

 

-			if($action == 'selectlines')

-			{

-			    print '<td class="linecolcheckall" align="center">';

-			    print '<input type="checkbox" class="linecheckboxtoggle" />';

-			    print '<script type="text/javascript">$(document).ready(function() {$(".linecheckboxtoggle").click(function() {var checkBoxes = $(".linecheckbox");checkBoxes.prop("checked", this.checked);})});</script>';

-			    print '</td>';

-			}

-

-			print "</tr>\n";

-			print "</thead>\n";

-		}

-

-		$var = true;

-		$i	 = 0;

-

-		print "<tbody>\n";

-		foreach ($this->lines as $line)

-		{

-			//Line extrafield

-			$line->fetch_optionals();

-

-			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))

-			if (is_object($hookmanager))   // Old code is commented on preceding line.

-			{

-				if (empty($line->fk_parent_line))

-				{

-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

-					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

-				}

-				else

-				{

-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);

-					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

-				}

-			}

-			if (empty($reshook))

-			{

-				$this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline);

-			}

-

-			$i++;

-		}

-		print "</tbody>\n";

-	}

-

-	/**

-	 *	Return HTML content of a detail line

-	 *	TODO Move this into an output class file (htmlline.class.php)

-	 *

-	 *	@param	string		$action				GET/POST action

-	 *	@param CommonObjectLine $line		       	Selected object line to output

-	 *	@param  string	    $var               	Is it a an odd line (true)

-	 *	@param  int		    $num               	Number of line (0)

-	 *	@param  int		    $i					I

-	 *	@param  int		    $dateSelector      	1=Show also date range input fields

-	 *	@param  string	    $seller            	Object of seller third party

-	 *	@param  string	    $buyer             	Object of buyer third party

-	 *	@param	int			$selected		   	Object line selected

-	 *  @param  int			$extrafieldsline	Object of extrafield line attribute

-	 *	@return	void

-	 */

-	function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0)

-	{

-		global $conf,$langs,$user,$object,$hookmanager;

-		global $form,$bc,$bcdd;

-		global $object_rights, $disableedit, $disablemove, $disableremove;   // TODO We should not use global var for this !

-

-		$object_rights = $this->getRights();

-

-		$element=$this->element;

-

-		$text=''; $description=''; $type=0;

-

-		// Show product and description

-		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);

-		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.

-		if (! empty($line->date_start)) $type=1; // deprecated

-		if (! empty($line->date_end)) $type=1; // deprecated

-

-		// Ligne en mode visu

-		if ($action != 'editline' || $selected != $line->id)

-		{

-			// Product

-			if ($line->fk_product > 0)

-			{

-				$product_static = new Product($this->db);

-				$product_static->fetch($line->fk_product);

-

-				$product_static->ref = $line->ref; //can change ref in hook

-				$product_static->label = $line->label; //can change label in hook

-				$text=$product_static->getNomUrl(1);

-

-				// Define output language and label

-				if (!empty(Globals::$conf->global->MAIN_MULTILANGS)) {

-					if (! is_object($this->thirdparty))

-					{

-						dol_print_error('','Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');

-						return;

-					}

-

-					$prod = new Product($this->db);

-					$prod->fetch($line->fk_product);

-

-					$outputlangs = $langs;

-					$newlang='';

-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');

-					if (!empty(Globals::$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang))

-                        $newlang = $this->thirdparty->default_lang;  // For language to language of customer

-                    if (! empty($newlang))

-					{

-						$outputlangs = new Translate("",$conf);

-						$outputlangs->setDefaultLang($newlang);

-					}

+        $result = $this->db->fetch_object($query);

 

-					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;

-				}

-				else

-				{

-					$label = $line->product_label;

-				}

+        return $this->fetch($result->rowid);

+    }

 

-				$text.= ' - '.(! empty($line->label)?$line->label:$label);

-				$description .= (!empty(Globals::$conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.

-            }

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *	Load data for barcode into properties ->barcode_type*

+     *	Properties ->barcode_type that is id of barcode. Type is used to find other properties, but

+     *  if it is not defined, ->element must be defined to know default barcode type.

+     *

+     *	@return		int			<0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded)

+     */

+    function fetch_barcode()

+    {

+        // phpcs:enable

+        global $conf;

 

-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');

+        dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);

 

-			// Output template part (modules that overwrite templates must declare this into descriptor)

-			// Use global variables + $dateSelector + $seller and $buyer

-			$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-            foreach($dirtpls as $reldir)

-			{

-				$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');

-				if (empty(Globals::$conf->file->strict_mode)) {

-                    $res=@include $tpl;

-				} else {

-					$res=include $tpl; // for debug

-				}

-				if ($res) break;

-			}

-		}

+        $idtype=$this->barcode_type;

+        if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined

+        {

+            if ($this->element == 'product')

+                $idtype = Globals::$conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

+            else if ($this->element == 'societe')

+                $idtype = Globals::$conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;

+            else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);

+        }

 

-		// Ligne en mode update

-		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)

-		{

-			$label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));

-			$placeholder=' placeholder="'.$langs->trans("Label").'"';

+        if ($idtype > 0)

+        {

+            if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded

+            {

+                $sql = "SELECT rowid, code, libelle as label, coder";

+                $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";

+                $sql.= " WHERE rowid = ".$idtype;

+                dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);

+                $resql = $this->db->query($sql);

+                if ($resql)

+                {

+                    $obj = $this->db->fetch_object($resql);

+                    $this->barcode_type       = $obj->rowid;

+                    $this->barcode_type_code  = $obj->code;

+                    $this->barcode_type_label = $obj->label;

+                    $this->barcode_type_coder = $obj->coder;

+                    return 1;

+                }

+                else

+                {

+                    dol_print_error($this->db);

+                    return -1;

+                }

+            }

+        }

+        return 0;

+    }

 

-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *		Load the project with id $this->fk_project into this->project

+     *

+     *		@return		int			<0 if KO, >=0 if OK

+     */

+    function fetch_projet()

+    {

+        // phpcs:enable

+        include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

 

-			// Output template part (modules that overwrite templates must declare this into descriptor)

-			// Use global variables + $dateSelector + $seller and $buyer

-			$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-            foreach($dirtpls as $reldir)

-			{

-				$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');

-				if (empty(Globals::$conf->file->strict_mode)) {

-                    $res=@include $tpl;

-				} else {

-					$res=include $tpl; // for debug

-				}

-				if ($res) break;

-			}

-		}

-	}

-

-

-	/* This is to show array of line of details of source object */

-

-

-	/**

-	 * 	Return HTML table table of source object lines

-	 *  TODO Move this and previous function into output html class file (htmlline.class.php).

-	 *  If lines are into a template, title must also be into a template

-	 *  But for the moment we don't know if it's possible, so we keep the method available on overloaded objects.

-	 *

-	 *	@param	string		$restrictlist		''=All lines, 'services'=Restrict to services only

-	 *  @return	void

-	 */

-	function printOriginLinesList($restrictlist='')

-	{

-		global $langs, $hookmanager, $conf;

-

-		print '<tr class="liste_titre">';

-		print '<td>'.$langs->trans('Ref').'</td>';

-		print '<td>'.$langs->trans('Description').'</td>';

-		print '<td align="right">'.$langs->trans('VATRate').'</td>';

-		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';

-		if (!empty(Globals::$conf->multicurrency->enabled))

-            print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';

-        print '<td align="right">'.$langs->trans('Qty').'</td>';

-		if (Globals::$conf->global->PRODUCT_USE_UNITS) {

-			print '<td align="left">'.$langs->trans('Unit').'</td>';

-		}

-		print '<td align="right">'.$langs->trans('ReductionShort').'</td></tr>';

+        if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility

+        if (empty($this->fk_project)) return 0;

 

-		$var = true;

-		$i	 = 0;

+        $project = new Project($this->db);

+        $result = $project->fetch($this->fk_project);

 

-		if (! empty($this->lines))

-		{

-			foreach ($this->lines as $line)

-			{

-				if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))

-				{

-					if (empty($line->fk_parent_line))

-					{

-						$parameters=array('line'=>$line,'var'=>$var,'i'=>$i);

-						$action='';

-						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks

-					}

-				}

-				else

-				{

-					$this->printOriginLine($line, $var, $restrictlist);

-				}

+        $this->projet = $project;	// deprecated

+        $this->project = $project;

+        return $result;

+    }

 

-				$i++;

-			}

-		}

-	}

-

-	/**

-	 * 	Return HTML with a line of table array of source object lines

-	 *  TODO Move this and previous function into output html class file (htmlline.class.php).

-	 *  If lines are into a template, title must also be into a template

-	 *  But for the moment we don't know if it's possible as we keep a method available on overloaded objects.

-	 *

-	 * 	@param	CommonObjectLine	$line				Line

-	 * 	@param	string				$var				Var

-	 *	@param	string				$restrictlist		''=All lines, 'services'=Restrict to services only (strike line if not)

-	 * 	@return	void

-	 */

-	function printOriginLine($line, $var, $restrictlist='')

-	{

-		global $langs, $conf;

-

-		//var_dump($line);

-		if (!empty($line->date_start))

-		{

-			$date_start=$line->date_start;

-		}

-		else

-		{

-			$date_start=$line->date_debut_prevue;

-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;

-		}

-		if (!empty($line->date_end))

-		{

-			$date_end=$line->date_end;

-		}

-		else

-		{

-			$date_end=$line->date_fin_prevue;

-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;

-		}

-

-		$this->tpl['label'] = '';

-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');

-

-		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object

-		{

-			$discount=new DiscountAbsolute($this->db);

-			$discount->fk_soc = $this->socid;

-			$this->tpl['label'].= $discount->getNomUrl(0,'discount');

-		}

-		else if (! empty($line->fk_product))

-		{

-			$productstatic = new Product($this->db);

-			$productstatic->id = $line->fk_product;

-			$productstatic->ref = $line->ref;

-			$productstatic->type = $line->fk_product_type;

-            if(empty($productstatic->ref)){

-				$line->fetch_product();

-				$productstatic = $line->product;

-			}

-			

-			$this->tpl['label'].= $productstatic->getNomUrl(1);

-			$this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);

-			// Dates

-			if ($line->product_type == 1 && ($date_start || $date_end))

-			{

-				$this->tpl['label'].= get_date_range($date_start,$date_end);

-			}

-		}

-		else

-		{

-			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));

-			if (!empty($line->desc)) {

-				$this->tpl['label'].=$line->desc;

-			}else {

-				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');

-			}

-			

-			// Dates

-			if ($line->product_type == 1 && ($date_start || $date_end))

-			{

-				$this->tpl['label'].= get_date_range($date_start,$date_end);

-			}

-		}

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *		Load the product with id $this->fk_product into this->product

+     *

+     *		@return		int			<0 if KO, >=0 if OK

+     */

+    function fetch_product()

+    {

+        // phpcs:enable

+        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

 

-		if (! empty($line->desc))

-		{

-			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object

-			{

-				$discount=new DiscountAbsolute($this->db);

-				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));

-			}

-			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object

-			{

-				$discount=new DiscountAbsolute($this->db);

-				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));

-			}

-			elseif ($line->desc == '(EXCESS RECEIVED)')

-			{

-				$discount=new DiscountAbsolute($this->db);

-				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));

-			}

-			elseif ($line->desc == '(EXCESS PAID)')

-			{

-				$discount=new DiscountAbsolute($this->db);

-				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));

-			}

-			else

-			{

-				$this->tpl['description'] = dol_trunc($line->desc,60);

-			}

-		}

-		else

-		{

-			$this->tpl['description'] = '&nbsp;';

-		}

-

-        // VAT Rate

-        $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);

-        $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';

-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';

-

-		$this->tpl['price'] = price($line->subprice);

-		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);

-		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';

-		if (Globals::$conf->global->PRODUCT_USE_UNITS)

-            $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));

-        $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';

+        if (empty($this->fk_product)) return 0;

 

-		// Is the line strike or not

-		$this->tpl['strike']=0;

-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;

-

-		// Output template part (modules that overwrite templates must declare this into descriptor)

-		// Use global variables + $dateSelector + $seller and $buyer

-		$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-        foreach($dirtpls as $reldir)

-		{

-			$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');

-			if (empty(Globals::$conf->file->strict_mode)) {

-                $res=@include $tpl;

-			} else {

-				$res=include $tpl; // for debug

-			}

-			if ($res) break;

-		}

-	}

+        $product = new Product($this->db);

+        $result = $product->fetch($this->fk_product);

 

+        $this->product = $product;

+        return $result;

+    }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *	Add resources to the current object : add entry into llx_element_resources

-	 *	Need $this->element & $this->id

-	 *

-	 *	@param		int		$resource_id		Resource id

-	 *	@param		string	$resource_type		'resource'

-	 *	@param		int		$busy				Busy or not

-	 *	@param		int		$mandatory			Mandatory or not

-	 *	@return		int							<=0 if KO, >0 if OK

-	 */

-	function add_element_resource($resource_id, $resource_type, $busy=0, $mandatory=0)

-	{

+    /**

+     *		Load the user with id $userid into this->user

+     *

+     *		@param	int		$userid 		Id du contact

+     *		@return	int						<0 if KO, >0 if OK

+     */

+    function fetch_user($userid)

+    {

         // phpcs:enable

-		$this->db->begin();

-

-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";

-		$sql.= "resource_id";

-		$sql.= ", resource_type";

-		$sql.= ", element_id";

-		$sql.= ", element_type";

-		$sql.= ", busy";

-		$sql.= ", mandatory";

-		$sql.= ") VALUES (";

-		$sql.= $resource_id;

-		$sql.= ", '".$this->db->escape($resource_type)."'";

-		$sql.= ", '".$this->db->escape($this->id)."'";

-		$sql.= ", '".$this->db->escape($this->element)."'";

-		$sql.= ", '".$this->db->escape($busy)."'";

-		$sql.= ", '".$this->db->escape($mandatory)."'";

-		$sql.= ")";

-

-		dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);

-		if ($this->db->query($sql))

-		{

-			$this->db->commit();

-			return 1;

-		}

-		else

-		{

-			$this->error=$this->db->lasterror();

-			$this->db->rollback();

-			return  0;

-		}

-	}

+        $user = new User($this->db);

+        $result=$user->fetch($userid);

+        $this->user = $user;

+        return $result;

+    }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *    Delete a link to resource line

-	 *

-	 *    @param	int		$rowid			Id of resource line to delete

-	 *    @param	int		$element		element name (for trigger) TODO: use $this->element into commonobject class

-	 *    @param	int		$notrigger		Disable all triggers

-	 *    @return   int						>0 if OK, <0 if KO

-	 */

-	function delete_resource($rowid, $element, $notrigger=0)

-	{

+    /**

+     *	Read linked origin object

+     *

+     *	@return		void

+     */

+    function fetch_origin()

+    {

         // phpcs:enable

-		global $user;

+        if ($this->origin == 'shipping') $this->origin = 'expedition';

+        if ($this->origin == 'delivery') $this->origin = 'livraison';

+        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';

 

-		$this->db->begin();

+        $origin = $this->origin;

 

-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";

-		$sql.= " WHERE rowid=".$rowid;

+        $classname = ucfirst($origin);

+        $this->$origin = new $classname($this->db);

+        $this->$origin->fetch($this->origin_id);

+    }

 

-		dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);

+    /**

+     *  Load object from specific field

+     *

+     *  @param	string	$table		Table element or element line

+     *  @param	string	$field		Field selected

+     *  @param	string	$key		Import key

+     *  @param	string	$element	Element name

+     *	@return	int					<0 if KO, >0 if OK

+     */

+    function fetchObjectFrom($table, $field, $key, $element = null)

+    {

+        global $conf;

 

-		$resql=$this->db->query($sql);

-		if (! $resql)

-		{

-			$this->error=$this->db->lasterror();

-			$this->db->rollback();

-			return -1;

-		}

-		else

-		{

-			if (! $notrigger)

-			{

-				$result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);

-				if ($result < 0) { $this->db->rollback(); return -1; }

-			}

-			$this->db->commit();

-			return 1;

-		}

-	}

-

-

-	/**

-	 * Overwrite magic function to solve problem of cloning object that are kept as references

-	 *

-	 * @return void

-	 */

-	function __clone()

-	{

-		// Force a copy of this->lines, otherwise it will point to same object.

-		if (isset($this->lines) && is_array($this->lines))

-		{

-			$nboflines=count($this->lines);

-			for($i=0; $i < $nboflines; $i++)

-			{

-				$this->lines[$i] = clone $this->lines[$i];

-			}

-		}

-	}

-

-	/**

-	 * Common function for all objects extending CommonObject for generating documents

-	 *

-	 * @param 	string 		$modelspath 	Relative folder where generators are placed

-	 * @param 	string 		$modele 		Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf') for example.

-	 * @param 	Translate 	$outputlangs 	Output language to use

-	 * @param 	int 		$hidedetails 	1 to hide details. 0 by default

-	 * @param 	int 		$hidedesc 		1 to hide product description. 0 by default

-	 * @param 	int 		$hideref 		1 to hide product reference. 0 by default

-	 * @param   null|array  $moreparams     Array to provide more information

-	 * @return 	int 						>0 if OK, <0 if KO

-	 * @see	addFileIntoDatabaseIndex

-	 */

-	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams=null)

-	{

-		global $conf, $langs, $user;

-

-		$srctemplatepath='';

-

-		// Increase limit for PDF build

-		$err=error_reporting();

-		error_reporting(0);

-		@set_time_limit(120);

-		error_reporting($err);

-

-		// If selected model is a filename template (then $modele="modelname" or "modelname:filename")

-		$tmp=explode(':',$modele,2);

-		if (! empty($tmp[1]))

-		{

-			$modele=$tmp[0];

-			$srctemplatepath=$tmp[1];

-		}

-

-		// Search template files

-		$file=''; $classname=''; $filefound=0;

-		$dirmodels=array('/');

-		if (is_array(Globals::$conf->modules_parts['models']))

-            $dirmodels = array_merge($dirmodels, Globals::$conf->modules_parts['models']);

-        foreach($dirmodels as $reldir)

-		{

-			foreach(array('doc','pdf') as $prefix)

-			{

-				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php

-				else $file = $prefix."_".$modele.".modules.php";

+        $result=false;

 

-				// On verifie l'emplacement du modele

-				$file=dol_buildpath($reldir.$modelspath.$file,0);

-				if (file_exists($file))

-				{

-					$filefound=1;

-					$classname=$prefix.'_'.$modele;

-					break;

-				}

-			}

-			if ($filefound) break;

-		}

+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;

+        $sql.= " WHERE ".$field." = '".$key."'";

+        if (! empty($element)) {

+            $sql.= " AND entity IN (".getEntity($element).")";

+        } else {

+            $sql .= " AND entity = " . Globals::$conf->entity;

+        }

 

-		// If generator was found

-		if ($filefound)

-		{

-			global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db

+        dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $row = $this->db->fetch_row($resql);

+            // Test for avoid error -1

+            if ($row[0] > 0) {

+                $result = $this->fetch($row[0]);

+            }

+        }

 

-			require_once $file;

+        return $result;

+    }

 

-			$obj = new $classname($this->db);

+    /**

+     *	Getter generic. Load value from a specific field

+     *

+     *	@param	string	$table		Table of element or element line

+     *	@param	int		$id			Element id

+     *	@param	string	$field		Field selected

+     *	@return	int					<0 if KO, >0 if OK

+     */

+    function getValueFrom($table, $id, $field)

+    {

+        $result=false;

+        if (!empty($id) && !empty($field) && !empty($table)) {

+            $sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;

+            $sql.= " WHERE rowid = ".$id;

+

+            dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);

+            $resql = $this->db->query($sql);

+            if ($resql)

+            {

+                $row = $this->db->fetch_row($resql);

+                $result = $row[0];

+            }

+        }

+        return $result;

+    }

 

-			// If generator is ODT, we must have srctemplatepath defined, if not we set it.

-			if ($obj->type == 'odt' && empty($srctemplatepath))

-			{

-				$varfortemplatedir=$obj->scandir;

-				if ($varfortemplatedir && !empty(Globals::$conf->global->$varfortemplatedir)) {

-					$dirtoscan = Globals::$conf->global->$varfortemplatedir;

+    /**

+     *	Setter generic. Update a specific field into database.

+     *  Warning: Trigger is run only if param trigkey is provided.

+     *

+     *	@param	string		$field			Field to update

+     *	@param	mixed		$value			New value

+     *	@param	string		$table			To force other table element or element line (should not be used)

+     *	@param	int			$id				To force other object id (should not be used)

+     *	@param	string		$format			Data format ('text', 'date'). 'text' is used if not defined

+     *	@param	string		$id_field		To force rowid field name. 'rowid' is used if not defined

+     *	@param	User|string	$fuser			Update the user of last update field with this user. If not provided, current user is used except if value is 'none'

+     *  @param  string      $trigkey    	Trigger key to run (in most cases something like 'XXX_MODIFY')

+     *  @param	string		$fk_user_field	Name of field to save user id making change

+     *	@return	int							<0 if KO, >0 if OK

+     *  @see updateExtraField

+     */

+    function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='', $fk_user_field='fk_user_modif')

+    {

+        global $user,$langs,$conf;

 

-                    $listoffiles=array();

+        if (empty($table)) 	  $table=$this->table_element;

+        if (empty($id))    	  $id=$this->id;

+        if (empty($format))   $format='text';

+        if (empty($id_field)) $id_field='rowid';

 

-					// Now we add first model found in directories scanned

-					$listofdir=explode(',',$dirtoscan);

-					foreach($listofdir as $key => $tmpdir)

-					{

-						$tmpdir=trim($tmpdir);

-						$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);

-						if (! $tmpdir) { unset($listofdir[$key]); continue; }

-						if (is_dir($tmpdir))

-						{

-							$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);

-							if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);

-						}

-					}

-

-					if (count($listoffiles))

-					{

-						foreach($listoffiles as $record)

-						{

-							$srctemplatepath=$record['fullname'];

-							break;

-						}

-					}

-				}

+        $error=0;

 

-				if (empty($srctemplatepath))

-				{

-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';

-					return -1;

-				}

-			}

+        $this->db->begin();

 

-			if ($obj->type == 'odt' && ! empty($srctemplatepath))

-			{

-				if (! dol_is_file($srctemplatepath))

-				{

-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';

-					return -1;

-				}

-			}

+        // Special case

+        if ($table == 'product' && $field == 'note_private') $field='note';

+        if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';

 

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

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";

 

-			if (in_array(get_class($this), array('Adherent')))

-			{

-				$arrayofrecords = array();   // The write_file of templates of adherent class need this var

-				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);

-			}

-			else

-			{

-				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);

-			}

-			// After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.

+        if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";

+        else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);

+        else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");

 

-			if ($resultwritefile > 0)

-			{

-				$outputlangs->charset_output=$sav_charset_output;

+        if ($fk_user_field)

+        {

+            if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;

+            elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;

+        }

 

-				// We delete old preview

-				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-				dol_delete_preview($this);

+        $sql.= " WHERE ".$id_field." = ".$id;

 

-				// Index file in database

-				if (! empty($obj->result['fullpath']))

-				{

-					$destfull = $obj->result['fullpath'];

-					$upload_dir = dirname($destfull);

-					$destfile = basename($destfull);

-					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);

-

-					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir

-					{

-						$filename = basename($destfile);

-						$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);

-						$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);

-

-						include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

-						$ecmfile=new EcmFiles($this->db);

-						$result = $ecmfile->fetch(0, '', ($rel_dir?$rel_dir.'/':'').$filename);

-

-						// Set the public "share" key

-						$setsharekey = false;

-						if ($this->element == 'propal')

-						{

-							$useonlinesignature = Globals::$conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok

-                            if ($useonlinesignature) $setsharekey=true;

-							if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD))

-                                $setsharekey = true;

-                        }

-						if ($this->element == 'commande' && !empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))

-                            $setsharekey = true;

-                        if ($this->element == 'facture' && !empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))

-                            $setsharekey = true;

-                        if ($this->element == 'bank_account' && !empty(Globals::$conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD))

-                            $setsharekey = true;

+        dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            if ($trigkey)

+            {

+                // call trigger with updated object values

+                if (empty($this->fields) && method_exists($this, 'fetch'))

+                {

+                    $result = $this->fetch($id);

+                }

+                else

+                {

+                    $result = $this->fetchCommon($id);

+                }

+                if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors

+                if ($result < 0) $error++;

+            }

 

-                        if ($setsharekey)

-						{

-							if (empty($ecmfile->share))	// Because object not found or share not set yet

-							{

-								require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

-								$ecmfile->share = getRandomPassword(true);

-							}

-						}

+            if (! $error)

+            {

+                if (property_exists($this, $field)) $this->$field = $value;

+                $this->db->commit();

+                return 1;

+            }

+            else

+            {

+                $this->db->rollback();

+                return -2;

+            }

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            $this->db->rollback();

+            return -1;

+        }

+    }

 

-						if ($result > 0)

-						{

-							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content

-							$ecmfile->fullpath_orig = '';

-							$ecmfile->gen_or_uploaded = 'generated';

-							$ecmfile->description = '';    // indexed content

-							$ecmfile->keyword = '';        // keyword content

-							$result = $ecmfile->update($user);

-							if ($result < 0)

-							{

-								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

-							}

-						}

-						else

-						{

-							$ecmfile->entity = Globals::$conf->entity;

-                            $ecmfile->filepath = $rel_dir;

-							$ecmfile->filename = $filename;

-							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content

-							$ecmfile->fullpath_orig = '';

-							$ecmfile->gen_or_uploaded = 'generated';

-							$ecmfile->description = '';    // indexed content

-							$ecmfile->keyword = '';        // keyword content

-							$ecmfile->src_object_type = $this->table_element;

-							$ecmfile->src_object_id   = $this->id;

-

-							$result = $ecmfile->create($user);

-							if ($result < 0)

-							{

-								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

-							}

-						}

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *      Load properties id_previous and id_next by comparing $fieldid with $this->ref

+     *

+     *      @param	string	$filter		Optional filter. Example: " AND (t.field1 = 'aa' OR t.field2 = 'bb')"

+     *	 	@param  string	$fieldid   	Name of field to use for the select MAX and MIN

+     *		@param	int		$nodbprefix	Do not include DB prefix to forge table name

+     *      @return int         		<0 if KO, >0 if OK

+     */

+    function load_previous_next_ref($filter, $fieldid, $nodbprefix=0)

+    {

+        // phpcs:enable

+        global $conf, $user;

 

-						/*$this->result['fullname']=$destfull;

-						$this->result['filepath']=$ecmfile->filepath;

-						$this->result['filename']=$ecmfile->filename;*/

-						//var_dump($obj->update_main_doc_field);exit;

-

-						// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)

-						$update_main_doc_field=0;

-						if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;

-						if ($update_main_doc_field && ! empty($this->table_element))

-						{

-							$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";

-							$sql.= ' WHERE rowid = '.$this->id;

-							$resql = $this->db->query($sql);

-							if (! $resql) dol_print_error($this->db);

-						}

-					}

-				}

-				else

-				{

-					dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);

-				}

+        if (! $this->table_element)

+        {

+            dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");

+            return -1;

+        }

+        if ($fieldid == 'none') return 1;

 

-				// Success in building document. We build meta file.

-				dol_meta_create($this);

+        // Security on socid

+        $socid = 0;

+        if ($user->societe_id > 0) $socid = $user->societe_id;

 

-				return 1;

-			}

-			else

-			{

-				$outputlangs->charset_output=$sav_charset_output;

-				dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);

-				return -1;

-			}

-		}

-		else

-		{

-			$this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);

-			dol_print_error('',$this->error);

-			return -1;

-		}

-	}

-

-	/**

-	 *  Build thumb

-	 *  @TODO Move this into files.lib.php

-	 *

-	 *  @param      string	$file           Path file in UTF8 to original file to create thumbs from.

-	 *	@return		void

-	 */

-	function addThumbs($file)

-	{

-		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;

-

-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...

-

-		$file_osencoded=dol_osencode($file);

-		if (file_exists($file_osencoded))

-		{

-			// Create small thumbs for company (Ratio is near 16/9)

-			// Used on logon for example

-			vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality);

-

-			// Create mini thumbs for company (Ratio is near 16/9)

-			// Used on menu or for setup page for example

-			vignette($file_osencoded, $maxwidthmini, $maxheightmini, '_mini', $quality);

-		}

-	}

-

-

-	/* Functions common to commonobject and commonobjectline */

-

-	/* For default values */

-

-	/**

-	 * Return the default value to use for a field when showing the create form of object.

-	 * Return values in this order:

-	 * 1) If parameter is available into POST, we return it first.

-	 * 2) If not but an alternate value was provided as parameter of function, we return it.

-	 * 3) If not but a constant Globals::$conf->global->OBJECTELEMENT_FIELDNAME is set, we return it (It is better to use the dedicated table).

-	 * 4) Return value found into database (TODO No yet implemented)

-	 *

-	 * @param   string              $fieldname          Name of field

-	 * @param   string              $alternatevalue     Alternate value to use

-	 * @return  string|string[]                         Default value (can be an array if the GETPOST return an array)

-	 **/

-	function getDefaultCreateValueFor($fieldname, $alternatevalue=null)

-	{

-		global $conf, $_POST;

-

-		// If param here has been posted, we use this value first.

-		if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);

-

-		if (isset($alternatevalue)) return $alternatevalue;

-

-		$newelement=$this->element;

-		if ($newelement == 'facture') $newelement='invoice';

-		if ($newelement == 'commande') $newelement='order';

-		if (empty($newelement))

-		{

-			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);

-			return '';

-		}

-

-		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);

-		//var_dump($keyforfieldname);

-		if (isset(Globals::$conf->global->$keyforfieldname))

-            return Globals::$conf->global->$keyforfieldname;

+        // this->ismultientitymanaged contains

+        // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

+        $alias = 's';

+        if ($this->element == 'societe') $alias = 'te';

 

-        // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname

-	}

+        $sql = "SELECT MAX(te.".$fieldid.")";

+        $sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";

+        if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

+            $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";

+        }

+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity

+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid

+        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid

+        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

+        $sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

+        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;

+        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';

+        if (! empty($filter))

+        {

+            if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility

+            $sql.=$filter;

+        }

+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity

+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid

+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

+            if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

+                if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) {

+                    $sql.= " AND te.entity IS NOT NULL"; // Show all users

+                } else {

+                    $sql.= " AND ug.fk_user = te.rowid";

+                    $sql.= " AND ug.entity IN (".getEntity($this->element).")";

+                }

+            } else {

+                $sql.= ' AND te.entity IN ('.getEntity($this->element).')';

+            }

+        }

+        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;

+        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';

+        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;

+        //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

 

+        $result = $this->db->query($sql);

+        if (! $result)

+        {

+            $this->error=$this->db->lasterror();

+            return -1;

+        }

+        $row = $this->db->fetch_row($result);

+        $this->ref_previous = $row[0];

 

-	/* For triggers */

 

+        $sql = "SELECT MIN(te.".$fieldid.")";

+        $sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";

+        if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

+            $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";

+        }

+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity

+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid

+        else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid

+        if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

+        $sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

+        if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;

+        if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';

+        if (! empty($filter))

+        {

+            if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility

+            $sql.=$filter;

+        }

+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity

+        else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid

+        if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

+            if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

+                if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) {

+                    $sql.= " AND te.entity IS NOT NULL"; // Show all users

+                } else {

+                    $sql.= " AND ug.fk_user = te.rowid";

+                    $sql.= " AND ug.entity IN (".getEntity($this->element).")";

+                }

+            } else {

+                $sql.= ' AND te.entity IN ('.getEntity($this->element).')';

+            }

+        }

+        if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;

+        if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';

+        if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;

+        //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

+        // Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null

+

+        $result = $this->db->query($sql);

+        if (! $result)

+        {

+            $this->error=$this->db->lasterror();

+            return -2;

+        }

+        $row = $this->db->fetch_row($result);

+        $this->ref_next = $row[0];

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 * Call trigger based on this instance.

-	 * Some context information may also be provided into array property this->context.

-	 * NB:  Error from trigger are stacked in interface->errors

-	 * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction.

-	 *

-	 * @param   string    $trigger_name   trigger's name to execute

-	 * @param   User      $user           Object user

-	 * @return  int                       Result of run_triggers

-	 */

-	function call_trigger($trigger_name, $user)

-	{

-        // phpcs:enable

-		global $langs,$conf;

+        return 1;

+    }

 

-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

-		$interface=new Interfaces($this->db);

-		$result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);

 

-		if ($result < 0)

-		{

-			if (!empty($this->errors))

-			{

-				$this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.

-			}

-			else

-			{

-				$this->errors=$interface->errors;

-			}

-		}

-		return $result;

-	}

+    /**

+     *      Return list of id of contacts of object

+     *

+     *      @param	string	$source     Source of contact: external (llx_socpeople) or internal (llx_user) or thirdparty (llx_societe)

+     *      @return array				Array of id of contacts (if source=external or internal)

+     * 									Array of id of third parties with at least one contact on object (if source=thirdparty)

+     */

+    function getListContactId($source='external')

+    {

+        $contactAlreadySelected = array();

+        $tab = $this->liste_contact(-1,$source);

+        $num=count($tab);

+        $i = 0;

+        while ($i < $num)

+        {

+            if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];

+            else  $contactAlreadySelected[$i] = $tab[$i]['id'];

+            $i++;

+        }

+        return $contactAlreadySelected;

+    }

 

 

-	/* Functions for extrafields */

+    /**

+     *	Link element with a project

+     *

+     *	@param     	int		$projectid		Project id to link element to

+     *	@return		int						<0 if KO, >0 if OK

+     */

+    function setProject($projectid)

+    {

+        if (! $this->table_element)

+        {

+            dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined",LOG_ERR);

+            return -1;

+        }

 

+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+        if ($this->table_element == 'actioncomm')

+        {

+            if ($projectid) $sql.= ' SET fk_project = '.$projectid;

+            else $sql.= ' SET fk_project = NULL';

+            $sql.= ' WHERE id = '.$this->id;

+        }

+        else

+        {

+            if ($projectid) $sql.= ' SET fk_projet = '.$projectid;

+            else $sql.= ' SET fk_projet = NULL';

+            $sql.= ' WHERE rowid = '.$this->id;

+        }

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *  Function to get extra fields of an object into $this->array_options

-	 *  This method is in most cases called by method fetch of objects but you can call it separately.

-	 *

-	 *  @param	int		$rowid			Id of line. Use the id of object if not defined. Deprecated. Function must be called without parameters.

-	 *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.

-	 *  @return	int						<0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded

-	 */

-	function fetch_optionals($rowid=null, $optionsArray=null)

-	{

-        // phpcs:enable

-		if (empty($rowid)) {

-            $rowid = $this->id;

+        dol_syslog(get_class($this)."::setProject", LOG_DEBUG);

+        if ($this->db->query($sql))

+        {

+            $this->fk_project = $projectid;

+            return 1;

+        }

+        else

+        {

+            dol_print_error($this->db);

+            return -1;

         }

+    }

 

-        // To avoid SQL errors. Probably not the better solution though

-		if (!$this->table_element) {

-			return 0;

-		}

-

-		$this->array_options=array();

-

-		if (! is_array($optionsArray))

-		{

-			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.

-			// TODO Use of existing $extrafield is not yet ready (must mutualize code that use extrafields in form first)

-			// global $extrafields;

-			//if (! is_object($extrafields))

-			//{

-				// require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

-            $extrafields = new AlExtraFields();

-            //}

+    /**

+     *  Change the payments methods

+     *

+     *  @param		int		$id		Id of new payment method

+     *  @return		int				>0 if OK, <0 if KO

+     */

+    function setPaymentMethods($id)

+    {

+        dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');

+        if ($this->statut >= 0 || $this->element == 'societe')

+        {

+            // TODO uniformize field name

+            $fieldname = 'fk_mode_reglement';

+            if ($this->element == 'societe') $fieldname = 'mode_reglement';

+            if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';

 

-			// Load array of extrafields for elementype = $this->table_element

-			if (empty($extrafields->attributes[$this->table_element]['loaded']))

-			{

-				$extrafields->fetch_name_optionals_label($this->table_element);

-			}

-			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);

-		}

-		else

-		{

-			// global $extrafields;

-            dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);

-		}

+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+            $sql .= ' SET '.$fieldname.' = '.$id;

+            $sql .= ' WHERE rowid='.$this->id;

 

-		$table_element = $this->table_element;

-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+            if ($this->db->query($sql))

+            {

+                $this->mode_reglement_id = $id;

+                // for supplier

+                if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;

+                return 1;

+            }

+            else

+            {

+                dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());

+                $this->error=$this->db->error();

+                return -1;

+            }

+        }

+        else

+        {

+            dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');

+            $this->error='Status of the object is incompatible '.$this->statut;

+            return -2;

+        }

+    }

 

-		// Request to get complementary values

-		if (is_array($optionsArray) && count($optionsArray) > 0)

-		{

-			$sql = "SELECT rowid";

-			foreach ($optionsArray as $name => $label)

-			{

-				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')

-				{

-					$sql.= ", ".$name;

-				}

-			}

-			$sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";

-			$sql.= " WHERE fk_object = ".$rowid;

+    /**

+     *  Change the multicurrency code

+     *

+     *  @param		string	$code	multicurrency code

+     *  @return		int				>0 if OK, <0 if KO

+     */

+    function setMulticurrencyCode($code)

+    {

+        dol_syslog(get_class($this).'::setMulticurrencyCode('.$id.')');

+        if ($this->statut >= 0 || $this->element == 'societe')

+        {

+            $fieldname = 'multicurrency_code';

 

-			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose

-			$resql=$this->db->query($sql);

-			if ($resql)

-			{

-				$this->array_options = array();

-				$numrows=$this->db->num_rows($resql);

-				if ($numrows)

-				{

-					$tab = $this->db->fetch_array($resql);

-

-					foreach ($tab as $key => $value)

-					{

-						// Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)

-						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))

-						{

-							// we can add this attribute to object

-							if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))

-							{

-								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);

-								$this->array_options["options_".$key]=$this->db->jdate($value);

-							}

-							else

-							{

-								$this->array_options["options_".$key]=$value;

-							}

+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+            $sql .= ' SET '.$fieldname." = '".$this->db->escape($code)."'";

+            $sql .= ' WHERE rowid='.$this->id;

 

-							//var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);

-						}

-					}

-				}

+            if ($this->db->query($sql))

+            {

+                $this->multicurrency_code = $code;

 

-				$this->db->free($resql);

+                list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);

+                if ($rate) $this->setMulticurrencyRate($rate,2);

 

-				if ($numrows) return $numrows;

-				else return 0;

-			}

-			else

-			{

-				dol_print_error($this->db);

-				return -1;

-			}

-		}

-		return 0;

-	}

-

-	/**

-	 *	Delete all extra fields values for the current object.

-	 *

-	 *  @return	int		<0 if KO, >0 if OK

-	 */

-	function deleteExtraFields()

-	{

-		$this->db->begin();

-

-		$table_element = $this->table_element;

-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

-

-		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

-		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);

-		$resql=$this->db->query($sql_del);

-		if (! $resql)

-		{

-			$this->error=$this->db->lasterror();

-			$this->db->rollback();

-			return -1;

-		}

-		else

-		{

-			$this->db->commit();

-			return 1;

-		}

-	}

-

-	/**

-	 *	Add/Update all extra fields values for the current object.

-	 *  Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)

-	 *  This function delete record with all extrafields and insert them again from the array $this->array_options.

-	 *

-	 *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)

-	 *  @param	User		$userused		Object user

-	 *  @return int 						-1=error, O=did nothing, 1=OK

-	 *  @see updateExtraField, setValueFrom

-	 */

-	function insertExtraFields($trigger='', $userused=null)

-	{

-		global $conf,$langs,$user;

-

-		if (empty($userused)) $userused=$user;

-

-		$error=0;

-

-		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

-            return 0; // For avoid conflicts if trigger used

+                return 1;

+            }

+            else

+            {

+                dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());

+                $this->error=$this->db->error();

+                return -1;

+            }

+        }

+        else

+        {

+            dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');

+            $this->error='Status of the object is incompatible '.$this->statut;

+            return -2;

+        }

+    }

 

-        if (! empty($this->array_options))

-		{

-			// Check parameters

-			$langs->load('admin');

-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

-			$extrafields = new AlExtraFields($this->db);

-            $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);

+    /**

+     *  Change the multicurrency rate

+     *

+     *  @param		double	$rate	multicurrency rate

+     *  @param		int		$mode	mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency

+     *  @return		int				>0 if OK, <0 if KO

+     */

+    function setMulticurrencyRate($rate, $mode=1)

+    {

+        dol_syslog(get_class($this).'::setMulticurrencyRate('.$id.')');

+        if ($this->statut >= 0 || $this->element == 'societe')

+        {

+            $fieldname = 'multicurrency_tx';

 

-			//Eliminate copied source object extra_fields that do not exist in target object

-			$new_array_options=array();

-			foreach ($this->array_options as $key => $value) {

-				if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test

-					$new_array_options[$key] = $value;

-				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix

-					$new_array_options['options_'.$key] = $value;

-			}

+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+            $sql .= ' SET '.$fieldname.' = '.$rate;

+            $sql .= ' WHERE rowid='.$this->id;

 

-			foreach($new_array_options as $key => $value)

-			{

-			   	$attributeKey      = substr($key,8);   // Remove 'options_' prefix

-			   	$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];

-			   	$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];

-			   	$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];

-			   	$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];

-

-			   	if ($attributeRequired)

-			   	{

-			   		$mandatorypb=false;

-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;

-			   		if ($this->array_options[$key] === '') $mandatorypb=true;

-			   		if ($mandatorypb)

-			   		{

-			   			dol_syslog($this->error);

-			   			$this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);

-			   			return -1;

-			   		}

-			   	}

-

-				//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);

-				//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);

-

-			   	switch ($attributeType)

-			   	{

-			   		case 'int':

-			  			if (!is_numeric($value) && $value!='')

-			   			{

-			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

-			   				return -1;

-			  			}

-			   			elseif ($value=='')

-			   			{

-			   				$new_array_options[$key] = null;

-			   			}

-			 			break;

-					case 'double':

-						$value = price2num($value);

-						if (!is_numeric($value) && $value!='')

-						{

-							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

-							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

-							return -1;

-						}

-						elseif ($value=='')

-						{

-							$new_array_options[$key] = null;

-						}

-						//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);

-						$new_array_options[$key] = $value;

-						break;

-			 		/*case 'select':	// Not required, we chosed value='0' for undefined values

-             			if ($value=='-1')

-             			{

-             				$this->array_options[$key] = null;

-             			}

-             			break;*/

-			   		case 'password':

-			   			$algo='';

-			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))

-			   			{

-			   				// If there is an encryption choice, we use it to crypt data before insert

-			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);

-			   				$algo=reset($tmparrays);

-			   				if ($algo != '')

-			   				{

-			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...

-			   					//var_dump($action);

-			   					//var_dump($this->oldcopy);exit;

-			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value

-			   					{

-			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);

-				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.

-				   					{

-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

-				   					}

-									else

-									{

-										// var_dump($algo);

-										$newvalue = dol_hash($this->array_options[$key], $algo);

-										$new_array_options[$key] = $newvalue;

-									}

-			   					}

-			   					else

-			   					{

-			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

-			   					}

-			   				}

-			   			}

-			   			else	// Common usage

-			   			{

-			   				$new_array_options[$key] = $this->array_options[$key];

-			   			}

-			   			break;

-			   		case 'price':

-						$new_array_options[$key] = price2num($this->array_options[$key]);

-						break;

-					case 'date':

-						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);

-						break;

-					case 'datetime':

-						// If data is a string instead of a timestamp, we convert it

-						if (! is_int($this->array_options[$key])) {

-							$this->array_options[$key] = strtotime($this->array_options[$key]);

-						}

-						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);

-						break;

-		   			case 'link':

-						$param_list=array_keys($attributeParam['options']);

-						// 0 : ObjectName

-						// 1 : classPath

-						$InfoFieldList = explode(":", $param_list[0]);

-						dol_include_once($InfoFieldList[1]);

-						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))

-						{

-							if ($value == '-1')	// -1 is key for no defined in combo list of objects

-							{

-								$new_array_options[$key]='';

-							}

-							elseif ($value)

-							{

-								$object = new $InfoFieldList[0]($this->db);

-								if (is_numeric($value)) $res=$object->fetch($value);

-								else $res=$object->fetch('',$value);

-

-								if ($res > 0) $new_array_options[$key]=$object->id;

-								else

-								{

-									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";

-									$this->db->rollback();

-									return -1;

-								}

-							}

-						}

-						else

-						{

-							dol_syslog('Error bad setup of extrafield', LOG_WARNING);

-						}

-						break;

-			   	}

-			}

-

-			$this->db->begin();

+            if ($this->db->query($sql))

+            {

+                $this->multicurrency_tx = $rate;

+

+                // Update line price

+                if (!empty($this->lines))

+                {

+                    foreach ($this->lines as &$line)

+                    {

+                        if($mode == 1) {

+                            $line->subprice = 0;

+                        }

 

-			$table_element = $this->table_element;

-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+                        switch ($this->element) {

+                            case 'propal':

+                                $this->updateline(

+                                    $line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,

+                                    ($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

+                                    $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,

+                                    $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

+                                );

+                                break;

+                            case 'commande':

+                                $this->updateline(

+                                    $line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

+                                    $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,

+                                    $line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,

+                                    $line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

+                                );

+                                break;

+                            case 'facture':

+                                $this->updateline(

+                                    $line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

+                                    $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,

+                                    $line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,

+                                    $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice

+                                );

+                                break;

+                            case 'supplier_proposal':

+                                $this->updateline(

+                                    $line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,

+                                    ($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

+                                    $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,

+                                    $line->ref_fourn, $line->multicurrency_subprice

+                                );

+                                break;

+                            case 'order_supplier':

+                                $this->updateline(

+                                    $line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

+                                    $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,

+                                    $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

+                                );

+                                break;

+                            case 'invoice_supplier':

+                                $this->updateline(

+                                    $line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,

+                                    $line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,

+                                    $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

+                                );

+                                break;

+                            default:

+                                dol_syslog(get_class($this).'::setMulticurrencyRate no updateline defined', LOG_DEBUG);

+                                break;

+                        }

+                    }

+                }

 

-			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

-			dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);

-			$this->db->query($sql_del);

+                return 1;

+            }

+            else

+            {

+                dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());

+                $this->error=$this->db->error();

+                return -1;

+            }

+        }

+        else

+        {

+            dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');

+            $this->error='Status of the object is incompatible '.$this->statut;

+            return -2;

+        }

+    }

 

-			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";

-			foreach($new_array_options as $key => $value)

-			{

-				$attributeKey = substr($key,8);   // Remove 'options_' prefix

-				// Add field of attribut

-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator

-					$sql.=",".$attributeKey;

-			}

-			$sql .= ") VALUES (".$this->id;

-

-			foreach($new_array_options as $key => $value)

-			{

-				$attributeKey = substr($key,8);   // Remove 'options_' prefix

-				// Add field of attribute

-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)

-				{

-					if ($new_array_options[$key] != '')

-					{

-						$sql.=",'".$this->db->escape($new_array_options[$key])."'";

-					}

-					else

-					{

-						$sql.=",null";

-					}

-				}

-			}

-			$sql.=")";

+    /**

+     *  Change the payments terms

+     *

+     *  @param		int		$id		Id of new payment terms

+     *  @return		int				>0 if OK, <0 if KO

+     */

+    function setPaymentTerms($id)

+    {

+        dol_syslog(get_class($this).'::setPaymentTerms('.$id.')');

+        if ($this->statut >= 0 || $this->element == 'societe')

+        {

+            // TODO uniformize field name

+            $fieldname = 'fk_cond_reglement';

+            if ($this->element == 'societe') $fieldname = 'cond_reglement';

+            if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';

 

-			dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);

-			$resql = $this->db->query($sql);

-			if (! $resql)

-			{

-				$this->error=$this->db->lasterror();

-				$error++;

-			}

+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+            $sql .= ' SET '.$fieldname.' = '.$id;

+            $sql .= ' WHERE rowid='.$this->id;

 

-			if (! $error && $trigger)

-			{

-				// Call trigger

-				$this->context=array('extrafieldaddupdate'=>1);

-				$result=$this->call_trigger($trigger, $userused);

-				if ($result < 0) $error++;

-				// End call trigger

-			}

-

-			if ($error)

-			{

-				$this->db->rollback();

-				return -1;

-			}

-			else

-			{

-				$this->db->commit();

-				return 1;

-			}

-		}

-		else return 0;

-	}

-

-	/**

-	 *	Update an extra field value for the current object.

-	 *  Data to describe values to update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)

-	 *

-	 *  @param  string      $key    		Key of the extrafield (without starting 'options_')

-	 *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)

-	 *  @param	User		$userused		Object user

-	 *  @return int                 		-1=error, O=did nothing, 1=OK

-	 *  @see setValueFrom, insertExtraFields

-	 */

-	function updateExtraField($key, $trigger=null, $userused=null)

-	{

-		global $conf,$langs,$user;

-

-		if (empty($userused)) $userused=$user;

-

-		$error=0;

-

-		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

-            return 0; // For avoid conflicts if trigger used

+            if ($this->db->query($sql))

+            {

+                $this->cond_reglement_id = $id;

+                // for supplier

+                if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;

+                $this->cond_reglement = $id;	// for compatibility

+                return 1;

+            }

+            else

+            {

+                dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());

+                $this->error=$this->db->error();

+                return -1;

+            }

+        }

+        else

+        {

+            dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');

+            $this->error='Status of the object is incompatible '.$this->statut;

+            return -2;

+        }

+    }

 

-        if (! empty($this->array_options) && isset($this->array_options["options_".$key]))

-		{

-			// Check parameters

-			$langs->load('admin');

-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

-			$extrafields = new AlExtraFields($this->db);

-            $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);

+    /**

+     *	Define delivery address

+     *  @deprecated

+     *

+     *	@param      int		$id		Address id

+     *	@return     int				<0 si ko, >0 si ok

+     */

+    function setDeliveryAddress($id)

+    {

+        $fieldname = 'fk_delivery_address';

+        if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';

 

-			$value=$this->array_options["options_".$key];

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;

+        $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";

 

-			$attributeType     = $extrafields->attributes[$this->table_element]['type'][$key];

-			$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];

-			$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$key];

-			$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$key];

+        if ($this->db->query($sql))

+        {

+            $this->fk_delivery_address = $id;

+            return 1;

+        }

+        else

+        {

+            $this->error=$this->db->error();

+            dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);

+            return -1;

+        }

+    }

 

-			//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);

-			//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);

 

-			switch ($attributeType)

-			{

-				case 'int':

-					if (!is_numeric($value) && $value!='')

-					{

-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);

-						return -1;

-					}

-					elseif ($value=='')

-					{

-						$this->array_options["options_".$key] = null;

-					}

-					break;

-				case 'double':

-					$value = price2num($value);

-					if (!is_numeric($value) && $value!='')

-					{

-						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

-						return -1;

-					}

-					elseif ($value=='')

-					{

-						$this->array_options["options_".$key] = null;

-					}

-					//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);

-					$this->array_options["options_".$key] = $value;

-					break;

-			 	/*case 'select':	// Not required, we chosed value='0' for undefined values

-             		if ($value=='-1')

-             		{

-             			$this->array_options[$key] = null;

-             		}

-             		break;*/

-				case 'price':

-					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);

-					break;

-				case 'date':

-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);

-					break;

-				case 'datetime':

-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);

-					break;

-				case 'link':

-					$param_list=array_keys($attributeParam['options']);

-					// 0 : ObjectName

-					// 1 : classPath

-					$InfoFieldList = explode(":", $param_list[0]);

-					dol_include_once($InfoFieldList[1]);

-					if ($value)

-					{

-						$object = new $InfoFieldList[0]($this->db);

-						$object->fetch(0,$value);

-						$this->array_options["options_".$key]=$object->id;

-					}

-					break;

-			}

-

-			$this->db->begin();

-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";

-			$sql .= " WHERE fk_object = ".$this->id;

-			$resql = $this->db->query($sql);

-			if (! $resql)

-			{

-				$error++;

-				$this->error=$this->db->lasterror();

-			}

+    /**

+     *  Change the shipping method

+     *

+     *  @param      int     $shipping_method_id     Id of shipping method

+     *  @param      bool    $notrigger              false=launch triggers after, true=disable triggers

+     *  @param      User	$userused               Object user

+     *

+     *  @return     int              1 if OK, 0 if KO

+     */

+    function setShippingMethod($shipping_method_id, $notrigger=false, $userused=null)

+    {

+        global $user;

 

-			if (! $error && $trigger)

-			{

-				// Call trigger

-				$this->context=array('extrafieldupdate'=>1);

-				$result=$this->call_trigger($trigger, $userused);

-				if ($result < 0) $error++;

-				// End call trigger

-			}

-

-			if ($error)

-			{

-				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);

-				$this->db->rollback();

-				return -1;

-			}

-			else

-			{

-				$this->db->commit();

-				return 1;

-			}

-		}

-		else return 0;

-	}

-

-

-	/**

-	 * Return HTML string to put an input field into a page

-	 * Code very similar with showInputField of extra fields

-	 *

-	 * @param  array   		$val	       Array of properties for field to show

-	 * @param  string  		$key           Key of attribute

-	 * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)

-	 * @param  string  		$moreparam     To add more parameters on html input tag

-	 * @param  string  		$keysuffix     Prefix string to add into name and id of field (can be used to avoid duplicate names)

-	 * @param  string  		$keyprefix     Suffix string to add into name and id of field (can be used to avoid duplicate names)

-	 * @param  string|int		$morecss       Value for css to define style/length of field. May also be a numeric.

-	 * @return string

-	 */

-	function showInputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss=0)

-	{

-		global $conf,$langs,$form;

-

-		if (! is_object($form))

-		{

-			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

-			$form=new Form($this->db);

-		}

-

-		$val=$this->fields[$key];

-

-		$out='';

-        $type='';

-        $param = array();

-        $param['options']=array();

-        $size =$this->fields[$key]['size'];

-        // Because we work on extrafields

-        if(preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)){

-            $param['options']=array($reg[1].':'.$reg[2]=>'N');

-            $type ='link';

-        } elseif(preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {

-            $param['options']=array($reg[1].':'.$reg[2]=>'N');

-            $type ='link';

-        } elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

-            $param['options']=array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4]=>'N');

-            $type ='sellist';

-        } elseif(preg_match('/varchar\((\d+)\)/', $val['type'],$reg)) {

-            $param['options']=array();

-            $type ='varchar';

-            $size=$reg[1];

-        } elseif(preg_match('/varchar/', $val['type'])) {

-            $param['options']=array();

-            $type ='varchar';

-        } elseif(is_array($this->fields[$key]['arrayofkeyval'])) {

-            $param['options']=$this->fields[$key]['arrayofkeyval'];

-            $type ='select';

-        } else {

-            $param['options']=array();

-            $type =$this->fields[$key]['type'];

-        }

+        if (empty($userused)) $userused=$user;

 

-		$label=$this->fields[$key]['label'];

-		//$elementtype=$this->fields[$key]['elementtype'];	// Seems not used

-		$default=$this->fields[$key]['default'];

-		$computed=$this->fields[$key]['computed'];

-		$unique=$this->fields[$key]['unique'];

-		$required=$this->fields[$key]['required'];

+        $error = 0;

 

-		$langfile=$this->fields[$key]['langfile'];

-		$list=$this->fields[$key]['list'];

-		$hidden=abs($this->fields[$key]['visible'])!=1?1:0;

+        if (! $this->table_element) {

+            dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined",LOG_ERR);

+            return -1;

+        }

 

-		$objectid = $this->id;

+        $this->db->begin();

 

+        if ($shipping_method_id<0) $shipping_method_id='NULL';

+        dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');

 

-		if ($computed)

-		{

-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

-			else return '';

-		}

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+        $sql.= " SET fk_shipping_method = ".$shipping_method_id;

+        $sql.= " WHERE rowid=".$this->id;

+        $resql = $this->db->query($sql);

+        if (! $resql) {

+            dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);

+            $this->error = $this->db->lasterror();

+            $error++;

+        } else {

+            if (!$notrigger)

+            {

+                // Call trigger

+                $this->context=array('shippingmethodupdate'=>1);

+                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

+                if ($result < 0) $error++;

+                // End call trigger

+            }

+        }

+        if ($error)

+        {

+            $this->db->rollback();

+            return -1;

+        } else {

+            $this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;

+            $this->db->commit();

+            return 1;

+        }

+    }

 

 

-		// Use in priority showsize from parameters, then $val['css'] then autodefine

-		if (empty($morecss) && ! empty($val['css']))

-		{

-			$showsize = $val['css'];

-		}

-		if (empty($morecss))

-		{

-			if ($type == 'date')

-			{

-				$morecss = 'minwidth100imp';

-			}

-			elseif ($type == 'datetime')

-			{

-				$morecss = 'minwidth200imp';

-			}

-			elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

-			{

-				$morecss = 'maxwidth75';

-                        }elseif ($type == 'url')

-			{

-				$morecss='minwidth400';

-			}

-			elseif ($type == 'boolean')

-			{

-				$morecss='';

-			}

-			else

-			{

-				if (round($size) < 12)

-				{

-					$morecss = 'minwidth100';

-				}

-				else if (round($size) <= 48)

-				{

-					$morecss = 'minwidth200';

-				}

-				else

-				{

-					$morecss = 'minwidth400';

-				}

-			}

-		}

-

-		if (in_array($type,array('date','datetime')))

-		{

-			$tmp=explode(',',$size);

-			$newsize=$tmp[0];

-

-			$showtime = in_array($type,array('datetime')) ? 1 : 0;

-

-			// Do not show current date when field not required (see selectDate() method)

-			if (!$required && $value == '') $value = '-1';

-

-			// TODO Must also support $moreparam

-			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

-		}

-		elseif (in_array($type,array('int','integer')))

-		{

-			$tmp=explode(',',$size);

-			$newsize=$tmp[0];

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';

-		}

-		elseif (preg_match('/varchar/', $type))

-		{

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';

-		}

-		elseif (in_array($type, array('mail', 'phone', 'url')))

-		{

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

-		}

-		elseif ($type == 'text')

-		{

-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

-			{

-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');

-				$out=$doleditor->Create(1);

-			}

-			else

-			{

-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

-			}

-		}

-		elseif ($type == 'html')

-		{

-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

-			{

-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

-				$doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

-                $out=$doleditor->Create(1);

-			}

-			else

-			{

-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

-			}

-		}

-		elseif ($type == 'boolean')

-		{

-			$checked='';

-			if (!empty($value)) {

-				$checked=' checked value="1" ';

-			} else {

-				$checked=' value="1" ';

-			}

-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';

-		}

-		elseif ($type == 'price')

-		{

-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

-				$value=price($value);

-			}

-			$out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ' . $langs->getCurrencySymbol(Globals::$conf->currency);

-        }

-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

-		{

-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

-				$value=price($value);

-			}

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';

-		}

-		elseif ($type == 'select')

-		{

-			$out = '';

-			if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

-			}

-

-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';

-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';

-			foreach ($param['options'] as $key => $val)

-			{

-				if ((string) $key == '') continue;

-				list($val, $parent) = explode('|', $val);

-				$out.='<option value="'.$key.'"';

-				$out.= (((string) $value == (string) $key)?' selected':'');

-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');

-				$out.='>'.$val.'</option>';

-			}

-			$out.='</select>';

-		}

-		elseif ($type == 'sellist')

-		{

-			$out = '';

-			if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

-			}

-

-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';

-			if (is_array($param['options']))

-			{

-				$param_list=array_keys($param['options']);

-				$InfoFieldList = explode(":", $param_list[0]);

-				$parentName='';

-				$parentField='';

-				// 0 : tableName

-				// 1 : label field name

-				// 2 : key fields name (if differ of rowid)

-				// 3 : key field parent (for dependent lists)

-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');

-

-

-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))

-				{

-					if (strpos($InfoFieldList[4], 'extra.') !== false)

-					{

-						$keyList='main.'.$InfoFieldList[2].' as rowid';

-					} else {

-						$keyList=$InfoFieldList[2].' as rowid';

-					}

-				}

-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))

-				{

-					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);

-					$keyList.= ', '.$parentField;

-				}

+    /**

+     *  Change the warehouse

+     *

+     *  @param      int     $warehouse_id     Id of warehouse

+     *  @return     int              1 if OK, 0 if KO

+     */

+    function setWarehouse($warehouse_id)

+    {

+        if (! $this->table_element) {

+            dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);

+            return -1;

+        }

+        if ($warehouse_id<0) $warehouse_id='NULL';

+        dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');

 

-				$fields_label = explode('|',$InfoFieldList[1]);

-				if (is_array($fields_label))

-				{

-					$keyList .=', ';

-					$keyList .= implode(', ', $fields_label);

-				}

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+        $sql.= " SET fk_warehouse = ".$warehouse_id;

+        $sql.= " WHERE rowid=".$this->id;

 

-				$sqlwhere='';

-				$sql = 'SELECT '.$keyList;

-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];

-				if (!empty($InfoFieldList[4]))

-				{

-					// can use SELECT request

-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {

-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);

-					}

-

-					// current object id can be use into filter

-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {

-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);

-					} else {

-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);

-					}

-					//We have to join on extrafield table

-					if (strpos($InfoFieldList[4], 'extra')!==false)

-					{

-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';

-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];

-					}

-					else

-					{

-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];

-					}

-				}

-				else

-				{

-					$sqlwhere.= ' WHERE 1=1';

-				}

-				// Some tables may have field, some other not. For the moment we disable it.

-				if (in_array($InfoFieldList[0],array('tablewithentity')))

-				{

-					$sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

-                }

-				$sql.=$sqlwhere;

-				//print $sql;

+        if ($this->db->query($sql)) {

+            $this->warehouse_id = ($warehouse_id=='NULL')?null:$warehouse_id;

+            return 1;

+        } else {

+            dol_syslog(get_class($this).'::setWarehouse Error ', LOG_DEBUG);

+            $this->error=$this->db->error();

+            return 0;

+        }

+    }

 

-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);

 

-				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

-				$resql = $this->db->query($sql);

-				if ($resql)

-				{

-					$out.='<option value="0">&nbsp;</option>';

-					$num = $this->db->num_rows($resql);

-					$i = 0;

-					while ($i < $num)

-					{

-						$labeltoshow='';

-						$obj = $this->db->fetch_object($resql);

-

-						// Several field into label (eq table:code|libelle:rowid)

-						$notrans = false;

-						$fields_label = explode('|',$InfoFieldList[1]);

-						if (is_array($fields_label))

-						{

-							$notrans = true;

-							foreach ($fields_label as $field_toshow)

-							{

-								$labeltoshow.= $obj->$field_toshow.' ';

-							}

-						}

-						else

-						{

-							$labeltoshow=$obj->{$InfoFieldList[1]};

-						}

-						$labeltoshow=dol_trunc($labeltoshow,45);

-

-						if ($value == $obj->rowid)

-						{

-							foreach ($fields_label as $field_toshow)

-							{

-								$translabel=$langs->trans($obj->$field_toshow);

-								if ($translabel!=$obj->$field_toshow) {

-									$labeltoshow=dol_trunc($translabel,18).' ';

-								}else {

-									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';

-								}

-							}

-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

-						}

-						else

-						{

-							if (! $notrans)

-							{

-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});

-								if ($translabel!=$obj->{$InfoFieldList[1]}) {

-									$labeltoshow=dol_trunc($translabel,18);

-								}

-								else {

-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);

-								}

-							}

-							if (empty($labeltoshow)) $labeltoshow='(not defined)';

-							if ($value==$obj->rowid)

-							{

-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

-							}

+    /**

+     *		Set last model used by doc generator

+     *

+     *		@param		User	$user		User object that make change

+     *		@param		string	$modelpdf	Modele name

+     *		@return		int					<0 if KO, >0 if OK

+     */

+    function setDocModel($user, $modelpdf)

+    {

+        if (! $this->table_element)

+        {

+            dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined",LOG_ERR);

+            return -1;

+        }

 

-							if (!empty($InfoFieldList[3]) && $parentField)

-							{

-								$parent = $parentName.':'.$obj->{$parentField};

-							}

+        $newmodelpdf=dol_trunc($modelpdf,255);

 

-							$out.='<option value="'.$obj->rowid.'"';

-							$out.= ($value==$obj->rowid?' selected':'');

-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');

-							$out.='>'.$labeltoshow.'</option>';

-						}

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+        $sql.= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";

+        $sql.= " WHERE rowid = ".$this->id;

+        // if ($this->element == 'facture') $sql.= " AND fk_statut < 2";

+        // if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";

 

-						$i++;

-					}

-					$this->db->free($resql);

-				}

-				else {

-					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

-				}

-			}

-			$out.='</select>';

-		}

-		elseif ($type == 'checkbox')

-		{

-			$value_arr=explode(',',$value);

-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

-		}

-		elseif ($type == 'radio')

-		{

-			$out='';

-			foreach ($param['options'] as $keyopt => $val)

-			{

-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');

-				$out.=' value="'.$keyopt.'"';

-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';

-				$out.= ($value==$keyopt?'checked':'');

-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

-			}

-		}

-		elseif ($type == 'chkbxlst')

-		{

-			if (is_array($value)) {

-				$value_arr = $value;

-			}

-			else {

-				$value_arr = explode(',', $value);

-			}

-

-			if (is_array($param['options'])) {

-				$param_list = array_keys($param['options']);

-				$InfoFieldList = explode(":", $param_list[0]);

-				$parentName='';

-				$parentField='';

-				// 0 : tableName

-				// 1 : label field name

-				// 2 : key fields name (if differ of rowid)

-				// 3 : key field parent (for dependent lists)

-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');

-

-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {

-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);

-					$keyList .= ', ' . $parentField;

-				}

-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {

-					if (strpos($InfoFieldList[4], 'extra.') !== false) {

-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';

-					} else {

-						$keyList = $InfoFieldList[2] . ' as rowid';

-					}

-				}

+        dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);

+        $resql=$this->db->query($sql);

+        if ($resql)

+        {

+            $this->modelpdf=$modelpdf;

+            return 1;

+        }

+        else

+        {

+            dol_print_error($this->db);

+            return 0;

+        }

+    }

 

-				$fields_label = explode('|', $InfoFieldList[1]);

-				if (is_array($fields_label)) {

-					$keyList .= ', ';

-					$keyList .= implode(', ', $fields_label);

-				}

 

-				$sqlwhere = '';

-				$sql = 'SELECT ' . $keyList;

-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

-				if (! empty($InfoFieldList[4])) {

-

-					// can use SELECT request

-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {

-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);

-					}

-

-					// current object id can be use into filter

-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {

-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);

-					} else {

-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);

-					}

-

-					// We have to join on extrafield table

-					if (strpos($InfoFieldList[4], 'extra') !== false) {

-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';

-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];

-					} else {

-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];

-					}

-				} else {

-					$sqlwhere .= ' WHERE 1=1';

-				}

-				// Some tables may have field, some other not. For the moment we disable it.

-				if (in_array($InfoFieldList[0], array ('tablewithentity')))

-				{

-					$sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

-                }

-				// $sql.=preg_replace('/^ AND /','',$sqlwhere);

-				// print $sql;

-

-				$sql .= $sqlwhere;

-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);

-				$resql = $this->db->query($sql);

-				if ($resql) {

-					$num = $this->db->num_rows($resql);

-					$i = 0;

-

-					$data=array();

-

-					while ( $i < $num ) {

-						$labeltoshow = '';

-						$obj = $this->db->fetch_object($resql);

-

-						$notrans = false;

-						// Several field into label (eq table:code|libelle:rowid)

-						$fields_label = explode('|', $InfoFieldList[1]);

-						if (is_array($fields_label)) {

-							$notrans = true;

-							foreach ( $fields_label as $field_toshow ) {

-								$labeltoshow .= $obj->$field_toshow . ' ';

-							}

-						} else {

-							$labeltoshow = $obj->{$InfoFieldList[1]};

-						}

-						$labeltoshow = dol_trunc($labeltoshow, 45);

-

-						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-							foreach ( $fields_label as $field_toshow ) {

-								$translabel = $langs->trans($obj->$field_toshow);

-								if ($translabel != $obj->$field_toshow) {

-									$labeltoshow = dol_trunc($translabel, 18) . ' ';

-								} else {

-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';

-								}

-							}

+    /**

+     *  Change the bank account

+     *

+     *  @param		int		$fk_account		Id of bank account

+     *  @param      bool    $notrigger      false=launch triggers after, true=disable triggers

+     *  @param      User	$userused		Object user

+     *  @return		int				1 if OK, 0 if KO

+     */

+    function setBankAccount($fk_account, $notrigger=false, $userused=null)

+    {

+        global $user;

 

-							$data[$obj->rowid]=$labeltoshow;

-						} else {

-							if (! $notrans) {

-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

-								if ($translabel != $obj->{$InfoFieldList[1]}) {

-									$labeltoshow = dol_trunc($translabel, 18);

-								} else {

-									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

-								}

-							}

-							if (empty($labeltoshow))

-								$labeltoshow = '(not defined)';

+        if (empty($userused)) $userused=$user;

 

-								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-									$data[$obj->rowid]=$labeltoshow;

-								}

+        $error = 0;

 

-								if (! empty($InfoFieldList[3]) && $parentField) {

-									$parent = $parentName . ':' . $obj->{$parentField};

-								}

+        if (! $this->table_element) {

+            dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);

+            return -1;

+        }

+        $this->db->begin();

 

-								$data[$obj->rowid]=$labeltoshow;

-						}

+        if ($fk_account<0) $fk_account='NULL';

+        dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');

 

-						$i ++;

-					}

-					$this->db->free($resql);

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+        $sql.= " SET fk_account = ".$fk_account;

+        $sql.= " WHERE rowid=".$this->id;

 

-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

-				} else {

-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';

-				}

-			}

-		}

-		elseif ($type == 'link')

-		{

-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'

-			$showempty=(($required && $default != '')?0:1);

-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);

-			if (Globals::$conf->global->MAIN_FEATURES_LEVEL >= 2) {

-            			list($class,$classfile)=explode(':',$param_list[0]);

-            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);

-            			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);

-            			$out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';

-            			// TODO Add Javascript code to add input fields contents to new elements urls

-			}

-		}

-		elseif ($type == 'password')

-		{

-			// If prefix is 'search_', field is used as a filter, we use a common text field.

-			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';

-		}

-		elseif ($type == 'array')

-		{

-			$newval = $val;

-			$newval['type'] = 'varchar(256)';

-

-			$out='';

-

-			$inputs = array();

-			if(! empty($value)) {

-				foreach($value as $option) {

-					$out.= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

-					$out.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';

-				}

-			}

+        $resql = $this->db->query($sql);

+        if (! $resql)

+        {

+            dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());

+            $this->error = $this->db->lasterror();

+            $error++;

+        }

+        else

+        {

+            if (!$notrigger)

+            {

+                // Call trigger

+                $this->context=array('bankaccountupdate'=>1);

+                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

+                if ($result < 0) $error++;

+                // End call trigger

+            }

+        }

+        if ($error)

+        {

+            $this->db->rollback();

+            return -1;

+        }

+        else

+        {

+            $this->fk_account = ($fk_account=='NULL')?null:$fk_account;

+            $this->db->commit();

+            return 1;

+        }

+    }

 

-			$out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';

 

-			$newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

-			$newInput.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';

+    // TODO: Move line related operations to CommonObjectLine?

 

-			if (!empty(Globals::$conf->use_javascript_ajax)) {

-                $out.= '

-					<script type="text/javascript">

-					$(document).ready(function() {

-						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {

-							$("'.dol_escape_js($newInput).'").insertBefore(this);

-						});

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *  Save a new position (field rang) for details lines.

+     *  You can choose to set position for lines with already a position or lines without any position defined.

+     *

+     * 	@param		boolean		$renum			   True to renum all already ordered lines, false to renum only not already ordered lines.

+     * 	@param		string		$rowidorder		   ASC or DESC

+     * 	@param		boolean		$fk_parent_line    Table with fk_parent_line field or not

+     * 	@return		int                            <0 if KO, >0 if OK

+     */

+    function line_order($renum=false, $rowidorder='ASC', $fk_parent_line=true)

+    {

+        // phpcs:enable

+        if (! $this->table_element_line)

+        {

+            dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined",LOG_ERR);

+            return -1;

+        }

+        if (! $this->fk_element)

+        {

+            dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined",LOG_ERR);

+            return -1;

+        }

+

+        // Count number of lines to reorder (according to choice $renum)

+        $nl=0;

+        $sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+        $sql.= ' WHERE '.$this->fk_element.'='.$this->id;

+        if (! $renum) $sql.= ' AND rang = 0';

+        if ($renum) $sql.= ' AND rang <> 0';

+

+        dol_syslog(get_class($this)."::line_order", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $row = $this->db->fetch_row($resql);

+            $nl = $row[0];

+        }

+        else dol_print_error($this->db);

+        if ($nl > 0)

+        {

+            // The goal of this part is to reorder all lines, with all children lines sharing the same

+            // counter that parents.

+            $rows=array();

+

+            // We first search all lines that are parent lines (for multilevel details lines)

+            $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+            $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

+            if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';

+            $sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;

+

+            dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);

+            $resql = $this->db->query($sql);

+            if ($resql)

+            {

+                $i=0;

+                $num = $this->db->num_rows($resql);

+                while ($i < $num)

+                {

+                    $row = $this->db->fetch_row($resql);

+                    $rows[] = $row[0];	// Add parent line into array rows

+                    $childrens = $this->getChildrenOfLine($row[0]);

+                    if (! empty($childrens))

+                    {

+                        foreach($childrens as $child)

+                        {

+                            array_push($rows, $child);

+                        }

+                    }

+                    $i++;

+                }

+

+                // Now we set a new number for each lines (parent and children with children included into parent tree)

+                if (! empty($rows))

+                {

+                    foreach($rows as $key => $row)

+                    {

+                        $this->updateRangOfLine($row, ($key+1));

+                    }

+                }

+            }

+            else

+            {

+                dol_print_error($this->db);

+            }

+        }

+        return 1;

+    }

+

+    /**

+     * 	Get children of line

+     *

+     * 	@param	int		$id		Id of parent line

+     * 	@return	array			Array with list of children lines id

+     */

+    function getChildrenOfLine($id)

+    {

+        $rows=array();

+

+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+        $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

+        $sql.= ' AND fk_parent_line = '.$id;

+        $sql.= ' ORDER BY rang ASC';

+

+        dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $i=0;

+            $num = $this->db->num_rows($resql);

+            while ($i < $num)

+            {

+                $row = $this->db->fetch_row($resql);

+                $rows[$i] = $row[0];

+                $i++;

+            }

+        }

+

+        return $rows;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     * 	Update a line to have a lower rank

+     *

+     * 	@param 	int			$rowid				Id of line

+     * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not

+     * 	@return	void

+     */

+    function line_up($rowid, $fk_parent_line=true)

+    {

+        // phpcs:enable

+        $this->line_order(false, 'ASC', $fk_parent_line);

+

+        // Get rang of line

+        $rang = $this->getRangOfLine($rowid);

+

+        // Update position of line

+        $this->updateLineUp($rowid, $rang);

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     * 	Update a line to have a higher rank

+     *

+     * 	@param	int			$rowid				Id of line

+     * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not

+     * 	@return	void

+     */

+    function line_down($rowid, $fk_parent_line=true)

+    {

+        // phpcs:enable

+        $this->line_order(false, 'ASC', $fk_parent_line);

+

+        // Get rang of line

+        $rang = $this->getRangOfLine($rowid);

+

+        // Get max value for rang

+        $max = $this->line_max();

+

+        // Update position of line

+        $this->updateLineDown($rowid, $rang, $max);

+    }

+

+    /**

+     * 	Update position of line (rang)

+     *

+     * 	@param	int		$rowid		Id of line

+     * 	@param	int		$rang		Position

+     * 	@return	void

+     */

+    function updateRangOfLine($rowid,$rang)

+    {

+        $fieldposition = 'rang';

+        if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+

+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

+        $sql.= ' WHERE rowid = '.$rowid;

+

+        dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);

+        if (! $this->db->query($sql))

+        {

+            dol_print_error($this->db);

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     * 	Update position of line with ajax (rang)

+     *

+     * 	@param	array	$rows	Array of rows

+     * 	@return	void

+     */

+    function line_ajaxorder($rows)

+    {

+        // phpcs:enable

+        $num = count($rows);

+        for ($i = 0 ; $i < $num ; $i++)

+        {

+            $this->updateRangOfLine($rows[$i], ($i+1));

+        }

+    }

+

+    /**

+     * 	Update position of line up (rang)

+     *

+     * 	@param	int		$rowid		Id of line

+     * 	@param	int		$rang		Position

+     * 	@return	void

+     */

+    function updateLineUp($rowid,$rang)

+    {

+        if ($rang > 1)

+        {

+            $fieldposition = 'rang';

+            if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+

+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;

+            $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

+            $sql.= ' AND rang = '.($rang - 1);

+            if ($this->db->query($sql) )

+            {

+                $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);

+                $sql.= ' WHERE rowid = '.$rowid;

+                if (! $this->db->query($sql) )

+                {

+                    dol_print_error($this->db);

+                }

+            }

+            else

+            {

+                dol_print_error($this->db);

+            }

+        }

+    }

+

+    /**

+     * 	Update position of line down (rang)

+     *

+     * 	@param	int		$rowid		Id of line

+     * 	@param	int		$rang		Position

+     * 	@param	int		$max		Max

+     * 	@return	void

+     */

+    function updateLineDown($rowid,$rang,$max)

+    {

+        if ($rang < $max)

+        {

+            $fieldposition = 'rang';

+            if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+

+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

+            $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

+            $sql.= ' AND rang = '.($rang+1);

+            if ($this->db->query($sql) )

+            {

+                $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang+1);

+                $sql.= ' WHERE rowid = '.$rowid;

+                if (! $this->db->query($sql) )

+                {

+                    dol_print_error($this->db);

+                }

+            }

+            else

+            {

+                dol_print_error($this->db);

+            }

+        }

+    }

+

+    /**

+     * 	Get position of line (rang)

+     *

+     * 	@param		int		$rowid		Id of line

+     *  @return		int     			Value of rang in table of lines

+     */

+    function getRangOfLine($rowid)

+    {

+        $sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+        $sql.= ' WHERE rowid ='.$rowid;

+

+        dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $row = $this->db->fetch_row($resql);

+            return $row[0];

+        }

+    }

+

+    /**

+     * 	Get rowid of the line relative to its position

+     *

+     * 	@param		int		$rang		Rang value

+     *  @return     int     			Rowid of the line

+     */

+    function getIdOfLine($rang)

+    {

+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+        $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

+        $sql.= ' AND rang = '.$rang;

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $row = $this->db->fetch_row($resql);

+            return $row[0];

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     * 	Get max value used for position of line (rang)

+     *

+     * 	@param		int		$fk_parent_line		Parent line id

+     *  @return     int  			   			Max value of rang in table of lines

+     */

+    function line_max($fk_parent_line=0)

+    {

+        // phpcs:enable

+        // Search the last rang with fk_parent_line

+        if ($fk_parent_line)

+        {

+            $sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+            $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

+            $sql.= ' AND fk_parent_line = '.$fk_parent_line;

+

+            dol_syslog(get_class($this)."::line_max", LOG_DEBUG);

+            $resql = $this->db->query($sql);

+            if ($resql)

+            {

+                $row = $this->db->fetch_row($resql);

+                if (! empty($row[0]))

+                {

+                    return $row[0];

+                }

+                else

+                {

+                    return $this->getRangOfLine($fk_parent_line);

+                }

+            }

+        }

+        // If not, search the last rang of element

+        else

+        {

+            $sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+            $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

+

+            dol_syslog(get_class($this)."::line_max", LOG_DEBUG);

+            $resql = $this->db->query($sql);

+            if ($resql)

+            {

+                $row = $this->db->fetch_row($resql);

+                return $row[0];

+            }

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *  Update external ref of element

+     *

+     *  @param      string		$ref_ext	Update field ref_ext

+     *  @return     int      		   		<0 if KO, >0 if OK

+     */

+    function update_ref_ext($ref_ext)

+    {

+        // phpcs:enable

+        if (! $this->table_element)

+        {

+            dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);

+            return -1;

+        }

+

+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+        $sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";

+        $sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;

+

+        dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);

+        if ($this->db->query($sql))

+        {

+            $this->ref_ext = $ref_ext;

+            return 1;

+        }

+        else

+        {

+            $this->error=$this->db->error();

+            return -1;

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *  Update note of element

+     *

+     *  @param      string		$note		New value for note

+     *  @param		string		$suffix		'', '_public' or '_private'

+     *  @return     int      		   		<0 if KO, >0 if OK

+     */

+    function update_note($note, $suffix='')

+    {

+        // phpcs:enable

+        global $user;

+

+        if (! $this->table_element)

+        {

+            $this->error='update_note was called on objet with property table_element not defined';

+            dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);

+            return -1;

+        }

+        if (! in_array($suffix,array('','_public','_private')))

+        {

+            $this->error='update_note Parameter suffix must be empty, \'_private\' or \'_public\'';

+            dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);

+            return -2;

+        }

+        // Special cas

+        //var_dump($this->table_element);exit;

+        if ($this->table_element == 'product') $suffix='';

+

+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+        $sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");

+        $sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;

+        $sql.= " WHERE rowid =". $this->id;

+

+        dol_syslog(get_class($this)."::update_note", LOG_DEBUG);

+        if ($this->db->query($sql))

+        {

+            if ($suffix == '_public') $this->note_public = $note;

+            else if ($suffix == '_private') $this->note_private = $note;

+            else

+            {

+                $this->note = $note;      // deprecated

+                $this->note_private = $note;

+            }

+            return 1;

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            return -1;

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     * 	Update public note (kept for backward compatibility)

+     *

+     * @param      string		$note		New value for note

+     * @return     int      		   		<0 if KO, >0 if OK

+     * @deprecated

+     * @see update_note()

+     */

+    function update_note_public($note)

+    {

+        // phpcs:enable

+        return $this->update_note($note,'_public');

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *	Update total_ht, total_ttc, total_vat, total_localtax1, total_localtax2 for an object (sum of lines).

+     *  Must be called at end of methods addline or updateline.

+     *

+     *	@param	int		$exclspec          	>0 = Exclude special product (product_type=9)

+     *  @param  string	$roundingadjust    	'none'=Do nothing, 'auto'=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND if defined, or '0'), '0'=Force mode total of rounding, '1'=Force mode rounding of total

+     *  @param	int		$nodatabaseupdate	1=Do not update database. Update only properties of object.

+     *  @param	Societe	$seller				If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object.

+     *	@return	int    			           	<0 if KO, >0 if OK

+     */

+    function update_price($exclspec=0,$roundingadjust='none',$nodatabaseupdate=0,$seller=null)

+    {

+        // phpcs:enable

+        global $conf, $hookmanager, $action;

+

+        // Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)

+        $MODULE = "";

+        if ($this->element == 'propal')

+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";

+        elseif ($this->element == 'order')

+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";

+        elseif ($this->element == 'facture')

+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";

+        elseif ($this->element == 'facture_fourn')

+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";

+        elseif ($this->element == 'order_supplier')

+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";

+        elseif ($this->element == 'supplier_proposal')

+            $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";

+

+        if (! empty($MODULE)) {

+            if (!empty(Globals::$conf->global->$MODULE)) {

+                $modsactivated = explode(',', Globals::$conf->global->$MODULE);

+                foreach ($modsactivated as $mod) {

+                    if (Globals::$conf->$mod->enabled)

+                        return 1; // update was disabled by specific setup

+                }

+            }

+        }

+

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';

+

+        if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility

+

+        $forcedroundingmode=$roundingadjust;

+        if ($forcedroundingmode == 'auto' && isset(Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND))

+            $forcedroundingmode = Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;

+        elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';

+

+        $error=0;

+

+        $multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;

+

+        // Define constants to find lines to sum

+        $fieldtva='total_tva';

+        $fieldlocaltax1='total_localtax1';

+        $fieldlocaltax2='total_localtax2';

+        $fieldup='subprice';

+        if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')

+        {

+            $fieldtva='tva';

+            $fieldup='pu_ht';

+        }

+        if ($this->element == 'expensereport')

+        {

+            $fieldup='value_unit';

+        }

+

+        $sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';

+        $sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';

+            if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';

+            $sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';

+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+        $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

+        if ($exclspec)

+        {

+            $product_field='product_type';

+            if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field

+            if ($product_field) $sql.= ' AND '.$product_field.' <> 9';

+        }

+        $sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used

+

+        dol_syslog(get_class($this)."::update_price", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $this->total_ht  = 0;

+            $this->total_tva = 0;

+            $this->total_localtax1 = 0;

+            $this->total_localtax2 = 0;

+            $this->total_ttc = 0;

+            $total_ht_by_vats  = array();

+            $total_tva_by_vats = array();

+            $total_ttc_by_vats = array();

+            $this->multicurrency_total_ht	= 0;

+            $this->multicurrency_total_tva	= 0;

+            $this->multicurrency_total_ttc	= 0;

+

+            $num = $this->db->num_rows($resql);

+            $i = 0;

+            while ($i < $num)

+            {

+                $obj = $this->db->fetch_object($resql);

+

+                // Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'

+                $parameters=array('fk_element' => $obj->rowid);

+                $reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

+

+                if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'

+                {

+                    $localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);

+                    $tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);

+                    $diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);

+                    if ($diff)

+                    {

+                        $sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;

+                        dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

+                                $resqlfix=$this->db->query($sqlfix);

+                                if (! $resqlfix) dol_print_error($this->db,'Failed to update line');

+                                $obj->total_tva = $tmpcal[1];

+                                $obj->total_ttc = $tmpcal[2];

+                        //

+                    }

+                }

+

+                $this->total_ht        += $obj->total_ht;		// The field visible at end of line detail

+                $this->total_tva       += $obj->total_tva;

+                $this->total_localtax1 += $obj->total_localtax1;

+                $this->total_localtax2 += $obj->total_localtax2;

+                $this->total_ttc       += $obj->total_ttc;

+                $this->multicurrency_total_ht        += $obj->multicurrency_total_ht;		// The field visible at end of line detail

+                $this->multicurrency_total_tva       += $obj->multicurrency_total_tva;

+                $this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;

+

+                if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;

+                if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;

+                if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;

+                $total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;

+                $total_tva_by_vats[$obj->vatrate] += $obj->total_tva;

+                $total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;

+

+                if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency

+                {

+                    $tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);

+                    $diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);

+                    //print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";

+                    if ($diff)

+                    {

+                        if (abs($diff) > 0.1) { dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING); exit; }

+                        $sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;

+                        dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

+                                $resqlfix=$this->db->query($sqlfix);

+                                if (! $resqlfix) dol_print_error($this->db,'Failed to update line');

+                                $this->total_tva -= $diff;

+                                $this->total_ttc -= $diff;

+                                $total_tva_by_vats[$obj->vatrate] -= $diff;

+                                $total_ttc_by_vats[$obj->vatrate] -= $diff;

+                    }

+                }

+

+                $i++;

+            }

+

+            // Add revenue stamp to total

+            $this->total_ttc       			+= isset($this->revenuestamp)?$this->revenuestamp:0;

+            $this->multicurrency_total_ttc  += isset($this->revenuestamp)?($this->revenuestamp * $multicurrency_tx):0;

+

+            // Situations totals

+            if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE )

+            {

+                $prev_sits = $this->get_prev_sits();

+

+                foreach ($prev_sits as $sit) {				// $sit is an object Facture loaded with a fetch.

+                    $this->total_ht -= $sit->total_ht;

+                    $this->total_tva -= $sit->total_tva;

+                    $this->total_localtax1 -= $sit->total_localtax1;

+                    $this->total_localtax2 -= $sit->total_localtax2;

+                    $this->total_ttc -= $sit->total_ttc;

+                    $this->multicurrency_total_ht -= $sit->multicurrency_total_ht;

+                    $this->multicurrency_total_tva -= $sit->multicurrency_total_tva;

+                    $this->multicurrency_total_ttc -= $sit->multicurrency_total_ttc;

+                }

+            }

+

+            $this->db->free($resql);

+

+            // Now update global field total_ht, total_ttc and tva

+            $fieldht='total_ht';

+            $fieldtva='tva';

+            $fieldlocaltax1='localtax1';

+            $fieldlocaltax2='localtax2';

+            $fieldttc='total_ttc';

+            // Specific code for backward compatibility with old field names

+            if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';

+            if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';

+            if ($this->element == 'propal')                                                $fieldttc='total';

+            if ($this->element == 'expensereport')                                         $fieldtva='total_tva';

+            if ($this->element == 'supplier_proposal')                                     $fieldttc='total';

+

+            if (empty($nodatabaseupdate))

+            {

+                $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';

+                $sql .= " ".$fieldht."='".price2num($this->total_ht)."',";

+                $sql .= " ".$fieldtva."='".price2num($this->total_tva)."',";

+                $sql .= " ".$fieldlocaltax1."='".price2num($this->total_localtax1)."',";

+                $sql .= " ".$fieldlocaltax2."='".price2num($this->total_localtax2)."',";

+                $sql .= " ".$fieldttc."='".price2num($this->total_ttc)."'";

+                        $sql .= ", multicurrency_total_ht='".price2num($this->multicurrency_total_ht, 'MT', 1)."'";

+                        $sql .= ", multicurrency_total_tva='".price2num($this->multicurrency_total_tva, 'MT', 1)."'";

+                        $sql .= ", multicurrency_total_ttc='".price2num($this->multicurrency_total_ttc, 'MT', 1)."'";

+                $sql .= ' WHERE rowid = '.$this->id;

+

+

+                dol_syslog(get_class($this)."::update_price", LOG_DEBUG);

+                $resql=$this->db->query($sql);

+                if (! $resql)

+                {

+                    $error++;

+                    $this->error=$this->db->lasterror();

+                    $this->errors[]=$this->db->lasterror();

+                }

+            }

+

+            if (! $error)

+            {

+                return 1;

+            }

+            else

+            {

+                return -1;

+            }

+        }

+        else

+        {

+            dol_print_error($this->db,'Bad request in update_price');

+            return -1;

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *	Add objects linked in llx_element_element.

+     *

+     *	@param		string	$origin		Linked element type

+     *	@param		int		$origin_id	Linked element id

+     *	@return		int					<=0 if KO, >0 if OK

+     *	@see		fetchObjectLinked, updateObjectLinked, deleteObjectLinked

+     */

+    function add_object_linked($origin=null, $origin_id=null)

+    {

+        // phpcs:enable

+        $origin = (! empty($origin) ? $origin : $this->origin);

+        $origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);

+

+        // Special case

+        if ($origin == 'order') $origin='commande';

+        if ($origin == 'invoice') $origin='facture';

+        if ($origin == 'invoice_template') $origin='facturerec';

+        if ($origin == 'supplierorder') $origin='order_supplier';

+        $this->db->begin();

+

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";

+        $sql.= "fk_source";

+        $sql.= ", sourcetype";

+        $sql.= ", fk_target";

+        $sql.= ", targettype";

+        $sql.= ") VALUES (";

+        $sql.= $origin_id;

+        $sql.= ", '".$this->db->escape($origin)."'";

+        $sql.= ", ".$this->id;

+        $sql.= ", '".$this->db->escape($this->element)."'";

+        $sql.= ")";

+

+        dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);

+        if ($this->db->query($sql))

+            {

+                $this->db->commit();

+                return 1;

+            }

+            else

+            {

+                $this->error=$this->db->lasterror();

+                $this->db->rollback();

+                return 0;

+            }

+    }

+

+    /**

+     *	Fetch array of objects linked to current object (object of enabled modules only). Links are loaded into

+     *		this->linkedObjectsIds array and

+     *		this->linkedObjects array if $loadalsoobjects = 1

+     *  Possible usage for parameters:

+     *  - all parameters empty -> we look all link to current object (current object can be source or target)

+     *  - source id+type -> will get target list linked to source

+     *  - target id+type -> will get source list linked to target

+     *  - source id+type + target type -> will get target list of the type

+     *  - target id+type + target source -> will get source list of the type

+     *

+     *	@param	int		$sourceid			Object source id (if not defined, id of object)

+     *	@param  string	$sourcetype			Object source type (if not defined, element name of object)

+     *	@param  int		$targetid			Object target id (if not defined, id of object)

+     *	@param  string	$targettype			Object target type (if not defined, elemennt name of object)

+     *	@param  string	$clause				'OR' or 'AND' clause used when both source id and target id are provided

+     *  @param  int		$alsosametype		0=Return only links to object that differs from source type. 1=Include also link to objects of same type.

+     *  @param  string	$orderby			SQL 'ORDER BY' clause

+     *  @param	int		$loadalsoobjects	Load also array this->linkedObjects (Use 0 to increase performances)

+     *	@return int							<0 if KO, >0 if OK

+     *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked

+     */

+    function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1,$orderby='sourcetype',$loadalsoobjects=1)

+    {

+        global $conf;

+

+        $this->linkedObjectsIds=array();

+        $this->linkedObjects=array();

+

+        $justsource=false;

+        $justtarget=false;

+        $withtargettype=false;

+        $withsourcetype=false;

+

+        if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))

+        {

+            $justsource=true;  // the source (id and type) is a search criteria

+            if (! empty($targettype)) $withtargettype=true;

+        }

+        if (! empty($targetid) && ! empty($targettype) && empty($sourceid))

+        {

+            $justtarget=true;  // the target (id and type) is a search criteria

+            if (! empty($sourcetype)) $withsourcetype=true;

+        }

+

+        $sourceid = (! empty($sourceid) ? $sourceid : $this->id);

+        $targetid = (! empty($targetid) ? $targetid : $this->id);

+        $sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);

+        $targettype = (! empty($targettype) ? $targettype : $this->element);

+

+        /*if (empty($sourceid) && empty($targetid))

+		 {

+		 dol_syslog('Bad usage of function. No source nor target id defined (nor as parameter nor as object id)', LOG_ERR);

+		 return -1;

+		 }*/

+

+        // Links between objects are stored in table element_element

+        $sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';

+        $sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';

+        $sql.= " WHERE ";

+        if ($justsource || $justtarget)

+        {

+            if ($justsource)

+            {

+                $sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";

+                if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";

+            }

+            else if ($justtarget)

+            {

+                $sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";

+                if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";

+            }

+        }

+        else

+        {

+            $sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";

+            $sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";

+        }

+        $sql .= ' ORDER BY '.$orderby;

+

+        dol_syslog(get_class($this)."::fetchObjectLink", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $num = $this->db->num_rows($resql);

+            $i = 0;

+            while ($i < $num)

+            {

+                $obj = $this->db->fetch_object($resql);

+                if ($justsource || $justtarget)

+                {

+                    if ($justsource)

+                    {

+                        $this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;

+                    }

+                    else if ($justtarget)

+                    {

+                        $this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;

+                    }

+                }

+                else

+                {

+                    if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)

+                    {

+                        $this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;

+                    }

+                    if ($obj->fk_target == $targetid && $obj->targettype == $targettype)

+                    {

+                        $this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;

+                    }

+                }

+                $i++;

+            }

+

+            if (! empty($this->linkedObjectsIds))

+            {

+                $tmparray = $this->linkedObjectsIds;

+                foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)

+                {

+                    // Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)

+                    $module = $element = $subelement = $objecttype;

+                    if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'

+                        && preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))

+                    {

+                        $module = $element = $regs[1];

+                        $subelement = $regs[2];

+                    }

+

+                    $classpath = $element.'/class';

+                    // To work with non standard classpath or module name

+                    if ($objecttype == 'facture')			{

+                        $classpath = 'compta/facture/class';

+                    }

+                    else if ($objecttype == 'facturerec')			{

+                        $classpath = 'compta/facture/class'; $module = 'facture';

+                    }

+                    else if ($objecttype == 'propal')			{

+                        $classpath = 'comm/propal/class';

+                    }

+                    else if ($objecttype == 'supplier_proposal')			{

+                        $classpath = 'supplier_proposal/class';

+                    }

+                    else if ($objecttype == 'shipping')			{

+                        $classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';

+                    }

+                    else if ($objecttype == 'delivery')			{

+                        $classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';

+                    }

+                    else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{

+                        $classpath = 'fourn/class'; $module = 'fournisseur';

+                    }

+                    else if ($objecttype == 'fichinter')			{

+                        $classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';

+                    }

+                    else if ($objecttype == 'subscription')			{

+                        $classpath = 'adherents/class'; $module = 'adherent';

+                    }

+

+                    // Set classfile

+                    $classfile = strtolower($subelement); $classname = ucfirst($subelement);

+

+                    if ($objecttype == 'order') {

+                        $classfile = 'commande'; $classname = 'Commande';

+                    }

+                    else if ($objecttype == 'invoice_supplier') {

+                        $classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';

+                    }

+                    else if ($objecttype == 'order_supplier')   {

+                        $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';

+                    }

+                    else if ($objecttype == 'supplier_proposal')   {

+                        $classfile = 'supplier_proposal'; $classname = 'SupplierProposal';

+                    }

+                    else if ($objecttype == 'facturerec')   {

+                        $classfile = 'facture-rec'; $classname = 'FactureRec';

+                    }

+                    else if ($objecttype == 'subscription')   {

+                        $classfile = 'subscription'; $classname = 'Subscription';

+                    }

+

+                    // Here $module, $classfile and $classname are set

+                    if (Globals::$conf->$module->enabled && (($element != $this->element) || $alsosametype)) {

+                        if ($loadalsoobjects)

+                        {

+                            dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');

+                            //print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);

+                            if (class_exists($classname))

+                            {

+                                foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element

+                                {

+                                    $object = new $classname($this->db);

+                                    $ret = $object->fetch($objectid);

+                                    if ($ret >= 0)

+                                    {

+                                        $this->linkedObjects[$objecttype][$i] = $object;

+                                    }

+                                }

+                            }

+                        }

+                    }

+                    else

+                    {

+                        unset($this->linkedObjectsIds[$objecttype]);

+                    }

+                }

+            }

+            return 1;

+        }

+        else

+        {

+            dol_print_error($this->db);

+            return -1;

+        }

+    }

+

+    /**

+     *	Update object linked of a current object

+     *

+     *	@param	int		$sourceid		Object source id

+     *	@param  string	$sourcetype		Object source type

+     *	@param  int		$targetid		Object target id

+     *	@param  string	$targettype		Object target type

+     *	@return							int	>0 if OK, <0 if KO

+     *	@see	add_object_linked, fetObjectLinked, deleteObjectLinked

+     */

+    function updateObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='')

+    {

+        $updatesource=false;

+        $updatetarget=false;

+

+        if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;

+        else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;

+

+        $sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";

+        if ($updatesource)

+        {

+            $sql.= "fk_source = ".$sourceid;

+            $sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";

+            $sql.= " WHERE fk_target = ".$this->id;

+            $sql.= " AND targettype = '".$this->db->escape($this->element)."'";

+        }

+        else if ($updatetarget)

+        {

+            $sql.= "fk_target = ".$targetid;

+            $sql.= ", targettype = '".$this->db->escape($targettype)."'";

+            $sql.= " WHERE fk_source = ".$this->id;

+            $sql.= " AND sourcetype = '".$this->db->escape($this->element)."'";

+        }

+

+        dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);

+        if ($this->db->query($sql))

+        {

+            return 1;

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            return -1;

+        }

+    }

+

+    /**

+     *	Delete all links between an object $this

+     *

+     *	@param	int		$sourceid		Object source id

+     *	@param  string	$sourcetype		Object source type

+     *	@param  int		$targetid		Object target id

+     *	@param  string	$targettype		Object target type

+     *  @param	int		$rowid			Row id of line to delete. If defined, other parameters are not used.

+     *	@return     					int	>0 if OK, <0 if KO

+     *	@see	add_object_linked, updateObjectLinked, fetchObjectLinked

+     */

+    function deleteObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='', $rowid='')

+    {

+        $deletesource=false;

+        $deletetarget=false;

+

+        if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;

+        else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;

+

+        $sourceid = (! empty($sourceid) ? $sourceid : $this->id);

+        $sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);

+        $targetid = (! empty($targetid) ? $targetid : $this->id);

+        $targettype = (! empty($targettype) ? $targettype : $this->element);

+

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";

+        $sql.= " WHERE";

+        if ($rowid > 0)

+        {

+            $sql.=" rowid = ".$rowid;

+        }

+        else

+        {

+            if ($deletesource)

+            {

+                $sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";

+                $sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";

+            }

+            else if ($deletetarget)

+            {

+                $sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";

+                $sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";

+            }

+            else

+            {

+                $sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";

+                $sql.= " OR";

+                $sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";

+            }

+        }

+

+        dol_syslog(get_class($this)."::deleteObjectLinked", LOG_DEBUG);

+        if ($this->db->query($sql))

+        {

+            return 1;

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            $this->errors[]=$this->error;

+            return -1;

+        }

+    }

+

+    /**

+     *      Set status of an object

+     *

+     *      @param	int		$status			Status to set

+     *      @param	int		$elementId		Id of element to force (use this->id by default)

+     *      @param	string	$elementType	Type of element to force (use this->table_element by default)

+     *      @param	string	$trigkey		Trigger key to use for trigger

+     *      @return int						<0 if KO, >0 if OK

+     */

+    function setStatut($status, $elementId=null, $elementType='', $trigkey='')

+    {

+        global $user,$langs,$conf;

+

+        $savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.

+

+        $elementId = (!empty($elementId)?$elementId:$this->id);

+        $elementTable = (!empty($elementType)?$elementType:$this->table_element);

+

+        $this->db->begin();

+

+        $fieldstatus="fk_statut";

+        if ($elementTable == 'facture_rec') $fieldstatus="suspended";

+        if ($elementTable == 'mailing') $fieldstatus="statut";

+        if ($elementTable == 'cronjob') $fieldstatus="status";

+        if ($elementTable == 'user') $fieldstatus="statut";

+        if ($elementTable == 'expensereport') $fieldstatus="fk_statut";

+        if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";

+

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;

+        $sql.= " SET ".$fieldstatus." = ".$status;

+        // If status = 1 = validated, update also fk_user_valid

+        if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;

+        $sql.= " WHERE rowid=".$elementId;

+

+        dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);

+        if ($this->db->query($sql))

+        {

+            $error = 0;

+

+            // Try autoset of trigkey

+            if (empty($trigkey))

+            {

+                if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

+                if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

+                if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

+                if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';

+                if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';

+                if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';

+            }

+

+            if ($trigkey)

+            {

+                // Appel des triggers

+                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

+                $interface=new Interfaces($this->db);

+                $result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf);

+                if ($result < 0) {

+                    $error++; $this->errors=$interface->errors;

+                }

+                // Fin appel triggers

+            }

+

+            if (! $error)

+            {

+                $this->db->commit();

+

+                if (empty($savElementId))    // If the element we update was $this (so $elementId is null)

+                {

+                    $this->statut = $status;

+                    $this->status = $status;

+                }

+

+                return 1;

+            }

+            else

+            {

+                $this->db->rollback();

+                dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);

+                return -1;

+            }

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            $this->db->rollback();

+            return -1;

+        }

+    }

+

+

+    /**

+     *  Load type of canvas of an object if it exists

+     *

+     *  @param      int		$id     Record id

+     *  @param      string	$ref    Record ref

+     *  @return		int				<0 if KO, 0 if nothing done, >0 if OK

+     */

+    function getCanvas($id=0,$ref='')

+    {

+        global $conf;

+

+        if (empty($id) && empty($ref)) return 0;

+        if (!empty(Globals::$conf->global->MAIN_DISABLE_CANVAS))

+            return 0;    // To increase speed. Not enabled by default.

+

+            // Clean parameters

+        $ref = trim($ref);

+

+        $sql = "SELECT rowid, canvas";

+        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;

+        $sql.= " WHERE entity IN (".getEntity($this->element).")";

+        if (! empty($id))  $sql.= " AND rowid = ".$id;

+        if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";

+

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $obj = $this->db->fetch_object($resql);

+            if ($obj)

+            {

+                $this->canvas   = $obj->canvas;

+                return 1;

+            }

+            else return 0;

+        }

+        else

+        {

+            dol_print_error($this->db);

+            return -1;

+        }

+    }

+

+

+    /**

+     * 	Get special code of a line

+     *

+     * 	@param	int		$lineid		Id of line

+     * 	@return	int					Special code

+     */

+    function getSpecialCode($lineid)

+    {

+        $sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+        $sql.= ' WHERE rowid = '.$lineid;

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $row = $this->db->fetch_row($resql);

+            return $row[0];

+        }

+    }

+

+    /**

+     *  Function to check if an object is used by others.

+     *  Check is done into this->childtables. There is no check into llx_element_element.

+     *

+     *  @param	int		$id			Force id of object

+     *  @return	int					<0 if KO, 0 if not used, >0 if already used

+     */

+    function isObjectUsed($id=0)

+    {

+        global $langs;

+

+        if (empty($id)) $id=$this->id;

+

+        // Check parameters

+        if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)

+        {

+            dol_print_error('Called isObjectUsed on a class with property this->childtables not defined');

+            return -1;

+        }

+

+        $arraytoscan = $this->childtables;

+        // For backward compatibility, we check if array is old format array('table1', 'table2', ...)

+        $tmparray=array_keys($this->childtables);

+        if (is_numeric($tmparray[0]))

+        {

+            $arraytoscan = array_flip($this->childtables);

+        }

+

+        // Test if child exists

+        $haschild=0;

+        foreach($arraytoscan as $table => $elementname)

+        {

+            //print $id.'-'.$table.'-'.$elementname.'<br>';

+            // Check if third party can be deleted

+            $sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;

+            $sql.= " WHERE ".$this->fk_element." = ".$id;

+            $resql=$this->db->query($sql);

+            if ($resql)

+            {

+                $obj=$this->db->fetch_object($resql);

+                if ($obj->nb > 0)

+                {

+                    $langs->load("errors");

+                    //print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;

+                    $haschild += $obj->nb;

+                    if (is_numeric($elementname))	// old usage

+                    {

+                        $this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);

+                    }

+                    else	// new usage: $elementname=Translation key

+                    {

+                        $this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));

+                    }

+                    break;    // We found at least one, we stop here

+                }

+            }

+            else

+            {

+                $this->errors[]=$this->db->lasterror();

+                return -1;

+            }

+        }

+        if ($haschild > 0)

+        {

+            $this->errors[]="ErrorRecordHasChildren";

+            return $haschild;

+        }

+        else return 0;

+    }

+

+    /**

+     *  Function to say how many lines object contains

+     *

+     *	@param	int		$predefined		-1=All, 0=Count free product/service only, 1=Count predefined product/service only, 2=Count predefined product, 3=Count predefined service

+     *  @return	int						<0 if KO, 0 if no predefined products, nb of lines with predefined products if found

+     */

+    function hasProductsOrServices($predefined=-1)

+    {

+        $nb=0;

+

+        foreach($this->lines as $key => $val)

+        {

+            $qualified=0;

+            if ($predefined == -1) $qualified=1;

+            if ($predefined == 1 && $val->fk_product > 0) $qualified=1;

+            if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;

+            if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;

+            if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;

+            if ($qualified) $nb++;

+        }

+        dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');

+        return $nb;

+    }

+

+    /**

+     * Function that returns the total amount HT of discounts applied for all lines.

+     *

+     * @return 	float

+     */

+    function getTotalDiscount()

+    {

+        $total_discount=0.00;

+

+        $sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";

+        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";

+        $sql.= " WHERE ".$this->fk_element." = ".$this->id;

+

+        dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $num=$this->db->num_rows($resql);

+            $i=0;

+            while ($i < $num)

+            {

+                $obj = $this->db->fetch_object($resql);

+

+                $pu_ht = $obj->pu_ht;

+                $qty= $obj->qty;

+                $total_ht = $obj->total_ht;

+

+                $total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));

+                $total_discount += $total_discount_line;

+

+                $i++;

+            }

+        }

+

+        //print $total_discount; exit;

+        return price2num($total_discount);

+    }

+

+

+    /**

+     * Return into unit=0, the calculated total of weight and volume of all lines * qty

+     * Calculate by adding weight and volume of each product line, so properties ->volume/volume_units/weight/weight_units must be loaded on line.

+     *

+     * @return  array                           array('weight'=>...,'volume'=>...)

+     */

+    function getTotalWeightVolume()

+    {

+        $totalWeight = 0;

+        $totalVolume = 0;

+        // defined for shipment only

+        $totalOrdered = '';

+        // defined for shipment only

+        $totalToShip = '';

+

+        foreach ($this->lines as $line)

+        {

+            if (isset($line->qty_asked))

+            {

+                if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''

+                $totalOrdered+=$line->qty_asked;    // defined for shipment only

+            }

+            if (isset($line->qty_shipped))

+            {

+                if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''

+                $totalToShip+=$line->qty_shipped;   // defined for shipment only

+            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

+            {

+                if (empty($totalToShip)) $totalToShip=0;

+                $totalToShip+=$line->qty;   // defined for reception only

+            }

+

+            // Define qty, weight, volume, weight_units, volume_units

+            if ($this->element == 'shipping') {

+                // for shipments

+                $qty = $line->qty_shipped ? $line->qty_shipped : 0;

+            }

+            else {

+                $qty = $line->qty ? $line->qty : 0;

+            }

+

+            $weight = $line->weight ? $line->weight : 0;

+            ($weight==0 && !empty($line->product->weight))? $weight=$line->product->weight: 0;

+            $volume = $line->volume ? $line->volume : 0;

+            ($volume==0 && !empty($line->product->volume))? $volume=$line->product->volume: 0;

+

+            $weight_units=$line->weight_units;

+            ($weight_units==0 && !empty($line->product->weight_units))? $weight_units=$line->product->weight_units: 0;

+            $volume_units=$line->volume_units;

+            ($volume_units==0 && !empty($line->product->volume_units))? $volume_units=$line->product->volume_units: 0;

+

+            $weightUnit=0;

+            $volumeUnit=0;

+            if (! empty($weight_units)) $weightUnit = $weight_units;

+            if (! empty($volume_units)) $volumeUnit = $volume_units;

+

+            if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''

+            if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''

+

+            //var_dump($line->volume_units);

+            if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

+            {

+                $trueWeightUnit=pow(10, $weightUnit);

+                $totalWeight += $weight * $qty * $trueWeightUnit;

+            }

+            else {

+        if ($weight_units == 99) {

+            // conversion 1 Pound = 0.45359237 KG

+            $trueWeightUnit = 0.45359237;

+            $totalWeight += $weight * $qty * $trueWeightUnit;

+        } elseif ($weight_units == 98) {

+            // conversion 1 Ounce = 0.0283495 KG

+            $trueWeightUnit = 0.0283495;

+            $totalWeight += $weight * $qty * $trueWeightUnit;

+        }

+        else

+                    $totalWeight += $weight * $qty;   // This may be wrong if we mix different units

+            }

+            if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

+            {

+                //print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;

+                $trueVolumeUnit=pow(10, $volumeUnit);

+                //print $line->volume;

+                $totalVolume += $volume * $qty * $trueVolumeUnit;

+            }

+            else

+            {

+                $totalVolume += $volume * $qty;   // This may be wrong if we mix different units

+            }

+        }

+

+        return array('weight'=>$totalWeight, 'volume'=>$totalVolume, 'ordered'=>$totalOrdered, 'toship'=>$totalToShip);

+    }

+

+

+    /**

+     *	Set extra parameters

+     *

+     *	@return	int      <0 if KO, >0 if OK

+     */

+    function setExtraParameters()

+    {

+        $this->db->begin();

+

+        $extraparams = (! empty($this->extraparams) ? json_encode($this->extraparams) : null);

+

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+        $sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");

+        $sql.= " WHERE rowid = ".$this->id;

+

+        dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if (! $resql)

+        {

+            $this->error=$this->db->lasterror();

+            $this->db->rollback();

+            return -1;

+        }

+        else

+        {

+            $this->db->commit();

+            return 1;

+        }

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *    Return incoterms informations

+     *    TODO Use a cache for label get

+     *

+     *    @return	string	incoterms info

+     */

+    function display_incoterms()

+    {

+        // phpcs:enable

+        $out = '';

+        $this->libelle_incoterms = '';

+        if (!empty($this->fk_incoterms))

+        {

+            $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;

+            $result = $this->db->query($sql);

+            if ($result)

+            {

+                $res = $this->db->fetch_object($result);

+                $out .= $res->code;

+            }

+        }

+

+        $out .= (($res->code && $this->location_incoterms)?' - ':'').$this->location_incoterms;

+

+        return $out;

+    }

+

+    /**

+     *    Return incoterms informations for pdf display

+     *

+     *    @return	string		incoterms info

+     */

+    function getIncotermsForPDF()

+    {

+        $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $num = $this->db->num_rows($resql);

+            if ($num > 0)

+            {

+                $res = $this->db->fetch_object($resql);

+                return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;

+            }

+            else

+            {

+                return '';

+            }

+        }

+        else

+        {

+            $this->errors[] = $this->db->lasterror();

+            return false;

+        }

+    }

+

+    /**

+     *    Define incoterms values of current object

+     *

+     *    @param	int		$id_incoterm     Id of incoterm to set or '' to remove

+     * 	  @param 	string  $location		 location of incoterm

+     *    @return	int     		<0 if KO, >0 if OK

+     */

+    function setIncoterms($id_incoterm, $location)

+    {

+        if ($this->id && $this->table_element)

+        {

+            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+            $sql.= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");

+            $sql.= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");

+            $sql.= " WHERE rowid = " . $this->id;

+            dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);

+            $resql=$this->db->query($sql);

+            if ($resql)

+            {

+                $this->fk_incoterms = $id_incoterm;

+                $this->location_incoterms = $location;

+

+                $sql = 'SELECT libelle FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;

+                $res = $this->db->query($sql);

+                if ($res)

+                {

+                    $obj = $this->db->fetch_object($res);

+                    $this->libelle_incoterms = $obj->libelle;

+                }

+                return 1;

+            }

+            else

+            {

+                $this->errors[] = $this->db->lasterror();

+                return -1;

+            }

+        }

+        else return -1;

+    }

+

+

+    // --------------------

+    // TODO: All functions here must be redesigned and moved as they are not business functions but output functions

+    // --------------------

+

+    /* This is to show add lines */

+

+    /**

+     *	Show add free and predefined products/services form

+     *

+     *  @param	int		        $dateSelector       1=Show also date range input fields

+     *  @param	Societe			$seller				Object thirdparty who sell

+     *  @param	Societe			$buyer				Object thirdparty who buy

+     *	@return	void

+     */

+    function formAddObjectLine($dateSelector, $seller, $buyer)

+    {

+        global $conf,$user,$langs,$object,$hookmanager;

+        global $form,$bcnd,$var;

+

+        // Line extrafield

+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

+        $extrafieldsline = new AlExtraFields($this->db);

+        $extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);

+

+        // Output template part (modules that overwrite templates must declare this into descriptor)

+        // Use global variables + $dateSelector + $seller and $buyer

+        $dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

+        foreach($dirtpls as $reldir)

+        {

+            $tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');

+            if (empty(Globals::$conf->file->strict_mode)) {

+                $res=@include $tpl;

+            } else {

+                $res=include $tpl; // for debug

+            }

+            if ($res) break;

+        }

+    }

+

+

+

+    /* This is to show array of line of details */

+

+

+    /**

+     *	Return HTML table for object lines

+     *	TODO Move this into an output class file (htmlline.class.php)

+     *	If lines are into a template, title must also be into a template

+     *	But for the moment we don't know if it's possible as we keep a method available on overloaded objects.

+     *

+     *	@param	string		$action				Action code

+     *	@param  string		$seller            	Object of seller third party

+     *	@param  string  	$buyer             	Object of buyer third party

+     *	@param	int			$selected		   	Object line selected

+     *	@param  int	    	$dateSelector      	1=Show also date range input fields

+     *	@return	void

+     */

+    function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)

+    {

+        global $conf, $hookmanager, $langs, $user;

+        // TODO We should not use global var for this !

+        global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;

+

+        // Define usemargins

+        $usemargins=0;

+        if (!empty(Globals::$conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande')))

+            $usemargins = 1;

+

+        $num = count($this->lines);

+

+        // Line extrafield

+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

+        $extrafieldsline = new AlExtraFields($this->db);

+        $extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);

+

+        $parameters = array('num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

+        $reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

+        if (empty($reshook))

+        {

+            // Title line

+            print "<thead>\n";

+

+            print '<tr class="liste_titre nodrag nodrop">';

+

+            // Adds a line numbering column

+            if (!empty(Globals::$conf->global->MAIN_VIEW_LINE_NUMBER))

+                print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';

+

+            // Description

+            print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';

+

+            if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier')

+            {

+                print '<td class="linerefsupplier"><span id="title_fourn_ref">'.$langs->trans("SupplierRef").'</span></td>';

+            }

+

+            // VAT

+            print '<td class="linecolvat" align="right" width="80">'.$langs->trans('VAT').'</td>';

+

+            // Price HT

+            print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';

+

+            // Multicurrency

+            if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

+                print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';

+

+            if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';

+

+            // Qty

+            print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';

+

+            if (Globals::$conf->global->PRODUCT_USE_UNITS) {

+                print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';

+            }

+

+            // Reduction short

+            print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';

+

+            if ($this->situation_cycle_ref) {

+                print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';

+            }

+

+            if ($usemargins && !empty(Globals::$conf->margin->enabled) && empty($user->societe_id)) {

+                if (!empty($user->rights->margins->creer))

+                {

+                    if (Globals::$conf->global->MARGIN_TYPE == "1")

+                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';

+                    else

+                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';

+                }

+

+                if (!empty(Globals::$conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)

+                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';

+                if (!empty(Globals::$conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)

+                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';

+            }

+

+            // Total HT

+            print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';

+

+            // Multicurrency

+            if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

+                print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';

+

+            if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';

+

+            print '<td class="linecoledit"></td>';  // No width to allow autodim

+

+            print '<td class="linecoldelete" width="10"></td>';

+

+            print '<td class="linecolmove" width="10"></td>';

+

+            if($action == 'selectlines')

+            {

+                print '<td class="linecolcheckall" align="center">';

+                print '<input type="checkbox" class="linecheckboxtoggle" />';

+                print '<script type="text/javascript">$(document).ready(function() {$(".linecheckboxtoggle").click(function() {var checkBoxes = $(".linecheckbox");checkBoxes.prop("checked", this.checked);})});</script>';

+                print '</td>';

+            }

+

+            print "</tr>\n";

+            print "</thead>\n";

+        }

+

+        $var = true;

+        $i	 = 0;

+

+        print "<tbody>\n";

+        foreach ($this->lines as $line)

+        {

+            //Line extrafield

+            $line->fetch_optionals();

+

+            //if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))

+            if (is_object($hookmanager))   // Old code is commented on preceding line.

+            {

+                if (empty($line->fk_parent_line))

+                {

+                    $parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

+                    $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+                }

+                else

+                {

+                    $parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);

+                    $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+                }

+            }

+            if (empty($reshook))

+            {

+                $this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline);

+            }

+

+            $i++;

+        }

+        print "</tbody>\n";

+    }

+

+    /**

+     *	Return HTML content of a detail line

+     *	TODO Move this into an output class file (htmlline.class.php)

+     *

+     *	@param	string		$action				GET/POST action

+     *	@param CommonObjectLine $line		       	Selected object line to output

+     *	@param  string	    $var               	Is it a an odd line (true)

+     *	@param  int		    $num               	Number of line (0)

+     *	@param  int		    $i					I

+     *	@param  int		    $dateSelector      	1=Show also date range input fields

+     *	@param  string	    $seller            	Object of seller third party

+     *	@param  string	    $buyer             	Object of buyer third party

+     *	@param	int			$selected		   	Object line selected

+     *  @param  int			$extrafieldsline	Object of extrafield line attribute

+     *	@return	void

+     */

+    function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0)

+    {

+        global $conf,$langs,$user,$object,$hookmanager;

+        global $form,$bc,$bcdd;

+        global $object_rights, $disableedit, $disablemove, $disableremove;   // TODO We should not use global var for this !

+

+        $object_rights = $this->getRights();

+

+        $element=$this->element;

+

+        $text=''; $description=''; $type=0;

+

+        // Show product and description

+        $type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);

+        // Try to enhance type detection using date_start and date_end for free lines where type was not saved.

+        if (! empty($line->date_start)) $type=1; // deprecated

+        if (! empty($line->date_end)) $type=1; // deprecated

+

+        // Ligne en mode visu

+        if ($action != 'editline' || $selected != $line->id)

+        {

+            // Product

+            if ($line->fk_product > 0)

+            {

+                $product_static = new Product($this->db);

+                $product_static->fetch($line->fk_product);

+

+                $product_static->ref = $line->ref; //can change ref in hook

+                $product_static->label = $line->label; //can change label in hook

+                $text=$product_static->getNomUrl(1);

+

+                // Define output language and label

+                if (!empty(Globals::$conf->global->MAIN_MULTILANGS)) {

+                    if (! is_object($this->thirdparty))

+                    {

+                        dol_print_error('','Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');

+                        return;

+                    }

+

+                    $prod = new Product($this->db);

+                    $prod->fetch($line->fk_product);

+

+                    $outputlangs = $langs;

+                    $newlang='';

+                    if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');

+                    if (!empty(Globals::$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang))

+                        $newlang = $this->thirdparty->default_lang;  // For language to language of customer

+                    if (! empty($newlang))

+                    {

+                        $outputlangs = new Translate("",$conf);

+                        $outputlangs->setDefaultLang($newlang);

+                    }

+

+                    $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;

+                }

+                else

+                {

+                    $label = $line->product_label;

+                }

+

+                $text.= ' - '.(! empty($line->label)?$line->label:$label);

+                $description .= (!empty(Globals::$conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.

+            }

+

+            $line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');

+

+            // Output template part (modules that overwrite templates must declare this into descriptor)

+            // Use global variables + $dateSelector + $seller and $buyer

+            $dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

+            foreach($dirtpls as $reldir)

+            {

+                $tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');

+                if (empty(Globals::$conf->file->strict_mode)) {

+                    $res=@include $tpl;

+                } else {

+                    $res=include $tpl; // for debug

+                }

+                if ($res) break;

+            }

+        }

+

+        // Ligne en mode update

+        if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)

+        {

+            $label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));

+            $placeholder=' placeholder="'.$langs->trans("Label").'"';

+

+            $line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');

+

+            // Output template part (modules that overwrite templates must declare this into descriptor)

+            // Use global variables + $dateSelector + $seller and $buyer

+            $dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

+            foreach($dirtpls as $reldir)

+            {

+                $tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');

+                if (empty(Globals::$conf->file->strict_mode)) {

+                    $res=@include $tpl;

+                } else {

+                    $res=include $tpl; // for debug

+                }

+                if ($res) break;

+            }

+        }

+    }

+

+

+    /* This is to show array of line of details of source object */

+

+

+    /**

+     * 	Return HTML table table of source object lines

+     *  TODO Move this and previous function into output html class file (htmlline.class.php).

+     *  If lines are into a template, title must also be into a template

+     *  But for the moment we don't know if it's possible, so we keep the method available on overloaded objects.

+     *

+     *	@param	string		$restrictlist		''=All lines, 'services'=Restrict to services only

+     *  @return	void

+     */

+    function printOriginLinesList($restrictlist='')

+    {

+        global $langs, $hookmanager, $conf;

+

+        print '<tr class="liste_titre">';

+        print '<td>'.$langs->trans('Ref').'</td>';

+        print '<td>'.$langs->trans('Description').'</td>';

+        print '<td align="right">'.$langs->trans('VATRate').'</td>';

+        print '<td align="right">'.$langs->trans('PriceUHT').'</td>';

+        if (!empty(Globals::$conf->multicurrency->enabled))

+            print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';

+        print '<td align="right">'.$langs->trans('Qty').'</td>';

+        if (Globals::$conf->global->PRODUCT_USE_UNITS) {

+            print '<td align="left">'.$langs->trans('Unit').'</td>';

+        }

+        print '<td align="right">'.$langs->trans('ReductionShort').'</td></tr>';

+

+        $var = true;

+        $i	 = 0;

+

+        if (! empty($this->lines))

+        {

+            foreach ($this->lines as $line)

+            {

+                if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))

+                {

+                    if (empty($line->fk_parent_line))

+                    {

+                        $parameters=array('line'=>$line,'var'=>$var,'i'=>$i);

+                        $action='';

+                        $hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks

+                    }

+                }

+                else

+                {

+                    $this->printOriginLine($line, $var, $restrictlist);

+                }

+

+                $i++;

+            }

+        }

+    }

+

+    /**

+     * 	Return HTML with a line of table array of source object lines

+     *  TODO Move this and previous function into output html class file (htmlline.class.php).

+     *  If lines are into a template, title must also be into a template

+     *  But for the moment we don't know if it's possible as we keep a method available on overloaded objects.

+     *

+     * 	@param	CommonObjectLine	$line				Line

+     * 	@param	string				$var				Var

+     *	@param	string				$restrictlist		''=All lines, 'services'=Restrict to services only (strike line if not)

+     * 	@return	void

+     */

+    function printOriginLine($line, $var, $restrictlist='')

+    {

+        global $langs, $conf;

+

+        //var_dump($line);

+        if (!empty($line->date_start))

+        {

+            $date_start=$line->date_start;

+        }

+        else

+        {

+            $date_start=$line->date_debut_prevue;

+            if ($line->date_debut_reel) $date_start=$line->date_debut_reel;

+        }

+        if (!empty($line->date_end))

+        {

+            $date_end=$line->date_end;

+        }

+        else

+        {

+            $date_end=$line->date_fin_prevue;

+            if ($line->date_fin_reel) $date_end=$line->date_fin_reel;

+        }

+

+        $this->tpl['label'] = '';

+        if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');

+

+        if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object

+        {

+            $discount=new DiscountAbsolute($this->db);

+            $discount->fk_soc = $this->socid;

+            $this->tpl['label'].= $discount->getNomUrl(0,'discount');

+        }

+        else if (! empty($line->fk_product))

+        {

+            $productstatic = new Product($this->db);

+            $productstatic->id = $line->fk_product;

+            $productstatic->ref = $line->ref;

+            $productstatic->type = $line->fk_product_type;

+            if(empty($productstatic->ref)){

+                $line->fetch_product();

+                $productstatic = $line->product;

+            }

+			

+            $this->tpl['label'].= $productstatic->getNomUrl(1);

+            $this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);

+            // Dates

+            if ($line->product_type == 1 && ($date_start || $date_end))

+            {

+                $this->tpl['label'].= get_date_range($date_start,$date_end);

+            }

+        }

+        else

+        {

+            $this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));

+            if (!empty($line->desc)) {

+                $this->tpl['label'].=$line->desc;

+            }else {

+                $this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');

+            }

+			

+            // Dates

+            if ($line->product_type == 1 && ($date_start || $date_end))

+            {

+                $this->tpl['label'].= get_date_range($date_start,$date_end);

+            }

+        }

+

+        if (! empty($line->desc))

+        {

+            if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object

+            {

+                $discount=new DiscountAbsolute($this->db);

+                $discount->fetch($line->fk_remise_except);

+                $this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));

+            }

+            elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object

+            {

+                $discount=new DiscountAbsolute($this->db);

+                $discount->fetch($line->fk_remise_except);

+                $this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));

+            }

+            elseif ($line->desc == '(EXCESS RECEIVED)')

+            {

+                $discount=new DiscountAbsolute($this->db);

+                $discount->fetch($line->fk_remise_except);

+                $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));

+            }

+            elseif ($line->desc == '(EXCESS PAID)')

+            {

+                $discount=new DiscountAbsolute($this->db);

+                $discount->fetch($line->fk_remise_except);

+                $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));

+            }

+            else

+            {

+                $this->tpl['description'] = dol_trunc($line->desc,60);

+            }

+        }

+        else

+        {

+            $this->tpl['description'] = '&nbsp;';

+        }

+

+        // VAT Rate

+        $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);

+        $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';

+        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';

+

+        $this->tpl['price'] = price($line->subprice);

+        $this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);

+        $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';

+        if (Globals::$conf->global->PRODUCT_USE_UNITS)

+            $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));

+        $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';

+

+        // Is the line strike or not

+        $this->tpl['strike']=0;

+        if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;

+

+        // Output template part (modules that overwrite templates must declare this into descriptor)

+        // Use global variables + $dateSelector + $seller and $buyer

+        $dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

+        foreach($dirtpls as $reldir)

+        {

+            $tpl = dol_buildpath($reldir.'/originproductline.tpl.php');

+            if (empty(Globals::$conf->file->strict_mode)) {

+                $res=@include $tpl;

+            } else {

+                $res=include $tpl; // for debug

+            }

+            if ($res) break;

+        }

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *	Add resources to the current object : add entry into llx_element_resources

+     *	Need $this->element & $this->id

+     *

+     *	@param		int		$resource_id		Resource id

+     *	@param		string	$resource_type		'resource'

+     *	@param		int		$busy				Busy or not

+     *	@param		int		$mandatory			Mandatory or not

+     *	@return		int							<=0 if KO, >0 if OK

+     */

+    function add_element_resource($resource_id, $resource_type, $busy=0, $mandatory=0)

+    {

+        // phpcs:enable

+        $this->db->begin();

+

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";

+        $sql.= "resource_id";

+        $sql.= ", resource_type";

+        $sql.= ", element_id";

+        $sql.= ", element_type";

+        $sql.= ", busy";

+        $sql.= ", mandatory";

+        $sql.= ") VALUES (";

+        $sql.= $resource_id;

+        $sql.= ", '".$this->db->escape($resource_type)."'";

+        $sql.= ", '".$this->db->escape($this->id)."'";

+        $sql.= ", '".$this->db->escape($this->element)."'";

+        $sql.= ", '".$this->db->escape($busy)."'";

+        $sql.= ", '".$this->db->escape($mandatory)."'";

+        $sql.= ")";

+

+        dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);

+        if ($this->db->query($sql))

+        {

+            $this->db->commit();

+            return 1;

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            $this->db->rollback();

+            return  0;

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *    Delete a link to resource line

+     *

+     *    @param	int		$rowid			Id of resource line to delete

+     *    @param	int		$element		element name (for trigger) TODO: use $this->element into commonobject class

+     *    @param	int		$notrigger		Disable all triggers

+     *    @return   int						>0 if OK, <0 if KO

+     */

+    function delete_resource($rowid, $element, $notrigger=0)

+    {

+        // phpcs:enable

+        global $user;

+

+        $this->db->begin();

+

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";

+        $sql.= " WHERE rowid=".$rowid;

+

+        dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);

+

+        $resql=$this->db->query($sql);

+        if (! $resql)

+        {

+            $this->error=$this->db->lasterror();

+            $this->db->rollback();

+            return -1;

+        }

+        else

+        {

+            if (! $notrigger)

+            {

+                $result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);

+                if ($result < 0) { $this->db->rollback(); return -1; }

+            }

+            $this->db->commit();

+            return 1;

+        }

+    }

+

+

+    /**

+     * Overwrite magic function to solve problem of cloning object that are kept as references

+     *

+     * @return void

+     */

+    function __clone()

+    {

+        // Force a copy of this->lines, otherwise it will point to same object.

+        if (isset($this->lines) && is_array($this->lines))

+        {

+            $nboflines=count($this->lines);

+            for($i=0; $i < $nboflines; $i++)

+            {

+                $this->lines[$i] = clone $this->lines[$i];

+            }

+        }

+    }

+

+    /**

+     * Common function for all objects extending CommonObject for generating documents

+     *

+     * @param 	string 		$modelspath 	Relative folder where generators are placed

+     * @param 	string 		$modele 		Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf') for example.

+     * @param 	Translate 	$outputlangs 	Output language to use

+     * @param 	int 		$hidedetails 	1 to hide details. 0 by default

+     * @param 	int 		$hidedesc 		1 to hide product description. 0 by default

+     * @param 	int 		$hideref 		1 to hide product reference. 0 by default

+     * @param   null|array  $moreparams     Array to provide more information

+     * @return 	int 						>0 if OK, <0 if KO

+     * @see	addFileIntoDatabaseIndex

+     */

+    protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams=null)

+    {

+        global $conf, $langs, $user;

+

+        $srctemplatepath='';

+

+        // Increase limit for PDF build

+        $err=error_reporting();

+        error_reporting(0);

+        @set_time_limit(120);

+        error_reporting($err);

+

+        // If selected model is a filename template (then $modele="modelname" or "modelname:filename")

+        $tmp=explode(':',$modele,2);

+        if (! empty($tmp[1]))

+        {

+            $modele=$tmp[0];

+            $srctemplatepath=$tmp[1];

+        }

+

+        // Search template files

+        $file=''; $classname=''; $filefound=0;

+        $dirmodels=array('/');

+        if (is_array(Globals::$conf->modules_parts['models']))

+            $dirmodels = array_merge($dirmodels, Globals::$conf->modules_parts['models']);

+        foreach($dirmodels as $reldir)

+        {

+            foreach(array('doc','pdf') as $prefix)

+            {

+                if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php

+                else $file = $prefix."_".$modele.".modules.php";

+

+                // On verifie l'emplacement du modele

+                $file=dol_buildpath($reldir.$modelspath.$file,0);

+                if (file_exists($file))

+                {

+                    $filefound=1;

+                    $classname=$prefix.'_'.$modele;

+                    break;

+                }

+            }

+            if ($filefound) break;

+        }

+

+        // If generator was found

+        if ($filefound)

+        {

+            global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db

+

+            require_once $file;

+

+            $obj = new $classname($this->db);

+

+            // If generator is ODT, we must have srctemplatepath defined, if not we set it.

+            if ($obj->type == 'odt' && empty($srctemplatepath))

+            {

+                $varfortemplatedir=$obj->scandir;

+                if ($varfortemplatedir && !empty(Globals::$conf->global->$varfortemplatedir)) {

+                    $dirtoscan = Globals::$conf->global->$varfortemplatedir;

+

+                    $listoffiles=array();

+

+                    // Now we add first model found in directories scanned

+                    $listofdir=explode(',',$dirtoscan);

+                    foreach($listofdir as $key => $tmpdir)

+                    {

+                        $tmpdir=trim($tmpdir);

+                        $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);

+                        if (! $tmpdir) { unset($listofdir[$key]); continue; }

+                        if (is_dir($tmpdir))

+                        {

+                            $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);

+                            if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);

+                        }

+                    }

+

+                    if (count($listoffiles))

+                    {

+                        foreach($listoffiles as $record)

+                        {

+                            $srctemplatepath=$record['fullname'];

+                            break;

+                        }

+                    }

+                }

+

+                if (empty($srctemplatepath))

+                {

+                    $this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';

+                    return -1;

+                }

+            }

+

+            if ($obj->type == 'odt' && ! empty($srctemplatepath))

+            {

+                if (! dol_is_file($srctemplatepath))

+                {

+                    $this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';

+                    return -1;

+                }

+            }

+

+            // 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 (in_array(get_class($this), array('Adherent')))

+            {

+                $arrayofrecords = array();   // The write_file of templates of adherent class need this var

+                $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);

+            }

+            else

+            {

+                $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);

+            }

+            // After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.

+

+            if ($resultwritefile > 0)

+            {

+                $outputlangs->charset_output=$sav_charset_output;

+

+                // We delete old preview

+                require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+                dol_delete_preview($this);

+

+                // Index file in database

+                if (! empty($obj->result['fullpath']))

+                {

+                    $destfull = $obj->result['fullpath'];

+                    $upload_dir = dirname($destfull);

+                    $destfile = basename($destfull);

+                    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);

+

+                    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir

+                    {

+                        $filename = basename($destfile);

+                        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);

+                        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);

+

+                        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

+                        $ecmfile=new EcmFiles($this->db);

+                        $result = $ecmfile->fetch(0, '', ($rel_dir?$rel_dir.'/':'').$filename);

+

+                        // Set the public "share" key

+                        $setsharekey = false;

+                        if ($this->element == 'propal')

+                        {

+                            $useonlinesignature = Globals::$conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok

+                            if ($useonlinesignature) $setsharekey=true;

+                            if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD))

+                                $setsharekey = true;

+                        }

+                        if ($this->element == 'commande' && !empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))

+                            $setsharekey = true;

+                        if ($this->element == 'facture' && !empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))

+                            $setsharekey = true;

+                        if ($this->element == 'bank_account' && !empty(Globals::$conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD))

+                            $setsharekey = true;

+

+                        if ($setsharekey)

+                        {

+                            if (empty($ecmfile->share))	// Because object not found or share not set yet

+                            {

+                                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

+                                $ecmfile->share = getRandomPassword(true);

+                            }

+                        }

+

+                        if ($result > 0)

+                        {

+                            $ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content

+                            $ecmfile->fullpath_orig = '';

+                            $ecmfile->gen_or_uploaded = 'generated';

+                            $ecmfile->description = '';    // indexed content

+                            $ecmfile->keyword = '';        // keyword content

+                            $result = $ecmfile->update($user);

+                            if ($result < 0)

+                            {

+                                setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

+                            }

+                        }

+                        else

+                        {

+                            $ecmfile->entity = Globals::$conf->entity;

+                            $ecmfile->filepath = $rel_dir;

+                            $ecmfile->filename = $filename;

+                            $ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content

+                            $ecmfile->fullpath_orig = '';

+                            $ecmfile->gen_or_uploaded = 'generated';

+                            $ecmfile->description = '';    // indexed content

+                            $ecmfile->keyword = '';        // keyword content

+                            $ecmfile->src_object_type = $this->table_element;

+                            $ecmfile->src_object_id   = $this->id;

+

+                            $result = $ecmfile->create($user);

+                            if ($result < 0)

+                            {

+                                setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

+                            }

+                        }

+

+                        /*$this->result['fullname']=$destfull;

+						$this->result['filepath']=$ecmfile->filepath;

+						$this->result['filename']=$ecmfile->filename;*/

+                        //var_dump($obj->update_main_doc_field);exit;

+

+                        // Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)

+                        $update_main_doc_field=0;

+                        if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;

+                        if ($update_main_doc_field && ! empty($this->table_element))

+                        {

+                            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";

+                            $sql.= ' WHERE rowid = '.$this->id;

+                            $resql = $this->db->query($sql);

+                            if (! $resql) dol_print_error($this->db);

+                        }

+                    }

+                }

+                else

+                {

+                    dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);

+                }

+

+                // Success in building document. We build meta file.

+                dol_meta_create($this);

+

+                return 1;

+            }

+            else

+            {

+                $outputlangs->charset_output=$sav_charset_output;

+                dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);

+                return -1;

+            }

+        }

+        else

+        {

+            $this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);

+            dol_print_error('',$this->error);

+            return -1;

+        }

+    }

+

+    /**

+     *  Build thumb

+     *  @TODO Move this into files.lib.php

+     *

+     *  @param      string	$file           Path file in UTF8 to original file to create thumbs from.

+     *	@return		void

+     */

+    function addThumbs($file)

+    {

+        global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;

+

+        require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...

+

+        $file_osencoded=dol_osencode($file);

+        if (file_exists($file_osencoded))

+        {

+            // Create small thumbs for company (Ratio is near 16/9)

+            // Used on logon for example

+            vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality);

+

+            // Create mini thumbs for company (Ratio is near 16/9)

+            // Used on menu or for setup page for example

+            vignette($file_osencoded, $maxwidthmini, $maxheightmini, '_mini', $quality);

+        }

+    }

+

+

+    /* Functions common to commonobject and commonobjectline */

+

+    /* For default values */

+

+    /**

+     * Return the default value to use for a field when showing the create form of object.

+     * Return values in this order:

+     * 1) If parameter is available into POST, we return it first.

+     * 2) If not but an alternate value was provided as parameter of function, we return it.

+     * 3) If not but a constant Globals::$conf->global->OBJECTELEMENT_FIELDNAME is set, we return it (It is better to use the dedicated table).

+     * 4) Return value found into database (TODO No yet implemented)

+     *

+     * @param   string              $fieldname          Name of field

+     * @param   string              $alternatevalue     Alternate value to use

+     * @return  string|string[]                         Default value (can be an array if the GETPOST return an array)

+     **/

+    function getDefaultCreateValueFor($fieldname, $alternatevalue=null)

+    {

+        global $conf, $_POST;

+

+        // If param here has been posted, we use this value first.

+        if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);

+

+        if (isset($alternatevalue)) return $alternatevalue;

+

+        $newelement=$this->element;

+        if ($newelement == 'facture') $newelement='invoice';

+        if ($newelement == 'commande') $newelement='order';

+        if (empty($newelement))

+        {

+            dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);

+            return '';

+        }

+

+        $keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);

+        //var_dump($keyforfieldname);

+        if (isset(Globals::$conf->global->$keyforfieldname))

+            return Globals::$conf->global->$keyforfieldname;

+

+        // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname

+    }

+

+

+    /* For triggers */

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     * Call trigger based on this instance.

+     * Some context information may also be provided into array property this->context.

+     * NB:  Error from trigger are stacked in interface->errors

+     * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction.

+     *

+     * @param   string    $trigger_name   trigger's name to execute

+     * @param   User      $user           Object user

+     * @return  int                       Result of run_triggers

+     */

+    function call_trigger($trigger_name, $user)

+    {

+        // phpcs:enable

+        global $langs,$conf;

+

+        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

+        $interface=new Interfaces($this->db);

+        $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);

+

+        if ($result < 0)

+        {

+            if (!empty($this->errors))

+            {

+                $this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.

+            }

+            else

+            {

+                $this->errors=$interface->errors;

+            }

+        }

+        return $result;

+    }

+

+

+    /* Functions for extrafields */

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *  Function to get extra fields of an object into $this->array_options

+     *  This method is in most cases called by method fetch of objects but you can call it separately.

+     *

+     *  @param	int		$rowid			Id of line. Use the id of object if not defined. Deprecated. Function must be called without parameters.

+     *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.

+     *  @return	int						<0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded

+     */

+    function fetch_optionals($rowid=null, $optionsArray=null)

+    {

+        // phpcs:enable

+        if (empty($rowid)) {

+            $rowid = $this->id;

+        }

+

+        // To avoid SQL errors. Probably not the better solution though

+        if (!$this->table_element) {

+            return 0;

+        }

+

+        $this->array_options=array();

+

+        if (! is_array($optionsArray))

+        {

+            // If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.

+            // TODO Use of existing $extrafield is not yet ready (must mutualize code that use extrafields in form first)

+            // global $extrafields;

+            //if (! is_object($extrafields))

+            //{

+                // require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

+            $extrafields = new AlExtraFields();

+            //}

+

+            // Load array of extrafields for elementype = $this->table_element

+            if (empty($extrafields->attributes[$this->table_element]['loaded']))

+            {

+                $extrafields->fetch_name_optionals_label($this->table_element);

+            }

+            $optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);

+        }

+        else

+        {

+            // global $extrafields;

+            dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);

+        }

+

+        $table_element = $this->table_element;

+        if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+

+        // Request to get complementary values

+        if (is_array($optionsArray) && count($optionsArray) > 0)

+        {

+            $sql = "SELECT rowid";

+            foreach ($optionsArray as $name => $label)

+            {

+                if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')

+                {

+                    $sql.= ", ".$name;

+                }

+            }

+            $sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";

+            $sql.= " WHERE fk_object = ".$rowid;

+

+            //dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose

+            $resql=$this->db->query($sql);

+            if ($resql)

+            {

+                $this->array_options = array();

+                $numrows=$this->db->num_rows($resql);

+                if ($numrows)

+                {

+                    $tab = $this->db->fetch_array($resql);

+

+                    foreach ($tab as $key => $value)

+                    {

+                        // Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)

+                        if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))

+                        {

+                            // we can add this attribute to object

+                            if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))

+                            {

+                                //var_dump($extrafields->attributes[$this->table_element]['type'][$key]);

+                                $this->array_options["options_".$key]=$this->db->jdate($value);

+                            }

+                            else

+                            {

+                                $this->array_options["options_".$key]=$value;

+                            }

+

+                            //var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);

+                        }

+                    }

+                }

+

+                $this->db->free($resql);

+

+                if ($numrows) return $numrows;

+                else return 0;

+            }

+            else

+            {

+                dol_print_error($this->db);

+                return -1;

+            }

+        }

+        return 0;

+    }

+

+    /**

+     *	Delete all extra fields values for the current object.

+     *

+     *  @return	int		<0 if KO, >0 if OK

+     */

+    function deleteExtraFields()

+    {

+        $this->db->begin();

+

+        $table_element = $this->table_element;

+        if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+

+        $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

+        dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);

+        $resql=$this->db->query($sql_del);

+        if (! $resql)

+        {

+            $this->error=$this->db->lasterror();

+            $this->db->rollback();

+            return -1;

+        }

+        else

+        {

+            $this->db->commit();

+            return 1;

+        }

+    }

+

+    /**

+     *	Add/Update all extra fields values for the current object.

+     *  Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)

+     *  This function delete record with all extrafields and insert them again from the array $this->array_options.

+     *

+     *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)

+     *  @param	User		$userused		Object user

+     *  @return int 						-1=error, O=did nothing, 1=OK

+     *  @see updateExtraField, setValueFrom

+     */

+    function insertExtraFields($trigger='', $userused=null)

+    {

+        global $conf,$langs,$user;

+

+        if (empty($userused)) $userused=$user;

+

+        $error=0;

+

+        if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

+            return 0; // For avoid conflicts if trigger used

+

+        if (! empty($this->array_options))

+        {

+            // Check parameters

+            $langs->load('admin');

+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

+            $extrafields = new AlExtraFields($this->db);

+            $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);

+

+            //Eliminate copied source object extra_fields that do not exist in target object

+            $new_array_options=array();

+            foreach ($this->array_options as $key => $value) {

+                if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test

+                    $new_array_options[$key] = $value;

+                elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix

+                    $new_array_options['options_'.$key] = $value;

+            }

+

+            foreach($new_array_options as $key => $value)

+            {

+                    $attributeKey      = substr($key,8);   // Remove 'options_' prefix

+                    $attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];

+                    $attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];

+                    $attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];

+                    $attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];

+

+                    if ($attributeRequired)

+                    {

+                        $mandatorypb=false;

+                        if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;

+                        if ($this->array_options[$key] === '') $mandatorypb=true;

+                        if ($mandatorypb)

+                        {

+                            dol_syslog($this->error);

+                            $this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);

+                            return -1;

+                        }

+                    }

+

+                //dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);

+                //dol_syslog("attributeType=".$attributeType, LOG_DEBUG);

+

+                    switch ($attributeType)

+                    {

+                        case 'int':

+                          if (!is_numeric($value) && $value!='')

+                            {

+                                $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

+                                return -1;

+                            }

+                            elseif ($value=='')

+                            {

+                                $new_array_options[$key] = null;

+                            }

+                            break;

+                    case 'double':

+                        $value = price2num($value);

+                        if (!is_numeric($value) && $value!='')

+                        {

+                            dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

+                            $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

+                            return -1;

+                        }

+                        elseif ($value=='')

+                        {

+                            $new_array_options[$key] = null;

+                        }

+                        //dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);

+                        $new_array_options[$key] = $value;

+                        break;

+                        /*case 'select':	// Not required, we chosed value='0' for undefined values

+             			if ($value=='-1')

+             			{

+             				$this->array_options[$key] = null;

+             			}

+             			break;*/

+                        case 'password':

+                           $algo='';

+                            if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))

+                            {

+                                // If there is an encryption choice, we use it to crypt data before insert

+                                $tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);

+                                $algo=reset($tmparrays);

+                                if ($algo != '')

+                                {

+                                    //global $action;		// $action may be 'create', 'update', 'update_extras'...

+                                    //var_dump($action);

+                                    //var_dump($this->oldcopy);exit;

+                                    if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value

+                                    {

+                                        //var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);

+                                        if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.

+                                        {

+                                            $new_array_options[$key] = $this->array_options[$key];	// Value is kept

+                                        }

+                                    else

+                                    {

+                                        // var_dump($algo);

+                                        $newvalue = dol_hash($this->array_options[$key], $algo);

+                                        $new_array_options[$key] = $newvalue;

+                                    }

+                                    }

+                                    else

+                                    {

+                                        $new_array_options[$key] = $this->array_options[$key];	// Value is kept

+                                    }

+                                }

+                            }

+                            else	// Common usage

+                            {

+                                $new_array_options[$key] = $this->array_options[$key];

+                            }

+                            break;

+                        case 'price':

+                        $new_array_options[$key] = price2num($this->array_options[$key]);

+                        break;

+                    case 'date':

+                        $new_array_options[$key] = $this->db->idate($this->array_options[$key]);

+                        break;

+                    case 'datetime':

+                        // If data is a string instead of a timestamp, we convert it

+                        if (! is_int($this->array_options[$key])) {

+                            $this->array_options[$key] = strtotime($this->array_options[$key]);

+                        }

+                        $new_array_options[$key] = $this->db->idate($this->array_options[$key]);

+                        break;

+                        case 'link':

+                        $param_list=array_keys($attributeParam['options']);

+                        // 0 : ObjectName

+                        // 1 : classPath

+                        $InfoFieldList = explode(":", $param_list[0]);

+                        dol_include_once($InfoFieldList[1]);

+                        if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))

+                        {

+                            if ($value == '-1')	// -1 is key for no defined in combo list of objects

+                            {

+                                $new_array_options[$key]='';

+                            }

+                            elseif ($value)

+                            {

+                                $object = new $InfoFieldList[0]($this->db);

+                                if (is_numeric($value)) $res=$object->fetch($value);

+                                else $res=$object->fetch('',$value);

+

+                                if ($res > 0) $new_array_options[$key]=$object->id;

+                                else

+                                {

+                                    $this->error="Id/Ref '".$value."' for object '".$object->element."' not found";

+                                    $this->db->rollback();

+                                    return -1;

+                                }

+                            }

+                        }

+                        else

+                        {

+                            dol_syslog('Error bad setup of extrafield', LOG_WARNING);

+                        }

+                        break;

+                    }

+            }

+

+            $this->db->begin();

+

+            $table_element = $this->table_element;

+            if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+

+            $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

+            dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);

+            $this->db->query($sql_del);

+

+            $sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";

+            foreach($new_array_options as $key => $value)

+            {

+                $attributeKey = substr($key,8);   // Remove 'options_' prefix

+                // Add field of attribut

+                if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator

+                    $sql.=",".$attributeKey;

+            }

+            $sql .= ") VALUES (".$this->id;

+

+            foreach($new_array_options as $key => $value)

+            {

+                $attributeKey = substr($key,8);   // Remove 'options_' prefix

+                // Add field of attribute

+                if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)

+                {

+                    if ($new_array_options[$key] != '')

+                    {

+                        $sql.=",'".$this->db->escape($new_array_options[$key])."'";

+                    }

+                    else

+                    {

+                        $sql.=",null";

+                    }

+                }

+            }

+            $sql.=")";

+

+            dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);

+            $resql = $this->db->query($sql);

+            if (! $resql)

+            {

+                $this->error=$this->db->lasterror();

+                $error++;

+            }

+

+            if (! $error && $trigger)

+            {

+                // Call trigger

+                $this->context=array('extrafieldaddupdate'=>1);

+                $result=$this->call_trigger($trigger, $userused);

+                if ($result < 0) $error++;

+                // End call trigger

+            }

+

+            if ($error)

+            {

+                $this->db->rollback();

+                return -1;

+            }

+            else

+            {

+                $this->db->commit();

+                return 1;

+            }

+        }

+        else return 0;

+    }

+

+    /**

+     *	Update an extra field value for the current object.

+     *  Data to describe values to update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)

+     *

+     *  @param  string      $key    		Key of the extrafield (without starting 'options_')

+     *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)

+     *  @param	User		$userused		Object user

+     *  @return int                 		-1=error, O=did nothing, 1=OK

+     *  @see setValueFrom, insertExtraFields

+     */

+    function updateExtraField($key, $trigger=null, $userused=null)

+    {

+        global $conf,$langs,$user;

+

+        if (empty($userused)) $userused=$user;

+

+        $error=0;

+

+        if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

+            return 0; // For avoid conflicts if trigger used

+

+        if (! empty($this->array_options) && isset($this->array_options["options_".$key]))

+        {

+            // Check parameters

+            $langs->load('admin');

+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

+            $extrafields = new AlExtraFields($this->db);

+            $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);

+

+            $value=$this->array_options["options_".$key];

+

+            $attributeType     = $extrafields->attributes[$this->table_element]['type'][$key];

+            $attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];

+            $attributeParam    = $extrafields->attributes[$this->table_element]['param'][$key];

+            $attributeRequired = $extrafields->attributes[$this->table_element]['required'][$key];

+

+            //dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);

+            //dol_syslog("attributeType=".$attributeType, LOG_DEBUG);

+

+            switch ($attributeType)

+            {

+                case 'int':

+                    if (!is_numeric($value) && $value!='')

+                    {

+                        $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);

+                        return -1;

+                    }

+                    elseif ($value=='')

+                    {

+                        $this->array_options["options_".$key] = null;

+                    }

+                    break;

+                case 'double':

+                    $value = price2num($value);

+                    if (!is_numeric($value) && $value!='')

+                    {

+                        dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

+                        $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

+                        return -1;

+                    }

+                    elseif ($value=='')

+                    {

+                        $this->array_options["options_".$key] = null;

+                    }

+                    //dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);

+                    $this->array_options["options_".$key] = $value;

+                    break;

+                    /*case 'select':	// Not required, we chosed value='0' for undefined values

+             		if ($value=='-1')

+             		{

+             			$this->array_options[$key] = null;

+             		}

+             		break;*/

+                case 'price':

+                    $this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);

+                    break;

+                case 'date':

+                    $this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);

+                    break;

+                case 'datetime':

+                    $this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);

+                    break;

+                case 'link':

+                    $param_list=array_keys($attributeParam['options']);

+                    // 0 : ObjectName

+                    // 1 : classPath

+                    $InfoFieldList = explode(":", $param_list[0]);

+                    dol_include_once($InfoFieldList[1]);

+                    if ($value)

+                    {

+                        $object = new $InfoFieldList[0]($this->db);

+                        $object->fetch(0,$value);

+                        $this->array_options["options_".$key]=$object->id;

+                    }

+                    break;

+            }

+

+            $this->db->begin();

+            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";

+            $sql .= " WHERE fk_object = ".$this->id;

+            $resql = $this->db->query($sql);

+            if (! $resql)

+            {

+                $error++;

+                $this->error=$this->db->lasterror();

+            }

+

+            if (! $error && $trigger)

+            {

+                // Call trigger

+                $this->context=array('extrafieldupdate'=>1);

+                $result=$this->call_trigger($trigger, $userused);

+                if ($result < 0) $error++;

+                // End call trigger

+            }

+

+            if ($error)

+            {

+                dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);

+                $this->db->rollback();

+                return -1;

+            }

+            else

+            {

+                $this->db->commit();

+                return 1;

+            }

+        }

+        else return 0;

+    }

+

+

+    /**

+     * Return HTML string to put an input field into a page

+     * Code very similar with showInputField of extra fields

+     *

+     * @param  array   		$val	       Array of properties for field to show

+     * @param  string  		$key           Key of attribute

+     * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)

+     * @param  string  		$moreparam     To add more parameters on html input tag

+     * @param  string  		$keysuffix     Prefix string to add into name and id of field (can be used to avoid duplicate names)

+     * @param  string  		$keyprefix     Suffix string to add into name and id of field (can be used to avoid duplicate names)

+     * @param  string|int		$morecss       Value for css to define style/length of field. May also be a numeric.

+     * @return string

+     */

+    function showInputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss=0)

+    {

+        global $conf,$langs,$form;

+

+        if (! is_object($form))

+        {

+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

+            $form=new Form($this->db);

+        }

+

+        $val=$this->fields[$key];

+

+        $out='';

+        $type='';

+        $param = array();

+        $param['options']=array();

+        $size =$this->fields[$key]['size'];

+        // Because we work on extrafields

+        if(preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)){

+            $param['options']=array($reg[1].':'.$reg[2]=>'N');

+            $type ='link';

+        } elseif(preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options']=array($reg[1].':'.$reg[2]=>'N');

+            $type ='link';

+        } elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options']=array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4]=>'N');

+            $type ='sellist';

+        } elseif(preg_match('/varchar\((\d+)\)/', $val['type'],$reg)) {

+            $param['options']=array();

+            $type ='varchar';

+            $size=$reg[1];

+        } elseif(preg_match('/varchar/', $val['type'])) {

+            $param['options']=array();

+            $type ='varchar';

+        } elseif(is_array($this->fields[$key]['arrayofkeyval'])) {

+            $param['options']=$this->fields[$key]['arrayofkeyval'];

+            $type ='select';

+        } else {

+            $param['options']=array();

+            $type =$this->fields[$key]['type'];

+        }

+

+        $label=$this->fields[$key]['label'];

+        //$elementtype=$this->fields[$key]['elementtype'];	// Seems not used

+        $default=$this->fields[$key]['default'];

+        $computed=$this->fields[$key]['computed'];

+        $unique=$this->fields[$key]['unique'];

+        $required=$this->fields[$key]['required'];

+

+        $langfile=$this->fields[$key]['langfile'];

+        $list=$this->fields[$key]['list'];

+        $hidden=abs($this->fields[$key]['visible'])!=1?1:0;

+

+        $objectid = $this->id;

+

+

+        if ($computed)

+        {

+            if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

+            else return '';

+        }

+

+

+        // Use in priority showsize from parameters, then $val['css'] then autodefine

+        if (empty($morecss) && ! empty($val['css']))

+        {

+            $showsize = $val['css'];

+        }

+        if (empty($morecss))

+        {

+            if ($type == 'date')

+            {

+                $morecss = 'minwidth100imp';

+            }

+            elseif ($type == 'datetime')

+            {

+                $morecss = 'minwidth200imp';

+            }

+            elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

+            {

+                $morecss = 'maxwidth75';

+                        }elseif ($type == 'url')

+            {

+                $morecss='minwidth400';

+            }

+            elseif ($type == 'boolean')

+            {

+                $morecss='';

+            }

+            else

+            {

+                if (round($size) < 12)

+                {

+                    $morecss = 'minwidth100';

+                }

+                else if (round($size) <= 48)

+                {

+                    $morecss = 'minwidth200';

+                }

+                else

+                {

+                    $morecss = 'minwidth400';

+                }

+            }

+        }

+

+        if (in_array($type,array('date','datetime')))

+        {

+            $tmp=explode(',',$size);

+            $newsize=$tmp[0];

+

+            $showtime = in_array($type,array('datetime')) ? 1 : 0;

+

+            // Do not show current date when field not required (see selectDate() method)

+            if (!$required && $value == '') $value = '-1';

+

+            // TODO Must also support $moreparam

+            $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

+        }

+        elseif (in_array($type,array('int','integer')))

+        {

+            $tmp=explode(',',$size);

+            $newsize=$tmp[0];

+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';

+        }

+        elseif (preg_match('/varchar/', $type))

+        {

+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';

+        }

+        elseif (in_array($type, array('mail', 'phone', 'url')))

+        {

+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

+        }

+        elseif ($type == 'text')

+        {

+            if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+            {

+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+                $doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');

+                $out=$doleditor->Create(1);

+            }

+            else

+            {

+                $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

+            }

+        }

+        elseif ($type == 'html')

+        {

+            if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+            {

+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+                $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

+                $out=$doleditor->Create(1);

+            }

+            else

+            {

+                $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

+            }

+        }

+        elseif ($type == 'boolean')

+        {

+            $checked='';

+            if (!empty($value)) {

+                $checked=' checked value="1" ';

+            } else {

+                $checked=' value="1" ';

+            }

+            $out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';

+        }

+        elseif ($type == 'price')

+        {

+            if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

+                $value=price($value);

+            }

+            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ' . $langs->getCurrencySymbol(Globals::$conf->currency);

+        }

+        elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

+        {

+            if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

+                $value=price($value);

+            }

+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';

+        }

+        elseif ($type == 'select')

+        {

+            $out = '';

+            if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                $out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

+            }

+

+            $out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';

+                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';

+            foreach ($param['options'] as $key => $val)

+            {

+                if ((string) $key == '') continue;

+                list($val, $parent) = explode('|', $val);

+                $out.='<option value="'.$key.'"';

+                $out.= (((string) $value == (string) $key)?' selected':'');

+                $out.= (!empty($parent)?' parent="'.$parent.'"':'');

+                $out.='>'.$val.'</option>';

+            }

+            $out.='</select>';

+        }

+        elseif ($type == 'sellist')

+        {

+            $out = '';

+            if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                $out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

+            }

+

+            $out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';

+            if (is_array($param['options']))

+            {

+                $param_list=array_keys($param['options']);

+                $InfoFieldList = explode(":", $param_list[0]);

+                $parentName='';

+                $parentField='';

+                // 0 : tableName

+                // 1 : label field name

+                // 2 : key fields name (if differ of rowid)

+                // 3 : key field parent (for dependent lists)

+                // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

+                $keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');

+

+

+                if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))

+                {

+                    if (strpos($InfoFieldList[4], 'extra.') !== false)

+                    {

+                        $keyList='main.'.$InfoFieldList[2].' as rowid';

+                    } else {

+                        $keyList=$InfoFieldList[2].' as rowid';

+                    }

+                }

+                if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))

+                {

+                    list($parentName, $parentField) = explode('|', $InfoFieldList[3]);

+                    $keyList.= ', '.$parentField;

+                }

+

+                $fields_label = explode('|',$InfoFieldList[1]);

+                if (is_array($fields_label))

+                {

+                    $keyList .=', ';

+                    $keyList .= implode(', ', $fields_label);

+                }

+

+                $sqlwhere='';

+                $sql = 'SELECT '.$keyList;

+                $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];

+                if (!empty($InfoFieldList[4]))

+                {

+                    // can use SELECT request

+                    if (strpos($InfoFieldList[4], '$SEL$')!==false) {

+                        $InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);

+                    }

+

+                    // current object id can be use into filter

+                    if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {

+                        $InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);

+                    } else {

+                        $InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);

+                    }

+                    //We have to join on extrafield table

+                    if (strpos($InfoFieldList[4], 'extra')!==false)

+                    {

+                        $sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';

+                        $sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];

+                    }

+                    else

+                    {

+                        $sqlwhere.= ' WHERE '.$InfoFieldList[4];

+                    }

+                }

+                else

+                {

+                    $sqlwhere.= ' WHERE 1=1';

+                }

+                // Some tables may have field, some other not. For the moment we disable it.

+                if (in_array($InfoFieldList[0],array('tablewithentity')))

+                {

+                    $sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

+                }

+                $sql.=$sqlwhere;

+                //print $sql;

+

+                $sql .= ' ORDER BY ' . implode(', ', $fields_label);

+

+                dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

+                $resql = $this->db->query($sql);

+                if ($resql)

+                {

+                    $out.='<option value="0">&nbsp;</option>';

+                    $num = $this->db->num_rows($resql);

+                    $i = 0;

+                    while ($i < $num)

+                    {

+                        $labeltoshow='';

+                        $obj = $this->db->fetch_object($resql);

+

+                        // Several field into label (eq table:code|libelle:rowid)

+                        $notrans = false;

+                        $fields_label = explode('|',$InfoFieldList[1]);

+                        if (is_array($fields_label))

+                        {

+                            $notrans = true;

+                            foreach ($fields_label as $field_toshow)

+                            {

+                                $labeltoshow.= $obj->$field_toshow.' ';

+                            }

+                        }

+                        else

+                        {

+                            $labeltoshow=$obj->{$InfoFieldList[1]};

+                        }

+                        $labeltoshow=dol_trunc($labeltoshow,45);

+

+                        if ($value == $obj->rowid)

+                        {

+                            foreach ($fields_label as $field_toshow)

+                            {

+                                $translabel=$langs->trans($obj->$field_toshow);

+                                if ($translabel!=$obj->$field_toshow) {

+                                    $labeltoshow=dol_trunc($translabel,18).' ';

+                                }else {

+                                    $labeltoshow=dol_trunc($obj->$field_toshow,18).' ';

+                                }

+                            }

+                            $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

+                        }

+                        else

+                        {

+                            if (! $notrans)

+                            {

+                                $translabel=$langs->trans($obj->{$InfoFieldList[1]});

+                                if ($translabel!=$obj->{$InfoFieldList[1]}) {

+                                    $labeltoshow=dol_trunc($translabel,18);

+                                }

+                                else {

+                                    $labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);

+                                }

+                            }

+                            if (empty($labeltoshow)) $labeltoshow='(not defined)';

+                            if ($value==$obj->rowid)

+                            {

+                                $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

+                            }

+

+                            if (!empty($InfoFieldList[3]) && $parentField)

+                            {

+                                $parent = $parentName.':'.$obj->{$parentField};

+                            }

+

+                            $out.='<option value="'.$obj->rowid.'"';

+                            $out.= ($value==$obj->rowid?' selected':'');

+                            $out.= (!empty($parent)?' parent="'.$parent.'"':'');

+                            $out.='>'.$labeltoshow.'</option>';

+                        }

+

+                        $i++;

+                    }

+                    $this->db->free($resql);

+                }

+                else {

+                    print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

+                }

+            }

+            $out.='</select>';

+        }

+        elseif ($type == 'checkbox')

+        {

+            $value_arr=explode(',',$value);

+            $out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

+        }

+        elseif ($type == 'radio')

+        {

+            $out='';

+            foreach ($param['options'] as $keyopt => $val)

+            {

+                $out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');

+                $out.=' value="'.$keyopt.'"';

+                $out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';

+                $out.= ($value==$keyopt?'checked':'');

+                $out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

+            }

+        }

+        elseif ($type == 'chkbxlst')

+        {

+            if (is_array($value)) {

+                $value_arr = $value;

+            }

+            else {

+                $value_arr = explode(',', $value);

+            }

+

+            if (is_array($param['options'])) {

+                $param_list = array_keys($param['options']);

+                $InfoFieldList = explode(":", $param_list[0]);

+                $parentName='';

+                $parentField='';

+                // 0 : tableName

+                // 1 : label field name

+                // 2 : key fields name (if differ of rowid)

+                // 3 : key field parent (for dependent lists)

+                // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');

+

+                if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {

+                    list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);

+                    $keyList .= ', ' . $parentField;

+                }

+                if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {

+                    if (strpos($InfoFieldList[4], 'extra.') !== false) {

+                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';

+                    } else {

+                        $keyList = $InfoFieldList[2] . ' as rowid';

+                    }

+                }

+

+                $fields_label = explode('|', $InfoFieldList[1]);

+                if (is_array($fields_label)) {

+                    $keyList .= ', ';

+                    $keyList .= implode(', ', $fields_label);

+                }

+

+                $sqlwhere = '';

+                $sql = 'SELECT ' . $keyList;

+                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+                if (! empty($InfoFieldList[4])) {

+

+                    // can use SELECT request

+                    if (strpos($InfoFieldList[4], '$SEL$')!==false) {

+                        $InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);

+                    }

+

+                    // current object id can be use into filter

+                    if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {

+                        $InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);

+                    } else {

+                        $InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);

+                    }

+

+                    // We have to join on extrafield table

+                    if (strpos($InfoFieldList[4], 'extra') !== false) {

+                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';

+                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];

+                    } else {

+                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];

+                    }

+                } else {

+                    $sqlwhere .= ' WHERE 1=1';

+                }

+                // Some tables may have field, some other not. For the moment we disable it.

+                if (in_array($InfoFieldList[0], array ('tablewithentity')))

+                {

+                    $sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

+                }

+                // $sql.=preg_replace('/^ AND /','',$sqlwhere);

+                // print $sql;

+

+                $sql .= $sqlwhere;

+                dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);

+                $resql = $this->db->query($sql);

+                if ($resql) {

+                    $num = $this->db->num_rows($resql);

+                    $i = 0;

+

+                    $data=array();

+

+                    while ( $i < $num ) {

+                        $labeltoshow = '';

+                        $obj = $this->db->fetch_object($resql);

+

+                        $notrans = false;

+                        // Several field into label (eq table:code|libelle:rowid)

+                        $fields_label = explode('|', $InfoFieldList[1]);

+                        if (is_array($fields_label)) {

+                            $notrans = true;

+                            foreach ( $fields_label as $field_toshow ) {

+                                $labeltoshow .= $obj->$field_toshow . ' ';

+                            }

+                        } else {

+                            $labeltoshow = $obj->{$InfoFieldList[1]};

+                        }

+                        $labeltoshow = dol_trunc($labeltoshow, 45);

+

+                        if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

+                            foreach ( $fields_label as $field_toshow ) {

+                                $translabel = $langs->trans($obj->$field_toshow);

+                                if ($translabel != $obj->$field_toshow) {

+                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';

+                                } else {

+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';

+                                }

+                            }

+

+                            $data[$obj->rowid]=$labeltoshow;

+                        } else {

+                            if (! $notrans) {

+                                $translabel = $langs->trans($obj->{$InfoFieldList[1]});

+                                if ($translabel != $obj->{$InfoFieldList[1]}) {

+                                    $labeltoshow = dol_trunc($translabel, 18);

+                                } else {

+                                    $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

+                                }

+                            }

+                            if (empty($labeltoshow))

+                                $labeltoshow = '(not defined)';

+

+                                if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

+                                    $data[$obj->rowid]=$labeltoshow;

+                                }

+

+                                if (! empty($InfoFieldList[3]) && $parentField) {

+                                    $parent = $parentName . ':' . $obj->{$parentField};

+                                }

+

+                                $data[$obj->rowid]=$labeltoshow;

+                        }

+

+                        $i ++;

+                    }

+                    $this->db->free($resql);

+

+                    $out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

+                } else {

+                    print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';

+                }

+            }

+        }

+        elseif ($type == 'link')

+        {

+            $param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'

+            $showempty=(($required && $default != '')?0:1);

+            $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);

+            if (Globals::$conf->global->MAIN_FEATURES_LEVEL >= 2) {

+                        list($class,$classfile)=explode(':',$param_list[0]);

+                        if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);

+                        else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);

+                        $out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';

+                        // TODO Add Javascript code to add input fields contents to new elements urls

+            }

+        }

+        elseif ($type == 'password')

+        {

+            // If prefix is 'search_', field is used as a filter, we use a common text field.

+            $out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';

+        }

+        elseif ($type == 'array')

+        {

+            $newval = $val;

+            $newval['type'] = 'varchar(256)';

+

+            $out='';

+

+            $inputs = array();

+            if(! empty($value)) {

+                foreach($value as $option) {

+                    $out.= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

+                    $out.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';

+                }

+            }

+

+            $out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';

+

+            $newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

+            $newInput.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';

+

+            if (!empty(Globals::$conf->use_javascript_ajax)) {

+                $out.= '

+					<script type="text/javascript">

+					$(document).ready(function() {

+						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {

+							$("'.dol_escape_js($newInput).'").insertBefore(this);

+						});

+

+						$(document).on("click", "a.'.dol_escape_js($keyprefix.$key.$keysuffix).'_del", function() {

+							$(this).parent().remove();

+						});

+					});

+					</script>';

+            }

+        }

+        if (!empty($hidden)) {

+            $out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';

+        }

+        /* Add comments

+		 if ($type == 'date') $out.=' (YYYY-MM-DD)';

+		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';

+		 */

+        return $out;

+    }

+

+    /**

+     * Return HTML string to show a field into a page

+     * Code very similar with showOutputField of extra fields

+     *

+     * @param  array   $val		       Array of properties of field to show

+     * @param  string  $key            Key of attribute

+     * @param  string  $value          Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)

+     * @param  string  $moreparam      To add more parametes on html input tag

+     * @param  string  $keysuffix      Prefix string to add into name and id of field (can be used to avoid duplicate names)

+     * @param  string  $keyprefix      Suffix string to add into name and id of field (can be used to avoid duplicate names)

+     * @param  mixed   $showsize       Value for css to define size. May also be a numeric.

+     * @return string

+     */

+    function showOutputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $showsize=0)

+    {

+        global $conf,$langs,$form;

+

+        if (! is_object($form))

+        {

+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

+            $form=new Form($this->db);

+        }

+

+        $objectid = $this->id;

+        $label = $val['label'];

+        $type  = $val['type'];

+        $size  = $val['css'];

+

+        // Convert var to be able to share same code than showOutputField of extrafields

+        if (preg_match('/varchar\((\d+)\)/', $type, $reg))

+        {

+            $type = 'varchar';		// convert varchar(xx) int varchar

+            $size = $reg[1];

+        }

+        elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar

+        if (is_array($val['arrayofkeyval'])) $type='select';

+        if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';

+

+        $default=$val['default'];

+        $computed=$val['computed'];

+        $unique=$val['unique'];

+        $required=$val['required'];

+        $param=$val['param'];

+        if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];

+        if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))

+        {

+            $type='link';

+            $param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);

+        }

+        $langfile=$val['langfile'];

+        $list=$val['list'];

+        $help=$val['help'];

+        $hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+

+        if ($hidden) return '';

+

+        // If field is a computed field, value must become result of compute

+        if ($computed)

+        {

+            // Make the eval of compute string

+            //var_dump($computed);

+            $value = dol_eval($computed, 1, 0);

+        }

+

+        if (empty($showsize))

+        {

+            if ($type == 'date')

+            {

+                //$showsize=10;

+                $showsize = 'minwidth100imp';

+            }

+            elseif ($type == 'datetime')

+            {

+                //$showsize=19;

+                $showsize = 'minwidth200imp';

+            }

+            elseif (in_array($type,array('int','double','price')))

+            {

+                //$showsize=10;

+                $showsize = 'maxwidth75';

+            }

+            elseif ($type == 'url')

+            {

+                $showsize='minwidth400';

+            }

+            elseif ($type == 'boolean')

+            {

+                $showsize='';

+            }

+            else

+            {

+                if (round($size) < 12)

+                {

+                    $showsize = 'minwidth100';

+                }

+                else if (round($size) <= 48)

+                {

+                    $showsize = 'minwidth200';

+                }

+                else

+                {

+                    //$showsize=48;

+                    $showsize = 'minwidth400';

+                }

+            }

+        }

+

+        // Format output value differently according to properties of field

+        if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);

+        elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);

+        elseif ($type == 'date')

+        {

+            if(! empty($value)) {

+                $value=dol_print_date($value,'day');

+            } else {

+                $value='';

+            }

+        }

+        elseif ($type == 'datetime')

+        {

+            if(! empty($value)) {

+                $value=dol_print_date($value,'dayhour');

+            } else {

+                $value='';

+            }

+        }

+        elseif ($type == 'double')

+        {

+            if (!empty($value)) {

+                $value=price($value);

+            }

+        }

+        elseif ($type == 'boolean')

+        {

+            $checked='';

+            if (!empty($value)) {

+                $checked=' checked ';

+            }

+            $value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';

+        }

+        elseif ($type == 'mail')

+        {

+            $value=dol_print_email($value,0,0,0,64,1,1);

+        }

+        elseif ($type == 'url')

+        {

+            $value=dol_print_url($value,'_blank',32,1);

+        }

+        elseif ($type == 'phone')

+        {

+            $value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);

+        }

+        elseif ($type == 'price')

+        {

+            $value = price($value, 0, $langs, 0, 0, -1, Globals::$conf->currency);

+        }

+        elseif ($type == 'select')

+        {

+            $value=$param['options'][$value];

+        }

+        elseif ($type == 'sellist')

+        {

+            $param_list=array_keys($param['options']);

+            $InfoFieldList = explode(":", $param_list[0]);

+

+            $selectkey="rowid";

+            $keyList='rowid';

+

+            if (count($InfoFieldList)>=3)

+            {

+                $selectkey = $InfoFieldList[2];

+                $keyList=$InfoFieldList[2].' as rowid';

+            }

+

+            $fields_label = explode('|',$InfoFieldList[1]);

+            if(is_array($fields_label)) {

+                $keyList .=', ';

+                $keyList .= implode(', ', $fields_label);

+            }

+

+            $sql = 'SELECT '.$keyList;

+            $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];

+            if (strpos($InfoFieldList[4], 'extra')!==false)

+            {

+                $sql.= ' as main';

+            }

+            if ($selectkey=='rowid' && empty($value)) {

+                $sql.= " WHERE ".$selectkey."=0";

+            } elseif ($selectkey=='rowid') {

+                $sql.= " WHERE ".$selectkey."=".$this->db->escape($value);

+            }else {

+                $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

+            }

+

+            //$sql.= ' AND entity = '.Globals::$conf->entity;

+

+            dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);

+            $resql = $this->db->query($sql);

+            if ($resql)

+            {

+                $value='';	// value was used, so now we reste it to use it to build final output

+

+                $obj = $this->db->fetch_object($resql);

+

+                // Several field into label (eq table:code|libelle:rowid)

+                $fields_label = explode('|',$InfoFieldList[1]);

+

+                if(is_array($fields_label) && count($fields_label)>1)

+                {

+                    foreach ($fields_label as $field_toshow)

+                    {

+                        $translabel='';

+                        if (!empty($obj->$field_toshow)) {

+                            $translabel=$langs->trans($obj->$field_toshow);

+                        }

+                        if ($translabel!=$field_toshow) {

+                            $value.=dol_trunc($translabel,18).' ';

+                        }else {

+                            $value.=$obj->$field_toshow.' ';

+                        }

+                    }

+                }

+                else

+                {

+                    $translabel='';

+                    if (!empty($obj->{$InfoFieldList[1]})) {

+                        $translabel=$langs->trans($obj->{$InfoFieldList[1]});

+                    }

+                    if ($translabel!=$obj->{$InfoFieldList[1]}) {

+                        $value=dol_trunc($translabel,18);

+                    }else {

+                        $value=$obj->{$InfoFieldList[1]};

+                    }

+                }

+            }

+            else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);

+        }

+        elseif ($type == 'radio')

+        {

+            $value=$param['options'][$value];

+        }

+        elseif ($type == 'checkbox')

+        {

+            $value_arr=explode(',',$value);

+            $value='';

+            if (is_array($value_arr) && count($value_arr)>0)

+            {

+                foreach ($value_arr as $keyval=>$valueval) {

+                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';

+                }

+                $value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

+            }

+        }

+        elseif ($type == 'chkbxlst')

+        {

+            $value_arr = explode(',', $value);

+

+            $param_list = array_keys($param['options']);

+            $InfoFieldList = explode(":", $param_list[0]);

+

+            $selectkey = "rowid";

+            $keyList = 'rowid';

+

+            if (count($InfoFieldList) >= 3) {

+                $selectkey = $InfoFieldList[2];

+                $keyList = $InfoFieldList[2] . ' as rowid';

+            }

+

+            $fields_label = explode('|', $InfoFieldList[1]);

+            if (is_array($fields_label)) {

+                $keyList .= ', ';

+                $keyList .= implode(', ', $fields_label);

+            }

+

+            $sql = 'SELECT ' . $keyList;

+            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+            if (strpos($InfoFieldList[4], 'extra') !== false) {

+                $sql .= ' as main';

+            }

+            // $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

+            // $sql.= ' AND entity = '.Globals::$conf->entity;

+

+            dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);

+            $resql = $this->db->query($sql);

+            if ($resql) {

+                $value = ''; // value was used, so now we reste it to use it to build final output

+                $toprint=array();

+                while ( $obj = $this->db->fetch_object($resql) ) {

+

+                    // Several field into label (eq table:code|libelle:rowid)

+                    $fields_label = explode('|', $InfoFieldList[1]);

+                    if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

+                        if (is_array($fields_label) && count($fields_label) > 1) {

+                            foreach ( $fields_label as $field_toshow ) {

+                                $translabel = '';

+                                if (! empty($obj->$field_toshow)) {

+                                    $translabel = $langs->trans($obj->$field_toshow);

+                                }

+                                if ($translabel != $field_toshow) {

+                                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

+                                } else {

+                                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';

+                                }

+                            }

+                        } else {

+                            $translabel = '';

+                            if (! empty($obj->{$InfoFieldList[1]})) {

+                                $translabel = $langs->trans($obj->{$InfoFieldList[1]});

+                            }

+                            if ($translabel != $obj->{$InfoFieldList[1]}) {

+                                $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

+                            } else {

+                                $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';

+                            }

+                        }

+                    }

+                }

+                $value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

+            } else {

+                dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);

+            }

+        }

+        elseif ($type == 'link')

+        {

+            $out='';

+

+            // only if something to display (perf)

+            if ($value)

+            {

+                $param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'

+

+                $InfoFieldList = explode(":", $param_list[0]);

+                $classname=$InfoFieldList[0];

+                $classpath=$InfoFieldList[1];

+                $getnomurlparam=(empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);

+                if (! empty($classpath))

+                {

+                    dol_include_once($InfoFieldList[1]);

+                    if ($classname && class_exists($classname))

+                    {

+                        $object = new $classname($this->db);

+                        $object->fetch($value);

+                        $value=$object->getNomUrl($getnomurlparam);

+                    }

+                }

+                else

+                {

+                    dol_syslog('Error bad setup of extrafield', LOG_WARNING);

+                    return 'Error bad setup of extrafield';

+                }

+            }

+            else $value='';

+        }

+        elseif ($type == 'text' || $type == 'html')

+        {

+            $value=dol_htmlentitiesbr($value);

+        }

+        elseif ($type == 'password')

+        {

+            $value=preg_replace('/./i','*',$value);

+        }

+        elseif ($type == 'array')

+        {

+            $value = implode('<br>', $value);

+        }

+

+        //print $type.'-'.$size;

+        $out=$value;

+

+        return $out;

+    }

+

+

+    /**

+     * Function to show lines of extrafields with output datas

+     *

+     * @param 	Extrafields $extrafields    Extrafield Object

+     * @param 	string      $mode           Show output (view) or input (edit) for extrafield

+     * @param 	array       $params         Optional parameters. Example: array('style'=>'class="oddeven"', 'colspan'=>$colspan)

+     * @param 	string      $keysuffix      Suffix string to add after name and id of field (can be used to avoid duplicate names)

+     * @param 	string      $keyprefix      Prefix string to add before name and id of field (can be used to avoid duplicate names)

+     * @param	string		$onetrtd		All fields in same tr td

+     * @return 	string

+     */

+    function showOptionals($extrafields, $mode='view', $params=null, $keysuffix='', $keyprefix='', $onetrtd=0)

+    {

+        global $db, $conf, $langs, $action, $form;

+

+        if (! is_object($form)) $form=new Form($db);

+

+        $out = '';

+

+        if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)

+        {

+            $out .= "\n";

+            $out .= '<!-- showOptionalsInput --> ';

+            $out .= "\n";

+

+            $e = 0;

+            foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)

+            {

+                // Show only the key field in params

+                if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;

+

+                $enabled = 1;

+                if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))

+                {

+                    $enabled = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1);

+                }

+

+                $perms = 1;

+                if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key]))

+                {

+                    $perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);

+                }

+

+                if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list

+                if (empty($perms)) continue;

+

+                // Load language if required

+                if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

+

+                $colspan='3';

+                if (is_array($params) && count($params)>0) {

+                    if (array_key_exists('colspan',$params)) {

+                        $colspan=$params['colspan'];

+                    }

+                }

+

+                switch($mode) {

+                    case "view":

+                        $value=$this->array_options["options_".$key.$keysuffix];

+                        break;

+                    case "edit":

+                        $getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none');				// GETPOST can get value from GET, POST or setup of default values.

+                        // GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')

+                        if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))

+                        {

+                            if (is_array($getposttemp)) {

+                                // $getposttemp is an array but following code expects a comma separated string

+                                $value = implode(",", $getposttemp);

+                            } else {

+                                $value = $getposttemp;

+                            }

+                        } else {

+                            $value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.

+                        }

+                        //var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);

+                        break;

+                }

+

+                if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')

+                {

+                    $out .= $extrafields->showSeparator($key, $this);

+                }

+                else

+                {

+                    $csstyle='';

+                    $class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');

+                    if (is_array($params) && count($params)>0) {

+                        if (array_key_exists('style',$params)) {

+                            $csstyle=$params['style'];

+                        }

+                    }

+

+                    // add html5 elements

+                    $domData  = ' data-element="extrafield"';

+                    $domData .= ' data-targetelement="'.$this->element.'"';

+                    $domData .= ' data-targetid="'.$this->id.'"';

+

+                    $html_id = !empty($this->id) ? 'extrarow-'.$this->element.'_'.$key.'_'.$this->id : '';

+

+                    $out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.'" '.$domData.' >';

+

+                    if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) {

+                        if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) {

+                            $colspan = '0';

+                        }

+                    }

+

+                    if ($action == 'selectlines') { $colspan++; }

+

+                    // Convert date into timestamp format (value in memory must be a timestamp)

+                    if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))

+                    {

+                        $datenotinstring = $this->array_options['options_' . $key];

+                        if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility

+                        {

+                            $datenotinstring = $this->db->jdate($datenotinstring);

+                        }

+                        $value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;

+                    }

+                    // Convert float submited string into real php numeric (value in memory must be a php numeric)

+                    if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('price','double')))

+                    {

+                        $value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)):$this->array_options['options_'.$key];

+                    }

+

+                    $labeltoshow = $langs->trans($label);

+

+                    $out .= '<td class="titlefield';

+                    if (GETPOST('action','none') == 'create') $out.='create';

+                    if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';

+                    $out .= '">';

+                    if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);

+                    else $out .= $labeltoshow;

+                    $out .= '</td>';

+

+                    $html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';

+                    $out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';

+

+                    switch($mode) {

+                        case "view":

+                            $out .= $extrafields->showOutputField($key, $value);

+                            break;

+                        case "edit":

+                            $out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id);

+                            break;

+                    }

+

+                    $out .= '</td>';

+

+                    if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1))

+                        $out .= '</tr>';

+                    else $out .= '</tr>';

+                    $e++;

+                }

+            }

+            $out .= "\n";

+            // Add code to manage list depending on others

+            if (!empty(Globals::$conf->use_javascript_ajax)) {

+                $out .= '

+				<script type="text/javascript">

+				    jQuery(document).ready(function() {

+				    	function showOptions(child_list, parent_list)

+				    	{

+				    		var val = $("select[name=\"options_"+parent_list+"\"]").val();

+				    		var parentVal = parent_list + ":" + val;

+							if(val > 0) {

+					    		$("select[name=\""+child_list+"\"] option[parent]").hide();

+					    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();

+							} else {

+								$("select[name=\""+child_list+"\"] option").show();

+							}

+				    	}

+						function setListDependencies() {

+					    	jQuery("select option[parent]").parent().each(function() {

+					    		var child_list = $(this).attr("name");

+								var parent = $(this).find("option[parent]:first").attr("parent");

+								var infos = parent.split(":");

+								var parent_list = infos[0];

+								$("select[name=\""+parent_list+"\"]").change(function() {

+									showOptions(child_list, parent_list);

+								});

+					    	});

+						}

+

+						setListDependencies();

+				    });

+				</script>'."\n";

+                $out .= '<!-- /showOptionalsInput --> '."\n";

+            }

+        }

+        return $out;

+    }

+

+

+    /**

+     * Returns the rights used for this class

+     * @return stdClass

+     */

+    public function getRights()

+    {

+        global $user;

+

+        $element = $this->element;

+        if ($element == 'facturerec') $element='facture';

+

+        return $user->rights->{$element};

+    }

+

+    /**

+     * Function used to replace a thirdparty id with another one.

+     * This function is meant to be called from replaceThirdparty with the appropiate tables

+     * Column name fk_soc MUST be used to identify thirdparties

+     *

+     * @param  DoliDB 	   $db 			  Database handler

+     * @param  int 		   $origin_id     Old thirdparty id (the thirdparty to delete)

+     * @param  int 		   $dest_id       New thirdparty id (the thirdparty that will received element of the other)

+     * @param  string[]    $tables        Tables that need to be changed

+     * @param  int         $ignoreerrors  Ignore errors. Return true even if errors. We need this when replacement can fails like for categories (categorie of old thirdparty may already exists on new one)

+     * @return bool						  True if success, False if error

+     */

+    public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors=0)

+    {

+        foreach ($tables as $table)

+        {

+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;

 

-						$(document).on("click", "a.'.dol_escape_js($keyprefix.$key.$keysuffix).'_del", function() {

-							$(this).parent().remove();

-						});

-					});

-					</script>';

-			}

-		}

-		if (!empty($hidden)) {

-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';

-		}

-		/* Add comments

-		 if ($type == 'date') $out.=' (YYYY-MM-DD)';

-		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';

-		 */

-		return $out;

-	}

-

-	/**

-	 * Return HTML string to show a field into a page

-	 * Code very similar with showOutputField of extra fields

-	 *

-	 * @param  array   $val		       Array of properties of field to show

-	 * @param  string  $key            Key of attribute

-	 * @param  string  $value          Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)

-	 * @param  string  $moreparam      To add more parametes on html input tag

-	 * @param  string  $keysuffix      Prefix string to add into name and id of field (can be used to avoid duplicate names)

-	 * @param  string  $keyprefix      Suffix string to add into name and id of field (can be used to avoid duplicate names)

-	 * @param  mixed   $showsize       Value for css to define size. May also be a numeric.

-	 * @return string

-	 */

-	function showOutputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $showsize=0)

-	{

-		global $conf,$langs,$form;

-

-		if (! is_object($form))

-		{

-			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

-			$form=new Form($this->db);

-		}

-

-		$objectid = $this->id;

-		$label = $val['label'];

-		$type  = $val['type'];

-		$size  = $val['css'];

-

-		// Convert var to be able to share same code than showOutputField of extrafields

-		if (preg_match('/varchar\((\d+)\)/', $type, $reg))

-		{

-			$type = 'varchar';		// convert varchar(xx) int varchar

-			$size = $reg[1];

-		}

-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar

-		if (is_array($val['arrayofkeyval'])) $type='select';

-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';

-

-		$default=$val['default'];

-		$computed=$val['computed'];

-		$unique=$val['unique'];

-		$required=$val['required'];

-		$param=$val['param'];

-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];

-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))

-		{

-			$type='link';

-			$param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);

-		}

-		$langfile=$val['langfile'];

-		$list=$val['list'];

-		$help=$val['help'];

-		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

-

-		if ($hidden) return '';

-

-		// If field is a computed field, value must become result of compute

-		if ($computed)

-		{

-			// Make the eval of compute string

-			//var_dump($computed);

-			$value = dol_eval($computed, 1, 0);

-		}

-

-		if (empty($showsize))

-		{

-			if ($type == 'date')

-			{

-				//$showsize=10;

-				$showsize = 'minwidth100imp';

-			}

-			elseif ($type == 'datetime')

-			{

-				//$showsize=19;

-				$showsize = 'minwidth200imp';

-			}

-			elseif (in_array($type,array('int','double','price')))

-			{

-				//$showsize=10;

-				$showsize = 'maxwidth75';

-			}

-			elseif ($type == 'url')

-			{

-				$showsize='minwidth400';

-			}

-			elseif ($type == 'boolean')

-			{

-				$showsize='';

-			}

-			else

-			{

-				if (round($size) < 12)

-				{

-					$showsize = 'minwidth100';

-				}

-				else if (round($size) <= 48)

-				{

-					$showsize = 'minwidth200';

-				}

-				else

-				{

-					//$showsize=48;

-					$showsize = 'minwidth400';

-				}

-			}

-		}

-

-		// Format output value differently according to properties of field

-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);

-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);

-		elseif ($type == 'date')

-		{

-			if(! empty($value)) {

-				$value=dol_print_date($value,'day');

-			} else {

-				$value='';

-			}

-		}

-		elseif ($type == 'datetime')

-		{

-			if(! empty($value)) {

-				$value=dol_print_date($value,'dayhour');

-			} else {

-				$value='';

-			}

-		}

-		elseif ($type == 'double')

-		{

-			if (!empty($value)) {

-				$value=price($value);

-			}

-		}

-		elseif ($type == 'boolean')

-		{

-			$checked='';

-			if (!empty($value)) {

-				$checked=' checked ';

-			}

-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';

-		}

-		elseif ($type == 'mail')

-		{

-			$value=dol_print_email($value,0,0,0,64,1,1);

-		}

-		elseif ($type == 'url')

-		{

-			$value=dol_print_url($value,'_blank',32,1);

-		}

-		elseif ($type == 'phone')

-		{

-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);

-		}

-		elseif ($type == 'price')

-		{

-			$value = price($value, 0, $langs, 0, 0, -1, Globals::$conf->currency);

-        }

-		elseif ($type == 'select')

-		{

-			$value=$param['options'][$value];

-		}

-		elseif ($type == 'sellist')

-		{

-			$param_list=array_keys($param['options']);

-			$InfoFieldList = explode(":", $param_list[0]);

-

-			$selectkey="rowid";

-			$keyList='rowid';

-

-			if (count($InfoFieldList)>=3)

-			{

-				$selectkey = $InfoFieldList[2];

-				$keyList=$InfoFieldList[2].' as rowid';

-			}

-

-			$fields_label = explode('|',$InfoFieldList[1]);

-			if(is_array($fields_label)) {

-				$keyList .=', ';

-				$keyList .= implode(', ', $fields_label);

-			}

-

-			$sql = 'SELECT '.$keyList;

-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];

-			if (strpos($InfoFieldList[4], 'extra')!==false)

-			{

-				$sql.= ' as main';

-			}

-			if ($selectkey=='rowid' && empty($value)) {

-				$sql.= " WHERE ".$selectkey."=0";

-			} elseif ($selectkey=='rowid') {

-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);

-			}else {

-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

-			}

-

-			//$sql.= ' AND entity = '.Globals::$conf->entity;

+            if (! $db->query($sql))

+            {

+                if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

+                //$this->errors = $db->lasterror();

+                return false;

+            }

+        }

 

-            dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);

-			$resql = $this->db->query($sql);

-			if ($resql)

-			{

-				$value='';	// value was used, so now we reste it to use it to build final output

+        return true;

+    }

 

-				$obj = $this->db->fetch_object($resql);

+    /**

+     * Get buy price to use for margin calculation. This function is called when buy price is unknown.

+     *	 Set buy price = sell price if ForceBuyingPriceIfNull configured,

+     *   else if calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice

+     *	 else if calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice

+     *	 else set min buy price as buy price

+     *

+     * @param float		$unitPrice		 Product unit price

+     * @param float		$discountPercent Line discount percent

+     * @param int		$fk_product		 Product id

+     * @return	float                    <0 if KO, buyprice if OK

+     */

+    public function defineBuyPrice($unitPrice = 0.0, $discountPercent = 0.0, $fk_product = 0)

+    {

+        global $conf;

 

-				// Several field into label (eq table:code|libelle:rowid)

-				$fields_label = explode('|',$InfoFieldList[1]);

+        $buyPrice = 0;

 

-				if(is_array($fields_label) && count($fields_label)>1)

-				{

-					foreach ($fields_label as $field_toshow)

-					{

-						$translabel='';

-						if (!empty($obj->$field_toshow)) {

-							$translabel=$langs->trans($obj->$field_toshow);

-						}

-						if ($translabel!=$field_toshow) {

-							$value.=dol_trunc($translabel,18).' ';

-						}else {

-							$value.=$obj->$field_toshow.' ';

-						}

-					}

-				}

-				else

-				{

-					$translabel='';

-					if (!empty($obj->{$InfoFieldList[1]})) {

-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});

-					}

-					if ($translabel!=$obj->{$InfoFieldList[1]}) {

-						$value=dol_trunc($translabel,18);

-					}else {

-						$value=$obj->{$InfoFieldList[1]};

-					}

-				}

-			}

-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);

-		}

-		elseif ($type == 'radio')

-		{

-			$value=$param['options'][$value];

-		}

-		elseif ($type == 'checkbox')

-		{

-			$value_arr=explode(',',$value);

-			$value='';

-			if (is_array($value_arr) && count($value_arr)>0)

-			{

-				foreach ($value_arr as $keyval=>$valueval) {

-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';

-				}

-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

-			}

-		}

-		elseif ($type == 'chkbxlst')

-		{

-			$value_arr = explode(',', $value);

-

-			$param_list = array_keys($param['options']);

-			$InfoFieldList = explode(":", $param_list[0]);

-

-			$selectkey = "rowid";

-			$keyList = 'rowid';

-

-			if (count($InfoFieldList) >= 3) {

-				$selectkey = $InfoFieldList[2];

-				$keyList = $InfoFieldList[2] . ' as rowid';

-			}

-

-			$fields_label = explode('|', $InfoFieldList[1]);

-			if (is_array($fields_label)) {

-				$keyList .= ', ';

-				$keyList .= implode(', ', $fields_label);

-			}

-

-			$sql = 'SELECT ' . $keyList;

-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

-			if (strpos($InfoFieldList[4], 'extra') !== false) {

-				$sql .= ' as main';

-			}

-			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

-			// $sql.= ' AND entity = '.Globals::$conf->entity;

+        if (($unitPrice > 0) && (isset(Globals::$conf->global->ForceBuyingPriceIfNull) && Globals::$conf->global->ForceBuyingPriceIfNull == 1)) { // In most cases, test here is false{

+            $buyPrice = $unitPrice * (1 - $discountPercent / 100);

+        }

+        else

+        {

+            // Get cost price for margin calculation

+            if (! empty($fk_product))

+            {

+                if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'costprice') {

+                    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

+                    $product = new Product($this->db);

+                    $result = $product->fetch($fk_product);

+                    if ($result <= 0)

+                    {

+                        $this->errors[] = 'ErrorProductIdDoesNotExists';

+                        return -1;

+                    }

+                    if ($product->cost_price > 0)

+                    {

+                        $buyPrice = $product->cost_price;

+                    }

+                    else if ($product->pmp > 0)

+                    {

+                        $buyPrice = $product->pmp;

+                    }

+                }

+                else if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'pmp') {

+                    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

+                    $product = new Product($this->db);

+                    $result = $product->fetch($fk_product);

+                    if ($result <= 0)

+                    {

+                        $this->errors[] = 'ErrorProductIdDoesNotExists';

+                        return -1;

+                    }

+                    if ($product->pmp > 0)

+                    {

+                        $buyPrice = $product->pmp;

+                    }

+                }

+

+                if (empty($buyPrice) && isset(Globals::$conf->global->MARGIN_TYPE) && in_array(Globals::$conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice'))) {

+                    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';

+                    $productFournisseur = new ProductFournisseur($this->db);

+                    if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)

+                    {

+                        $buyPrice = $productFournisseur->fourn_unitprice;

+                    }

+                    else if ($result < 0)

+                    {

+                        $this->errors[] = $productFournisseur->error;

+                        return -2;

+                    }

+                }

+            }

+        }

+        return $buyPrice;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

+    /**

+     *  Show photos of an object (nbmax maximum), into several columns

+     *

+     *  @param		string	$modulepart		'product', 'ticket', ...

+     *  @param      string	$sdir        	Directory to scan (full absolute path)

+     *  @param      int		$size        	0=original size, 1='small' use thumbnail if possible

+     *  @param      int		$nbmax       	Nombre maximum de photos (0=pas de max)

+     *  @param      int		$nbbyrow     	Number of image per line or -1 to use div. Used only if size=1.

+     * 	@param		int		$showfilename	1=Show filename

+     * 	@param		int		$showaction		1=Show icon with action links (resize, delete)

+     * 	@param		int		$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.

+     * 	@param		int		$maxWidth		Max width of original image when size='small'

+     *  @param      int     $nolink         Do not add a href link to view enlarged imaged into a new tab

+     *  @param      int     $notitle        Do not add title tag on image

+     *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)

+     *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto

+     */

+    function show_photos($modulepart, $sdir, $size=0, $nbmax=0, $nbbyrow=5, $showfilename=0, $showaction=0, $maxHeight=120, $maxWidth=160, $nolink=0, $notitle=0, $usesharelink=0)

+    {

+        // phpcs:enable

+        global $conf,$user,$langs;

+

+        include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';

+        include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';

+

+        $sortfield='position_name';

+        $sortorder='asc';

+

+        $dir = $sdir . '/';

+        $pdir = '/';

+        if ($modulepart == 'ticket')

+        {

+            $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';

+            $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';

+        }

+        else

+        {

+            $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';

+            $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';

+        }

+

+        // For backward compatibility

+        if ($modulepart == 'product' && !empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {

+            $dir = $sdir . '/'. get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";

+            $pdir = '/' . get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";

+        }

+

+        // Defined relative dir to DOL_DATA_ROOT

+        $relativedir = '';

+        if ($dir)

+        {

+            $relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);

+            $relativedir = preg_replace('/^[\\/]/','',$relativedir);

+            $relativedir = preg_replace('/[\\/]$/','',$relativedir);

+        }

+

+        $dirthumb = $dir.'thumbs/';

+        $pdirthumb = $pdir.'thumbs/';

+

+        $return ='<!-- Photo -->'."\n";

+        $nbphoto=0;

+

+        $filearray=dol_dir_list($dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);

+

+        /* if (! empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs

+          {

+          $filearrayold=dol_dir_list($dirold,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);

+          $filearray=array_merge($filearray, $filearrayold);

+          } */

+

+        completeFileArrayWithDatabaseInfo($filearray, $relativedir);

+

+        if (count($filearray))

+        {

+            if ($sortfield && $sortorder)

+            {

+                $filearray=dol_sort_array($filearray, $sortfield, $sortorder);

+            }

+

+            foreach($filearray as $key => $val)

+            {

+                $photo='';

+                $file = $val['name'];

+

+                //if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory

+

+                //if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)

+                if (image_format_supported($file) >= 0)

+                {

+                    $nbphoto++;

+                    $photo = $file;

+                    $viewfilename = $file;

+

+                    if ($size == 1 || $size == 'small') {   // Format vignette

+

+                        // Find name of thumb file

+                        $photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));

+                        if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';

+

+                        // Get filesize of original file

+                        $imgarray=dol_getImageSize($dir.$photo);

+

+                        if ($nbbyrow > 0)

+                        {

+                            if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';

+

+                            if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';

+                            $return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';

+                        }

+                        else if ($nbbyrow < 0) $return .= '<div class="inline-block">';

+

+                        $return.= "\n";

+

+                        $relativefile=preg_replace('/^\//', '', $pdir.$photo);

+                        if (empty($nolink))

+                        {

+                            $urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);

+                            if ($urladvanced) $return.='<a href="'.$urladvanced.'">';

+                            else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';

+                        }

+

+                        // Show image (width height=$maxHeight)

+                        // Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine

+                        $alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;

+                        $alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];

+                        if ($notitle) $alt='';

+

+                        if ($usesharelink)

+                        {

+                            if ($val['share'])

+                            {

+                                if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

+                                {

+                                    $return.= '<!-- Show original file (thumb not yet available with shared links) -->';

+                                    $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

+                                }

+                                else {

+                                    $return.= '<!-- Show original file -->';

+                                    $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

+                                }

+                            }

+                            else

+                            {

+                                $return.= '<!-- Show nophoto file (because file is not shared) -->';

+                                $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';

+                            }

+                        }

+                        else

+                        {

+                            if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

+                            {

+                                $return.= '<!-- Show thumb -->';

+                                $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';

+                            }

+                            else {

+                                $return.= '<!-- Show original file -->';

+                                $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';

+                            }

+                        }

+

+                        if (empty($nolink)) $return.= '</a>';

+                        $return.="\n";

+

+                        if ($showfilename) $return.= '<br>'.$viewfilename;

+                        if ($showaction)

+                        {

+                            $return.= '<br>';

+                            // On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites

+                            if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))

+                            {

+                                $return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';

+                            }

+                            // Special cas for product

+                            if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))

+                            {

+                                // Link to resize

+                                $return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

+

+                                // Link to delete

+                                $return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

+                                $return.= img_delete().'</a>';

+                            }

+                        }

+                        $return.= "\n";

+

+                        if ($nbbyrow > 0)

+                        {

+                            $return.= '</td>';

+                            if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';

+                        }

+                        else if ($nbbyrow < 0) $return.='</div>';

+                    }

+

+                    if (empty($size)) {     // Format origine

+                        $return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';

+

+                        if ($showfilename) $return.= '<br>'.$viewfilename;

+                        if ($showaction)

+                        {

+                            // Special case for product

+                            if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))

+                            {

+                                // Link to resize

+                                $return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

+

+                                // Link to delete

+                                $return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

+                                $return.= img_delete().'</a>';

+                            }

+                        }

+                    }

+

+                    // On continue ou on arrete de boucler ?

+                    if ($nbmax && $nbphoto >= $nbmax) break;

+                }

+            }

+

+            if ($size==1 || $size=='small')

+            {

+                if ($nbbyrow > 0)

+                {

+                    // Ferme tableau

+                    while ($nbphoto % $nbbyrow)

+                    {

+                        $return.= '<td width="'.ceil(100/$nbbyrow).'%">&nbsp;</td>';

+                        $nbphoto++;

+                    }

+

+                    if ($nbphoto) $return.= '</table>';

+                }

+            }

+        }

+

+        $this->nbphoto = $nbphoto;

+

+        return $return;

+    }

+

+

+    /**

+     * Function test if type is array

+     *

+     * @param   array   $info   content informations of field

+     * @return                  bool

+     */

+    protected function isArray($info)

+    {

+        if(is_array($info))

+        {

+            if(isset($info['type']) && $info['type']=='array') return true;

+            else return false;

+        }

+        else return false;

+    }

+

+    /**

+     * Function test if type is null

+     *

+     * @param   array   $info   content informations of field

+     * @return                  bool

+     */

+    protected function isNull($info)

+    {

+        if(is_array($info))

+        {

+            if(isset($info['type']) && $info['type']=='null') return true;

+            else return false;

+        }

+        else return false;

+    }

+

+    /**

+     * Function test if type is date

+     *

+     * @param   array   $info   content informations of field

+     * @return                  bool

+     */

+    public function isDate($info)

+    {

+        if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;

+        else return false;

+    }

+

+    /**

+     * Function test if type is integer

+     *

+     * @param   array   $info   content informations of field

+     * @return                  bool

+     */

+    public function isInt($info)

+    {

+        if(is_array($info))

+        {

+            if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;

+            else return false;

+        }

+        else return false;

+    }

+

+    /**

+     * Function test if type is float

+     *

+     * @param   array   $info   content informations of field

+     * @return                  bool

+     */

+    public function isFloat($info)

+    {

+        if(is_array($info))

+        {

+            if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;

+            else return false;

+        }

+        else return false;

+    }

+

+    /**

+     * Function test if type is text

+     *

+     * @param   array   $info   content informations of field

+     * @return                  bool

+     */

+    public function isText($info)

+    {

+        if(is_array($info))

+        {

+            if(isset($info['type']) && $info['type']=='text') return true;

+            else return false;

+        }

+        else return false;

+    }

+

+    /**

+     * Function test if is indexed

+     *

+     * @param   array   $info   content informations of field

+     * @return                  bool

+     */

+    protected function isIndex($info)

+    {

+        if(is_array($info))

+        {

+            if(isset($info['index']) && $info['index']==true) return true;

+            else return false;

+        }

+        else return false;

+    }

+

+    /**

+     * Function to prepare the values to insert.

+     * Note $this->${field} are set by the page that make the createCommon or the updateCommon.

+     *

+     * @return array

+     */

+    protected function setSaveQuery()

+    {

+        global $conf;

+

+        $queryarray=array();

+        foreach ($this->fields as $field=>$info)	// Loop on definition of fields

+        {

+            // Depending on field type ('datetime', ...)

+            if($this->isDate($info))

+            {

+                if(empty($this->{$field}))

+                {

+                    $queryarray[$field] = null;

+                }

+                else

+                {

+                    $queryarray[$field] = $this->db->idate($this->{$field});

+                }

+            }

+            else if($this->isArray($info))

+            {

+                if(! empty($this->{$field})) {

+                    if(! is_array($this->{$field})) {

+                        $this->{$field} = array($this->{$field});

+                    }

+                    $queryarray[$field] = serialize($this->{$field});

+                } else {

+                    $queryarray[$field] = null;

+                }

+            }

+            else if($this->isInt($info))

+            {

+                if ($field == 'entity' && is_null($this->{$field}))

+                    $queryarray[$field] = Globals::$conf->entity;

+                else

+                {

+                    $queryarray[$field] = (int) price2num($this->{$field});

+                    if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.

+                }

+            }

+            else if($this->isFloat($info))

+            {

+                $queryarray[$field] = (double) price2num($this->{$field});

+                if (empty($queryarray[$field])) $queryarray[$field]=0;

+            }

+            else

+            {

+                $queryarray[$field] = $this->{$field};

+            }

+

+            if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);

+            if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;

+        }

+

+        return $queryarray;

+    }

+

+    /**

+     * Function to load data from a SQL pointer into properties of current object $this

+     *

+     * @param   stdClass    $obj    Contain data of object from database

+     * @return void

+     */

+    protected function setVarsFromFetchObj(&$obj)

+    {

+        foreach ($this->fields as $field => $info)

+        {

+            if($this->isDate($info))

+            {

+                if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;

+                else $this->{$field} = strtotime($obj->{$field});

+            }

+            elseif($this->isArray($info))

+            {

+                if(! empty($obj->{$field})) {

+                    $this->{$field} = @unserialize($obj->{$field});

+                    // Hack for data not in UTF8

+                    if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));

+                } else {

+                    $this->{$field} = array();

+                }

+            }

+            elseif($this->isInt($info))

+            {

+                if ($field == 'rowid') $this->id = (int) $obj->{$field};

+                else $this->{$field} = (int) $obj->{$field};

+            }

+            elseif($this->isFloat($info))

+            {

+                $this->{$field} = (double) $obj->{$field};

+            }

+            elseif($this->isNull($info))

+            {

+                $val = $obj->{$field};

+                // zero is not null

+                $this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);

+            }

+            else

+            {

+                $this->{$field} = $obj->{$field};

+            }

+        }

+

+        // If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.

+        if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;

+    }

+

+    /**

+     * Function to concat keys of fields

+     *

+     * @return string

+     */

+    protected function getFieldList()

+    {

+        $keys = array_keys($this->fields);

+        return implode(',', $keys);

+    }

+

+    /**

+     * Add quote to field value if necessary

+     *

+     * @param 	string|int	$value			Value to protect

+     * @param	array		$fieldsentry	Properties of field

+     * @return 	string

+     */

+    protected function quote($value, $fieldsentry)

+    {

+        if (is_null($value)) return 'NULL';

+        else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");

+        else return "'".$this->db->escape($value)."'";

+    }

+

+

+    /**

+     * Create object into database

+     *

+     * @param  User $user      User that creates

+     * @param  bool $notrigger false=launch triggers after, true=disable triggers

+     * @return int             <0 if KO, Id of created object if OK

+     */

+    public function createCommon(User $user, $notrigger = false)

+    {

+        global $langs;

 

-            dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);

-			$resql = $this->db->query($sql);

-			if ($resql) {

-				$value = ''; // value was used, so now we reste it to use it to build final output

-				$toprint=array();

-				while ( $obj = $this->db->fetch_object($resql) ) {

-

-					// Several field into label (eq table:code|libelle:rowid)

-					$fields_label = explode('|', $InfoFieldList[1]);

-					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-						if (is_array($fields_label) && count($fields_label) > 1) {

-							foreach ( $fields_label as $field_toshow ) {

-								$translabel = '';

-								if (! empty($obj->$field_toshow)) {

-									$translabel = $langs->trans($obj->$field_toshow);

-								}

-								if ($translabel != $field_toshow) {

-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

-								} else {

-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';

-								}

-							}

-						} else {

-							$translabel = '';

-							if (! empty($obj->{$InfoFieldList[1]})) {

-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

-							}

-							if ($translabel != $obj->{$InfoFieldList[1]}) {

-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

-							} else {

-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';

-							}

-						}

-					}

-				}

-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

-			} else {

-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);

-			}

-		}

-		elseif ($type == 'link')

-		{

-			$out='';

-

-			// only if something to display (perf)

-			if ($value)

-			{

-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'

+        $error = 0;

 

-				$InfoFieldList = explode(":", $param_list[0]);

-				$classname=$InfoFieldList[0];

-				$classpath=$InfoFieldList[1];

-				$getnomurlparam=(empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);

-				if (! empty($classpath))

-				{

-					dol_include_once($InfoFieldList[1]);

-					if ($classname && class_exists($classname))

-					{

-						$object = new $classname($this->db);

-						$object->fetch($value);

-						$value=$object->getNomUrl($getnomurlparam);

-					}

-				}

-				else

-				{

-					dol_syslog('Error bad setup of extrafield', LOG_WARNING);

-					return 'Error bad setup of extrafield';

-				}

-			}

-			else $value='';

-		}

-		elseif ($type == 'text' || $type == 'html')

-		{

-			$value=dol_htmlentitiesbr($value);

-		}

-		elseif ($type == 'password')

-		{

-			$value=preg_replace('/./i','*',$value);

-		}

-		elseif ($type == 'array')

-		{

-			$value = implode('<br>', $value);

-		}

-

-		//print $type.'-'.$size;

-		$out=$value;

-

-		return $out;

-	}

-

-

-	/**

-	 * Function to show lines of extrafields with output datas

-	 *

-	 * @param 	Extrafields $extrafields    Extrafield Object

-	 * @param 	string      $mode           Show output (view) or input (edit) for extrafield

-	 * @param 	array       $params         Optional parameters. Example: array('style'=>'class="oddeven"', 'colspan'=>$colspan)

-	 * @param 	string      $keysuffix      Suffix string to add after name and id of field (can be used to avoid duplicate names)

-	 * @param 	string      $keyprefix      Prefix string to add before name and id of field (can be used to avoid duplicate names)

-	 * @param	string		$onetrtd		All fields in same tr td

-	 * @return 	string

-	 */

-	function showOptionals($extrafields, $mode='view', $params=null, $keysuffix='', $keyprefix='', $onetrtd=0)

-	{

-		global $db, $conf, $langs, $action, $form;

-

-		if (! is_object($form)) $form=new Form($db);

-

-		$out = '';

-

-		if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)

-		{

-			$out .= "\n";

-			$out .= '<!-- showOptionalsInput --> ';

-			$out .= "\n";

-

-			$e = 0;

-			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)

-			{

-				// Show only the key field in params

-				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;

+        $now=dol_now();

 

-				$enabled = 1;

-				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))

-				{

-					$enabled = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1);

-				}

+        $fieldvalues = $this->setSaveQuery();

+        if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);

+        if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;

+        unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.

 

-				$perms = 1;

-				if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key]))

-				{

-					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);

-				}

+        $keys=array();

+        $values = array();

+        foreach ($fieldvalues as $k => $v) {

+            $keys[$k] = $k;

+            $value = $this->fields[$k];

+            $values[$k] = $this->quote($v, $value);

+        }

 

-				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list

-				if (empty($perms)) continue;

+        // Clean and check mandatory

+        foreach($keys as $key)

+        {

+            // If field is an implicit foreign key field

+            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';

+            if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';

 

-				// Load language if required

-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

+            //var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

+            if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))

+            {

+                $error++;

+                $this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);

+            }

 

-				$colspan='3';

-				if (is_array($params) && count($params)>0) {

-					if (array_key_exists('colspan',$params)) {

-						$colspan=$params['colspan'];

-					}

-				}

+            // If field is an implicit foreign key field

+            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';

+            if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';

+        }

 

-				switch($mode) {

-					case "view":

-						$value=$this->array_options["options_".$key.$keysuffix];

-						break;

-					case "edit":

-						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none');				// GETPOST can get value from GET, POST or setup of default values.

-						// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')

-						if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))

-						{

-							if (is_array($getposttemp)) {

-								// $getposttemp is an array but following code expects a comma separated string

-								$value = implode(",", $getposttemp);

-							} else {

-								$value = $getposttemp;

-							}

-						} else {

-							$value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.

-						}

-						//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);

-						break;

-				}

+        if ($error) return -1;

 

-				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')

-				{

-					$out .= $extrafields->showSeparator($key, $this);

-				}

-				else

-				{

-					$csstyle='';

-					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');

-					if (is_array($params) && count($params)>0) {

-						if (array_key_exists('style',$params)) {

-							$csstyle=$params['style'];

-						}

-					}

+        $this->db->begin();

 

-					// add html5 elements

-					$domData  = ' data-element="extrafield"';

-					$domData .= ' data-targetelement="'.$this->element.'"';

-					$domData .= ' data-targetid="'.$this->id.'"';

+        if (! $error)

+        {

+            $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;

+            $sql.= ' ('.implode( ", ", $keys ).')';

+            $sql.= ' VALUES ('.implode( ", ", $values ).')';

+

+            $res = $this->db->query($sql);

+            if ($res===false) {

+                $error++;

+                $this->errors[] = $this->db->lasterror();

+            }

+        }

 

-					$html_id = !empty($this->id) ? 'extrarow-'.$this->element.'_'.$key.'_'.$this->id : '';

+        if (! $error)

+        {

+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);

+        }

 

-					$out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.'" '.$domData.' >';

+        // Create extrafields

+        if (! $error)

+        {

+            $result=$this->insertExtraFields();

+            if ($result < 0) $error++;

+        }

 

-					if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) {

-						if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) {

-                            $colspan = '0';

-                        }

-                    }

+        // Triggers

+        if (! $error && ! $notrigger)

+        {

+            // Call triggers

+            $result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);

+            if ($result < 0) { $error++; }

+            // End call triggers

+        }

 

-					if ($action == 'selectlines') { $colspan++; }

+        // Commit or rollback

+        if ($error) {

+            $this->db->rollback();

+            return -1;

+        } else {

+            $this->db->commit();

+            return $this->id;

+        }

+    }

 

-					// Convert date into timestamp format (value in memory must be a timestamp)

-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))

-					{

-						$datenotinstring = $this->array_options['options_' . $key];

-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility

-						{

-							$datenotinstring = $this->db->jdate($datenotinstring);

-						}

-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;

-					}

-					// Convert float submited string into real php numeric (value in memory must be a php numeric)

-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('price','double')))

-					{

-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)):$this->array_options['options_'.$key];

-					}

-

-					$labeltoshow = $langs->trans($label);

-

-					$out .= '<td class="titlefield';

-					if (GETPOST('action','none') == 'create') $out.='create';

-					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';

-					$out .= '">';

-					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);

-					else $out .= $labeltoshow;

-					$out .= '</td>';

-

-					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';

-					$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';

-

-					switch($mode) {

-						case "view":

-							$out .= $extrafields->showOutputField($key, $value);

-							break;

-						case "edit":

-							$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id);

-							break;

-					}

-

-					$out .= '</td>';

-

-					if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1))

-                        $out .= '</tr>';

-                    else $out .= '</tr>';

-					$e++;

-				}

-			}

-			$out .= "\n";

-			// Add code to manage list depending on others

-			if (!empty(Globals::$conf->use_javascript_ajax)) {

-                $out .= '

-				<script type="text/javascript">

-				    jQuery(document).ready(function() {

-				    	function showOptions(child_list, parent_list)

-				    	{

-				    		var val = $("select[name=\"options_"+parent_list+"\"]").val();

-				    		var parentVal = parent_list + ":" + val;

-							if(val > 0) {

-					    		$("select[name=\""+child_list+"\"] option[parent]").hide();

-					    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();

-							} else {

-								$("select[name=\""+child_list+"\"] option").show();

-							}

-				    	}

-						function setListDependencies() {

-					    	jQuery("select option[parent]").parent().each(function() {

-					    		var child_list = $(this).attr("name");

-								var parent = $(this).find("option[parent]:first").attr("parent");

-								var infos = parent.split(":");

-								var parent_list = infos[0];

-								$("select[name=\""+parent_list+"\"]").change(function() {

-									showOptions(child_list, parent_list);

-								});

-					    	});

-						}

 

-						setListDependencies();

-				    });

-				</script>'."\n";

-				$out .= '<!-- /showOptionalsInput --> '."\n";

-			}

-		}

-		return $out;

-	}

-

-

-	/**

-	 * Returns the rights used for this class

-	 * @return stdClass

-	 */

-	public function getRights()

-	{

-		global $user;

-

-		$element = $this->element;

-		if ($element == 'facturerec') $element='facture';

-

-		return $user->rights->{$element};

-	}

-

-	/**

-	 * Function used to replace a thirdparty id with another one.

-	 * This function is meant to be called from replaceThirdparty with the appropiate tables

-	 * Column name fk_soc MUST be used to identify thirdparties

-	 *

-	 * @param  DoliDB 	   $db 			  Database handler

-	 * @param  int 		   $origin_id     Old thirdparty id (the thirdparty to delete)

-	 * @param  int 		   $dest_id       New thirdparty id (the thirdparty that will received element of the other)

-	 * @param  string[]    $tables        Tables that need to be changed

-	 * @param  int         $ignoreerrors  Ignore errors. Return true even if errors. We need this when replacement can fails like for categories (categorie of old thirdparty may already exists on new one)

-	 * @return bool						  True if success, False if error

-	 */

-	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors=0)

-	{

-		foreach ($tables as $table)

-		{

-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;

-

-			if (! $db->query($sql))

-			{

-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

-				//$this->errors = $db->lasterror();

-				return false;

-			}

-		}

-

-		return true;

-	}

-

-	/**

-	 * Get buy price to use for margin calculation. This function is called when buy price is unknown.

-	 *	 Set buy price = sell price if ForceBuyingPriceIfNull configured,

-	 *   else if calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice

-	 *	 else if calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice

-	 *	 else set min buy price as buy price

-	 *

-	 * @param float		$unitPrice		 Product unit price

-	 * @param float		$discountPercent Line discount percent

-	 * @param int		$fk_product		 Product id

-	 * @return	float                    <0 if KO, buyprice if OK

-	 */

-	public function defineBuyPrice($unitPrice = 0.0, $discountPercent = 0.0, $fk_product = 0)

-	{

-		global $conf;

-

-		$buyPrice = 0;

-

-		if (($unitPrice > 0) && (isset(Globals::$conf->global->ForceBuyingPriceIfNull) && Globals::$conf->global->ForceBuyingPriceIfNull == 1)) { // In most cases, test here is false{

-			$buyPrice = $unitPrice * (1 - $discountPercent / 100);

-		}

-		else

-		{

-			// Get cost price for margin calculation

-			if (! empty($fk_product))

-			{

-				if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'costprice') {

-					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

-					$product = new Product($this->db);

-					$result = $product->fetch($fk_product);

-					if ($result <= 0)

-					{

-						$this->errors[] = 'ErrorProductIdDoesNotExists';

-						return -1;

-					}

-					if ($product->cost_price > 0)

-					{

-						$buyPrice = $product->cost_price;

-					}

-					else if ($product->pmp > 0)

-					{

-						$buyPrice = $product->pmp;

-					}

-				}

-				else if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'pmp') {

-					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

-					$product = new Product($this->db);

-					$result = $product->fetch($fk_product);

-					if ($result <= 0)

-					{

-						$this->errors[] = 'ErrorProductIdDoesNotExists';

-						return -1;

-					}

-					if ($product->pmp > 0)

-					{

-						$buyPrice = $product->pmp;

-					}

-				}

+    /**

+     * Load object in memory from the database

+     *

+     * @param	int    $id				Id object

+     * @param	string $ref				Ref

+     * @param	string	$morewhere		More SQL filters (' AND ...')

+     * @return 	int         			<0 if KO, 0 if not found, >0 if OK

+     */

+    public function fetchCommon($id, $ref = null, $morewhere = '')

+    {

+        if (empty($id) && empty($ref) && empty($morewhere)) return -1;

 

-				if (empty($buyPrice) && isset(Globals::$conf->global->MARGIN_TYPE) && in_array(Globals::$conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice'))) {

-					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';

-					$productFournisseur = new ProductFournisseur($this->db);

-					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)

-					{

-						$buyPrice = $productFournisseur->fourn_unitprice;

-					}

-					else if ($result < 0)

-					{

-						$this->errors[] = $productFournisseur->error;

-						return -2;

-					}

-				}

-			}

-		}

-		return $buyPrice;

-	}

+        $sql = 'SELECT '.$this->getFieldList();

+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

 

-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *  Show photos of an object (nbmax maximum), into several columns

-	 *

-	 *  @param		string	$modulepart		'product', 'ticket', ...

-	 *  @param      string	$sdir        	Directory to scan (full absolute path)

-	 *  @param      int		$size        	0=original size, 1='small' use thumbnail if possible

-	 *  @param      int		$nbmax       	Nombre maximum de photos (0=pas de max)

-	 *  @param      int		$nbbyrow     	Number of image per line or -1 to use div. Used only if size=1.

-	 * 	@param		int		$showfilename	1=Show filename

-	 * 	@param		int		$showaction		1=Show icon with action links (resize, delete)

-	 * 	@param		int		$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.

-	 * 	@param		int		$maxWidth		Max width of original image when size='small'

-	 *  @param      int     $nolink         Do not add a href link to view enlarged imaged into a new tab

-	 *  @param      int     $notitle        Do not add title tag on image

-	 *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)

-	 *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto

-	 */

-	function show_photos($modulepart, $sdir, $size=0, $nbmax=0, $nbbyrow=5, $showfilename=0, $showaction=0, $maxHeight=120, $maxWidth=160, $nolink=0, $notitle=0, $usesharelink=0)

-	{

-        // phpcs:enable

-		global $conf,$user,$langs;

-

-		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';

-		include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';

-

-		$sortfield='position_name';

-		$sortorder='asc';

-

-		$dir = $sdir . '/';

-		$pdir = '/';

-		if ($modulepart == 'ticket')

-		{

-			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';

-			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';

-		}

-		else

-		{

-			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';

-			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';

-		}

-

-		// For backward compatibility

-		if ($modulepart == 'product' && !empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {

-			$dir = $sdir . '/'. get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";

-			$pdir = '/' . get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";

-		}

-

-		// Defined relative dir to DOL_DATA_ROOT

-		$relativedir = '';

-		if ($dir)

-		{

-			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);

-			$relativedir = preg_replace('/^[\\/]/','',$relativedir);

-			$relativedir = preg_replace('/[\\/]$/','',$relativedir);

-		}

-

-		$dirthumb = $dir.'thumbs/';

-		$pdirthumb = $pdir.'thumbs/';

-

-		$return ='<!-- Photo -->'."\n";

-		$nbphoto=0;

-

-		$filearray=dol_dir_list($dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);

-

-		/* if (! empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs

-          {

-          $filearrayold=dol_dir_list($dirold,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);

-          $filearray=array_merge($filearray, $filearrayold);

-          } */

+        if (!empty($id))  $sql.= ' WHERE rowid = '.$id;

+        elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);

+        else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare

+        if ($morewhere)   $sql.= $morewhere;

+        $sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record

 

-		completeFileArrayWithDatabaseInfo($filearray, $relativedir);

+        $res = $this->db->query($sql);

+        if ($res)

+        {

+            $obj = $this->db->fetch_object($res);

+            if ($obj)

+            {

+                $this->setVarsFromFetchObj($obj);

+                return $this->id;

+            }

+            else

+            {

+                return 0;

+            }

+        }

+        else

+        {

+            $this->error = $this->db->lasterror();

+            $this->errors[] = $this->error;

+            return -1;

+        }

+    }

 

-		if (count($filearray))

-		{

-			if ($sortfield && $sortorder)

-			{

-				$filearray=dol_sort_array($filearray, $sortfield, $sortorder);

-			}

+    /**

+     * Update object into database

+     *

+     * @param  User $user      	User that modifies

+     * @param  bool $notrigger 	false=launch triggers after, true=disable triggers

+     * @return int             	<0 if KO, >0 if OK

+     */

+    public function updateCommon(User $user, $notrigger = false)

+    {

+        global $conf, $langs;

 

-			foreach($filearray as $key => $val)

-			{

-				$photo='';

-				$file = $val['name'];

+        $error = 0;

 

-				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory

+        $now=dol_now();

 

-				//if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)

-				if (image_format_supported($file) >= 0)

-				{

-					$nbphoto++;

-					$photo = $file;

-					$viewfilename = $file;

+        $fieldvalues = $this->setSaveQuery();

+        if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);

+        if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;

+        unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.

 

-					if ($size == 1 || $size == 'small') {   // Format vignette

+        $keys=array();

+        $values = array();

+        foreach ($fieldvalues as $k => $v) {

+            $keys[$k] = $k;

+            $value = $this->fields[$k];

+            $values[$k] = $this->quote($v, $value);

+            $tmp[] = $k.'='.$this->quote($v, $this->fields[$k]);

+        }

 

-						// Find name of thumb file

-						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));

-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';

+        // Clean and check mandatory

+        foreach($keys as $key)

+        {

+            if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field

+            if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field

 

-						// Get filesize of original file

-						$imgarray=dol_getImageSize($dir.$photo);

+            //var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

+            /*

+			if ($this->fields[$key]['notnull'] == 1 && empty($values[$key]))

+			{

+				$error++;

+				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);

+			}*/

+        }

 

-						if ($nbbyrow > 0)

-						{

-							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';

+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;

 

-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';

-							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';

-						}

-						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';

+        $this->db->begin();

+        if (! $error)

+        {

+            $res = $this->db->query($sql);

+            if ($res===false)

+            {

+                $error++;

+                $this->errors[] = $this->db->lasterror();

+            }

+        }

 

-						$return.= "\n";

+        // Update extrafield

+        if (!$error && empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0) {

+            $result=$this->insertExtraFields();

+            if ($result < 0)

+            {

+                $error++;

+            }

+        }

 

-						$relativefile=preg_replace('/^\//', '', $pdir.$photo);

-						if (empty($nolink))

-						{

-							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);

-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';

-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';

-						}

+        // Triggers

+        if (! $error && ! $notrigger)

+        {

+            // Call triggers

+            $result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY',$user);

+            if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail

+            // End call triggers

+        }

 

-						// Show image (width height=$maxHeight)

-						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine

-						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;

-						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];

-						if ($notitle) $alt='';

-

-						if ($usesharelink)

-						{

-							if ($val['share'])

-							{

-								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

-								{

-									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';

-									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

-								}

-								else {

-									$return.= '<!-- Show original file -->';

-									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

-								}

-							}

-							else

-							{

-								$return.= '<!-- Show nophoto file (because file is not shared) -->';

-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';

-							}

-						}

-						else

-						{

-							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

-							{

-								$return.= '<!-- Show thumb -->';

-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';

-							}

-							else {

-								$return.= '<!-- Show original file -->';

-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';

-							}

-						}

+        // Commit or rollback

+        if ($error) {

+            $this->db->rollback();

+            return -1;

+        } else {

+            $this->db->commit();

+            return $this->id;

+        }

+    }

 

-						if (empty($nolink)) $return.= '</a>';

-						$return.="\n";

-

-						if ($showfilename) $return.= '<br>'.$viewfilename;

-						if ($showaction)

-						{

-							$return.= '<br>';

-							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites

-							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))

-							{

-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';

-							}

-							// Special cas for product

-							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))

-							{

-								// Link to resize

-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

-

-								// Link to delete

-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

-								$return.= img_delete().'</a>';

-							}

-						}

-						$return.= "\n";

+    /**

+     * Delete object in database

+     *

+     * @param 	User 	$user       			User that deletes

+     * @param 	bool 	$notrigger  			false=launch triggers after, true=disable triggers

+     * @param	int		$forcechilddeletion		0=no, 1=Force deletion of children

+     * @return 	int             				<=0 if KO, >0 if OK

+     */

+    public function deleteCommon(User $user, $notrigger=false, $forcechilddeletion=0)

+    {

+        $error=0;

 

-						if ($nbbyrow > 0)

-						{

-							$return.= '</td>';

-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';

-						}

-						else if ($nbbyrow < 0) $return.='</div>';

-					}

-

-					if (empty($size)) {     // Format origine

-						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';

-

-						if ($showfilename) $return.= '<br>'.$viewfilename;

-						if ($showaction)

-						{

-							// Special case for product

-							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))

-							{

-								// Link to resize

-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

-

-								// Link to delete

-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

-								$return.= img_delete().'</a>';

-							}

-						}

-					}

+        $this->db->begin();

 

-					// On continue ou on arrete de boucler ?

-					if ($nbmax && $nbphoto >= $nbmax) break;

-				}

-			}

+        if ($forcechilddeletion)

+        {

+            foreach($this->childtables as $table)

+            {

+                $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;

+                $resql = $this->db->query($sql);

+                if (! $resql)

+                {

+                    $this->error=$this->db->lasterror();

+                    $this->errors[]=$this->error;

+                    $this->db->rollback();

+                    return -1;

+                }

+            }

+        }

+        elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.

+        {

+            $objectisused = $this->isObjectUsed($this->id);

+            if (! empty($objectisused))

+            {

+                dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);

+                $this->error='ErrorRecordHasChildren';

+                $this->errors[]=$this->error;

+                $this->db->rollback();

+                return 0;

+            }

+        }

 

-			if ($size==1 || $size=='small')

-			{

-				if ($nbbyrow > 0)

-				{

-					// Ferme tableau

-					while ($nbphoto % $nbbyrow)

-					{

-						$return.= '<td width="'.ceil(100/$nbbyrow).'%">&nbsp;</td>';

-						$nbphoto++;

-					}

-

-					if ($nbphoto) $return.= '</table>';

-				}

-			}

-		}

-

-		$this->nbphoto = $nbphoto;

-

-		return $return;

-	}

-

-

-	/**

-	 * Function test if type is array

-	 *

-	 * @param   array   $info   content informations of field

-	 * @return                  bool

-	 */

-	protected function isArray($info)

-	{

-		if(is_array($info))

-		{

-			if(isset($info['type']) && $info['type']=='array') return true;

-			else return false;

-		}

-		else return false;

-	}

-

-	/**

-	 * Function test if type is null

-	 *

-	 * @param   array   $info   content informations of field

-	 * @return                  bool

-	 */

-	protected function isNull($info)

-	{

-		if(is_array($info))

-		{

-			if(isset($info['type']) && $info['type']=='null') return true;

-			else return false;

-		}

-		else return false;

-	}

-

-	/**

-	 * Function test if type is date

-	 *

-	 * @param   array   $info   content informations of field

-	 * @return                  bool

-	 */

-	public function isDate($info)

-	{

-		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;

-		else return false;

-	}

-

-	/**

-	 * Function test if type is integer

-	 *

-	 * @param   array   $info   content informations of field

-	 * @return                  bool

-	 */

-	public function isInt($info)

-	{

-		if(is_array($info))

-		{

-			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;

-			else return false;

-		}

-		else return false;

-	}

-

-	/**

-	 * Function test if type is float

-	 *

-	 * @param   array   $info   content informations of field

-	 * @return                  bool

-	 */

-	public function isFloat($info)

-	{

-		if(is_array($info))

-		{

-			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;

-			else return false;

-		}

-		else return false;

-	}

-

-	/**

-	 * Function test if type is text

-	 *

-	 * @param   array   $info   content informations of field

-	 * @return                  bool

-	 */

-	public function isText($info)

-	{

-		if(is_array($info))

-		{

-			if(isset($info['type']) && $info['type']=='text') return true;

-			else return false;

-		}

-		else return false;

-	}

-

-	/**

-	 * Function test if is indexed

-	 *

-	 * @param   array   $info   content informations of field

-	 * @return                  bool

-	 */

-	protected function isIndex($info)

-	{

-		if(is_array($info))

-		{

-			if(isset($info['index']) && $info['index']==true) return true;

-			else return false;

-		}

-		else return false;

-	}

-

-	/**

-	 * Function to prepare the values to insert.

-	 * Note $this->${field} are set by the page that make the createCommon or the updateCommon.

-	 *

-	 * @return array

-	 */

-	protected function setSaveQuery()

-	{

-		global $conf;

-

-		$queryarray=array();

-		foreach ($this->fields as $field=>$info)	// Loop on definition of fields

-		{

-			// Depending on field type ('datetime', ...)

-			if($this->isDate($info))

-			{

-				if(empty($this->{$field}))

-				{

-					$queryarray[$field] = null;

-				}

-				else

-				{

-					$queryarray[$field] = $this->db->idate($this->{$field});

-				}

-			}

-			else if($this->isArray($info))

-			{

-				if(! empty($this->{$field})) {

-					if(! is_array($this->{$field})) {

-						$this->{$field} = array($this->{$field});

-					}

-					$queryarray[$field] = serialize($this->{$field});

-				} else {

-					$queryarray[$field] = null;

-				}

-			}

-			else if($this->isInt($info))

-			{

-				if ($field == 'entity' && is_null($this->{$field}))

-                    $queryarray[$field] = Globals::$conf->entity;

-                else

-				{

-					$queryarray[$field] = (int) price2num($this->{$field});

-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.

-				}

-			}

-			else if($this->isFloat($info))

-			{

-				$queryarray[$field] = (double) price2num($this->{$field});

-				if (empty($queryarray[$field])) $queryarray[$field]=0;

-			}

-			else

-			{

-				$queryarray[$field] = $this->{$field};

-			}

+        if (! $error) {

+            if (! $notrigger) {

+                // Call triggers

+                $result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);

+                if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail

+                // End call triggers

+            }

+        }

 

-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);

-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;

-		}

+        if (! $error && ! empty($this->isextrafieldmanaged))

+        {

+            $sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element."_extrafields";

+            $sql.= " WHERE fk_object=" . $this->id;

 

-		return $queryarray;

-	}

+            $resql = $this->db->query($sql);

+            if (! $resql)

+            {

+                $this->errors[] = $this->db->lasterror();

+                $error++;

+            }

+        }

 

-	/**

-	 * Function to load data from a SQL pointer into properties of current object $this

-	 *

-	 * @param   stdClass    $obj    Contain data of object from database

-     * @return void

-	 */

-	protected function setVarsFromFetchObj(&$obj)

-	{

-		foreach ($this->fields as $field => $info)

-		{

-			if($this->isDate($info))

-			{

-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;

-				else $this->{$field} = strtotime($obj->{$field});

-			}

-			elseif($this->isArray($info))

-			{

-				if(! empty($obj->{$field})) {

-					$this->{$field} = @unserialize($obj->{$field});

-					// Hack for data not in UTF8

-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));

-				} else {

-					$this->{$field} = array();

-				}

-			}

-			elseif($this->isInt($info))

-			{

-				if ($field == 'rowid') $this->id = (int) $obj->{$field};

-				else $this->{$field} = (int) $obj->{$field};

-			}

-			elseif($this->isFloat($info))

-			{

-				$this->{$field} = (double) $obj->{$field};

-			}

-			elseif($this->isNull($info))

-			{

-				$val = $obj->{$field};

-				// zero is not null

-				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);

-			}

-			else

-			{

-				$this->{$field} = $obj->{$field};

-			}

-		}

-

-		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.

-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;

-	}

-

-	/**

-	 * Function to concat keys of fields

-	 *

-	 * @return string

-	 */

-	protected function getFieldList()

-	{

-		$keys = array_keys($this->fields);

-		return implode(',', $keys);

-	}

-

-	/**

-	 * Add quote to field value if necessary

-	 *

-	 * @param 	string|int	$value			Value to protect

-	 * @param	array		$fieldsentry	Properties of field

-	 * @return 	string

-	 */

-    protected function quote($value, $fieldsentry)

-    {

-		if (is_null($value)) return 'NULL';

-		else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");

-		else return "'".$this->db->escape($value)."'";

-	}

-

-

-	/**

-	 * Create object into database

-	 *

-	 * @param  User $user      User that creates

-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers

-	 * @return int             <0 if KO, Id of created object if OK

-	 */

-	public function createCommon(User $user, $notrigger = false)

-	{

-		global $langs;

-

-		$error = 0;

-

-		$now=dol_now();

-

-		$fieldvalues = $this->setSaveQuery();

-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);

-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;

-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.

-

-		$keys=array();

-		$values = array();

-		foreach ($fieldvalues as $k => $v) {

-			$keys[$k] = $k;

-			$value = $this->fields[$k];

-			$values[$k] = $this->quote($v, $value);

-		}

-

-		// Clean and check mandatory

-		foreach($keys as $key)

-		{

-			// If field is an implicit foreign key field

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';

-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';

-

-			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))

-			{

-				$error++;

-				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);

-			}

+        if (! $error)

+        {

+            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;

 

-			// If field is an implicit foreign key field

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';

-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';

-		}

+            $res = $this->db->query($sql);

+            if($res===false) {

+                $error++;

+                $this->errors[] = $this->db->lasterror();

+            }

+        }

 

-		if ($error) return -1;

+        // Commit or rollback

+        if ($error) {

+            $this->db->rollback();

+            return -1;

+        } else {

+            $this->db->commit();

+            return 1;

+        }

+    }

 

-		$this->db->begin();

+    /**

+     * Initialise object with example values

+     * Id must be 0 if object instance is a specimen

+     *

+     * @return void

+     */

+    public function initAsSpecimenCommon()

+    {

+        $this->id = 0;

 

-		if (! $error)

-		{

-			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;

-			$sql.= ' ('.implode( ", ", $keys ).')';

-			$sql.= ' VALUES ('.implode( ", ", $values ).')';

+        // TODO...

+    }

 

-			$res = $this->db->query($sql);

-			if ($res===false) {

-				$error++;

-				$this->errors[] = $this->db->lasterror();

-			}

-		}

-

-		if (! $error)

-		{

-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);

-		}

-

-		// Create extrafields

-		if (! $error)

-		{

-			$result=$this->insertExtraFields();

-			if ($result < 0) $error++;

-		}

-

-		// Triggers

-		if (! $error && ! $notrigger)

-		{

-			// Call triggers

-			$result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);

-			if ($result < 0) { $error++; }

-			// End call triggers

-		}

-

-		// Commit or rollback

-		if ($error) {

-			$this->db->rollback();

-			return -1;

-		} else {

-			$this->db->commit();

-			return $this->id;

-		}

-	}

-

-

-	/**

-	 * Load object in memory from the database

-	 *

-	 * @param	int    $id				Id object

-	 * @param	string $ref				Ref

-	 * @param	string	$morewhere		More SQL filters (' AND ...')

-	 * @return 	int         			<0 if KO, 0 if not found, >0 if OK

-	 */

-	public function fetchCommon($id, $ref = null, $morewhere = '')

-	{

-		if (empty($id) && empty($ref) && empty($morewhere)) return -1;

-

-		$sql = 'SELECT '.$this->getFieldList();

-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

-

-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;

-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);

-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare

-		if ($morewhere)   $sql.= $morewhere;

-		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record

-

-		$res = $this->db->query($sql);

-		if ($res)

-		{

-			$obj = $this->db->fetch_object($res);

-			if ($obj)

-			{

-				$this->setVarsFromFetchObj($obj);

-				return $this->id;

-			}

-			else

-			{

-				return 0;

-			}

-		}

-		else

-		{

-			$this->error = $this->db->lasterror();

-			$this->errors[] = $this->error;

-			return -1;

-		}

-	}

-

-	/**

-	 * Update object into database

-	 *

-	 * @param  User $user      	User that modifies

-	 * @param  bool $notrigger 	false=launch triggers after, true=disable triggers

-	 * @return int             	<0 if KO, >0 if OK

-	 */

-	public function updateCommon(User $user, $notrigger = false)

-	{

-		global $conf, $langs;

-

-		$error = 0;

-

-		$now=dol_now();

-

-		$fieldvalues = $this->setSaveQuery();

-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);

-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;

-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.

-

-		$keys=array();

-		$values = array();

-		foreach ($fieldvalues as $k => $v) {

-			$keys[$k] = $k;

-			$value = $this->fields[$k];

-			$values[$k] = $this->quote($v, $value);

-			$tmp[] = $k.'='.$this->quote($v, $this->fields[$k]);

-		}

-

-		// Clean and check mandatory

-		foreach($keys as $key)

-		{

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field

-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field

-

-			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

-			/*

-			if ($this->fields[$key]['notnull'] == 1 && empty($values[$key]))

-			{

-				$error++;

-				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);

-			}*/

-		}

 

-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;

+    /* Part for comments */

 

-		$this->db->begin();

-		if (! $error)

-		{

-			$res = $this->db->query($sql);

-			if ($res===false)

-			{

-				$error++;

-				$this->errors[] = $this->db->lasterror();

-			}

-		}

-

-		// Update extrafield

-		if (!$error && empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0) {

-			$result=$this->insertExtraFields();

-			if ($result < 0)

-			{

-				$error++;

-			}

-		}

-

-		// Triggers

-		if (! $error && ! $notrigger)

-		{

-			// Call triggers

-			$result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY',$user);

-			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail

-			// End call triggers

-		}

-

-		// Commit or rollback

-		if ($error) {

-			$this->db->rollback();

-			return -1;

-		} else {

-			$this->db->commit();

-			return $this->id;

-		}

-	}

-

-	/**

-	 * Delete object in database

-	 *

-	 * @param 	User 	$user       			User that deletes

-	 * @param 	bool 	$notrigger  			false=launch triggers after, true=disable triggers

-	 * @param	int		$forcechilddeletion		0=no, 1=Force deletion of children

-	 * @return 	int             				<=0 if KO, >0 if OK

-	 */

-	public function deleteCommon(User $user, $notrigger=false, $forcechilddeletion=0)

-	{

-		$error=0;

-

-		$this->db->begin();

-

-		if ($forcechilddeletion)

-		{

-			foreach($this->childtables as $table)

-			{

-				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;

-				$resql = $this->db->query($sql);

-				if (! $resql)

-				{

-					$this->error=$this->db->lasterror();

-					$this->errors[]=$this->error;

-					$this->db->rollback();

-					return -1;

-				}

-			}

-		}

-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.

-		{

-			$objectisused = $this->isObjectUsed($this->id);

-			if (! empty($objectisused))

-			{

-				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);

-				$this->error='ErrorRecordHasChildren';

-				$this->errors[]=$this->error;

-				$this->db->rollback();

-				return 0;

-			}

-		}

-

-		if (! $error) {

-			if (! $notrigger) {

-				// Call triggers

-				$result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);

-				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail

-				// End call triggers

-			}

-		}

-

-		if (! $error && ! empty($this->isextrafieldmanaged))

-		{

-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element."_extrafields";

-			$sql.= " WHERE fk_object=" . $this->id;

-

-			$resql = $this->db->query($sql);

-			if (! $resql)

-			{

-				$this->errors[] = $this->db->lasterror();

-				$error++;

-			}

-		}

+    /**

+     * Load comments linked with current task

+     *	@return boolean	1 if ok

+     */

+    public function fetchComments()

+    {

+        require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';

 

-		if (! $error)

-		{

-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;

+        $comment = new Comment($this->db);

+        $result=$comment->fetchAllFor($this->element, $this->id);

+        if ($result<0) {

+            $this->errors=array_merge($this->errors, $comment->errors);

+            return -1;

+        } else {

+            $this->comments = $comment->comments;

+        }

+        return count($this->comments);

+    }

 

-			$res = $this->db->query($sql);

-			if($res===false) {

-				$error++;

-				$this->errors[] = $this->db->lasterror();

-			}

-		}

-

-		// Commit or rollback

-		if ($error) {

-			$this->db->rollback();

-			return -1;

-		} else {

-			$this->db->commit();

-			return 1;

-		}

-	}

-

-	/**

-	 * Initialise object with example values

-	 * Id must be 0 if object instance is a specimen

-	 *

-	 * @return void

-	 */

-	public function initAsSpecimenCommon()

-	{

-		$this->id = 0;

-

-		// TODO...

-	}

-

-

-	/* Part for comments */

-

-	/**

-	 * Load comments linked with current task

-	 *	@return boolean	1 if ok

-	 */

-	public function fetchComments()

-	{

-		require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';

-

-		$comment = new Comment($this->db);

-		$result=$comment->fetchAllFor($this->element, $this->id);

-		if ($result<0) {

-			$this->errors=array_merge($this->errors, $comment->errors);

-			return -1;

-		} else {

-			$this->comments = $comment->comments;

-		}

-		return count($this->comments);

-	}

-

-	/**

-	 * Return nb comments already posted

-	 *

-	 * @return int

-	 */

-	public function getNbComments()

-	{

-		return count($this->comments);

-	}

+    /**

+     * Return nb comments already posted

+     *

+     * @return int

+     */

+    public function getNbComments()

+    {

+        return count($this->comments);

+    }

 

     /**

      * Trim object parameters

Spacing +1479 added lines, -1479 removed lines

@@ -35,7 +35,7 @@ 
 	/**

 	 * @var string[]	Array of error strings

 	 */

-	public $errors=array();

+	public $errors = array();

 

 	/**

 	 * @var string ID to identify managed object

@@ -50,7 +50,7 @@ 
 	/**

 	 * @var int    Name of subtable line

 	 */

-	public $table_element_line='';

+	public $table_element_line = '';

 

 	/**

 	 * @var string		Key value used to track if data is coming from import wizard

@@ -60,7 +60,7 @@ 
 	/**

 	 * @var mixed		Contains data to manage extrafields

 	 */

-	public $array_options=array();

+	public $array_options = array();

 

 	/**

 	 * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked

@@ -89,7 +89,7 @@ 
 	/**

 	 * @var array<string,mixed>		Can be used to pass information when only object is provided to method

 	 */

-	public $context=array();

+	public $context = array();

 

 	/**

 	 * @var string		Contains canvas name if record is an alternative canvas record

@@ -349,7 +349,7 @@ 
 	 * @var mixed		Contains comments

 	 * @see fetchComments()

 	 */

-	public $comments=array();

+	public $comments = array();

 

 	/**

 	 * @var int

@@ -375,9 +375,9 @@ 
 	public $civility_id;

 

 	// Dates

-	public $date_creation;			// Date creation

-	public $date_validation;		// Date validation

-	public $date_modification;		// Date last change (tms field)

+	public $date_creation; // Date creation

+	public $date_validation; // Date validation

+	public $date_modification; // Date last change (tms field)

 

 

 

@@ -393,30 +393,30 @@ 
 	 *  @param	string	$ref_ext	Ref ext of object to check

 	 *  @return int     			<0 if KO, 0 if OK but not found, >0 if OK and exists

 	 */

-	static function isExistingObject($element, $id, $ref='', $ref_ext='')

+	static function isExistingObject($element, $id, $ref = '', $ref_ext = '')

 	{

-		global $db,$conf;

+		global $db, $conf;

 

 		$sql = "SELECT rowid, ref, ref_ext";

-		$sql.= " FROM ".MAIN_DB_PREFIX.$element;

-		$sql.= " WHERE entity IN (".getEntity($element).")" ;

+		$sql .= " FROM ".MAIN_DB_PREFIX.$element;

+		$sql .= " WHERE entity IN (".getEntity($element).")";

 

-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);

-		else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";

-		else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";

+		if ($id > 0) $sql .= " AND rowid = ".$db->escape($id);

+		else if ($ref) $sql .= " AND ref = '".$db->escape($ref)."'";

+		else if ($ref_ext) $sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";

 		else {

-			$error='ErrorWrongParameters';

+			$error = 'ErrorWrongParameters';

 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);

 			return -1;

 		}

 		if ($ref || $ref_ext)

-            $sql .= " AND entity = " . Globals::$conf->entity;

+            $sql .= " AND entity = ".Globals::$conf->entity;

 

         dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);

 		$resql = $db->query($sql);

 		if ($resql)

 		{

-			$num=$db->num_rows($resql);

+			$num = $db->num_rows($resql);

 			if ($num > 0) return 1;

 			else return 0;

 		}

@@ -430,7 +430,7 @@ 
 	 */

 	function errorsToString()

 	{

-		return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ',$this->errors)):'');

+		return $this->error.(is_array($this->errors) ? (($this->error != '' ? ', ' : '').join(', ', $this->errors)) : '');

 	}

 

 	/**

@@ -442,18 +442,18 @@ 
 	 * 	@param	int			$maxlen			Maximum length

 	 * 	@return	string						String with full name

 	 */

-	function getFullName($langs,$option=0,$nameorder=-1,$maxlen=0)

+	function getFullName($langs, $option = 0, $nameorder = -1, $maxlen = 0)

 	{

 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";

-		$lastname=$this->lastname;

-		$firstname=$this->firstname;

-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));

+		$lastname = $this->lastname;

+		$firstname = $this->firstname;

+		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));

 

-		$ret='';

+		$ret = '';

 		if ($option && $this->civility_id)

 		{

-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';

-			else $ret.=$this->civility_id.' ';

+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id) != "Civility".$this->civility_id) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';

+			else $ret .= $this->civility_id.' ';

 		}

 

 		$ret .= AlDolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder);

@@ -469,24 +469,24 @@ 
 	 *  @param		int		    $withregion			1=Add region into address string

 	 *	@return		string							Full address string

 	 */

-	function getFullAddress($withcountry=0, $sep="\n", $withregion=0)

+	function getFullAddress($withcountry = 0, $sep = "\n", $withregion = 0)

 	{

 		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))

 		{

-			require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';

-			$tmparray=getCountry($this->country_id,'all');

-			$this->country_code=$tmparray['code'];

-			$this->country     =$tmparray['label'];

+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

+			$tmparray = getCountry($this->country_id, 'all');

+			$this->country_code = $tmparray['code'];

+			$this->country     = $tmparray['label'];

 		}

 

         if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde)))

     	{

-    		require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';

-    		$tmparray=getState($this->state_id,'all',0,1);

-			$this->state_code   =$tmparray['code'];

-			$this->state        =$tmparray['label'];

-			$this->region_code  =$tmparray['region_code'];

-			$this->region       =$tmparray['region'];

+    		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

+    		$tmparray = getState($this->state_id, 'all', 0, 1);

+			$this->state_code   = $tmparray['code'];

+			$this->state        = $tmparray['label'];

+			$this->region_code  = $tmparray['region_code'];

+			$this->region       = $tmparray['region'];

         }

 

 		return dol_format_address($this, $withcountry, $sep);

@@ -504,105 +504,105 @@ 
 	{

 		global $conf, $langs;

 

-		$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS

+		$countriesusingstate = array('AU', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also option MAIN_FORCE_STATE_INTO_ADDRESS

 

-		$contactid=0;

-		$thirdpartyid=0;

+		$contactid = 0;

+		$thirdpartyid = 0;

 		if ($this->element == 'societe')

 		{

-			$thirdpartyid=$this->id;

+			$thirdpartyid = $this->id;

 		}

 		if ($this->element == 'contact')

 		{

-			$contactid=$this->id;

-			$thirdpartyid=$object->fk_soc;

+			$contactid = $this->id;

+			$thirdpartyid = $object->fk_soc;

 		}

 		if ($this->element == 'user')

 		{

-			$contactid=$this->contact_id;

-			$thirdpartyid=$object->fk_soc;

+			$contactid = $this->contact_id;

+			$thirdpartyid = $object->fk_soc;

 		}

 

-		$out='<!-- BEGIN part to show address block -->';

+		$out = '<!-- BEGIN part to show address block -->';

 

-		$outdone=0;

+		$outdone = 0;

 		$coords = $this->getFullAddress(1, ', ', Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);

         if ($coords)

 		{

 			if (!empty(Globals::$conf->use_javascript_ajax)) {

-				$namecoords = $this->getFullName($langs,1).'<br>'.$coords;

+				$namecoords = $this->getFullName($langs, 1).'<br>'.$coords;

 				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile

-				$out.='<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';

-				$out.=img_picto($langs->trans("Address"), 'object_address.png');

-				$out.='</a> ';

+				$out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';

+				$out .= img_picto($langs->trans("Address"), 'object_address.png');

+				$out .= '</a> ';

 			}

-			$out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;

+			$out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;

 			$outdone++;

 		}

 

 		if (!in_array($this->country_code, $countriesusingstate) && empty(Globals::$conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress

             && empty(Globals::$conf->global->SOCIETE_DISABLE_STATE) && $this->state) {

             if (!empty(Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {

-                $out.=($outdone?' - ':'').$this->region.' - '.$this->state;

+                $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;

             }

             else {

-                $out.=($outdone?' - ':'').$this->state;

+                $out .= ($outdone ? ' - ' : '').$this->state;

             }

 			$outdone++;

 		}

 

-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');

-		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone

-			$out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

+		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');

+		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone

+			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;

 		}

-		if (! empty($this->phone_pro)) {

-			$out.=dol_print_phone($this->phone_pro,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

+		if (!empty($this->phone_pro)) {

+			$out .= dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;

 		}

-		if (! empty($this->phone_mobile)) {

-			$out.=dol_print_phone($this->phone_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;

+		if (!empty($this->phone_mobile)) {

+			$out .= dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;

 		}

-		if (! empty($this->phone_perso)) {

-			$out.=dol_print_phone($this->phone_perso,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePerso")); $outdone++;

+		if (!empty($this->phone_perso)) {

+			$out .= dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso")); $outdone++;

 		}

-		if (! empty($this->office_phone)) {

-			$out.=dol_print_phone($this->office_phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

+		if (!empty($this->office_phone)) {

+			$out .= dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;

 		}

-		if (! empty($this->user_mobile)) {

-			$out.=dol_print_phone($this->user_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;

+		if (!empty($this->user_mobile)) {

+			$out .= dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;

 		}

-		if (! empty($this->fax)) {

-			$out.=dol_print_phone($this->fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;

+		if (!empty($this->fax)) {

+			$out .= dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;

 		}

-		if (! empty($this->office_fax)) {

-			$out.=dol_print_phone($this->office_fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;

+		if (!empty($this->office_fax)) {

+			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;

 		}

 

-		$out.='<div style="clear: both;"></div>';

-		$outdone=0;

-		if (! empty($this->email))

+		$out .= '<div style="clear: both;"></div>';

+		$outdone = 0;

+		if (!empty($this->email))

 		{

-			$out.=dol_print_email($this->email,$this->id,$object->id,'AC_EMAIL',0,0,1);

+			$out .= dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);

 			$outdone++;

 		}

-		if (! empty($this->url))

+		if (!empty($this->url))

 		{

-			$out.=dol_print_url($this->url,'_goout',0,1);

+			$out .= dol_print_url($this->url, '_goout', 0, 1);

 			$outdone++;

 		}

-		$out.='<div style="clear: both;">';

+		$out .= '<div style="clear: both;">';

 		if (!empty(Globals::$conf->socialnetworks->enabled)) {

-			if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');

+			if ($this->skype) $out .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');

 			$outdone++;

-			if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');

+			if ($this->jabberid) $out .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');

 			$outdone++;

-			if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');

+			if ($this->twitter) $out .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');

 			$outdone++;

-			if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');

+			if ($this->facebook) $out .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');

 			$outdone++;

 		}

-		$out.='</div>';

+		$out .= '</div>';

 

-		$out.='<!-- END Part to show address block -->';

+		$out .= '<!-- END Part to show address block -->';

 

 		return $out;

 	}

@@ -615,17 +615,17 @@ 
 	 * @param	int		$relativelink		0=Return full external link, 1=Return link relative to root of file

 	 * @return	string						Link or empty string if there is no download link

 	 */

-	function getLastMainDocLink($modulepart, $initsharekey=0, $relativelink=0)

+	function getLastMainDocLink($modulepart, $initsharekey = 0, $relativelink = 0)

 	{

 		global $user, $dolibarr_main_url_root;

 

 		if (empty($this->last_main_doc))

 		{

-			return '';		// No way to known which document name to use

+			return ''; // No way to known which document name to use

 		}

 

 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

-		$ecmfile=new EcmFiles($this->db);

+		$ecmfile = new EcmFiles($this->db);

 		$result = $ecmfile->fetch(0, '', $this->last_main_doc);

 		if ($result < 0)

 		{

@@ -673,26 +673,26 @@ 
 		}

 

 		// Define $urlwithroot

-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));

-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file

+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-		$forcedownload=0;

+		$forcedownload = 0;

 

-		$paramlink='';

+		$paramlink = '';

 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.

 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.

 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash

-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share

-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';

+		if (!empty($ecmfile->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share

+		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';

 

 		if ($relativelink)

 		{

-			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');

+			$linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : '');

 		}

 		else

 		{

-			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');

+			$linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');

 		}

 

 		// Here $ecmfile->share is defined

@@ -710,10 +710,10 @@ 
 	 *  @param  int		$notrigger			Disable all triggers

 	 *  @return int                 		<0 if KO, >0 if OK

 	 */

-	function add_contact($fk_socpeople, $type_contact, $source='external',$notrigger=0)

+	function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)

 	{

         // phpcs:enable

-		global $user,$langs;

+		global $user, $langs;

 

 

 		dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");

@@ -722,43 +722,43 @@ 
 		if ($fk_socpeople <= 0)

 		{

 			$langs->load("errors");

-			$this->error=$langs->trans("ErrorWrongValueForParameterX","1");

-			dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);

+			$this->error = $langs->trans("ErrorWrongValueForParameterX", "1");

+			dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);

 			return -1;

 		}

-		if (! $type_contact)

+		if (!$type_contact)

 		{

 			$langs->load("errors");

-			$this->error=$langs->trans("ErrorWrongValueForParameterX","2");

-			dol_syslog(get_class($this)."::add_contact ".$this->error,LOG_ERR);

+			$this->error = $langs->trans("ErrorWrongValueForParameterX", "2");

+			dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);

 			return -2;

 		}

 

-		$id_type_contact=0;

+		$id_type_contact = 0;

 		if (is_numeric($type_contact))

 		{

-			$id_type_contact=$type_contact;

+			$id_type_contact = $type_contact;

 		}

 		else

 		{

 			// We look for id type_contact

 			$sql = "SELECT tc.rowid";

-			$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

-			$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";

-			$sql.= " AND tc.source='".$this->db->escape($source)."'";

-			$sql.= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";

+			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

+			$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";

+			$sql .= " AND tc.source='".$this->db->escape($source)."'";

+			$sql .= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";

 			//print $sql;

-			$resql=$this->db->query($sql);

+			$resql = $this->db->query($sql);

 			if ($resql)

 			{

 				$obj = $this->db->fetch_object($resql);

-				if ($obj) $id_type_contact=$obj->rowid;

+				if ($obj) $id_type_contact = $obj->rowid;

 			}

 		}

 

 		if ($id_type_contact == 0)

 		{

-			$this->error='CODE_NOT_VALID_FOR_THIS_ELEMENT';

+			$this->error = 'CODE_NOT_VALID_FOR_THIS_ELEMENT';

 			dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");

 			return -3;

 		}

@@ -766,35 +766,35 @@ 
 		$datecreate = dol_now();

 

 		// Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error

-		$TListeContacts=$this->liste_contact(-1, $source);

-		$already_added=false;

-		if(!empty($TListeContacts)) {

-			foreach($TListeContacts as $array_contact) {

-				if($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {

-					$already_added=true;

+		$TListeContacts = $this->liste_contact(-1, $source);

+		$already_added = false;

+		if (!empty($TListeContacts)) {

+			foreach ($TListeContacts as $array_contact) {

+				if ($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {

+					$already_added = true;

 					break;

 				}

 			}

 		}

 

-		if(!$already_added) {

+		if (!$already_added) {

 

 			$this->db->begin();

 

 			// Insert into database

 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";

-			$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";

-			$sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;

-			$sql.= "'".$this->db->idate($datecreate)."'";

-			$sql.= ", 4, ". $id_type_contact;

-			$sql.= ")";

+			$sql .= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";

+			$sql .= " VALUES (".$this->id.", ".$fk_socpeople." , ";

+			$sql .= "'".$this->db->idate($datecreate)."'";

+			$sql .= ", 4, ".$id_type_contact;

+			$sql .= ")";

 

-			$resql=$this->db->query($sql);

+			$resql = $this->db->query($sql);

 			if ($resql)

 			{

-				if (! $notrigger)

+				if (!$notrigger)

 				{

-					$result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);

+					$result = $this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);

 					if ($result < 0)

 					{

 						$this->db->rollback();

@@ -809,14 +809,14 @@ 
 			{

 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')

 				{

-					$this->error=$this->db->errno();

+					$this->error = $this->db->errno();

 					$this->db->rollback();

 					echo 'err rollback';

 					return -2;

 				}

 				else

 				{

-					$this->error=$this->db->error();

+					$this->error = $this->db->error();

 					$this->db->rollback();

 					return -1;

 				}

@@ -832,15 +832,15 @@ 
 	 *    @param    string          $source     Nature of contact ('internal' or 'external')

 	 *    @return   int                         >0 if OK, <0 if KO

 	 */

-	function copy_linked_contact($objFrom, $source='internal')

+	function copy_linked_contact($objFrom, $source = 'internal')

 	{

         // phpcs:enable

 		$contacts = $objFrom->liste_contact(-1, $source);

-		foreach($contacts as $contact)

+		foreach ($contacts as $contact)

 		{

 			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)

 			{

-				$this->error=$this->db->lasterror();

+				$this->error = $this->db->lasterror();

 				return -1;

 			}

 		}

@@ -857,23 +857,23 @@ 
 	 *      @param  int		$fk_socpeople	    Id of soc_people to update (not modified if 0)

 	 *      @return int                 		<0 if KO, >= 0 if OK

 	 */

-	function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0)

+	function update_contact($rowid, $statut, $type_contact_id = 0, $fk_socpeople = 0)

 	{

         // phpcs:enable

 		// Insert into database

 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";

-		$sql.= " statut = ".$statut;

-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";

-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";

-		$sql.= " where rowid = ".$rowid;

-		$resql=$this->db->query($sql);

+		$sql .= " statut = ".$statut;

+		if ($type_contact_id) $sql .= ", fk_c_type_contact = '".$type_contact_id."'";

+		if ($fk_socpeople) $sql .= ", fk_socpeople = '".$fk_socpeople."'";

+		$sql .= " where rowid = ".$rowid;

+		$resql = $this->db->query($sql);

 		if ($resql)

 		{

 			return 0;

 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			return -1;

 		}

 	}

@@ -886,7 +886,7 @@ 
 	 *    @param	int		$notrigger		Disable all triggers

 	 *    @return   int						>0 if OK, <0 if KO

 	 */

-	function delete_contact($rowid, $notrigger=0)

+	function delete_contact($rowid, $notrigger = 0)

 	{

         // phpcs:enable

 		global $user;

@@ -895,14 +895,14 @@ 
 		$this->db->begin();

 

 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";

-		$sql.= " WHERE rowid =".$rowid;

+		$sql .= " WHERE rowid =".$rowid;

 

 		dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);

 		if ($this->db->query($sql))

 		{

-			if (! $notrigger)

+			if (!$notrigger)

 			{

-				$result=$this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);

+				$result = $this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);

 				if ($result < 0) { $this->db->rollback(); return -1; }

 			}

 

@@ -911,7 +911,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

@@ -925,22 +925,22 @@ 
 	 *	  @param	string	$code		Type of contact (code or id)

 	 *    @return   int					>0 if OK, <0 if KO

 	 */

-	function delete_linked_contact($source='',$code='')

+	function delete_linked_contact($source = '', $code = '')

 	{

         // phpcs:enable

 		$temp = array();

-		$typeContact = $this->liste_type_contact($source,'',0,0,$code);

+		$typeContact = $this->liste_type_contact($source, '', 0, 0, $code);

 

-		foreach($typeContact as $key => $value)

+		foreach ($typeContact as $key => $value)

 		{

-			array_push($temp,$key);

+			array_push($temp, $key);

 		}

 		$listId = implode(",", $temp);

 

 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";

-		$sql.= " WHERE element_id = ".$this->id;

+		$sql .= " WHERE element_id = ".$this->id;

 		if ($listId)

-			$sql.= " AND fk_c_type_contact IN (".$listId.")";

+			$sql .= " AND fk_c_type_contact IN (".$listId.")";

 

 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);

 		if ($this->db->query($sql))

@@ -949,7 +949,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			return -1;

 		}

 	}

@@ -964,54 +964,54 @@ 
 	 *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)

 	 *    @return	array|int		        Array of contacts, -1 if error

 	 */

-	function liste_contact($statut=-1,$source='external',$list=0,$code='')

+	function liste_contact($statut = -1, $source = 'external', $list = 0, $code = '')

 	{

         // phpcs:enable

 		global $langs;

 

-		$tab=array();

-

-		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user

-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";

-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";

-		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";

-		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";

-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";

-		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";

-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";

-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";

-		$sql.= " WHERE ec.element_id =".$this->id;

-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";

-		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";

-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";

-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";

-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";

-		$sql.= " AND tc.active=1";

-		if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";

-		$sql.=" ORDER BY t.lastname ASC";

+		$tab = array();

+

+		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact"; // This field contains id of llx_socpeople or id of llx_user

+		if ($source == 'internal') $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";

+		if ($source == 'external' || $source == 'thirdparty') $sql .= ", t.fk_soc as socid, t.statut as statuscontact";

+		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";

+		$sql .= ", tc.source, tc.element, tc.code, tc.libelle";

+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";

+		$sql .= ", ".MAIN_DB_PREFIX."element_contact ec";

+		if ($source == 'internal') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";

+		if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";

+		$sql .= " WHERE ec.element_id =".$this->id;

+		$sql .= " AND ec.fk_c_type_contact=tc.rowid";

+		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";

+		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";

+		if ($source == 'internal') $sql .= " AND tc.source = 'internal'";

+		if ($source == 'external' || $source == 'thirdparty') $sql .= " AND tc.source = 'external'";

+		$sql .= " AND tc.active=1";

+		if ($statut >= 0) $sql .= " AND ec.statut = '".$statut."'";

+		$sql .= " ORDER BY t.lastname ASC";

 

 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);

-		$resql=$this->db->query($sql);

+		$resql = $this->db->query($sql);

 		if ($resql)

 		{

-			$num=$this->db->num_rows($resql);

-			$i=0;

+			$num = $this->db->num_rows($resql);

+			$i = 0;

 			while ($i < $num)

 			{

 				$obj = $this->db->fetch_object($resql);

 

-				if (! $list)

+				if (!$list)

 				{

-					$transkey="TypeContact_".$obj->element."_".$obj->source."_".$obj->code;

-					$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);

-					$tab[$i]=array('source'=>$obj->source,'socid'=>$obj->socid,'id'=>$obj->id,

-								   'nom'=>$obj->lastname,      // For backward compatibility

+					$transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;

+					$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);

+					$tab[$i] = array('source'=>$obj->source, 'socid'=>$obj->socid, 'id'=>$obj->id,

+								   'nom'=>$obj->lastname, // For backward compatibility

 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,

 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);

 				}

 				else

 				{

-					$tab[$i]=$obj->id;

+					$tab[$i] = $obj->id;

 				}

 

 				$i++;

@@ -1021,7 +1021,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			dol_print_error($this->db);

 			return -1;

 		}

@@ -1037,16 +1037,16 @@ 
 	function swapContactStatus($rowid)

 	{

 		$sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";

-		$sql.= " tc.code, tc.libelle";

+		$sql .= " tc.code, tc.libelle";

 		//$sql.= ", s.fk_soc";

-		$sql.= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";

+		$sql .= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";

 		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe

-		$sql.= " WHERE ec.rowid =".$rowid;

-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";

-		$sql.= " AND tc.element = '".$this->db->escape($this->element)."'";

+		$sql .= " WHERE ec.rowid =".$rowid;

+		$sql .= " AND ec.fk_c_type_contact=tc.rowid";

+		$sql .= " AND tc.element = '".$this->db->escape($this->element)."'";

 

 		dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);

-		$resql=$this->db->query($sql);

+		$resql = $this->db->query($sql);

 		if ($resql)

 		{

 			$obj = $this->db->fetch_object($resql);

@@ -1057,7 +1057,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->error();

+			$this->error = $this->db->error();

 			dol_print_error($this->db);

 			return -1;

 		}

@@ -1074,44 +1074,44 @@ 
 	 *		@param	string	$code		Type of contact (Example: 'CUSTOMER', 'SERVICE')

 	 *      @return array       		Array list of type of contacts (id->label if option=0, code->label if option=1)

 	 */

-	function liste_type_contact($source='internal', $order='position', $option=0, $activeonly=0, $code='')

+	function liste_type_contact($source = 'internal', $order = 'position', $option = 0, $activeonly = 0, $code = '')

 	{

         // phpcs:enable

 		global $langs;

 

-		if (empty($order)) $order='position';

-		if ($order == 'position') $order.=',code';

+		if (empty($order)) $order = 'position';

+		if ($order == 'position') $order .= ',code';

 

 		$tab = array();

 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";

-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

-		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";

-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types

-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";

-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";

-		$sql.= $this->db->order($order,'ASC');

+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

+		$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";

+		if ($activeonly == 1) $sql .= " AND tc.active=1"; // only the active types

+		if (!empty($source) && $source != 'all') $sql .= " AND tc.source='".$this->db->escape($source)."'";

+		if (!empty($code)) $sql .= " AND tc.code='".$this->db->escape($code)."'";

+		$sql .= $this->db->order($order, 'ASC');

 

 		//print "sql=".$sql;

-		$resql=$this->db->query($sql);

+		$resql = $this->db->query($sql);

 		if ($resql)

 		{

-			$num=$this->db->num_rows($resql);

-			$i=0;

+			$num = $this->db->num_rows($resql);

+			$i = 0;

 			while ($i < $num)

 			{

 				$obj = $this->db->fetch_object($resql);

 

-				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;

-				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);

-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;

-				else $tab[$obj->code]=$libelle_type;

+				$transkey = "TypeContact_".$this->element."_".$source."_".$obj->code;

+				$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);

+				if (empty($option)) $tab[$obj->rowid] = $libelle_type;

+				else $tab[$obj->code] = $libelle_type;

 				$i++;

 			}

 			return $tab;

 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			//dol_print_error($this->db);

 			return null;

 		}

@@ -1128,53 +1128,53 @@ 
 	 *		@param	int		$status		limited to a certain status

 	 *      @return array       		List of id for such contacts

 	 */

-	function getIdContact($source,$code,$status=0)

+	function getIdContact($source, $code, $status = 0)

 	{

 		global $conf;

 

-		$result=array();

-		$i=0;

+		$result = array();

+		$i = 0;

 		//cas particulier pour les expeditions

-		if($this->element=='shipping' && $this->origin_id != 0) {

-			$id=$this->origin_id;

-			$element='commande';

-        } else if($this->element=='reception' && $this->origin_id != 0) {

-            $id=$this->origin_id;

-            $element='order_supplier';

+		if ($this->element == 'shipping' && $this->origin_id != 0) {

+			$id = $this->origin_id;

+			$element = 'commande';

+        } else if ($this->element == 'reception' && $this->origin_id != 0) {

+            $id = $this->origin_id;

+            $element = 'order_supplier';

 		} else {

-			$id=$this->id;

-			$element=$this->element;

+			$id = $this->id;

+			$element = $this->element;

 		}

 

 		$sql = "SELECT ec.fk_socpeople";

-		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";

-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";

-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";

-		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";

-		$sql.= " WHERE ec.element_id = ".$id;

-		$sql.= " AND ec.fk_socpeople = c.rowid";

-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";

-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";

-		$sql.= " AND ec.fk_c_type_contact = tc.rowid";

-		$sql.= " AND tc.element = '".$element."'";

-		$sql.= " AND tc.source = '".$source."'";

-		$sql.= " AND tc.code = '".$code."'";

-		$sql.= " AND tc.active = 1";

-		if ($status) $sql.= " AND ec.statut = ".$status;

+		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";

+		if ($source == 'internal') $sql .= " ".MAIN_DB_PREFIX."user as c,";

+		if ($source == 'external') $sql .= " ".MAIN_DB_PREFIX."socpeople as c,";

+		$sql .= " ".MAIN_DB_PREFIX."c_type_contact as tc";

+		$sql .= " WHERE ec.element_id = ".$id;

+		$sql .= " AND ec.fk_socpeople = c.rowid";

+		if ($source == 'internal') $sql .= " AND c.entity IN (".getEntity('user').")";

+		if ($source == 'external') $sql .= " AND c.entity IN (".getEntity('societe').")";

+		$sql .= " AND ec.fk_c_type_contact = tc.rowid";

+		$sql .= " AND tc.element = '".$element."'";

+		$sql .= " AND tc.source = '".$source."'";

+		$sql .= " AND tc.code = '".$code."'";

+		$sql .= " AND tc.active = 1";

+		if ($status) $sql .= " AND ec.statut = ".$status;

 

 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);

-		$resql=$this->db->query($sql);

+		$resql = $this->db->query($sql);

 		if ($resql)

 		{

 			while ($obj = $this->db->fetch_object($resql))

 			{

-				$result[$i]=$obj->fk_socpeople;

+				$result[$i] = $obj->fk_socpeople;

 				$i++;

 			}

 		}

 		else

 		{

-			$this->error=$this->db->error();

+			$this->error = $this->db->error();

 			return null;

 		}

 

@@ -1188,16 +1188,16 @@ 
 	 *		@param	int		$contactid      Id du contact. Use this->contactid if empty.

 	 *		@return	int						<0 if KO, >0 if OK

 	 */

-	function fetch_contact($contactid=null)

+	function fetch_contact($contactid = null)

 	{

         // phpcs:enable

-		if (empty($contactid)) $contactid=$this->contactid;

+		if (empty($contactid)) $contactid = $this->contactid;

 

 		if (empty($contactid)) return 0;

 

 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

 		$contact = new Contact($this->db);

-		$result=$contact->fetch($contactid);

+		$result = $contact->fetch($contactid);

 		$this->contact = $contact;

 		return $result;

 	}

@@ -1209,7 +1209,7 @@ 
 	 *		@param		int		$force_thirdparty_id	Force thirdparty id

 	 *		@return		int								<0 if KO, >0 if OK

 	 */

-	function fetch_thirdparty($force_thirdparty_id=0)

+	function fetch_thirdparty($force_thirdparty_id = 0)

 	{

         // phpcs:enable

 		global $conf;

@@ -1217,7 +1217,7 @@ 
 		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))

 			return 0;

 

-		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';

 

 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);

 		if ($force_thirdparty_id)

@@ -1280,7 +1280,7 @@ 
 

 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);

 

-		$idtype=$this->barcode_type;

+		$idtype = $this->barcode_type;

 		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined

 		{

 			if ($this->element == 'product')

@@ -1295,8 +1295,8 @@ 
 			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded

 			{

 				$sql = "SELECT rowid, code, libelle as label, coder";

-				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";

-				$sql.= " WHERE rowid = ".$idtype;

+				$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";

+				$sql .= " WHERE rowid = ".$idtype;

 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);

 				$resql = $this->db->query($sql);

 				if ($resql)

@@ -1329,13 +1329,13 @@ 
         // phpcs:enable

 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

 

-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility

+		if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility

 		if (empty($this->fk_project)) return 0;

 

 		$project = new Project($this->db);

 		$result = $project->fetch($this->fk_project);

 

-		$this->projet = $project;	// deprecated

+		$this->projet = $project; // deprecated

 		$this->project = $project;

 		return $result;

 	}

@@ -1371,7 +1371,7 @@ 
 	{

         // phpcs:enable

 		$user = new User($this->db);

-		$result=$user->fetch($userid);

+		$result = $user->fetch($userid);

 		$this->user = $user;

 		return $result;

 	}

@@ -1409,14 +1409,14 @@ 
 	{

 		global $conf;

 

-		$result=false;

+		$result = false;

 

 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;

-		$sql.= " WHERE ".$field." = '".$key."'";

-		if (! empty($element)) {

-			$sql.= " AND entity IN (".getEntity($element).")";

+		$sql .= " WHERE ".$field." = '".$key."'";

+		if (!empty($element)) {

+			$sql .= " AND entity IN (".getEntity($element).")";

 		} else {

-			$sql .= " AND entity = " . Globals::$conf->entity;

+			$sql .= " AND entity = ".Globals::$conf->entity;

         }

 

 		dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);

@@ -1443,10 +1443,10 @@ 
 	 */

 	function getValueFrom($table, $id, $field)

 	{

-		$result=false;

+		$result = false;

 		if (!empty($id) && !empty($field) && !empty($table)) {

 			$sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;

-			$sql.= " WHERE rowid = ".$id;

+			$sql .= " WHERE rowid = ".$id;

 

 			dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);

 			$resql = $this->db->query($sql);

@@ -1475,36 +1475,36 @@ 
 	 *	@return	int							<0 if KO, >0 if OK

 	 *  @see updateExtraField

 	 */

-	function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='', $fk_user_field='fk_user_modif')

+	function setValueFrom($field, $value, $table = '', $id = null, $format = '', $id_field = '', $fuser = null, $trigkey = '', $fk_user_field = 'fk_user_modif')

 	{

-		global $user,$langs,$conf;

+		global $user, $langs, $conf;

 

-		if (empty($table)) 	  $table=$this->table_element;

-		if (empty($id))    	  $id=$this->id;

-		if (empty($format))   $format='text';

-		if (empty($id_field)) $id_field='rowid';

+		if (empty($table)) 	  $table = $this->table_element;

+		if (empty($id))    	  $id = $this->id;

+		if (empty($format))   $format = 'text';

+		if (empty($id_field)) $id_field = 'rowid';

 

-		$error=0;

+		$error = 0;

 

 		$this->db->begin();

 

 		// Special case

-		if ($table == 'product' && $field == 'note_private') $field='note';

+		if ($table == 'product' && $field == 'note_private') $field = 'note';

 		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";

 

-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";

-		else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);

-		else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");

+		if ($format == 'text') $sql .= $field." = '".$this->db->escape($value)."'";

+		else if ($format == 'int') $sql .= $field." = ".$this->db->escape($value);

+		else if ($format == 'date') $sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");

 

 		if ($fk_user_field)

 		{

-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;

-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;

+			if (!empty($fuser) && is_object($fuser)) $sql .= ", ".$fk_user_field." = ".$fuser->id;

+			elseif (empty($fuser) || $fuser != 'none') $sql .= ", ".$fk_user_field." = ".$user->id;

 		}

 

-		$sql.= " WHERE ".$id_field." = ".$id;

+		$sql .= " WHERE ".$id_field." = ".$id;

 

 		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);

 		$resql = $this->db->query($sql);

@@ -1521,11 +1521,11 @@ 
 				{

 					$result = $this->fetchCommon($id);

 				}

-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors

+				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors

 				if ($result < 0) $error++;

 			}

 

-			if (! $error)

+			if (!$error)

 			{

 				if (property_exists($this, $field)) $this->$field = $value;

 				$this->db->commit();

@@ -1539,7 +1539,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

@@ -1554,14 +1554,14 @@ 
 	 *		@param	int		$nodbprefix	Do not include DB prefix to forge table name

 	 *      @return int         		<0 if KO, >0 if OK

 	 */

-	function load_previous_next_ref($filter, $fieldid, $nodbprefix=0)

+	function load_previous_next_ref($filter, $fieldid, $nodbprefix = 0)

 	{

         // phpcs:enable

 		global $conf, $user;

 

-		if (! $this->table_element)

+		if (!$this->table_element)

 		{

-			dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");

+			dol_print_error('', get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");

 			return -1;

 		}

 		if ($fieldid == 'none') return 1;

@@ -1576,45 +1576,45 @@ 
 		if ($this->element == 'societe') $alias = 'te';

 

 		$sql = "SELECT MAX(te.".$fieldid.")";

-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";

+		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";

 		if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-            $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";

-		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid

-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid

-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

-		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;

-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';

-		if (! empty($filter))

-		{

-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility

-			$sql.=$filter;

-		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid

+            $sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";

+		}

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid

+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid

+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

+		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)

+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;

+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';

+		if (!empty($filter))

+		{

+			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility

+			$sql .= $filter;

+		}

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid

 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

 			if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

                 if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) {

-                    $sql.= " AND te.entity IS NOT NULL"; // Show all users

+                    $sql .= " AND te.entity IS NOT NULL"; // Show all users

 				} else {

-					$sql.= " AND ug.fk_user = te.rowid";

-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";

+					$sql .= " AND ug.fk_user = te.rowid";

+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";

 				}

 			} else {

-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';

+				$sql .= ' AND te.entity IN ('.getEntity($this->element).')';

 			}

 		}

-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;

-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';

-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;

+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;

+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';

+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;

 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

 

 		$result = $this->db->query($sql);

-		if (! $result)

+		if (!$result)

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			return -1;

 		}

 		$row = $this->db->fetch_row($result);

@@ -1622,46 +1622,46 @@ 
 

 

 		$sql = "SELECT MIN(te.".$fieldid.")";

-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";

+		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";

 		if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-            $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";

-		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid

-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid

-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

-		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;

-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';

-		if (! empty($filter))

-		{

-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility

-			$sql.=$filter;

-		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid

+            $sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";

+		}

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid

+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid

+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

+		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)

+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;

+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';

+		if (!empty($filter))

+		{

+			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility

+			$sql .= $filter;

+		}

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid

 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

 			if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

                 if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) {

-                    $sql.= " AND te.entity IS NOT NULL"; // Show all users

+                    $sql .= " AND te.entity IS NOT NULL"; // Show all users

 				} else {

-					$sql.= " AND ug.fk_user = te.rowid";

-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";

+					$sql .= " AND ug.fk_user = te.rowid";

+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";

 				}

 			} else {

-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';

+				$sql .= ' AND te.entity IN ('.getEntity($this->element).')';

 			}

 		}

-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;

-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';

-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;

+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;

+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';

+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;

 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null

 

 		$result = $this->db->query($sql);

-		if (! $result)

+		if (!$result)

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			return -2;

 		}

 		$row = $this->db->fetch_row($result);

@@ -1678,11 +1678,11 @@ 
 	 *      @return array				Array of id of contacts (if source=external or internal)

 	 * 									Array of id of third parties with at least one contact on object (if source=thirdparty)

 	 */

-	function getListContactId($source='external')

+	function getListContactId($source = 'external')

 	{

 		$contactAlreadySelected = array();

-		$tab = $this->liste_contact(-1,$source);

-		$num=count($tab);

+		$tab = $this->liste_contact(-1, $source);

+		$num = count($tab);

 		$i = 0;

 		while ($i < $num)

 		{

@@ -1702,24 +1702,24 @@ 
 	 */

 	function setProject($projectid)

 	{

-		if (! $this->table_element)

+		if (!$this->table_element)

 		{

-			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined",LOG_ERR);

+			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

 

 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

 		if ($this->table_element == 'actioncomm')

 		{

-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;

-			else $sql.= ' SET fk_project = NULL';

-			$sql.= ' WHERE id = '.$this->id;

+			if ($projectid) $sql .= ' SET fk_project = '.$projectid;

+			else $sql .= ' SET fk_project = NULL';

+			$sql .= ' WHERE id = '.$this->id;

 		}

 		else

 		{

-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;

-			else $sql.= ' SET fk_projet = NULL';

-			$sql.= ' WHERE rowid = '.$this->id;

+			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;

+			else $sql .= ' SET fk_projet = NULL';

+			$sql .= ' WHERE rowid = '.$this->id;

 		}

 

 		dol_syslog(get_class($this)."::setProject", LOG_DEBUG);

@@ -1765,14 +1765,14 @@ 
 			else

 			{

 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());

-				$this->error=$this->db->error();

+				$this->error = $this->db->error();

 				return -1;

 			}

 		}

 		else

 		{

 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');

-			$this->error='Status of the object is incompatible '.$this->statut;

+			$this->error = 'Status of the object is incompatible '.$this->statut;

 			return -2;

 		}

 	}

@@ -1799,21 +1799,21 @@ 
 				$this->multicurrency_code = $code;

 

 				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);

-				if ($rate) $this->setMulticurrencyRate($rate,2);

+				if ($rate) $this->setMulticurrencyRate($rate, 2);

 

 				return 1;

 			}

 			else

 			{

 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());

-				$this->error=$this->db->error();

+				$this->error = $this->db->error();

 				return -1;

 			}

 		}

 		else

 		{

 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');

-			$this->error='Status of the object is incompatible '.$this->statut;

+			$this->error = 'Status of the object is incompatible '.$this->statut;

 			return -2;

 		}

 	}

@@ -1825,7 +1825,7 @@ 
 	 *  @param		int		$mode	mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency

 	 *  @return		int				>0 if OK, <0 if KO

 	 */

-	function setMulticurrencyRate($rate, $mode=1)

+	function setMulticurrencyRate($rate, $mode = 1)

 	{

 		dol_syslog(get_class($this).'::setMulticurrencyRate('.$id.')');

 		if ($this->statut >= 0 || $this->element == 'societe')

@@ -1845,7 +1845,7 @@ 
 				{

 					foreach ($this->lines as &$line)

 					{

-						if($mode == 1) {

+						if ($mode == 1) {

 							$line->subprice = 0;

 						}

 

@@ -1853,14 +1853,14 @@ 
 							case 'propal':

 								$this->updateline(

 									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,

-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

 									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,

 									$line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

 								);

 								break;

 							case 'commande':

 								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,

 									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,

 									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,

 									$line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

@@ -1868,7 +1868,7 @@ 
 								break;

 							case 'facture':

 								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,

 									$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,

 									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,

 									$line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice

@@ -1877,21 +1877,21 @@ 
 							case 'supplier_proposal':

 								$this->updateline(

 									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,

-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

 									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,

 									$line->ref_fourn, $line->multicurrency_subprice

 								);

 								break;

 							case 'order_supplier':

 								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,

 									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,

 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

 								);

 								break;

 							case 'invoice_supplier':

 								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,

 									$line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,

 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

 								);

@@ -1908,14 +1908,14 @@ 
 			else

 			{

 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());

-				$this->error=$this->db->error();

+				$this->error = $this->db->error();

 				return -1;

 			}

 		}

 		else

 		{

 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');

-			$this->error='Status of the object is incompatible '.$this->statut;

+			$this->error = 'Status of the object is incompatible '.$this->statut;

 			return -2;

 		}

 	}

@@ -1945,20 +1945,20 @@ 
 				$this->cond_reglement_id = $id;

 				// for supplier

 				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;

-				$this->cond_reglement = $id;	// for compatibility

+				$this->cond_reglement = $id; // for compatibility

 				return 1;

 			}

 			else

 			{

 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());

-				$this->error=$this->db->error();

+				$this->error = $this->db->error();

 				return -1;

 			}

 		}

 		else

 		{

 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');

-			$this->error='Status of the object is incompatible '.$this->statut;

+			$this->error = 'Status of the object is incompatible '.$this->statut;

 			return -2;

 		}

 	}

@@ -1976,7 +1976,7 @@ 
 		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;

-		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";

+		$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";

 

 		if ($this->db->query($sql))

 		{

@@ -1985,7 +1985,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->error();

+			$this->error = $this->db->error();

 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);

 			return -1;

 		}

@@ -2001,29 +2001,29 @@ 
 	 *

 	 *  @return     int              1 if OK, 0 if KO

 	 */

-	function setShippingMethod($shipping_method_id, $notrigger=false, $userused=null)

+	function setShippingMethod($shipping_method_id, $notrigger = false, $userused = null)

 	{

         global $user;

 

-        if (empty($userused)) $userused=$user;

+        if (empty($userused)) $userused = $user;

 

         $error = 0;

 

-		if (! $this->table_element) {

-			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined",LOG_ERR);

+		if (!$this->table_element) {

+			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

 

         $this->db->begin();

 

-		if ($shipping_method_id<0) $shipping_method_id='NULL';

+		if ($shipping_method_id < 0) $shipping_method_id = 'NULL';

 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET fk_shipping_method = ".$shipping_method_id;

-		$sql.= " WHERE rowid=".$this->id;

+		$sql .= " SET fk_shipping_method = ".$shipping_method_id;

+		$sql .= " WHERE rowid=".$this->id;

         $resql = $this->db->query($sql);

-		if (! $resql) {

+		if (!$resql) {

 			dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);

 			$this->error = $this->db->lasterror();

 			$error++;

@@ -2031,8 +2031,8 @@ 
             if (!$notrigger)

             {

                 // Call trigger

-                $this->context=array('shippingmethodupdate'=>1);

-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

+                $this->context = array('shippingmethodupdate'=>1);

+                $result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);

                 if ($result < 0) $error++;

                 // End call trigger

             }

@@ -2042,7 +2042,7 @@ 
             $this->db->rollback();

             return -1;

         } else {

-            $this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;

+            $this->shipping_method_id = ($shipping_method_id == 'NULL') ?null:$shipping_method_id;

             $this->db->commit();

             return 1;

         }

@@ -2057,23 +2057,23 @@ 
 	 */

 	function setWarehouse($warehouse_id)

 	{

-		if (! $this->table_element) {

-			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);

+		if (!$this->table_element) {

+			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

-		if ($warehouse_id<0) $warehouse_id='NULL';

+		if ($warehouse_id < 0) $warehouse_id = 'NULL';

 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET fk_warehouse = ".$warehouse_id;

-		$sql.= " WHERE rowid=".$this->id;

+		$sql .= " SET fk_warehouse = ".$warehouse_id;

+		$sql .= " WHERE rowid=".$this->id;

 

 		if ($this->db->query($sql)) {

-			$this->warehouse_id = ($warehouse_id=='NULL')?null:$warehouse_id;

+			$this->warehouse_id = ($warehouse_id == 'NULL') ?null:$warehouse_id;

 			return 1;

 		} else {

 			dol_syslog(get_class($this).'::setWarehouse Error ', LOG_DEBUG);

-			$this->error=$this->db->error();

+			$this->error = $this->db->error();

 			return 0;

 		}

 	}

@@ -2088,25 +2088,25 @@ 
 	 */

 	function setDocModel($user, $modelpdf)

 	{

-		if (! $this->table_element)

+		if (!$this->table_element)

 		{

-			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined",LOG_ERR);

+			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

 

-		$newmodelpdf=dol_trunc($modelpdf,255);

+		$newmodelpdf = dol_trunc($modelpdf, 255);

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";

-		$sql.= " WHERE rowid = ".$this->id;

+		$sql .= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";

+		$sql .= " WHERE rowid = ".$this->id;

 		// if ($this->element == 'facture') $sql.= " AND fk_statut < 2";

 		// if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";

 

 		dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);

-		$resql=$this->db->query($sql);

+		$resql = $this->db->query($sql);

 		if ($resql)

 		{

-			$this->modelpdf=$modelpdf;

+			$this->modelpdf = $modelpdf;

 			return 1;

 		}

 		else

@@ -2125,29 +2125,29 @@ 
 	 *  @param      User	$userused		Object user

 	 *  @return		int				1 if OK, 0 if KO

 	 */

-	function setBankAccount($fk_account, $notrigger=false, $userused=null)

+	function setBankAccount($fk_account, $notrigger = false, $userused = null)

 	{

         global $user;

 

-        if (empty($userused)) $userused=$user;

+        if (empty($userused)) $userused = $user;

 

         $error = 0;

 

-		if (! $this->table_element) {

-			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);

+		if (!$this->table_element) {

+			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

         $this->db->begin();

 

-		if ($fk_account<0) $fk_account='NULL';

+		if ($fk_account < 0) $fk_account = 'NULL';

 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET fk_account = ".$fk_account;

-		$sql.= " WHERE rowid=".$this->id;

+		$sql .= " SET fk_account = ".$fk_account;

+		$sql .= " WHERE rowid=".$this->id;

 

         $resql = $this->db->query($sql);

-        if (! $resql)

+        if (!$resql)

         {

             dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());

             $this->error = $this->db->lasterror();

@@ -2158,8 +2158,8 @@ 
             if (!$notrigger)

             {

                 // Call trigger

-                $this->context=array('bankaccountupdate'=>1);

-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

+                $this->context = array('bankaccountupdate'=>1);

+                $result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);

                 if ($result < 0) $error++;

                 // End call trigger

             }

@@ -2171,7 +2171,7 @@ 
         }

         else

         {

-            $this->fk_account = ($fk_account=='NULL')?null:$fk_account;

+            $this->fk_account = ($fk_account == 'NULL') ?null:$fk_account;

             $this->db->commit();

             return 1;

         }

@@ -2190,26 +2190,26 @@ 
 	 * 	@param		boolean		$fk_parent_line    Table with fk_parent_line field or not

 	 * 	@return		int                            <0 if KO, >0 if OK

 	 */

-	function line_order($renum=false, $rowidorder='ASC', $fk_parent_line=true)

+	function line_order($renum = false, $rowidorder = 'ASC', $fk_parent_line = true)

 	{

         // phpcs:enable

-		if (! $this->table_element_line)

+		if (!$this->table_element_line)

 		{

-			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined",LOG_ERR);

+			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined", LOG_ERR);

 			return -1;

 		}

-		if (! $this->fk_element)

+		if (!$this->fk_element)

 		{

-			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined",LOG_ERR);

+			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined", LOG_ERR);

 			return -1;

 		}

 

 		// Count number of lines to reorder (according to choice $renum)

-		$nl=0;

+		$nl = 0;

 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;

-		if (! $renum) $sql.= ' AND rang = 0';

-		if ($renum) $sql.= ' AND rang <> 0';

+		$sql .= ' WHERE '.$this->fk_element.'='.$this->id;

+		if (!$renum) $sql .= ' AND rang = 0';

+		if ($renum) $sql .= ' AND rang <> 0';

 

 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);

 		$resql = $this->db->query($sql);

@@ -2223,28 +2223,28 @@ 
 		{

 			// The goal of this part is to reorder all lines, with all children lines sharing the same

 			// counter that parents.

-			$rows=array();

+			$rows = array();

 

 			// We first search all lines that are parent lines (for multilevel details lines)

 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';

-			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;

+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+			if ($fk_parent_line) $sql .= ' AND fk_parent_line IS NULL';

+			$sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;

 

 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);

 			$resql = $this->db->query($sql);

 			if ($resql)

 			{

-				$i=0;

+				$i = 0;

 				$num = $this->db->num_rows($resql);

 				while ($i < $num)

 				{

 					$row = $this->db->fetch_row($resql);

-					$rows[] = $row[0];	// Add parent line into array rows

+					$rows[] = $row[0]; // Add parent line into array rows

 					$childrens = $this->getChildrenOfLine($row[0]);

-					if (! empty($childrens))

+					if (!empty($childrens))

 					{

-						foreach($childrens as $child)

+						foreach ($childrens as $child)

 						{

 							array_push($rows, $child);

 						}

@@ -2253,11 +2253,11 @@ 
 				}

 

 				// Now we set a new number for each lines (parent and children with children included into parent tree)

-				if (! empty($rows))

+				if (!empty($rows))

 				{

-					foreach($rows as $key => $row)

+					foreach ($rows as $key => $row)

 					{

-						$this->updateRangOfLine($row, ($key+1));

+						$this->updateRangOfLine($row, ($key + 1));

 					}

 				}

 			}

@@ -2277,18 +2277,18 @@ 
 	 */

 	function getChildrenOfLine($id)

 	{

-		$rows=array();

+		$rows = array();

 

 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-		$sql.= ' AND fk_parent_line = '.$id;

-		$sql.= ' ORDER BY rang ASC';

+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+		$sql .= ' AND fk_parent_line = '.$id;

+		$sql .= ' ORDER BY rang ASC';

 

 		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);

 		$resql = $this->db->query($sql);

 		if ($resql)

 		{

-			$i=0;

+			$i = 0;

 			$num = $this->db->num_rows($resql);

 			while ($i < $num)

 			{

@@ -2309,7 +2309,7 @@ 
 	 * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not

 	 * 	@return	void

 	 */

-	function line_up($rowid, $fk_parent_line=true)

+	function line_up($rowid, $fk_parent_line = true)

 	{

         // phpcs:enable

 		$this->line_order(false, 'ASC', $fk_parent_line);

@@ -2329,7 +2329,7 @@ 
 	 * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not

 	 * 	@return	void

 	 */

-	function line_down($rowid, $fk_parent_line=true)

+	function line_down($rowid, $fk_parent_line = true)

 	{

         // phpcs:enable

 		$this->line_order(false, 'ASC', $fk_parent_line);

@@ -2351,16 +2351,16 @@ 
 	 * 	@param	int		$rang		Position

 	 * 	@return	void

 	 */

-	function updateRangOfLine($rowid,$rang)

+	function updateRangOfLine($rowid, $rang)

 	{

 		$fieldposition = 'rang';

 		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

 

 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

-		$sql.= ' WHERE rowid = '.$rowid;

+		$sql .= ' WHERE rowid = '.$rowid;

 

 		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);

-		if (! $this->db->query($sql))

+		if (!$this->db->query($sql))

 		{

 			dol_print_error($this->db);

 		}

@@ -2377,9 +2377,9 @@ 
 	{

         // phpcs:enable

 		$num = count($rows);

-		for ($i = 0 ; $i < $num ; $i++)

+		for ($i = 0; $i < $num; $i++)

 		{

-			$this->updateRangOfLine($rows[$i], ($i+1));

+			$this->updateRangOfLine($rows[$i], ($i + 1));

 		}

 	}

 

@@ -2390,21 +2390,21 @@ 
 	 * 	@param	int		$rang		Position

 	 * 	@return	void

 	 */

-	function updateLineUp($rowid,$rang)

+	function updateLineUp($rowid, $rang)

 	{

 		if ($rang > 1)

 		{

 			$fieldposition = 'rang';

 			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

 

-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;

-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-			$sql.= ' AND rang = '.($rang - 1);

-			if ($this->db->query($sql) )

+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+			$sql .= ' AND rang = '.($rang - 1);

+			if ($this->db->query($sql))

 			{

 				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);

-				$sql.= ' WHERE rowid = '.$rowid;

-				if (! $this->db->query($sql) )

+				$sql .= ' WHERE rowid = '.$rowid;

+				if (!$this->db->query($sql))

 				{

 					dol_print_error($this->db);

 				}

@@ -2424,7 +2424,7 @@ 
 	 * 	@param	int		$max		Max

 	 * 	@return	void

 	 */

-	function updateLineDown($rowid,$rang,$max)

+	function updateLineDown($rowid, $rang, $max)

 	{

 		if ($rang < $max)

 		{

@@ -2432,13 +2432,13 @@ 
 			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

 

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-			$sql.= ' AND rang = '.($rang+1);

-			if ($this->db->query($sql) )

+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+			$sql .= ' AND rang = '.($rang + 1);

+			if ($this->db->query($sql))

 			{

-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang+1);

-				$sql.= ' WHERE rowid = '.$rowid;

-				if (! $this->db->query($sql) )

+				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang + 1);

+				$sql .= ' WHERE rowid = '.$rowid;

+				if (!$this->db->query($sql))

 				{

 					dol_print_error($this->db);

 				}

@@ -2459,7 +2459,7 @@ 
 	function getRangOfLine($rowid)

 	{

 		$sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE rowid ='.$rowid;

+		$sql .= ' WHERE rowid ='.$rowid;

 

 		dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);

 		$resql = $this->db->query($sql);

@@ -2479,8 +2479,8 @@ 
 	function getIdOfLine($rang)

 	{

 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-		$sql.= ' AND rang = '.$rang;

+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+		$sql .= ' AND rang = '.$rang;

 		$resql = $this->db->query($sql);

 		if ($resql)

 		{

@@ -2496,22 +2496,22 @@ 
 	 * 	@param		int		$fk_parent_line		Parent line id

 	 *  @return     int  			   			Max value of rang in table of lines

 	 */

-	function line_max($fk_parent_line=0)

+	function line_max($fk_parent_line = 0)

 	{

         // phpcs:enable

 		// Search the last rang with fk_parent_line

 		if ($fk_parent_line)

 		{

 			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-			$sql.= ' AND fk_parent_line = '.$fk_parent_line;

+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+			$sql .= ' AND fk_parent_line = '.$fk_parent_line;

 

 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);

 			$resql = $this->db->query($sql);

 			if ($resql)

 			{

 				$row = $this->db->fetch_row($resql);

-				if (! empty($row[0]))

+				if (!empty($row[0]))

 				{

 					return $row[0];

 				}

@@ -2525,7 +2525,7 @@ 
 		else

 		{

 			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

 

 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);

 			$resql = $this->db->query($sql);

@@ -2547,15 +2547,15 @@ 
 	function update_ref_ext($ref_ext)

 	{

         // phpcs:enable

-		if (! $this->table_element)

+		if (!$this->table_element)

 		{

 			dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

 

 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";

-		$sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;

+		$sql .= " SET ref_ext = '".$this->db->escape($ref_ext)."'";

+		$sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".$this->id;

 

 		dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);

 		if ($this->db->query($sql))

@@ -2565,7 +2565,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->error();

+			$this->error = $this->db->error();

 			return -1;

 		}

 	}

@@ -2578,31 +2578,31 @@ 
 	 *  @param		string		$suffix		'', '_public' or '_private'

 	 *  @return     int      		   		<0 if KO, >0 if OK

 	 */

-	function update_note($note, $suffix='')

+	function update_note($note, $suffix = '')

 	{

         // phpcs:enable

 		global $user;

 

-		if (! $this->table_element)

+		if (!$this->table_element)

 		{

-			$this->error='update_note was called on objet with property table_element not defined';

+			$this->error = 'update_note was called on objet with property table_element not defined';

 			dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

-		if (! in_array($suffix,array('','_public','_private')))

+		if (!in_array($suffix, array('', '_public', '_private')))

 		{

-			$this->error='update_note Parameter suffix must be empty, \'_private\' or \'_public\'';

+			$this->error = 'update_note Parameter suffix must be empty, \'_private\' or \'_public\'';

 			dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);

 			return -2;

 		}

 		// Special cas

 		//var_dump($this->table_element);exit;

-		if ($this->table_element == 'product') $suffix='';

+		if ($this->table_element == 'product') $suffix = '';

 

 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");

-		$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;

-		$sql.= " WHERE rowid =". $this->id;

+		$sql .= " SET note".$suffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");

+		$sql .= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif")." = ".$user->id;

+		$sql .= " WHERE rowid =".$this->id;

 

 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);

 		if ($this->db->query($sql))

@@ -2611,14 +2611,14 @@ 
 			else if ($suffix == '_private') $this->note_private = $note;

 			else

 			{

-				$this->note = $note;      // deprecated

+				$this->note = $note; // deprecated

 				$this->note_private = $note;

 			}

 			return 1;

 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			return -1;

 		}

 	}

@@ -2635,7 +2635,7 @@ 
 	function update_note_public($note)

 	{

         // phpcs:enable

-		return $this->update_note($note,'_public');

+		return $this->update_note($note, '_public');

 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -2649,7 +2649,7 @@ 
 	 *  @param	Societe	$seller				If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object.

 	 *	@return	int    			           	<0 if KO, >0 if OK

 	 */

-	function update_price($exclspec=0,$roundingadjust='none',$nodatabaseupdate=0,$seller=null)

+	function update_price($exclspec = 0, $roundingadjust = 'none', $nodatabaseupdate = 0, $seller = null)

 	{

         // phpcs:enable

 		global $conf, $hookmanager, $action;

@@ -2669,7 +2669,7 @@ 
 		elseif ($this->element == 'supplier_proposal')

 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";

 

-		if (! empty($MODULE)) {

+		if (!empty($MODULE)) {

 			if (!empty(Globals::$conf->global->$MODULE)) {

                 $modsactivated = explode(',', Globals::$conf->global->$MODULE);

                 foreach ($modsactivated as $mod) {

@@ -2681,45 +2681,45 @@ 
 

 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';

 

-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility

+		if ($roundingadjust == '-1') $roundingadjust = 'auto'; // For backward compatibility

 

-		$forcedroundingmode=$roundingadjust;

+		$forcedroundingmode = $roundingadjust;

 		if ($forcedroundingmode == 'auto' && isset(Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND))

             $forcedroundingmode = Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;

-        elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';

+        elseif ($forcedroundingmode == 'auto') $forcedroundingmode = '0';

 

-		$error=0;

+		$error = 0;

 

 		$multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;

 

 		// Define constants to find lines to sum

-		$fieldtva='total_tva';

-		$fieldlocaltax1='total_localtax1';

-		$fieldlocaltax2='total_localtax2';

-		$fieldup='subprice';

+		$fieldtva = 'total_tva';

+		$fieldlocaltax1 = 'total_localtax1';

+		$fieldlocaltax2 = 'total_localtax2';

+		$fieldup = 'subprice';

 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')

 		{

-			$fieldtva='tva';

-			$fieldup='pu_ht';

+			$fieldtva = 'tva';

+			$fieldup = 'pu_ht';

 		}

 		if ($this->element == 'expensereport')

 		{

-			$fieldup='value_unit';

+			$fieldup = 'value_unit';

 		}

 

 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';

-		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';

-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';

-			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';

-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

+		$sql .= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';

+			if ($this->table_element_line == 'facturedet') $sql .= ', situation_percent';

+			$sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

 		if ($exclspec)

 		{

-			$product_field='product_type';

-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field

-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';

+			$product_field = 'product_type';

+			if ($this->table_element_line == 'contratdet') $product_field = ''; // contratdet table has no product_type field

+			if ($product_field) $sql .= ' AND '.$product_field.' <> 9';

 		}

-		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used

+		$sql .= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used

 

 		dol_syslog(get_class($this)."::update_price", LOG_DEBUG);

 		$resql = $this->db->query($sql);

@@ -2733,7 +2733,7 @@ 
 			$total_ht_by_vats  = array();

 			$total_tva_by_vats = array();

 			$total_ttc_by_vats = array();

-			$this->multicurrency_total_ht	= 0;

+			$this->multicurrency_total_ht = 0;

 			$this->multicurrency_total_tva	= 0;

 			$this->multicurrency_total_ttc	= 0;

 

@@ -2744,54 +2744,54 @@ 
 				$obj = $this->db->fetch_object($resql);

 

 				// Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'

-				$parameters=array('fk_element' => $obj->rowid);

+				$parameters = array('fk_element' => $obj->rowid);

 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 

 				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'

 				{

-					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);

-					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);

-					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);

+					$localtax_array = array($obj->localtax1_type, $obj->localtax1_tx, $obj->localtax2_type, $obj->localtax2_tx);

+					$tmpcal = calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);

+					$diff = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);

 					if ($diff)

 					{

-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;

+						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;

 						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

-								$resqlfix=$this->db->query($sqlfix);

-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');

+								$resqlfix = $this->db->query($sqlfix);

+								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');

 								$obj->total_tva = $tmpcal[1];

 								$obj->total_ttc = $tmpcal[2];

 						//

 					}

 				}

 

-				$this->total_ht        += $obj->total_ht;		// The field visible at end of line detail

+				$this->total_ht        += $obj->total_ht; // The field visible at end of line detail

 				$this->total_tva       += $obj->total_tva;

 				$this->total_localtax1 += $obj->total_localtax1;

 				$this->total_localtax2 += $obj->total_localtax2;

 				$this->total_ttc       += $obj->total_ttc;

-				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht;		// The field visible at end of line detail

+				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht; // The field visible at end of line detail

 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;

 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;

 

-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;

-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;

-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;

+				if (!isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate] = 0;

+				if (!isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate] = 0;

+				if (!isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate] = 0;

 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;

 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;

 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;

 

 				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency

 				{

-					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);

-					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);

+					$tmpvat = price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);

+					$diff = price2num($total_tva_by_vats[$obj->vatrate] - $tmpvat, 'MT', 1);

 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";

 					if ($diff)

 					{

 						if (abs($diff) > 0.1) { dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING); exit; }

-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;

+						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;

 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

-								$resqlfix=$this->db->query($sqlfix);

-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');

+								$resqlfix = $this->db->query($sqlfix);

+								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');

 								$this->total_tva -= $diff;

 								$this->total_ttc -= $diff;

 								$total_tva_by_vats[$obj->vatrate] -= $diff;

@@ -2803,11 +2803,11 @@ 
 			}

 

 			// Add revenue stamp to total

-			$this->total_ttc       			+= isset($this->revenuestamp)?$this->revenuestamp:0;

-			$this->multicurrency_total_ttc  += isset($this->revenuestamp)?($this->revenuestamp * $multicurrency_tx):0;

+			$this->total_ttc += isset($this->revenuestamp) ? $this->revenuestamp : 0;

+			$this->multicurrency_total_ttc += isset($this->revenuestamp) ? ($this->revenuestamp * $multicurrency_tx) : 0;

 

 			// Situations totals

-			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE )

+			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)

 			{

 				$prev_sits = $this->get_prev_sits();

 

@@ -2826,17 +2826,17 @@ 
 			$this->db->free($resql);

 

 			// Now update global field total_ht, total_ttc and tva

-			$fieldht='total_ht';

-			$fieldtva='tva';

-			$fieldlocaltax1='localtax1';

-			$fieldlocaltax2='localtax2';

-			$fieldttc='total_ttc';

+			$fieldht = 'total_ht';

+			$fieldtva = 'tva';

+			$fieldlocaltax1 = 'localtax1';

+			$fieldlocaltax2 = 'localtax2';

+			$fieldttc = 'total_ttc';

 			// Specific code for backward compatibility with old field names

-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';

-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';

-			if ($this->element == 'propal')                                                $fieldttc='total';

-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';

-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';

+			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht = 'total';

+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva = 'total_tva';

+			if ($this->element == 'propal')                                                $fieldttc = 'total';

+			if ($this->element == 'expensereport')                                         $fieldtva = 'total_tva';

+			if ($this->element == 'supplier_proposal')                                     $fieldttc = 'total';

 

 			if (empty($nodatabaseupdate))

 			{

@@ -2853,16 +2853,16 @@ 
 

 

 				dol_syslog(get_class($this)."::update_price", LOG_DEBUG);

-				$resql=$this->db->query($sql);

-				if (! $resql)

+				$resql = $this->db->query($sql);

+				if (!$resql)

 				{

 					$error++;

-					$this->error=$this->db->lasterror();

-					$this->errors[]=$this->db->lasterror();

+					$this->error = $this->db->lasterror();

+					$this->errors[] = $this->db->lasterror();

 				}

 			}

 

-			if (! $error)

+			if (!$error)

 			{

 				return 1;

 			}

@@ -2873,7 +2873,7 @@ 
 		}

 		else

 		{

-			dol_print_error($this->db,'Bad request in update_price');

+			dol_print_error($this->db, 'Bad request in update_price');

 			return -1;

 		}

 	}

@@ -2887,30 +2887,30 @@ 
 	 *	@return		int					<=0 if KO, >0 if OK

 	 *	@see		fetchObjectLinked, updateObjectLinked, deleteObjectLinked

 	 */

-	function add_object_linked($origin=null, $origin_id=null)

+	function add_object_linked($origin = null, $origin_id = null)

 	{

         // phpcs:enable

-		$origin = (! empty($origin) ? $origin : $this->origin);

-		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);

+		$origin = (!empty($origin) ? $origin : $this->origin);

+		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);

 

 		// Special case

-		if ($origin == 'order') $origin='commande';

-		if ($origin == 'invoice') $origin='facture';

-		if ($origin == 'invoice_template') $origin='facturerec';

-    	if ($origin == 'supplierorder') $origin='order_supplier';

+		if ($origin == 'order') $origin = 'commande';

+		if ($origin == 'invoice') $origin = 'facture';

+		if ($origin == 'invoice_template') $origin = 'facturerec';

+    	if ($origin == 'supplierorder') $origin = 'order_supplier';

 		$this->db->begin();

 

 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";

-		$sql.= "fk_source";

-		$sql.= ", sourcetype";

-		$sql.= ", fk_target";

-		$sql.= ", targettype";

-		$sql.= ") VALUES (";

-		$sql.= $origin_id;

-		$sql.= ", '".$this->db->escape($origin)."'";

-		$sql.= ", ".$this->id;

-		$sql.= ", '".$this->db->escape($this->element)."'";

-		$sql.= ")";

+		$sql .= "fk_source";

+		$sql .= ", sourcetype";

+		$sql .= ", fk_target";

+		$sql .= ", targettype";

+		$sql .= ") VALUES (";

+		$sql .= $origin_id;

+		$sql .= ", '".$this->db->escape($origin)."'";

+		$sql .= ", ".$this->id;

+		$sql .= ", '".$this->db->escape($this->element)."'";

+		$sql .= ")";

 

 		dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);

 		if ($this->db->query($sql))

@@ -2920,7 +2920,7 @@ 
 	  	}

 	  	else

 	  	{

-	  		$this->error=$this->db->lasterror();

+	  		$this->error = $this->db->lasterror();

 	  		$this->db->rollback();

 	  		return 0;

 	  	}

@@ -2948,33 +2948,33 @@ 
 	 *	@return int							<0 if KO, >0 if OK

 	 *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked

 	 */

-	function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1,$orderby='sourcetype',$loadalsoobjects=1)

+	function fetchObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $clause = 'OR', $alsosametype = 1, $orderby = 'sourcetype', $loadalsoobjects = 1)

 	{

 		global $conf;

 

-		$this->linkedObjectsIds=array();

-		$this->linkedObjects=array();

+		$this->linkedObjectsIds = array();

+		$this->linkedObjects = array();

 

-		$justsource=false;

-		$justtarget=false;

-		$withtargettype=false;

-		$withsourcetype=false;

+		$justsource = false;

+		$justtarget = false;

+		$withtargettype = false;

+		$withsourcetype = false;

 

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))

+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid))

 		{

-			$justsource=true;  // the source (id and type) is a search criteria

-			if (! empty($targettype)) $withtargettype=true;

+			$justsource = true; // the source (id and type) is a search criteria

+			if (!empty($targettype)) $withtargettype = true;

 		}

-		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))

+		if (!empty($targetid) && !empty($targettype) && empty($sourceid))

 		{

-			$justtarget=true;  // the target (id and type) is a search criteria

-			if (! empty($sourcetype)) $withsourcetype=true;

+			$justtarget = true; // the target (id and type) is a search criteria

+			if (!empty($sourcetype)) $withsourcetype = true;

 		}

 

-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);

-		$targetid = (! empty($targetid) ? $targetid : $this->id);

-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);

-		$targettype = (! empty($targettype) ? $targettype : $this->element);

+		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);

+		$targetid = (!empty($targetid) ? $targetid : $this->id);

+		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);

+		$targettype = (!empty($targettype) ? $targettype : $this->element);

 

 		/*if (empty($sourceid) && empty($targetid))

 		 {

@@ -2984,25 +2984,25 @@ 
 

 		// Links between objects are stored in table element_element

 		$sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';

-		$sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';

-		$sql.= " WHERE ";

+		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_element';

+		$sql .= " WHERE ";

 		if ($justsource || $justtarget)

 		{

 			if ($justsource)

 			{

-				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";

-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";

+				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";

+				if ($withtargettype) $sql .= " AND targettype = '".$targettype."'";

 			}

 			else if ($justtarget)

 			{

-				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";

-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";

+				$sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'";

+				if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";

 			}

 		}

 		else

 		{

-			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";

-			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";

+			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";

+			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";

 		}

 		$sql .= ' ORDER BY '.$orderby;

 

@@ -3019,36 +3019,36 @@ 
 				{

 					if ($justsource)

 					{

-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;

+						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;

 					}

 					else if ($justtarget)

 					{

-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;

+						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;

 					}

 				}

 				else

 				{

 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)

 					{

-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;

+						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;

 					}

 					if ($obj->fk_target == $targetid && $obj->targettype == $targettype)

 					{

-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;

+						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;

 					}

 				}

 				$i++;

 			}

 

-			if (! empty($this->linkedObjectsIds))

+			if (!empty($this->linkedObjectsIds))

 			{

 				$tmparray = $this->linkedObjectsIds;

-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)

+				foreach ($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)

 				{

 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)

 					$module = $element = $subelement = $objecttype;

 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'

-						&& preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))

+						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))

 					{

 						$module = $element = $regs[1];

 						$subelement = $regs[2];

@@ -3056,31 +3056,31 @@ 
 

 					$classpath = $element.'/class';

 					// To work with non standard classpath or module name

-					if ($objecttype == 'facture')			{

+					if ($objecttype == 'facture') {

 						$classpath = 'compta/facture/class';

 					}

-					else if ($objecttype == 'facturerec')			{

+					else if ($objecttype == 'facturerec') {

 						$classpath = 'compta/facture/class'; $module = 'facture';

 					}

-					else if ($objecttype == 'propal')			{

+					else if ($objecttype == 'propal') {

 						$classpath = 'comm/propal/class';

 					}

-					else if ($objecttype == 'supplier_proposal')			{

+					else if ($objecttype == 'supplier_proposal') {

 						$classpath = 'supplier_proposal/class';

 					}

-					else if ($objecttype == 'shipping')			{

+					else if ($objecttype == 'shipping') {

 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';

 					}

-					else if ($objecttype == 'delivery')			{

+					else if ($objecttype == 'delivery') {

 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';

 					}

-					else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{

+					else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {

 						$classpath = 'fourn/class'; $module = 'fournisseur';

 					}

-					else if ($objecttype == 'fichinter')			{

+					else if ($objecttype == 'fichinter') {

 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';

 					}

-					else if ($objecttype == 'subscription')			{

+					else if ($objecttype == 'subscription') {

 						$classpath = 'adherents/class'; $module = 'adherent';

 					}

 

@@ -3093,16 +3093,16 @@ 
 					else if ($objecttype == 'invoice_supplier') {

 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';

 					}

-					else if ($objecttype == 'order_supplier')   {

+					else if ($objecttype == 'order_supplier') {

 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';

 					}

-					else if ($objecttype == 'supplier_proposal')   {

+					else if ($objecttype == 'supplier_proposal') {

 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';

 					}

-					else if ($objecttype == 'facturerec')   {

+					else if ($objecttype == 'facturerec') {

 						$classfile = 'facture-rec'; $classname = 'FactureRec';

 					}

-					else if ($objecttype == 'subscription')   {

+					else if ($objecttype == 'subscription') {

 						$classfile = 'subscription'; $classname = 'Subscription';

 					}

 

@@ -3114,7 +3114,7 @@ 
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);

 							if (class_exists($classname))

 							{

-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element

+								foreach ($objectids as $i => $objectid)	// $i is rowid into llx_element_element

 								{

 									$object = new $classname($this->db);

 									$ret = $object->fetch($objectid);

@@ -3151,28 +3151,28 @@ 
 	 *	@return							int	>0 if OK, <0 if KO

 	 *	@see	add_object_linked, fetObjectLinked, deleteObjectLinked

 	 */

-	function updateObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='')

+	function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '')

 	{

-		$updatesource=false;

-		$updatetarget=false;

+		$updatesource = false;

+		$updatetarget = false;

 

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;

-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;

+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;

+		else if (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";

 		if ($updatesource)

 		{

-			$sql.= "fk_source = ".$sourceid;

-			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";

-			$sql.= " WHERE fk_target = ".$this->id;

-			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";

+			$sql .= "fk_source = ".$sourceid;

+			$sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";

+			$sql .= " WHERE fk_target = ".$this->id;

+			$sql .= " AND targettype = '".$this->db->escape($this->element)."'";

 		}

 		else if ($updatetarget)

 		{

-			$sql.= "fk_target = ".$targetid;

-			$sql.= ", targettype = '".$this->db->escape($targettype)."'";

-			$sql.= " WHERE fk_source = ".$this->id;

-			$sql.= " AND sourcetype = '".$this->db->escape($this->element)."'";

+			$sql .= "fk_target = ".$targetid;

+			$sql .= ", targettype = '".$this->db->escape($targettype)."'";

+			$sql .= " WHERE fk_source = ".$this->id;

+			$sql .= " AND sourcetype = '".$this->db->escape($this->element)."'";

 		}

 

 		dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);

@@ -3182,7 +3182,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			return -1;

 		}

 	}

@@ -3198,42 +3198,42 @@ 
 	 *	@return     					int	>0 if OK, <0 if KO

 	 *	@see	add_object_linked, updateObjectLinked, fetchObjectLinked

 	 */

-	function deleteObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='', $rowid='')

+	function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '')

 	{

-		$deletesource=false;

-		$deletetarget=false;

+		$deletesource = false;

+		$deletetarget = false;

 

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;

-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;

+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;

+		else if (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;

 

-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);

-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);

-		$targetid = (! empty($targetid) ? $targetid : $this->id);

-		$targettype = (! empty($targettype) ? $targettype : $this->element);

+		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);

+		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);

+		$targetid = (!empty($targetid) ? $targetid : $this->id);

+		$targettype = (!empty($targettype) ? $targettype : $this->element);

 

 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";

-		$sql.= " WHERE";

+		$sql .= " WHERE";

 		if ($rowid > 0)

 		{

-			$sql.=" rowid = ".$rowid;

+			$sql .= " rowid = ".$rowid;

 		}

 		else

 		{

 			if ($deletesource)

 			{

-				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";

-				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";

+				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";

+				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";

 			}

 			else if ($deletetarget)

 			{

-				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";

-				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";

+				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";

+				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";

 			}

 			else

 			{

-				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";

-				$sql.= " OR";

-				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";

+				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";

+				$sql .= " OR";

+				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";

 			}

 		}

 

@@ -3244,8 +3244,8 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

-			$this->errors[]=$this->error;

+			$this->error = $this->db->lasterror();

+			$this->errors[] = $this->error;

 			return -1;

 		}

 	}

@@ -3259,30 +3259,30 @@ 
 	 *      @param	string	$trigkey		Trigger key to use for trigger

 	 *      @return int						<0 if KO, >0 if OK

 	 */

-	function setStatut($status, $elementId=null, $elementType='', $trigkey='')

+	function setStatut($status, $elementId = null, $elementType = '', $trigkey = '')

 	{

-		global $user,$langs,$conf;

+		global $user, $langs, $conf;

 

-		$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.

+		$savElementId = $elementId; // To be used later to know if we were using the method using the id of this or not.

 

-		$elementId = (!empty($elementId)?$elementId:$this->id);

-		$elementTable = (!empty($elementType)?$elementType:$this->table_element);

+		$elementId = (!empty($elementId) ? $elementId : $this->id);

+		$elementTable = (!empty($elementType) ? $elementType : $this->table_element);

 

 		$this->db->begin();

 

-		$fieldstatus="fk_statut";

-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";

-		if ($elementTable == 'mailing') $fieldstatus="statut";

-		if ($elementTable == 'cronjob') $fieldstatus="status";

-		if ($elementTable == 'user') $fieldstatus="statut";

-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";

-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";

+		$fieldstatus = "fk_statut";

+		if ($elementTable == 'facture_rec') $fieldstatus = "suspended";

+		if ($elementTable == 'mailing') $fieldstatus = "statut";

+		if ($elementTable == 'cronjob') $fieldstatus = "status";

+		if ($elementTable == 'user') $fieldstatus = "statut";

+		if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";

+		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;

-		$sql.= " SET ".$fieldstatus." = ".$status;

+		$sql .= " SET ".$fieldstatus." = ".$status;

 		// If status = 1 = validated, update also fk_user_valid

-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;

-		$sql.= " WHERE rowid=".$elementId;

+		if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = ".$user->id;

+		$sql .= " WHERE rowid=".$elementId;

 

 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);

 		if ($this->db->query($sql))

@@ -3292,27 +3292,27 @@ 
 			// Try autoset of trigkey

 			if (empty($trigkey))

 			{

-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';

-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';

-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';

+				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

+				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

+				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

+				if ($this->element == 'fichinter' && $status == 3) $trigkey = 'FICHINTER_CLASSIFY_DONE';

+				if ($this->element == 'fichinter' && $status == 2) $trigkey = 'FICHINTER_CLASSIFY_BILLED';

+				if ($this->element == 'fichinter' && $status == 1) $trigkey = 'FICHINTER_CLASSIFY_UNBILLED';

 			}

 

 			if ($trigkey)

 			{

 				// Appel des triggers

-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

-				$interface=new Interfaces($this->db);

-				$result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf);

+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';

+				$interface = new Interfaces($this->db);

+				$result = $interface->run_triggers($trigkey, $this, $user, $langs, $conf);

 				if ($result < 0) {

-					$error++; $this->errors=$interface->errors;

+					$error++; $this->errors = $interface->errors;

 				}

 				// Fin appel triggers

 			}

 

-			if (! $error)

+			if (!$error)

 			{

 				$this->db->commit();

 

@@ -3327,13 +3327,13 @@ 
 			else

 			{

 				$this->db->rollback();

-				dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);

+				dol_syslog(get_class($this)."::setStatus ".$this->error, LOG_ERR);

 				return -1;

 			}

 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

@@ -3347,22 +3347,22 @@ 
 	 *  @param      string	$ref    Record ref

 	 *  @return		int				<0 if KO, 0 if nothing done, >0 if OK

 	 */

-	function getCanvas($id=0,$ref='')

+	function getCanvas($id = 0, $ref = '')

 	{

 		global $conf;

 

 		if (empty($id) && empty($ref)) return 0;

 		if (!empty(Globals::$conf->global->MAIN_DISABLE_CANVAS))

-            return 0;    // To increase speed. Not enabled by default.

+            return 0; // To increase speed. Not enabled by default.

 

             // Clean parameters

 		$ref = trim($ref);

 

 		$sql = "SELECT rowid, canvas";

-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " WHERE entity IN (".getEntity($this->element).")";

-		if (! empty($id))  $sql.= " AND rowid = ".$id;

-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";

+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;

+		$sql .= " WHERE entity IN (".getEntity($this->element).")";

+		if (!empty($id))  $sql .= " AND rowid = ".$id;

+		if (!empty($ref)) $sql .= " AND ref = '".$this->db->escape($ref)."'";

 

 		$resql = $this->db->query($sql);

 		if ($resql)

@@ -3370,7 +3370,7 @@ 
 			$obj = $this->db->fetch_object($resql);

 			if ($obj)

 			{

-				$this->canvas   = $obj->canvas;

+				$this->canvas = $obj->canvas;

 				return 1;

 			}

 			else return 0;

@@ -3392,7 +3392,7 @@ 
 	function getSpecialCode($lineid)

 	{

 		$sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE rowid = '.$lineid;

+		$sql .= ' WHERE rowid = '.$lineid;

 		$resql = $this->db->query($sql);

 		if ($resql)

 		{

@@ -3408,14 +3408,14 @@ 
 	 *  @param	int		$id			Force id of object

 	 *  @return	int					<0 if KO, 0 if not used, >0 if already used

 	 */

-	function isObjectUsed($id=0)

+	function isObjectUsed($id = 0)

 	{

 		global $langs;

 

-		if (empty($id)) $id=$this->id;

+		if (empty($id)) $id = $this->id;

 

 		// Check parameters

-		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)

+		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0)

 		{

 			dol_print_error('Called isObjectUsed on a class with property this->childtables not defined');

 			return -1;

@@ -3423,24 +3423,24 @@ 
 

 		$arraytoscan = $this->childtables;

 		// For backward compatibility, we check if array is old format array('table1', 'table2', ...)

-		$tmparray=array_keys($this->childtables);

+		$tmparray = array_keys($this->childtables);

 		if (is_numeric($tmparray[0]))

 		{

 			$arraytoscan = array_flip($this->childtables);

 		}

 

 		// Test if child exists

-		$haschild=0;

-		foreach($arraytoscan as $table => $elementname)

+		$haschild = 0;

+		foreach ($arraytoscan as $table => $elementname)

 		{

 			//print $id.'-'.$table.'-'.$elementname.'<br>';

 			// Check if third party can be deleted

 			$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;

-			$sql.= " WHERE ".$this->fk_element." = ".$id;

-			$resql=$this->db->query($sql);

+			$sql .= " WHERE ".$this->fk_element." = ".$id;

+			$resql = $this->db->query($sql);

 			if ($resql)

 			{

-				$obj=$this->db->fetch_object($resql);

+				$obj = $this->db->fetch_object($resql);

 				if ($obj->nb > 0)

 				{

 					$langs->load("errors");

@@ -3448,24 +3448,24 @@ 
 					$haschild += $obj->nb;

 					if (is_numeric($elementname))	// old usage

 					{

-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);

+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);

 					}

 					else	// new usage: $elementname=Translation key

 					{

-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));

+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));

 					}

-					break;    // We found at least one, we stop here

+					break; // We found at least one, we stop here

 				}

 			}

 			else

 			{

-				$this->errors[]=$this->db->lasterror();

+				$this->errors[] = $this->db->lasterror();

 				return -1;

 			}

 		}

 		if ($haschild > 0)

 		{

-			$this->errors[]="ErrorRecordHasChildren";

+			$this->errors[] = "ErrorRecordHasChildren";

 			return $haschild;

 		}

 		else return 0;

@@ -3477,18 +3477,18 @@ 
 	 *	@param	int		$predefined		-1=All, 0=Count free product/service only, 1=Count predefined product/service only, 2=Count predefined product, 3=Count predefined service

 	 *  @return	int						<0 if KO, 0 if no predefined products, nb of lines with predefined products if found

 	 */

-	function hasProductsOrServices($predefined=-1)

+	function hasProductsOrServices($predefined = -1)

 	{

-		$nb=0;

+		$nb = 0;

 

-		foreach($this->lines as $key => $val)

+		foreach ($this->lines as $key => $val)

 		{

-			$qualified=0;

-			if ($predefined == -1) $qualified=1;

-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;

-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;

-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;

-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;

+			$qualified = 0;

+			if ($predefined == -1) $qualified = 1;

+			if ($predefined == 1 && $val->fk_product > 0) $qualified = 1;

+			if ($predefined == 0 && $val->fk_product <= 0) $qualified = 1;

+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) $qualified = 1;

+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) $qualified = 1;

 			if ($qualified) $nb++;

 		}

 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');

@@ -3502,24 +3502,24 @@ 
 	 */

 	function getTotalDiscount()

 	{

-		$total_discount=0.00;

+		$total_discount = 0.00;

 

 		$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";

-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";

-		$sql.= " WHERE ".$this->fk_element." = ".$this->id;

+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";

+		$sql .= " WHERE ".$this->fk_element." = ".$this->id;

 

 		dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);

 		$resql = $this->db->query($sql);

 		if ($resql)

 		{

-			$num=$this->db->num_rows($resql);

-			$i=0;

+			$num = $this->db->num_rows($resql);

+			$i = 0;

 			while ($i < $num)

 			{

 				$obj = $this->db->fetch_object($resql);

 

 				$pu_ht = $obj->pu_ht;

-				$qty= $obj->qty;

+				$qty = $obj->qty;

 				$total_ht = $obj->total_ht;

 

 				$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));

@@ -3553,17 +3553,17 @@ 
 		{

 			if (isset($line->qty_asked))

 			{

-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''

-				$totalOrdered+=$line->qty_asked;    // defined for shipment only

+				if (empty($totalOrdered)) $totalOrdered = 0; // Avoid warning because $totalOrdered is ''

+				$totalOrdered += $line->qty_asked; // defined for shipment only

 			}

 			if (isset($line->qty_shipped))

 			{

-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''

-				$totalToShip+=$line->qty_shipped;   // defined for shipment only

-            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

+				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''

+				$totalToShip += $line->qty_shipped; // defined for shipment only

+            } else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

             {

-                if (empty($totalToShip)) $totalToShip=0;

-                $totalToShip+=$line->qty;   // defined for reception only

+                if (empty($totalToShip)) $totalToShip = 0;

+                $totalToShip += $line->qty; // defined for reception only

 			}

 

 			// Define qty, weight, volume, weight_units, volume_units

@@ -3576,27 +3576,27 @@ 
 			}

 

 			$weight = $line->weight ? $line->weight : 0;

-            ($weight==0 && !empty($line->product->weight))? $weight=$line->product->weight: 0;

+            ($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;

 			$volume = $line->volume ? $line->volume : 0;

-			($volume==0 && !empty($line->product->volume))? $volume=$line->product->volume: 0;

+			($volume == 0 && !empty($line->product->volume)) ? $volume = $line->product->volume : 0;

 

-			$weight_units=$line->weight_units;

-			($weight_units==0 && !empty($line->product->weight_units))? $weight_units=$line->product->weight_units: 0;

-			$volume_units=$line->volume_units;

-			($volume_units==0 && !empty($line->product->volume_units))? $volume_units=$line->product->volume_units: 0;

+			$weight_units = $line->weight_units;

+			($weight_units == 0 && !empty($line->product->weight_units)) ? $weight_units = $line->product->weight_units : 0;

+			$volume_units = $line->volume_units;

+			($volume_units == 0 && !empty($line->product->volume_units)) ? $volume_units = $line->product->volume_units : 0;

 

-			$weightUnit=0;

-			$volumeUnit=0;

-			if (! empty($weight_units)) $weightUnit = $weight_units;

-			if (! empty($volume_units)) $volumeUnit = $volume_units;

+			$weightUnit = 0;

+			$volumeUnit = 0;

+			if (!empty($weight_units)) $weightUnit = $weight_units;

+			if (!empty($volume_units)) $volumeUnit = $volume_units;

 

-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''

-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''

+			if (empty($totalWeight)) $totalWeight = 0; // Avoid warning because $totalWeight is ''

+			if (empty($totalVolume)) $totalVolume = 0; // Avoid warning because $totalVolume is ''

 

 			//var_dump($line->volume_units);

 			if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

 			{

-				$trueWeightUnit=pow(10, $weightUnit);

+				$trueWeightUnit = pow(10, $weightUnit);

 				$totalWeight += $weight * $qty * $trueWeightUnit;

 			}

 			else {

@@ -3610,18 +3610,18 @@ 
 			$totalWeight += $weight * $qty * $trueWeightUnit;

 		}

 		else

-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units

+					$totalWeight += $weight * $qty; // This may be wrong if we mix different units

 			}

 			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

 			{

 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;

-				$trueVolumeUnit=pow(10, $volumeUnit);

+				$trueVolumeUnit = pow(10, $volumeUnit);

 				//print $line->volume;

 				$totalVolume += $volume * $qty * $trueVolumeUnit;

 			}

 			else

 			{

-				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units

+				$totalVolume += $volume * $qty; // This may be wrong if we mix different units

 			}

 		}

 

@@ -3638,17 +3638,17 @@ 
 	{

 		$this->db->begin();

 

-		$extraparams = (! empty($this->extraparams) ? json_encode($this->extraparams) : null);

+		$extraparams = (!empty($this->extraparams) ? json_encode($this->extraparams) : null);

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");

-		$sql.= " WHERE rowid = ".$this->id;

+		$sql .= " SET extraparams = ".(!empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");

+		$sql .= " WHERE rowid = ".$this->id;

 

 		dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);

 		$resql = $this->db->query($sql);

-		if (! $resql)

+		if (!$resql)

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

@@ -3683,7 +3683,7 @@ 
 			}

 		}

 

-		$out .= (($res->code && $this->location_incoterms)?' - ':'').$this->location_incoterms;

+		$out .= (($res->code && $this->location_incoterms) ? ' - ' : '').$this->location_incoterms;

 

 		return $out;

 	}

@@ -3729,11 +3729,11 @@ 
 		if ($this->id && $this->table_element)

 		{

 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-			$sql.= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");

-			$sql.= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");

-			$sql.= " WHERE rowid = " . $this->id;

+			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");

+			$sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");

+			$sql .= " WHERE rowid = ".$this->id;

 			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);

-			$resql=$this->db->query($sql);

+			$resql = $this->db->query($sql);

 			if ($resql)

 			{

 				$this->fk_incoterms = $id_incoterm;

@@ -3774,24 +3774,24 @@ 
 	 */

 	function formAddObjectLine($dateSelector, $seller, $buyer)

 	{

-		global $conf,$user,$langs,$object,$hookmanager;

-		global $form,$bcnd,$var;

+		global $conf, $user, $langs, $object, $hookmanager;

+		global $form, $bcnd, $var;

 

 		// Line extrafield

 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

 		$extrafieldsline = new AlExtraFields($this->db);

-        $extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);

+        $extralabelslines = $extrafieldsline->fetch_name_optionals_label($this->table_element_line);

 

 		// Output template part (modules that overwrite templates must declare this into descriptor)

 		// Use global variables + $dateSelector + $seller and $buyer

 		$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-        foreach($dirtpls as $reldir)

+        foreach ($dirtpls as $reldir)

 		{

 			$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');

 			if (empty(Globals::$conf->file->strict_mode)) {

-                $res=@include $tpl;

+                $res = @include $tpl;

 			} else {

-				$res=include $tpl; // for debug

+				$res = include $tpl; // for debug

 			}

 			if ($res) break;

 		}

@@ -3815,14 +3815,14 @@ 
 	 *	@param  int	    	$dateSelector      	1=Show also date range input fields

 	 *	@return	void

 	 */

-	function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)

+	function printObjectLines($action, $seller, $buyer, $selected = 0, $dateSelector = 0)

 	{

 		global $conf, $hookmanager, $langs, $user;

 		// TODO We should not use global var for this !

 		global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;

 

 		// Define usemargins

-		$usemargins=0;

+		$usemargins = 0;

 		if (!empty(Globals::$conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande')))

             $usemargins = 1;

 

@@ -3831,9 +3831,9 @@ 
 		// Line extrafield

 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

 		$extrafieldsline = new AlExtraFields($this->db);

-        $extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);

+        $extralabelslines = $extrafieldsline->fetch_name_optionals_label($this->table_element_line);

 

-		$parameters = array('num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

+		$parameters = array('num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

 		$reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 		if (empty($reshook))

 		{

@@ -3862,7 +3862,7 @@ 
 

 			// Multicurrency

 			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

-                print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';

+                print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';

 

             if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';

 

@@ -3877,7 +3877,7 @@ 
 			print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';

 

 			if ($this->situation_cycle_ref) {

-				print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';

+				print '<td class="linecolcycleref" align="right">'.$langs->trans('Progress').'</td>';

 			}

 

 			if ($usemargins && !empty(Globals::$conf->margin->enabled) && empty($user->societe_id)) {

@@ -3900,17 +3900,17 @@ 
 

 			// Multicurrency

 			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

-                print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';

+                print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';

 

             if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';

 

-			print '<td class="linecoledit"></td>';  // No width to allow autodim

+			print '<td class="linecoledit"></td>'; // No width to allow autodim

 

 			print '<td class="linecoldelete" width="10"></td>';

 

 			print '<td class="linecolmove" width="10"></td>';

 

-			if($action == 'selectlines')

+			if ($action == 'selectlines')

 			{

 			    print '<td class="linecolcheckall" align="center">';

 			    print '<input type="checkbox" class="linecheckboxtoggle" />';

@@ -3923,7 +3923,7 @@ 
 		}

 

 		$var = true;

-		$i	 = 0;

+		$i = 0;

 

 		print "<tbody>\n";

 		foreach ($this->lines as $line)

@@ -3936,18 +3936,18 @@ 
 			{

 				if (empty($line->fk_parent_line))

 				{

-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

-					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+					$parameters = array('line'=>$line, 'var'=>$var, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

+					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 				}

 				else

 				{

-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);

-					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+					$parameters = array('line'=>$line, 'var'=>$var, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);

+					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 				}

 			}

 			if (empty($reshook))

 			{

-				$this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline);

+				$this->printObjectLine($action, $line, $var, $num, $i, $dateSelector, $seller, $buyer, $selected, $extrafieldsline);

 			}

 

 			$i++;

@@ -3971,23 +3971,23 @@ 
 	 *  @param  int			$extrafieldsline	Object of extrafield line attribute

 	 *	@return	void

 	 */

-	function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0)

+	function printObjectLine($action, $line, $var, $num, $i, $dateSelector, $seller, $buyer, $selected = 0, $extrafieldsline = 0)

 	{

-		global $conf,$langs,$user,$object,$hookmanager;

-		global $form,$bc,$bcdd;

-		global $object_rights, $disableedit, $disablemove, $disableremove;   // TODO We should not use global var for this !

+		global $conf, $langs, $user, $object, $hookmanager;

+		global $form, $bc, $bcdd;

+		global $object_rights, $disableedit, $disablemove, $disableremove; // TODO We should not use global var for this !

 

 		$object_rights = $this->getRights();

 

-		$element=$this->element;

+		$element = $this->element;

 

-		$text=''; $description=''; $type=0;

+		$text = ''; $description = ''; $type = 0;

 

 		// Show product and description

-		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);

+		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);

 		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.

-		if (! empty($line->date_start)) $type=1; // deprecated

-		if (! empty($line->date_end)) $type=1; // deprecated

+		if (!empty($line->date_start)) $type = 1; // deprecated

+		if (!empty($line->date_end)) $type = 1; // deprecated

 

 		// Ligne en mode visu

 		if ($action != 'editline' || $selected != $line->id)

@@ -4000,13 +4000,13 @@ 
 

 				$product_static->ref = $line->ref; //can change ref in hook

 				$product_static->label = $line->label; //can change label in hook

-				$text=$product_static->getNomUrl(1);

+				$text = $product_static->getNomUrl(1);

 

 				// Define output language and label

 				if (!empty(Globals::$conf->global->MAIN_MULTILANGS)) {

-					if (! is_object($this->thirdparty))

+					if (!is_object($this->thirdparty))

 					{

-						dol_print_error('','Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');

+						dol_print_error('', 'Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');

 						return;

 					}

 

@@ -4014,39 +4014,39 @@ 
 					$prod->fetch($line->fk_product);

 

 					$outputlangs = $langs;

-					$newlang='';

-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');

+					$newlang = '';

+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');

 					if (!empty(Globals::$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang))

-                        $newlang = $this->thirdparty->default_lang;  // For language to language of customer

-                    if (! empty($newlang))

+                        $newlang = $this->thirdparty->default_lang; // For language to language of customer

+                    if (!empty($newlang))

 					{

-						$outputlangs = new Translate("",$conf);

+						$outputlangs = new Translate("", $conf);

 						$outputlangs->setDefaultLang($newlang);

 					}

 

-					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;

+					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;

 				}

 				else

 				{

 					$label = $line->product_label;

 				}

 

-				$text.= ' - '.(! empty($line->label)?$line->label:$label);

+				$text .= ' - '.(!empty($line->label) ? $line->label : $label);

 				$description .= (!empty(Globals::$conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.

             }

 

-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');

+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');

 

 			// Output template part (modules that overwrite templates must declare this into descriptor)

 			// Use global variables + $dateSelector + $seller and $buyer

 			$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-            foreach($dirtpls as $reldir)

+            foreach ($dirtpls as $reldir)

 			{

 				$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');

 				if (empty(Globals::$conf->file->strict_mode)) {

-                    $res=@include $tpl;

+                    $res = @include $tpl;

 				} else {

-					$res=include $tpl; // for debug

+					$res = include $tpl; // for debug

 				}

 				if ($res) break;

 			}

@@ -4055,21 +4055,21 @@ 
 		// Ligne en mode update

 		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)

 		{

-			$label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));

-			$placeholder=' placeholder="'.$langs->trans("Label").'"';

+			$label = (!empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));

+			$placeholder = ' placeholder="'.$langs->trans("Label").'"';

 

-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');

+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');

 

 			// Output template part (modules that overwrite templates must declare this into descriptor)

 			// Use global variables + $dateSelector + $seller and $buyer

 			$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-            foreach($dirtpls as $reldir)

+            foreach ($dirtpls as $reldir)

 			{

 				$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');

 				if (empty(Globals::$conf->file->strict_mode)) {

-                    $res=@include $tpl;

+                    $res = @include $tpl;

 				} else {

-					$res=include $tpl; // for debug

+					$res = include $tpl; // for debug

 				}

 				if ($res) break;

 			}

@@ -4089,7 +4089,7 @@ 
 	 *	@param	string		$restrictlist		''=All lines, 'services'=Restrict to services only

 	 *  @return	void

 	 */

-	function printOriginLinesList($restrictlist='')

+	function printOriginLinesList($restrictlist = '')

 	{

 		global $langs, $hookmanager, $conf;

 

@@ -4099,7 +4099,7 @@ 
 		print '<td align="right">'.$langs->trans('VATRate').'</td>';

 		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';

 		if (!empty(Globals::$conf->multicurrency->enabled))

-            print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';

+            print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';

         print '<td align="right">'.$langs->trans('Qty').'</td>';

 		if (Globals::$conf->global->PRODUCT_USE_UNITS) {

 			print '<td align="left">'.$langs->trans('Unit').'</td>';

@@ -4107,19 +4107,19 @@ 
 		print '<td align="right">'.$langs->trans('ReductionShort').'</td></tr>';

 

 		$var = true;

-		$i	 = 0;

+		$i = 0;

 

-		if (! empty($this->lines))

+		if (!empty($this->lines))

 		{

 			foreach ($this->lines as $line)

 			{

-				if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))

+				if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line)))

 				{

 					if (empty($line->fk_parent_line))

 					{

-						$parameters=array('line'=>$line,'var'=>$var,'i'=>$i);

-						$action='';

-						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks

+						$parameters = array('line'=>$line, 'var'=>$var, 'i'=>$i);

+						$action = '';

+						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 					}

 				}

 				else

@@ -4143,103 +4143,103 @@ 
 	 *	@param	string				$restrictlist		''=All lines, 'services'=Restrict to services only (strike line if not)

 	 * 	@return	void

 	 */

-	function printOriginLine($line, $var, $restrictlist='')

+	function printOriginLine($line, $var, $restrictlist = '')

 	{

 		global $langs, $conf;

 

 		//var_dump($line);

 		if (!empty($line->date_start))

 		{

-			$date_start=$line->date_start;

+			$date_start = $line->date_start;

 		}

 		else

 		{

-			$date_start=$line->date_debut_prevue;

-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;

+			$date_start = $line->date_debut_prevue;

+			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;

 		}

 		if (!empty($line->date_end))

 		{

-			$date_end=$line->date_end;

+			$date_end = $line->date_end;

 		}

 		else

 		{

-			$date_end=$line->date_fin_prevue;

-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;

+			$date_end = $line->date_fin_prevue;

+			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;

 		}

 

 		$this->tpl['label'] = '';

-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');

+		if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');

 

 		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object

 		{

-			$discount=new DiscountAbsolute($this->db);

+			$discount = new DiscountAbsolute($this->db);

 			$discount->fk_soc = $this->socid;

-			$this->tpl['label'].= $discount->getNomUrl(0,'discount');

+			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');

 		}

-		else if (! empty($line->fk_product))

+		else if (!empty($line->fk_product))

 		{

 			$productstatic = new Product($this->db);

 			$productstatic->id = $line->fk_product;

 			$productstatic->ref = $line->ref;

 			$productstatic->type = $line->fk_product_type;

-            if(empty($productstatic->ref)){

+            if (empty($productstatic->ref)) {

 				$line->fetch_product();

 				$productstatic = $line->product;

 			}

 			

-			$this->tpl['label'].= $productstatic->getNomUrl(1);

-			$this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);

+			$this->tpl['label'] .= $productstatic->getNomUrl(1);

+			$this->tpl['label'] .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);

 			// Dates

 			if ($line->product_type == 1 && ($date_start || $date_end))

 			{

-				$this->tpl['label'].= get_date_range($date_start,$date_end);

+				$this->tpl['label'] .= get_date_range($date_start, $date_end);

 			}

 		}

 		else

 		{

-			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));

+			$this->tpl['label'] .= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));

 			if (!empty($line->desc)) {

-				$this->tpl['label'].=$line->desc;

-			}else {

-				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');

+				$this->tpl['label'] .= $line->desc;

+			} else {

+				$this->tpl['label'] .= ($line->label ? '&nbsp;'.$line->label : '');

 			}

 			

 			// Dates

 			if ($line->product_type == 1 && ($date_start || $date_end))

 			{

-				$this->tpl['label'].= get_date_range($date_start,$date_end);

+				$this->tpl['label'] .= get_date_range($date_start, $date_end);

 			}

 		}

 

-		if (! empty($line->desc))

+		if (!empty($line->desc))

 		{

 			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount = new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));

+				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));

 			}

 			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount = new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));

+				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));

 			}

 			elseif ($line->desc == '(EXCESS RECEIVED)')

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount = new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));

+				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));

 			}

 			elseif ($line->desc == '(EXCESS PAID)')

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount = new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));

+				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));

 			}

 			else

 			{

-				$this->tpl['description'] = dol_trunc($line->desc,60);

+				$this->tpl['description'] = dol_trunc($line->desc, 60);

 			}

 		}

 		else

@@ -4250,7 +4250,7 @@ 
         // VAT Rate

         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);

         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';

-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';

+        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';

 

 		$this->tpl['price'] = price($line->subprice);

 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);

@@ -4260,19 +4260,19 @@ 
         $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';

 

 		// Is the line strike or not

-		$this->tpl['strike']=0;

-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;

+		$this->tpl['strike'] = 0;

+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike'] = 1;

 

 		// Output template part (modules that overwrite templates must declare this into descriptor)

 		// Use global variables + $dateSelector + $seller and $buyer

 		$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-        foreach($dirtpls as $reldir)

+        foreach ($dirtpls as $reldir)

 		{

 			$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');

 			if (empty(Globals::$conf->file->strict_mode)) {

-                $res=@include $tpl;

+                $res = @include $tpl;

 			} else {

-				$res=include $tpl; // for debug

+				$res = include $tpl; // for debug

 			}

 			if ($res) break;

 		}

@@ -4290,26 +4290,26 @@ 
 	 *	@param		int		$mandatory			Mandatory or not

 	 *	@return		int							<=0 if KO, >0 if OK

 	 */

-	function add_element_resource($resource_id, $resource_type, $busy=0, $mandatory=0)

+	function add_element_resource($resource_id, $resource_type, $busy = 0, $mandatory = 0)

 	{

         // phpcs:enable

 		$this->db->begin();

 

 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";

-		$sql.= "resource_id";

-		$sql.= ", resource_type";

-		$sql.= ", element_id";

-		$sql.= ", element_type";

-		$sql.= ", busy";

-		$sql.= ", mandatory";

-		$sql.= ") VALUES (";

-		$sql.= $resource_id;

-		$sql.= ", '".$this->db->escape($resource_type)."'";

-		$sql.= ", '".$this->db->escape($this->id)."'";

-		$sql.= ", '".$this->db->escape($this->element)."'";

-		$sql.= ", '".$this->db->escape($busy)."'";

-		$sql.= ", '".$this->db->escape($mandatory)."'";

-		$sql.= ")";

+		$sql .= "resource_id";

+		$sql .= ", resource_type";

+		$sql .= ", element_id";

+		$sql .= ", element_type";

+		$sql .= ", busy";

+		$sql .= ", mandatory";

+		$sql .= ") VALUES (";

+		$sql .= $resource_id;

+		$sql .= ", '".$this->db->escape($resource_type)."'";

+		$sql .= ", '".$this->db->escape($this->id)."'";

+		$sql .= ", '".$this->db->escape($this->element)."'";

+		$sql .= ", '".$this->db->escape($busy)."'";

+		$sql .= ", '".$this->db->escape($mandatory)."'";

+		$sql .= ")";

 

 		dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);

 		if ($this->db->query($sql))

@@ -4319,7 +4319,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return  0;

 		}

@@ -4334,7 +4334,7 @@ 
 	 *    @param	int		$notrigger		Disable all triggers

 	 *    @return   int						>0 if OK, <0 if KO

 	 */

-	function delete_resource($rowid, $element, $notrigger=0)

+	function delete_resource($rowid, $element, $notrigger = 0)

 	{

         // phpcs:enable

 		global $user;

@@ -4342,22 +4342,22 @@ 
 		$this->db->begin();

 

 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";

-		$sql.= " WHERE rowid=".$rowid;

+		$sql .= " WHERE rowid=".$rowid;

 

 		dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);

 

-		$resql=$this->db->query($sql);

-		if (! $resql)

+		$resql = $this->db->query($sql);

+		if (!$resql)

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

 		else

 		{

-			if (! $notrigger)

+			if (!$notrigger)

 			{

-				$result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);

+				$result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);

 				if ($result < 0) { $this->db->rollback(); return -1; }

 			}

 			$this->db->commit();

@@ -4376,8 +4376,8 @@ 
 		// Force a copy of this->lines, otherwise it will point to same object.

 		if (isset($this->lines) && is_array($this->lines))

 		{

-			$nboflines=count($this->lines);

-			for($i=0; $i < $nboflines; $i++)

+			$nboflines = count($this->lines);

+			for ($i = 0; $i < $nboflines; $i++)

 			{

 				$this->lines[$i] = clone $this->lines[$i];

 			}

@@ -4397,44 +4397,44 @@ 
 	 * @return 	int 						>0 if OK, <0 if KO

 	 * @see	addFileIntoDatabaseIndex

 	 */

-	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams=null)

+	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams = null)

 	{

 		global $conf, $langs, $user;

 

-		$srctemplatepath='';

+		$srctemplatepath = '';

 

 		// Increase limit for PDF build

-		$err=error_reporting();

+		$err = error_reporting();

 		error_reporting(0);

 		@set_time_limit(120);

 		error_reporting($err);

 

 		// If selected model is a filename template (then $modele="modelname" or "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('/');

+		$file = ''; $classname = ''; $filefound = 0;

+		$dirmodels = array('/');

 		if (is_array(Globals::$conf->modules_parts['models']))

             $dirmodels = array_merge($dirmodels, Globals::$conf->modules_parts['models']);

-        foreach($dirmodels as $reldir)

+        foreach ($dirmodels as $reldir)

 		{

-			foreach(array('doc','pdf') as $prefix)

+			foreach (array('doc', 'pdf') as $prefix)

 			{

-				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php

+				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php

 				else $file = $prefix."_".$modele.".modules.php";

 

 				// On verifie l'emplacement du modele

-				$file=dol_buildpath($reldir.$modelspath.$file,0);

+				$file = dol_buildpath($reldir.$modelspath.$file, 0);

 				if (file_exists($file))

 				{

-					$filefound=1;

-					$classname=$prefix.'_'.$modele;

+					$filefound = 1;

+					$classname = $prefix.'_'.$modele;

 					break;

 				}

 			}

@@ -4444,7 +4444,7 @@ 
 		// If generator was found

 		if ($filefound)

 		{

-			global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db

+			global $db; // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db

 

 			require_once $file;

 

@@ -4453,31 +4453,31 @@ 
 			// If generator is ODT, we must have srctemplatepath defined, if not we set it.

 			if ($obj->type == 'odt' && empty($srctemplatepath))

 			{

-				$varfortemplatedir=$obj->scandir;

+				$varfortemplatedir = $obj->scandir;

 				if ($varfortemplatedir && !empty(Globals::$conf->global->$varfortemplatedir)) {

 					$dirtoscan = Globals::$conf->global->$varfortemplatedir;

 

-                    $listoffiles=array();

+                    $listoffiles = array();

 

 					// Now we add first model found in directories scanned

-					$listofdir=explode(',',$dirtoscan);

-					foreach($listofdir as $key => $tmpdir)

+					$listofdir = explode(',', $dirtoscan);

+					foreach ($listofdir as $key => $tmpdir)

 					{

-						$tmpdir=trim($tmpdir);

-						$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);

-						if (! $tmpdir) { unset($listofdir[$key]); continue; }

+						$tmpdir = trim($tmpdir);

+						$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);

+						if (!$tmpdir) { unset($listofdir[$key]); continue; }

 						if (is_dir($tmpdir))

 						{

-							$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);

-							if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);

+							$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);

+							if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);

 						}

 					}

 

 					if (count($listoffiles))

 					{

-						foreach($listoffiles as $record)

+						foreach ($listoffiles as $record)

 						{

-							$srctemplatepath=$record['fullname'];

+							$srctemplatepath = $record['fullname'];

 							break;

 						}

 					}

@@ -4485,27 +4485,27 @@ 
 

 				if (empty($srctemplatepath))

 				{

-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';

+					$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';

 					return -1;

 				}

 			}

 

-			if ($obj->type == 'odt' && ! empty($srctemplatepath))

+			if ($obj->type == 'odt' && !empty($srctemplatepath))

 			{

-				if (! dol_is_file($srctemplatepath))

+				if (!dol_is_file($srctemplatepath))

 				{

-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';

+					$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';

 					return -1;

 				}

 			}

 

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

+			$sav_charset_output = $outputlangs->charset_output;

 

 			if (in_array(get_class($this), array('Adherent')))

 			{

-				$arrayofrecords = array();   // The write_file of templates of adherent class need this var

+				$arrayofrecords = array(); // The write_file of templates of adherent class need this var

 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);

 			}

 			else

@@ -4516,36 +4516,36 @@ 
 

 			if ($resultwritefile > 0)

 			{

-				$outputlangs->charset_output=$sav_charset_output;

+				$outputlangs->charset_output = $sav_charset_output;

 

 				// We delete old preview

 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

 				dol_delete_preview($this);

 

 				// Index file in database

-				if (! empty($obj->result['fullpath']))

+				if (!empty($obj->result['fullpath']))

 				{

 					$destfull = $obj->result['fullpath'];

 					$upload_dir = dirname($destfull);

 					$destfile = basename($destfull);

-					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);

+					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);

 

-					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir

+					if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir

 					{

 						$filename = basename($destfile);

 						$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);

 						$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);

 

 						include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

-						$ecmfile=new EcmFiles($this->db);

-						$result = $ecmfile->fetch(0, '', ($rel_dir?$rel_dir.'/':'').$filename);

+						$ecmfile = new EcmFiles($this->db);

+						$result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);

 

 						// Set the public "share" key

 						$setsharekey = false;

 						if ($this->element == 'propal')

 						{

 							$useonlinesignature = Globals::$conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok

-                            if ($useonlinesignature) $setsharekey=true;

+                            if ($useonlinesignature) $setsharekey = true;

 							if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD))

                                 $setsharekey = true;

                         }

@@ -4567,11 +4567,11 @@ 
 

 						if ($result > 0)

 						{

-							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content

+							$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content

 							$ecmfile->fullpath_orig = '';

 							$ecmfile->gen_or_uploaded = 'generated';

-							$ecmfile->description = '';    // indexed content

-							$ecmfile->keyword = '';        // keyword content

+							$ecmfile->description = ''; // indexed content

+							$ecmfile->keyword = ''; // keyword content

 							$result = $ecmfile->update($user);

 							if ($result < 0)

 							{

@@ -4583,11 +4583,11 @@ 
 							$ecmfile->entity = Globals::$conf->entity;

                             $ecmfile->filepath = $rel_dir;

 							$ecmfile->filename = $filename;

-							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content

+							$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content

 							$ecmfile->fullpath_orig = '';

 							$ecmfile->gen_or_uploaded = 'generated';

-							$ecmfile->description = '';    // indexed content

-							$ecmfile->keyword = '';        // keyword content

+							$ecmfile->description = ''; // indexed content

+							$ecmfile->keyword = ''; // keyword content

 							$ecmfile->src_object_type = $this->table_element;

 							$ecmfile->src_object_id   = $this->id;

 

@@ -4604,14 +4604,14 @@ 
 						//var_dump($obj->update_main_doc_field);exit;

 

 						// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)

-						$update_main_doc_field=0;

-						if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;

-						if ($update_main_doc_field && ! empty($this->table_element))

+						$update_main_doc_field = 0;

+						if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;

+						if ($update_main_doc_field && !empty($this->table_element))

 						{

 							$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";

-							$sql.= ' WHERE rowid = '.$this->id;

+							$sql .= ' WHERE rowid = '.$this->id;

 							$resql = $this->db->query($sql);

-							if (! $resql) dol_print_error($this->db);

+							if (!$resql) dol_print_error($this->db);

 						}

 					}

 				}

@@ -4627,15 +4627,15 @@ 
 			}

 			else

 			{

-				$outputlangs->charset_output=$sav_charset_output;

+				$outputlangs->charset_output = $sav_charset_output;

 				dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);

 				return -1;

 			}

 		}

 		else

 		{

-			$this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);

-			dol_print_error('',$this->error);

+			$this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);

+			dol_print_error('', $this->error);

 			return -1;

 		}

 	}

@@ -4651,9 +4651,9 @@ 
 	{

 		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;

 

-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...

+		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ...

 

-		$file_osencoded=dol_osencode($file);

+		$file_osencoded = dol_osencode($file);

 		if (file_exists($file_osencoded))

 		{

 			// Create small thumbs for company (Ratio is near 16/9)

@@ -4683,7 +4683,7 @@ 
 	 * @param   string              $alternatevalue     Alternate value to use

 	 * @return  string|string[]                         Default value (can be an array if the GETPOST return an array)

 	 **/

-	function getDefaultCreateValueFor($fieldname, $alternatevalue=null)

+	function getDefaultCreateValueFor($fieldname, $alternatevalue = null)

 	{

 		global $conf, $_POST;

 

@@ -4692,16 +4692,16 @@ 
 

 		if (isset($alternatevalue)) return $alternatevalue;

 

-		$newelement=$this->element;

-		if ($newelement == 'facture') $newelement='invoice';

-		if ($newelement == 'commande') $newelement='order';

+		$newelement = $this->element;

+		if ($newelement == 'facture') $newelement = 'invoice';

+		if ($newelement == 'commande') $newelement = 'order';

 		if (empty($newelement))

 		{

 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);

 			return '';

 		}

 

-		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);

+		$keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname);

 		//var_dump($keyforfieldname);

 		if (isset(Globals::$conf->global->$keyforfieldname))

             return Globals::$conf->global->$keyforfieldname;

@@ -4727,21 +4727,21 @@ 
 	function call_trigger($trigger_name, $user)

 	{

         // phpcs:enable

-		global $langs,$conf;

+		global $langs, $conf;

 

-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

-		$interface=new Interfaces($this->db);

-		$result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);

+		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';

+		$interface = new Interfaces($this->db);

+		$result = $interface->run_triggers($trigger_name, $this, $user, $langs, $conf);

 

 		if ($result < 0)

 		{

 			if (!empty($this->errors))

 			{

-				$this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.

+				$this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.

 			}

 			else

 			{

-				$this->errors=$interface->errors;

+				$this->errors = $interface->errors;

 			}

 		}

 		return $result;

@@ -4760,7 +4760,7 @@ 
 	 *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.

 	 *  @return	int						<0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded

 	 */

-	function fetch_optionals($rowid=null, $optionsArray=null)

+	function fetch_optionals($rowid = null, $optionsArray = null)

 	{

         // phpcs:enable

 		if (empty($rowid)) {

@@ -4772,9 +4772,9 @@ 
 			return 0;

 		}

 

-		$this->array_options=array();

+		$this->array_options = array();

 

-		if (! is_array($optionsArray))

+		if (!is_array($optionsArray))

 		{

 			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.

 			// TODO Use of existing $extrafield is not yet ready (must mutualize code that use extrafields in form first)

@@ -4790,7 +4790,7 @@ 
 			{

 				$extrafields->fetch_name_optionals_label($this->table_element);

 			}

-			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);

+			$optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null);

 		}

 		else

 		{

@@ -4809,18 +4809,18 @@ 
 			{

 				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')

 				{

-					$sql.= ", ".$name;

+					$sql .= ", ".$name;

 				}

 			}

-			$sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";

-			$sql.= " WHERE fk_object = ".$rowid;

+			$sql .= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";

+			$sql .= " WHERE fk_object = ".$rowid;

 

 			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose

-			$resql=$this->db->query($sql);

+			$resql = $this->db->query($sql);

 			if ($resql)

 			{

 				$this->array_options = array();

-				$numrows=$this->db->num_rows($resql);

+				$numrows = $this->db->num_rows($resql);

 				if ($numrows)

 				{

 					$tab = $this->db->fetch_array($resql);

@@ -4828,17 +4828,17 @@ 
 					foreach ($tab as $key => $value)

 					{

 						// Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)

-						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))

+						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key))

 						{

 							// we can add this attribute to object

-							if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))

+							if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))

 							{

 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);

-								$this->array_options["options_".$key]=$this->db->jdate($value);

+								$this->array_options["options_".$key] = $this->db->jdate($value);

 							}

 							else

 							{

-								$this->array_options["options_".$key]=$value;

+								$this->array_options["options_".$key] = $value;

 							}

 

 							//var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);

@@ -4874,10 +4874,10 @@ 
 

 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);

-		$resql=$this->db->query($sql_del);

-		if (! $resql)

+		$resql = $this->db->query($sql_del);

+		if (!$resql)

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

@@ -4898,37 +4898,37 @@ 
 	 *  @return int 						-1=error, O=did nothing, 1=OK

 	 *  @see updateExtraField, setValueFrom

 	 */

-	function insertExtraFields($trigger='', $userused=null)

+	function insertExtraFields($trigger = '', $userused = null)

 	{

-		global $conf,$langs,$user;

+		global $conf, $langs, $user;

 

-		if (empty($userused)) $userused=$user;

+		if (empty($userused)) $userused = $user;

 

-		$error=0;

+		$error = 0;

 

 		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

             return 0; // For avoid conflicts if trigger used

 

-        if (! empty($this->array_options))

+        if (!empty($this->array_options))

 		{

 			// Check parameters

 			$langs->load('admin');

 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

 			$extrafields = new AlExtraFields($this->db);

-            $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);

+            $target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);

 

 			//Eliminate copied source object extra_fields that do not exist in target object

-			$new_array_options=array();

+			$new_array_options = array();

 			foreach ($this->array_options as $key => $value) {

-				if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test

+				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test

 					$new_array_options[$key] = $value;

 				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix

 					$new_array_options['options_'.$key] = $value;

 			}

 

-			foreach($new_array_options as $key => $value)

+			foreach ($new_array_options as $key => $value)

 			{

-			   	$attributeKey      = substr($key,8);   // Remove 'options_' prefix

+			   	$attributeKey      = substr($key, 8); // Remove 'options_' prefix

 			   	$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];

 			   	$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];

 			   	$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];

@@ -4936,13 +4936,13 @@ 
 

 			   	if ($attributeRequired)

 			   	{

-			   		$mandatorypb=false;

-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;

-			   		if ($this->array_options[$key] === '') $mandatorypb=true;

+			   		$mandatorypb = false;

+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;

+			   		if ($this->array_options[$key] === '') $mandatorypb = true;

 			   		if ($mandatorypb)

 			   		{

 			   			dol_syslog($this->error);

-			   			$this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);

+			   			$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);

 			   			return -1;

 			   		}

 			   	}

@@ -4953,25 +4953,25 @@ 
 			   	switch ($attributeType)

 			   	{

 			   		case 'int':

-			  			if (!is_numeric($value) && $value!='')

+			  			if (!is_numeric($value) && $value != '')

 			   			{

-			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

+			   				$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 			   				return -1;

 			  			}

-			   			elseif ($value=='')

+			   			elseif ($value == '')

 			   			{

 			   				$new_array_options[$key] = null;

 			   			}

 			 			break;

 					case 'double':

 						$value = price2num($value);

-						if (!is_numeric($value) && $value!='')

+						if (!is_numeric($value) && $value != '')

 						{

 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

-							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

+							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 							return -1;

 						}

-						elseif ($value=='')

+						elseif ($value == '')

 						{

 							$new_array_options[$key] = null;

 						}

@@ -4985,12 +4985,12 @@ 
              			}

              			break;*/

 			   		case 'password':

-			   			$algo='';

+			   			$algo = '';

 			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))

 			   			{

 			   				// If there is an encryption choice, we use it to crypt data before insert

 			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);

-			   				$algo=reset($tmparrays);

+			   				$algo = reset($tmparrays);

 			   				if ($algo != '')

 			   				{

 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...

@@ -5001,7 +5001,7 @@ 
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);

 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.

 				   					{

-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

+				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept

 				   					}

 									else

 									{

@@ -5012,7 +5012,7 @@ 
 			   					}

 			   					else

 			   					{

-			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

+			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept

 			   					}

 			   				}

 			   			}

@@ -5029,13 +5029,13 @@ 
 						break;

 					case 'datetime':

 						// If data is a string instead of a timestamp, we convert it

-						if (! is_int($this->array_options[$key])) {

+						if (!is_int($this->array_options[$key])) {

 							$this->array_options[$key] = strtotime($this->array_options[$key]);

 						}

 						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);

 						break;

 		   			case 'link':

-						$param_list=array_keys($attributeParam['options']);

+						$param_list = array_keys($attributeParam['options']);

 						// 0 : ObjectName

 						// 1 : classPath

 						$InfoFieldList = explode(":", $param_list[0]);

@@ -5044,18 +5044,18 @@ 
 						{

 							if ($value == '-1')	// -1 is key for no defined in combo list of objects

 							{

-								$new_array_options[$key]='';

+								$new_array_options[$key] = '';

 							}

 							elseif ($value)

 							{

 								$object = new $InfoFieldList[0]($this->db);

-								if (is_numeric($value)) $res=$object->fetch($value);

-								else $res=$object->fetch('',$value);

+								if (is_numeric($value)) $res = $object->fetch($value);

+								else $res = $object->fetch('', $value);

 

-								if ($res > 0) $new_array_options[$key]=$object->id;

+								if ($res > 0) $new_array_options[$key] = $object->id;

 								else

 								{

-									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";

+									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";

 									$this->db->rollback();

 									return -1;

 								}

@@ -5079,46 +5079,46 @@ 
 			$this->db->query($sql_del);

 

 			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";

-			foreach($new_array_options as $key => $value)

+			foreach ($new_array_options as $key => $value)

 			{

-				$attributeKey = substr($key,8);   // Remove 'options_' prefix

+				$attributeKey = substr($key, 8); // Remove 'options_' prefix

 				// Add field of attribut

 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator

-					$sql.=",".$attributeKey;

+					$sql .= ",".$attributeKey;

 			}

 			$sql .= ") VALUES (".$this->id;

 

-			foreach($new_array_options as $key => $value)

+			foreach ($new_array_options as $key => $value)

 			{

-				$attributeKey = substr($key,8);   // Remove 'options_' prefix

+				$attributeKey = substr($key, 8); // Remove 'options_' prefix

 				// Add field of attribute

 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)

 				{

 					if ($new_array_options[$key] != '')

 					{

-						$sql.=",'".$this->db->escape($new_array_options[$key])."'";

+						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";

 					}

 					else

 					{

-						$sql.=",null";

+						$sql .= ",null";

 					}

 				}

 			}

-			$sql.=")";

+			$sql .= ")";

 

 			dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);

 			$resql = $this->db->query($sql);

-			if (! $resql)

+			if (!$resql)

 			{

-				$this->error=$this->db->lasterror();

+				$this->error = $this->db->lasterror();

 				$error++;

 			}

 

-			if (! $error && $trigger)

+			if (!$error && $trigger)

 			{

 				// Call trigger

-				$this->context=array('extrafieldaddupdate'=>1);

-				$result=$this->call_trigger($trigger, $userused);

+				$this->context = array('extrafieldaddupdate'=>1);

+				$result = $this->call_trigger($trigger, $userused);

 				if ($result < 0) $error++;

 				// End call trigger

 			}

@@ -5147,26 +5147,26 @@ 
 	 *  @return int                 		-1=error, O=did nothing, 1=OK

 	 *  @see setValueFrom, insertExtraFields

 	 */

-	function updateExtraField($key, $trigger=null, $userused=null)

+	function updateExtraField($key, $trigger = null, $userused = null)

 	{

-		global $conf,$langs,$user;

+		global $conf, $langs, $user;

 

-		if (empty($userused)) $userused=$user;

+		if (empty($userused)) $userused = $user;

 

-		$error=0;

+		$error = 0;

 

 		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

             return 0; // For avoid conflicts if trigger used

 

-        if (! empty($this->array_options) && isset($this->array_options["options_".$key]))

+        if (!empty($this->array_options) && isset($this->array_options["options_".$key]))

 		{

 			// Check parameters

 			$langs->load('admin');

 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

 			$extrafields = new AlExtraFields($this->db);

-            $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);

+            $target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);

 

-			$value=$this->array_options["options_".$key];

+			$value = $this->array_options["options_".$key];

 

 			$attributeType     = $extrafields->attributes[$this->table_element]['type'][$key];

 			$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];

@@ -5179,25 +5179,25 @@ 
 			switch ($attributeType)

 			{

 				case 'int':

-					if (!is_numeric($value) && $value!='')

+					if (!is_numeric($value) && $value != '')

 					{

-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);

+						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 						return -1;

 					}

-					elseif ($value=='')

+					elseif ($value == '')

 					{

 						$this->array_options["options_".$key] = null;

 					}

 					break;

 				case 'double':

 					$value = price2num($value);

-					if (!is_numeric($value) && $value!='')

+					if (!is_numeric($value) && $value != '')

 					{

 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

+						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 						return -1;

 					}

-					elseif ($value=='')

+					elseif ($value == '')

 					{

 						$this->array_options["options_".$key] = null;

 					}

@@ -5214,13 +5214,13 @@ 
 					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);

 					break;

 				case 'date':

-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);

+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);

 					break;

 				case 'datetime':

-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);

+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);

 					break;

 				case 'link':

-					$param_list=array_keys($attributeParam['options']);

+					$param_list = array_keys($attributeParam['options']);

 					// 0 : ObjectName

 					// 1 : classPath

 					$InfoFieldList = explode(":", $param_list[0]);

@@ -5228,8 +5228,8 @@ 
 					if ($value)

 					{

 						$object = new $InfoFieldList[0]($this->db);

-						$object->fetch(0,$value);

-						$this->array_options["options_".$key]=$object->id;

+						$object->fetch(0, $value);

+						$this->array_options["options_".$key] = $object->id;

 					}

 					break;

 			}

@@ -5238,24 +5238,24 @@ 
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";

 			$sql .= " WHERE fk_object = ".$this->id;

 			$resql = $this->db->query($sql);

-			if (! $resql)

+			if (!$resql)

 			{

 				$error++;

-				$this->error=$this->db->lasterror();

+				$this->error = $this->db->lasterror();

 			}

 

-			if (! $error && $trigger)

+			if (!$error && $trigger)

 			{

 				// Call trigger

-				$this->context=array('extrafieldupdate'=>1);

-				$result=$this->call_trigger($trigger, $userused);

+				$this->context = array('extrafieldupdate'=>1);

+				$result = $this->call_trigger($trigger, $userused);

 				if ($result < 0) $error++;

 				// End call trigger

 			}

 

 			if ($error)

 			{

-				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);

+				dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);

 				$this->db->rollback();

 				return -1;

 			}

@@ -5282,71 +5282,71 @@ 
 	 * @param  string|int		$morecss       Value for css to define style/length of field. May also be a numeric.

 	 * @return string

 	 */

-	function showInputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss=0)

+	function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0)

 	{

-		global $conf,$langs,$form;

+		global $conf, $langs, $form;

 

-		if (! is_object($form))

+		if (!is_object($form))

 		{

 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

-			$form=new Form($this->db);

+			$form = new Form($this->db);

 		}

 

-		$val=$this->fields[$key];

+		$val = $this->fields[$key];

 

-		$out='';

-        $type='';

+		$out = '';

+        $type = '';

         $param = array();

-        $param['options']=array();

-        $size =$this->fields[$key]['size'];

+        $param['options'] = array();

+        $size = $this->fields[$key]['size'];

         // Because we work on extrafields

-        if(preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)){

-            $param['options']=array($reg[1].':'.$reg[2]=>'N');

-            $type ='link';

-        } elseif(preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {

-            $param['options']=array($reg[1].':'.$reg[2]=>'N');

-            $type ='link';

-        } elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

-            $param['options']=array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4]=>'N');

-            $type ='sellist';

-        } elseif(preg_match('/varchar\((\d+)\)/', $val['type'],$reg)) {

-            $param['options']=array();

-            $type ='varchar';

-            $size=$reg[1];

-        } elseif(preg_match('/varchar/', $val['type'])) {

-            $param['options']=array();

-            $type ='varchar';

-        } elseif(is_array($this->fields[$key]['arrayofkeyval'])) {

-            $param['options']=$this->fields[$key]['arrayofkeyval'];

-            $type ='select';

+        if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options'] = array($reg[1].':'.$reg[2]=>'N');

+            $type = 'link';

+        } elseif (preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options'] = array($reg[1].':'.$reg[2]=>'N');

+            $type = 'link';

+        } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4]=>'N');

+            $type = 'sellist';

+        } elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {

+            $param['options'] = array();

+            $type = 'varchar';

+            $size = $reg[1];

+        } elseif (preg_match('/varchar/', $val['type'])) {

+            $param['options'] = array();

+            $type = 'varchar';

+        } elseif (is_array($this->fields[$key]['arrayofkeyval'])) {

+            $param['options'] = $this->fields[$key]['arrayofkeyval'];

+            $type = 'select';

         } else {

-            $param['options']=array();

-            $type =$this->fields[$key]['type'];

+            $param['options'] = array();

+            $type = $this->fields[$key]['type'];

         }

 

-		$label=$this->fields[$key]['label'];

+		$label = $this->fields[$key]['label'];

 		//$elementtype=$this->fields[$key]['elementtype'];	// Seems not used

-		$default=$this->fields[$key]['default'];

-		$computed=$this->fields[$key]['computed'];

-		$unique=$this->fields[$key]['unique'];

-		$required=$this->fields[$key]['required'];

+		$default = $this->fields[$key]['default'];

+		$computed = $this->fields[$key]['computed'];

+		$unique = $this->fields[$key]['unique'];

+		$required = $this->fields[$key]['required'];

 

-		$langfile=$this->fields[$key]['langfile'];

-		$list=$this->fields[$key]['list'];

-		$hidden=abs($this->fields[$key]['visible'])!=1?1:0;

+		$langfile = $this->fields[$key]['langfile'];

+		$list = $this->fields[$key]['list'];

+		$hidden = abs($this->fields[$key]['visible']) != 1 ? 1 : 0;

 

 		$objectid = $this->id;

 

 

 		if ($computed)

 		{

-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

+			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

 			else return '';

 		}

 

 

 		// Use in priority showsize from parameters, then $val['css'] then autodefine

-		if (empty($morecss) && ! empty($val['css']))

+		if (empty($morecss) && !empty($val['css']))

 		{

 			$showsize = $val['css'];

 		}

@@ -5360,16 +5360,16 @@ 
 			{

 				$morecss = 'minwidth200imp';

 			}

-			elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

+			elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))

 			{

 				$morecss = 'maxwidth75';

                         }elseif ($type == 'url')

 			{

-				$morecss='minwidth400';

+				$morecss = 'minwidth400';

 			}

 			elseif ($type == 'boolean')

 			{

-				$morecss='';

+				$morecss = '';

 			}

 			else

 			{

@@ -5388,12 +5388,12 @@ 
 			}

 		}

 

-		if (in_array($type,array('date','datetime')))

+		if (in_array($type, array('date', 'datetime')))

 		{

-			$tmp=explode(',',$size);

-			$newsize=$tmp[0];

+			$tmp = explode(',', $size);

+			$newsize = $tmp[0];

 

-			$showtime = in_array($type,array('datetime')) ? 1 : 0;

+			$showtime = in_array($type, array('datetime')) ? 1 : 0;

 

 			// Do not show current date when field not required (see selectDate() method)

 			if (!$required && $value == '') $value = '-1';

@@ -5401,235 +5401,235 @@ 
 			// TODO Must also support $moreparam

 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

 		}

-		elseif (in_array($type,array('int','integer')))

+		elseif (in_array($type, array('int', 'integer')))

 		{

-			$tmp=explode(',',$size);

-			$newsize=$tmp[0];

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';

+			$tmp = explode(',', $size);

+			$newsize = $tmp[0];

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';

 		}

 		elseif (preg_match('/varchar/', $type))

 		{

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';

 		}

 		elseif (in_array($type, array('mail', 'phone', 'url')))

 		{

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

 		}

 		elseif ($type == 'text')

 		{

-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

 			{

 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');

-				$out=$doleditor->Create(1);

+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');

+				$out = $doleditor->Create(1);

 			}

 			else

 			{

-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

 			}

 		}

 		elseif ($type == 'html')

 		{

-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

 			{

 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

-				$doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

-                $out=$doleditor->Create(1);

+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

+                $out = $doleditor->Create(1);

 			}

 			else

 			{

-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

 			}

 		}

 		elseif ($type == 'boolean')

 		{

-			$checked='';

+			$checked = '';

 			if (!empty($value)) {

-				$checked=' checked value="1" ';

+				$checked = ' checked value="1" ';

 			} else {

-				$checked=' value="1" ';

+				$checked = ' value="1" ';

 			}

-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';

+			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';

 		}

 		elseif ($type == 'price')

 		{

 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

-				$value=price($value);

+				$value = price($value);

 			}

-			$out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ' . $langs->getCurrencySymbol(Globals::$conf->currency);

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol(Globals::$conf->currency);

         }

-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

+		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))

 		{

 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

-				$value=price($value);

+				$value = price($value);

 			}

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';

 		}

 		elseif ($type == 'select')

 		{

 			$out = '';

 			if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

 			}

 

-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';

-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';

+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';

+                if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';

 			foreach ($param['options'] as $key => $val)

 			{

 				if ((string) $key == '') continue;

 				list($val, $parent) = explode('|', $val);

-				$out.='<option value="'.$key.'"';

-				$out.= (((string) $value == (string) $key)?' selected':'');

-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');

-				$out.='>'.$val.'</option>';

+				$out .= '<option value="'.$key.'"';

+				$out .= (((string) $value == (string) $key) ? ' selected' : '');

+				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

+				$out .= '>'.$val.'</option>';

 			}

-			$out.='</select>';

+			$out .= '</select>';

 		}

 		elseif ($type == 'sellist')

 		{

 			$out = '';

 			if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

 			}

 

-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';

+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';

 			if (is_array($param['options']))

 			{

-				$param_list=array_keys($param['options']);

+				$param_list = array_keys($param['options']);

 				$InfoFieldList = explode(":", $param_list[0]);

-				$parentName='';

-				$parentField='';

+				$parentName = '';

+				$parentField = '';

 				// 0 : tableName

 				// 1 : label field name

 				// 2 : key fields name (if differ of rowid)

 				// 3 : key field parent (for dependent lists)

 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');

+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');

 

 

-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))

+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))

 				{

 					if (strpos($InfoFieldList[4], 'extra.') !== false)

 					{

-						$keyList='main.'.$InfoFieldList[2].' as rowid';

+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';

 					} else {

-						$keyList=$InfoFieldList[2].' as rowid';

+						$keyList = $InfoFieldList[2].' as rowid';

 					}

 				}

-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))

+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))

 				{

 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);

-					$keyList.= ', '.$parentField;

+					$keyList .= ', '.$parentField;

 				}

 

-				$fields_label = explode('|',$InfoFieldList[1]);

+				$fields_label = explode('|', $InfoFieldList[1]);

 				if (is_array($fields_label))

 				{

-					$keyList .=', ';

+					$keyList .= ', ';

 					$keyList .= implode(', ', $fields_label);

 				}

 

-				$sqlwhere='';

+				$sqlwhere = '';

 				$sql = 'SELECT '.$keyList;

-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];

+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

 				if (!empty($InfoFieldList[4]))

 				{

 					// can use SELECT request

-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {

-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);

+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {

+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

 					}

 

 					// current object id can be use into filter

-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {

-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);

+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

 					} else {

-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);

+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

 					}

 					//We have to join on extrafield table

-					if (strpos($InfoFieldList[4], 'extra')!==false)

+					if (strpos($InfoFieldList[4], 'extra') !== false)

 					{

-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';

-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];

+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

 					}

 					else

 					{

-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];

+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];

 					}

 				}

 				else

 				{

-					$sqlwhere.= ' WHERE 1=1';

+					$sqlwhere .= ' WHERE 1=1';

 				}

 				// Some tables may have field, some other not. For the moment we disable it.

-				if (in_array($InfoFieldList[0],array('tablewithentity')))

+				if (in_array($InfoFieldList[0], array('tablewithentity')))

 				{

-					$sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

+					$sqlwhere .= ' AND entity = '.Globals::$conf->entity;

                 }

-				$sql.=$sqlwhere;

+				$sql .= $sqlwhere;

 				//print $sql;

 

-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);

+				$sql .= ' ORDER BY '.implode(', ', $fields_label);

 

 				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

 				$resql = $this->db->query($sql);

 				if ($resql)

 				{

-					$out.='<option value="0">&nbsp;</option>';

+					$out .= '<option value="0">&nbsp;</option>';

 					$num = $this->db->num_rows($resql);

 					$i = 0;

 					while ($i < $num)

 					{

-						$labeltoshow='';

+						$labeltoshow = '';

 						$obj = $this->db->fetch_object($resql);

 

 						// Several field into label (eq table:code|libelle:rowid)

 						$notrans = false;

-						$fields_label = explode('|',$InfoFieldList[1]);

+						$fields_label = explode('|', $InfoFieldList[1]);

 						if (is_array($fields_label))

 						{

 							$notrans = true;

 							foreach ($fields_label as $field_toshow)

 							{

-								$labeltoshow.= $obj->$field_toshow.' ';

+								$labeltoshow .= $obj->$field_toshow.' ';

 							}

 						}

 						else

 						{

-							$labeltoshow=$obj->{$InfoFieldList[1]};

+							$labeltoshow = $obj->{$InfoFieldList[1]};

 						}

-						$labeltoshow=dol_trunc($labeltoshow,45);

+						$labeltoshow = dol_trunc($labeltoshow, 45);

 

 						if ($value == $obj->rowid)

 						{

 							foreach ($fields_label as $field_toshow)

 							{

-								$translabel=$langs->trans($obj->$field_toshow);

-								if ($translabel!=$obj->$field_toshow) {

-									$labeltoshow=dol_trunc($translabel,18).' ';

-								}else {

-									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';

+								$translabel = $langs->trans($obj->$field_toshow);

+								if ($translabel != $obj->$field_toshow) {

+									$labeltoshow = dol_trunc($translabel, 18).' ';

+								} else {

+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

 								}

 							}

-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

 						}

 						else

 						{

-							if (! $notrans)

+							if (!$notrans)

 							{

-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});

-								if ($translabel!=$obj->{$InfoFieldList[1]}) {

-									$labeltoshow=dol_trunc($translabel,18);

+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

+								if ($translabel != $obj->{$InfoFieldList[1]}) {

+									$labeltoshow = dol_trunc($translabel, 18);

 								}

 								else {

-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);

+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]},18);

 								}

 							}

-							if (empty($labeltoshow)) $labeltoshow='(not defined)';

-							if ($value==$obj->rowid)

+							if (empty($labeltoshow)) $labeltoshow = '(not defined)';

+							if ($value == $obj->rowid)

 							{

-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

+								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

 							}

 

 							if (!empty($InfoFieldList[3]) && $parentField)

@@ -5637,10 +5637,10 @@ 
 								$parent = $parentName.':'.$obj->{$parentField};

 							}

 

-							$out.='<option value="'.$obj->rowid.'"';

-							$out.= ($value==$obj->rowid?' selected':'');

-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');

-							$out.='>'.$labeltoshow.'</option>';

+							$out .= '<option value="'.$obj->rowid.'"';

+							$out .= ($value == $obj->rowid ? ' selected' : '');

+							$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

+							$out .= '>'.$labeltoshow.'</option>';

 						}

 

 						$i++;

@@ -5651,23 +5651,23 @@ 
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

 				}

 			}

-			$out.='</select>';

+			$out .= '</select>';

 		}

 		elseif ($type == 'checkbox')

 		{

-			$value_arr=explode(',',$value);

-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

+			$value_arr = explode(',', $value);

+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

 		}

 		elseif ($type == 'radio')

 		{

-			$out='';

+			$out = '';

 			foreach ($param['options'] as $keyopt => $val)

 			{

-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');

-				$out.=' value="'.$keyopt.'"';

-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';

-				$out.= ($value==$keyopt?'checked':'');

-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

+				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');

+				$out .= ' value="'.$keyopt.'"';

+				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';

+				$out .= ($value == $keyopt ? 'checked' : '');

+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

 			}

 		}

 		elseif ($type == 'chkbxlst')

@@ -5682,24 +5682,24 @@ 
 			if (is_array($param['options'])) {

 				$param_list = array_keys($param['options']);

 				$InfoFieldList = explode(":", $param_list[0]);

-				$parentName='';

-				$parentField='';

+				$parentName = '';

+				$parentField = '';

 				// 0 : tableName

 				// 1 : label field name

 				// 2 : key fields name (if differ of rowid)

 				// 3 : key field parent (for dependent lists)

 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');

+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');

 

-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {

-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);

-					$keyList .= ', ' . $parentField;

+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {

+					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);

+					$keyList .= ', '.$parentField;

 				}

-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {

+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {

 					if (strpos($InfoFieldList[4], 'extra.') !== false) {

-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';

+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';

 					} else {

-						$keyList = $InfoFieldList[2] . ' as rowid';

+						$keyList = $InfoFieldList[2].' as rowid';

 					}

 				}

 

@@ -5710,50 +5710,50 @@ 
 				}

 

 				$sqlwhere = '';

-				$sql = 'SELECT ' . $keyList;

-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

-				if (! empty($InfoFieldList[4])) {

+				$sql = 'SELECT '.$keyList;

+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+				if (!empty($InfoFieldList[4])) {

 

 					// can use SELECT request

-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {

-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);

+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {

+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

 					}

 

 					// current object id can be use into filter

-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {

-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);

+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

 					} else {

-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);

+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

 					}

 

 					// We have to join on extrafield table

 					if (strpos($InfoFieldList[4], 'extra') !== false) {

-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';

-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];

+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

 					} else {

-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];

+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];

 					}

 				} else {

 					$sqlwhere .= ' WHERE 1=1';

 				}

 				// Some tables may have field, some other not. For the moment we disable it.

-				if (in_array($InfoFieldList[0], array ('tablewithentity')))

+				if (in_array($InfoFieldList[0], array('tablewithentity')))

 				{

-					$sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

+					$sqlwhere .= ' AND entity = '.Globals::$conf->entity;

                 }

 				// $sql.=preg_replace('/^ AND /','',$sqlwhere);

 				// print $sql;

 

 				$sql .= $sqlwhere;

-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);

+				dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);

 				$resql = $this->db->query($sql);

 				if ($resql) {

 					$num = $this->db->num_rows($resql);

 					$i = 0;

 

-					$data=array();

+					$data = array();

 

-					while ( $i < $num ) {

+					while ($i < $num) {

 						$labeltoshow = '';

 						$obj = $this->db->fetch_object($resql);

 

@@ -5762,8 +5762,8 @@ 
 						$fields_label = explode('|', $InfoFieldList[1]);

 						if (is_array($fields_label)) {

 							$notrans = true;

-							foreach ( $fields_label as $field_toshow ) {

-								$labeltoshow .= $obj->$field_toshow . ' ';

+							foreach ($fields_label as $field_toshow) {

+								$labeltoshow .= $obj->$field_toshow.' ';

 							}

 						} else {

 							$labeltoshow = $obj->{$InfoFieldList[1]};

@@ -5771,18 +5771,18 @@ 
 						$labeltoshow = dol_trunc($labeltoshow, 45);

 

 						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-							foreach ( $fields_label as $field_toshow ) {

+							foreach ($fields_label as $field_toshow) {

 								$translabel = $langs->trans($obj->$field_toshow);

 								if ($translabel != $obj->$field_toshow) {

-									$labeltoshow = dol_trunc($translabel, 18) . ' ';

+									$labeltoshow = dol_trunc($translabel, 18).' ';

 								} else {

-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';

+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

 								}

 							}

 

-							$data[$obj->rowid]=$labeltoshow;

+							$data[$obj->rowid] = $labeltoshow;

 						} else {

-							if (! $notrans) {

+							if (!$notrans) {

 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

 								if ($translabel != $obj->{$InfoFieldList[1]}) {

 									$labeltoshow = dol_trunc($translabel, 18);

@@ -5794,66 +5794,66 @@ 
 								$labeltoshow = '(not defined)';

 

 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-									$data[$obj->rowid]=$labeltoshow;

+									$data[$obj->rowid] = $labeltoshow;

 								}

 

-								if (! empty($InfoFieldList[3]) && $parentField) {

-									$parent = $parentName . ':' . $obj->{$parentField};

+								if (!empty($InfoFieldList[3]) && $parentField) {

+									$parent = $parentName.':'.$obj->{$parentField};

 								}

 

-								$data[$obj->rowid]=$labeltoshow;

+								$data[$obj->rowid] = $labeltoshow;

 						}

 

-						$i ++;

+						$i++;

 					}

 					$this->db->free($resql);

 

-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

+					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

 				} else {

-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';

+					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

 				}

 			}

 		}

 		elseif ($type == 'link')

 		{

-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'

-			$showempty=(($required && $default != '')?0:1);

-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);

+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

+			$showempty = (($required && $default != '') ? 0 : 1);

+			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);

 			if (Globals::$conf->global->MAIN_FEATURES_LEVEL >= 2) {

-            			list($class,$classfile)=explode(':',$param_list[0]);

-            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);

-            			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);

-            			$out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';

+            			list($class, $classfile) = explode(':', $param_list[0]);

+            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);

+            			else $url_path = dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php', 1);

+            			$out .= '<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';

             			// TODO Add Javascript code to add input fields contents to new elements urls

 			}

 		}

 		elseif ($type == 'password')

 		{

 			// If prefix is 'search_', field is used as a filter, we use a common text field.

-			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';

+			$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';

 		}

 		elseif ($type == 'array')

 		{

 			$newval = $val;

 			$newval['type'] = 'varchar(256)';

 

-			$out='';

+			$out = '';

 

 			$inputs = array();

-			if(! empty($value)) {

-				foreach($value as $option) {

-					$out.= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

-					$out.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';

+			if (!empty($value)) {

+				foreach ($value as $option) {

+					$out .= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

+					$out .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';

 				}

 			}

 

-			$out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';

+			$out .= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';

 

 			$newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

-			$newInput.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';

+			$newInput .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';

 

 			if (!empty(Globals::$conf->use_javascript_ajax)) {

-                $out.= '

+                $out .= '

 					<script type="text/javascript">

 					$(document).ready(function() {

 						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {

@@ -5868,7 +5868,7 @@ 
 			}

 		}

 		if (!empty($hidden)) {

-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';

+			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';

 		}

 		/* Add comments

 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';

@@ -5890,14 +5890,14 @@ 
 	 * @param  mixed   $showsize       Value for css to define size. May also be a numeric.

 	 * @return string

 	 */

-	function showOutputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $showsize=0)

+	function showOutputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $showsize = 0)

 	{

-		global $conf,$langs,$form;

+		global $conf, $langs, $form;

 

-		if (! is_object($form))

+		if (!is_object($form))

 		{

 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

-			$form=new Form($this->db);

+			$form = new Form($this->db);

 		}

 

 		$objectid = $this->id;

@@ -5908,28 +5908,28 @@ 
 		// Convert var to be able to share same code than showOutputField of extrafields

 		if (preg_match('/varchar\((\d+)\)/', $type, $reg))

 		{

-			$type = 'varchar';		// convert varchar(xx) int varchar

+			$type = 'varchar'; // convert varchar(xx) int varchar

 			$size = $reg[1];

 		}

-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar

-		if (is_array($val['arrayofkeyval'])) $type='select';

-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';

+		elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar

+		if (is_array($val['arrayofkeyval'])) $type = 'select';

+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';

 

-		$default=$val['default'];

-		$computed=$val['computed'];

-		$unique=$val['unique'];

-		$required=$val['required'];

-		$param=$val['param'];

+		$default = $val['default'];

+		$computed = $val['computed'];

+		$unique = $val['unique'];

+		$required = $val['required'];

+		$param = $val['param'];

 		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];

 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))

 		{

-			$type='link';

-			$param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);

+			$type = 'link';

+			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);

 		}

-		$langfile=$val['langfile'];

-		$list=$val['list'];

-		$help=$val['help'];

-		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+		$langfile = $val['langfile'];

+		$list = $val['list'];

+		$help = $val['help'];

+		$hidden = (($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

 

 		if ($hidden) return '';

 

@@ -5953,18 +5953,18 @@ 
 				//$showsize=19;

 				$showsize = 'minwidth200imp';

 			}

-			elseif (in_array($type,array('int','double','price')))

+			elseif (in_array($type, array('int', 'double', 'price')))

 			{

 				//$showsize=10;

 				$showsize = 'maxwidth75';

 			}

 			elseif ($type == 'url')

 			{

-				$showsize='minwidth400';

+				$showsize = 'minwidth400';

 			}

 			elseif ($type == 'boolean')

 			{

-				$showsize='';

+				$showsize = '';

 			}

 			else

 			{

@@ -5985,49 +5985,49 @@ 
 		}

 

 		// Format output value differently according to properties of field

-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);

-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);

+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);

+		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);

 		elseif ($type == 'date')

 		{

-			if(! empty($value)) {

-				$value=dol_print_date($value,'day');

+			if (!empty($value)) {

+				$value = dol_print_date($value, 'day');

 			} else {

-				$value='';

+				$value = '';

 			}

 		}

 		elseif ($type == 'datetime')

 		{

-			if(! empty($value)) {

-				$value=dol_print_date($value,'dayhour');

+			if (!empty($value)) {

+				$value = dol_print_date($value, 'dayhour');

 			} else {

-				$value='';

+				$value = '';

 			}

 		}

 		elseif ($type == 'double')

 		{

 			if (!empty($value)) {

-				$value=price($value);

+				$value = price($value);

 			}

 		}

 		elseif ($type == 'boolean')

 		{

-			$checked='';

+			$checked = '';

 			if (!empty($value)) {

-				$checked=' checked ';

+				$checked = ' checked ';

 			}

-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';

+			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';

 		}

 		elseif ($type == 'mail')

 		{

-			$value=dol_print_email($value,0,0,0,64,1,1);

+			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);

 		}

 		elseif ($type == 'url')

 		{

-			$value=dol_print_url($value,'_blank',32,1);

+			$value = dol_print_url($value, '_blank', 32, 1);

 		}

 		elseif ($type == 'phone')

 		{

-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);

+			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);

 		}

 		elseif ($type == 'price')

 		{

@@ -6035,40 +6035,40 @@ 
         }

 		elseif ($type == 'select')

 		{

-			$value=$param['options'][$value];

+			$value = $param['options'][$value];

 		}

 		elseif ($type == 'sellist')

 		{

-			$param_list=array_keys($param['options']);

+			$param_list = array_keys($param['options']);

 			$InfoFieldList = explode(":", $param_list[0]);

 

-			$selectkey="rowid";

-			$keyList='rowid';

+			$selectkey = "rowid";

+			$keyList = 'rowid';

 

-			if (count($InfoFieldList)>=3)

+			if (count($InfoFieldList) >= 3)

 			{

 				$selectkey = $InfoFieldList[2];

-				$keyList=$InfoFieldList[2].' as rowid';

+				$keyList = $InfoFieldList[2].' as rowid';

 			}

 

-			$fields_label = explode('|',$InfoFieldList[1]);

-			if(is_array($fields_label)) {

-				$keyList .=', ';

+			$fields_label = explode('|', $InfoFieldList[1]);

+			if (is_array($fields_label)) {

+				$keyList .= ', ';

 				$keyList .= implode(', ', $fields_label);

 			}

 

 			$sql = 'SELECT '.$keyList;

-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];

-			if (strpos($InfoFieldList[4], 'extra')!==false)

+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+			if (strpos($InfoFieldList[4], 'extra') !== false)

 			{

-				$sql.= ' as main';

+				$sql .= ' as main';

 			}

-			if ($selectkey=='rowid' && empty($value)) {

-				$sql.= " WHERE ".$selectkey."=0";

-			} elseif ($selectkey=='rowid') {

-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);

-			}else {

-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

+			if ($selectkey == 'rowid' && empty($value)) {

+				$sql .= " WHERE ".$selectkey."=0";

+			} elseif ($selectkey == 'rowid') {

+				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);

+			} else {

+				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

 			}

 

 			//$sql.= ' AND entity = '.Globals::$conf->entity;

@@ -6077,38 +6077,38 @@ 
 			$resql = $this->db->query($sql);

 			if ($resql)

 			{

-				$value='';	// value was used, so now we reste it to use it to build final output

+				$value = ''; // value was used, so now we reste it to use it to build final output

 

 				$obj = $this->db->fetch_object($resql);

 

 				// Several field into label (eq table:code|libelle:rowid)

-				$fields_label = explode('|',$InfoFieldList[1]);

+				$fields_label = explode('|', $InfoFieldList[1]);

 

-				if(is_array($fields_label) && count($fields_label)>1)

+				if (is_array($fields_label) && count($fields_label) > 1)

 				{

 					foreach ($fields_label as $field_toshow)

 					{

-						$translabel='';

+						$translabel = '';

 						if (!empty($obj->$field_toshow)) {

-							$translabel=$langs->trans($obj->$field_toshow);

+							$translabel = $langs->trans($obj->$field_toshow);

 						}

-						if ($translabel!=$field_toshow) {

-							$value.=dol_trunc($translabel,18).' ';

-						}else {

-							$value.=$obj->$field_toshow.' ';

+						if ($translabel != $field_toshow) {

+							$value .= dol_trunc($translabel, 18).' ';

+						} else {

+							$value .= $obj->$field_toshow.' ';

 						}

 					}

 				}

 				else

 				{

-					$translabel='';

+					$translabel = '';

 					if (!empty($obj->{$InfoFieldList[1]})) {

-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});

+						$translabel = $langs->trans($obj->{$InfoFieldList[1]});

 					}

-					if ($translabel!=$obj->{$InfoFieldList[1]}) {

-						$value=dol_trunc($translabel,18);

-					}else {

-						$value=$obj->{$InfoFieldList[1]};

+					if ($translabel != $obj->{$InfoFieldList[1]}) {

+						$value = dol_trunc($translabel, 18);

+					} else {

+						$value = $obj->{$InfoFieldList[1]};

 					}

 				}

 			}

@@ -6116,18 +6116,18 @@ 
 		}

 		elseif ($type == 'radio')

 		{

-			$value=$param['options'][$value];

+			$value = $param['options'][$value];

 		}

 		elseif ($type == 'checkbox')

 		{

-			$value_arr=explode(',',$value);

-			$value='';

-			if (is_array($value_arr) && count($value_arr)>0)

+			$value_arr = explode(',', $value);

+			$value = '';

+			if (is_array($value_arr) && count($value_arr) > 0)

 			{

 				foreach ($value_arr as $keyval=>$valueval) {

-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';

+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';

 				}

-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

 			}

 		}

 		elseif ($type == 'chkbxlst')

@@ -6142,7 +6142,7 @@ 
 

 			if (count($InfoFieldList) >= 3) {

 				$selectkey = $InfoFieldList[2];

-				$keyList = $InfoFieldList[2] . ' as rowid';

+				$keyList = $InfoFieldList[2].' as rowid';

 			}

 

 			$fields_label = explode('|', $InfoFieldList[1]);

@@ -6151,75 +6151,75 @@ 
 				$keyList .= implode(', ', $fields_label);

 			}

 

-			$sql = 'SELECT ' . $keyList;

-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+			$sql = 'SELECT '.$keyList;

+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

 			if (strpos($InfoFieldList[4], 'extra') !== false) {

 				$sql .= ' as main';

 			}

 			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

 			// $sql.= ' AND entity = '.Globals::$conf->entity;

 

-            dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);

+            dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);

 			$resql = $this->db->query($sql);

 			if ($resql) {

 				$value = ''; // value was used, so now we reste it to use it to build final output

-				$toprint=array();

-				while ( $obj = $this->db->fetch_object($resql) ) {

+				$toprint = array();

+				while ($obj = $this->db->fetch_object($resql)) {

 

 					// Several field into label (eq table:code|libelle:rowid)

 					$fields_label = explode('|', $InfoFieldList[1]);

 					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

 						if (is_array($fields_label) && count($fields_label) > 1) {

-							foreach ( $fields_label as $field_toshow ) {

+							foreach ($fields_label as $field_toshow) {

 								$translabel = '';

-								if (! empty($obj->$field_toshow)) {

+								if (!empty($obj->$field_toshow)) {

 									$translabel = $langs->trans($obj->$field_toshow);

 								}

 								if ($translabel != $field_toshow) {

-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

 								} else {

-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';

+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';

 								}

 							}

 						} else {

 							$translabel = '';

-							if (! empty($obj->{$InfoFieldList[1]})) {

+							if (!empty($obj->{$InfoFieldList[1]})) {

 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

 							}

 							if ($translabel != $obj->{$InfoFieldList[1]}) {

-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

 							} else {

-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';

+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';

 							}

 						}

 					}

 				}

-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

 			} else {

-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);

+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);

 			}

 		}

 		elseif ($type == 'link')

 		{

-			$out='';

+			$out = '';

 

 			// only if something to display (perf)

 			if ($value)

 			{

-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'

+				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

 

 				$InfoFieldList = explode(":", $param_list[0]);

-				$classname=$InfoFieldList[0];

-				$classpath=$InfoFieldList[1];

-				$getnomurlparam=(empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);

-				if (! empty($classpath))

+				$classname = $InfoFieldList[0];

+				$classpath = $InfoFieldList[1];

+				$getnomurlparam = (empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);

+				if (!empty($classpath))

 				{

 					dol_include_once($InfoFieldList[1]);

 					if ($classname && class_exists($classname))

 					{

 						$object = new $classname($this->db);

 						$object->fetch($value);

-						$value=$object->getNomUrl($getnomurlparam);

+						$value = $object->getNomUrl($getnomurlparam);

 					}

 				}

 				else

@@ -6228,15 +6228,15 @@ 
 					return 'Error bad setup of extrafield';

 				}

 			}

-			else $value='';

+			else $value = '';

 		}

 		elseif ($type == 'text' || $type == 'html')

 		{

-			$value=dol_htmlentitiesbr($value);

+			$value = dol_htmlentitiesbr($value);

 		}

 		elseif ($type == 'password')

 		{

-			$value=preg_replace('/./i','*',$value);

+			$value = preg_replace('/./i', '*', $value);

 		}

 		elseif ($type == 'array')

 		{

@@ -6244,7 +6244,7 @@ 
 		}

 

 		//print $type.'-'.$size;

-		$out=$value;

+		$out = $value;

 

 		return $out;

 	}

@@ -6261,11 +6261,11 @@ 
 	 * @param	string		$onetrtd		All fields in same tr td

 	 * @return 	string

 	 */

-	function showOptionals($extrafields, $mode='view', $params=null, $keysuffix='', $keyprefix='', $onetrtd=0)

+	function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0)

 	{

 		global $db, $conf, $langs, $action, $form;

 

-		if (! is_object($form)) $form=new Form($db);

+		if (!is_object($form)) $form = new Form($db);

 

 		$out = '';

 

@@ -6276,10 +6276,10 @@ 
 			$out .= "\n";

 

 			$e = 0;

-			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)

+			foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)

 			{

 				// Show only the key field in params

-				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;

+				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;

 

 				$enabled = 1;

 				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))

@@ -6293,25 +6293,25 @@ 
 					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);

 				}

 

-				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list

+				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list

 				if (empty($perms)) continue;

 

 				// Load language if required

-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

+				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

 

-				$colspan='3';

-				if (is_array($params) && count($params)>0) {

-					if (array_key_exists('colspan',$params)) {

-						$colspan=$params['colspan'];

+				$colspan = '3';

+				if (is_array($params) && count($params) > 0) {

+					if (array_key_exists('colspan', $params)) {

+						$colspan = $params['colspan'];

 					}

 				}

 

-				switch($mode) {

+				switch ($mode) {

 					case "view":

-						$value=$this->array_options["options_".$key.$keysuffix];

+						$value = $this->array_options["options_".$key.$keysuffix];

 						break;

 					case "edit":

-						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none');				// GETPOST can get value from GET, POST or setup of default values.

+						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none'); // GETPOST can get value from GET, POST or setup of default values.

 						// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')

 						if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))

 						{

@@ -6322,7 +6322,7 @@ 
 								$value = $getposttemp;

 							}

 						} else {

-							$value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.

+							$value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.

 						}

 						//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);

 						break;

@@ -6334,11 +6334,11 @@ 
 				}

 				else

 				{

-					$csstyle='';

-					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');

-					if (is_array($params) && count($params)>0) {

-						if (array_key_exists('style',$params)) {

-							$csstyle=$params['style'];

+					$csstyle = '';

+					$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');

+					if (is_array($params) && count($params) > 0) {

+						if (array_key_exists('style', $params)) {

+							$csstyle = $params['style'];

 						}

 					}

 

@@ -6360,35 +6360,35 @@ 
 					if ($action == 'selectlines') { $colspan++; }

 

 					// Convert date into timestamp format (value in memory must be a timestamp)

-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))

+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))

 					{

-						$datenotinstring = $this->array_options['options_' . $key];

-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility

+						$datenotinstring = $this->array_options['options_'.$key];

+						if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility

 						{

 							$datenotinstring = $this->db->jdate($datenotinstring);

 						}

-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;

+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;

 					}

 					// Convert float submited string into real php numeric (value in memory must be a php numeric)

-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('price','double')))

+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double')))

 					{

-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)):$this->array_options['options_'.$key];

+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];

 					}

 

 					$labeltoshow = $langs->trans($label);

 

 					$out .= '<td class="titlefield';

-					if (GETPOST('action','none') == 'create') $out.='create';

-					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';

+					if (GETPOST('action', 'none') == 'create') $out .= 'create';

+					if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';

 					$out .= '">';

-					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);

+					if (!empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);

 					else $out .= $labeltoshow;

 					$out .= '</td>';

 

 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';

-					$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';

+					$out .= '<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';

 

-					switch($mode) {

+					switch ($mode) {

 						case "view":

 							$out .= $extrafields->showOutputField($key, $value);

 							break;

@@ -6453,7 +6453,7 @@ 
 		global $user;

 

 		$element = $this->element;

-		if ($element == 'facturerec') $element='facture';

+		if ($element == 'facturerec') $element = 'facture';

 

 		return $user->rights->{$element};

 	}

@@ -6470,15 +6470,15 @@ 
 	 * @param  int         $ignoreerrors  Ignore errors. Return true even if errors. We need this when replacement can fails like for categories (categorie of old thirdparty may already exists on new one)

 	 * @return bool						  True if success, False if error

 	 */

-	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors=0)

+	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors = 0)

 	{

 		foreach ($tables as $table)

 		{

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;

 

-			if (! $db->query($sql))

+			if (!$db->query($sql))

 			{

-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

+				if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

 				//$this->errors = $db->lasterror();

 				return false;

 			}

@@ -6511,7 +6511,7 @@ 
 		else

 		{

 			// Get cost price for margin calculation

-			if (! empty($fk_product))

+			if (!empty($fk_product))

 			{

 				if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'costprice') {

 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

@@ -6582,18 +6582,18 @@ 
 	 *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)

 	 *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto

 	 */

-	function show_photos($modulepart, $sdir, $size=0, $nbmax=0, $nbbyrow=5, $showfilename=0, $showaction=0, $maxHeight=120, $maxWidth=160, $nolink=0, $notitle=0, $usesharelink=0)

+	function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $notitle = 0, $usesharelink = 0)

 	{

         // phpcs:enable

-		global $conf,$user,$langs;

+		global $conf, $user, $langs;

 

-		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';

-		include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';

+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

 

-		$sortfield='position_name';

-		$sortorder='asc';

+		$sortfield = 'position_name';

+		$sortorder = 'asc';

 

-		$dir = $sdir . '/';

+		$dir = $sdir.'/';

 		$pdir = '/';

 		if ($modulepart == 'ticket')

 		{

@@ -6608,26 +6608,26 @@ 
 

 		// For backward compatibility

 		if ($modulepart == 'product' && !empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {

-			$dir = $sdir . '/'. get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";

-			$pdir = '/' . get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";

+			$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";

+			$pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";

 		}

 

 		// Defined relative dir to DOL_DATA_ROOT

 		$relativedir = '';

 		if ($dir)

 		{

-			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);

-			$relativedir = preg_replace('/^[\\/]/','',$relativedir);

-			$relativedir = preg_replace('/[\\/]$/','',$relativedir);

+			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);

+			$relativedir = preg_replace('/^[\\/]/', '', $relativedir);

+			$relativedir = preg_replace('/[\\/]$/', '', $relativedir);

 		}

 

 		$dirthumb = $dir.'thumbs/';

 		$pdirthumb = $pdir.'thumbs/';

 

-		$return ='<!-- Photo -->'."\n";

-		$nbphoto=0;

+		$return = '<!-- Photo -->'."\n";

+		$nbphoto = 0;

 

-		$filearray=dol_dir_list($dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);

+		$filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);

 

 		/* if (! empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs

           {

@@ -6641,12 +6641,12 @@ 
 		{

 			if ($sortfield && $sortorder)

 			{

-				$filearray=dol_sort_array($filearray, $sortfield, $sortorder);

+				$filearray = dol_sort_array($filearray, $sortfield, $sortorder);

 			}

 

-			foreach($filearray as $key => $val)

+			foreach ($filearray as $key => $val)

 			{

-				$photo='';

+				$photo = '';

 				$file = $val['name'];

 

 				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory

@@ -6661,36 +6661,36 @@ 
 					if ($size == 1 || $size == 'small') {   // Format vignette

 

 						// Find name of thumb file

-						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));

-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';

+						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));

+						if (!dol_is_file($dirthumb.$photo_vignette)) $photo_vignette = '';

 

 						// Get filesize of original file

-						$imgarray=dol_getImageSize($dir.$photo);

+						$imgarray = dol_getImageSize($dir.$photo);

 

 						if ($nbbyrow > 0)

 						{

-							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';

+							if ($nbphoto == 1) $return .= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';

 

-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';

-							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';

+							if ($nbphoto % $nbbyrow == 1) $return .= '<tr align=center valign=middle border=1>';

+							$return .= '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';

 						}

 						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';

 

-						$return.= "\n";

+						$return .= "\n";

 

-						$relativefile=preg_replace('/^\//', '', $pdir.$photo);

+						$relativefile = preg_replace('/^\//', '', $pdir.$photo);

 						if (empty($nolink))

 						{

-							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);

-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';

-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';

+							$urladvanced = getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);

+							if ($urladvanced) $return .= '<a href="'.$urladvanced.'">';

+							else $return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';

 						}

 

 						// Show image (width height=$maxHeight)

 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine

-						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;

-						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];

-						if ($notitle) $alt='';

+						$alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;

+						$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];

+						if ($notitle) $alt = '';

 

 						if ($usesharelink)

 						{

@@ -6698,81 +6698,81 @@ 
 							{

 								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

 								{

-									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';

-									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

+									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';

+									$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

 								}

 								else {

-									$return.= '<!-- Show original file -->';

-									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

+									$return .= '<!-- Show original file -->';

+									$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

 								}

 							}

 							else

 							{

-								$return.= '<!-- Show nophoto file (because file is not shared) -->';

-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';

+								$return .= '<!-- Show nophoto file (because file is not shared) -->';

+								$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';

 							}

 						}

 						else

 						{

 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

 							{

-								$return.= '<!-- Show thumb -->';

-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';

+								$return .= '<!-- Show thumb -->';

+								$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';

 							}

 							else {

-								$return.= '<!-- Show original file -->';

-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';

+								$return .= '<!-- Show original file -->';

+								$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';

 							}

 						}

 

-						if (empty($nolink)) $return.= '</a>';

-						$return.="\n";

+						if (empty($nolink)) $return .= '</a>';

+						$return .= "\n";

 

-						if ($showfilename) $return.= '<br>'.$viewfilename;

+						if ($showfilename) $return .= '<br>'.$viewfilename;

 						if ($showaction)

 						{

-							$return.= '<br>';

+							$return .= '<br>';

 							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites

 							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))

 							{

-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';

+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';

 							}

 							// Special cas for product

 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))

 							{

 								// Link to resize

-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

 

 								// Link to delete

-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

-								$return.= img_delete().'</a>';

+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

+								$return .= img_delete().'</a>';

 							}

 						}

-						$return.= "\n";

+						$return .= "\n";

 

 						if ($nbbyrow > 0)

 						{

-							$return.= '</td>';

-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';

+							$return .= '</td>';

+							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';

 						}

-						else if ($nbbyrow < 0) $return.='</div>';

+						else if ($nbbyrow < 0) $return .= '</div>';

 					}

 

 					if (empty($size)) {     // Format origine

-						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';

+						$return .= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';

 

-						if ($showfilename) $return.= '<br>'.$viewfilename;

+						if ($showfilename) $return .= '<br>'.$viewfilename;

 						if ($showaction)

 						{

 							// Special case for product

 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))

 							{

 								// Link to resize

-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

 

 								// Link to delete

-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

-								$return.= img_delete().'</a>';

+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

+								$return .= img_delete().'</a>';

 							}

 						}

 					}

@@ -6782,18 +6782,18 @@ 
 				}

 			}

 

-			if ($size==1 || $size=='small')

+			if ($size == 1 || $size == 'small')

 			{

 				if ($nbbyrow > 0)

 				{

 					// Ferme tableau

 					while ($nbphoto % $nbbyrow)

 					{

-						$return.= '<td width="'.ceil(100/$nbbyrow).'%">&nbsp;</td>';

+						$return .= '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';

 						$nbphoto++;

 					}

 

-					if ($nbphoto) $return.= '</table>';

+					if ($nbphoto) $return .= '</table>';

 				}

 			}

 		}

@@ -6812,9 +6812,9 @@ 
 	 */

 	protected function isArray($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='array') return true;

+			if (isset($info['type']) && $info['type'] == 'array') return true;

 			else return false;

 		}

 		else return false;

@@ -6828,9 +6828,9 @@ 
 	 */

 	protected function isNull($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='null') return true;

+			if (isset($info['type']) && $info['type'] == 'null') return true;

 			else return false;

 		}

 		else return false;

@@ -6844,7 +6844,7 @@ 
 	 */

 	public function isDate($info)

 	{

-		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;

+		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) return true;

 		else return false;

 	}

 

@@ -6856,9 +6856,9 @@ 
 	 */

 	public function isInt($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

-			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;

+			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;

 			else return false;

 		}

 		else return false;

@@ -6872,7 +6872,7 @@ 
 	 */

 	public function isFloat($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

 			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;

 			else return false;

@@ -6888,9 +6888,9 @@ 
 	 */

 	public function isText($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='text') return true;

+			if (isset($info['type']) && $info['type'] == 'text') return true;

 			else return false;

 		}

 		else return false;

@@ -6904,9 +6904,9 @@ 
 	 */

 	protected function isIndex($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

-			if(isset($info['index']) && $info['index']==true) return true;

+			if (isset($info['index']) && $info['index'] == true) return true;

 			else return false;

 		}

 		else return false;

@@ -6922,13 +6922,13 @@ 
 	{

 		global $conf;

 

-		$queryarray=array();

+		$queryarray = array();

 		foreach ($this->fields as $field=>$info)	// Loop on definition of fields

 		{

 			// Depending on field type ('datetime', ...)

-			if($this->isDate($info))

+			if ($this->isDate($info))

 			{

-				if(empty($this->{$field}))

+				if (empty($this->{$field}))

 				{

 					$queryarray[$field] = null;

 				}

@@ -6937,10 +6937,10 @@ 
 					$queryarray[$field] = $this->db->idate($this->{$field});

 				}

 			}

-			else if($this->isArray($info))

+			else if ($this->isArray($info))

 			{

-				if(! empty($this->{$field})) {

-					if(! is_array($this->{$field})) {

+				if (!empty($this->{$field})) {

+					if (!is_array($this->{$field})) {

 						$this->{$field} = array($this->{$field});

 					}

 					$queryarray[$field] = serialize($this->{$field});

@@ -6948,20 +6948,20 @@ 
 					$queryarray[$field] = null;

 				}

 			}

-			else if($this->isInt($info))

+			else if ($this->isInt($info))

 			{

 				if ($field == 'entity' && is_null($this->{$field}))

                     $queryarray[$field] = Globals::$conf->entity;

                 else

 				{

 					$queryarray[$field] = (int) price2num($this->{$field});

-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.

+					if (empty($queryarray[$field])) $queryarray[$field] = 0; // May be reset to null later if property 'notnull' is -1 for this field.

 				}

 			}

-			else if($this->isFloat($info))

+			else if ($this->isFloat($info))

 			{

 				$queryarray[$field] = (double) price2num($this->{$field});

-				if (empty($queryarray[$field])) $queryarray[$field]=0;

+				if (empty($queryarray[$field])) $queryarray[$field] = 0;

 			}

 			else

 			{

@@ -6969,7 +6969,7 @@ 
 			}

 

 			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);

-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;

+			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;

 		}

 

 		return $queryarray;

@@ -6985,35 +6985,35 @@ 
 	{

 		foreach ($this->fields as $field => $info)

 		{

-			if($this->isDate($info))

+			if ($this->isDate($info))

 			{

-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;

+				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;

 				else $this->{$field} = strtotime($obj->{$field});

 			}

-			elseif($this->isArray($info))

+			elseif ($this->isArray($info))

 			{

-				if(! empty($obj->{$field})) {

+				if (!empty($obj->{$field})) {

 					$this->{$field} = @unserialize($obj->{$field});

 					// Hack for data not in UTF8

-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));

+					if ($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));

 				} else {

 					$this->{$field} = array();

 				}

 			}

-			elseif($this->isInt($info))

+			elseif ($this->isInt($info))

 			{

 				if ($field == 'rowid') $this->id = (int) $obj->{$field};

 				else $this->{$field} = (int) $obj->{$field};

 			}

-			elseif($this->isFloat($info))

+			elseif ($this->isFloat($info))

 			{

 				$this->{$field} = (double) $obj->{$field};

 			}

-			elseif($this->isNull($info))

+			elseif ($this->isNull($info))

 			{

 				$val = $obj->{$field};

 				// zero is not null

-				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);

+				$this->{$field} = (is_null($val) || (empty($val) && $val !== 0 && $val !== '0') ? null : $val);

 			}

 			else

 			{

@@ -7022,7 +7022,7 @@ 
 		}

 

 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.

-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;

+		if (!isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;

 	}

 

 	/**

@@ -7064,14 +7064,14 @@ 
 

 		$error = 0;

 

-		$now=dol_now();

+		$now = dol_now();

 

 		$fieldvalues = $this->setSaveQuery();

-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);

-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;

-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.

+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);

+		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;

+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.

 

-		$keys=array();

+		$keys = array();

 		$values = array();

 		foreach ($fieldvalues as $k => $v) {

 			$keys[$k] = $k;

@@ -7080,58 +7080,58 @@ 
 		}

 

 		// Clean and check mandatory

-		foreach($keys as $key)

+		foreach ($keys as $key)

 		{

 			// If field is an implicit foreign key field

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';

-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';

+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';

 

 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))

+			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && !isset($values[$key]) && is_null($val['default']))

 			{

 				$error++;

-				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);

+				$this->errors[] = $langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);

 			}

 

 			// If field is an implicit foreign key field

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';

-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key] = 'null';

+			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key] = 'null';

 		}

 

 		if ($error) return -1;

 

 		$this->db->begin();

 

-		if (! $error)

+		if (!$error)

 		{

 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;

-			$sql.= ' ('.implode( ", ", $keys ).')';

-			$sql.= ' VALUES ('.implode( ", ", $values ).')';

+			$sql .= ' ('.implode(", ", $keys).')';

+			$sql .= ' VALUES ('.implode(", ", $values).')';

 

 			$res = $this->db->query($sql);

-			if ($res===false) {

+			if ($res === false) {

 				$error++;

 				$this->errors[] = $this->db->lasterror();

 			}

 		}

 

-		if (! $error)

+		if (!$error)

 		{

-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);

+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);

 		}

 

 		// Create extrafields

-		if (! $error)

+		if (!$error)

 		{

-			$result=$this->insertExtraFields();

+			$result = $this->insertExtraFields();

 			if ($result < 0) $error++;

 		}

 

 		// Triggers

-		if (! $error && ! $notrigger)

+		if (!$error && !$notrigger)

 		{

 			// Call triggers

-			$result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);

+			$result = $this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);

 			if ($result < 0) { $error++; }

 			// End call triggers

 		}

@@ -7160,13 +7160,13 @@ 
 		if (empty($id) && empty($ref) && empty($morewhere)) return -1;

 

 		$sql = 'SELECT '.$this->getFieldList();

-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

 

-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;

-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);

-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare

-		if ($morewhere)   $sql.= $morewhere;

-		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record

+		if (!empty($id))  $sql .= ' WHERE rowid = '.$id;

+		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);

+		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare

+		if ($morewhere)   $sql .= $morewhere;

+		$sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record

 

 		$res = $this->db->query($sql);

 		if ($res)

@@ -7203,14 +7203,14 @@ 
 

 		$error = 0;

 

-		$now=dol_now();

+		$now = dol_now();

 

 		$fieldvalues = $this->setSaveQuery();

-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);

-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;

-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.

+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);

+		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;

+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.

 

-		$keys=array();

+		$keys = array();

 		$values = array();

 		foreach ($fieldvalues as $k => $v) {

 			$keys[$k] = $k;

@@ -7220,10 +7220,10 @@ 
 		}

 

 		// Clean and check mandatory

-		foreach($keys as $key)

+		foreach ($keys as $key)

 		{

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field

-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = ''; // This is an implicit foreign key field

+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = ''; // This is an explicit foreign key field

 

 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

 			/*

@@ -7234,13 +7234,13 @@ 
 			}*/

 		}

 

-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;

+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(',', $tmp).' WHERE rowid='.$this->id;

 

 		$this->db->begin();

-		if (! $error)

+		if (!$error)

 		{

 			$res = $this->db->query($sql);

-			if ($res===false)

+			if ($res === false)

 			{

 				$error++;

 				$this->errors[] = $this->db->lasterror();

@@ -7249,7 +7249,7 @@ 
 

 		// Update extrafield

 		if (!$error && empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0) {

-			$result=$this->insertExtraFields();

+			$result = $this->insertExtraFields();

 			if ($result < 0)

 			{

 				$error++;

@@ -7257,10 +7257,10 @@ 
 		}

 

 		// Triggers

-		if (! $error && ! $notrigger)

+		if (!$error && !$notrigger)

 		{

 			// Call triggers

-			$result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY',$user);

+			$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);

 			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail

 			// End call triggers

 		}

@@ -7283,68 +7283,68 @@ 
 	 * @param	int		$forcechilddeletion		0=no, 1=Force deletion of children

 	 * @return 	int             				<=0 if KO, >0 if OK

 	 */

-	public function deleteCommon(User $user, $notrigger=false, $forcechilddeletion=0)

+	public function deleteCommon(User $user, $notrigger = false, $forcechilddeletion = 0)

 	{

-		$error=0;

+		$error = 0;

 

 		$this->db->begin();

 

 		if ($forcechilddeletion)

 		{

-			foreach($this->childtables as $table)

+			foreach ($this->childtables as $table)

 			{

 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;

 				$resql = $this->db->query($sql);

-				if (! $resql)

+				if (!$resql)

 				{

-					$this->error=$this->db->lasterror();

-					$this->errors[]=$this->error;

+					$this->error = $this->db->lasterror();

+					$this->errors[] = $this->error;

 					$this->db->rollback();

 					return -1;

 				}

 			}

 		}

-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.

+		elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.

 		{

 			$objectisused = $this->isObjectUsed($this->id);

-			if (! empty($objectisused))

+			if (!empty($objectisused))

 			{

 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);

-				$this->error='ErrorRecordHasChildren';

-				$this->errors[]=$this->error;

+				$this->error = 'ErrorRecordHasChildren';

+				$this->errors[] = $this->error;

 				$this->db->rollback();

 				return 0;

 			}

 		}

 

-		if (! $error) {

-			if (! $notrigger) {

+		if (!$error) {

+			if (!$notrigger) {

 				// Call triggers

-				$result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);

+				$result = $this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);

 				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail

 				// End call triggers

 			}

 		}

 

-		if (! $error && ! empty($this->isextrafieldmanaged))

+		if (!$error && !empty($this->isextrafieldmanaged))

 		{

-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element."_extrafields";

-			$sql.= " WHERE fk_object=" . $this->id;

+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_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.$this->table_element.' WHERE rowid='.$this->id;

 

 			$res = $this->db->query($sql);

-			if($res===false) {

+			if ($res === false) {

 				$error++;

 				$this->errors[] = $this->db->lasterror();

 			}

@@ -7385,9 +7385,9 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';

 

 		$comment = new Comment($this->db);

-		$result=$comment->fetchAllFor($this->element, $this->id);

-		if ($result<0) {

-			$this->errors=array_merge($this->errors, $comment->errors);

+		$result = $comment->fetchAllFor($this->element, $this->id);

+		if ($result < 0) {

+			$this->errors = array_merge($this->errors, $comment->errors);

 			return -1;

 		} else {

 			$this->comments = $comment->comments;

Braces +1373 added lines, -865 removed lines

@@ -401,24 +401,31 @@ 
 		$sql.= " FROM ".MAIN_DB_PREFIX.$element;

 		$sql.= " WHERE entity IN (".getEntity($element).")" ;

 

-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);

-		else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";

-		else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";

-		else {

+		if ($id > 0) {
+		    $sql.= " AND rowid = ".$db->escape($id);
+		} else if ($ref) {
+		    $sql.= " AND ref = '".$db->escape($ref)."'";
+		} else if ($ref_ext) {
+		    $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		} else {

 			$error='ErrorWrongParameters';

 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);

 			return -1;

 		}

-		if ($ref || $ref_ext)

-            $sql .= " AND entity = " . Globals::$conf->entity;

+		if ($ref || $ref_ext) {
+		            $sql .= " AND entity = " . Globals::$conf->entity;
+		}
 

         dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);

 		$resql = $db->query($sql);

 		if ($resql)

 		{

 			$num=$db->num_rows($resql);

-			if ($num > 0) return 1;

-			else return 0;

+			if ($num > 0) {
+			    return 1;
+			} else {
+			    return 0;
+			}
 		}

 		return -1;

 	}

@@ -447,13 +454,18 @@ 
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";

 		$lastname=$this->lastname;

 		$firstname=$this->firstname;

-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));

+		if (empty($lastname)) {
+		    $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		}
 

 		$ret='';

 		if ($option && $this->civility_id)

 		{

-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';

-			else $ret.=$this->civility_id.' ';

+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) {
+			    $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
+			} else {
+			    $ret.=$this->civility_id.' ';
+			}
 		}

 

 		$ret .= AlDolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder);

@@ -544,14 +556,15 @@ 
             && empty(Globals::$conf->global->SOCIETE_DISABLE_STATE) && $this->state) {

             if (!empty(Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {

                 $out.=($outdone?' - ':'').$this->region.' - '.$this->state;

-            }

-            else {

+            } else {

                 $out.=($outdone?' - ':'').$this->state;

             }

 			$outdone++;

 		}

 

-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');

+		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) {
+		    $out.=($outdone?'<br>':'');
+		}
 		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone

 			$out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

 		}

@@ -591,13 +604,21 @@ 
 		}

 		$out.='<div style="clear: both;">';

 		if (!empty(Globals::$conf->socialnetworks->enabled)) {

-			if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');

+			if ($this->skype) {
+			    $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');
+			}
 			$outdone++;

-			if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');

+			if ($this->jabberid) {
+			    $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');
+			}
 			$outdone++;

-			if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');

+			if ($this->twitter) {
+			    $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');
+			}
 			$outdone++;

-			if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');

+			if ($this->facebook) {
+			    $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');
+			}
 			$outdone++;

 		}

 		$out.='</div>';

@@ -657,10 +678,10 @@ 
 					$this->errors = $ecmfile->errors;

 				}

 				*/

-			}

-			else return '';

-		}

-		elseif (empty($ecmfile->share))

+			} else {
+			    return '';
+			}
+		} elseif (empty($ecmfile->share))

 		{

 			// Add entry into index

 			if ($initsharekey)

@@ -668,8 +689,9 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

 				$ecmfile->share = getRandomPassword(true);

 				$ecmfile->update($user);

-			}

-			else return '';

+			} else {
+			    return '';
+			}
 		}

 

 		// Define $urlwithroot

@@ -683,14 +705,18 @@ 
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.

 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.

 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash

-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share

-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';

+		if (! empty($ecmfile->share)) {
+		    $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;
+		}
+		// Hash for public share

+		if ($forcedownload) {
+		    $paramlink.=($paramlink?'&':'').'attachment=1';
+		}
 

 		if ($relativelink)

 		{

 			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');

-		}

-		else

+		} else

 		{

 			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');

 		}

@@ -738,8 +764,7 @@ 
 		if (is_numeric($type_contact))

 		{

 			$id_type_contact=$type_contact;

-		}

-		else

+		} else

 		{

 			// We look for id type_contact

 			$sql = "SELECT tc.rowid";

@@ -752,7 +777,9 @@ 
 			if ($resql)

 			{

 				$obj = $this->db->fetch_object($resql);

-				if ($obj) $id_type_contact=$obj->rowid;

+				if ($obj) {
+				    $id_type_contact=$obj->rowid;
+				}
 			}

 		}

 

@@ -804,8 +831,7 @@ 
 

 				$this->db->commit();

 				return 1;

-			}

-			else

+			} else

 			{

 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')

 				{

@@ -813,15 +839,16 @@ 
 					$this->db->rollback();

 					echo 'err rollback';

 					return -2;

-				}

-				else

+				} else

 				{

 					$this->error=$this->db->error();

 					$this->db->rollback();

 					return -1;

 				}

 			}

-		} else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -863,15 +890,18 @@ 
 		// Insert into database

 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";

 		$sql.= " statut = ".$statut;

-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";

-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";

+		if ($type_contact_id) {
+		    $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
+		}
+		if ($fk_socpeople) {
+		    $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
+		}
 		$sql.= " where rowid = ".$rowid;

 		$resql=$this->db->query($sql);

 		if ($resql)

 		{

 			return 0;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			return -1;

@@ -908,8 +938,7 @@ 
 

 			$this->db->commit();

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

@@ -939,15 +968,15 @@ 
 

 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";

 		$sql.= " WHERE element_id = ".$this->id;

-		if ($listId)

-			$sql.= " AND fk_c_type_contact IN (".$listId.")";

+		if ($listId) {
+					$sql.= " AND fk_c_type_contact IN (".$listId.")";
+		}
 

 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);

 		if ($this->db->query($sql))

 		{

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			return -1;

@@ -972,22 +1001,38 @@ 
 		$tab=array();

 

 		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user

-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";

-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";

+		if ($source == 'internal') {
+		    $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+		    $sql.=", t.fk_soc as socid, t.statut as statuscontact";
+		}
 		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";

 		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";

 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";

 		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";

-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";

-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";

+		if ($source == 'internal') {
+		    $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		}
+		if ($source == 'external'|| $source == 'thirdparty') {
+		    $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		}
 		$sql.= " WHERE ec.element_id =".$this->id;

 		$sql.= " AND ec.fk_c_type_contact=tc.rowid";

 		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";

-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";

-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";

-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";

+		if ($code) {
+		    $sql.= " AND tc.code = '".$this->db->escape($code)."'";
+		}
+		if ($source == 'internal') {
+		    $sql.= " AND tc.source = 'internal'";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+		    $sql.= " AND tc.source = 'external'";
+		}
 		$sql.= " AND tc.active=1";

-		if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";

+		if ($statut >= 0) {
+		    $sql.= " AND ec.statut = '".$statut."'";
+		}
 		$sql.=" ORDER BY t.lastname ASC";

 

 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);

@@ -1008,8 +1053,7 @@ 
 								   'nom'=>$obj->lastname,      // For backward compatibility

 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,

 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);

-				}

-				else

+				} else

 				{

 					$tab[$i]=$obj->id;

 				}

@@ -1018,8 +1062,7 @@ 
 			}

 

 			return $tab;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			dol_print_error($this->db);

@@ -1054,8 +1097,7 @@ 
 			$result = $this->update_contact($rowid, $newstatut);

 			$this->db->free($resql);

 			return $result;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->error();

 			dol_print_error($this->db);

@@ -1079,16 +1121,27 @@ 
         // phpcs:enable

 		global $langs;

 

-		if (empty($order)) $order='position';

-		if ($order == 'position') $order.=',code';

+		if (empty($order)) {
+		    $order='position';
+		}
+		if ($order == 'position') {
+		    $order.=',code';
+		}
 

 		$tab = array();

 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";

 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

 		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";

-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types

-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";

-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";

+		if ($activeonly == 1) {
+		    $sql.= " AND tc.active=1";
+		}
+		// only the active types

+		if (! empty($source) && $source != 'all') {
+		    $sql.= " AND tc.source='".$this->db->escape($source)."'";
+		}
+		if (! empty($code)) {
+		    $sql.= " AND tc.code='".$this->db->escape($code)."'";
+		}
 		$sql.= $this->db->order($order,'ASC');

 

 		//print "sql=".$sql;

@@ -1103,13 +1156,15 @@ 
 

 				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;

 				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);

-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;

-				else $tab[$obj->code]=$libelle_type;

+				if (empty($option)) {
+				    $tab[$obj->rowid]=$libelle_type;
+				} else {
+				    $tab[$obj->code]=$libelle_type;
+				}
 				$i++;

 			}

 			return $tab;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			//dol_print_error($this->db);

@@ -1148,19 +1203,29 @@ 
 

 		$sql = "SELECT ec.fk_socpeople";

 		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";

-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";

-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";

+		if ($source == 'internal') {
+		    $sql.= " ".MAIN_DB_PREFIX."user as c,";
+		}
+		if ($source == 'external') {
+		    $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+		}
 		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";

 		$sql.= " WHERE ec.element_id = ".$id;

 		$sql.= " AND ec.fk_socpeople = c.rowid";

-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";

-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";

+		if ($source == 'internal') {
+		    $sql.= " AND c.entity IN (".getEntity('user').")";
+		}
+		if ($source == 'external') {
+		    $sql.= " AND c.entity IN (".getEntity('societe').")";
+		}
 		$sql.= " AND ec.fk_c_type_contact = tc.rowid";

 		$sql.= " AND tc.element = '".$element."'";

 		$sql.= " AND tc.source = '".$source."'";

 		$sql.= " AND tc.code = '".$code."'";

 		$sql.= " AND tc.active = 1";

-		if ($status) $sql.= " AND ec.statut = ".$status;

+		if ($status) {
+		    $sql.= " AND ec.statut = ".$status;
+		}
 

 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);

 		$resql=$this->db->query($sql);

@@ -1171,8 +1236,7 @@ 
 				$result[$i]=$obj->fk_socpeople;

 				$i++;

 			}

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->error();

 			return null;

@@ -1191,9 +1255,13 @@ 
 	function fetch_contact($contactid=null)

 	{

         // phpcs:enable

-		if (empty($contactid)) $contactid=$this->contactid;

+		if (empty($contactid)) {
+		    $contactid=$this->contactid;
+		}
 

-		if (empty($contactid)) return 0;

+		if (empty($contactid)) {
+		    return 0;
+		}
 

 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

 		$contact = new Contact($this->db);

@@ -1214,14 +1282,16 @@ 
         // phpcs:enable

 		global $conf;

 

-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))

-			return 0;

+		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) {
+					return 0;
+		}
 

 		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

 

 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);

-		if ($force_thirdparty_id)

-			$idtofetch = $force_thirdparty_id;

+		if ($force_thirdparty_id) {
+					$idtofetch = $force_thirdparty_id;
+		}
 

 		if ($idtofetch) {

 			$thirdparty = new Societe($this->db);

@@ -1234,8 +1304,9 @@ 
 			}

 

 			return $result;

-		} else

-			return -1;

+		} else {
+					return -1;
+		}
 	}

 

 

@@ -1281,20 +1352,25 @@ 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);

 

 		$idtype=$this->barcode_type;

-		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined

+		if (empty($idtype) && $idtype != '0') {
+		    // If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined

 		{

 			if ($this->element == 'product')

-                $idtype = Globals::$conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

-            else if ($this->element == 'societe')

-                $idtype = Globals::$conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;

-            else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);

+                $idtype = Globals::$conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		} else if ($this->element == 'societe') {
+                            $idtype = Globals::$conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+            } else {
+                dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+            }
 		}

 

 		if ($idtype > 0)

 		{

-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded

+			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {
+			    // If data not already loaded

 			{

-				$sql = "SELECT rowid, code, libelle as label, coder";

+				$sql = "SELECT rowid, code, libelle as label, coder";
+			}
 				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";

 				$sql.= " WHERE rowid = ".$idtype;

 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);

@@ -1307,8 +1383,7 @@ 
 					$this->barcode_type_label = $obj->label;

 					$this->barcode_type_coder = $obj->coder;

 					return 1;

-				}

-				else

+				} else

 				{

 					dol_print_error($this->db);

 					return -1;

@@ -1329,8 +1404,13 @@ 
         // phpcs:enable

 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

 

-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility

-		if (empty($this->fk_project)) return 0;

+		if (empty($this->fk_project) && ! empty($this->fk_projet)) {
+		    $this->fk_project = $this->fk_projet;
+		}
+		// For backward compatibility

+		if (empty($this->fk_project)) {
+		    return 0;
+		}
 

 		$project = new Project($this->db);

 		$result = $project->fetch($this->fk_project);

@@ -1351,7 +1431,9 @@ 
         // phpcs:enable

 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

 

-		if (empty($this->fk_product)) return 0;

+		if (empty($this->fk_product)) {
+		    return 0;
+		}
 

 		$product = new Product($this->db);

 		$result = $product->fetch($this->fk_product);

@@ -1385,9 +1467,15 @@ 
 	function fetch_origin()

 	{

         // phpcs:enable

-		if ($this->origin == 'shipping') $this->origin = 'expedition';

-		if ($this->origin == 'delivery') $this->origin = 'livraison';

-        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';

+		if ($this->origin == 'shipping') {
+		    $this->origin = 'expedition';
+		}
+		if ($this->origin == 'delivery') {
+		    $this->origin = 'livraison';
+		}
+        if ($this->origin == 'order_supplier') {
+            $this->origin = 'commandeFournisseur';
+        }
 

 		$origin = $this->origin;

 

@@ -1479,29 +1567,48 @@ 
 	{

 		global $user,$langs,$conf;

 

-		if (empty($table)) 	  $table=$this->table_element;

-		if (empty($id))    	  $id=$this->id;

-		if (empty($format))   $format='text';

-		if (empty($id_field)) $id_field='rowid';

+		if (empty($table)) {
+		    $table=$this->table_element;
+		}
+		if (empty($id)) {
+		    $id=$this->id;
+		}
+		if (empty($format)) {
+		    $format='text';
+		}
+		if (empty($id_field)) {
+		    $id_field='rowid';
+		}
 

 		$error=0;

 

 		$this->db->begin();

 

 		// Special case

-		if ($table == 'product' && $field == 'note_private') $field='note';

-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';

+		if ($table == 'product' && $field == 'note_private') {
+		    $field='note';
+		}
+		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+		    $fk_user_field = 'fk_user_mod';
+		}
 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";

 

-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";

-		else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);

-		else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");

+		if ($format == 'text') {
+		    $sql.= $field." = '".$this->db->escape($value)."'";
+		} else if ($format == 'int') {
+		    $sql.= $field." = ".$this->db->escape($value);
+		} else if ($format == 'date') {
+		    $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		}
 

 		if ($fk_user_field)

 		{

-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;

-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;

+			if (! empty($fuser) && is_object($fuser)) {
+			    $sql.=", ".$fk_user_field." = ".$fuser->id;
+			} elseif (empty($fuser) || $fuser != 'none') {
+			    $sql.=", ".$fk_user_field." = ".$user->id;
+			}
 		}

 

 		$sql.= " WHERE ".$id_field." = ".$id;

@@ -1516,28 +1623,32 @@ 
 				if (empty($this->fields) && method_exists($this, 'fetch'))

 				{

 					$result = $this->fetch($id);

-				}

-				else

+				} else

 				{

 					$result = $this->fetchCommon($id);

 				}

-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors

-				if ($result < 0) $error++;

+				if ($result >= 0) {
+				    $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);
+				}
+				// This may set this->errors

+				if ($result < 0) {
+				    $error++;
+				}
 			}

 

 			if (! $error)

 			{

-				if (property_exists($this, $field)) $this->$field = $value;

+				if (property_exists($this, $field)) {
+				    $this->$field = $value;
+				}
 				$this->db->commit();

 				return 1;

-			}

-			else

+			} else

 			{

 				$this->db->rollback();

 				return -2;

 			}

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

@@ -1564,36 +1675,66 @@ 
 			dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");

 			return -1;

 		}

-		if ($fieldid == 'none') return 1;

+		if ($fieldid == 'none') {
+		    return 1;
+		}
 

 		// Security on socid

 		$socid = 0;

-		if ($user->societe_id > 0) $socid = $user->societe_id;

+		if ($user->societe_id > 0) {
+		    $socid = $user->societe_id;
+		}
 

 		// this->ismultientitymanaged contains

 		// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

 		$alias = 's';

-		if ($this->element == 'societe') $alias = 'te';

+		if ($this->element == 'societe') {
+		    $alias = 'te';
+		}
 

 		$sql = "SELECT MAX(te.".$fieldid.")";

 		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";

 		if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

             $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";

 		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid

-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid

-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid

+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid

+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		}
 		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;

-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';

+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND sc.fk_user = " .$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (! empty($filter))

 		{

-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility

+			if (! preg_match('/^\s*AND/i', $filter)) {
+			    $sql.=" AND ";
+			}
+			// For backward compatibility

 			$sql.=$filter;

 		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid

 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

 			if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

                 if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) {

@@ -1606,9 +1747,15 @@ 
 				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';

 			}

 		}

-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;

-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';

-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;

+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND te.fk_soc = ' . $socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+		    $sql.= ' AND te.rowid = ' . $socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

 

 		$result = $this->db->query($sql);

@@ -1626,20 +1773,44 @@ 
 		if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

             $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";

 		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid

-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid

-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid

+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid

+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		}
 		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;

-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';

+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND sc.fk_user = " .$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (! empty($filter))

 		{

-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility

+			if (! preg_match('/^\s*AND/i', $filter)) {
+			    $sql.=" AND ";
+			}
+			// For backward compatibility

 			$sql.=$filter;

 		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid

 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

 			if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

                 if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) {

@@ -1652,9 +1823,15 @@ 
 				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';

 			}

 		}

-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;

-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';

-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;

+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND te.fk_soc = ' . $socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+		    $sql.= ' AND te.rowid = ' . $socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null

 

@@ -1686,8 +1863,11 @@ 
 		$i = 0;

 		while ($i < $num)

 		{

-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];

-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];

+			if ($source == 'thirdparty') {
+			    $contactAlreadySelected[$i] = $tab[$i]['socid'];
+			} else {
+			    $contactAlreadySelected[$i] = $tab[$i]['id'];
+			}
 			$i++;

 		}

 		return $contactAlreadySelected;

@@ -1711,14 +1891,19 @@ 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

 		if ($this->table_element == 'actioncomm')

 		{

-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;

-			else $sql.= ' SET fk_project = NULL';

+			if ($projectid) {
+			    $sql.= ' SET fk_project = '.$projectid;
+			} else {
+			    $sql.= ' SET fk_project = NULL';
+			}
 			$sql.= ' WHERE id = '.$this->id;

-		}

-		else

+		} else

 		{

-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;

-			else $sql.= ' SET fk_projet = NULL';

+			if ($projectid) {
+			    $sql.= ' SET fk_projet = '.$projectid;
+			} else {
+			    $sql.= ' SET fk_projet = NULL';
+			}
 			$sql.= ' WHERE rowid = '.$this->id;

 		}

 

@@ -1727,8 +1912,7 @@ 
 		{

 			$this->fk_project = $projectid;

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -1748,8 +1932,12 @@ 
 		{

 			// TODO uniformize field name

 			$fieldname = 'fk_mode_reglement';

-			if ($this->element == 'societe') $fieldname = 'mode_reglement';

-			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';

+			if ($this->element == 'societe') {
+			    $fieldname = 'mode_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+			    $fieldname = 'mode_reglement_supplier';
+			}
 

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

 			$sql .= ' SET '.$fieldname.' = '.$id;

@@ -1759,17 +1947,17 @@ 
 			{

 				$this->mode_reglement_id = $id;

 				// for supplier

-				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;

+				if (get_class($this) == 'Fournisseur') {
+				    $this->mode_reglement_supplier_id = $id;
+				}
 				return 1;

-			}

-			else

+			} else

 			{

 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());

 				$this->error=$this->db->error();

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');

 			$this->error='Status of the object is incompatible '.$this->statut;

@@ -1799,18 +1987,18 @@ 
 				$this->multicurrency_code = $code;

 

 				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);

-				if ($rate) $this->setMulticurrencyRate($rate,2);

+				if ($rate) {
+				    $this->setMulticurrencyRate($rate,2);
+				}
 

 				return 1;

-			}

-			else

+			} else

 			{

 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());

 				$this->error=$this->db->error();

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');

 			$this->error='Status of the object is incompatible '.$this->statut;

@@ -1904,15 +2092,13 @@ 
 				}

 

 				return 1;

-			}

-			else

+			} else

 			{

 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());

 				$this->error=$this->db->error();

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');

 			$this->error='Status of the object is incompatible '.$this->statut;

@@ -1933,8 +2119,12 @@ 
 		{

 			// TODO uniformize field name

 			$fieldname = 'fk_cond_reglement';

-			if ($this->element == 'societe') $fieldname = 'cond_reglement';

-			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';

+			if ($this->element == 'societe') {
+			    $fieldname = 'cond_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+			    $fieldname = 'cond_reglement_supplier';
+			}
 

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

 			$sql .= ' SET '.$fieldname.' = '.$id;

@@ -1944,18 +2134,18 @@ 
 			{

 				$this->cond_reglement_id = $id;

 				// for supplier

-				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;

+				if (get_class($this) == 'Fournisseur') {
+				    $this->cond_reglement_supplier_id = $id;
+				}
 				$this->cond_reglement = $id;	// for compatibility

 				return 1;

-			}

-			else

+			} else

 			{

 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());

 				$this->error=$this->db->error();

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');

 			$this->error='Status of the object is incompatible '.$this->statut;

@@ -1973,7 +2163,9 @@ 
 	function setDeliveryAddress($id)

 	{

 		$fieldname = 'fk_delivery_address';

-		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';

+		if ($this->element == 'delivery' || $this->element == 'shipping') {
+		    $fieldname = 'fk_address';
+		}
 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;

 		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";

@@ -1982,8 +2174,7 @@ 
 		{

 			$this->fk_delivery_address = $id;

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->error();

 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);

@@ -2005,7 +2196,9 @@ 
 	{

         global $user;

 

-        if (empty($userused)) $userused=$user;

+        if (empty($userused)) {
+            $userused=$user;
+        }
 

         $error = 0;

 

@@ -2016,7 +2209,9 @@ 
 

         $this->db->begin();

 

-		if ($shipping_method_id<0) $shipping_method_id='NULL';

+		if ($shipping_method_id<0) {
+		    $shipping_method_id='NULL';
+		}
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

@@ -2033,7 +2228,9 @@ 
                 // Call trigger

                 $this->context=array('shippingmethodupdate'=>1);

                 $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

-                if ($result < 0) $error++;

+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger

             }

         }

@@ -2061,7 +2258,9 @@ 
 			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);

 			return -1;

 		}

-		if ($warehouse_id<0) $warehouse_id='NULL';

+		if ($warehouse_id<0) {
+		    $warehouse_id='NULL';
+		}
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

@@ -2108,8 +2307,7 @@ 
 		{

 			$this->modelpdf=$modelpdf;

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return 0;

@@ -2129,7 +2327,9 @@ 
 	{

         global $user;

 

-        if (empty($userused)) $userused=$user;

+        if (empty($userused)) {
+            $userused=$user;
+        }
 

         $error = 0;

 

@@ -2139,7 +2339,9 @@ 
 		}

         $this->db->begin();

 

-		if ($fk_account<0) $fk_account='NULL';

+		if ($fk_account<0) {
+		    $fk_account='NULL';
+		}
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

@@ -2152,15 +2354,16 @@ 
             dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());

             $this->error = $this->db->lasterror();

             $error++;

-        }

-        else

+        } else

         {

             if (!$notrigger)

             {

                 // Call trigger

                 $this->context=array('bankaccountupdate'=>1);

                 $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

-                if ($result < 0) $error++;

+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger

             }

         }

@@ -2168,8 +2371,7 @@ 
         {

             $this->db->rollback();

             return -1;

-        }

-        else

+        } else

         {

             $this->fk_account = ($fk_account=='NULL')?null:$fk_account;

             $this->db->commit();

@@ -2208,8 +2410,12 @@ 
 		$nl=0;

 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

 		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;

-		if (! $renum) $sql.= ' AND rang = 0';

-		if ($renum) $sql.= ' AND rang <> 0';

+		if (! $renum) {
+		    $sql.= ' AND rang = 0';
+		}
+		if ($renum) {
+		    $sql.= ' AND rang <> 0';
+		}
 

 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);

 		$resql = $this->db->query($sql);

@@ -2217,8 +2423,9 @@ 
 		{

 			$row = $this->db->fetch_row($resql);

 			$nl = $row[0];

-		}

-		else dol_print_error($this->db);

+		} else {
+		    dol_print_error($this->db);
+		}
 		if ($nl > 0)

 		{

 			// The goal of this part is to reorder all lines, with all children lines sharing the same

@@ -2228,7 +2435,9 @@ 
 			// We first search all lines that are parent lines (for multilevel details lines)

 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';

+			if ($fk_parent_line) {
+			    $sql.= ' AND fk_parent_line IS NULL';
+			}
 			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;

 

 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);

@@ -2260,8 +2469,7 @@ 
 						$this->updateRangOfLine($row, ($key+1));

 					}

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2354,7 +2562,9 @@ 
 	function updateRangOfLine($rowid,$rang)

 	{

 		$fieldposition = 'rang';

-		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+		    $fieldposition = 'position';
+		}
 

 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

 		$sql.= ' WHERE rowid = '.$rowid;

@@ -2395,7 +2605,9 @@ 
 		if ($rang > 1)

 		{

 			$fieldposition = 'rang';

-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+			    $fieldposition = 'position';
+			}
 

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;

 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

@@ -2408,8 +2620,7 @@ 
 				{

 					dol_print_error($this->db);

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2429,7 +2640,9 @@ 
 		if ($rang < $max)

 		{

 			$fieldposition = 'rang';

-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+			    $fieldposition = 'position';
+			}
 

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

@@ -2442,8 +2655,7 @@ 
 				{

 					dol_print_error($this->db);

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2514,8 +2726,7 @@ 
 				if (! empty($row[0]))

 				{

 					return $row[0];

-				}

-				else

+				} else

 				{

 					return $this->getRangOfLine($fk_parent_line);

 				}

@@ -2562,8 +2773,7 @@ 
 		{

 			$this->ref_ext = $ref_ext;

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->error();

 			return -1;

@@ -2597,7 +2807,9 @@ 
 		}

 		// Special cas

 		//var_dump($this->table_element);exit;

-		if ($this->table_element == 'product') $suffix='';

+		if ($this->table_element == 'product') {
+		    $suffix='';
+		}
 

 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

 		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");

@@ -2607,16 +2819,17 @@ 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);

 		if ($this->db->query($sql))

 		{

-			if ($suffix == '_public') $this->note_public = $note;

-			else if ($suffix == '_private') $this->note_private = $note;

-			else

+			if ($suffix == '_public') {
+			    $this->note_public = $note;
+			} else if ($suffix == '_private') {
+			    $this->note_private = $note;
+			} else

 			{

 				$this->note = $note;      // deprecated

 				$this->note_private = $note;

 			}

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			return -1;

@@ -2656,37 +2869,45 @@ 
 

 		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)

 		$MODULE = "";

-		if ($this->element == 'propal')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";

-		elseif ($this->element == 'order')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";

-		elseif ($this->element == 'facture')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";

-		elseif ($this->element == 'facture_fourn')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";

-		elseif ($this->element == 'order_supplier')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";

-		elseif ($this->element == 'supplier_proposal')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";

+		if ($this->element == 'propal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
+		} elseif ($this->element == 'order') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
+		} elseif ($this->element == 'facture') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
+		} elseif ($this->element == 'facture_fourn') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
+		} elseif ($this->element == 'order_supplier') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
+		} elseif ($this->element == 'supplier_proposal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		}
 

 		if (! empty($MODULE)) {

 			if (!empty(Globals::$conf->global->$MODULE)) {

                 $modsactivated = explode(',', Globals::$conf->global->$MODULE);

                 foreach ($modsactivated as $mod) {

-					if (Globals::$conf->$mod->enabled)

-                        return 1; // update was disabled by specific setup

+					if (Globals::$conf->$mod->enabled) {
+					                        return 1;
+					}
+					// update was disabled by specific setup

 				}

 			}

 		}

 

 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';

 

-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility

+		if ($roundingadjust == '-1') {
+		    $roundingadjust='auto';
+		}
+		// For backward compatibility

 

 		$forcedroundingmode=$roundingadjust;

-		if ($forcedroundingmode == 'auto' && isset(Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND))

-            $forcedroundingmode = Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;

-        elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';

+		if ($forcedroundingmode == 'auto' && isset(Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
+		            $forcedroundingmode = Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		} elseif ($forcedroundingmode == 'auto') {
+            $forcedroundingmode='0';
+        }
 

 		$error=0;

 

@@ -2709,15 +2930,22 @@ 
 

 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';

 		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';

-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';

+			if ($this->table_element_line == 'facturedet') {
+			    $sql.= ', situation_percent';
+			}
 			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';

 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;

 		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

 		if ($exclspec)

 		{

 			$product_field='product_type';

-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field

-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';

+			if ($this->table_element_line == 'contratdet') {
+			    $product_field='';
+			}
+			// contratdet table has no product_type field

+			if ($product_field) {
+			    $sql.= ' AND '.$product_field.' <> 9';
+			}
 		}

 		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used

 

@@ -2747,9 +2975,11 @@ 
 				$parameters=array('fk_element' => $obj->rowid);

 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 

-				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'

+				if (empty($reshook) && $forcedroundingmode == '0') {
+				    // Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'

 				{

-					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);

+					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
+				}
 					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);

 					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);

 					if ($diff)

@@ -2757,7 +2987,9 @@ 
 						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;

 						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

 								$resqlfix=$this->db->query($sqlfix);

-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');

+								if (! $resqlfix) {
+								    dol_print_error($this->db,'Failed to update line');
+								}
 								$obj->total_tva = $tmpcal[1];

 								$obj->total_ttc = $tmpcal[2];

 						//

@@ -2773,16 +3005,24 @@ 
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;

 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;

 

-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;

-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;

-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;

+				if (! isset($total_ht_by_vats[$obj->vatrate])) {
+				    $total_ht_by_vats[$obj->vatrate]=0;
+				}
+				if (! isset($total_tva_by_vats[$obj->vatrate])) {
+				    $total_tva_by_vats[$obj->vatrate]=0;
+				}
+				if (! isset($total_ttc_by_vats[$obj->vatrate])) {
+				    $total_ttc_by_vats[$obj->vatrate]=0;
+				}
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;

 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;

 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;

 

-				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency

+				if ($forcedroundingmode == '1') {
+				    // Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency

 				{

-					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);

+					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+				}
 					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);

 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";

 					if ($diff)

@@ -2791,7 +3031,9 @@ 
 						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;

 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

 								$resqlfix=$this->db->query($sqlfix);

-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');

+								if (! $resqlfix) {
+								    dol_print_error($this->db,'Failed to update line');
+								}
 								$this->total_tva -= $diff;

 								$this->total_ttc -= $diff;

 								$total_tva_by_vats[$obj->vatrate] -= $diff;

@@ -2832,11 +3074,21 @@ 
 			$fieldlocaltax2='localtax2';

 			$fieldttc='total_ttc';

 			// Specific code for backward compatibility with old field names

-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';

-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';

-			if ($this->element == 'propal')                                                $fieldttc='total';

-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';

-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';

+			if ($this->element == 'facture' || $this->element == 'facturerec') {
+			    $fieldht='total';
+			}
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+			    $fieldtva='total_tva';
+			}
+			if ($this->element == 'propal') {
+			    $fieldttc='total';
+			}
+			if ($this->element == 'expensereport') {
+			    $fieldtva='total_tva';
+			}
+			if ($this->element == 'supplier_proposal') {
+			    $fieldttc='total';
+			}
 

 			if (empty($nodatabaseupdate))

 			{

@@ -2865,13 +3117,11 @@ 
 			if (! $error)

 			{

 				return 1;

-			}

-			else

+			} else

 			{

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db,'Bad request in update_price');

 			return -1;

@@ -2894,10 +3144,18 @@ 
 		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);

 

 		// Special case

-		if ($origin == 'order') $origin='commande';

-		if ($origin == 'invoice') $origin='facture';

-		if ($origin == 'invoice_template') $origin='facturerec';

-    	if ($origin == 'supplierorder') $origin='order_supplier';

+		if ($origin == 'order') {
+		    $origin='commande';
+		}
+		if ($origin == 'invoice') {
+		    $origin='facture';
+		}
+		if ($origin == 'invoice_template') {
+		    $origin='facturerec';
+		}
+    	if ($origin == 'supplierorder') {
+    	    $origin='order_supplier';
+    	}
 		$this->db->begin();

 

 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";

@@ -2917,8 +3175,7 @@ 
 	  	{

 	  		$this->db->commit();

 	  		return 1;

-	  	}

-	  	else

+	  	} else

 	  	{

 	  		$this->error=$this->db->lasterror();

 	  		$this->db->rollback();

@@ -2963,12 +3220,16 @@ 
 		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))

 		{

 			$justsource=true;  // the source (id and type) is a search criteria

-			if (! empty($targettype)) $withtargettype=true;

+			if (! empty($targettype)) {
+			    $withtargettype=true;
+			}
 		}

 		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))

 		{

 			$justtarget=true;  // the target (id and type) is a search criteria

-			if (! empty($sourcetype)) $withsourcetype=true;

+			if (! empty($sourcetype)) {
+			    $withsourcetype=true;
+			}
 		}

 

 		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);

@@ -2991,15 +3252,17 @@ 
 			if ($justsource)

 			{

 				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";

-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";

-			}

-			else if ($justtarget)

+				if ($withtargettype) {
+				    $sql.= " AND targettype = '".$targettype."'";
+				}
+			} else if ($justtarget)

 			{

 				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";

-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";

+				if ($withsourcetype) {
+				    $sql.= " AND sourcetype = '".$sourcetype."'";
+				}
 			}

-		}

-		else

+		} else

 		{

 			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";

 			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";

@@ -3020,13 +3283,11 @@ 
 					if ($justsource)

 					{

 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;

-					}

-					else if ($justtarget)

+					} else if ($justtarget)

 					{

 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;

 					}

-				}

-				else

+				} else

 				{

 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)

 					{

@@ -3043,10 +3304,12 @@ 
 			if (! empty($this->linkedObjectsIds))

 			{

 				$tmparray = $this->linkedObjectsIds;

-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)

+				foreach($tmparray as $objecttype => $objectids) {
+				    // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)

 				{

 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)

-					$module = $element = $subelement = $objecttype;

+					$module = $element = $subelement = $objecttype;
+				}
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'

 						&& preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))

 					{

@@ -3058,29 +3321,21 @@ 
 					// To work with non standard classpath or module name

 					if ($objecttype == 'facture')			{

 						$classpath = 'compta/facture/class';

-					}

-					else if ($objecttype == 'facturerec')			{

+					} else if ($objecttype == 'facturerec')			{

 						$classpath = 'compta/facture/class'; $module = 'facture';

-					}

-					else if ($objecttype == 'propal')			{

+					} else if ($objecttype == 'propal')			{

 						$classpath = 'comm/propal/class';

-					}

-					else if ($objecttype == 'supplier_proposal')			{

+					} else if ($objecttype == 'supplier_proposal')			{

 						$classpath = 'supplier_proposal/class';

-					}

-					else if ($objecttype == 'shipping')			{

+					} else if ($objecttype == 'shipping')			{

 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';

-					}

-					else if ($objecttype == 'delivery')			{

+					} else if ($objecttype == 'delivery')			{

 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';

-					}

-					else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{

+					} else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{

 						$classpath = 'fourn/class'; $module = 'fournisseur';

-					}

-					else if ($objecttype == 'fichinter')			{

+					} else if ($objecttype == 'fichinter')			{

 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';

-					}

-					else if ($objecttype == 'subscription')			{

+					} else if ($objecttype == 'subscription')			{

 						$classpath = 'adherents/class'; $module = 'adherent';

 					}

 

@@ -3089,20 +3344,15 @@ 
 

 					if ($objecttype == 'order') {

 						$classfile = 'commande'; $classname = 'Commande';

-					}

-					else if ($objecttype == 'invoice_supplier') {

+					} else if ($objecttype == 'invoice_supplier') {

 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';

-					}

-					else if ($objecttype == 'order_supplier')   {

+					} else if ($objecttype == 'order_supplier')   {

 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';

-					}

-					else if ($objecttype == 'supplier_proposal')   {

+					} else if ($objecttype == 'supplier_proposal')   {

 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';

-					}

-					else if ($objecttype == 'facturerec')   {

+					} else if ($objecttype == 'facturerec')   {

 						$classfile = 'facture-rec'; $classname = 'FactureRec';

-					}

-					else if ($objecttype == 'subscription')   {

+					} else if ($objecttype == 'subscription')   {

 						$classfile = 'subscription'; $classname = 'Subscription';

 					}

 

@@ -3114,9 +3364,11 @@ 
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);

 							if (class_exists($classname))

 							{

-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element

+								foreach($objectids as $i => $objectid) {
+								    // $i is rowid into llx_element_element

 								{

-									$object = new $classname($this->db);

+									$object = new $classname($this->db);
+								}
 									$ret = $object->fetch($objectid);

 									if ($ret >= 0)

 									{

@@ -3125,16 +3377,14 @@ 
 								}

 							}

 						}

-					}

-					else

+					} else

 					{

 						unset($this->linkedObjectsIds[$objecttype]);

 					}

 				}

 			}

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -3156,8 +3406,11 @@ 
 		$updatesource=false;

 		$updatetarget=false;

 

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;

-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;

+		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) {
+		    $updatesource=true;
+		} else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) {
+		    $updatetarget=true;
+		}
 

 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";

 		if ($updatesource)

@@ -3166,8 +3419,7 @@ 
 			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";

 			$sql.= " WHERE fk_target = ".$this->id;

 			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";

-		}

-		else if ($updatetarget)

+		} else if ($updatetarget)

 		{

 			$sql.= "fk_target = ".$targetid;

 			$sql.= ", targettype = '".$this->db->escape($targettype)."'";

@@ -3179,8 +3431,7 @@ 
 		if ($this->db->query($sql))

 		{

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			return -1;

@@ -3203,8 +3454,11 @@ 
 		$deletesource=false;

 		$deletetarget=false;

 

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;

-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;

+		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) {
+		    $deletesource=true;
+		} else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) {
+		    $deletetarget=true;
+		}
 

 		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);

 		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);

@@ -3216,20 +3470,17 @@ 
 		if ($rowid > 0)

 		{

 			$sql.=" rowid = ".$rowid;

-		}

-		else

+		} else

 		{

 			if ($deletesource)

 			{

 				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";

 				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";

-			}

-			else if ($deletetarget)

+			} else if ($deletetarget)

 			{

 				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";

 				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";

-			}

-			else

+			} else

 			{

 				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";

 				$sql.= " OR";

@@ -3241,8 +3492,7 @@ 
 		if ($this->db->query($sql))

 		{

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->errors[]=$this->error;

@@ -3271,17 +3521,31 @@ 
 		$this->db->begin();

 

 		$fieldstatus="fk_statut";

-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";

-		if ($elementTable == 'mailing') $fieldstatus="statut";

-		if ($elementTable == 'cronjob') $fieldstatus="status";

-		if ($elementTable == 'user') $fieldstatus="statut";

-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";

-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";

+		if ($elementTable == 'facture_rec') {
+		    $fieldstatus="suspended";
+		}
+		if ($elementTable == 'mailing') {
+		    $fieldstatus="statut";
+		}
+		if ($elementTable == 'cronjob') {
+		    $fieldstatus="status";
+		}
+		if ($elementTable == 'user') {
+		    $fieldstatus="statut";
+		}
+		if ($elementTable == 'expensereport') {
+		    $fieldstatus="fk_statut";
+		}
+		if ($elementTable == 'commande_fournisseur_dispatch') {
+		    $fieldstatus="status";
+		}
 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;

 		$sql.= " SET ".$fieldstatus." = ".$status;

 		// If status = 1 = validated, update also fk_user_valid

-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;

+		if ($status == 1 && $elementTable == 'expensereport') {
+		    $sql.=", fk_user_valid = ".$user->id;
+		}
 		$sql.= " WHERE rowid=".$elementId;

 

 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);

@@ -3292,12 +3556,27 @@ 
 			// Try autoset of trigkey

 			if (empty($trigkey))

 			{

-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';

-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';

-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';

+				if ($this->element == 'supplier_proposal' && $status == 2) {
+				    $trigkey='SUPPLIER_PROPOSAL_SIGN';
+				}
+				// 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

+				if ($this->element == 'supplier_proposal' && $status == 3) {
+				    $trigkey='SUPPLIER_PROPOSAL_REFUSE';
+				}
+				// 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

+				if ($this->element == 'supplier_proposal' && $status == 4) {
+				    $trigkey='SUPPLIER_PROPOSAL_CLOSE';
+				}
+				// 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

+				if ($this->element == 'fichinter' && $status == 3) {
+				    $trigkey='FICHINTER_CLASSIFY_DONE';
+				}
+				if ($this->element == 'fichinter' && $status == 2) {
+				    $trigkey='FICHINTER_CLASSIFY_BILLED';
+				}
+				if ($this->element == 'fichinter' && $status == 1) {
+				    $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				}
 			}

 

 			if ($trigkey)

@@ -3316,22 +3595,22 @@ 
 			{

 				$this->db->commit();

 

-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)

+				if (empty($savElementId)) {
+				    // If the element we update was $this (so $elementId is null)

 				{

-					$this->statut = $status;

+					$this->statut = $status;
+				}
 					$this->status = $status;

 				}

 

 				return 1;

-			}

-			else

+			} else

 			{

 				$this->db->rollback();

 				dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

@@ -3351,9 +3630,13 @@ 
 	{

 		global $conf;

 

-		if (empty($id) && empty($ref)) return 0;

-		if (!empty(Globals::$conf->global->MAIN_DISABLE_CANVAS))

-            return 0;    // To increase speed. Not enabled by default.

+		if (empty($id) && empty($ref)) {
+		    return 0;
+		}
+		if (!empty(Globals::$conf->global->MAIN_DISABLE_CANVAS)) {
+		            return 0;
+		}
+		// To increase speed. Not enabled by default.

 

             // Clean parameters

 		$ref = trim($ref);

@@ -3361,8 +3644,12 @@ 
 		$sql = "SELECT rowid, canvas";

 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;

 		$sql.= " WHERE entity IN (".getEntity($this->element).")";

-		if (! empty($id))  $sql.= " AND rowid = ".$id;

-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";

+		if (! empty($id)) {
+		    $sql.= " AND rowid = ".$id;
+		}
+		if (! empty($ref)) {
+		    $sql.= " AND ref = '".$this->db->escape($ref)."'";
+		}
 

 		$resql = $this->db->query($sql);

 		if ($resql)

@@ -3372,10 +3659,10 @@ 
 			{

 				$this->canvas   = $obj->canvas;

 				return 1;

-			}

-			else return 0;

-		}

-		else

+			} else {
+			    return 0;
+			}
+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -3412,7 +3699,9 @@ 
 	{

 		global $langs;

 

-		if (empty($id)) $id=$this->id;

+		if (empty($id)) {
+		    $id=$this->id;
+		}
 

 		// Check parameters

 		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)

@@ -3446,18 +3735,18 @@ 
 					$langs->load("errors");

 					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;

 					$haschild += $obj->nb;

-					if (is_numeric($elementname))	// old usage

+					if (is_numeric($elementname)) {
+					    // old usage

 					{

-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);

-					}

-					else	// new usage: $elementname=Translation key

+						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
+					}
+					} else	// new usage: $elementname=Translation key

 					{

 						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));

 					}

 					break;    // We found at least one, we stop here

 				}

-			}

-			else

+			} else

 			{

 				$this->errors[]=$this->db->lasterror();

 				return -1;

@@ -3467,8 +3756,9 @@ 
 		{

 			$this->errors[]="ErrorRecordHasChildren";

 			return $haschild;

-		}

-		else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

 	/**

@@ -3484,12 +3774,24 @@ 
 		foreach($this->lines as $key => $val)

 		{

 			$qualified=0;

-			if ($predefined == -1) $qualified=1;

-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;

-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;

-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;

-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;

-			if ($qualified) $nb++;

+			if ($predefined == -1) {
+			    $qualified=1;
+			}
+			if ($predefined == 1 && $val->fk_product > 0) {
+			    $qualified=1;
+			}
+			if ($predefined == 0 && $val->fk_product <= 0) {
+			    $qualified=1;
+			}
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) {
+			    $qualified=1;
+			}
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) {
+			    $qualified=1;
+			}
+			if ($qualified) {
+			    $nb++;
+			}
 		}

 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');

 		return $nb;

@@ -3553,16 +3855,24 @@ 
 		{

 			if (isset($line->qty_asked))

 			{

-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''

+				if (empty($totalOrdered)) {
+				    $totalOrdered=0;
+				}
+				// Avoid warning because $totalOrdered is ''

 				$totalOrdered+=$line->qty_asked;    // defined for shipment only

 			}

 			if (isset($line->qty_shipped))

 			{

-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''

+				if (empty($totalToShip)) {
+				    $totalToShip=0;
+				}
+				// Avoid warning because $totalToShip is ''

 				$totalToShip+=$line->qty_shipped;   // defined for shipment only

-            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

+            } else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

             {

-                if (empty($totalToShip)) $totalToShip=0;

+                if (empty($totalToShip)) {
+                    $totalToShip=0;
+                }
                 $totalToShip+=$line->qty;   // defined for reception only

 			}

 

@@ -3570,8 +3880,7 @@ 
 			if ($this->element == 'shipping') {

 				// for shipments

 				$qty = $line->qty_shipped ? $line->qty_shipped : 0;

-			}

-			else {

+			} else {

 				$qty = $line->qty ? $line->qty : 0;

 			}

 

@@ -3587,19 +3896,30 @@ 
 

 			$weightUnit=0;

 			$volumeUnit=0;

-			if (! empty($weight_units)) $weightUnit = $weight_units;

-			if (! empty($volume_units)) $volumeUnit = $volume_units;

-

-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''

-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''

+			if (! empty($weight_units)) {
+			    $weightUnit = $weight_units;
+			}
+			if (! empty($volume_units)) {
+			    $volumeUnit = $volume_units;
+			}
+

+			if (empty($totalWeight)) {
+			    $totalWeight=0;
+			}
+			// Avoid warning because $totalWeight is ''

+			if (empty($totalVolume)) {
+			    $totalVolume=0;
+			}
+			// Avoid warning because $totalVolume is ''

 

 			//var_dump($line->volume_units);

-			if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

+			if ($weight_units < 50) {
+			    // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

 			{

-				$trueWeightUnit=pow(10, $weightUnit);

+				$trueWeightUnit=pow(10, $weightUnit);
+			}
 				$totalWeight += $weight * $qty * $trueWeightUnit;

-			}

-			else {

+			} else {

 		if ($weight_units == 99) {

 			// conversion 1 Pound = 0.45359237 KG

 			$trueWeightUnit = 0.45359237;

@@ -3608,18 +3928,20 @@ 
 			// conversion 1 Ounce = 0.0283495 KG

 			$trueWeightUnit = 0.0283495;

 			$totalWeight += $weight * $qty * $trueWeightUnit;

-		}

-		else

-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units

+		} else {
+							$totalWeight += $weight * $qty;
+		}
+		// This may be wrong if we mix different units

 			}

-			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

+			if ($volume_units < 50) {
+			    // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

 			{

 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;

-				$trueVolumeUnit=pow(10, $volumeUnit);

+				$trueVolumeUnit=pow(10, $volumeUnit);
+			}
 				//print $line->volume;

 				$totalVolume += $volume * $qty * $trueVolumeUnit;

-			}

-			else

+			} else

 			{

 				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units

 			}

@@ -3651,8 +3973,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			$this->db->commit();

 			return 1;

@@ -3704,13 +4025,11 @@ 
 			{

 				$res = $this->db->fetch_object($resql);

 				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;

-			}

-			else

+			} else

 			{

 				return '';

 			}

-		}

-		else

+		} else

 		{

 			$this->errors[] = $this->db->lasterror();

 			return false;

@@ -3747,14 +4066,14 @@ 
 					$this->libelle_incoterms = $obj->libelle;

 				}

 				return 1;

-			}

-			else

+			} else

 			{

 				$this->errors[] = $this->db->lasterror();

 				return -1;

 			}

-		}

-		else return -1;

+		} else {
+		    return -1;
+		}
 	}

 

 

@@ -3793,7 +4112,9 @@ 
 			} else {

 				$res=include $tpl; // for debug

 			}

-			if ($res) break;

+			if ($res) {
+			    break;
+			}
 		}

 	}

 

@@ -3823,8 +4144,9 @@ 
 

 		// Define usemargins

 		$usemargins=0;

-		if (!empty(Globals::$conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande')))

-            $usemargins = 1;

+		if (!empty(Globals::$conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande'))) {
+		            $usemargins = 1;
+		}
 

         $num = count($this->lines);

 

@@ -3843,8 +4165,9 @@ 
 			print '<tr class="liste_titre nodrag nodrop">';

 

 			// Adds a line numbering column

-			if (!empty(Globals::$conf->global->MAIN_VIEW_LINE_NUMBER))

-                print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';

+			if (!empty(Globals::$conf->global->MAIN_VIEW_LINE_NUMBER)) {
+			                print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
+			}
 

             // Description

 			print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';

@@ -3861,10 +4184,13 @@ 
 			print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';

 

 			// Multicurrency

-			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

-                print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';

+			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency) {
+			                print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';
+			}
 

-            if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';

+            if ($inputalsopricewithtax) {
+                print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
+            }
 

 			// Qty

 			print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';

@@ -3883,26 +4209,32 @@ 
 			if ($usemargins && !empty(Globals::$conf->margin->enabled) && empty($user->societe_id)) {

 				if (!empty($user->rights->margins->creer))

 				{

-					if (Globals::$conf->global->MARGIN_TYPE == "1")

-                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';

-					else

-						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';

+					if (Globals::$conf->global->MARGIN_TYPE == "1") {
+					                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
+					} else {
+											print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
+					}
 				}

 

-				if (!empty(Globals::$conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)

-                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';

-				if (!empty(Globals::$conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)

-                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';

+				if (!empty(Globals::$conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) {
+				                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
+				}
+				if (!empty(Globals::$conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {
+				                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
+				}
 			}

 

 			// Total HT

 			print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';

 

 			// Multicurrency

-			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

-                print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';

+			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency) {
+			                print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';
+			}
 

-            if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';

+            if ($outputalsopricetotalwithtax) {
+                print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
+            }
 

 			print '<td class="linecoledit"></td>';  // No width to allow autodim

 

@@ -3932,14 +4264,15 @@ 
 			$line->fetch_optionals();

 

 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))

-			if (is_object($hookmanager))   // Old code is commented on preceding line.

+			if (is_object($hookmanager)) {
+			    // Old code is commented on preceding line.

 			{

 				if (empty($line->fk_parent_line))

 				{

-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

+					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+			}
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

-				}

-				else

+				} else

 				{

 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);

 					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

@@ -3986,8 +4319,14 @@ 
 		// Show product and description

 		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);

 		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.

-		if (! empty($line->date_start)) $type=1; // deprecated

-		if (! empty($line->date_end)) $type=1; // deprecated

+		if (! empty($line->date_start)) {
+		    $type=1;
+		}
+		// deprecated

+		if (! empty($line->date_end)) {
+		    $type=1;
+		}
+		// deprecated

 

 		// Ligne en mode visu

 		if ($action != 'editline' || $selected != $line->id)

@@ -4015,9 +4354,13 @@ 
 

 					$outputlangs = $langs;

 					$newlang='';

-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');

-					if (!empty(Globals::$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang))

-                        $newlang = $this->thirdparty->default_lang;  // For language to language of customer

+					if (empty($newlang) && GETPOST('lang_id','aZ09')) {
+					    $newlang=GETPOST('lang_id','aZ09');
+					}
+					if (!empty(Globals::$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) {
+					                        $newlang = $this->thirdparty->default_lang;
+					}
+					// For language to language of customer

                     if (! empty($newlang))

 					{

 						$outputlangs = new Translate("",$conf);

@@ -4025,8 +4368,7 @@ 
 					}

 

 					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;

-				}

-				else

+				} else

 				{

 					$label = $line->product_label;

 				}

@@ -4048,7 +4390,9 @@ 
 				} else {

 					$res=include $tpl; // for debug

 				}

-				if ($res) break;

+				if ($res) {
+				    break;
+				}
 			}

 		}

 

@@ -4071,7 +4415,9 @@ 
 				} else {

 					$res=include $tpl; // for debug

 				}

-				if ($res) break;

+				if ($res) {
+				    break;
+				}
 			}

 		}

 	}

@@ -4098,8 +4444,9 @@ 
 		print '<td>'.$langs->trans('Description').'</td>';

 		print '<td align="right">'.$langs->trans('VATRate').'</td>';

 		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';

-		if (!empty(Globals::$conf->multicurrency->enabled))

-            print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';

+		if (!empty(Globals::$conf->multicurrency->enabled)) {
+		            print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';
+		}
         print '<td align="right">'.$langs->trans('Qty').'</td>';

 		if (Globals::$conf->global->PRODUCT_USE_UNITS) {

 			print '<td align="left">'.$langs->trans('Unit').'</td>';

@@ -4121,8 +4468,7 @@ 
 						$action='';

 						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks

 					}

-				}

-				else

+				} else

 				{

 					$this->printOriginLine($line, $var, $restrictlist);

 				}

@@ -4151,32 +4497,37 @@ 
 		if (!empty($line->date_start))

 		{

 			$date_start=$line->date_start;

-		}

-		else

+		} else

 		{

 			$date_start=$line->date_debut_prevue;

-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;

+			if ($line->date_debut_reel) {
+			    $date_start=$line->date_debut_reel;
+			}
 		}

 		if (!empty($line->date_end))

 		{

 			$date_end=$line->date_end;

-		}

-		else

+		} else

 		{

 			$date_end=$line->date_fin_prevue;

-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;

+			if ($line->date_fin_reel) {
+			    $date_end=$line->date_fin_reel;
+			}
 		}

 

 		$this->tpl['label'] = '';

-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');

+		if (! empty($line->fk_parent_line)) {
+		    $this->tpl['label'].= img_picto('', 'rightarrow');
+		}
 

-		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object

+		if (($line->info_bits & 2) == 2) {
+		    // TODO Not sure this is used for source object

 		{

-			$discount=new DiscountAbsolute($this->db);

+			$discount=new DiscountAbsolute($this->db);
+		}
 			$discount->fk_soc = $this->socid;

 			$this->tpl['label'].= $discount->getNomUrl(0,'discount');

-		}

-		else if (! empty($line->fk_product))

+		} else if (! empty($line->fk_product))

 		{

 			$productstatic = new Product($this->db);

 			$productstatic->id = $line->fk_product;

@@ -4194,13 +4545,12 @@ 
 			{

 				$this->tpl['label'].= get_date_range($date_start,$date_end);

 			}

-		}

-		else

+		} else

 		{

 			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));

 			if (!empty($line->desc)) {

 				$this->tpl['label'].=$line->desc;

-			}else {

+			} else {

 				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');

 			}

 			

@@ -4213,36 +4563,35 @@ 
 

 		if (! empty($line->desc))

 		{

-			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object

+			if ($line->desc == '(CREDIT_NOTE)') {
+			    // TODO Not sure this is used for source object

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount=new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);

 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));

-			}

-			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object

+			} elseif ($line->desc == '(DEPOSIT)') {
+			    // TODO Not sure this is used for source object

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount=new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);

 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));

-			}

-			elseif ($line->desc == '(EXCESS RECEIVED)')

+			} elseif ($line->desc == '(EXCESS RECEIVED)')

 			{

 				$discount=new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));

-			}

-			elseif ($line->desc == '(EXCESS PAID)')

+			} elseif ($line->desc == '(EXCESS PAID)')

 			{

 				$discount=new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));

-			}

-			else

+			} else

 			{

 				$this->tpl['description'] = dol_trunc($line->desc,60);

 			}

-		}

-		else

+		} else

 		{

 			$this->tpl['description'] = '&nbsp;';

 		}

@@ -4250,18 +4599,23 @@ 
         // VAT Rate

         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);

         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';

-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';

+        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) {
+            $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        }
 

 		$this->tpl['price'] = price($line->subprice);

 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);

 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';

-		if (Globals::$conf->global->PRODUCT_USE_UNITS)

-            $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));

+		if (Globals::$conf->global->PRODUCT_USE_UNITS) {
+		            $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		}
         $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';

 

 		// Is the line strike or not

 		$this->tpl['strike']=0;

-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;

+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) {
+		    $this->tpl['strike']=1;
+		}
 

 		// Output template part (modules that overwrite templates must declare this into descriptor)

 		// Use global variables + $dateSelector + $seller and $buyer

@@ -4274,7 +4628,9 @@ 
 			} else {

 				$res=include $tpl; // for debug

 			}

-			if ($res) break;

+			if ($res) {
+			    break;
+			}
 		}

 	}

 

@@ -4316,8 +4672,7 @@ 
 		{

 			$this->db->commit();

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

@@ -4352,8 +4707,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			if (! $notrigger)

 			{

@@ -4420,14 +4774,20 @@ 
 		// Search template files

 		$file=''; $classname=''; $filefound=0;

 		$dirmodels=array('/');

-		if (is_array(Globals::$conf->modules_parts['models']))

-            $dirmodels = array_merge($dirmodels, Globals::$conf->modules_parts['models']);

+		if (is_array(Globals::$conf->modules_parts['models'])) {
+		            $dirmodels = array_merge($dirmodels, Globals::$conf->modules_parts['models']);
+		}
         foreach($dirmodels as $reldir)

 		{

 			foreach(array('doc','pdf') as $prefix)

 			{

-				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php

-				else $file = $prefix."_".$modele.".modules.php";

+				if (in_array(get_class($this), array('Adherent'))) {
+				    $file = $prefix."_".$modele.".class.php";
+				}
+				// Member module use prefix_module.class.php

+				else {
+				    $file = $prefix."_".$modele.".modules.php";
+				}
 

 				// On verifie l'emplacement du modele

 				$file=dol_buildpath($reldir.$modelspath.$file,0);

@@ -4438,7 +4798,9 @@ 
 					break;

 				}

 			}

-			if ($filefound) break;

+			if ($filefound) {
+			    break;
+			}
 		}

 

 		// If generator was found

@@ -4469,7 +4831,9 @@ 
 						if (is_dir($tmpdir))

 						{

 							$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);

-							if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);

+							if (count($tmpfiles)) {
+							    $listoffiles=array_merge($listoffiles,$tmpfiles);
+							}
 						}

 					}

 

@@ -4507,8 +4871,7 @@ 
 			{

 				$arrayofrecords = array();   // The write_file of templates of adherent class need this var

 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);

-			}

-			else

+			} else

 			{

 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);

 			}

@@ -4530,9 +4893,11 @@ 
 					$destfile = basename($destfull);

 					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);

 

-					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir

+					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+					    // If not a tmp dir

 					{

-						$filename = basename($destfile);

+						$filename = basename($destfile);
+					}
 						$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);

 						$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);

 

@@ -4545,22 +4910,30 @@ 
 						if ($this->element == 'propal')

 						{

 							$useonlinesignature = Globals::$conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok

-                            if ($useonlinesignature) $setsharekey=true;

-							if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD))

-                                $setsharekey = true;

+                            if ($useonlinesignature) {
+                                $setsharekey=true;
+                            }
+							if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+							                                $setsharekey = true;
+							}
                         }

-						if ($this->element == 'commande' && !empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))

-                            $setsharekey = true;

-                        if ($this->element == 'facture' && !empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))

-                            $setsharekey = true;

-                        if ($this->element == 'bank_account' && !empty(Globals::$conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD))

-                            $setsharekey = true;

+						if ($this->element == 'commande' && !empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+						                            $setsharekey = true;
+						}
+                        if ($this->element == 'facture' && !empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+                                                    $setsharekey = true;
+                        }
+                        if ($this->element == 'bank_account' && !empty(Globals::$conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
+                                                    $setsharekey = true;
+                        }
 

                         if ($setsharekey)

 						{

-							if (empty($ecmfile->share))	// Because object not found or share not set yet

+							if (empty($ecmfile->share)) {
+							    // Because object not found or share not set yet

 							{

-								require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

+								require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+							}
 								$ecmfile->share = getRandomPassword(true);

 							}

 						}

@@ -4577,8 +4950,7 @@ 
 							{

 								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

 							}

-						}

-						else

+						} else

 						{

 							$ecmfile->entity = Globals::$conf->entity;

                             $ecmfile->filepath = $rel_dir;

@@ -4605,17 +4977,20 @@ 
 

 						// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)

 						$update_main_doc_field=0;

-						if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;

+						if (! empty($obj->update_main_doc_field)) {
+						    $update_main_doc_field=1;
+						}
 						if ($update_main_doc_field && ! empty($this->table_element))

 						{

 							$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";

 							$sql.= ' WHERE rowid = '.$this->id;

 							$resql = $this->db->query($sql);

-							if (! $resql) dol_print_error($this->db);

+							if (! $resql) {
+							    dol_print_error($this->db);
+							}
 						}

 					}

-				}

-				else

+				} else

 				{

 					dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);

 				}

@@ -4624,15 +4999,13 @@ 
 				dol_meta_create($this);

 

 				return 1;

-			}

-			else

+			} else

 			{

 				$outputlangs->charset_output=$sav_charset_output;

 				dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			$this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);

 			dol_print_error('',$this->error);

@@ -4688,13 +5061,21 @@ 
 		global $conf, $_POST;

 

 		// If param here has been posted, we use this value first.

-		if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);

+		if (isset($_POST[$fieldname])) {
+		    return GETPOST($fieldname, 2);
+		}
 

-		if (isset($alternatevalue)) return $alternatevalue;

+		if (isset($alternatevalue)) {
+		    return $alternatevalue;
+		}
 

 		$newelement=$this->element;

-		if ($newelement == 'facture') $newelement='invoice';

-		if ($newelement == 'commande') $newelement='order';

+		if ($newelement == 'facture') {
+		    $newelement='invoice';
+		}
+		if ($newelement == 'commande') {
+		    $newelement='order';
+		}
 		if (empty($newelement))

 		{

 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);

@@ -4703,8 +5084,9 @@ 
 

 		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);

 		//var_dump($keyforfieldname);

-		if (isset(Globals::$conf->global->$keyforfieldname))

-            return Globals::$conf->global->$keyforfieldname;

+		if (isset(Globals::$conf->global->$keyforfieldname)) {
+		            return Globals::$conf->global->$keyforfieldname;
+		}
 

         // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname

 	}

@@ -4738,8 +5120,7 @@ 
 			if (!empty($this->errors))

 			{

 				$this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.

-			}

-			else

+			} else

 			{

 				$this->errors=$interface->errors;

 			}

@@ -4791,15 +5172,17 @@ 
 				$extrafields->fetch_name_optionals_label($this->table_element);

 			}

 			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);

-		}

-		else

+		} else

 		{

 			// global $extrafields;

             dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);

 		}

 

 		$table_element = $this->table_element;

-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+		if ($table_element == 'categorie') {
+		    $table_element = 'categories';
+		}
+		// For compatibility

 

 		// Request to get complementary values

 		if (is_array($optionsArray) && count($optionsArray) > 0)

@@ -4835,8 +5218,7 @@ 
 							{

 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);

 								$this->array_options["options_".$key]=$this->db->jdate($value);

-							}

-							else

+							} else

 							{

 								$this->array_options["options_".$key]=$value;

 							}

@@ -4848,10 +5230,12 @@ 
 

 				$this->db->free($resql);

 

-				if ($numrows) return $numrows;

-				else return 0;

-			}

-			else

+				if ($numrows) {
+				    return $numrows;
+				} else {
+				    return 0;
+				}
+			} else

 			{

 				dol_print_error($this->db);

 				return -1;

@@ -4870,7 +5254,10 @@ 
 		$this->db->begin();

 

 		$table_element = $this->table_element;

-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+		if ($table_element == 'categorie') {
+		    $table_element = 'categories';
+		}
+		// For compatibility

 

 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);

@@ -4880,8 +5267,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			$this->db->commit();

 			return 1;

@@ -4902,12 +5288,16 @@ 
 	{

 		global $conf,$langs,$user;

 

-		if (empty($userused)) $userused=$user;

+		if (empty($userused)) {
+		    $userused=$user;
+		}
 

 		$error=0;

 

-		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

-            return 0; // For avoid conflicts if trigger used

+		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		            return 0;
+		}
+		// For avoid conflicts if trigger used

 

         if (! empty($this->array_options))

 		{

@@ -4920,10 +5310,13 @@ 
 			//Eliminate copied source object extra_fields that do not exist in target object

 			$new_array_options=array();

 			foreach ($this->array_options as $key => $value) {

-				if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test

-					$new_array_options[$key] = $value;

-				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix

-					$new_array_options['options_'.$key] = $value;

+				if (in_array(substr($key,8), array_keys($target_extrafields))) {
+				    // We remove the 'options_' from $key for test

+					$new_array_options[$key] = $value;
+				} elseif (in_array($key, array_keys($target_extrafields))) {
+				    // We test on $key that does not contains the 'options_' prefix

+					$new_array_options['options_'.$key] = $value;
+				}
 			}

 

 			foreach($new_array_options as $key => $value)

@@ -4937,8 +5330,12 @@ 
 			   	if ($attributeRequired)

 			   	{

 			   		$mandatorypb=false;

-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;

-			   		if ($this->array_options[$key] === '') $mandatorypb=true;

+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') {
+			   		    $mandatorypb=true;
+			   		}
+			   		if ($this->array_options[$key] === '') {
+			   		    $mandatorypb=true;
+			   		}
 			   		if ($mandatorypb)

 			   		{

 			   			dol_syslog($this->error);

@@ -4957,8 +5354,7 @@ 
 			   			{

 			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 			   				return -1;

-			  			}

-			   			elseif ($value=='')

+			  			} elseif ($value=='')

 			   			{

 			   				$new_array_options[$key] = null;

 			   			}

@@ -4970,8 +5366,7 @@ 
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

 							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 							return -1;

-						}

-						elseif ($value=='')

+						} elseif ($value=='')

 						{

 							$new_array_options[$key] = null;

 						}

@@ -4996,27 +5391,27 @@ 
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...

 			   					//var_dump($action);

 			   					//var_dump($this->oldcopy);exit;

-			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value

+			   					if (is_object($this->oldcopy)) {
+			   					    // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value

 			   					{

 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);

 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.

 				   					{

-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

-				   					}

-									else

+				   						$new_array_options[$key] = $this->array_options[$key];
+			   					}
+			   					// Value is kept

+				   					} else

 									{

 										// var_dump($algo);

 										$newvalue = dol_hash($this->array_options[$key], $algo);

 										$new_array_options[$key] = $newvalue;

 									}

-			   					}

-			   					else

+			   					} else

 			   					{

 			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

 			   					}

 			   				}

-			   			}

-			   			else	// Common usage

+			   			} else	// Common usage

 			   			{

 			   				$new_array_options[$key] = $this->array_options[$key];

 			   			}

@@ -5042,26 +5437,30 @@ 
 						dol_include_once($InfoFieldList[1]);

 						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))

 						{

-							if ($value == '-1')	// -1 is key for no defined in combo list of objects

+							if ($value == '-1') {
+							    // -1 is key for no defined in combo list of objects

 							{

-								$new_array_options[$key]='';

-							}

-							elseif ($value)

+								$new_array_options[$key]='';
+							}
+							} elseif ($value)

 							{

 								$object = new $InfoFieldList[0]($this->db);

-								if (is_numeric($value)) $res=$object->fetch($value);

-								else $res=$object->fetch('',$value);

-

-								if ($res > 0) $new_array_options[$key]=$object->id;

-								else

+								if (is_numeric($value)) {
+								    $res=$object->fetch($value);
+								} else {
+								    $res=$object->fetch('',$value);
+								}
+

+								if ($res > 0) {
+								    $new_array_options[$key]=$object->id;
+								} else

 								{

 									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";

 									$this->db->rollback();

 									return -1;

 								}

 							}

-						}

-						else

+						} else

 						{

 							dol_syslog('Error bad setup of extrafield', LOG_WARNING);

 						}

@@ -5072,7 +5471,10 @@ 
 			$this->db->begin();

 

 			$table_element = $this->table_element;

-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+			if ($table_element == 'categorie') {
+			    $table_element = 'categories';
+			}
+			// For compatibility

 

 			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

 			dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);

@@ -5083,8 +5485,10 @@ 
 			{

 				$attributeKey = substr($key,8);   // Remove 'options_' prefix

 				// Add field of attribut

-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator

-					$sql.=",".$attributeKey;

+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+				    // Only for other type than separator

+					$sql.=",".$attributeKey;
+				}
 			}

 			$sql .= ") VALUES (".$this->id;

 

@@ -5092,13 +5496,14 @@ 
 			{

 				$attributeKey = substr($key,8);   // Remove 'options_' prefix

 				// Add field of attribute

-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)

+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+				    // Only for other type than separator)

 				{

 					if ($new_array_options[$key] != '')

 					{

-						$sql.=",'".$this->db->escape($new_array_options[$key])."'";

-					}

-					else

+						$sql.=",'".$this->db->escape($new_array_options[$key])."'";
+				}
+					} else

 					{

 						$sql.=",null";

 					}

@@ -5119,7 +5524,9 @@ 
 				// Call trigger

 				$this->context=array('extrafieldaddupdate'=>1);

 				$result=$this->call_trigger($trigger, $userused);

-				if ($result < 0) $error++;

+				if ($result < 0) {
+				    $error++;
+				}
 				// End call trigger

 			}

 

@@ -5127,14 +5534,14 @@ 
 			{

 				$this->db->rollback();

 				return -1;

-			}

-			else

+			} else

 			{

 				$this->db->commit();

 				return 1;

 			}

-		}

-		else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

 	/**

@@ -5151,12 +5558,16 @@ 
 	{

 		global $conf,$langs,$user;

 

-		if (empty($userused)) $userused=$user;

+		if (empty($userused)) {
+		    $userused=$user;
+		}
 

 		$error=0;

 

-		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

-            return 0; // For avoid conflicts if trigger used

+		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		            return 0;
+		}
+		// For avoid conflicts if trigger used

 

         if (! empty($this->array_options) && isset($this->array_options["options_".$key]))

 		{

@@ -5183,8 +5594,7 @@ 
 					{

 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);

 						return -1;

-					}

-					elseif ($value=='')

+					} elseif ($value=='')

 					{

 						$this->array_options["options_".$key] = null;

 					}

@@ -5196,8 +5606,7 @@ 
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 						return -1;

-					}

-					elseif ($value=='')

+					} elseif ($value=='')

 					{

 						$this->array_options["options_".$key] = null;

 					}

@@ -5249,7 +5658,9 @@ 
 				// Call trigger

 				$this->context=array('extrafieldupdate'=>1);

 				$result=$this->call_trigger($trigger, $userused);

-				if ($result < 0) $error++;

+				if ($result < 0) {
+				    $error++;
+				}
 				// End call trigger

 			}

 

@@ -5258,14 +5669,14 @@ 
 				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);

 				$this->db->rollback();

 				return -1;

-			}

-			else

+			} else

 			{

 				$this->db->commit();

 				return 1;

 			}

-		}

-		else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

 

@@ -5340,8 +5751,11 @@ 
 

 		if ($computed)

 		{

-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

-			else return '';

+			if (! preg_match('/^search_/', $keyprefix)) {
+			    return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+			    return '';
+			}
 		}

 

 

@@ -5355,33 +5769,27 @@ 
 			if ($type == 'date')

 			{

 				$morecss = 'minwidth100imp';

-			}

-			elseif ($type == 'datetime')

+			} elseif ($type == 'datetime')

 			{

 				$morecss = 'minwidth200imp';

-			}

-			elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

+			} elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

 			{

 				$morecss = 'maxwidth75';

-                        }elseif ($type == 'url')

+                        } elseif ($type == 'url')

 			{

 				$morecss='minwidth400';

-			}

-			elseif ($type == 'boolean')

+			} elseif ($type == 'boolean')

 			{

 				$morecss='';

-			}

-			else

+			} else

 			{

 				if (round($size) < 12)

 				{

 					$morecss = 'minwidth100';

-				}

-				else if (round($size) <= 48)

+				} else if (round($size) <= 48)

 				{

 					$morecss = 'minwidth200';

-				}

-				else

+				} else

 				{

 					$morecss = 'minwidth400';

 				}

@@ -5396,52 +5804,50 @@ 
 			$showtime = in_array($type,array('datetime')) ? 1 : 0;

 

 			// Do not show current date when field not required (see selectDate() method)

-			if (!$required && $value == '') $value = '-1';

+			if (!$required && $value == '') {
+			    $value = '-1';
+			}
 

 			// TODO Must also support $moreparam

 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

-		}

-		elseif (in_array($type,array('int','integer')))

+		} elseif (in_array($type,array('int','integer')))

 		{

 			$tmp=explode(',',$size);

 			$newsize=$tmp[0];

 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';

-		}

-		elseif (preg_match('/varchar/', $type))

+		} elseif (preg_match('/varchar/', $type))

 		{

 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';

-		}

-		elseif (in_array($type, array('mail', 'phone', 'url')))

+		} elseif (in_array($type, array('mail', 'phone', 'url')))

 		{

 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

-		}

-		elseif ($type == 'text')

+		} elseif ($type == 'text')

 		{

-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			if (! preg_match('/search_/', $keyprefix)) {
+			    // If keyprefix is search_ or search_options_, we must just use a simple text field

 			{

-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');

 				$out=$doleditor->Create(1);

-			}

-			else

+			} else

 			{

 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

 			}

-		}

-		elseif ($type == 'html')

+		} elseif ($type == 'html')

 		{

-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			if (! preg_match('/search_/', $keyprefix)) {
+			    // If keyprefix is search_ or search_options_, we must just use a simple text field

 			{

-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

                 $out=$doleditor->Create(1);

-			}

-			else

+			} else

 			{

 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

 			}

-		}

-		elseif ($type == 'boolean')

+		} elseif ($type == 'boolean')

 		{

 			$checked='';

 			if (!empty($value)) {

@@ -5450,22 +5856,19 @@ 
 				$checked=' value="1" ';

 			}

 			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';

-		}

-		elseif ($type == 'price')

+		} elseif ($type == 'price')

 		{

 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

 				$value=price($value);

 			}

 			$out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ' . $langs->getCurrencySymbol(Globals::$conf->currency);

-        }

-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

+        } elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

 		{

 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

 				$value=price($value);

 			}

 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';

-		}

-		elseif ($type == 'select')

+		} elseif ($type == 'select')

 		{

 			$out = '';

 			if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

@@ -5474,10 +5877,14 @@ 
 			}

 

 			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';

-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';

+                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1)) {
+                    $out.='<option value="0">&nbsp;</option>';
+                }
 			foreach ($param['options'] as $key => $val)

 			{

-				if ((string) $key == '') continue;

+				if ((string) $key == '') {
+				    continue;
+				}
 				list($val, $parent) = explode('|', $val);

 				$out.='<option value="'.$key.'"';

 				$out.= (((string) $value == (string) $key)?' selected':'');

@@ -5485,8 +5892,7 @@ 
 				$out.='>'.$val.'</option>';

 			}

 			$out.='</select>';

-		}

-		elseif ($type == 'sellist')

+		} elseif ($type == 'sellist')

 		{

 			$out = '';

 			if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

@@ -5552,13 +5958,11 @@ 
 					{

 						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';

 						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];

-					}

-					else

+					} else

 					{

 						$sqlwhere.= ' WHERE '.$InfoFieldList[4];

 					}

-				}

-				else

+				} else

 				{

 					$sqlwhere.= ' WHERE 1=1';

 				}

@@ -5594,8 +5998,7 @@ 
 							{

 								$labeltoshow.= $obj->$field_toshow.' ';

 							}

-						}

-						else

+						} else

 						{

 							$labeltoshow=$obj->{$InfoFieldList[1]};

 						}

@@ -5608,25 +6011,25 @@ 
 								$translabel=$langs->trans($obj->$field_toshow);

 								if ($translabel!=$obj->$field_toshow) {

 									$labeltoshow=dol_trunc($translabel,18).' ';

-								}else {

+								} else {

 									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';

 								}

 							}

 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

-						}

-						else

+						} else

 						{

 							if (! $notrans)

 							{

 								$translabel=$langs->trans($obj->{$InfoFieldList[1]});

 								if ($translabel!=$obj->{$InfoFieldList[1]}) {

 									$labeltoshow=dol_trunc($translabel,18);

-								}

-								else {

+								} else {

 									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);

 								}

 							}

-							if (empty($labeltoshow)) $labeltoshow='(not defined)';

+							if (empty($labeltoshow)) {
+							    $labeltoshow='(not defined)';
+							}
 							if ($value==$obj->rowid)

 							{

 								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

@@ -5646,19 +6049,16 @@ 
 						$i++;

 					}

 					$this->db->free($resql);

-				}

-				else {

+				} else {

 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

 				}

 			}

 			$out.='</select>';

-		}

-		elseif ($type == 'checkbox')

+		} elseif ($type == 'checkbox')

 		{

 			$value_arr=explode(',',$value);

 			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

-		}

-		elseif ($type == 'radio')

+		} elseif ($type == 'radio')

 		{

 			$out='';

 			foreach ($param['options'] as $keyopt => $val)

@@ -5669,13 +6069,11 @@ 
 				$out.= ($value==$keyopt?'checked':'');

 				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

 			}

-		}

-		elseif ($type == 'chkbxlst')

+		} elseif ($type == 'chkbxlst')

 		{

 			if (is_array($value)) {

 				$value_arr = $value;

-			}

-			else {

+			} else {

 				$value_arr = explode(',', $value);

 			}

 

@@ -5790,8 +6188,9 @@ 
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

 								}

 							}

-							if (empty($labeltoshow))

-								$labeltoshow = '(not defined)';

+							if (empty($labeltoshow)) {
+															$labeltoshow = '(not defined)';
+							}
 

 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

 									$data[$obj->rowid]=$labeltoshow;

@@ -5813,26 +6212,26 @@ 
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';

 				}

 			}

-		}

-		elseif ($type == 'link')

+		} elseif ($type == 'link')

 		{

 			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'

 			$showempty=(($required && $default != '')?0:1);

 			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);

 			if (Globals::$conf->global->MAIN_FEATURES_LEVEL >= 2) {

             			list($class,$classfile)=explode(':',$param_list[0]);

-            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);

-            			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);

+            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) {
+            			    $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);
+            			} else {
+            			    $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);
+            			}
             			$out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';

             			// TODO Add Javascript code to add input fields contents to new elements urls

 			}

-		}

-		elseif ($type == 'password')

+		} elseif ($type == 'password')

 		{

 			// If prefix is 'search_', field is used as a filter, we use a common text field.

 			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';

-		}

-		elseif ($type == 'array')

+		} elseif ($type == 'array')

 		{

 			$newval = $val;

 			$newval['type'] = 'varchar(256)';

@@ -5910,17 +6309,25 @@ 
 		{

 			$type = 'varchar';		// convert varchar(xx) int varchar

 			$size = $reg[1];

-		}

-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar

-		if (is_array($val['arrayofkeyval'])) $type='select';

-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';

+		} elseif (preg_match('/varchar/', $type)) {
+		    $type = 'varchar';
+		}
+		// convert varchar(xx) int varchar

+		if (is_array($val['arrayofkeyval'])) {
+		    $type='select';
+		}
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+		    $type='link';
+		}
 

 		$default=$val['default'];

 		$computed=$val['computed'];

 		$unique=$val['unique'];

 		$required=$val['required'];

 		$param=$val['param'];

-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];

+		if (is_array($val['arrayofkeyval'])) {
+		    $param['options'] = $val['arrayofkeyval'];
+		}
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))

 		{

 			$type='link';

@@ -5931,7 +6338,9 @@ 
 		$help=$val['help'];

 		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

 

-		if ($hidden) return '';

+		if ($hidden) {
+		    return '';
+		}
 

 		// If field is a computed field, value must become result of compute

 		if ($computed)

@@ -5947,36 +6356,29 @@ 
 			{

 				//$showsize=10;

 				$showsize = 'minwidth100imp';

-			}

-			elseif ($type == 'datetime')

+			} elseif ($type == 'datetime')

 			{

 				//$showsize=19;

 				$showsize = 'minwidth200imp';

-			}

-			elseif (in_array($type,array('int','double','price')))

+			} elseif (in_array($type,array('int','double','price')))

 			{

 				//$showsize=10;

 				$showsize = 'maxwidth75';

-			}

-			elseif ($type == 'url')

+			} elseif ($type == 'url')

 			{

 				$showsize='minwidth400';

-			}

-			elseif ($type == 'boolean')

+			} elseif ($type == 'boolean')

 			{

 				$showsize='';

-			}

-			else

+			} else

 			{

 				if (round($size) < 12)

 				{

 					$showsize = 'minwidth100';

-				}

-				else if (round($size) <= 48)

+				} else if (round($size) <= 48)

 				{

 					$showsize = 'minwidth200';

-				}

-				else

+				} else

 				{

 					//$showsize=48;

 					$showsize = 'minwidth400';

@@ -5985,59 +6387,52 @@ 
 		}

 

 		// Format output value differently according to properties of field

-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);

-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);

-		elseif ($type == 'date')

+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) {
+		    $value=$this->getNomUrl(1, '', 0, '', 1);
+		} elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {
+		    $value=$this->getLibStatut(3);
+		} elseif ($type == 'date')

 		{

 			if(! empty($value)) {

 				$value=dol_print_date($value,'day');

 			} else {

 				$value='';

 			}

-		}

-		elseif ($type == 'datetime')

+		} elseif ($type == 'datetime')

 		{

 			if(! empty($value)) {

 				$value=dol_print_date($value,'dayhour');

 			} else {

 				$value='';

 			}

-		}

-		elseif ($type == 'double')

+		} elseif ($type == 'double')

 		{

 			if (!empty($value)) {

 				$value=price($value);

 			}

-		}

-		elseif ($type == 'boolean')

+		} elseif ($type == 'boolean')

 		{

 			$checked='';

 			if (!empty($value)) {

 				$checked=' checked ';

 			}

 			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';

-		}

-		elseif ($type == 'mail')

+		} elseif ($type == 'mail')

 		{

 			$value=dol_print_email($value,0,0,0,64,1,1);

-		}

-		elseif ($type == 'url')

+		} elseif ($type == 'url')

 		{

 			$value=dol_print_url($value,'_blank',32,1);

-		}

-		elseif ($type == 'phone')

+		} elseif ($type == 'phone')

 		{

 			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);

-		}

-		elseif ($type == 'price')

+		} elseif ($type == 'price')

 		{

 			$value = price($value, 0, $langs, 0, 0, -1, Globals::$conf->currency);

-        }

-		elseif ($type == 'select')

+        } elseif ($type == 'select')

 		{

 			$value=$param['options'][$value];

-		}

-		elseif ($type == 'sellist')

+		} elseif ($type == 'sellist')

 		{

 			$param_list=array_keys($param['options']);

 			$InfoFieldList = explode(":", $param_list[0]);

@@ -6067,7 +6462,7 @@ 
 				$sql.= " WHERE ".$selectkey."=0";

 			} elseif ($selectkey=='rowid') {

 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);

-			}else {

+			} else {

 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

 			}

 

@@ -6094,12 +6489,11 @@ 
 						}

 						if ($translabel!=$field_toshow) {

 							$value.=dol_trunc($translabel,18).' ';

-						}else {

+						} else {

 							$value.=$obj->$field_toshow.' ';

 						}

 					}

-				}

-				else

+				} else

 				{

 					$translabel='';

 					if (!empty($obj->{$InfoFieldList[1]})) {

@@ -6107,18 +6501,17 @@ 
 					}

 					if ($translabel!=$obj->{$InfoFieldList[1]}) {

 						$value=dol_trunc($translabel,18);

-					}else {

+					} else {

 						$value=$obj->{$InfoFieldList[1]};

 					}

 				}

-			}

-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);

-		}

-		elseif ($type == 'radio')

+			} else {
+			    dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			}
+		} elseif ($type == 'radio')

 		{

 			$value=$param['options'][$value];

-		}

-		elseif ($type == 'checkbox')

+		} elseif ($type == 'checkbox')

 		{

 			$value_arr=explode(',',$value);

 			$value='';

@@ -6129,8 +6522,7 @@ 
 				}

 				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

 			}

-		}

-		elseif ($type == 'chkbxlst')

+		} elseif ($type == 'chkbxlst')

 		{

 			$value_arr = explode(',', $value);

 

@@ -6198,8 +6590,7 @@ 
 			} else {

 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);

 			}

-		}

-		elseif ($type == 'link')

+		} elseif ($type == 'link')

 		{

 			$out='';

 

@@ -6221,24 +6612,21 @@ 
 						$object->fetch($value);

 						$value=$object->getNomUrl($getnomurlparam);

 					}

-				}

-				else

+				} else

 				{

 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);

 					return 'Error bad setup of extrafield';

 				}

-			}

-			else $value='';

-		}

-		elseif ($type == 'text' || $type == 'html')

+			} else {
+			    $value='';
+			}
+		} elseif ($type == 'text' || $type == 'html')

 		{

 			$value=dol_htmlentitiesbr($value);

-		}

-		elseif ($type == 'password')

+		} elseif ($type == 'password')

 		{

 			$value=preg_replace('/./i','*',$value);

-		}

-		elseif ($type == 'array')

+		} elseif ($type == 'array')

 		{

 			$value = implode('<br>', $value);

 		}

@@ -6265,7 +6653,9 @@ 
 	{

 		global $db, $conf, $langs, $action, $form;

 

-		if (! is_object($form)) $form=new Form($db);

+		if (! is_object($form)) {
+		    $form=new Form($db);
+		}
 

 		$out = '';

 

@@ -6279,7 +6669,9 @@ 
 			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)

 			{

 				// Show only the key field in params

-				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;

+				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) {
+				    continue;
+				}
 

 				$enabled = 1;

 				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))

@@ -6293,11 +6685,18 @@ 
 					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);

 				}

 

-				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list

-				if (empty($perms)) continue;

+				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) {
+				    continue;
+				}
+				// <> -1 and <> 1 and <> 3 = not visible on forms, only on list

+				if (empty($perms)) {
+				    continue;
+				}
 

 				// Load language if required

-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

+				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
+				    $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				}
 

 				$colspan='3';

 				if (is_array($params) && count($params)>0) {

@@ -6331,8 +6730,7 @@ 
 				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')

 				{

 					$out .= $extrafields->showSeparator($key, $this);

-				}

-				else

+				} else

 				{

 					$csstyle='';

 					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');

@@ -6363,9 +6761,11 @@ 
 					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))

 					{

 						$datenotinstring = $this->array_options['options_' . $key];

-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility

+						if (! is_numeric($this->array_options['options_' . $key])) {
+						    // For backward compatibility

 						{

-							$datenotinstring = $this->db->jdate($datenotinstring);

+							$datenotinstring = $this->db->jdate($datenotinstring);
+						}
 						}

 						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;

 					}

@@ -6378,11 +6778,18 @@ 
 					$labeltoshow = $langs->trans($label);

 

 					$out .= '<td class="titlefield';

-					if (GETPOST('action','none') == 'create') $out.='create';

-					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';

+					if (GETPOST('action','none') == 'create') {
+					    $out.='create';
+					}
+					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+					    $out .= ' fieldrequired';
+					}
 					$out .= '">';

-					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);

-					else $out .= $labeltoshow;

+					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) {
+					    $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
+					} else {
+					    $out .= $labeltoshow;
+					}
 					$out .= '</td>';

 

 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';

@@ -6399,9 +6806,11 @@ 
 

 					$out .= '</td>';

 

-					if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1))

-                        $out .= '</tr>';

-                    else $out .= '</tr>';

+					if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+					                        $out .= '</tr>';
+					} else {
+                        $out .= '</tr>';
+                    }
 					$e++;

 				}

 			}

@@ -6453,7 +6862,9 @@ 
 		global $user;

 

 		$element = $this->element;

-		if ($element == 'facturerec') $element='facture';

+		if ($element == 'facturerec') {
+		    $element='facture';
+		}
 

 		return $user->rights->{$element};

 	}

@@ -6478,7 +6889,10 @@ 
 

 			if (! $db->query($sql))

 			{

-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

+				if ($ignoreerrors) {
+				    return true;
+				}
+				// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

 				//$this->errors = $db->lasterror();

 				return false;

 			}

@@ -6507,8 +6921,7 @@ 
 

 		if (($unitPrice > 0) && (isset(Globals::$conf->global->ForceBuyingPriceIfNull) && Globals::$conf->global->ForceBuyingPriceIfNull == 1)) { // In most cases, test here is false{

 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);

-		}

-		else

+		} else

 		{

 			// Get cost price for margin calculation

 			if (! empty($fk_product))

@@ -6525,13 +6938,11 @@ 
 					if ($product->cost_price > 0)

 					{

 						$buyPrice = $product->cost_price;

-					}

-					else if ($product->pmp > 0)

+					} else if ($product->pmp > 0)

 					{

 						$buyPrice = $product->pmp;

 					}

-				}

-				else if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'pmp') {

+				} else if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'pmp') {

 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

 					$product = new Product($this->db);

 					$result = $product->fetch($fk_product);

@@ -6552,8 +6963,7 @@ 
 					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)

 					{

 						$buyPrice = $productFournisseur->fourn_unitprice;

-					}

-					else if ($result < 0)

+					} else if ($result < 0)

 					{

 						$this->errors[] = $productFournisseur->error;

 						return -2;

@@ -6599,8 +7009,7 @@ 
 		{

 			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';

 			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';

-		}

-		else

+		} else

 		{

 			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';

 			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';

@@ -6662,19 +7071,26 @@ 
 

 						// Find name of thumb file

 						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));

-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';

+						if (! dol_is_file($dirthumb.$photo_vignette)) {
+						    $photo_vignette='';
+						}
 

 						// Get filesize of original file

 						$imgarray=dol_getImageSize($dir.$photo);

 

 						if ($nbbyrow > 0)

 						{

-							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';

+							if ($nbphoto == 1) {
+							    $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+							}
 

-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';

+							if ($nbphoto % $nbbyrow == 1) {
+							    $return.= '<tr align=center valign=middle border=1>';
+							}
 							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';

-						}

-						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';

+						} else if ($nbbyrow < 0) {
+						    $return .= '<div class="inline-block">';
+						}
 

 						$return.= "\n";

 

@@ -6682,15 +7098,20 @@ 
 						if (empty($nolink))

 						{

 							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);

-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';

-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';

+							if ($urladvanced) {
+							    $return.='<a href="'.$urladvanced.'">';
+							} else {
+							    $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							}
 						}

 

 						// Show image (width height=$maxHeight)

 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine

 						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;

 						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];

-						if ($notitle) $alt='';

+						if ($notitle) {
+						    $alt='';
+						}
 

 						if ($usesharelink)

 						{

@@ -6700,35 +7121,35 @@ 
 								{

 									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';

 									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

-								}

-								else {

+								} else {

 									$return.= '<!-- Show original file -->';

 									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

 								}

-							}

-							else

+							} else

 							{

 								$return.= '<!-- Show nophoto file (because file is not shared) -->';

 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';

 							}

-						}

-						else

+						} else

 						{

 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

 							{

 								$return.= '<!-- Show thumb -->';

 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';

-							}

-							else {

+							} else {

 								$return.= '<!-- Show original file -->';

 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';

 							}

 						}

 

-						if (empty($nolink)) $return.= '</a>';

+						if (empty($nolink)) {
+						    $return.= '</a>';
+						}
 						$return.="\n";

 

-						if ($showfilename) $return.= '<br>'.$viewfilename;

+						if ($showfilename) {
+						    $return.= '<br>'.$viewfilename;
+						}
 						if ($showaction)

 						{

 							$return.= '<br>';

@@ -6753,15 +7174,20 @@ 
 						if ($nbbyrow > 0)

 						{

 							$return.= '</td>';

-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';

-						}

-						else if ($nbbyrow < 0) $return.='</div>';

+							if (($nbphoto % $nbbyrow) == 0) {
+							    $return.= '</tr>';
+							}
+						} else if ($nbbyrow < 0) {
+						    $return.='</div>';
+						}
 					}

 

 					if (empty($size)) {     // Format origine

 						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';

 

-						if ($showfilename) $return.= '<br>'.$viewfilename;

+						if ($showfilename) {
+						    $return.= '<br>'.$viewfilename;
+						}
 						if ($showaction)

 						{

 							// Special case for product

@@ -6778,7 +7204,9 @@ 
 					}

 

 					// On continue ou on arrete de boucler ?

-					if ($nbmax && $nbphoto >= $nbmax) break;

+					if ($nbmax && $nbphoto >= $nbmax) {
+					    break;
+					}
 				}

 			}

 

@@ -6793,7 +7221,9 @@ 
 						$nbphoto++;

 					}

 

-					if ($nbphoto) $return.= '</table>';

+					if ($nbphoto) {
+					    $return.= '</table>';
+					}
 				}

 			}

 		}

@@ -6814,10 +7244,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='array') return true;

-			else return false;

-		}

-		else return false;

+			if(isset($info['type']) && $info['type']=='array') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6830,10 +7264,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='null') return true;

-			else return false;

-		}

-		else return false;

+			if(isset($info['type']) && $info['type']=='null') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6844,8 +7282,11 @@ 
 	 */

 	public function isDate($info)

 	{

-		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;

-		else return false;

+		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) {
+		    return true;
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6858,10 +7299,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;

-			else return false;

-		}

-		else return false;

+			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6874,10 +7319,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;

-			else return false;

-		}

-		else return false;

+			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6890,10 +7339,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='text') return true;

-			else return false;

-		}

-		else return false;

+			if(isset($info['type']) && $info['type']=='text') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6906,10 +7359,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if(isset($info['index']) && $info['index']==true) return true;

-			else return false;

-		}

-		else return false;

+			if(isset($info['index']) && $info['index']==true) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6923,21 +7380,21 @@ 
 		global $conf;

 

 		$queryarray=array();

-		foreach ($this->fields as $field=>$info)	// Loop on definition of fields

+		foreach ($this->fields as $field=>$info) {
+		    // Loop on definition of fields

 		{

 			// Depending on field type ('datetime', ...)

 			if($this->isDate($info))

 			{

 				if(empty($this->{$field}))

 				{

-					$queryarray[$field] = null;

-				}

-				else

+					$queryarray[$field] = null;
+		}
+				} else

 				{

 					$queryarray[$field] = $this->db->idate($this->{$field});

 				}

-			}

-			else if($this->isArray($info))

+			} else if($this->isArray($info))

 			{

 				if(! empty($this->{$field})) {

 					if(! is_array($this->{$field})) {

@@ -6947,29 +7404,35 @@ 
 				} else {

 					$queryarray[$field] = null;

 				}

-			}

-			else if($this->isInt($info))

+			} else if($this->isInt($info))

 			{

-				if ($field == 'entity' && is_null($this->{$field}))

-                    $queryarray[$field] = Globals::$conf->entity;

-                else

+				if ($field == 'entity' && is_null($this->{$field})) {
+				                    $queryarray[$field] = Globals::$conf->entity;
+				} else

 				{

 					$queryarray[$field] = (int) price2num($this->{$field});

-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.

+					if (empty($queryarray[$field])) {
+					    $queryarray[$field]=0;
+					}
+					// May be reset to null later if property 'notnull' is -1 for this field.

 				}

-			}

-			else if($this->isFloat($info))

+			} else if($this->isFloat($info))

 			{

 				$queryarray[$field] = (double) price2num($this->{$field});

-				if (empty($queryarray[$field])) $queryarray[$field]=0;

-			}

-			else

+				if (empty($queryarray[$field])) {
+				    $queryarray[$field]=0;
+				}
+			} else

 			{

 				$queryarray[$field] = $this->{$field};

 			}

 

-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);

-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;

+			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) {
+			    unset($queryarray[$field]);
+			}
+			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) {
+			    $queryarray[$field] = null;
+			}
 		}

 

 		return $queryarray;

@@ -6987,42 +7450,47 @@ 
 		{

 			if($this->isDate($info))

 			{

-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;

-				else $this->{$field} = strtotime($obj->{$field});

-			}

-			elseif($this->isArray($info))

+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') {
+				    $this->{$field} = 0;
+				} else {
+				    $this->{$field} = strtotime($obj->{$field});
+				}
+			} elseif($this->isArray($info))

 			{

 				if(! empty($obj->{$field})) {

 					$this->{$field} = @unserialize($obj->{$field});

 					// Hack for data not in UTF8

-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));

+					if($this->{$field } === false) {
+					    @unserialize(utf8_decode($obj->{$field}));
+					}
 				} else {

 					$this->{$field} = array();

 				}

-			}

-			elseif($this->isInt($info))

+			} elseif($this->isInt($info))

 			{

-				if ($field == 'rowid') $this->id = (int) $obj->{$field};

-				else $this->{$field} = (int) $obj->{$field};

-			}

-			elseif($this->isFloat($info))

+				if ($field == 'rowid') {
+				    $this->id = (int) $obj->{$field};
+				} else {
+				    $this->{$field} = (int) $obj->{$field};
+				}
+			} elseif($this->isFloat($info))

 			{

 				$this->{$field} = (double) $obj->{$field};

-			}

-			elseif($this->isNull($info))

+			} elseif($this->isNull($info))

 			{

 				$val = $obj->{$field};

 				// zero is not null

 				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);

-			}

-			else

+			} else

 			{

 				$this->{$field} = $obj->{$field};

 			}

 		}

 

 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.

-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;

+		if (! isset($this->fields['ref']) && isset($this->id)) {
+		    $this->ref = $this->id;
+		}
 	}

 

 	/**

@@ -7045,9 +7513,13 @@ 
 	 */

     protected function quote($value, $fieldsentry)

     {

-		if (is_null($value)) return 'NULL';

-		else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");

-		else return "'".$this->db->escape($value)."'";

+		if (is_null($value)) {
+		    return 'NULL';
+		} else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) {
+		    return $this->db->escape("$value");
+		} else {
+		    return "'".$this->db->escape($value)."'";
+		}
 	}

 

 

@@ -7067,8 +7539,12 @@ 
 		$now=dol_now();

 

 		$fieldvalues = $this->setSaveQuery();

-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);

-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;

+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {
+		    $fieldvalues['date_creation']=$this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) {
+		    $fieldvalues['fk_user_creat']=$user->id;
+		}
 		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.

 

 		$keys=array();

@@ -7083,8 +7559,12 @@ 
 		foreach($keys as $key)

 		{

 			// If field is an implicit foreign key field

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';

-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
 

 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

 			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))

@@ -7094,11 +7574,17 @@ 
 			}

 

 			// If field is an implicit foreign key field

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';

-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
+			    $values[$key]='null';
+			}
+			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) {
+			    $values[$key]='null';
+			}
 		}

 

-		if ($error) return -1;

+		if ($error) {
+		    return -1;
+		}
 

 		$this->db->begin();

 

@@ -7124,7 +7610,9 @@ 
 		if (! $error)

 		{

 			$result=$this->insertExtraFields();

-			if ($result < 0) $error++;

+			if ($result < 0) {
+			    $error++;
+			}
 		}

 

 		// Triggers

@@ -7157,15 +7645,24 @@ 
 	 */

 	public function fetchCommon($id, $ref = null, $morewhere = '')

 	{

-		if (empty($id) && empty($ref) && empty($morewhere)) return -1;

+		if (empty($id) && empty($ref) && empty($morewhere)) {
+		    return -1;
+		}
 

 		$sql = 'SELECT '.$this->getFieldList();

 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

 

-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;

-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);

-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare

-		if ($morewhere)   $sql.= $morewhere;

+		if (!empty($id)) {
+		    $sql.= ' WHERE rowid = '.$id;
+		} elseif (!empty($ref)) {
+		    $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		} else {
+		    $sql.=' WHERE 1 = 1';
+		}
+		// usage with empty id and empty ref is very rare

+		if ($morewhere) {
+		    $sql.= $morewhere;
+		}
 		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record

 

 		$res = $this->db->query($sql);

@@ -7176,13 +7673,11 @@ 
 			{

 				$this->setVarsFromFetchObj($obj);

 				return $this->id;

-			}

-			else

+			} else

 			{

 				return 0;

 			}

-		}

-		else

+		} else

 		{

 			$this->error = $this->db->lasterror();

 			$this->errors[] = $this->error;

@@ -7206,8 +7701,12 @@ 
 		$now=dol_now();

 

 		$fieldvalues = $this->setSaveQuery();

-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);

-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;

+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
+		    $fieldvalues['date_modification']=$this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) {
+		    $fieldvalues['fk_user_modif']=$user->id;
+		}
 		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.

 

 		$keys=array();

@@ -7222,8 +7721,14 @@ 
 		// Clean and check mandatory

 		foreach($keys as $key)

 		{

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field

-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			// This is an implicit foreign key field

+			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			// This is an explicit foreign key field

 

 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

 			/*

@@ -7303,10 +7808,11 @@ 
 					return -1;

 				}

 			}

-		}

-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.

+		} elseif (! empty($this->fk_element) && ! empty($this->childtables)) {
+		    // If object has childs linked with a foreign key field, we check all child tables.

 		{

-			$objectisused = $this->isObjectUsed($this->id);

+			$objectisused = $this->isObjectUsed($this->id);
+		}
 			if (! empty($objectisused))

 			{

 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);

@@ -7413,7 +7919,9 @@ 
      */

     public function trimParameters($parameters)

     {

-        if (!is_array($parameters)) return;

+        if (!is_array($parameters)) {
+            return;
+        }
         foreach ($parameters as $parameter) {

             if (isset($this->$parameter)) {

                 $this->$parameter = trim($this->$parameter);

Base/Menubase.php

Spacing +77 added lines, -77 removed lines

@@ -83,7 +83,7 @@ 
     public $titre;

     //public Globals::$langs;

     public $level;

-    public $leftmenu;  //<! Not used

+    public $leftmenu; //<! Not used

     public $perms;

     public $enabled;

     //public $user;

@@ -117,7 +117,7 @@ 
         $this->type = trim($this->type);

         $this->mainmenu = trim($this->mainmenu);

         $this->leftmenu = trim($this->leftmenu);

-        $this->fk_menu = (int) $this->fk_menu;          // If -1, fk_mainmenu and fk_leftmenu must be defined

+        $this->fk_menu = (int) $this->fk_menu; // If -1, fk_mainmenu and fk_leftmenu must be defined

         $this->fk_mainmenu = trim($this->fk_mainmenu);

         $this->fk_leftmenu = trim($this->fk_leftmenu);

         $this->position = (int) $this->position;

@@ -144,7 +144,7 @@ 
         // may use an already used value because its internal cursor does not increase when we do

         // an insert with a forced id.

         if (in_array(Globals::$db->type, array('pgsql'))) {

-            $sql = "SELECT MAX(rowid) as maxrowid FROM " . MAIN_DB_PREFIX . "menu";

+            $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";

             $resqlrowid = Globals::$db->query($sql);

             if ($resqlrowid) {

                 $obj = Globals::$db->fetch_object($resqlrowid);

@@ -155,7 +155,7 @@ 
                     $maxrowid = 1;

                 }

 

-                $sql = "SELECT setval('" . MAIN_DB_PREFIX . "menu_rowid_seq', " . ($maxrowid) . ")";

+                $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";

                 //print $sql; exit;

                 $resqlrowidset = Globals::$db->query($sql);

                 if (!$resqlrowidset) {

@@ -168,12 +168,12 @@ 
 

         // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql

         $sql = "SELECT count(*)";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "menu";

-        $sql .= " WHERE menu_handler = '" . Globals::$db->escape($this->menu_handler) . "'";

-        $sql .= " AND fk_menu = " . ((int) $this->fk_menu);

-        $sql .= " AND position = " . ((int) $this->position);

-        $sql .= " AND url = '" . Globals::$db->escape($this->url) . "'";

-        $sql .= " AND entity = " . Globals::$conf->entity;

+        $sql .= " FROM ".MAIN_DB_PREFIX."menu";

+        $sql .= " WHERE menu_handler = '".Globals::$db->escape($this->menu_handler)."'";

+        $sql .= " AND fk_menu = ".((int) $this->fk_menu);

+        $sql .= " AND position = ".((int) $this->position);

+        $sql .= " AND url = '".Globals::$db->escape($this->url)."'";

+        $sql .= " AND entity = ".Globals::$conf->entity;

 

         $result = Globals::$db->query($sql);

         if ($result) {

@@ -181,7 +181,7 @@ 
 

             if ($row[0] == 0) {   // If not found

                 // Insert request

-                $sql = "INSERT INTO " . MAIN_DB_PREFIX . "menu(";

+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";

                 $sql .= "menu_handler,";

                 $sql .= "entity,";

                 $sql .= "module,";

@@ -200,38 +200,38 @@ 
                 $sql .= "enabled,";

                 $sql .= "usertype";

                 $sql .= ") VALUES (";

-                $sql .= " '" . Globals::$db->escape($this->menu_handler) . "',";

-                $sql .= " '" . Globals::$db->escape(Globals::$conf->entity) . "',";

-                $sql .= " '" . Globals::$db->escape($this->module) . "',";

-                $sql .= " '" . Globals::$db->escape($this->type) . "',";

-                $sql .= " " . ($this->mainmenu ? "'" . Globals::$db->escape($this->mainmenu) . "'" : "''") . ",";    // Can't be null

-                $sql .= " " . ($this->leftmenu ? "'" . Globals::$db->escape($this->leftmenu) . "'" : "null") . ",";

-                $sql .= " " . ((int) $this->fk_menu) . ",";

-                $sql .= " " . ($this->fk_mainmenu ? "'" . Globals::$db->escape($this->fk_mainmenu) . "'" : "null") . ",";

-                $sql .= " " . ($this->fk_leftmenu ? "'" . Globals::$db->escape($this->fk_leftmenu) . "'" : "null") . ",";

-                $sql .= " " . ((int) $this->position) . ",";

-                $sql .= " '" . Globals::$db->escape($this->url) . "',";

-                $sql .= " '" . Globals::$db->escape($this->target) . "',";

-                $sql .= " '" . Globals::$db->escape($this->titre) . "',";

-                $sql .= " '" . Globals::$db->escape($this->langs) . "',";

-                $sql .= " '" . Globals::$db->escape($this->perms) . "',";

-                $sql .= " '" . Globals::$db->escape($this->enabled) . "',";

-                $sql .= " '" . Globals::$db->escape($this->user) . "'";

+                $sql .= " '".Globals::$db->escape($this->menu_handler)."',";

+                $sql .= " '".Globals::$db->escape(Globals::$conf->entity)."',";

+                $sql .= " '".Globals::$db->escape($this->module)."',";

+                $sql .= " '".Globals::$db->escape($this->type)."',";

+                $sql .= " ".($this->mainmenu ? "'".Globals::$db->escape($this->mainmenu)."'" : "''").","; // Can't be null

+                $sql .= " ".($this->leftmenu ? "'".Globals::$db->escape($this->leftmenu)."'" : "null").",";

+                $sql .= " ".((int) $this->fk_menu).",";

+                $sql .= " ".($this->fk_mainmenu ? "'".Globals::$db->escape($this->fk_mainmenu)."'" : "null").",";

+                $sql .= " ".($this->fk_leftmenu ? "'".Globals::$db->escape($this->fk_leftmenu)."'" : "null").",";

+                $sql .= " ".((int) $this->position).",";

+                $sql .= " '".Globals::$db->escape($this->url)."',";

+                $sql .= " '".Globals::$db->escape($this->target)."',";

+                $sql .= " '".Globals::$db->escape($this->titre)."',";

+                $sql .= " '".Globals::$db->escape($this->langs)."',";

+                $sql .= " '".Globals::$db->escape($this->perms)."',";

+                $sql .= " '".Globals::$db->escape($this->enabled)."',";

+                $sql .= " '".Globals::$db->escape($this->user)."'";

                 $sql .= ")";

 

-                AlDolUtils::dol_syslog(get_class($this) . "::create", LOG_DEBUG);

+                AlDolUtils::dol_syslog(get_class($this)."::create", LOG_DEBUG);

                 $resql = Globals::$db->query($sql);

                 if ($resql) {

-                    $this->id = Globals::$db->last_insert_id(MAIN_DB_PREFIX . "menu");

-                    AlDolUtils::dol_syslog(get_class($this) . "::create record added has rowid=" . $this->id, LOG_DEBUG);

+                    $this->id = Globals::$db->last_insert_id(MAIN_DB_PREFIX."menu");

+                    AlDolUtils::dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);

 

                     return $this->id;

                 } else {

-                    $this->error = "Error " . Globals::$db->lasterror();

+                    $this->error = "Error ".Globals::$db->lasterror();

                     return -1;

                 }

             } else {

-                AlDolUtils::dol_syslog(get_class($this) . "::create menu entry already exists", LOG_WARNING);

+                AlDolUtils::dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);

                 $this->error = 'Error Menu entry already exists';

                 return 0;

             }

@@ -272,29 +272,29 @@ 
         // Check parameters

         // Put here code to add control on parameters values

         // Update request

-        $sql = "UPDATE " . MAIN_DB_PREFIX . "menu SET";

-        $sql .= " menu_handler='" . Globals::$db->escape($this->menu_handler) . "',";

-        $sql .= " module='" . Globals::$db->escape($this->module) . "',";

-        $sql .= " type='" . Globals::$db->escape($this->type) . "',";

-        $sql .= " mainmenu='" . Globals::$db->escape($this->mainmenu) . "',";

-        $sql .= " leftmenu='" . Globals::$db->escape($this->leftmenu) . "',";

-        $sql .= " fk_menu=" . $this->fk_menu . ",";

-        $sql .= " fk_mainmenu=" . ($this->fk_mainmenu ? "'" . Globals::$db->escape($this->fk_mainmenu) . "'" : "null") . ",";

-        $sql .= " fk_leftmenu=" . ($this->fk_leftmenu ? "'" . Globals::$db->escape($this->fk_leftmenu) . "'" : "null") . ",";

-        $sql .= " position=" . ($this->position > 0 ? $this->position : 0) . ",";

-        $sql .= " url='" . Globals::$db->escape($this->url) . "',";

-        $sql .= " target='" . Globals::$db->escape($this->target) . "',";

-        $sql .= " titre='" . Globals::$db->escape($this->titre) . "',";

-        $sql .= " langs='" . Globals::$db->escape($this->langs) . "',";

-        $sql .= " perms='" . Globals::$db->escape($this->perms) . "',";

-        $sql .= " enabled='" . Globals::$db->escape($this->enabled) . "',";

-        $sql .= " usertype='" . Globals::$db->escape($this->user) . "'";

-        $sql .= " WHERE rowid=" . $this->id;

-

-        AlDolUtils::dol_syslog(get_class($this) . "::update", LOG_DEBUG);

+        $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";

+        $sql .= " menu_handler='".Globals::$db->escape($this->menu_handler)."',";

+        $sql .= " module='".Globals::$db->escape($this->module)."',";

+        $sql .= " type='".Globals::$db->escape($this->type)."',";

+        $sql .= " mainmenu='".Globals::$db->escape($this->mainmenu)."',";

+        $sql .= " leftmenu='".Globals::$db->escape($this->leftmenu)."',";

+        $sql .= " fk_menu=".$this->fk_menu.",";

+        $sql .= " fk_mainmenu=".($this->fk_mainmenu ? "'".Globals::$db->escape($this->fk_mainmenu)."'" : "null").",";

+        $sql .= " fk_leftmenu=".($this->fk_leftmenu ? "'".Globals::$db->escape($this->fk_leftmenu)."'" : "null").",";

+        $sql .= " position=".($this->position > 0 ? $this->position : 0).",";

+        $sql .= " url='".Globals::$db->escape($this->url)."',";

+        $sql .= " target='".Globals::$db->escape($this->target)."',";

+        $sql .= " titre='".Globals::$db->escape($this->titre)."',";

+        $sql .= " langs='".Globals::$db->escape($this->langs)."',";

+        $sql .= " perms='".Globals::$db->escape($this->perms)."',";

+        $sql .= " enabled='".Globals::$db->escape($this->enabled)."',";

+        $sql .= " usertype='".Globals::$db->escape($this->user)."'";

+        $sql .= " WHERE rowid=".$this->id;

+

+        AlDolUtils::dol_syslog(get_class($this)."::update", LOG_DEBUG);

         $resql = Globals::$db->query($sql);

         if (!$resql) {

-            $this->error = "Error " . Globals::$db->lasterror();

+            $this->error = "Error ".Globals::$db->lasterror();

             return -1;

         }

 

@@ -332,10 +332,10 @@ 
         $sql .= " t.enabled,";

         $sql .= " t.usertype as user,";

         $sql .= " t.tms";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "menu as t";

-        $sql .= " WHERE t.rowid = " . $id;

+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as t";

+        $sql .= " WHERE t.rowid = ".$id;

 

-        AlDolUtils::dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

         $resql = Globals::$db->query($sql);

         if ($resql) {

             if (Globals::$db->num_rows($resql)) {

@@ -366,7 +366,7 @@ 
 

             return 1;

         } else {

-            $this->error = "Error " . Globals::$db->lasterror();

+            $this->error = "Error ".Globals::$db->lasterror();

             return -1;

         }

     }

@@ -381,13 +381,13 @@ 
     {

         // global $conf, Globals::$langs;

 

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "menu";

-        $sql .= " WHERE rowid=" . $this->id;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";

+        $sql .= " WHERE rowid=".$this->id;

 

-        AlDolUtils::dol_syslog(get_class($this) . "::delete", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::delete", LOG_DEBUG);

         $resql = Globals::$db->query($sql);

         if (!$resql) {

-            $this->error = "Error " . Globals::$db->lasterror();

+            $this->error = "Error ".Globals::$db->lasterror();

             return -1;

         }

 

@@ -438,8 +438,8 @@ 
         // global Globals::$langs, $user, $conf; // To export to AlDolUtils::dol_eval function

         // global $mainmenu, $leftmenu;  // To export to AlDolUtils::dol_eval function

 

-        $mainmenu = $mymainmenu;  // To export to AlDolUtils::dol_eval function

-        $leftmenu = $myleftmenu;  // To export to AlDolUtils::dol_eval function

+        $mainmenu = $mymainmenu; // To export to AlDolUtils::dol_eval function

+        $leftmenu = $myleftmenu; // To export to AlDolUtils::dol_eval function

 

         $newTabMenu = array();

         foreach ($tabMenu as $val) {

@@ -468,8 +468,8 @@ 
         //global Globals::$langs, $user, $conf;  // To export to AlDolUtils::dol_eval function

         // global $mainmenu, $leftmenu;  // To export to AlDolUtils::dol_eval function

 

-        $mainmenu = $mymainmenu;  // To export to AlDolUtils::dol_eval function

-        $leftmenu = $myleftmenu;  // To export to AlDolUtils::dol_eval function

+        $mainmenu = $mymainmenu; // To export to AlDolUtils::dol_eval function

+        $leftmenu = $myleftmenu; // To export to AlDolUtils::dol_eval function

         // Detect what is top mainmenu id

         $menutopid = '';

         foreach ($tabMenu as $key => $val) {

@@ -524,7 +524,7 @@ 
                     if ($found) {

                         $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);

                     } else {

-                        AlDolUtils::dol_syslog("Error. Modules " . $val['module'] . " has defined a menu entry with a parent='fk_mainmenu=" . $val['fk_leftmenu'] . ",fk_leftmenu=" . $val['fk_leftmenu'] . "' and position=" . $val['position'] . '. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);

+                        AlDolUtils::dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);

                         //print "Parent menu not found !!<br>";

                     }

                 }

@@ -550,13 +550,13 @@ 
         //global $mainmenu, $leftmenu; // To export to AlDolUtils::dol_eval function

 

         $menutopid = 0;

-        $mainmenu = $mymainmenu;  // To export to AlDolUtils::dol_eval function

-        $leftmenu = $myleftmenu;  // To export to AlDolUtils::dol_eval function

+        $mainmenu = $mymainmenu; // To export to AlDolUtils::dol_eval function

+        $leftmenu = $myleftmenu; // To export to AlDolUtils::dol_eval function

 

         $sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "menu as m";

-        $sql .= " WHERE m.entity IN (0," . Globals::$conf->entity . ")";

-        $sql .= " AND m.menu_handler IN ('" . $menu_handler . "','all')";

+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";

+        $sql .= " WHERE m.entity IN (0,".Globals::$conf->entity.")";

+        $sql .= " AND m.menu_handler IN ('".$menu_handler."','all')";

         if ($type_user == 0) {

             $sql .= " AND m.usertype IN (0,2)";

         }

@@ -567,7 +567,7 @@ 
         //print $sql;

         //$tmp1=microtime(true);

         //print '>>> 1 0<br>';

-        AlDolUtils::dol_syslog(get_class($this) . "::menuLoad mymainmenu=" . $mymainmenu . " myleftmenu=" . $myleftmenu . " type_user=" . $type_user . " menu_handler=" . $menu_handler . " tabMenu size=" . count($tabMenu) . "", LOG_DEBUG);

+        AlDolUtils::dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);

         $resql = Config::$dbEngine->select($sql);

         if (is_array($resql)) {

             $a = 0;

@@ -600,7 +600,7 @@ 
 

                 // Define $title

                 if ($enabled) {

-                    $title = Globals::$langs->trans($menu['titre']);  // If $menu['titre'] start with $, a AlDolUtils::dol_eval is done.

+                    $title = Globals::$langs->trans($menu['titre']); // If $menu['titre'] start with $, a AlDolUtils::dol_eval is done.

                     //var_dump($title.'-'.$menu['titre']);

                     if ($title == $menu['titre']) {   // Translation not found

                         if (!empty($menu['langs'])) {    // If there is a dedicated translation file

@@ -613,7 +613,7 @@ 
 

                         if (preg_match("/\//", $menu['titre'])) { // To manage translation when title is string1/string2

                             $tab_titre = explode("/", $menu['titre']);

-                            $title = Globals::$langs->trans($tab_titre[0]) . "/" . Globals::$langs->trans($tab_titre[1]);

+                            $title = Globals::$langs->trans($tab_titre[0])."/".Globals::$langs->trans($tab_titre[1]);

                         } else if (preg_match('/\|\|/', $menu['titre'])) { // To manage different translation (Title||AltTitle@ConditionForAltTitle)

                             $tab_title = explode("||", $menu['titre']);

                             $alt_title = explode("@", $tab_title[1]);

@@ -632,9 +632,9 @@ 
                     $tabMenu[$b]['url'] = $menu['url'];

                     if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url'])) {

                         if (preg_match('/\?/', $tabMenu[$b]['url'])) {

-                            $tabMenu[$b]['url'] .= '&amp;idmenu=' . $menu['rowid'];

+                            $tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];

                         } else {

-                            $tabMenu[$b]['url'] .= '?idmenu=' . $menu['rowid'];

+                            $tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];

                         }

                     }

                     $tabMenu[$b]['titre'] = $title;

Base/AlixarController.php

Spacing +89 added lines, -89 removed lines

@@ -52,13 +52,13 @@ 
         // Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
         $prefix = AlDolUtils::dol_getprefix('');
 
-        $this->sessionname = 'DOLSESSID_' . $prefix;
-        $sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
+        $this->sessionname = 'DOLSESSID_'.$prefix;
+        $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
         if (!empty($_COOKIE[$sessiontimeout])) {
             ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
         }
         session_name($this->sessionname);
-        session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+        session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
         // This create lock, released when session_write_close() or end of page.
         // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
         if (!defined('NOSESSION')) {
@@ -81,7 +81,7 @@ 
             Globals::$conf->browser->name = $tmp['browsername'];
             Globals::$conf->browser->os = $tmp['browseros'];
             Globals::$conf->browser->version = $tmp['browserversion'];
-            Globals::$conf->browser->layout = $tmp['layout'];     // 'classic', 'phone', 'tablet'
+            Globals::$conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
             //var_dump(Globals::$conf->browser);
 
             if (Globals::$conf->browser->layout == 'phone') {
@@ -102,18 +102,18 @@ 
                         $newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
                     }
                 } else { // Check HTTPS environment variable (Apache/mod_ssl only)
-                    $newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT) . $_SERVER["REQUEST_URI"];
+                    $newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
                 }
             } else {
                 // Check HTTPS environment variable (Apache/mod_ssl only)
-                $newurl = Globals::$conf->file->main_force_https . $_SERVER["REQUEST_URI"];
+                $newurl = Globals::$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
             }
             // Start redirect
             if ($newurl) {
-                AlDolUtils::dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to " . $newurl);
+                AlDolUtils::dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
                 echo $newurl;
                 throw Exception('x');
-                header("Location: " . $newurl);
+                header("Location: ".$newurl);
                 exit;
             } else {
                 AlDolUtils::dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
@@ -138,29 +138,29 @@ 
 
         // Loading of additional presentation includes
         if (!defined('NOREQUIREHTML')) {
-            require_once DOL_BASE_PATH . '/core/class/html.form.class.php';     // Need 660ko memory (800ko in 2.2)
+            require_once DOL_BASE_PATH.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
         }
         if (!defined('NOREQUIREAJAX') && Globals::$conf->use_javascript_ajax) {
-            require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php'; // Need 22ko memory
+            require_once DOL_BASE_PATH.'/core/lib/ajax.lib.php'; // Need 22ko memory
         }
         // If install or upgrade process not done or not completely finished, we call the install page.
         if (!empty(Globals::$conf->global->MAIN_NOT_INSTALLED) || !empty(Globals::$conf->global->MAIN_NOT_UPGRADED)) {
             AlDolUtils::dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
             throw Exception('x');
-            header("Location: " . DOL_BASE_URI . "/install/index.php");
+            header("Location: ".DOL_BASE_URI."/install/index.php");
             exit;
         }
         // If an upgrade process is required, we call the install page.
         if ((!empty(Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE) && (Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION)) || (empty(Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty(Globals::$conf->global->MAIN_VERSION_LAST_INSTALL) && (Globals::$conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) {
             $versiontocompare = empty(Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE) ? Globals::$conf->global->MAIN_VERSION_LAST_INSTALL : Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE;
-            require_once DOL_BASE_PATH . '/core/lib/admin.lib.php';
+            require_once DOL_BASE_PATH.'/core/lib/admin.lib.php';
             $dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
             $dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
             $rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
             if ($rescomp > 0) {   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
-                AlDolUtils::dol_syslog("main.inc: database version " . $versiontocompare . " is lower than programs version " . DOL_VERSION . ". Redirect to install page.", LOG_WARNING);
+                AlDolUtils::dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
                 throw Exception('x');
-                header("Location: " . DOL_BASE_URI . "/install/index.php");
+                header("Location: ".DOL_BASE_URI."/install/index.php");
                 exit;
             }
         }
@@ -184,7 +184,7 @@ 
             }
             if ($_SERVER['REQUEST_METHOD'] === 'POST') {  // This test must be after loading $_SESSION['token'].
                 if (AlDolUtils::GETPOST('token', 'alpha') != $_SESSION['token']) {
-                    AlDolUtils::dol_syslog("Invalid token in " . $_SERVER['HTTP_REFERER'] . ", action=" . AlDolUtils::GETPOST('action', 'aZ09') . ", _POST['token']=" . AlDolUtils::GETPOST('token', 'alpha') . ", _SESSION['token']=" . $_SESSION['token'], LOG_WARNING);
+                    AlDolUtils::dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".AlDolUtils::GETPOST('action', 'aZ09').", _POST['token']=".AlDolUtils::GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
                     //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
                     unset($_POST);
                 }
@@ -217,7 +217,7 @@ 
         if (AlDolUtils::GETPOST('theme', 'alpha')) {
             Globals::$conf->theme = AlDolUtils::GETPOST('theme', 'alpha', 1);
             // Globals::$conf->css = "/theme/" . Globals::$conf->theme . "/style.css.php";
-            Globals::$conf->css = '?controller=theme/' . Globals::$conf->theme . '&method=style.css';
+            Globals::$conf->css = '?controller=theme/'.Globals::$conf->theme.'&method=style.css';
         }
 
 
@@ -267,7 +267,7 @@ 
         if (!empty(Globals::$conf->dol_use_jmobile) && in_array(Globals::$conf->theme, array('bureau2crea', 'cameleo', 'amarok'))) {
             Globals::$conf->theme = 'eldy';
             // Globals::$conf->css = "/theme/" . Globals::$conf->theme . "/style.css.php";
-            Globals::$conf->css = '?controller=theme/' . Globals::$conf->theme . '&method=style.css';
+            Globals::$conf->css = '?controller=theme/'.Globals::$conf->theme.'&method=style.css';
         }
 
         if (!defined('NOREQUIRETRAN')) {
@@ -304,7 +304,7 @@ 
         }
 
 
-        AlDolUtils::dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . ' - action=' . AlDolUtils::GETPOST('action', 'az09') . ', massaction=' . AlDolUtils::GETPOST('massaction', 'az09'));
+        AlDolUtils::dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.AlDolUtils::GETPOST('action', 'az09').', massaction='.AlDolUtils::GETPOST('massaction', 'az09'));
         //Another call for easy debugg
         //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
         // Load main languages files
@@ -316,7 +316,7 @@ 
         // Define some constants used for style of arrays
         $bc = array(0 => 'class="impair"', 1 => 'class="pair"');
         $bcdd = array(0 => 'class="drag drop oddeven"', 1 => 'class="drag drop oddeven"');
-        $bcnd = array(0 => 'class="nodrag nodrop nohover"', 1 => 'class="nodrag nodrop nohoverpair"');  // Used for tr to add new lines
+        $bcnd = array(0 => 'class="nodrag nodrop nohover"', 1 => 'class="nodrag nodrop nohoverpair"'); // Used for tr to add new lines
         $bctag = array(0 => 'class="impair tagtr"', 1 => 'class="pair tagtr"');
 
         // Define messages variables
@@ -364,7 +364,7 @@ 
 // Load the menu manager (only if not already done)
             $file_menu = Globals::$conf->standard_menu;
             if (AlDolUtils::GETPOST('menu', 'alpha')) {
-                $file_menu = AlDolUtils::GETPOST('menu', 'alpha');     // example: menu=eldy_menu.php
+                $file_menu = AlDolUtils::GETPOST('menu', 'alpha'); // example: menu=eldy_menu.php
             }
             if (!class_exists('MenuManager')) {
                 $menufound = 0;
@@ -376,7 +376,7 @@ 
                     }
                 }
                 if (!class_exists('MenuManager')) { // If failed to include, we try with standard eldy_menu.php
-                    AlDolUtils::dol_syslog("You define a menu manager '" . $file_menu . "' that can not be loaded.", LOG_WARNING);
+                    AlDolUtils::dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
                     $file_menu = 'eldy_menu.php';
                     // include_once DOL_DOCUMENT_ROOT . "/core/menus/standard/" . $file_menu;
                 }
@@ -420,7 +420,7 @@ 
 
         // This is to make Dolibarr working with Plesk
         if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs') {
-            set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
+            set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
         }
 
         // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
@@ -431,7 +431,7 @@ 
             $tmplist = explode(',', $tmpautoset[1]);
             $cookiearrayvalue = array();
             foreach ($tmplist as $tmpkey) {
-                $postkey = $tmpautoset[0] . '_' . $tmpkey;
+                $postkey = $tmpautoset[0].'_'.$tmpkey;
 //var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
                 if (!empty($_POST[$postkey])) {
                     $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
@@ -492,8 +492,8 @@ 
             $inj += preg_match('/insert\s+into/i', $val);
             $inj += preg_match('/select\s+from/i', $val);
             $inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
-            $inj += preg_match('/user\s*\(/i', $val);      // avoid to use function user() that return current database login
-            $inj += preg_match('/information_schema/i', $val);    // avoid to use request that read information_schema database
+            $inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() that return current database login
+            $inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
         }
         if ($type == 3) {
             $inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i', $val);
@@ -517,15 +517,15 @@ 
             $inj += preg_match('/<style/i', $val);
         }
         $inj += preg_match('/base[\s]+href/si', $val);
-        $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-        $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-        $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-        $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-        $inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
-        $inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
-        $inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
+        $inj += preg_match('/<.*onmouse/si', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+        $inj += preg_match('/onerror\s*=/i', $val); // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+        $inj += preg_match('/onfocus\s*=/i', $val); // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+        $inj += preg_match('/onload\s*=/i', $val); // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+        $inj += preg_match('/onloadstart\s*=/i', $val); // onload can be set on audio tag <audio onloadstart=alert(1)>
+        $inj += preg_match('/onclick\s*=/i', $val); // onclick can be set on img text html tag like <img onclick = alert(1)>
+        $inj += preg_match('/onscroll\s*=/i', $val); // onscroll can be on textarea
 //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-        $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);  // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+        $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
 //if ($type == 1)
 //{
         $inj += preg_match('/javascript:/i', $val);
@@ -533,10 +533,10 @@ 
 //}
 // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
         if ($type == 1) {
-            $inj += preg_match('/"/i', $val);  // We refused " in GET parameters value
+            $inj += preg_match('/"/i', $val); // We refused " in GET parameters value
         }
         if ($type == 2) {
-            $inj += preg_match('/[;"]/', $val);  // PHP_SELF is a file system path. It can contains spaces.
+            $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
         }
         return $inj;
     }
@@ -555,7 +555,7 @@ 
                 if ($this->analyseVarsForSqlAndScriptsInjection($key, $type) && $this->analyseVarsForSqlAndScriptsInjection($value, $type)) {
 //$var[$key] = $value;	// This is useless
                 } else {
-                    print 'Access refused by SQL/Script injection protection in main.inc.php (type=' . htmlentities($type) . ' key=' . htmlentities($key) . ' value=' . htmlentities($value) . ' page=' . htmlentities($_SERVER["REQUEST_URI"]) . ')';
+                    print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
                     exit;
                 }
             }
@@ -626,20 +626,20 @@ 
 
             // dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
             // If in demo mode, we check we go to home page through the public/demo/index.php page
-            if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_BASE_URI . '/index.php') {
+            if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_BASE_URI.'/index.php') {
                 // We ask index page
                 if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER'])) {
-                    AlDolUtils::dol_syslog("Call index page from another url than demo page (call is done from page " . $_SERVER['HTTP_REFERER'] . ")");
+                    AlDolUtils::dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
                     $url = '';
-                    $url .= ($url ? '&' : '') . ($dol_hide_topmenu ? 'dol_hide_topmenu=' . $dol_hide_topmenu : '');
-                    $url .= ($url ? '&' : '') . ($dol_hide_leftmenu ? 'dol_hide_leftmenu=' . $dol_hide_leftmenu : '');
-                    $url .= ($url ? '&' : '') . ($dol_optimize_smallscreen ? 'dol_optimize_smallscreen=' . $dol_optimize_smallscreen : '');
-                    $url .= ($url ? '&' : '') . ($dol_no_mouse_hover ? 'dol_no_mouse_hover=' . $dol_no_mouse_hover : '');
-                    $url .= ($url ? '&' : '') . ($dol_use_jmobile ? 'dol_use_jmobile=' . $dol_use_jmobile : '');
-                    $url = DOL_BASE_URI . '/public/demo/index.php' . ($url ? '?' . $url : '');
+                    $url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
+                    $url .= ($url ? '&' : '').($dol_hide_leftmenu ? 'dol_hide_leftmenu='.$dol_hide_leftmenu : '');
+                    $url .= ($url ? '&' : '').($dol_optimize_smallscreen ? 'dol_optimize_smallscreen='.$dol_optimize_smallscreen : '');
+                    $url .= ($url ? '&' : '').($dol_no_mouse_hover ? 'dol_no_mouse_hover='.$dol_no_mouse_hover : '');
+                    $url .= ($url ? '&' : '').($dol_use_jmobile ? 'dol_use_jmobile='.$dol_use_jmobile : '');
+                    $url = DOL_BASE_URI.'/public/demo/index.php'.($url ? '?'.$url : '');
                     echo $url;
                     throw Exception('x');
-                    header("Location: " . $url);
+                    header("Location: ".$url);
                     exit;
                 }
             }
@@ -660,7 +660,7 @@ 
                     $test = false;
 
                     // Call trigger for the "security events" log
-                    Globals::$user->trigger_mesg = 'ErrorBadValueForCode - login=' . AlDolUtils::GETPOST("username", "alpha", 2);
+                    Globals::$user->trigger_mesg = 'ErrorBadValueForCode - login='.AlDolUtils::GETPOST("username", "alpha", 2);
 
                     // Call of triggers
                     //include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
@@ -675,7 +675,7 @@ 
                     $action = '';
                     Globals::$hookManager->initHooks(array('login'));
                     $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                     if ($reshook < 0) {
                         $error++;
                     }
@@ -760,7 +760,7 @@ 
                     }
 
                     // Call trigger for the "security events" log
-                    Globals::$user->trigger_mesg = Globals::$langs->trans("ErrorBadLoginPassword") . ' - login=' . AlDolUtils::GETPOST("username", "alpha", 2);
+                    Globals::$user->trigger_mesg = Globals::$langs->trans("ErrorBadLoginPassword").' - login='.AlDolUtils::GETPOST("username", "alpha", 2);
 
                     // Call of triggers
                     //include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
@@ -774,7 +774,7 @@ 
                     $action = '';
                     Globals::$hookManager->initHooks(array('login'));
                     $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                     if ($reshook < 0) {
                         $error++;
                     }
@@ -786,7 +786,7 @@ 
             // End test login / passwords
             if (!$login || (in_array('ldap', $this->authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
                 // No data to test login, so we show the login page
-                AlDolUtils::dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . " showing the login form and exit");
+                AlDolUtils::dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
                 if (defined('NOREDIRECTBYMAINTOLOGIN')) {
                     return 'ERROR_NOT_LOGGED';
                 } else {
@@ -800,8 +800,8 @@ 
                 AlDolUtils::dol_syslog('User not found, connexion refused');
                 session_destroy();
                 session_name($this->sessionname);
-                session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-                session_start();    // Fixing the bug of register_globals here is useless since session is empty
+                session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+                session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
                 if ($resultFetchUser == 0) {
                 // Load translation files required by page
@@ -809,7 +809,7 @@ 
 
                     $_SESSION["dol_loginmesg"] = Globals::$langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-                    Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login=' . $login;
+                    Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
                 }
                 if ($resultFetchUser < 0) {
                     $_SESSION["dol_loginmesg"] = Globals::$user->error;
@@ -829,24 +829,24 @@ 
                 $action = '';
                 Globals::$hookManager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) {
                     $error++;
                 }
 
                 $paramsurl = array();
                 if (AlDolUtils::GETPOST('textbrowser', 'int')) {
-                    $paramsurl[] = 'textbrowser=' . AlDolUtils::GETPOST('textbrowser', 'int');
+                    $paramsurl[] = 'textbrowser='.AlDolUtils::GETPOST('textbrowser', 'int');
                 }
                 if (AlDolUtils::GETPOST('nojs', 'int')) {
-                    $paramsurl[] = 'nojs=' . AlDolUtils::GETPOST('nojs', 'int');
+                    $paramsurl[] = 'nojs='.AlDolUtils::GETPOST('nojs', 'int');
                 }
                 if (AlDolUtils::GETPOST('lang', 'aZ09')) {
-                    $paramsurl[] = 'lang=' . AlDolUtils::GETPOST('lang', 'aZ09');
+                    $paramsurl[] = 'lang='.AlDolUtils::GETPOST('lang', 'aZ09');
                 }
-                echo 'Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : '');
+                echo 'Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : '');
                 throw Exception('x');
-                header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
+                header('Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
                 exit;
             }
         }
@@ -855,16 +855,16 @@ 
             // We are already into an authenticated session
             $login = $_SESSION["dol_login"];
             $entity = $_SESSION["dol_entity"];
-            AlDolUtils::dol_syslog("- This is an already logged session. _SESSION['dol_login']=" . $login . " _SESSION['dol_entity']=" . $entity, LOG_DEBUG);
+            AlDolUtils::dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
             $resultFetchUser = Globals::$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
             if ($resultFetchUser <= 0) {
                 // Account has been removed after login
-                AlDolUtils::dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=" . $login, LOG_WARNING);
+                AlDolUtils::dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
                 session_destroy();
                 session_name($this->sessionname);
-                session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-                session_start();    // Fixing the bug of register_globals here is useless since session is empty
+                session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+                session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
                 if ($resultFetchUser == 0) {
                     // Load translation files required by page
@@ -872,7 +872,7 @@ 
 
                     $_SESSION["dol_loginmesg"] = Globals::$langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-                    Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login=' . $login;
+                    Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
                 }
                 if ($resultFetchUser < 0) {
                     $_SESSION["dol_loginmesg"] = Globals::$user->error;
@@ -892,24 +892,24 @@ 
                 $action = '';
                 Globals::$hookManager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) {
                     $error++;
                 }
 
                 $paramsurl = array();
                 if (AlDolUtils::GETPOST('textbrowser', 'int')) {
-                    $paramsurl[] = 'textbrowser=' . AlDolUtils::GETPOST('textbrowser', 'int');
+                    $paramsurl[] = 'textbrowser='.AlDolUtils::GETPOST('textbrowser', 'int');
                 }
                 if (AlDolUtils::GETPOST('nojs', 'int')) {
-                    $paramsurl[] = 'nojs=' . AlDolUtils::GETPOST('nojs', 'int');
+                    $paramsurl[] = 'nojs='.AlDolUtils::GETPOST('nojs', 'int');
                 }
                 if (AlDolUtils::GETPOST('lang', 'aZ09')) {
-                    $paramsurl[] = 'lang=' . AlDolUtils::GETPOST('lang', 'aZ09');
+                    $paramsurl[] = 'lang='.AlDolUtils::GETPOST('lang', 'aZ09');
                 }
-                echo 'Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : '');
+                echo 'Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : '');
                 throw Exception('x');
-                header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
+                header('Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
                 exit;
             } else {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -918,30 +918,30 @@ 
 // Code for search criteria persistence.
                 if (!empty($_GET['save_lastsearch_values'])) {    // We must use $_GET here
                     $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
-                    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring);     // Get full path except host server
+                    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
 // Clean $relativepathstring
                     if (constant('DOL_BASE_URI')) {
-                        $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                        $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);
                     }
                     $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                     $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 //var_dump($relativepathstring);
 // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-                    if (!empty($_SESSION['lastsearch_values_tmp_' . $relativepathstring])) {
-                        $_SESSION['lastsearch_values_' . $relativepathstring] = $_SESSION['lastsearch_values_tmp_' . $relativepathstring];
-                        unset($_SESSION['lastsearch_values_tmp_' . $relativepathstring]);
+                    if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring])) {
+                        $_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+                        unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
                     }
-                    if (!empty($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring])) {
-                        $_SESSION['lastsearch_contextpage_' . $relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring];
-                        unset($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring]);
+                    if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring])) {
+                        $_SESSION['lastsearch_contextpage_'.$relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
+                        unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
                     }
-                    if (!empty($_SESSION['lastsearch_page_tmp_' . $relativepathstring]) && $_SESSION['lastsearch_page_tmp_' . $relativepathstring] > 1) {
-                        $_SESSION['lastsearch_page_' . $relativepathstring] = $_SESSION['lastsearch_page_tmp_' . $relativepathstring];
-                        unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
+                    if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1) {
+                        $_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
+                        unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
                     }
-                    if (!empty($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]) && $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] != Globals::$conf->liste_limit) {
-                        $_SESSION['lastsearch_limit_' . $relativepathstring] = $_SESSION['lastsearch_limit_tmp_' . $relativepathstring];
-                        unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
+                    if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != Globals::$conf->liste_limit) {
+                        $_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+                        unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
                     }
                 }
 
@@ -990,14 +990,14 @@ 
                 $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
             }
 
-            AlDolUtils::dol_syslog("This is a new started user session. _SESSION['dol_login']=" . $_SESSION["dol_login"] . " Session id=" . session_id());
+            AlDolUtils::dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
             // Config::$dbEngine->begin();
             Config::$dbEngine->beginTransaction();
 
             Globals::$user->update_last_login_date();
 
-            $loginfo = 'TZ=' . $_SESSION["dol_tz"] . ';TZString=' . $_SESSION["dol_tz_string"] . ';Screen=' . $_SESSION["dol_screenwidth"] . 'x' . $_SESSION["dol_screenheight"];
+            $loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
 
             // Call triggers for the "security events" log
             Globals::$user->trigger_mesg = $loginfo;
@@ -1013,7 +1013,7 @@ 
             $action = '';
             Globals::$hookManager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginfo' => $loginfo);
-            $reshook = Globals::$hookManager->executeHooks('afterLogin', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+            $reshook = Globals::$hookManager->executeHooks('afterLogin', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
             if ($reshook < 0) {
                 $error++;
             }
@@ -1034,7 +1034,7 @@ 
                 if ($_SERVER["PHP_SELF"] != $newpath) {   // not already on landing page (avoid infinite loop)
                     echo $newpath;
                     throw Exception('x');
-                    header('Location: ' . $newpath);
+                    header('Location: '.$newpath);
                     exit;
                 }
             }
@@ -1065,7 +1065,7 @@ 
         if (empty(Globals::$conf->global->MAIN_FORCETHEME) && !empty(Globals::$user->conf->MAIN_THEME)) {
             Globals::$conf->theme = Globals::$user->conf->MAIN_THEME;
 // Globals::$conf->css = "/theme/" . Globals::$conf->theme . "/style.css.php";
-            Globals::$conf->css = '?controller=theme/' . Globals::$conf->theme . '&method=style.css';
+            Globals::$conf->css = '?controller=theme/'.Globals::$conf->theme.'&method=style.css';
         }
     }
 }