alxarafe / alixar

Helpers/DolUtils.php

Indentation +93 added lines, -93 removed lines

@@ -258,7 +258,7 @@ 
      */

     static function dol_shutdown()

     {

-       // global Globals::$conf, $user, Globals::$langs, $db;

+        // global Globals::$conf, $user, Globals::$langs, $db;

         $disconnectdone = false;

         $depth = 0;

         if (is_object($db) && !empty($db->connected)) {

@@ -305,7 +305,7 @@ 
      */

     static function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $options = null, $noreplace = 0)

     {

-       // global $mysoc, $user, Globals::$conf;

+        // global $mysoc, $user, Globals::$conf;

 

         if (empty($paramname))

             return 'BadFirstParameterForDolUtils::GETPOST';

@@ -364,7 +364,7 @@ 
             elseif (!isset($_GET['sortfield'])) { // If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set

                 if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) {

                     // Search default value from $object->field

-                   // global $object;

+                    // global $object;

                     if (is_object($object) && isset($object->fields[$paramname]['default'])) {

                         $out = $object->fields[$paramname]['default'];

                     }

@@ -707,7 +707,7 @@ 
      */

     static function dol_include_once($relpath, $classname = '')

     {

-       // global Globals::$conf, Globals::$langs, $user, $mysoc;   // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

+        // global Globals::$conf, Globals::$langs, $user, $mysoc;   // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

 

         $fullpath = dol_buildpath($relpath);

 

@@ -735,7 +735,7 @@ 
      */

     static function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $path = preg_replace('/^\//', '', $path);

 

@@ -777,7 +777,7 @@ 
             foreach (Globals::$conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

                 if ($key == 'main') {

                     if ($type == 3) {

-                       // global $dolibarr_main_url_root;

+                        // global $dolibarr_main_url_root;

                         // Define $urlwithroot

 

                         // $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

@@ -801,7 +801,7 @@ 
                             $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

                         }

                         if ($type == 3) {

-                           // global $dolibarr_main_url_root;

+                            // global $dolibarr_main_url_root;

                             // Define $urlwithroot

                             $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

                             $urlwithroot = $urlwithouturlroot . DOL_BASE_URI;  // This is to use external domain name found into config file

@@ -1071,7 +1071,7 @@ 
      */

     static function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = '', $restricttologhandler = '')

     {

-       // global Globals::$conf, $user;

+        // global Globals::$conf, $user;

 // If syslog module enabled

         if (empty(Globals::$conf->syslog->enabled))

             return;

@@ -1177,7 +1177,7 @@ 
      */

     static function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '')

     {

-       // global Globals::$conf, Globals::$langs, $hookmanager;

+        // global Globals::$conf, Globals::$langs, $hookmanager;

 

         $out = "\n" . '<div class="tabs" data-role="controlgroup" data-type="horizontal">' . "\n";

 

@@ -1360,7 +1360,7 @@ 
      */

     static function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $onlybanner = 0, $morehtmlright = '')

     {

-       // global Globals::$conf, $form, $user, Globals::$langs;

+        // global Globals::$conf, $form, $user, Globals::$langs;

 

         $error = 0;

 

@@ -1639,7 +1639,7 @@ 
      */

     static function fieldLabel($langkey, $fieldkey, $fieldrequired = 0)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

         $ret = '';

         if ($fieldrequired)

             $ret .= '<span class="fieldrequired">';

@@ -1662,7 +1662,7 @@ 
      */

     static function dol_bc($var, $moreclass = '')

     {

-       // global $bc;

+        // global $bc;

         $ret = ' ' . $bc[$var];

         if ($moreclass)

             $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

@@ -1682,7 +1682,7 @@ 
      */

     static function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs = '', $mode = 0)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         $ret = '';

         $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR');    // See also MAIN_FORCE_STATE_INTO_ADDRESS

@@ -1773,7 +1773,7 @@ 
      */

     static function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlangs = '', $encodetooutput = false)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 // Clean parameters

         $to_gmt = false;

         $offsettz = $offsetdst = 0;

@@ -1984,7 +1984,7 @@ 
      */

     static function dol_getdate($timestamp, $fast = false)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $usealternatemethod = false;

         if ($timestamp <= 0)

@@ -2022,7 +2022,7 @@ 
      */

     static function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $check = 1)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";

 // Clean parameters

         if ($hour == -1 || empty($hour))

@@ -2134,7 +2134,7 @@ 
      */

     static function dol_print_size($size, $shortvalue = 0, $shortunit = 0)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

         $level = 1024;

 

         if (!empty(Globals::$conf->dol_optimize_smallscreen))

@@ -2171,7 +2171,7 @@ 
      */

     static function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)

     {

-       // global Globals::$langs;

+        // global Globals::$langs;

 

         if (empty($url))

             return '';

@@ -2205,7 +2205,7 @@ 
      */

     static function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64, $showinvalid = 1, $withpicto = 0)

     {

-       // global Globals::$conf, $user, Globals::$langs, $hookmanager;

+        // global Globals::$conf, $user, Globals::$langs, $hookmanager;

 

         $newemail = $email;

 

@@ -2262,7 +2262,7 @@ 
      */

     static function dol_print_socialnetworks($value, $cid, $socid, $type)

     {

-       // global Globals::$conf, $user, Globals::$langs;

+        // global Globals::$conf, $user, Globals::$langs;

 

         $newskype = $value;

 

@@ -2317,7 +2317,7 @@ 
      */

     static function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addlink = '', $separ = "&nbsp;", $withpicto = '', $titlealt = '', $adddivfloat = 0)

     {

-       // global Globals::$conf, $user, Globals::$langs, $mysoc, $hookmanager;

+        // global Globals::$conf, $user, Globals::$langs, $mysoc, $hookmanager;

 // Clean phone parameter

         $phone = preg_replace("/[\s.-]/", "", trim($phone));

         if (empty($phone)) {

@@ -2581,7 +2581,7 @@ 
      */

     static function dol_print_ip($ip, $mode = 0)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         $ret = '';

 

@@ -2626,7 +2626,7 @@ 
      */

     static function dolGetCountryCodeFromIp($ip)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $countrycode = '';

 

@@ -2653,7 +2653,7 @@ 
      */

     static function dol_user_country()

     {

-       // global Globals::$conf, Globals::$langs, $user;

+        // global Globals::$conf, Globals::$langs, $user;

 //$ret=$user->xxx;

         $ret = '';

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

@@ -2683,7 +2683,7 @@ 
      */

     static function dol_print_address($address, $htmlid, $mode, $id, $noprint = 0, $charfornl = '')

     {

-       // global Globals::$conf, $user, Globals::$langs, $hookmanager;

+        // global Globals::$conf, $user, Globals::$langs, $hookmanager;

 

         $out = '';

 

@@ -2815,7 +2815,7 @@ 
      */

     static function dol_substr($string, $start, $length, $stringencoding = '', $trunconbytes = 0)

     {

-       // global Globals::$langs;

+        // global Globals::$langs;

 

         if (empty($stringencoding))

             $stringencoding = Globals::$langs->charset_output;

@@ -2852,7 +2852,7 @@ 
      */

     static function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF-8', $nodot = 0, $display = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC))

             return $string;

@@ -2918,7 +2918,7 @@ 
      */

     static function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0, $alt = '', $morecss = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 // We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_BASE_URI/theme/$conf->theme/img/$picto

 //$url = DOL_BASE_URI;

         $url = DOL_BASE_URI;

@@ -3103,7 +3103,7 @@ 
      */

     static function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         if (!preg_match('/(\.png|\.gif)$/i', $picto))

             $picto .= '.png';

@@ -3126,7 +3126,7 @@ 
      */

     static function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         if (!preg_match('/(\.png|\.gif)$/i', $picto))

             $picto .= '.png';

@@ -3157,7 +3157,7 @@ 
      */

     static function img_action($titlealt, $numaction)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if (empty($titlealt) || $titlealt == 'default') {

             if ($numaction == '-1' || $numaction == 'ST_NO') {

@@ -3195,7 +3195,7 @@ 
      */

     static function img_pdf($titlealt = 'default', $size = 3)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Show');

@@ -3212,7 +3212,7 @@ 
      */

     static function img_edit_add($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Add');

@@ -3229,7 +3229,7 @@ 
      */

     static function img_edit_remove($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Remove');

@@ -3247,7 +3247,7 @@ 
      */

     static function img_edit($titlealt = 'default', $float = 0, $other = 'class="pictoedit"')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Modify');

@@ -3265,7 +3265,7 @@ 
      */

     static function img_view($titlealt = 'default', $float = 0, $other = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('View');

@@ -3284,7 +3284,7 @@ 
      */

     static function img_delete($titlealt = 'default', $other = 'class="pictodelete"')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Delete');

@@ -3302,7 +3302,7 @@ 
      */

     static function img_printer($titlealt = "default", $other = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

         if ($titlealt == "default")

             $titlealt = Globals::$langs->trans("Print");

         return img_picto($titlealt, 'printer.png', $other);

@@ -3317,7 +3317,7 @@ 
      */

     static function img_split($titlealt = 'default', $other = 'class="pictosplit"')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Split');

@@ -3334,7 +3334,7 @@ 
      */

     static function img_help($usehelpcursor = 1, $usealttitle = 1)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($usealttitle) {

             if (is_string($usealttitle))

@@ -3354,7 +3354,7 @@ 
      */

     static function img_info($titlealt = 'default')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Informations');

@@ -3371,7 +3371,7 @@ 
      */

     static function img_warning($titlealt = 'default', $moreatt = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Warning');

@@ -3388,7 +3388,7 @@ 
      */

     static function img_error($titlealt = 'default')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Error');

@@ -3405,7 +3405,7 @@ 
      */

     static function img_next($titlealt = 'default', $moreatt = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Next');

@@ -3423,7 +3423,7 @@ 
      */

     static function img_previous($titlealt = 'default', $moreatt = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Previous');

@@ -3442,7 +3442,7 @@ 
      */

     static function img_down($titlealt = 'default', $selected = 0, $moreclass = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Down');

@@ -3460,7 +3460,7 @@ 
      */

     static function img_up($titlealt = 'default', $selected = 0, $moreclass = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Up');

@@ -3478,7 +3478,7 @@ 
      */

     static function img_left($titlealt = 'default', $selected = 0, $moreatt = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Left');

@@ -3496,7 +3496,7 @@ 
      */

     static function img_right($titlealt = 'default', $selected = 0, $moreatt = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Right');

@@ -3513,7 +3513,7 @@ 
      */

     static function img_allow($allow, $titlealt = 'default')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Active');

@@ -3588,7 +3588,7 @@ 
     {

         dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

 

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Call');

@@ -3610,7 +3610,7 @@ 
      */

     static function img_search($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Search');

@@ -3632,7 +3632,7 @@ 
      */

     static function img_searchclear($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Search');

@@ -3657,7 +3657,7 @@ 
      */

     static function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if ($infoonimgalt) {

             return img_picto($text, 'info', 'class="hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '"');

@@ -3680,7 +3680,7 @@ 
      */

     static function dol_print_error($db = '', $error = '', $errors = null)

     {

-       // global Globals::$conf, Globals::$langs, $argv;

+        // global Globals::$conf, Globals::$langs, $argv;

         // global $dolibarr_main_prod;

 

         $out = '';

@@ -3799,7 +3799,7 @@ 
      */

     static function dol_print_error_email($prefixcode, $errormessage = '', $errormessages = array(), $morecss = 'error', $email = '')

     {

-       // global Globals::$langs, Globals::$conf;

+        // global Globals::$langs, Globals::$conf;

 

         if (empty($email))

             $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;

@@ -3858,7 +3858,7 @@ 
      */

     static function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '')

     {

-       // global Globals::$conf, Globals::$langs, $form;

+        // global Globals::$conf, Globals::$langs, $form;

 //print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder<br>\n";

 

         $sortorder = strtoupper($sortorder);

@@ -3997,7 +3997,7 @@ 
      */

     static function load_fiche_titre($titre, $morehtmlright = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $id = '', $morecssontable = '', $morehtmlcenter = '')

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $return = '';

 

@@ -4047,7 +4047,7 @@ 
      */

     static function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $sortorder = '', $morehtmlcenter = '', $num = -1, $totalnboflines = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limit = -1, $hideselectlimit = 0, $hidenavigation = 0)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         $savlimit = $limit;

         $savtotalnboflines = $totalnboflines;

@@ -4160,7 +4160,7 @@ 
      */

     static function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $betweenarrows = '', $afterarrows = '', $limit = -1, $totalnboflines = 0, $hideselectlimit = 0)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         print '<div class="pagination"><ul>';

         if ((int) $limit >= 0 && empty($hideselectlimit)) {

@@ -4283,7 +4283,7 @@ 
      */

     static function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $forcerounding = -1, $currency_code = '')

     {

-       // global Globals::$langs, Globals::$conf;

+        // global Globals::$langs, Globals::$conf;

 // Clean parameters

         if (empty($amount))

             $amount = 0; // To have a numeric value if amount not defined or = ''

@@ -4376,7 +4376,7 @@ 
      */

     static function price2num($amount, $rounding = '', $alreadysqlnb = 0)

     {

-       // global Globals::$langs, Globals::$conf;

+        // global Globals::$langs, Globals::$conf;

 // Round PHP static function does not allow number like '1,234.56' nor '1.234,56' nor '1 234,56'

 // Numbers must be '1234.56'

 // Decimal delimiter for PHP and database SQL requests must be '.'

@@ -4499,7 +4499,7 @@ 
      */

     static function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_seller = "", $vatnpr = 0)

     {

-       // global $db, Globals::$conf, $mysoc;

+        // global $db, Globals::$conf, $mysoc;

 

         if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

             $thirdparty_seller = $mysoc;

@@ -4639,7 +4639,7 @@ 
      */

     static function get_localtax_by_third($local)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

         $sql = "SELECT t.localtax1, t.localtax2 ";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=t.fk_pays";

         $sql .= " WHERE c.code = '" . $mysoc->country_code . "' AND t.active = 1 AND t.taux=(";

@@ -4672,7 +4672,7 @@ 
      */

     static function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid = 1)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

 

         dol_syslog("getTaxesFromId vat id or rate = " . $vatrate);

 

@@ -4729,7 +4729,7 @@ 
      */

     static function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid = 0)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

 

         dol_syslog("getLocalTaxesFromRate vatrate=" . $vatrate . " local=" . $local);

 

@@ -4783,7 +4783,7 @@ 
      */

     static function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice = 0)

     {

-       // global $db, Globals::$conf, $mysoc;

+        // global $db, Globals::$conf, $mysoc;

 

         require_once DOL_BASE_PATH . '/product/class/product.class.php';

 

@@ -4854,7 +4854,7 @@ 
      */

     static function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

 

         if (!class_exists('Product')) {

             require_once DOL_BASE_PATH . 'product/class/product.class.php';

@@ -4922,7 +4922,7 @@ 
      */

     static function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod = 0, $idprodfournprice = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         require_once DOL_BASE_PATH . '/core/lib/company.lib.php';

 

@@ -4997,7 +4997,7 @@ 
      */

     static function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod = 0, $idprodfournprice = 0)

     {

-       // global $db;

+        // global $db;

 

         if ($idprodfournprice > 0) {

             if (!class_exists('ProductFournisseur'))

@@ -5032,7 +5032,7 @@ 
      */

     static function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $idprod = 0)

     {

-       // global $mysoc;

+        // global $mysoc;

 

         if (!is_object($thirdparty_seller))

             return -1;

@@ -5077,7 +5077,7 @@ 
      */

     static function yn($yesno, $case = 1, $color = 0)

     {

-       // global Globals::$langs;

+        // global Globals::$langs;

         $result = 'unknown';

         $classname = '';

         if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0

@@ -5127,7 +5127,7 @@ 
      */

     static function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $path = '';

 

@@ -5175,7 +5175,7 @@ 
      */

     static function dol_mkdir($dir, $dataroot = '', $newmask = null)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

 

@@ -5722,7 +5722,7 @@ 
      */

     static function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, $object = null)

     {

-       // global $db, Globals::$conf, $mysoc, $user, $extrafields;

+        // global $db, Globals::$conf, $mysoc, $user, $extrafields;

 

         $substitutionarray = array();

 

@@ -6028,7 +6028,7 @@ 
      */

     static function make_substitutions($text, $substitutionarray, $outputlangs = null)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if (!is_array($substitutionarray))

             return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

@@ -6094,7 +6094,7 @@ 
      */

     static function complete_substitutions_array(&$substitutionarray, $outputlangs, $object = null, $parameters = null, $callfunc = "completesubstitutionarray")

     {

-       // global Globals::$conf, $user;

+        // global Globals::$conf, $user;

 

         require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

 

@@ -6164,7 +6164,7 @@ 
      */

     static function get_date_range($date_start, $date_end, $format = '', $outputlangs = '', $withparenthesis = 1)

     {

-       // global Globals::$langs;

+        // global Globals::$langs;

 

         $out = '';

 

@@ -6194,7 +6194,7 @@ 
      */

     static function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $ret = '';

 // If order not defined, we use the setup

@@ -6318,7 +6318,7 @@ 
      */

     static function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $keepembedded = 0)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         $ret = 0;

         $return = '';

@@ -6554,7 +6554,7 @@ 
      */

     function dol_osencode($str)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

         if (empty($tmp) && !empty($_SERVER["WINDIR"]))

@@ -6584,7 +6584,7 @@ 
      */

     static function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0)

     {

-       // global $cache_codes;

+        // global $cache_codes;

 // If key empty

         if ($key == '')

             return '';

@@ -6625,7 +6625,7 @@ 
      */

     static function verifCond($strRights)

     {

-       // global $user, Globals::$conf, Globals::$langs;

+        // global $user, Globals::$conf, Globals::$langs;

         // global $leftmenu;

         // global $rights;    // To export to dol_eval function

 //print $strRights."<br>\n";

@@ -6691,7 +6691,7 @@ 
      */

     static function picto_from_langcode($codelang, $moreatt = '')

     {

-       // global Globals::$langs;

+        // global Globals::$langs;

 

         if (empty($codelang))

             return '';

@@ -6726,7 +6726,7 @@ 
      */

     static function getLanguageCodeFromCountryCode($countrycode)

     {

-       // global $mysoc;

+        // global $mysoc;

 

         if (strtoupper($countrycode) == 'MQ')

             return 'fr_CA';

@@ -6960,7 +6960,7 @@ 
      */

     static function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add')

     {

-       // global $hookmanager;

+        // global $hookmanager;

 

         if (isset(Globals::$conf->modules_parts['tabs'][$type]) && is_array(Globals::$conf->modules_parts['tabs'][$type])) {

             foreach (Globals::$conf->modules_parts['tabs'][$type] as $value) {

@@ -7049,7 +7049,7 @@ 
      */

     static function printCommonFooter($zone = 'private')

     {

-       // global Globals::$conf, $hookmanager, $user;

+        // global Globals::$conf, $hookmanager, $user;

         // global $action;

         // global $micro_start_time;

 

@@ -7289,7 +7289,7 @@ 
      */

     static function natural_search($fields, $value, $mode = 0, $nofirstand = 0)

     {

-       // global $db, Globals::$langs;

+        // global $db, Globals::$langs;

 

         $value = trim($value);

 

@@ -7422,7 +7422,7 @@ 
      */

     static function showDirectDownloadLink($object)

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         $out = '';

         $url = $object->getLastMainDocLink($object->element);

@@ -7484,7 +7484,7 @@ 
      */

     static function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata = 0, $param = '')

     {

-       // global Globals::$conf, Globals::$langs;

+        // global Globals::$conf, Globals::$langs;

 

         if (empty(Globals::$conf->use_javascript_ajax))

             return '';

@@ -7517,7 +7517,7 @@ 
      */

     static function ajax_autoselect($htmlname, $addlink = '')

     {

-       // global Globals::$langs;

+        // global Globals::$langs;

         $out = '<script type="text/javascript">

                jQuery(document).ready(static function () {

 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

@@ -7901,7 +7901,7 @@ 
      */

     static function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield = 'rowid')

     {

-       // global $dictvalues, $db, Globals::$langs;

+        // global $dictvalues, $db, Globals::$langs;

 

         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

@@ -7969,7 +7969,7 @@ 
      */

     static function isVisibleToUserType($type_user, &$menuentry, &$listofmodulesforexternal)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];

 //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);

         if (empty($menuentry['enabled']))

Spacing +542 added lines, -542 removed lines

@@ -52,7 +52,7 @@ 
      */

     static function getStaticMember($class, $member)

     {

-        dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

         // This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member

         /* if (version_compare(phpversion(), '5.3.0', '<'))

@@ -77,7 +77,7 @@ 
 

         if (isset($class::$member))

             return $class::$member;

-        dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

+        dol_print_error('', 'Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');

         return null;

     }

 

@@ -94,9 +94,9 @@ 
      */

     static function getDoliDBInstance($type, $host, $user, $pass, $name, $port)

     {

-        require_once DOL_BASE_PATH . "/core/db/" . $type . '.class.php';

+        require_once DOL_BASE_PATH."/core/db/".$type.'.class.php';

 

-        $class = 'DoliDB' . ucfirst($type);

+        $class = 'DoliDB'.ucfirst($type);

         $dolidb = new $class($type, $host, $user, $pass, $name, $port);

         return $dolidb;

     }

@@ -265,7 +265,7 @@ 
             $depth = $db->transaction_opened;

             $disconnectdone = $db->close();

         }

-        dol_syslog("--- End access to " . $_SERVER["PHP_SELF"] . (($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was ' . $depth . ')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

+        dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

     }

 

     /**

@@ -310,7 +310,7 @@ 
         if (empty($paramname))

             return 'BadFirstParameterForDolUtils::GETPOST';

         if (empty($check)) {

-            dol_syslog("Deprecated use of DolUtils::GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);

+            dol_syslog("Deprecated use of DolUtils::GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);

         // Enable this line to know who call the DolUtils::GETPOST with '' $check parameter.

         //var_dump(debug_backtrace()[0]);

         }

@@ -332,7 +332,7 @@ 
             $relativepathstring = $_SERVER["PHP_SELF"];

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

@@ -340,8 +340,8 @@ 
             // Code for search criteria persistence.

             // Retrieve values if restore_lastsearch_values

             if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not DolUtils::GETPOST

-                if (!empty($_SESSION['lastsearch_values_' . $relativepathstring])) { // If there is saved values

-                    $tmp = json_decode($_SESSION['lastsearch_values_' . $relativepathstring], true);

+                if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) { // If there is saved values

+                    $tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);

                     if (is_array($tmp)) {

                         foreach ($tmp as $key => $val) {

                             if ($key == $paramname) { // We are on the requested parameter

@@ -352,12 +352,12 @@ 
                     }

                 }

                 // If there is saved contextpage, page or limit

-                if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_contextpage_' . $relativepathstring];

-                } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_page_' . $relativepathstring];

-                } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_limit_' . $relativepathstring];

+                if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];

+                } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_page_'.$relativepathstring];

+                } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_limit_'.$relativepathstring];

                 }

             }

             // Else, retreive default values if we are not doing a sort

@@ -425,7 +425,7 @@ 
                                             $qualified = 1;

 

                                         if ($qualified) {

-                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                             foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

                                                 if ($out)

                                                     $out .= ', ';

@@ -461,11 +461,11 @@ 
                                         if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

                                             // We made a search from quick search menu, do we still use default filter ?

                                             if (empty(Globals::$conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH)) {

-                                                $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                                $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                                 $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                             }

                                         } else {

-                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                             $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                         }

                                         break;

@@ -483,7 +483,7 @@ 
         // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.

         if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {

             $maxloop = 20;

-            $loopnb = 0;    // Protection against infinite loop

+            $loopnb = 0; // Protection against infinite loop

             while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.

                 $loopnb++;

                 $newout = '';

@@ -528,7 +528,7 @@ 
                 } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                     $newout = Globals::$conf->entity;

                 } else

-                    $newout = '';     // Key not found, we replace with empty string

+                    $newout = ''; // Key not found, we replace with empty string

 

 

 

@@ -563,7 +563,7 @@ 
 

                     

 //var_dump('__'.$reg[1].'__ -> '.$newout);

-                $out = preg_replace('/__' . preg_quote($reg[1], '/') . '__/', $newout, $out);

+                $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);

             }

         }

 

@@ -673,7 +673,7 @@ 
         // If prefix is for email

         if ($mode == 'email') {

             if (empty(Globals::$conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) {

-                return Security::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+                return Security::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

             }

             // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)

             if (Globals::$conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {

@@ -683,16 +683,16 @@ 
                 return $_SERVER["SERVER_NAME"];

             }

 

-            return Security::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+            return Security::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

         }

 

         if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) {

-            return Security::dol_hash($_SERVER["SERVER_NAME"] . $_SERVER["DOCUMENT_ROOT"] . DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+            return Security::dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_BASE_URI);

 

             // Use this for a "readable" cookie name

             //return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_BASE_URI);

         }

-        return Security::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+        return Security::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

     }

 

     /**

@@ -712,7 +712,7 @@ 
         $fullpath = dol_buildpath($relpath);

 

         if (!file_exists($fullpath)) {

-            dol_syslog('functions::dol_include_once Tried to load unexisting file: ' . $relpath, LOG_ERR);

+            dol_syslog('functions::dol_include_once Tried to load unexisting file: '.$relpath, LOG_ERR);

             return false;

         }

 

@@ -741,14 +741,14 @@ 
 

         if ($type == 0 /* empty($type) */) { // For a filesystem path

 //$res = DOL_BASE_PATH . '' . $path;  // Standard default path

-            $res = DOL_BASE_PATH . '/' . $path;  // Standard default path

+            $res = DOL_BASE_PATH.'/'.$path; // Standard default path

             if (isset(Globals::$conf->file->dol_document_root)) {

                 foreach (Globals::$conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

                     if ($key == 'main') {

                         continue;

                     }

-                    if (file_exists($dirroot . '/' . $path)) {

-                        $res = $dirroot . '/' . $path;

+                    if (file_exists($dirroot.'/'.$path)) {

+                        $res = $dirroot.'/'.$path;

                         return $res;

                     }

                 }

@@ -765,13 +765,13 @@ 
 // using proxy, rewriting, virtual path, etc...

             $res = '';

             if ($type == 1) {

-                $res = /* DOL_BASE_URI */ DOL_BASE_URI . '/' . $path;   // Standard value

+                $res = /* DOL_BASE_URI */ DOL_BASE_URI.'/'.$path; // Standard value

             }

             if ($type == 2) {

-                $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;  // Standard value

+                $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH.'/'.$path; // Standard value

             }

             if ($type == 3) {

-                $res = DOL_BASE_URI . '/' . $path;

+                $res = DOL_BASE_URI.'/'.$path;

             }

 

             foreach (Globals::$conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

@@ -781,33 +781,33 @@ 
                         // Define $urlwithroot

 

                         // $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

-                        $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim(DOL_BASE_URI));

+                        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_BASE_URI, '/').'$/i', '', trim(DOL_BASE_URI));

 

-                        $urlwithroot = $urlwithouturlroot . DOL_BASE_URI;  // This is to use external domain name found into config file

+                        $urlwithroot = $urlwithouturlroot.DOL_BASE_URI; // 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

 

-                        $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . '/' . $path;     // Test on start with http is for old conf syntax

+                        $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot).'/'.$path; // Test on start with http is for old conf syntax

                     }

                     continue;

                 }

-                preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs);    // Take part before '?'

+                preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?'

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

                     //print $key.'-'.$dirroot.'/'.$path.'-'.$conf->file->dol_url_root[$type].'<br>'."\n";

-                    if (file_exists($dirroot . '/' . $regs[1])) {

+                    if (file_exists($dirroot.'/'.$regs[1])) {

                         if ($type == 1) {

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_BASE_URI) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_BASE_URI).Globals::$conf->file->dol_url_root[$key].'/'.$path;

                         }

                         if ($type == 2) {

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).Globals::$conf->file->dol_url_root[$key].'/'.$path;

                         }

                         if ($type == 3) {

                            // global $dolibarr_main_url_root;

                             // Define $urlwithroot

-                            $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

-                            $urlwithroot = $urlwithouturlroot . DOL_BASE_URI;  // This is to use external domain name found into config file

+                            $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_BASE_URI, '/').'$/i', '', trim($dolibarr_main_url_root));

+                            $urlwithroot = $urlwithouturlroot.DOL_BASE_URI; // 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

 

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;     // Test on start with http is for old conf syntax

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot).Globals::$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax

                         }

                         break;

                     }

@@ -835,7 +835,7 @@ 
         if (empty($native)) {

             $myclone = unserialize(serialize($object));

         } else {

-            $myclone = clone $object;     // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

+            $myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

         }

 

         return $myclone;

@@ -956,7 +956,7 @@ 
      */

     static function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')

     {

-        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

+        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName

         $forbidden_chars_to_remove = array();

         if (is_array($badcharstoreplace))

             $forbidden_chars_to_replace = $badcharstoreplace;

@@ -1019,12 +1019,12 @@ 
     static function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0)

     {

 // escape quotes and backslashes, newlines, etc.

-        $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

+        $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

         if (!$keepb)

             $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));

         if (!$keepn)

             $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));

-        return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

+        return htmlentities($tmp, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars instead, that make only required change for html tags

     }

 

     /**

@@ -1094,14 +1094,14 @@ 
             $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

 // If adding log inside HTML page is required

             if (!empty($_REQUEST['logtohtml']) && (!empty(Globals::$conf->global->MAIN_ENABLE_LOG_TO_HTML) || !empty(Globals::$conf->global->MAIN_LOGTOHTML))) {   // MAIN_LOGTOHTML kept for backward compatibility

-                Globals::$conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S") . " " . $message;

+                Globals::$conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$message;

             }

 

 //TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output

 // If html log tag enabled and url parameter log defined, we show output log on HTML comments

             if (!empty(Globals::$conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"])) {

                 print "\n\n<!-- Log start\n";

-                print $message . "\n";

+                print $message."\n";

                 print "Log end -->\n";

             }

 

@@ -1115,7 +1115,7 @@ 
 

 // This is when server run behind a reverse proxy

             if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))

-                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);

+                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"]) ? '' : '->'.$_SERVER['REMOTE_ADDR']);

 // This is when server run normally on a server

             else if (!empty($_SERVER["REMOTE_ADDR"]))

                 $data['ip'] = $_SERVER['REMOTE_ADDR'];

@@ -1124,10 +1124,10 @@ 
                 $data['ip'] = $_SERVER['SERVER_ADDR'];

 // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

             else if (!empty($_SERVER['COMPUTERNAME']))

-                $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);

+                $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);

 // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

             else if (!empty($_SERVER['LOGNAME']))

-                $data['ip'] = '???@' . $_SERVER['LOGNAME'];

+                $data['ip'] = '???@'.$_SERVER['LOGNAME'];

 // Loop on each log handler and send output

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

                 if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

@@ -1179,10 +1179,10 @@ 
     {

        // global Globals::$conf, Globals::$langs, $hookmanager;

 

-        $out = "\n" . '<div class="tabs" data-role="controlgroup" data-type="horizontal">' . "\n";

+        $out = "\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";

 

         if ($morehtmlright) {

-            $out .= '<div class="inline-block floatright tabsElem">' . $morehtmlright . '</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

+            $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

         }

 

 // Show title

@@ -1193,8 +1193,8 @@ 
             $limittitle = 30;

             $out .= '<a class="tabTitle">';

             if ($picto)

-                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

-            $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

+                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath).' ';

+            $out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';

             $out .= '</a>';

         }

 

@@ -1234,23 +1234,23 @@ 
             }

 

             if ($i < $limittoshow || $isactive) {

-                $out .= '<div class="inline-block tabsElem' . ($isactive ? ' tabsElemActive' : '') . ((!$isactive && !empty(Globals::$conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '') . '"><!-- id tab = ' . (empty($links[$i][2]) ? '' : $links[$i][2]) . ' -->';

+                $out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty(Globals::$conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';

                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {

                     if (!empty($links[$i][0])) {

-                        $out .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

+                        $out .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";

                     } else {

-                        $out .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

+                        $out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";

                     }

                 } else if (!empty($links[$i][1])) {

                     //print "x $i $active ".$links[$i][2]." z";

                     if ($isactive) {

-                        $out .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="tabactive tab inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                        $out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                         $out .= $links[$i][1];

-                        $out .= '</a>' . "\n";

+                        $out .= '</a>'."\n";

                     } else {

-                        $out .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="tabunactive tab inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                        $out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                         $out .= $links[$i][1];

-                        $out .= '</a>' . "\n";

+                        $out .= '</a>'."\n";

                     }

                 }

                 $out .= '</div>';

@@ -1263,14 +1263,14 @@ 
                 $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {

                     if (!empty($links[$i][0]))

-                        $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

+                        $outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";

                     else

-                        $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

+                        $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";

                 }

                 else if (!empty($links[$i][1])) {

-                    $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                    $outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                     $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

-                    $outmore .= '</a>' . "\n";

+                    $outmore .= '</a>'."\n";

                 }

                 $outmore .= '</div>';

 

@@ -1286,24 +1286,24 @@ 
             $right = (Globals::$langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');

 

             $tabsname = str_replace("@", "", $picto);

-            $out .= '<div id="moretabs' . $tabsname . '" class="inline-block tabsElem">';

-            $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">' . Globals::$langs->trans("More") . '... (' . $nbintab . ')</a>';

-            $out .= '<div id="moretabsList' . $tabsname . '" style="position: absolute; ' . $left . ': -999em; text-align: ' . $left . '; margin:0px; padding:2px">';

+            $out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';

+            $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">'.Globals::$langs->trans("More").'... ('.$nbintab.')</a>';

+            $out .= '<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px">';

             $out .= $outmore;

             $out .= '</div>';

             $out .= '<div></div>';

             $out .= "</div>\n";

 

             $out .= "<script>";

-            $out .= "$('#moretabs" . $tabsname . "').mouseenter( function() { console.log('mouseenter " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','auto');});";

-            $out .= "$('#moretabs" . $tabsname . "').mouseleave( function() { console.log('mouseleave " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','-999em');});";

+            $out .= "$('#moretabs".$tabsname."').mouseenter( function() { console.log('mouseenter ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','auto');});";

+            $out .= "$('#moretabs".$tabsname."').mouseleave( function() { console.log('mouseleave ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','-999em');});";

             $out .= "</script>";

         }

 

         $out .= "</div>\n";

 

         if (!$notab || $notab == -1)

-            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+            $out .= "\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";

 

         $parameters = array('tabname' => $active, 'out' => $out);

         $reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"

@@ -1412,7 +1412,7 @@ 
             if (Globals::$conf->browser->layout == 'phone')

                 $maxvisiblephotos = 1;

             if ($showimage)

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

             else {

                 if (!empty(Globals::$conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {

                     $nophoto = '';

@@ -1421,18 +1421,18 @@ 
 //elseif (Globals::$conf->browser->layout != 'phone') {    // Show no photo link

                 $nophoto = '/public/theme/common/nophoto.png';

 // $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

 //}

             }

         } elseif ($object->element == 'ticket') {

             $width = 80;

             $cssclass = 'photoref';

-            $showimage = $object->is_photo_available(Globals::$conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

+            $showimage = $object->is_photo_available(Globals::$conf->ticket->multidir_output[$entity].'/'.$object->track_id);

             $maxvisiblephotos = (isset(Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

             if (Globals::$conf->browser->layout == 'phone')

                 $maxvisiblephotos = 1;

             if ($showimage)

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

             else {

                 if (!empty(Globals::$conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {

                     $nophoto = '';

@@ -1441,7 +1441,7 @@ 
 //elseif (Globals::$conf->browser->layout != 'phone') {    // Show no photo link

                 $nophoto = '/public/theme/common/nophoto.png';

 //$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

 //}

             }

         } else {

@@ -1451,25 +1451,25 @@ 
                     // Check if a preview file is available

                     if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick")) {

                         $objectref = dol_sanitizeFileName($object->ref);

-                        $dir_output = (empty(Globals::$conf->$modulepart->multidir_output[$entity]) ? Globals::$conf->$modulepart->dir_output : Globals::$conf->$modulepart->multidir_output[$entity]) . "/";

+                        $dir_output = (empty(Globals::$conf->$modulepart->multidir_output[$entity]) ? Globals::$conf->$modulepart->dir_output : Globals::$conf->$modulepart->multidir_output[$entity])."/";

                         if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice'))) {

                             $subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart);

-                            $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '') . $objectref;  // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

+                            $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

                         } else {

                             $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                         }

                         if (empty($subdir))

                             $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

 

-                        $filepath = $dir_output . $subdir . "/";

+                        $filepath = $dir_output.$subdir."/";

 

-                        $file = $filepath . $objectref . ".pdf";

-                        $relativepath = $subdir . '/' . $objectref . '.pdf';

+                        $file = $filepath.$objectref.".pdf";

+                        $relativepath = $subdir.'/'.$objectref.'.pdf';

 

                         // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")

-                        $fileimage = $file . '_preview.png';              // If PDF has 1 page

-                        $fileimagebis = $file . '_preview-0.png';         // If PDF has more than one page

-                        $relativepathimage = $relativepath . '_preview.png';

+                        $fileimage = $file.'_preview.png'; // If PDF has 1 page

+                        $fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page

+                        $relativepathimage = $relativepath.'_preview.png';

 

                         // Si fichier PDF existe

                         if (file_exists($file)) {

@@ -1478,7 +1478,7 @@ 
                             if ((!file_exists($fileimage) || (filemtime($fileimage) < filemtime($file))) && (!file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))

                             ) {

                                 if (empty(Globals::$conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

-                                    include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+                                    include_once DOL_BASE_PATH.'/core/lib/files.lib.php';

                                     $ret = dol_convert_file($file, 'png', $fileimage);

                                     if ($ret < 0)

                                         $error++;

@@ -1491,14 +1491,14 @@ 
                             // Si fichier png PDF d'1 page trouve

                             if (file_exists($fileimage)) {

                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-                                $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_BASE_URI . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($relativepathimage) . '">';

+                                $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_BASE_URI.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';

                                 $phototoshow .= '</div></div>';

                             }

                             // Si fichier png PDF de plus d'1 page trouve

                             elseif (file_exists($fileimagebis)) {

-                                $preview = preg_replace('/\.png/', '', $relativepathimage) . "-0.png";

+                                $preview = preg_replace('/\.png/', '', $relativepathimage)."-0.png";

                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-                                $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_BASE_URI . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($preview) . '"><p>';

+                                $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_BASE_URI.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';

                                 $phototoshow .= '</div></div>';

                             }

                         }

@@ -1525,10 +1525,10 @@ 
                         $picto = $object->picto;

                         if ($object->element == 'project' && !$object->public)

                             $picto = 'project'; // instead of projectpub

-                        $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

+                        $nophoto = img_picto('', 'object_'.$picto, '', false, 1);

                     }

                     $morehtmlleft .= '<!-- No photo to show -->';

-                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . $nophoto . '"></div></div>';

+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.$nophoto.'"></div></div>';

 

                     $morehtmlleft .= '</div>';

                 }

@@ -1536,7 +1536,7 @@ 
         }

 

         if ($showbarcode)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';

 

         if ($object->element == 'societe') {

             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->societe->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1549,14 +1549,14 @@ 
             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->produit->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

                 $morehtmlstatus .= ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');

             } else {

-                $morehtmlstatus .= '<span class="statusrefsell">' . $object->getLibStatut(5, 0) . '</span>';

+                $morehtmlstatus .= '<span class="statusrefsell">'.$object->getLibStatut(5, 0).'</span>';

             }

             $morehtmlstatus .= ' &nbsp; ';

 //$morehtmlstatus.=Globals::$langs->trans("Status").' ('.Globals::$langs->trans("Buy").') ';

             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->produit->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

                 $morehtmlstatus .= ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');

             } else {

-                $morehtmlstatus .= '<span class="statusrefbuy">' . $object->getLibStatut(5, 1) . '</span>';

+                $morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(5, 1).'</span>';

             }

         } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

             $tmptxt = $object->getLibStatut(6, $object->totalpaye);

@@ -1583,7 +1583,7 @@ 
             if ($object->progress >= 100)

                 $object->fk_statut = 3;

             $tmptxt = $object->getLibStatut(5);

-            $morehtmlstatus .= $tmptxt;  // No status on task

+            $morehtmlstatus .= $tmptxt; // No status on task

         }

         else { // Generic case

             $tmptxt = $object->getLibStatut(6);

@@ -1597,18 +1597,18 @@ 
             if (method_exists($object, 'getVentilExportCompta')) {

                 $accounted = $object->getVentilExportCompta();

                 Globals::$langs->load("accountancy");

-                $morehtmlstatus .= '</div><div class="statusref statusrefbis">' . ($accounted > 0 ? Globals::$langs->trans("Accounted") : Globals::$langs->trans("NotYetAccounted"));

+                $morehtmlstatus .= '</div><div class="statusref statusrefbis">'.($accounted > 0 ? Globals::$langs->trans("Accounted") : Globals::$langs->trans("NotYetAccounted"));

             }

         }

 

 // Add alias for thirdparty

         if (!empty($object->name_alias))

-            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+            $morehtmlref .= '<div class="refidno">'.$object->name_alias.'</div>';

 

 // Add label

         if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {

             if (!empty($object->label))

-                $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';

+                $morehtmlref .= '<div class="refidno">'.$object->label.'</div>';

         }

 

         if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {

@@ -1618,11 +1618,11 @@ 
         }

         if (!empty(Globals::$conf->global->MAIN_SHOW_TECHNICAL_ID) && in_array($object->element, array('societe', 'contact', 'member', 'product'))) {

             $morehtmlref .= '<div style="clear: both;"></div><div class="refidno">';

-            $morehtmlref .= Globals::$langs->trans("TechnicalID") . ': ' . $object->id;

+            $morehtmlref .= Globals::$langs->trans("TechnicalID").': '.$object->id;

             $morehtmlref .= '</div>';

         }

 

-        print '<div class="' . ($onlybanner ? 'arearefnobottom ' : 'arearef ') . 'heightref valignmiddle" width="100%">';

+        print '<div class="'.($onlybanner ? 'arearefnobottom ' : 'arearef ').'heightref valignmiddle" width="100%">';

         print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);

         print '</div>';

         print '<div class="underrefbanner clearboth"></div>';

@@ -1644,7 +1644,7 @@ 
         if ($fieldrequired)

             $ret .= '<span class="fieldrequired">';

         if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '<label for="' . $fieldkey . '">';

+            $ret .= '<label for="'.$fieldkey.'">';

         $ret .= Globals::$langs->trans($langkey);

         if ((Globals::$conf->dol_use_jmobile != 4))

             $ret .= '</label>';

@@ -1663,9 +1663,9 @@ 
     static function dol_bc($var, $moreclass = '')

     {

        // global $bc;

-        $ret = ' ' . $bc[$var];

+        $ret = ' '.$bc[$var];

         if ($moreclass)

-            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+            $ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);

         return $ret;

     }

 

@@ -1685,50 +1685,50 @@ 
        // global Globals::$conf, Globals::$langs;

 

         $ret = '';

-        $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR');    // See also MAIN_FORCE_STATE_INTO_ADDRESS

+        $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS

 // Address

         if (empty($mode)) {

             $ret .= $object->address;

         }

 // Zip/Town/State

         if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty(Globals::$conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {    // US: title firstname name \n address lines \n town, state, zip \n country

-            $ret .= ($ret ? $sep : '' ) . $object->town;

+            $ret .= ($ret ? $sep : '').$object->town;

             if ($object->state) {

-                $ret .= ($ret ? ", " : '') . $object->state;

+                $ret .= ($ret ? ", " : '').$object->state;

             }

             if ($object->zip)

-                $ret .= ($ret ? ", " : '') . $object->zip;

+                $ret .= ($ret ? ", " : '').$object->zip;

         }

         else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

-            $ret .= ($ret ? $sep : '' ) . $object->town;

+            $ret .= ($ret ? $sep : '').$object->town;

             if ($object->state) {

-                $ret .= ($ret ? ", " : '') . $object->state;

+                $ret .= ($ret ? ", " : '').$object->state;

             }

             if ($object->zip)

-                $ret .= ($ret ? $sep : '' ) . $object->zip;

+                $ret .= ($ret ? $sep : '').$object->zip;

         }

         else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

-            $ret .= ($ret ? $sep : '' ) . $object->zip;

-            $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

+            $ret .= ($ret ? $sep : '').$object->zip;

+            $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');

             if ($object->state) {

-                $ret .= "\n" . $object->state;

+                $ret .= "\n".$object->state;

             }

         } else if (in_array($object->country_code, array('IT'))) { // IT: tile firstname name\n address lines \n zip (Code Departement) \n country

-            $ret .= ($ret ? $sep : '' ) . $object->zip;

-            $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

-            $ret .= ($object->departement_id ? (' (' . ($object->departement_id) . ')') : '');

+            $ret .= ($ret ? $sep : '').$object->zip;

+            $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');

+            $ret .= ($object->departement_id ? (' ('.($object->departement_id).')') : '');

         } else {                                          // Other: title firstname name \n address lines \n zip town \n country

-            $ret .= $object->zip ? (($ret ? $sep : '' ) . $object->zip) : '';

-            $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '' )) . $object->town) : '');

+            $ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';

+            $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$object->town) : '');

             if ($object->state && in_array($object->country_code, $countriesusingstate)) {

-                $ret .= ($ret ? ", " : '') . $object->state;

+                $ret .= ($ret ? ", " : '').$object->state;

             }

         }

         if (!is_object($outputlangs))

             $outputlangs = Globals::$langs;

         if ($withcountry) {

             Globals::$langs->load("dict");

-            $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

+            $ret .= ($object->country_code ? ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)) : '');

         }

 

         return $ret;

@@ -1782,13 +1782,13 @@ 
             if (is_string($tzoutput)) {

                 if ($tzoutput == 'tzserver') {

                     $to_gmt = false;

-                    $offsettzstring = @date_default_timezone_get();  // Example 'Europe/Berlin' or 'Indian/Reunion'

+                    $offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'

                     $offsettz = 0;

                     $offsetdst = 0;

                 } elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {

                     $to_gmt = true;

                     $offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'

-                    $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;  // Will not be used anymore

+                    $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore

                     $offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore

                 }

             }

@@ -1834,9 +1834,9 @@ 
         else if ($format == 'dayxcard')

             $format = '%Y%m%d';

         else if ($format == 'dayrfc')

-            $format = '%Y-%m-%d';             // DATE_RFC3339

+            $format = '%Y-%m-%d'; // DATE_RFC3339

         else if ($format == 'dayhourrfc')

-            $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

+            $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339

         else if ($format == 'standard')

             $format = '%Y-%m-%d %H:%M:%S';

 

@@ -1847,7 +1847,7 @@ 
 

 // If date undefined or "", we return ""

         if (dol_strlen($time) == 0)

-            return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+            return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1898,7 +1898,7 @@ 
         if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg) || preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) { // Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000

 // TODO Remove this.

 // This part of code should not be used.

-            dol_syslog("Functions.lib::dol_print_date static function call with deprecated value of time in page " . $_SERVER["PHP_SELF"], LOG_ERR);

+            dol_syslog("Functions.lib::dol_print_date static function call with deprecated value of time in page ".$_SERVER["PHP_SELF"], LOG_ERR);

 // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS' or 'YYYYMMDDHHMMSS'

             $syear = (!empty($reg[1]) ? $reg[1] : '');

             $smonth = (!empty($reg[2]) ? $reg[2] : '');

@@ -1916,7 +1916,7 @@ 
 

                 $ret = adodb_strftime($format, $timetouse, $to_gmt);

             } else

-                $ret = 'Bad value ' . $time . ' for date';

+                $ret = 'Bad value '.$time.' for date';

         }

 

         if (preg_match('/__b__/i', $format)) {

@@ -1925,11 +1925,11 @@ 
             $month = adodb_strftime('%m', $timetouse);

             $month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.

             if ($encodetooutput) {

-                $monthtext = $outputlangs->transnoentities('Month' . $month);

-                $monthtextshort = $outputlangs->transnoentities('MonthShort' . $month);

+                $monthtext = $outputlangs->transnoentities('Month'.$month);

+                $monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);

             } else {

-                $monthtext = $outputlangs->transnoentitiesnoconv('Month' . $month);

-                $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort' . $month);

+                $monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);

+                $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);

             }

 //print 'monthtext='.$monthtext.' monthtextshort='.$monthtextshort;

             $ret = str_replace('__b__', $monthtextshort, $ret);

@@ -1940,8 +1940,8 @@ 
         if (preg_match('/__a__/i', $format)) {

             $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

-            $w = adodb_strftime('%w', $timetouse);      // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

-            $dayweek = $outputlangs->transnoentitiesnoconv('Day' . $w);

+            $w = adodb_strftime('%w', $timetouse); // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

+            $dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);

             $ret = str_replace('__A__', $dayweek, $ret);

             $ret = str_replace('__a__', dol_substr($dayweek, 0, 3), $ret);

         }

@@ -1988,9 +1988,9 @@ 
 

         $usealternatemethod = false;

         if ($timestamp <= 0)

-            $usealternatemethod = true;    // <= 1970

+            $usealternatemethod = true; // <= 1970

         if ($timestamp >= 2145913200)

-            $usealternatemethod = true;  // >= 2038

+            $usealternatemethod = true; // >= 2038

 

         if ($usealternatemethod) {

             $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -2050,23 +2050,23 @@ 
 

         if (method_exists('DateTime', 'getTimestamp')) {

             if (empty($gm) || $gm === 'server') {

-                $default_timezone = @date_default_timezone_get();  // Example 'Europe/Berlin'

+                $default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'

                 $localtz = new DateTimeZone($default_timezone);

             } else if ($gm === 'user') {

 // We use dol_tz_string first because it is more reliable.

-                $default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]);  // Example 'Europe/Berlin'

+                $default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'

                 try {

                     $localtz = new DateTimeZone($default_timezone);

                 } catch (Exception $e) {

-                    dol_syslog("Warning dol_tz_string contains an invalid value " . $_SESSION["dol_tz_string"], LOG_WARNING);

+                    dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);

                     $default_timezone = @date_default_timezone_get();

                 }

             } else if (strrpos($gm, "tz,") !== false) {

-                $timezone = str_replace("tz,", "", $gm);  // Example 'tz,Europe/Berlin'

+                $timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'

                 try {

                     $localtz = new DateTimeZone($timezone);

                 } catch (Exception $e) {

-                    dol_syslog("Warning passed timezone contains an invalid value " . $timezone, LOG_WARNING);

+                    dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);

                 }

             }

 

@@ -2105,8 +2105,8 @@ 
         if ($mode == 'gmt')

             $ret = time(); // Time for now at greenwich.

         else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added

-            require_once DOL_BASE_PATH . '/core/lib/date.lib.php';

-            $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

+            require_once DOL_BASE_PATH.'/core/lib/date.lib.php';

+            $tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time

             $ret = (int) (dol_now('gmt') + ($tzsecond * 3600));

         }

         /* else if ($mode == 'tzref')				// Time for now with parent company timezone is added

@@ -2152,9 +2152,9 @@ 
         }

 // Use long or short text unit

         if (empty($shortunit)) {

-            $ret .= ' ' . $textunitlong;

+            $ret .= ' '.$textunitlong;

         } else {

-            $ret .= ' ' . $textunitshort;

+            $ret .= ' '.$textunitshort;

         }

 

         return $ret;

@@ -2182,13 +2182,13 @@ 
         $link .= $url;

         $link .= '"';

         if ($target)

-            $link .= ' target="' . $target . '"';

+            $link .= ' target="'.$target.'"';

         $link .= '>';

         if (!preg_match('/^http/i', $url))

             $link .= 'http://';

         $link .= dol_trunc($url, $max);

         $link .= '</a>';

-        return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto(Globals::$langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

+        return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto(Globals::$langs->trans("Url"), 'object_globe.png').' ' : '').$link.'</div>';

     }

 

     /**

@@ -2229,9 +2229,9 @@ 
                 $type = 'AC_EMAIL';

                 $link = '';

                 if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

+                    $link = '<a href="'.DOL_BASE_URI.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object(Globals::$langs->trans("AddAction"), "calendar").'</a>';

                 if ($link)

-                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';

+                    $newemail = '<div>'.$newemail.' '.$link.'</div>';

             }

         }

         else {

@@ -2241,7 +2241,7 @@ 
             }

         }

 

-        $rep = '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto(Globals::$langs->trans("EMail"), 'object_email.png') . ' ' : '') . $newemail . '</div>';

+        $rep = '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto(Globals::$langs->trans("EMail"), 'object_email.png').' ' : '').$newemail.'</div>';

         if ($hookmanager) {

             $parameters = array('cid' => $cid, 'socid' => $socid, 'addlink' => $addlink, 'picto' => $withpicto);

             $reshook = $hookmanager->executeHooks('printEmail', $parameters, $email);

@@ -2271,26 +2271,26 @@ 
 

         if (!empty($type)) {

             $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

-            $newskype .= img_picto(Globals::$langs->trans(strtoupper($type)), $type . '.png', '', false, 0, 0, '', 'paddingright');

+            $newskype .= img_picto(Globals::$langs->trans(strtoupper($type)), $type.'.png', '', false, 0, 0, '', 'paddingright');

             $newskype .= $value;

             if ($type == 'skype') {

                 $newskype .= '&nbsp;';

                 $newskype .= '<a href="skype:';

                 $newskype .= $value;

-                $newskype .= '?call" alt="' . Globals::$langs->trans("Call") . '&nbsp;' . $value . '" title="' . Globals::$langs->trans("Call") . '&nbsp;' . $value . '">';

-                $newskype .= '<img src="' . DOL_BASE_URI . '/theme/common/skype_callbutton.png" border="0">';

+                $newskype .= '?call" alt="'.Globals::$langs->trans("Call").'&nbsp;'.$value.'" title="'.Globals::$langs->trans("Call").'&nbsp;'.$value.'">';

+                $newskype .= '<img src="'.DOL_BASE_URI.'/theme/common/skype_callbutton.png" border="0">';

                 $newskype .= '</a><a href="skype:';

                 $newskype .= $value;

-                $newskype .= '?chat" alt="' . Globals::$langs->trans("Chat") . '&nbsp;' . $value . '" title="' . Globals::$langs->trans("Chat") . '&nbsp;' . $value . '">';

-                $newskype .= '<img class="paddingleft" src="' . DOL_BASE_URI . '/theme/common/skype_chatbutton.png" border="0">';

+                $newskype .= '?chat" alt="'.Globals::$langs->trans("Chat").'&nbsp;'.$value.'" title="'.Globals::$langs->trans("Chat").'&nbsp;'.$value.'">';

+                $newskype .= '<img class="paddingleft" src="'.DOL_BASE_URI.'/theme/common/skype_chatbutton.png" border="0">';

                 $newskype .= '</a>';

             }

             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

                 $addlink = 'AC_SKYPE';

                 $link = '';

                 if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

-                $newskype .= ($link ? ' ' . $link : '');

+                    $link = '<a href="'.DOL_BASE_URI.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object(Globals::$langs->trans("AddAction"), "calendar").'</a>';

+                $newskype .= ($link ? ' '.$link : '');

             }

             $newskype .= '</div>';

         }

@@ -2334,165 +2334,165 @@ 
         if (strtoupper($countrycode) == "FR") {

 // France

             if (dol_strlen($phone) == 10) {

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 2) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 2).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);

             } elseif (dol_strlen($phone) == 7) {

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);

             } elseif (dol_strlen($phone) == 9) {

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 3) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2);

             } elseif (dol_strlen($phone) == 11) {

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (dol_strlen($phone) == 12) {

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "CA") {

             if (dol_strlen($phone) == 10) {

-                $newphone = ($separ != '' ? '(' : '') . substr($newphone, 0, 3) . ($separ != '' ? ')' : '') . $separ . substr($newphone, 3, 3) . ($separ != '' ? '-' : '') . substr($newphone, 6, 4);

+                $newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);

             }

         } elseif (strtoupper($countrycode) == "PT") {//Portugal

             if (dol_strlen($phone) == 13) {//ex: +351_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "SR") {//Suriname

             if (dol_strlen($phone) == 10) {//ex: +597_ABC_DEF

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);

             } elseif (dol_strlen($phone) == 11) {//ex: +597_ABC_DEFG

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 4);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);

             }

         } elseif (strtoupper($countrycode) == "DE") {//Allemagne

             if (dol_strlen($phone) == 14) {//ex:  +49_ABCD_EFGH_IJK

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 4) . $separ . substr($newphone, 11, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 4).$separ.substr($newphone, 11, 3);

             } elseif (dol_strlen($phone) == 13) {//ex: +49_ABC_DEFG_HIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 4) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "ES") {//Espagne

             if (dol_strlen($phone) == 12) {//ex:  +34_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "BF") {// Burkina Faso

             if (dol_strlen($phone) == 12) {//ex :  +22 A BC_DE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "RO") {// Roumanie

             if (dol_strlen($phone) == 12) {//ex :  +40 AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "TR") {//Turquie

             if (dol_strlen($phone) == 13) {//ex :  +90 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

             }

         } elseif (strtoupper($countrycode) == "US") {//Etat-Unis

             if (dol_strlen($phone) == 12) {//ex: +1 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 3) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 4);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);

             }

         } elseif (strtoupper($countrycode) == "MX") {//Mexique

             if (dol_strlen($phone) == 12) {//ex: +52 ABCD_EFG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);

             } elseif (dol_strlen($phone) == 11) {//ex: +52 AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (dol_strlen($phone) == 13) {//ex: +52 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

             }

         } elseif (strtoupper($countrycode) == "ML") {//Mali

             if (dol_strlen($phone) == 12) {//ex: +223 AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "TH") {//Thaïlande

             if (dol_strlen($phone) == 11) {//ex: +66_ABC_DE_FGH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);

             } elseif (dol_strlen($phone) == 12) {//ex: +66_A_BCD_EF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "MU") {//Maurice

             if (dol_strlen($phone) == 11) {//ex: +230_ABC_DE_FG

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (dol_strlen($phone) == 12) {//ex: +230_ABCD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 4) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "ZA") {//Afrique du sud

             if (dol_strlen($phone) == 12) {//ex: +27_AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "SY") {//Syrie

             if (dol_strlen($phone) == 12) {//ex: +963_AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             } elseif (dol_strlen($phone) == 13) {//ex: +963_AB_CD_EF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "AE") {//Emirats Arabes Unis

             if (dol_strlen($phone) == 12) {//ex: +971_ABC_DEF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);

             } elseif (dol_strlen($phone) == 13) {//ex: +971_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             } elseif (dol_strlen($phone) == 14) {//ex: +971_ABC_DEF_GHIK

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 4);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);

             }

         } elseif (strtoupper($countrycode) == "DZ") {//Algérie

             if (dol_strlen($phone) == 13) {//ex: +213_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "BE") {//Belgique

             if (dol_strlen($phone) == 11) {//ex: +32_ABC_DE_FGH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);

             } elseif (dol_strlen($phone) == 12) {//ex: +32_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "PF") {//Polynésie française

             if (dol_strlen($phone) == 12) {//ex: +689_AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "CO") {//Colombie

             if (dol_strlen($phone) == 13) {//ex: +57_ABC_DEF_GH_IJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "JO") {//Jordanie

             if (dol_strlen($phone) == 12) {//ex: +962_A_BCD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 1) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             }

         } elseif (strtoupper($countrycode) == "MG") {//Madagascar

             if (dol_strlen($phone) == 13) {//ex: +261_AB_CD_EF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "GB") {//Royaume uni

             if (dol_strlen($phone) == 13) {//ex: +44_ABCD_EFG_HIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "CH") {//Suisse

             if (dol_strlen($phone) == 12) {//ex: +41_AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             } elseif (dol_strlen($phone) == 15) {// +41_AB_CDE_FGH_IJKL

-                $newphone = $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 3) . $separ . substr($newphone, 11, 4);

+                $newphone = $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 4);

             }

         } elseif (strtoupper($countrycode) == "TN") {//Tunisie

             if (dol_strlen($phone) == 12) {//ex: +216_AB_CDE_FGH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "GF") {//Guyane francaise

             if (dol_strlen($phone) == 13) {//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "GP") {//Guadeloupe

             if (dol_strlen($phone) == 13) {//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "MQ") {//Martinique

             if (dol_strlen($phone) == 13) {//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "IT") {//Italie

             if (dol_strlen($phone) == 12) {//ex: +39_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             } elseif (dol_strlen($phone) == 13) {//ex: +39_ABC_DEF_GH_IJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "AU") {//Australie

             if (dol_strlen($phone) == 12) {//ex: +61_A_BCDE_FGHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 4) . $separ . substr($newphone, 8, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);

             }

         }

         if (!empty($addlink)) { // Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)

             if (Globals::$conf->browser->layout == 'phone' || (!empty(Globals::$conf->clicktodial->enabled) && !empty(Globals::$conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) { // If phone or option for, we use link of phone

-                $newphone = '<a href="tel:' . $phone . '"';

-                $newphone .= '>' . $phone . '</a>';

+                $newphone = '<a href="tel:'.$phone.'"';

+                $newphone .= '>'.$phone.'</a>';

             } else if (!empty(Globals::$conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url

                 if (empty($user->clicktodial_loaded))

                     $user->fetch_clicktodial();

@@ -2516,10 +2516,10 @@ 
                     '__PASS__' => $clicktodial_password);

                 $url = make_substitutions($url, $substitarray);

                 $newphonesav = $newphone;

-                $newphone = '<a href="' . $url . '"';

+                $newphone = '<a href="'.$url.'"';

                 if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET))

                     $newphone .= ' target="_blank"';

-                $newphone .= '>' . $newphonesav . '</a>';

+                $newphone .= '>'.$newphonesav.'</a>';

             }

 

 //if (($cid || $socid) && ! empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create)

@@ -2529,9 +2529,9 @@ 
                 if ($addlink == 'AC_FAX')

                     $type = 'AC_FAX';

                 if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

+                    $link = '<a href="'.DOL_BASE_URI.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object(Globals::$langs->trans("AddAction"), "calendar").'</a>';

                 if ($link)

-                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';

+                    $newphone = '<div>'.$newphone.' '.$link.'</div>';

             }

         }

 

@@ -2562,7 +2562,7 @@ 
                 $rep .= '<div class="nospan float" style="margin-right: 10px">';

             else

                 $rep .= '<span style="margin-right: 10px;">';

-            $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

+            $rep .= ($withpicto ? img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;

             if ($adddivfloat)

                 $rep .= '</div>';

             else

@@ -2589,15 +2589,15 @@ 
             $ret .= $ip;

         }

 

-        echo ('<p>DOL_BASE_PATH: ' . DOL_BASE_PATH . '/DOL_BASE_URI: ' . DOL_BASE_URI . '</p>');

+        echo ('<p>DOL_BASE_PATH: '.DOL_BASE_PATH.'/DOL_BASE_URI: '.DOL_BASE_URI.'</p>');

 

         if ($mode != 2) {

             $countrycode = dolGetCountryCodeFromIp($ip);

             if ($countrycode) { // If success, countrycode is us, fr, ...

-                if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {

-                    $ret .= ' ' . img_picto($countrycode . ' ' . Globals::$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

+                if (file_exists(DOL_BASE_PATH.'/theme/common/flags/'.$countrycode.'.png')) {

+                    $ret .= ' '.img_picto($countrycode.' '.Globals::$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI.'/theme/common/flags/'.$countrycode.'.png', '', 1);

                 } else

-                    $ret .= ' (' . $countrycode . ')';

+                    $ret .= ' ('.$countrycode.')';

             }

         }

 

@@ -2635,7 +2635,7 @@ 
 //$ip='24.24.24.24';

 //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)

 

-            include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+            include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

             $geoip = new DolGeoIP('country', $datafile);

 //print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n";

 //print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n";

@@ -2661,7 +2661,7 @@ 
             $datafile = Globals::$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;

 //$ip='24.24.24.24';

 //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';

-            include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+            include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

             $geoip = new DolGeoIP('country', $datafile);

             $countrycode = $geoip->getCountryCodeFromIP($ip);

             $ret = $countrycode;

@@ -2716,12 +2716,12 @@ 
                     $showomap = 1;

 

                 if ($showgmap) {

-                    $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

-                    $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '" class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/gmap.png"></a>';

+                    $url = dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id, 1);

+                    $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/gmap.png"></a>';

                 }

                 if ($showomap) {

-                    $url = dol_buildpath('/openstreetmap/maps.php?mode=' . $mode . '&id=' . $id, 1);

-                    $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '_openstreetmap" class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/gmap.png"></a>';

+                    $url = dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id, 1);

+                    $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/gmap.png"></a>';

                 }

             }

         }

@@ -2867,7 +2867,7 @@ 
         if ($trunc == 'right') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

+                return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');

             else

 //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

                 return $string;

@@ -2877,21 +2877,21 @@ 
             if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {

                 $size1 = round($size / 2);

                 $size2 = round($size / 2);

-                return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

+                return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

             } else

                 return $string;

         }

         elseif ($trunc == 'left') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

+                return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

             else

                 return $string;

         }

         elseif ($trunc == 'wrap') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (dol_strlen($newstring, $stringencoding) > ($size + 1))

-                return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

+                return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

             else

                 return $string;

         } else

@@ -2924,7 +2924,7 @@ 
         $url = DOL_BASE_URI;

 

         $theme = Globals::$conf->theme;

-        $path = 'theme/' . $theme;

+        $path = 'theme/'.$theme;

 

 // Define fullpathpicto to use into src

         if ($pictoisfullpath) {

@@ -2973,7 +2973,7 @@ 
                     $fakey = 'fa-pencil';

                     $facolor = '#444';

                 } elseif ($pictowithoutext == 'filter') {

-                    $fakey = 'fa-' . $pictowithoutext;

+                    $fakey = 'fa-'.$pictowithoutext;

                 } elseif ($pictowithoutext == 'grip_title' || $pictowithoutext == 'grip') {

                     $fakey = 'fa-arrows';

                 } elseif ($pictowithoutext == 'listlight') {

@@ -3012,15 +3012,15 @@ 
                 } elseif ($pictowithoutext == 'jabber') {

                     $fakey = 'fa-comment-o';

                 } else {

-                    $fakey = 'fa-' . $pictowithoutext;

+                    $fakey = 'fa-'.$pictowithoutext;

                     $facolor = '#444';

                     $marginleftonlyshort = 0;

                 }

 

                 if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {

-                    $morecss .= ($morecss ? ' ' : '') . $reg[1];

+                    $morecss .= ($morecss ? ' ' : '').$reg[1];

                 }

-                $enabledisablehtml = '<span class="fa ' . $fakey . ' ' . ($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '') . ' valignmiddle' . ($morecss ? ' ' . $morecss : '') . '" style="' . ($fasize ? ('font-size: ' . $fasize . ';') : '') . ($facolor ? (' color: ' . $facolor . ';') : '') . '" alt="' . dol_escape_htmltag($titlealt) . '"' . (($notitle || empty($title)) ? '' : ' title="' . dol_escape_htmltag($title) . '"') . ($moreatt ? ' ' . $moreatt : '') . '>';

+                $enabledisablehtml = '<span class="fa '.$fakey.' '.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '').' valignmiddle'.($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').'" alt="'.dol_escape_htmltag($titlealt).'"'.(($notitle || empty($title)) ? '' : ' title="'.dol_escape_htmltag($title).'"').($moreatt ? ' '.$moreatt : '').'>';

                 if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

                     $enabledisablehtml .= $titlealt;

                 }

@@ -3030,11 +3030,11 @@ 
             }

 

             if (!empty(Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH)) {

-                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH . '/theme/' . $theme; // If the theme does not have the same name as the module

+                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module

             } else if (!empty(Globals::$conf->global->MAIN_OVERWRITE_THEME_RES)) {

-                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_RES . '/theme/' . Globals::$conf->global->MAIN_OVERWRITE_THEME_RES;  // To allow an external module to overwrite image resources whatever is activated theme

+                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.Globals::$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme

             } else if (!empty(Globals::$conf->modules_parts['theme']) && array_key_exists($theme, Globals::$conf->modules_parts['theme'])) {

-                $path = $theme . '/theme/' . $theme; // If the theme have the same name as the module

+                $path = $theme.'/theme/'.$theme; // If the theme have the same name as the module

             }

 

 // If we ask an image into $url/$mymodule/img (instead of default path)

@@ -3054,15 +3054,15 @@ 
                     continue;

                 }

 // This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded

-                if (file_exists($dirroot . '/' . $path . '/img/' . $picto)) {

+                if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) {

                     //$url = DOL_BASE_URI . Globals::$conf->file->dol_url_root[$type];

-                    $url = DOL_BASE_URI . Globals::$conf->file->dol_url_root[$type];

+                    $url = DOL_BASE_URI.Globals::$conf->file->dol_url_root[$type];

                     break;

                 }

             }

 

 // $url is '' or '/custom', $path is current theme or

-            $fullpathpicto = $url . '/' . $path . '/img/' . $picto;

+            $fullpathpicto = $url.'/'.$path.'/img/'.$picto;

         }

 

         if ($srconly) {

@@ -3070,7 +3070,7 @@ 
         }

 

 // tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for bind people

-        return '<img src="' . $fullpathpicto . '" alt="' . dol_escape_htmltag($alt) . '"' . (($notitle || empty($titlealt)) ? '' : ' title="' . dol_escape_htmltag($titlealt) . '"') . ($moreatt ? ' ' . $moreatt : ' class="inline-block' . ($morecss ? ' ' . $morecss : '') . '"') . '>'; // Alt is used for accessibility, title for popup

+        return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup

     }

 

     /**

@@ -3088,7 +3088,7 @@ 
      */

     static function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)

     {

-        return img_picto($titlealt, 'object_' . $picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

+        return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

     }

 

     /**

@@ -3109,7 +3109,7 @@ 
             $picto .= '.png';

 

 //$path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

-        $path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

+        $path = DOL_BASE_URI.'/theme/'.Globals::$conf->theme.'/img/weather/'.$picto;

 

         return img_picto($titlealt, $path, $moreatt, 1);

     }

@@ -3135,10 +3135,10 @@ 
             $path = $picto;

         else {

 //$path = DOL_BASE_URI . '/theme/common/' . $picto;

-            $path = DOL_BASE_URI . '/theme/common/' . $picto;

+            $path = DOL_BASE_URI.'/theme/common/'.$picto;

 

             if (!empty(Globals::$conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {

-                $themepath = DOL_BASE_PATH . 'theme/' . Globals::$conf->theme . '/img/' . $picto;

+                $themepath = DOL_BASE_PATH.'theme/'.Globals::$conf->theme.'/img/'.$picto;

 

                 if (file_exists($themepath))

                     $path = $themepath;

@@ -3176,14 +3176,14 @@ 
                 $numaction = 3;

                 $titlealt = Globals::$langs->transnoentitiesnoconv('ChangeContactDone');

             } else {

-                $titlealt = Globals::$langs->transnoentitiesnoconv('ChangeStatus ' . $numaction);

+                $titlealt = Globals::$langs->transnoentitiesnoconv('ChangeStatus '.$numaction);

                 $numaction = 0;

             }

         }

         if (!is_numeric($numaction))

             $numaction = 0;

 

-        return img_picto($titlealt, 'stcomm' . $numaction . '.png');

+        return img_picto($titlealt, 'stcomm'.$numaction.'.png');

     }

 

     /**

@@ -3200,7 +3200,7 @@ 
         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Show');

 

-        return img_picto($titlealt, 'pdf' . $size . '.png');

+        return img_picto($titlealt, 'pdf'.$size.'.png');

     }

 

     /**

@@ -3252,7 +3252,7 @@ 
         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Modify');

 

-        return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . (Globals::$langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));

+        return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.(Globals::$langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right').'"' : "").($other ? ' '.$other : ''));

     }

 

     /**

@@ -3270,7 +3270,7 @@ 
         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('View');

 

-        $moreatt = ($float ? 'style="float: right" ' : '') . $other;

+        $moreatt = ($float ? 'style="float: right" ' : '').$other;

 

         return img_picto($titlealt, 'view.png', $moreatt);

     }

@@ -3343,7 +3343,7 @@ 
                 $usealttitle = Globals::$langs->trans('Info');

         }

 

-        return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

+        return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')).'"');

     }

 

     /**

@@ -3377,7 +3377,7 @@ 
             $titlealt = Globals::$langs->trans('Warning');

 

 //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';

-        return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));

+        return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt) : ''));

     }

 

     /**

@@ -3411,7 +3411,7 @@ 
             $titlealt = Globals::$langs->trans('Next');

 

 //return img_picto($titlealt, 'next.png', $moreatt);

-        return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

+        return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';

     }

 

     /**

@@ -3429,7 +3429,7 @@ 
             $titlealt = Globals::$langs->trans('Previous');

 

 //return img_picto($titlealt, 'previous.png', $moreatt);

-        return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

+        return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';

     }

 

     /**

@@ -3447,7 +3447,7 @@ 
         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Down');

 

-        return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

+        return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass ? " ".$moreclass : "").'"');

     }

 

     /**

@@ -3465,7 +3465,7 @@ 
         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Up');

 

-        return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

+        return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass ? " ".$moreclass : "").'"');

     }

 

     /**

@@ -3548,7 +3548,7 @@ 
             $brand = 'credit-card';

         }

 

-        return '<span class="fa fa-' . $brand . ' fa-2x fa-fw"></span>';

+        return '<span class="fa fa-'.$brand.' fa-2x fa-fw"></span>';

     }

 

     /**

@@ -3561,17 +3561,17 @@ 
      */

     static function img_mime($file, $titlealt = '', $morecss = '')

     {

-        require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

         $mimetype = dol_mimetype($file, '', 1);

         $mimeimg = dol_mimetype($file, '', 2);

         $mimefa = dol_mimetype($file, '', 4);

 

         if (empty($titlealt))

-            $titlealt = 'Mime type: ' . $mimetype;

+            $titlealt = 'Mime type: '.$mimetype;

 

 //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

-        return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

+        return '<i class="fa fa-'.$mimefa.' paddingright"></i>';

     }

 

     /**

@@ -3586,7 +3586,7 @@ 
      */

     static function img_phone($titlealt = 'default', $option = 0)

     {

-        dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

        // global Globals::$conf, Globals::$langs;

 

@@ -3617,8 +3617,8 @@ 
 

         $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

-        $input = '<input type="image" class="liste_titre" name="button_search" src="' . $img . '" ';

-        $input .= 'value="' . dol_escape_htmltag($titlealt) . '" title="' . dol_escape_htmltag($titlealt) . '" >';

+        $input = '<input type="image" class="liste_titre" name="button_search" src="'.$img.'" ';

+        $input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';

 

         return $input;

     }

@@ -3639,8 +3639,8 @@ 
 

         $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

-        $input = '<input type="image" class="liste_titre" name="button_removefilter" src="' . $img . '" ';

-        $input .= 'value="' . dol_escape_htmltag($titlealt) . '" title="' . dol_escape_htmltag($titlealt) . '" >';

+        $input = '<input type="image" class="liste_titre" name="button_removefilter" src="'.$img.'" ';

+        $input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';

 

         return $input;

     }

@@ -3660,10 +3660,10 @@ 
        // global Globals::$conf, Globals::$langs;

 

         if ($infoonimgalt) {

-            return img_picto($text, 'info', 'class="hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '"');

+            return img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');

         }

 

-        return ($nodiv ? '' : '<div class="' . (empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)) . ' hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '">') . '<span class="fa fa-info-circle" title="' . dol_escape_htmltag($admin ? Globals::$langs->trans('InfoAdmin') : Globals::$langs->trans('Note')) . '"></span> ' . $text . ($nodiv ? '' : '</div>');

+        return ($nodiv ? '' : '<div class="'.(empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)).' hideonsmartphone'.($morecss ? ' '.$morecss : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? Globals::$langs->trans('InfoAdmin') : Globals::$langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');

     }

 

     /**

@@ -3688,7 +3688,7 @@ 
 

 // Si erreur intervenue avant chargement langue

         if (!Globals::$langs) {

-            require_once DOL_BASE_PATH . '/core/class/translate.class.php';

+            require_once DOL_BASE_PATH.'/core/class/translate.class.php';

             Globals::$langs = new Translate('', Globals::$conf);

             Globals::$langs->load("main");

         }

@@ -3696,51 +3696,51 @@ 
         Globals::$langs->loadLangs(array('main', 'errors'));

 

         if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

-            $out .= Globals::$langs->trans("DolibarrHasDetectedError") . ".<br>\n";

+            $out .= Globals::$langs->trans("DolibarrHasDetectedError").".<br>\n";

             if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))

                 $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

-            $out .= Globals::$langs->trans("InformationToHelpDiagnose") . ":<br>\n";

+            $out .= Globals::$langs->trans("InformationToHelpDiagnose").":<br>\n";

 

-            $out .= "<b>" . Globals::$langs->trans("Date") . ":</b> " . dol_print_date(time(), 'dayhourlog') . "<br>\n";

-            $out .= "<b>" . Globals::$langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("Date").":</b> ".dol_print_date(time(), 'dayhourlog')."<br>\n";

+            $out .= "<b>".Globals::$langs->trans("Dolibarr").":</b> ".DOL_VERSION."<br>\n";

             if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL))

-                $out .= "<b>" . Globals::$langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";

+                $out .= "<b>".Globals::$langs->trans("LevelOfFeature").":</b> ".Globals::$conf->global->MAIN_FEATURES_LEVEL."<br>\n";

             if (function_exists("phpversion")) {

-                $out .= "<b>" . Globals::$langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";

+                $out .= "<b>".Globals::$langs->trans("PHP").":</b> ".phpversion()."<br>\n";

             }

-            $out .= "<b>" . Globals::$langs->trans("Server") . ":</b> " . $_SERVER["SERVER_SOFTWARE"] . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";

             if (function_exists("php_uname")) {

-                $out .= "<b>" . Globals::$langs->trans("OS") . ":</b> " . php_uname() . "<br>\n";

+                $out .= "<b>".Globals::$langs->trans("OS").":</b> ".php_uname()."<br>\n";

             }

-            $out .= "<b>" . Globals::$langs->trans("UserAgent") . ":</b> " . $_SERVER["HTTP_USER_AGENT"] . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";

             $out .= "<br>\n";

-            $out .= "<b>" . Globals::$langs->trans("RequestedUrl") . ":</b> " . dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8') . "<br>\n";

-            $out .= "<b>" . Globals::$langs->trans("Referer") . ":</b> " . (isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '') . "<br>\n";

-            $out .= "<b>" . Globals::$langs->trans("MenuManager") . ":</b> " . (isset(Globals::$conf->standard_menu) ? Globals::$conf->standard_menu : '') . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";

+            $out .= "<b>".Globals::$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";

+            $out .= "<b>".Globals::$langs->trans("MenuManager").":</b> ".(isset(Globals::$conf->standard_menu) ? Globals::$conf->standard_menu : '')."<br>\n";

             $out .= "<br>\n";

-            $syslog .= "url=" . dol_escape_htmltag($_SERVER["REQUEST_URI"]);

-            $syslog .= ", query_string=" . dol_escape_htmltag($_SERVER["QUERY_STRING"]);

+            $syslog .= "url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);

+            $syslog .= ", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);

         } else {                              // Mode CLI

-            $out .= '> ' . Globals::$langs->transnoentities("ErrorInternalErrorDetected") . ":\n" . $argv[0] . "\n";

-            $syslog .= "pid=" . dol_getmypid();

+            $out .= '> '.Globals::$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";

+            $syslog .= "pid=".dol_getmypid();

         }

 

         if (is_object($db)) {

             if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

-                $out .= "<b>" . Globals::$langs->trans("DatabaseTypeManager") . ":</b> " . $db->type . "<br>\n";

-                $out .= "<b>" . Globals::$langs->trans("RequestLastAccessInError") . ":</b> " . ($db->lastqueryerror() ? dol_escape_htmltag($db->lastqueryerror()) : Globals::$langs->trans("ErrorNoRequestInError")) . "<br>\n";

-                $out .= "<b>" . Globals::$langs->trans("ReturnCodeLastAccessInError") . ":</b> " . ($db->lasterrno() ? dol_escape_htmltag($db->lasterrno()) : Globals::$langs->trans("ErrorNoRequestInError")) . "<br>\n";

-                $out .= "<b>" . Globals::$langs->trans("InformationLastAccessInError") . ":</b> " . ($db->lasterror() ? dol_escape_htmltag($db->lasterror()) : Globals::$langs->trans("ErrorNoRequestInError")) . "<br>\n";

+                $out .= "<b>".Globals::$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";

+                $out .= "<b>".Globals::$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror() ? dol_escape_htmltag($db->lastqueryerror()) : Globals::$langs->trans("ErrorNoRequestInError"))."<br>\n";

+                $out .= "<b>".Globals::$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ? dol_escape_htmltag($db->lasterrno()) : Globals::$langs->trans("ErrorNoRequestInError"))."<br>\n";

+                $out .= "<b>".Globals::$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ? dol_escape_htmltag($db->lasterror()) : Globals::$langs->trans("ErrorNoRequestInError"))."<br>\n";

                 $out .= "<br>\n";

             } else {                            // Mode CLI

 // No dol_escape_htmltag for output, we are in CLI mode

-                $out .= '> ' . Globals::$langs->transnoentities("DatabaseTypeManager") . ":\n" . $db->type . "\n";

-                $out .= '> ' . Globals::$langs->transnoentities("RequestLastAccessInError") . ":\n" . ($db->lastqueryerror() ? $db->lastqueryerror() : Globals::$langs->transnoentities("ErrorNoRequestInError")) . "\n";

-                $out .= '> ' . Globals::$langs->transnoentities("ReturnCodeLastAccessInError") . ":\n" . ($db->lasterrno() ? $db->lasterrno() : Globals::$langs->transnoentities("ErrorNoRequestInError")) . "\n";

-                $out .= '> ' . Globals::$langs->transnoentities("InformationLastAccessInError") . ":\n" . ($db->lasterror() ? $db->lasterror() : Globals::$langs->transnoentities("ErrorNoRequestInError")) . "\n";

+                $out .= '> '.Globals::$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";

+                $out .= '> '.Globals::$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror() ? $db->lastqueryerror() : Globals::$langs->transnoentities("ErrorNoRequestInError"))."\n";

+                $out .= '> '.Globals::$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno() ? $db->lasterrno() : Globals::$langs->transnoentities("ErrorNoRequestInError"))."\n";

+                $out .= '> '.Globals::$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror() ? $db->lasterror() : Globals::$langs->transnoentities("ErrorNoRequestInError"))."\n";

             }

-            $syslog .= ", sql=" . $db->lastquery();

-            $syslog .= ", db_error=" . $db->lasterror();

+            $syslog .= ", sql=".$db->lastquery();

+            $syslog .= ", db_error=".$db->lasterror();

         }

 

         if ($error || $errors) {

@@ -3760,31 +3760,31 @@ 
                 if (empty($msg))

                     continue;

                 if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

-                    $out .= "<b>" . Globals::$langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

+                    $out .= "<b>".Globals::$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";

                 } else {                        // Mode CLI

-                    $out .= '> ' . Globals::$langs->transnoentities("Message") . ":\n" . $msg . "\n";

+                    $out .= '> '.Globals::$langs->transnoentities("Message").":\n".$msg."\n";

                 }

-                $syslog .= ", msg=" . $msg;

+                $syslog .= ", msg=".$msg;

             }

         }

         if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file')) {

             xdebug_print_function_stack();

-            $out .= '<b>XDebug informations:</b>' . "<br>\n";

-            $out .= 'File: ' . xdebug_call_file() . "<br>\n";

-            $out .= 'Line: ' . xdebug_call_line() . "<br>\n";

-            $out .= 'Function: ' . xdebug_call_function() . "<br>\n";

+            $out .= '<b>XDebug informations:</b>'."<br>\n";

+            $out .= 'File: '.xdebug_call_file()."<br>\n";

+            $out .= 'Line: '.xdebug_call_line()."<br>\n";

+            $out .= 'Function: '.xdebug_call_function()."<br>\n";

             $out .= "<br>\n";

         }

 

         if (empty($dolibarr_main_prod))

             print $out;

         else {

-            print Globals::$langs->trans("DolibarrHasDetectedError") . '. ';

+            print Globals::$langs->trans("DolibarrHasDetectedError").'. ';

             print Globals::$langs->trans("YouCanSetOptionDolibarrMainProdToZero");

             define("MAIN_CORE_ERROR", 1);

         }

 //else print 'Sorry, an error occured but the parameter $dolibarr_main_prod is defined in conf file so no message is reported to your browser. Please read the log file for error message.';

-        dol_syslog("Error " . $syslog, LOG_ERR);

+        dol_syslog("Error ".$syslog, LOG_ERR);

     }

 

     /**

@@ -3807,13 +3807,13 @@ 
         Globals::$langs->load("errors");

         $now = dol_now();

 

-        print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

-        print Globals::$langs->trans("ErrorContactEMail", $email, $prefixcode . dol_print_date($now, '%Y%m%d'));

+        print '<br><div class="center login_main_message"><div class="'.$morecss.'">';

+        print Globals::$langs->trans("ErrorContactEMail", $email, $prefixcode.dol_print_date($now, '%Y%m%d'));

         if ($errormessage)

-            print '<br><br>' . $errormessage;

+            print '<br><br>'.$errormessage;

         if (is_array($errormessages) && count($errormessages)) {

             foreach ($errormessages as $mesgtoshow) {

-                print '<br><br>' . $mesgtoshow;

+                print '<br><br>'.$mesgtoshow;

             }

         }

         print '</div></div>';

@@ -3871,16 +3871,16 @@ 
         }

 

         $tmpsortfield = explode(',', $sortfield);

-        $sortfield1 = trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

+        $sortfield1 = trim($tmpsortfield[0]); // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

         $tmpfield = explode(',', $field);

-        $field1 = trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'

+        $field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'

 //var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);

 // If field is used as sort criteria we use a specific css class liste_titre_sel

 // Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")

         if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) {

-            $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre_sel" ' . $moreattrib . '>';

+            $out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib.'>';

         } else {

-            $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre" ' . $moreattrib . '>';

+            $out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib.'>';

         }

 

         if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field

@@ -3888,7 +3888,7 @@ 
             $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

             $options = preg_replace('/&+/i', '&', $options);

             if (!preg_match('/^&/', $options)) {

-                $options = '&' . $options;

+                $options = '&'.$options;

             }

 

             $sortordertouseinlink = '';

@@ -3906,7 +3906,7 @@ 
                 }

             }

             $sortordertouseinlink = preg_replace('/,$/', '', $sortordertouseinlink);

-            $out .= '<a class="reposition" href="' . $file . '?sortfield=' . $field . '&sortorder=' . $sortordertouseinlink . '&begin=' . $begin . $options . '">';

+            $out .= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder='.$sortordertouseinlink.'&begin='.$begin.$options.'">';

         }

 

         if ($tooltip) {

@@ -3924,7 +3924,7 @@ 
             $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

             $options = preg_replace('/&+/i', '&', $options);

             if (!preg_match('/^&/', $options)) {

-                $options = '&' . $options;

+                $options = '&'.$options;

             }

 

             if (!$sortorder || $field1 != $sortfield1) {

@@ -3934,19 +3934,19 @@ 
                 if (preg_match('/^DESC/', $sortorder)) {

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';

-                    $sortimg .= '<span class="nowrap">' . img_up("Z-A", 0) . '</span>';

+                    $sortimg .= '<span class="nowrap">'.img_up("Z-A", 0).'</span>';

                 }

                 if (preg_match('/^ASC/', $sortorder)) {

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';

-                    $sortimg .= '<span class="nowrap">' . img_down("A-Z", 0) . '</span>';

+                    $sortimg .= '<span class="nowrap">'.img_down("A-Z", 0).'</span>';

                 }

             }

         }

 

         $out .= $sortimg;

 

-        $out .= '</' . $tag . '>';

+        $out .= '</'.$tag.'>';

 

         return $out;

     }

@@ -3961,9 +3961,9 @@ 
      */

     static function print_titre($title)

     {

-        dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

-        print '<div class="titre">' . $title . '</div>';

+        print '<div class="titre">'.$title.'</div>';

     }

 

     /**

@@ -4006,20 +4006,20 @@ 
         }

 

         $return .= "\n";

-        $return .= '<table ' . ($id ? 'id="' . $id . '" ' : '') . 'summary="" class="centpercent notopnoleftnoright' . ($morecssontable ? ' ' . $morecssontable : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

+        $return .= '<table '.($id ? 'id="'.$id.'" ' : '').'summary="" class="centpercent notopnoleftnoright'.($morecssontable ? ' '.$morecssontable : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

         if ($picto) {

-            $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">' . img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath) . '</td>';

+            $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';

         }

         $return .= '<td class="nobordernopadding valignmiddle">';

-        $return .= '<div class="titre inline-block">' . $titre . '</div>';

+        $return .= '<div class="titre inline-block">'.$titre.'</div>';

         $return .= '</td>';

         if (dol_strlen($morehtmlcenter)) {

-            $return .= '<td class="nobordernopadding" align="center" valign="middle">' . $morehtmlcenter . '</td>';

+            $return .= '<td class="nobordernopadding" align="center" valign="middle">'.$morehtmlcenter.'</td>';

         }

         if (dol_strlen($morehtmlright)) {

-            $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">' . $morehtmlright . '</td>';

+            $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">'.$morehtmlright.'</td>';

         }

-        $return .= '</tr></table>' . "\n";

+        $return .= '</tr></table>'."\n";

 

         return $return;

     }

@@ -4067,29 +4067,29 @@ 
 //print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;

 

         print "\n";

-        print "<!-- Begin title '" . $titre . "' -->\n";

-        print '<table border="0" class="centpercent notopnoleftnoright' . ($morecss ? ' ' . $morecss : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

+        print "<!-- Begin title '".$titre."' -->\n";

+        print '<table border="0" class="centpercent notopnoleftnoright'.($morecss ? ' '.$morecss : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

 // Left

 //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';

         print '<td class="nobordernopadding valignmiddle">';

         if ($picto && $titre)

             print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

-        print '<div class="titre inline-block">' . $titre;

+        print '<div class="titre inline-block">'.$titre;

         if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-            print ' (' . $totalnboflines . ')';

+            print ' ('.$totalnboflines.')';

         print '</div></td>';

 

 // Center

         if ($morehtmlcenter) {

-            print '<td class="nobordernopadding center valignmiddle">' . $morehtmlcenter . '</td>';

+            print '<td class="nobordernopadding center valignmiddle">'.$morehtmlcenter.'</td>';

         }

 

 // Right

         print '<td class="nobordernopadding valignmiddle" align="right">';

         if ($sortfield)

-            $options .= "&sortfield=" . urlencode($sortfield);

+            $options .= "&sortfield=".urlencode($sortfield);

         if ($sortorder)

-            $options .= "&sortorder=" . urlencode($sortorder);

+            $options .= "&sortorder=".urlencode($sortorder);

 // Show navigation bar

         $pagelist = '';

         if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

@@ -4107,40 +4107,40 @@ 
                 }

 

                 if ($cpt >= 1) {

-                    $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

+                    $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=0'.$options.'">1</a></li>';

                     if ($cpt > 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '').'>...</span></li>';

                     else if ($cpt == 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';

                 }

 

                 do {

                     if ($cpt == $page) {

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . '</span></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1).'</span></li>';

                     } else {

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . $cpt . $options . '">' . ($cpt + 1) . '</a></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';

                     }

                     $cpt++;

                 } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

                 if ($cpt < $nbpages) {

                     if ($cpt < $nbpages - 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '').'>...</span></li>';

                     else if ($cpt == $nbpages - 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';

-                    $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';

+                    $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';

                 }

             }

             else {

-                $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

+                $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1)."</li>";

             }

         }

 

-        print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit);  // output the div and ul for previous/last completed with page numbers into $pagelist

+        print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit); // output the div and ul for previous/last completed with page numbers into $pagelist

 

         print '</td>';

 

-        print '</tr></table>' . "\n";

+        print '</tr></table>'."\n";

         print "<!-- End title -->\n\n";

     }

 

@@ -4171,12 +4171,12 @@ 
                 $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;

 

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

-            print '<select class="flat selectlimit" name="limit" title="' . dol_escape_htmltag(Globals::$langs->trans("MaxNbOfRecordPerPage")) . '">';

+            print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag(Globals::$langs->trans("MaxNbOfRecordPerPage")).'">';

             $tmpchoice = explode(',', $pagesizechoices);

-            $tmpkey = $limit . ':' . $limit;

+            $tmpkey = $limit.':'.$limit;

             if (!in_array($tmpkey, $tmpchoice))

                 $tmpchoice[] = $tmpkey;

-            $tmpkey = Globals::$conf->liste_limit . ':' . Globals::$conf->liste_limit;

+            $tmpkey = Globals::$conf->liste_limit.':'.Globals::$conf->liste_limit;

             if (!in_array($tmpkey, $tmpchoice))

                 $tmpchoice[] = $tmpkey;

             asort($tmpchoice, SORT_NUMERIC);

@@ -4191,7 +4191,7 @@ 
                         $selected = ' selected="selected"';

                         $found = true;

                     }

-                    print '<option name="' . $key . '"' . $selected . '>' . dol_escape_htmltag($val) . '</option>' . "\n";

+                    print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";

                 }

             }

             print '</select>';

@@ -4210,20 +4210,20 @@ 
             print '</li>';

         }

         if ($page > 0) {

-            print '<li class="pagination"><a class="paginationprevious" href="' . $file . '?page=' . ($page - 1) . $options . '"><i class="fa fa-chevron-left" title="' . dol_escape_htmltag(Globals::$langs->trans("Previous")) . '"></i></a></li>';

+            print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag(Globals::$langs->trans("Previous")).'"></i></a></li>';

         }

         if ($betweenarrows) {

             print $betweenarrows;

         }

         if ($nextpage > 0) {

-            print '<li class="pagination"><a class="paginationnext" href="' . $file . '?page=' . ($page + 1) . $options . '"><i class="fa fa-chevron-right" title="' . dol_escape_htmltag(Globals::$langs->trans("Next")) . '"></i></a></li>';

+            print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag(Globals::$langs->trans("Next")).'"></i></a></li>';

         }

         if ($afterarrows) {

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

             print $afterarrows;

             print '</li>';

         }

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

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

     }

 

     /**

@@ -4245,8 +4245,8 @@ 
             $addpercent = true;

         }

         if (preg_match('/\((.*)\)/', $rate, $reg)) {

-            $morelabel = ' (' . $reg[1] . ')';

-            $rate = preg_replace('/\s*' . preg_quote($morelabel, '/') . '/', '', $rate);

+            $morelabel = ' ('.$reg[1].')';

+            $rate = preg_replace('/\s*'.preg_quote($morelabel, '/').'/', '', $rate);

         }

         if (preg_match('/\*/', $rate)) {

             $rate = str_replace('*', '', $rate);

@@ -4255,10 +4255,10 @@ 
 

 // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()

         if (!preg_match('/\//', $rate))

-            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');

+            $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');

         else {

 // TODO Split on / and output with a price2num to have clean numbers without ton of 000.

-            $ret = $rate . ($addpercent ? '%' : '');

+            $ret = $rate.($addpercent ? '%' : '');

         }

         if (($info_bits & 1) && $usestarfornpr >= 0)

             $ret .= ' *';

@@ -4351,10 +4351,10 @@ 
                 $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

             else {

                 $tmpcur = $outlangs->getCurrencySymbol($currency_code);

-                $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

+                $cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);

             }

         }

-        $output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' ' : '') . $cursymbolafter;

+        $output = $cursymbolbefore.$output.$end.($cursymbolafter ? ' ' : '').$cursymbolafter;

 

         return $output;

     }

@@ -4407,7 +4407,7 @@ 
 // Now make replace (the main goal of function)

             if ($thousand != ',' && $thousand != '.')

                 $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-            $amount = str_replace(' ', '', $amount);  // To avoid spaces

+            $amount = str_replace(' ', '', $amount); // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

         }

@@ -4436,14 +4436,14 @@ 
                 $temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000

                 $temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1

                 $nbofdec = max(0, dol_strlen($temps) - 2); // -2 to remove "0."

-                $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand);  // Convert amount to format with dolibarr dec and thousand

+                $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand); // Convert amount to format with dolibarr dec and thousand

             }

 //print "TT".$amount.'<br>';

 // Always make replace because each math static function (like round) replace

 // with local values and we want a number that has a SQL string format x.y

             if ($thousand != ',' && $thousand != '.')

                 $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-            $amount = str_replace(' ', '', $amount);  // To avoid spaces

+            $amount = str_replace(' ', '', $amount); // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

         }

@@ -4464,7 +4464,7 @@ 
      */

     static function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no')

     {

-        require_once DOL_BASE_PATH . '/core/lib/product.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/product.lib.php';

 

         if (($forceunitoutput == 'no' && $dimension < 1 / 10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) {

             $dimension = $dimension * 1000000;

@@ -4480,7 +4480,7 @@ 
             $unit = $unit + 3;

         }

 

-        $ret = price($dimension, 0, $outputlangs, 0, 0, $round) . ' ' . measuring_units_string($unit, $type);

+        $ret = price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);

 

         return $ret;

     }

@@ -4504,7 +4504,7 @@ 
         if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

             $thirdparty_seller = $mysoc;

 

-        dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

+        dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '')."/country_code=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);

 

         $vatratecleaned = $vatrate;

         if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4535,7 +4535,7 @@ 
             if ($local == 2) {

 //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

                 if (!$mysoc->localtax2_assuj)

-                    return 0;  // If main vat is 0, IRPF may be different than 0.

+                    return 0; // If main vat is 0, IRPF may be different than 0.

                 if ($thirdparty_seller->id == $mysoc->id) {

                     if (!$thirdparty_buyer->localtax2_assuj)

                         return 0;

@@ -4589,13 +4589,13 @@ 
 

 // By default, search value of local tax on line of common tax

         $sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

-        $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";

+        $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

         if ($vatratecode)

-            $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

+            $sql .= " AND t.code ='".$vatratecode."'"; // If we have the code, we use it in priority

         else

-            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+            $sql .= " AND t.recuperableonly ='".$vatnpr."'";

         dol_syslog("get_localtax", LOG_DEBUG);

         $resql = $db->query($sql);

 

@@ -4641,10 +4641,10 @@ 
     {

        // global $db, $mysoc;

         $sql = "SELECT t.localtax1, t.localtax2 ";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=t.fk_pays";

-        $sql .= " WHERE c.code = '" . $mysoc->country_code . "' AND t.active = 1 AND t.taux=(";

-        $sql .= "  SELECT max(tt.taux) FROM " . MAIN_DB_PREFIX . "c_tva as tt inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=tt.fk_pays";

-        $sql .= "  WHERE c.code = '" . $mysoc->country_code . "' AND tt.active = 1";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";

+        $sql .= " WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=(";

+        $sql .= "  SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";

+        $sql .= "  WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1";

         $sql .= "  )";

 

         $resql = $db->query($sql);

@@ -4674,13 +4674,13 @@ 
     {

        // global $db, $mysoc;

 

-        dol_syslog("getTaxesFromId vat id or rate = " . $vatrate);

+        dol_syslog("getTaxesFromId vat id or rate = ".$vatrate);

 

 // Search local taxes

         $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

         if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

+            $sql .= " WHERE t.rowid = ".(int) $vatrate;

         else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

@@ -4689,13 +4689,13 @@ 
                 $vatratecode = $reg[2];

             }

 

-            $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+            $sql .= ", ".MAIN_DB_PREFIX."c_country as c";

             /* if ($mysoc->country_code == 'ES') $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // vat in spain use the buyer country ??

               else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-            $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

+            $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

             if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+                $sql .= " AND t.code = '".$vatratecode."'";

         }

 

         $resql = $db->query($sql);

@@ -4731,13 +4731,13 @@ 
     {

        // global $db, $mysoc;

 

-        dol_syslog("getLocalTaxesFromRate vatrate=" . $vatrate . " local=" . $local);

+        dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local);

 

 // Search local taxes

         $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

         if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

+            $sql .= " WHERE t.rowid = ".(int) $vatrate;

         else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

@@ -4746,14 +4746,14 @@ 
                 $vatratecode = $reg[2];

             }

 

-            $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+            $sql .= ", ".MAIN_DB_PREFIX."c_country as c";

             if ($mysoc->country_code == 'ES')

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

+                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; // local tax in spain use the buyer country ??

             else

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-            $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

+            $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

             if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+                $sql .= " AND t.code = '".$vatratecode."'";

         }

 

         $resql = $db->query($sql);

@@ -4785,7 +4785,7 @@ 
     {

        // global $db, Globals::$conf, $mysoc;

 

-        require_once DOL_BASE_PATH . '/product/class/product.class.php';

+        require_once DOL_BASE_PATH.'/product/class/product.class.php';

 

         $ret = 0;

         $found = 0;

@@ -4800,12 +4800,12 @@ 
                     $product->get_buyprice($idprodfournprice, 0, 0, 0);

                     $ret = $product->vatrate_supplier;

                     if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                        $ret .= ' ('.$product->default_vat_code.')';

                 }

                 else {

-                    $ret = $product->tva_tx;    // Default vat of product we defined

+                    $ret = $product->tva_tx; // Default vat of product we defined

                     if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                        $ret .= ' ('.$product->default_vat_code.')';

                 }

                 $found = 1;

             }

@@ -4819,8 +4819,8 @@ 
             if (empty(Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {

 // If vat of product for the country not found or not defined, we return the first higher vat of country.

                 $sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";

-                $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-                $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='" . $thirdparty_seller->country_code . "'";

+                $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+                $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

                 $sql .= " ORDER BY t.taux DESC, t.code ASC, t.recuperableonly ASC";

                 $sql .= $db->plimit(1);

 

@@ -4830,16 +4830,16 @@ 
                     if ($obj) {

                         $ret = $obj->vat_rate;

                         if ($obj->default_vat_code)

-                            $ret .= ' (' . $obj->default_vat_code . ')';

+                            $ret .= ' ('.$obj->default_vat_code.')';

                     }

                     $db->free($sql);

                 } else

                     dol_print_error($db);

             } else

-                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails

         }

 

-        dol_syslog("get_product_vat_for_country: ret=" . $ret);

+        dol_syslog("get_product_vat_for_country: ret=".$ret);

         return $ret;

     }

 

@@ -4857,7 +4857,7 @@ 
        // global $db, $mysoc;

 

         if (!class_exists('Product')) {

-            require_once DOL_BASE_PATH . 'product/class/product.class.php';

+            require_once DOL_BASE_PATH.'product/class/product.class.php';

         }

 

         $ret = 0;

@@ -4882,8 +4882,8 @@ 
         if (!$found) {

 // If vat of product for the country not found or not defined, we return higher vat of country.

             $sql = "SELECT taux as vat_rate, localtax1, localtax2";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-            $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='" . $thirdparty_seller->country_code . "'";

+            $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+            $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

             $sql .= " ORDER BY t.taux DESC, t.recuperableonly ASC";

             $sql .= $db->plimit(1);

 

@@ -4900,7 +4900,7 @@ 
                 dol_print_error($db);

         }

 

-        dol_syslog("get_product_localtax_for_country: ret=" . $ret);

+        dol_syslog("get_product_localtax_for_country: ret=".$ret);

         return $ret;

     }

 

@@ -4924,7 +4924,7 @@ 
     {

        // global Globals::$conf;

 

-        require_once DOL_BASE_PATH . '/core/lib/company.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/company.lib.php';

 

 // Note: possible values for tva_assuj are 0/1 or franchise/reel

         $seller_use_vat = ((is_numeric($thirdparty_seller->tva_assuj) && !$thirdparty_seller->tva_assuj) || (!is_numeric($thirdparty_seller->tva_assuj) && $thirdparty_seller->tva_assuj == 'franchise')) ? 0 : 1;

@@ -4935,7 +4935,7 @@ 
         $buyer_country_code = $thirdparty_buyer->country_code;

         $buyer_in_cee = isInEEC($thirdparty_buyer);

 

-        dol_syslog("get_default_tva: seller use vat=" . $seller_use_vat . ", seller country=" . $seller_country_code . ", seller in cee=" . $seller_in_cee . ", buyer vat number=" . $thirdparty_buyer->tva_intra . " buyer country=" . $buyer_country_code . ", buyer in cee=" . $buyer_in_cee . ", idprod=" . $idprod . ", idprodfournprice=" . $idprodfournprice . ", SERVICE_ARE_ECOMMERCE_200238EC=" . (!empty(Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

+        dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(!empty(Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

 

 // If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)

 // we use the buyer VAT.

@@ -5001,14 +5001,14 @@ 
 

         if ($idprodfournprice > 0) {

             if (!class_exists('ProductFournisseur'))

-                require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+                require_once DOL_BASE_PATH.'/fourn/class/fournisseur.product.class.php';

             $prodprice = new ProductFournisseur($db);

             $prodprice->fetch_product_fournisseur_price($idprodfournprice);

             return $prodprice->fourn_tva_npr;

         }

         elseif ($idprod > 0) {

             if (!class_exists('Product'))

-                require_once DOL_BASE_PATH . 'product/class/product.class.php';

+                require_once DOL_BASE_PATH.'product/class/product.class.php';

             $prod = new Product($db);

             $prod->fetch($idprod);

             return $prod->tva_npr;

@@ -5087,7 +5087,7 @@ 
             if ($case == 2)

                 $result = '<input type="checkbox" value="1" checked disabled>';

             if ($case == 3)

-                $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+                $result = '<input type="checkbox" value="1" checked disabled> '.$result;

 

             $classname = 'ok';

         }

@@ -5098,7 +5098,7 @@ 
             if ($case == 2)

                 $result = '<input type="checkbox" value="0" disabled>';

             if ($case == 3)

-                $result = '<input type="checkbox" value="0" disabled> ' . $result;

+                $result = '<input type="checkbox" value="0" disabled> '.$result;

 

             if ($color == 2)

                 $classname = 'ok';

@@ -5106,7 +5106,7 @@ 
                 $classname = 'error';

         }

         if ($color)

-            return '<font class="' . $classname . '">' . $result . '</font>';

+            return '<font class="'.$classname.'">'.$result.'</font>';

         return $result;

     }

 

@@ -5140,13 +5140,13 @@ 
                 $num = preg_replace('/([^0-9])/i', '', $num);

             else

                 $num = preg_replace('/^.*\-/i', '', $num);

-            $num = substr("000" . $num, -$level);

+            $num = substr("000".$num, -$level);

             if ($level == 1)

                 $path = substr($num, 0, 1);

             if ($level == 2)

-                $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

+                $path = substr($num, 1, 1).'/'.substr($num, 0, 1);

             if ($level == 3)

-                $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

+                $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);

         }

         else {

 // TODO

@@ -5177,7 +5177,7 @@ 
     {

        // global Globals::$conf;

 

-        dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

+        dol_syslog("functions.lib::dol_mkdir: dir=".$dir, LOG_INFO);

 

         $dir_osencoded = dol_osencode($dir);

         if (@is_dir($dir_osencoded))

@@ -5189,15 +5189,15 @@ 
         $ccdir = '';

         if (!empty($dataroot)) {

 // Remove data root from loop

-            $dir = str_replace($dataroot . '/', '', $dir);

-            $ccdir = $dataroot . '/';

+            $dir = str_replace($dataroot.'/', '', $dir);

+            $ccdir = $dataroot.'/';

         }

 

         $cdir = explode("/", $dir);

         $num = count($cdir);

         for ($i = 0; $i < $num; $i++) {

             if ($i > 0)

-                $ccdir .= '/' . $cdir[$i];

+                $ccdir .= '/'.$cdir[$i];

             else

                 $ccdir .= $cdir[$i];

             if (preg_match("/^.:$/", $ccdir, $regs))

@@ -5241,20 +5241,20 @@ 
             if ($ccdir) {

                 $ccdir_osencoded = dol_osencode($ccdir);

                 if (!@is_dir($ccdir_osencoded)) {

-                    dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

+                    dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

 

                     umask(0);

                     $dirmaskdec = octdec($newmask);

                     if (empty($newmask)) {

                         $dirmaskdec = empty(Globals::$conf->global->MAIN_UMASK) ? octdec('0755') : octdec(Globals::$conf->global->MAIN_UMASK);

                     }

-                    $dirmaskdec |= octdec('0111');  // Set x bit required for directories

+                    $dirmaskdec |= octdec('0111'); // Set x bit required for directories

                     if (!@mkdir($ccdir_osencoded, $dirmaskdec)) {

                         // Si le is_dir a renvoye une fausse info, alors on passe ici.

-                        dol_syslog("functions.lib::dol_mkdir: Fails to create directory '" . $ccdir . "' or directory already exists.", LOG_WARNING);

+                        dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);

                         $nberr++;

                     } else {

-                        dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' created", LOG_DEBUG);

+                        dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created", LOG_DEBUG);

                         $nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore

                         $nbcreated++;

                     }

@@ -5302,9 +5302,9 @@ 
         } else {

             $pattern = "/<[^<>]+>/";

 // Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>

-            $temp = preg_replace($pattern, "", $temp);    // pass 1

+            $temp = preg_replace($pattern, "", $temp); // pass 1

 // $temp after pass 1: <a href="/myurl" title="A title">0000-021

-            $temp = preg_replace($pattern, "", $temp);    // pass 2

+            $temp = preg_replace($pattern, "", $temp); // pass 2

 // $temp after pass 2: 0000-021

         }

 

@@ -5360,8 +5360,8 @@ 
     {

         $temp = $stringtoclean;

         foreach ($disallowed_tags as $tagtoremove) {

-            $temp = preg_replace('/<\/?' . $tagtoremove . '>/', '', $temp);

-            $temp = preg_replace('/<\/?' . $tagtoremove . '\s+[^>]*>/', '', $temp);

+            $temp = preg_replace('/<\/?'.$tagtoremove.'>/', '', $temp);

+            $temp = preg_replace('/<\/?'.$tagtoremove.'\s+[^>]*>/', '', $temp);

         }

         return $temp;

     }

@@ -5378,12 +5378,12 @@ 
     {

         if ($nboflines == 1) {

             if (dol_textishtml($text)) {

-                $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text);  // The s pattern modifier means the . can match newline characters

+                $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters

                 $firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters

             } else {

                 $firstline = preg_replace('/[\n\r].*/', '', $text);

             }

-            return $firstline . ((strlen($firstline) != strlen($text)) ? '...' : '');

+            return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');

         } else {

             $ishtml = 0;

             if (dol_textishtml($text)) {

@@ -5399,7 +5399,7 @@ 
                 $pattern = '/(<br[^>]*>)/Uu';

             } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

             else

-                $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+                $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

             $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

             $firstline = '';

@@ -5413,7 +5413,7 @@ 
                 $i++;

             }

             unset($a);

-            return $firstline . (($i < $nba) ? '...' : '');

+            return $firstline.(($i < $nba) ? '...' : '');

         }

     }

 

@@ -5484,9 +5484,9 @@ 
     static function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')

     {

         $ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT, $pagecodeto);

-        $ret = preg_replace('/' . "\r\n" . '<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

-        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\r\n" . '/i', "\r\n", $ret);

-        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\n" . '/i', "\n", $ret);

+        $ret = preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

+        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i', "\r\n", $ret);

+        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i', "\n", $ret);

         $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', "\n", $ret);

         return $ret;

     }

@@ -5499,7 +5499,7 @@ 
      */

     static function dol_htmlcleanlastbr($stringtodecode)

     {

-        $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|' . "\n" . '|' . "\r" . ')+$/i', "", $stringtodecode);

+        $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $stringtodecode);

         return $ret;

     }

 

@@ -5596,7 +5596,7 @@ 
             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

         else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+            $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $nblines = (int) floor((count($a) + 1) / 2);

@@ -5627,7 +5627,7 @@ 
      */

     static function dol_microtime_float()

     {

-        dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

         return microtime(true);

     }

@@ -5673,9 +5673,9 @@ 
             elseif (preg_match('/<h[0-9]>/i', $msg))

                 return true;

             elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-                return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+                return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

             elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-                return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+                return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

             return false;

         }

@@ -5900,7 +5900,7 @@ 
                     if ($object->fetch_optionals() > 0) {

                         if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {

                             foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {

-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];

+                                $substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];

                             }

                         }

                     }

@@ -5912,7 +5912,7 @@ 
                     $paymenturl = '';

                 } else {

                     // Set the online payment url link into __ONLINE_PAYMENT_URL__ key

-                    require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

+                    require_once DOL_BASE_PATH.'/core/lib/payments.lib.php';

                     $outputlangs->loadLangs(array('paypal', 'other'));

                     $typeforonlinepayment = 'free';

                     if (is_object($object) && $object->element == 'commande')

@@ -5973,7 +5973,7 @@ 
 

 //var_dump($substitutionarray['__AMOUNT_FORMATED__']);

         if (empty($exclude) || !in_array('date', $exclude)) {

-            include_once DOL_BASE_PATH . '/core/lib/date.lib.php';

+            include_once DOL_BASE_PATH.'/core/lib/date.lib.php';

 

             $tmp = dol_getdate(dol_now(), true);

             $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);

@@ -5983,13 +5983,13 @@ 
 

             $substitutionarray = array_merge($substitutionarray, array(

                 '__DAY__' => (string) $tmp['mday'],

-                '__DAY_TEXT__' => $outputlangs->trans('Day' . $tmp['wday']), // Monday

-                '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'] . 'Min'), // Mon

-                '__DAY_TEXT_MIN__' => $outputlangs->trans('Short' . $tmp['weekday']), // M

+                '__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday

+                '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon

+                '__DAY_TEXT_MIN__' => $outputlangs->trans('Short'.$tmp['weekday']), // M

                 '__MONTH__' => (string) $tmp['mon'],

-                '__MONTH_TEXT__' => $outputlangs->trans('Month' . sprintf("%02d", $tmp['mon'])),

-                '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort' . sprintf("%02d", $tmp['mon'])),

-                '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort' . sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT__' => $outputlangs->trans('Month'.sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort'.sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort'.sprintf("%02d", $tmp['mon'])),

                 '__YEAR__' => (string) $tmp['year'],

                 '__PREVIOUS_DAY__' => (string) $tmp2['day'],

                 '__PREVIOUS_MONTH__' => (string) $tmp3['month'],

@@ -6048,7 +6048,7 @@ 
                 if (!empty($tmp[1]))

                     $outputlangs->load($tmp[1]);

 

-                $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

+                $text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

             }

         }

 

@@ -6064,13 +6064,13 @@ 
                 $newval = '*****forbidden*****';

             else

                 $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;

-            $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

+            $text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

         }

 

 // Make substitition for array $substitutionarray

         foreach ($substitutionarray as $key => $value) {

             if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = '';  // Protection

+                $value = ''; // Protection

             if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

                 $value = ''; // Protection

 

@@ -6096,7 +6096,7 @@ 
     {

        // global Globals::$conf, $user;

 

-        require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

 // Add a substitution key for each extrafields, using key __EXTRA_XXX__

 // TODO Remove this. Already available into the getCommonSubstitutionArray used to build the substitution array.

@@ -6126,11 +6126,11 @@ 
                 if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg)) {

                     $module = $reg[1];

 

-                    dol_syslog("Library " . $substitfile['name'] . " found into " . $dir);

+                    dol_syslog("Library ".$substitfile['name']." found into ".$dir);

                     // Include the user's functions file

-                    require_once $dir . $substitfile['name'];

+                    require_once $dir.$substitfile['name'];

                     // Call the user's function, and only if it is defined

-                    $function_name = $module . "_" . $callfunc;

+                    $function_name = $module."_".$callfunc;

                     if (function_exists($function_name))

                         $function_name($substitutionarray, $outputlangs, $object, $parameters);

                 }

@@ -6172,13 +6172,13 @@ 
             $outputlangs = Globals::$langs;

 

         if ($date_start && $date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

         if ($date_start && !$date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($date_start, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($date_start, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

         if (!$date_start && $date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

 

         return $out;

@@ -6258,7 +6258,7 @@ 
             dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

         } else {

             if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-                dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

+                dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');

             if (empty($mesgs))

                 setEventMessage($mesg, $style);

             else {

@@ -6327,7 +6327,7 @@ 
 

 // If inline message with no format, we add it.

         if ((empty(Globals::$conf->use_javascript_ajax) || !empty(Globals::$conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out)) {

-            $divstart = '<div class="' . $style . ' clearboth">';

+            $divstart = '<div class="'.$style.' clearboth">';

             $divend = '</div>';

         }

 

@@ -6354,14 +6354,14 @@ 
             if (!empty(Globals::$conf->use_javascript_ajax) && empty(Globals::$conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded)) {

                 $return = '<script type="text/javascript">

 					$(document).ready(function() {

-						var block = ' . (!empty(Globals::$conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false") . '

+						var block = ' . (!empty(Globals::$conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false").'

 						if (block) {

-							$.dolEventValid("","' . dol_escape_js($out) . '");

+							$.dolEventValid("","' . dol_escape_js($out).'");

 						} else {

 							/* jnotify(message, preset of message type, keepmessage) */

-							$.jnotify("' . dol_escape_js($out) . '",

-							"' . ($style == "ok" ? 3000 : $style) . '",

-							' . ($style == "ok" ? "false" : "true") . ',

+							$.jnotify("' . dol_escape_js($out).'",

+							"' . ($style == "ok" ? 3000 : $style).'",

+							' . ($style == "ok" ? "false" : "true").',

 							{ remove: static function (){} } );

 						}

 					});

@@ -6556,11 +6556,11 @@ 
     {

        // global Globals::$conf;

 

-        $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

+        $tmp = ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0

         if (empty($tmp) && !empty($_SERVER["WINDIR"]))

             $tmp = 'iso-8859-1'; // By default for windows

         if (empty($tmp))

-            $tmp = 'utf-8';          // By default for other

+            $tmp = 'utf-8'; // By default for other

         if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING))

             $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;

 

@@ -6591,16 +6591,16 @@ 
 

 // Check in cache

         if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

-            return $cache_codes[$tablename][$key][$fieldid];   // Found in cache

+            return $cache_codes[$tablename][$key][$fieldid]; // Found in cache

         }

 

         dol_syslog('dol_getIdFromCode (value not found into cache)', LOG_DEBUG);

 

-        $sql = "SELECT " . $fieldid . " as valuetoget";

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

-        $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

+        $sql = "SELECT ".$fieldid." as valuetoget";

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

+        $sql .= " WHERE ".$fieldkey." = '".$db->escape($key)."'";

         if (!empty($entityfilter))

-            $sql .= " AND entity IN (" . getEntity($tablename) . ")";

+            $sql .= " AND entity IN (".getEntity($tablename).")";

 

         $resql = $db->query($sql);

         if ($resql) {

@@ -6631,8 +6631,8 @@ 
 //print $strRights."<br>\n";

         $rights = true;

         if ($strRights != '') {

-            $str = 'if(!(' . $strRights . ')) { $rights = false; }';

-            self::dol_eval($str);  // The dol_eval must contains all the// global $xxx used into a condition

+            $str = 'if(!('.$strRights.')) { $rights = false; }';

+            self::dol_eval($str); // The dol_eval must contains all the// global $xxx used into a condition

         }

         return $rights;

     }

@@ -6659,9 +6659,9 @@ 
 //print $s."<br>\n";

         if ($returnvalue) {

             if ($hideerrors)

-                return @eval('return ' . $s . ';');

+                return @eval('return '.$s.';');

             else

-                return eval('return ' . $s . ';');

+                return eval('return '.$s.';');

         }

         else {

             if ($hideerrors)

@@ -6715,7 +6715,7 @@ 
             $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

         }

 

-        return img_picto_common($codelang, 'flags/' . strtolower($flagImage) . '.png', $moreatt);

+        return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt);

     }

 

     /**

@@ -6913,16 +6913,16 @@ 
             'zu-ZA',

         );

 

-        $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

+        $buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);

         if (in_array($buildprimarykeytotest, $locales))

-            return strtolower($countrycode) . '_' . strtoupper($countrycode);

+            return strtolower($countrycode).'_'.strtoupper($countrycode);

 

         foreach ($locales as $locale) {

             $locale_language = locale_get_primary_language($locale);

             $locale_region = locale_get_region($locale);

             if (strtoupper($countrycode) == $locale_region) {

 //var_dump($locale.'-'.$locale_language.'-'.$locale_region);

-                return strtolower($locale_language) . '_' . strtoupper($locale_region);

+                return strtolower($locale_language).'_'.strtoupper($locale_region);

             }

         }

 

@@ -6983,7 +6983,7 @@ 
                                 $label = Globals::$langs->trans($values[2]);

 

                             //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

-                            $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

+                            $head[$h][0] = BASE_URI.preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

                             $head[$h][1] = $label;

                             $head[$h][2] = str_replace('+', '', $values[1]);

                             $h++;

@@ -7054,43 +7054,43 @@ 
         // global $micro_start_time;

 

         if ($zone == 'private')

-            print "\n" . '<!-- Common footer for private page -->' . "\n";

+            print "\n".'<!-- Common footer for private page -->'."\n";

         else

-            print "\n" . '<!-- Common footer for public page -->' . "\n";

+            print "\n".'<!-- Common footer for public page -->'."\n";

 

 // A div to store page_y POST parameter so we can read it using javascript

         print "\n<!-- A div to store page_y POST paramater -->\n";

-        print '<div id="page_y" style="display: none;">' . $_POST['page_y'] . '</div>' . "\n";

+        print '<div id="page_y" style="display: none;">'.$_POST['page_y'].'</div>'."\n";

 

         $parameters = array();

-        $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks

+        $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks

         if (empty($reshook)) {

             if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER))

-                print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";

+                print Globals::$conf->global->MAIN_HTML_FOOTER."\n";

 

             print "\n";

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

-                print '<script type="text/javascript" language="javascript">' . "\n";

-                print 'jQuery(document).ready(function() {' . "\n";

+                print '<script type="text/javascript" language="javascript">'."\n";

+                print 'jQuery(document).ready(function() {'."\n";

 

                 if ($zone == 'private' && empty(Globals::$conf->dol_use_jmobile)) {

                     print "\n";

-                    print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */' . "\n";

+                    print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */'."\n";

                     print 'jQuery(".menuhider").click(function() {';

-                    print '  console.log("We click on .menuhider");' . "\n";

+                    print '  console.log("We click on .menuhider");'."\n";

                     //print "  $('.side-nav').animate({width:'toggle'},200);\n";     // OK with eldy theme but not with md

                     print "  $('.side-nav').toggle()\n";

                     print "  $('.login_block').toggle()\n";

-                    print '});' . "\n";

+                    print '});'."\n";

                 }

 

 // Management of focus and mandatory for fields

                 if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"])))) {

-                    print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

+                    print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */'."\n";

                     $relativepathstring = $_SERVER["PHP_SELF"];

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

                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7113,9 +7113,9 @@ 
                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

                                     // Set focus on field

-                                    print 'jQuery("input[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                    print 'jQuery("textarea[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                    print 'jQuery("select[name=\'' . $paramkey . '\']").focus();' . "\n";  // Not really usefull, but we keep it in case of.

+                                    print 'jQuery("input[name=\''.$paramkey.'\']").focus();'."\n";

+                                    print 'jQuery("textarea[name=\''.$paramkey.'\']").focus();'."\n";

+                                    print 'jQuery("select[name=\''.$paramkey.'\']").focus();'."\n"; // Not really usefull, but we keep it in case of.

                                 }

                             }

                         }

@@ -7139,16 +7139,16 @@ 
                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

                                     // Add property 'required' on input

-                                    print 'jQuery("input[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                    print 'jQuery("textarea[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                    print 'jQuery("select[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";  // required on a select works only if key is "", this does not happen in Dolibarr

+                                    print 'jQuery("input[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                    print 'jQuery("textarea[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                    print 'jQuery("select[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n"; // required on a select works only if key is "", this does not happen in Dolibarr

                                 }

                             }

                         }

                     }

                 }

 

-                print '});' . "\n";

+                print '});'."\n";

 

 // Google Analytics

 // TODO Add a hook here

@@ -7156,15 +7156,15 @@ 
                     if ((Globals::$conf->dol_use_jmobile != 4)) {

                         print "\n";

                         print "/* JS CODE TO ENABLE for google analtics tag */\n";

-                        print '  var _gaq = _gaq || [];' . "\n";

-                        print '  _gaq.push([\'_setAccount\', \'' . Globals::$conf->global->MAIN_GOOGLE_AN_ID . '\']);' . "\n";

-                        print '  _gaq.push([\'_trackPageview\']);' . "\n";

-                        print '' . "\n";

-                        print '  (function() {' . "\n";

-                        print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;' . "\n";

-                        print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';' . "\n";

-                        print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);' . "\n";

-                        print '  })();' . "\n";

+                        print '  var _gaq = _gaq || [];'."\n";

+                        print '  _gaq.push([\'_setAccount\', \''.Globals::$conf->global->MAIN_GOOGLE_AN_ID.'\']);'."\n";

+                        print '  _gaq.push([\'_trackPageview\']);'."\n";

+                        print ''."\n";

+                        print '  (function() {'."\n";

+                        print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;'."\n";

+                        print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';'."\n";

+                        print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);'."\n";

+                        print '  })();'."\n";

                     }

                 }

 

@@ -7174,27 +7174,27 @@ 
                     print "/* JS CODE TO ENABLE to add memory info */\n";

                     print 'window.console && console.log("';

                     if (!empty(Globals::$conf->global->MEMCACHED_SERVER))

-                        print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';

-                    print 'MAIN_OPTIMIZE_SPEED=' . (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

+                        print 'MEMCACHED_SERVER='.Globals::$conf->global->MEMCACHED_SERVER.' - ';

+                    print 'MAIN_OPTIMIZE_SPEED='.(isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                     if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in// global variable.

                         $micro_end_time = microtime(true);

-                        print ' - Build time: ' . ceil(1000 * ($micro_end_time - $micro_start_time)) . ' ms';

+                        print ' - Build time: '.ceil(1000 * ($micro_end_time - $micro_start_time)).' ms';

                     }

                     if (function_exists("memory_get_usage")) {

-                        print ' - Mem: ' . memory_get_usage();

+                        print ' - Mem: '.memory_get_usage();

                     }

                     if (function_exists("xdebug_memory_usage")) {

-                        print ' - XDebug time: ' . ceil(1000 * xdebug_time_index()) . ' ms';

-                        print ' - XDebug mem: ' . xdebug_memory_usage();

-                        print ' - XDebug mem peak: ' . xdebug_peak_memory_usage();

+                        print ' - XDebug time: '.ceil(1000 * xdebug_time_index()).' ms';

+                        print ' - XDebug mem: '.xdebug_memory_usage();

+                        print ' - XDebug mem peak: '.xdebug_peak_memory_usage();

                     }

                     if (function_exists("zend_loader_file_encoded")) {

-                        print ' - Zend encoded file: ' . (zend_loader_file_encoded() ? 'yes' : 'no');

+                        print ' - Zend encoded file: '.(zend_loader_file_encoded() ? 'yes' : 'no');

                     }

-                    print '");' . "\n";

+                    print '");'."\n";

                 }

 

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

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

             }

 

 // Add Xdebug coverage of code

@@ -7208,7 +7208,7 @@ 
                 print "<!-- Start of log output\n";

 //print '<div class="hidden">'."\n";

                 foreach (Globals::$conf->logbuffer as $logline) {

-                    print $logline . "<br>\n";

+                    print $logline."<br>\n";

                 }

 //print '</div>'."\n";

                 print "End of log output -->\n";

@@ -7251,8 +7251,8 @@ 
      */

     static function dol_set_focus($selector)

     {

-        print "\n" . '<!-- Set focus onto a specific field -->' . "\n";

-        print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("' . dol_escape_js($selector) . '").focus(); });</script>' . "\n";

+        print "\n".'<!-- Set focus onto a specific field -->'."\n";

+        print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.dol_escape_js($selector).'").focus(); });</script>'."\n";

     }

 

     /**

@@ -7297,7 +7297,7 @@ 
             $value = preg_replace('/\*/', '%', $value); // Replace * with %

         }

         if ($mode == 1) {

-            $value = preg_replace('/([<>=]+)\s+([0-9' . preg_quote(Globals::$langs->trans("DecimalSeparator"), '/') . '\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

+            $value = preg_replace('/([<>=]+)\s+([0-9'.preg_quote(Globals::$langs->trans("DecimalSeparator"), '/').'\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

         }

 

         $value = preg_replace('/\s*\|\s*/', '|', $value);

@@ -7326,14 +7326,14 @@ 
                     if ($newcrit != '') {

                         $numnewcrit = price2num($newcrit);

                         if (is_numeric($numnewcrit)) {

-                            $newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' ' . $operator . ' ' . $numnewcrit;

+                            $newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;

                         } else {

-                            $newres .= ($i2 > 0 ? ' OR ' : '') . '1 = 2'; // force false

+                            $newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false

                         }

                         $i2++; // a criteria was added to string

                     }

                 } else if ($mode == 2) {

-                    $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $db->escape(trim($crit)) . ")";

+                    $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$db->escape(trim($crit)).")";

                     $i2++; // a criteria was added to string

                 } else if ($mode == 3) {

                     $tmparray = explode(',', trim($crit));

@@ -7342,10 +7342,10 @@ 
                         foreach ($tmparray as $val) {

                             if ($val) {

                                 $listofcodes .= ($listofcodes ? ',' : '');

-                                $listofcodes .= "'" . $db->escape(trim($val)) . "'";

+                                $listofcodes .= "'".$db->escape(trim($val))."'";

                             }

                         }

-                        $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $listofcodes . ")";

+                        $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$listofcodes.")";

                         $i2++; // a criteria was added to string

                     }

                 } else if ($mode == 4) {

@@ -7354,10 +7354,10 @@ 
                         $listofcodes = '';

                         foreach ($tmparray as $val) {

                             if ($val) {

-                                $newres .= ($i2 > 0 ? ' OR (' : '(') . $field . ' LIKE \'' . $db->escape(trim($val)) . ',%\'';

-                                $newres .= ' OR ' . $field . ' = \'' . $db->escape(trim($val)) . '\'';

-                                $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . '\'';

-                                $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . ',%\'';

+                                $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';

+                                $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';

+                                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';

+                                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';

                                 $newres .= ')';

                                 $i2++;

                             }

@@ -7374,9 +7374,9 @@ 
                         $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

                         if (preg_match('/\.(id|rowid)$/', $field)) { // Special case for rowid that is sometimes a ref so used as a search field

-                            $newres .= $field . " = " . (is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

+                            $newres .= $field." = ".(is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

                         } else {

-                            $newres .= $field . " LIKE '";

+                            $newres .= $field." LIKE '";

 

                             $tmpcrit = trim($tmpcrit);

                             $tmpcrit2 = $tmpcrit;

@@ -7395,7 +7395,7 @@ 
                             $newres .= $tmpafter;

                             $newres .= "'";

                             if ($tmpcrit2 == '') {

-                                $newres .= ' OR ' . $field . " IS NULL";

+                                $newres .= ' OR '.$field." IS NULL";

                             }

                         }

 

@@ -7406,10 +7406,10 @@ 
                 $i++;

             }

             if ($newres)

-                $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+                $res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');

             $j++;

         }

-        $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

+        $res = ($nofirstand ? "" : " AND ")."(".$res.")";

 //print 'xx'.$res.'yy';

         return $res;

     }

@@ -7428,8 +7428,8 @@ 
         $url = $object->getLastMainDocLink($object->element);

 

         if ($url) {

-            $out .= img_picto('', 'object_globe.png') . ' ' . Globals::$langs->trans("DirectDownloadLink") . '<br>';

-            $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="' . $url . '">';

+            $out .= img_picto('', 'object_globe.png').' '.Globals::$langs->trans("DirectDownloadLink").'<br>';

+            $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">';

             $out .= ajax_autoselect("directdownloadlink", 0);

         }

         return $out;

@@ -7470,7 +7470,7 @@ 
         if ($extName)

             $subdir = 'thumbs/';

 

-        return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

+        return ($dirName ? $dirName.'/' : '').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb

     }

 

     /**

@@ -7496,14 +7496,14 @@ 
 

         if ($alldata == 1) {

             if ($num_mime !== false)

-                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

+                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime' => dol_mimetype($relativepath),);

             else

                 return array();

         }

 

 // old behavior

         if ($num_mime !== false)

-            return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';

+            return 'javascript:document_preview(\''.dol_escape_js(DOL_BASE_URI.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js(Globals::$langs->trans('Preview')).'\')';

         else

             return '';

     }

@@ -7520,11 +7520,11 @@ 
        // global Globals::$langs;

         $out = '<script type="text/javascript">

                jQuery(document).ready(static function () {

-				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

+				    jQuery("#' . $htmlname.'").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

         if ($addlink)

-            $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>';

+            $out .= ' <a href="'.$addlink.'" target="_blank">'.Globals::$langs->trans("Link").'</a>';

         return $out;

     }

 

@@ -7905,9 +7905,9 @@ 
 

         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

-            $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

+            $sql = 'SELECT * FROM '.$tablename.' WHERE 1';

             if ($checkentity)

-                $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+                $sql .= ' AND entity IN (0,'.getEntity($tablename).')';

 

             $resql = $db->query($sql);

             if ($resql) {

@@ -7945,14 +7945,14 @@ 
                 $g = $tmp[1];

                 $b = $tmp[2];

             } else {

-                $hexr = $stringcolor[0] . $stringcolor[1];

-                $hexg = $stringcolor[2] . $stringcolor[3];

-                $hexb = $stringcolor[4] . $stringcolor[5];

+                $hexr = $stringcolor[0].$stringcolor[1];

+                $hexg = $stringcolor[2].$stringcolor[3];

+                $hexb = $stringcolor[4].$stringcolor[5];

                 $r = hexdec($hexr);

                 $g = hexdec($hexg);

                 $b = hexdec($hexb);

             }

-            $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

+            $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0; // HSL algorithm

             if ($bright > 0.6)

                 $res = 1;

         }

@@ -7987,11 +7987,11 @@ 
                 return 0; // Entry is for menus all excluded to external users

         }

         if (!$menuentry['perms'] && $type_user)

-            return 0;            // No permissions and user is external

+            return 0; // No permissions and user is external

         if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

             return 0; // No permissions and option to hide when not allowed, even for internal user, is on

         if (!$menuentry['perms'])

-            return 2;               // No permissions and user is external

+            return 2; // No permissions and user is external

         return 1;

     }

 

Braces +1453 added lines, -1047 removed lines

@@ -75,8 +75,9 @@ 
           if ($found) return $result;

           } */

 

-        if (isset($class::$member))

-            return $class::$member;

+        if (isset($class::$member)) {
+                    return $class::$member;
+        }
         dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

         return null;

     }

@@ -127,8 +128,9 @@ 
         } else {

             $out = '';

             $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');

-            if (in_array($element, $addzero))

-                $out .= '0,';

+            if (in_array($element, $addzero)) {
+                            $out .= '0,';
+            }
             $out .= Globals::$conf->entity;

             return $out;

         }

@@ -307,32 +309,35 @@ 
     {

        // global $mysoc, $user, Globals::$conf;

 

-        if (empty($paramname))

-            return 'BadFirstParameterForDolUtils::GETPOST';

+        if (empty($paramname)) {
+                    return 'BadFirstParameterForDolUtils::GETPOST';
+        }
         if (empty($check)) {

             dol_syslog("Deprecated use of DolUtils::GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);

         // Enable this line to know who call the DolUtils::GETPOST with '' $check parameter.

         //var_dump(debug_backtrace()[0]);

         }

 

-        if (empty($method))

-            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');

-        elseif ($method == 1)

-            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';

-        elseif ($method == 2)

-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';

-        elseif ($method == 3)

-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');

-        elseif ($method == 4)

-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));

-        else

-            return 'BadThirdParameterForDolUtils::GETPOST';

+        if (empty($method)) {
+                    $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+        } elseif ($method == 1) {
+                    $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+        } elseif ($method == 2) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+        } elseif ($method == 3) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+        } elseif ($method == 4) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));
+        } else {
+                    return 'BadThirdParameterForDolUtils::GETPOST';
+        }
 

         if (empty($method) || $method == 3 || $method == 4) {

             $relativepathstring = $_SERVER["PHP_SELF"];

             // Clean $relativepathstring

-            if (constant('DOL_BASE_URI'))

-                $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);

+            if (constant('DOL_BASE_URI')) {
+                            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+            }
             $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

             $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

             //var_dump($relativepathstring);

@@ -381,14 +386,17 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                         $foundintru = 0;

                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                $foundintru = 1;

+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }

-                                        if (!$foundintru)

-                                            $qualified = 1;

+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
                                         //var_dump($defkey.'-'.$qualified);

-                                    } else

-                                        $qualified = 1;

+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 

                                     if ($qualified) {

                                         //var_dump($user->default_values[$relativepathstring][$defkey]['createform']);

@@ -415,20 +423,24 @@ 
                                             $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                             $foundintru = 0;

                                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                    $foundintru = 1;

+                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                                    $foundintru = 1;
+                                                }
                                             }

-                                            if (!$foundintru)

-                                                $qualified = 1;

+                                            if (!$foundintru) {
+                                                                                            $qualified = 1;
+                                            }
                                             //var_dump($defkey.'-'.$qualified);

-                                        } else

-                                            $qualified = 1;

+                                        } else {
+                                                                                    $qualified = 1;
+                                        }
 

                                         if ($qualified) {

                                             $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

                                             foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

-                                                if ($out)

-                                                    $out .= ', ';

+                                                if ($out) {
+                                                                                                    $out .= ', ';
+                                                }
                                                 if ($paramname == 'sortfield') {

                                                     $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);

                                                 }

@@ -448,14 +460,17 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                         $foundintru = 0;

                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                $foundintru = 1;

+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }

-                                        if (!$foundintru)

-                                            $qualified = 1;

+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
                                         //var_dump($defkey.'-'.$qualified);

-                                    } else

-                                        $qualified = 1;

+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 

                                     if ($qualified) {

                                         if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

@@ -527,8 +542,10 @@ 
                     $newout = $user->fk_user;

                 } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                     $newout = Globals::$conf->entity;

-                } else

-                    $newout = '';     // Key not found, we replace with empty string

+                } else {
+                                    $newout = '';
+                }
+                // Key not found, we replace with empty string

 

 

 

@@ -577,18 +594,20 @@ 
                 }

                 break;

             case 'intcomma':

-                if (preg_match('/[^0-9,-]+/i', $out))

-                    $out = '';

+                if (preg_match('/[^0-9,-]+/i', $out)) {
+                                    $out = '';
+                }
                 break;

             case 'alpha':

                 if (!is_array($out)) {

                     $out = trim($out);

                     // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                     // '../' is dangerous because it allows dir transversals

-                    if (preg_match('/"/', $out))

-                        $out = '';

-                    else if (preg_match('/\.\.\//', $out))

-                        $out = '';

+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'san_alpha':

@@ -597,27 +616,31 @@ 
             case 'aZ':

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'aZ09':

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'aZ09comma':  // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'array':

-                if (!is_array($out) || empty($out))

-                    $out = array();

+                if (!is_array($out) || empty($out)) {
+                                    $out = array();
+                }
                 break;

             case 'nohtml':  // Recommended for most scalar parameters

                 $out = dol_string_nohtmltag($out, 0);

@@ -627,16 +650,18 @@ 
                     $out = trim($out);

                     // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                     // '../' is dangerous because it allows dir transversals

-                    if (preg_match('/"/', $out))

-                        $out = '';

-                    else if (preg_match('/\.\.\//', $out))

-                        $out = '';

+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                     $out = dol_string_nohtmltag($out);

                 }

                 break;

             case 'custom':

-                if (empty($filter))

-                    return 'BadFourthParameterForDolUtils::GETPOST';

+                if (empty($filter)) {
+                                    return 'BadFourthParameterForDolUtils::GETPOST';
+                }
                 $out = filter_var($out, $filter, $options);

                 break;

         }

@@ -754,11 +779,11 @@ 
                 }

             }

             if ($returnemptyifnotfound) {        // Not found into alternate dir

-                if ($returnemptyifnotfound == 1 || !file_exists($res))

-                    return '';

+                if ($returnemptyifnotfound == 1 || !file_exists($res)) {
+                                    return '';
+                }
             }

-        }

-        else {    // For an url path

+        } else {    // For an url path

 // We try to get local path of file on filesystem from url

 // Note that trying to know if a file on disk exist by forging path on disk from url

 // works only for some web server and some setup. This is bugged when

@@ -853,12 +878,14 @@ 
     static function dol_size($size, $type = '')

     {

         //global Globals::$conf;

-        if (empty(Globals::$conf->dol_optimize_smallscreen))

-            return $size;

-        if ($type == 'width' && $size > 250)

-            return 250;

-        else

-            return 10;

+        if (empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    return $size;
+        }
+        if ($type == 'width' && $size > 250) {
+                    return 250;
+        } else {
+                    return 10;
+        }
     }

 

     /**

@@ -958,9 +985,10 @@ 
     {

         $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

         $forbidden_chars_to_remove = array();

-        if (is_array($badcharstoreplace))

-            $forbidden_chars_to_replace = $badcharstoreplace;

-//$forbidden_chars_to_remove=array("(",")");

+        if (is_array($badcharstoreplace)) {
+                    $forbidden_chars_to_replace = $badcharstoreplace;
+        }
+        //$forbidden_chars_to_remove=array("(",")");

 

         return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));

     }

@@ -996,9 +1024,9 @@ 
         if (empty($mode)) {

             $substitjs["'"] = "\\'";

             $substitjs['"'] = "\\'";

-        } else if ($mode == 1)

-            $substitjs["'"] = "\\'";

-        else if ($mode == 2) {

+        } else if ($mode == 1) {
+                    $substitjs["'"] = "\\'";
+        } else if ($mode == 2) {

             $substitjs['"'] = '\\"';

         } else if ($mode == 3) {

             $substitjs["'"] = "\\'";

@@ -1020,10 +1048,12 @@ 
     {

 // escape quotes and backslashes, newlines, etc.

         $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

-        if (!$keepb)

-            $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));

-        if (!$keepn)

-            $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));

+        if (!$keepb) {
+                    $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));
+        }
+        if (!$keepn) {
+                    $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));
+        }
         return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

     }

 

@@ -1073,8 +1103,9 @@ 
     {

        // global Globals::$conf, $user;

 // If syslog module enabled

-        if (empty(Globals::$conf->syslog->enabled))

-            return;

+        if (empty(Globals::$conf->syslog->enabled)) {
+                    return;
+        }
 

         if ($ident < 0) {

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

@@ -1088,8 +1119,9 @@ 
             if (!in_array($level, $logLevels, true)) {

                 throw new Exception('Incorrect log level');

             }

-            if ($level > Globals::$conf->global->SYSLOG_LEVEL)

-                return;

+            if ($level > Globals::$conf->global->SYSLOG_LEVEL) {
+                            return;
+            }
 

             $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

 // If adding log inside HTML page is required

@@ -1114,24 +1146,30 @@ 
             );

 

 // This is when server run behind a reverse proxy

-            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))

-                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);

-// This is when server run normally on a server

-            else if (!empty($_SERVER["REMOTE_ADDR"]))

-                $data['ip'] = $_SERVER['REMOTE_ADDR'];

-// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

-            else if (!empty($_SERVER['SERVER_ADDR']))

-                $data['ip'] = $_SERVER['SERVER_ADDR'];

-// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

-            else if (!empty($_SERVER['COMPUTERNAME']))

-                $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);

-// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

-            else if (!empty($_SERVER['LOGNAME']))

-                $data['ip'] = '???@' . $_SERVER['LOGNAME'];

-// Loop on each log handler and send output

+            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                            $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);
+            }
+            // This is when server run normally on a server

+            else if (!empty($_SERVER["REMOTE_ADDR"])) {
+                            $data['ip'] = $_SERVER['REMOTE_ADDR'];
+            }
+            // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

+            else if (!empty($_SERVER['SERVER_ADDR'])) {
+                            $data['ip'] = $_SERVER['SERVER_ADDR'];
+            }
+            // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

+            else if (!empty($_SERVER['COMPUTERNAME'])) {
+                            $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);
+            }
+            // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

+            else if (!empty($_SERVER['LOGNAME'])) {
+                            $data['ip'] = '???@' . $_SERVER['LOGNAME'];
+            }
+            // Loop on each log handler and send output

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

-                if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

-                    continue;

+                if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+                                    continue;
+                }
                 $loghandlerinstance->export($data, $suffixinfilename);

             }

             unset($data);

@@ -1187,13 +1225,15 @@ 
 

 // Show title

         $showtitle = 1;

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            $showtitle = 0;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    $showtitle = 0;
+        }
         if (!empty($title) && $showtitle) {

             $limittitle = 30;

             $out .= '<a class="tabTitle">';

-            if ($picto)

-                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

+            if ($picto) {
+                            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';
+            }
             $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

             $out .= '</a>';

         }

@@ -1202,12 +1242,14 @@ 
         $maxkey = -1;

         if (is_array($links) && !empty($links)) {

             $keys = array_keys($links);

-            if (count($keys))

-                $maxkey = max($keys);

+            if (count($keys)) {
+                            $maxkey = max($keys);
+            }
         }

 

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2;
+        }
 

 // Show tabs

         $bactive = false;

@@ -1220,8 +1262,9 @@ 
         for ($i = 0; $i <= $maxkey; $i++) {

             if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {

 // If active tab is already present

-                if ($i >= $limittoshow)

-                    $limittoshow--;

+                if ($i >= $limittoshow) {
+                                    $limittoshow--;
+                }
             }

         }

 

@@ -1262,12 +1305,12 @@ 
                 }

                 $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {

-                    if (!empty($links[$i][0]))

-                        $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

-                    else

-                        $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

-                }

-                else if (!empty($links[$i][1])) {

+                    if (!empty($links[$i][0])) {
+                                            $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";
+                    } else {
+                                            $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";
+                    }
+                } else if (!empty($links[$i][1])) {

                     $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

                     $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

                     $outmore .= '</a>' . "\n";

@@ -1278,8 +1321,9 @@ 
             }

             $displaytab = $i;

         }

-        if ($popuptab)

-            $outmore .= '</div>';

+        if ($popuptab) {
+                    $outmore .= '</div>';
+        }
 

         if ($displaytab > $limittoshow) {

             $left = (Globals::$langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');

@@ -1302,8 +1346,9 @@ 
 

         $out .= "</div>\n";

 

-        if (!$notab || $notab == -1)

-            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+        if (!$notab || $notab == -1) {
+                    $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";
+        }
 

         $parameters = array('tabname' => $active, 'out' => $out);

         $reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"

@@ -1333,10 +1378,11 @@ 
      */

     static function dol_get_fiche_end($notab = 0)

     {

-        if (!$notab || $notab == -1)

-            return "\n</div>\n";

-        else

-            return '';

+        if (!$notab || $notab == -1) {
+                    return "\n</div>\n";
+        } else {
+                    return '';
+        }
     }

 

     /**

@@ -1368,40 +1414,55 @@ 
         $showimage = 1;

         $entity = (empty($object->entity) ? Globals::$conf->entity : $object->entity);

         $showbarcode = empty(Globals::$conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);

-        if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-            $showbarcode = 0;

+        if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                    $showbarcode = 0;
+        }
         $modulepart = 'unknown';

 

-        if ($object->element == 'societe')

-            $modulepart = 'societe';

-        if ($object->element == 'contact')

-            $modulepart = 'contact';

-        if ($object->element == 'member')

-            $modulepart = 'memberphoto';

-        if ($object->element == 'user')

-            $modulepart = 'userphoto';

-        if ($object->element == 'product')

-            $modulepart = 'product';

+        if ($object->element == 'societe') {
+                    $modulepart = 'societe';
+        }
+        if ($object->element == 'contact') {
+                    $modulepart = 'contact';
+        }
+        if ($object->element == 'member') {
+                    $modulepart = 'memberphoto';
+        }
+        if ($object->element == 'user') {
+                    $modulepart = 'userphoto';
+        }
+        if ($object->element == 'product') {
+                    $modulepart = 'product';
+        }
 

         if (class_exists("Imagick")) {

-            if ($object->element == 'propal')

-                $modulepart = 'propal';

-            if ($object->element == 'commande')

-                $modulepart = 'commande';

-            if ($object->element == 'facture')

-                $modulepart = 'facture';

-            if ($object->element == 'fichinter')

-                $modulepart = 'ficheinter';

-            if ($object->element == 'contrat')

-                $modulepart = 'contract';

-            if ($object->element == 'supplier_proposal')

-                $modulepart = 'supplier_proposal';

-            if ($object->element == 'order_supplier')

-                $modulepart = 'supplier_order';

-            if ($object->element == 'invoice_supplier')

-                $modulepart = 'supplier_invoice';

-            if ($object->element == 'expensereport')

-                $modulepart = 'expensereport';

+            if ($object->element == 'propal') {
+                            $modulepart = 'propal';
+            }
+            if ($object->element == 'commande') {
+                            $modulepart = 'commande';
+            }
+            if ($object->element == 'facture') {
+                            $modulepart = 'facture';
+            }
+            if ($object->element == 'fichinter') {
+                            $modulepart = 'ficheinter';
+            }
+            if ($object->element == 'contrat') {
+                            $modulepart = 'contract';
+            }
+            if ($object->element == 'supplier_proposal') {
+                            $modulepart = 'supplier_proposal';
+            }
+            if ($object->element == 'order_supplier') {
+                            $modulepart = 'supplier_order';
+            }
+            if ($object->element == 'invoice_supplier') {
+                            $modulepart = 'supplier_invoice';
+            }
+            if ($object->element == 'expensereport') {
+                            $modulepart = 'expensereport';
+            }
         }

 

         if ($object->element == 'product') {

@@ -1409,11 +1470,12 @@ 
             $cssclass = 'photoref';

             $showimage = $object->is_photo_available(Globals::$conf->product->multidir_output[$entity]);

             $maxvisiblephotos = (isset(Globals::$conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? Globals::$conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);

-            if (Globals::$conf->browser->layout == 'phone')

-                $maxvisiblephotos = 1;

-            if ($showimage)

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-            else {

+            if (Globals::$conf->browser->layout == 'phone') {
+                            $maxvisiblephotos = 1;
+            }
+            if ($showimage) {
+                            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+            } else {

                 if (!empty(Globals::$conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {

                     $nophoto = '';

                     $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1429,11 +1491,12 @@ 
             $cssclass = 'photoref';

             $showimage = $object->is_photo_available(Globals::$conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

             $maxvisiblephotos = (isset(Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

-            if (Globals::$conf->browser->layout == 'phone')

-                $maxvisiblephotos = 1;

-            if ($showimage)

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-            else {

+            if (Globals::$conf->browser->layout == 'phone') {
+                            $maxvisiblephotos = 1;
+            }
+            if ($showimage) {
+                            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+            } else {

                 if (!empty(Globals::$conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {

                     $nophoto = '';

                     $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1458,8 +1521,10 @@ 
                         } else {

                             $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                         }

-                        if (empty($subdir))

-                            $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

+                        if (empty($subdir)) {
+                                                    $subdir = 'errorgettingsubdirofobject';
+                        }
+                        // Protection to avoid to return empty path

 

                         $filepath = $dir_output . $subdir . "/";

 

@@ -1480,14 +1545,16 @@ 
                                 if (empty(Globals::$conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

                                     include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

                                     $ret = dol_convert_file($file, 'png', $fileimage);

-                                    if ($ret < 0)

-                                        $error++;

+                                    if ($ret < 0) {
+                                                                            $error++;
+                                    }
                                 }

                             }

 

                             $heightforphotref = 70;

-                            if (!empty(Globals::$conf->dol_optimize_smallscreen))

-                                $heightforphotref = 60;

+                            if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                                                            $heightforphotref = 60;
+                            }
                             // Si fichier png PDF d'1 page trouve

                             if (file_exists($fileimage)) {

                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

@@ -1523,8 +1590,10 @@ 
                         $width = 14;

                         $cssclass = 'photorefcenter';

                         $picto = $object->picto;

-                        if ($object->element == 'project' && !$object->public)

-                            $picto = 'project'; // instead of projectpub

+                        if ($object->element == 'project' && !$object->public) {
+                                                    $picto = 'project';
+                        }
+                        // instead of projectpub

                         $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

                     }

                     $morehtmlleft .= '<!-- No photo to show -->';

@@ -1535,8 +1604,9 @@ 
             }

         }

 

-        if ($showbarcode)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+        if ($showbarcode) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';
+        }
 

         if ($object->element == 'societe') {

             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->societe->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1560,35 +1630,37 @@ 
             }

         } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

             $tmptxt = $object->getLibStatut(6, $object->totalpaye);

-            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone')

-                $tmptxt = $object->getLibStatut(5, $object->totalpaye);

+            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') {
+                            $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+            }
             $morehtmlstatus .= $tmptxt;

-        }

-        elseif ($object->element == 'contrat' || $object->element == 'contract') {

-            if ($object->statut == 0)

-                $morehtmlstatus .= $object->getLibStatut(5);

-            else

-                $morehtmlstatus .= $object->getLibStatut(4);

-        }

-        elseif ($object->element == 'facturerec') {

-            if ($object->frequency == 0)

-                $morehtmlstatus .= $object->getLibStatut(2);

-            else

-                $morehtmlstatus .= $object->getLibStatut(5);

-        }

-        elseif ($object->element == 'project_task') {

+        } elseif ($object->element == 'contrat' || $object->element == 'contract') {

+            if ($object->statut == 0) {
+                            $morehtmlstatus .= $object->getLibStatut(5);
+            } else {
+                            $morehtmlstatus .= $object->getLibStatut(4);
+            }
+        } elseif ($object->element == 'facturerec') {

+            if ($object->frequency == 0) {
+                            $morehtmlstatus .= $object->getLibStatut(2);
+            } else {
+                            $morehtmlstatus .= $object->getLibStatut(5);
+            }
+        } elseif ($object->element == 'project_task') {

             $object->fk_statut = 1;

-            if ($object->progress > 0)

-                $object->fk_statut = 2;

-            if ($object->progress >= 100)

-                $object->fk_statut = 3;

+            if ($object->progress > 0) {
+                            $object->fk_statut = 2;
+            }
+            if ($object->progress >= 100) {
+                            $object->fk_statut = 3;
+            }
             $tmptxt = $object->getLibStatut(5);

             $morehtmlstatus .= $tmptxt;  // No status on task

-        }

-        else { // Generic case

+        } else { // Generic case

             $tmptxt = $object->getLibStatut(6);

-            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone')

-                $tmptxt = $object->getLibStatut(5);

+            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') {
+                            $tmptxt = $object->getLibStatut(5);
+            }
             $morehtmlstatus .= $tmptxt;

         }

 

@@ -1602,13 +1674,15 @@ 
         }

 

 // Add alias for thirdparty

-        if (!empty($object->name_alias))

-            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+        if (!empty($object->name_alias)) {
+                    $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';
+        }
 

 // Add label

         if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {

-            if (!empty($object->label))

-                $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';

+            if (!empty($object->label)) {
+                            $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';
+            }
         }

 

         if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {

@@ -1641,15 +1715,19 @@ 
     {

        // global Globals::$conf, Globals::$langs;

         $ret = '';

-        if ($fieldrequired)

-            $ret .= '<span class="fieldrequired">';

-        if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '<label for="' . $fieldkey . '">';

+        if ($fieldrequired) {
+                    $ret .= '<span class="fieldrequired">';
+        }
+        if ((Globals::$conf->dol_use_jmobile != 4)) {
+                    $ret .= '<label for="' . $fieldkey . '">';
+        }
         $ret .= Globals::$langs->trans($langkey);

-        if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '</label>';

-        if ($fieldrequired)

-            $ret .= '</span>';

+        if ((Globals::$conf->dol_use_jmobile != 4)) {
+                    $ret .= '</label>';
+        }
+        if ($fieldrequired) {
+                    $ret .= '</span>';
+        }
         return $ret;

     }

 

@@ -1664,8 +1742,9 @@ 
     {

        // global $bc;

         $ret = ' ' . $bc[$var];

-        if ($moreclass)

-            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+        if ($moreclass) {
+                    $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);
+        }
         return $ret;

     }

 

@@ -1696,18 +1775,18 @@ 
             if ($object->state) {

                 $ret .= ($ret ? ", " : '') . $object->state;

             }

-            if ($object->zip)

-                $ret .= ($ret ? ", " : '') . $object->zip;

-        }

-        else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

+            if ($object->zip) {
+                            $ret .= ($ret ? ", " : '') . $object->zip;
+            }
+        } else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

             $ret .= ($ret ? $sep : '' ) . $object->town;

             if ($object->state) {

                 $ret .= ($ret ? ", " : '') . $object->state;

             }

-            if ($object->zip)

-                $ret .= ($ret ? $sep : '' ) . $object->zip;

-        }

-        else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

+            if ($object->zip) {
+                            $ret .= ($ret ? $sep : '' ) . $object->zip;
+            }
+        } else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

             $ret .= ($ret ? $sep : '' ) . $object->zip;

             $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

             if ($object->state) {

@@ -1724,8 +1803,9 @@ 
                 $ret .= ($ret ? ", " : '') . $object->state;

             }

         }

-        if (!is_object($outputlangs))

-            $outputlangs = Globals::$langs;

+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
         if ($withcountry) {

             Globals::$langs->load("dict");

             $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

@@ -1746,8 +1826,9 @@ 
     {

         if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range

             return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);

-        } else

-            return 'Error date into a not supported range';

+        } else {
+                    return 'Error date into a not supported range';
+        }
     }

 

     /**

@@ -1793,10 +1874,12 @@ 
                 }

             }

         }

-        if (!is_object($outputlangs))

-            $outputlangs = Globals::$langs;

-        if (!$format)

-            $format = 'daytextshort';

+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
+        if (!$format) {
+                    $format = 'daytextshort';
+        }
         $reduceformat = (!empty(Globals::$conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;

         $formatwithoutreduce = preg_replace('/reduceformat/', '', $format);

         if ($formatwithoutreduce != $format) {

@@ -1805,40 +1888,46 @@ 
         }  // so format 'dayreduceformat' is processed like day

 // Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.

 // TODO Add format daysmallyear and dayhoursmallyear

-        if ($format == 'day')

-            $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short);

-        else if ($format == 'hour')

-            $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short);

-        else if ($format == 'hourduration')

-            $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration);

-        else if ($format == 'daytext')

-            $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text);

-        else if ($format == 'daytextshort')

-// Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

-            $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short);

-        else if ($format == 'dayhour')

-            $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short);

-        else if ($format == 'dayhoursec')

-            $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short);

-        else if ($format == 'dayhourtext')

-            $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text);

-        else if ($format == 'dayhourtextshort')

-            $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short);

-// Format not sensitive to language

-        else if ($format == 'dayhourlog')

-            $format = '%Y%m%d%H%M%S';

-        else if ($format == 'dayhourldap')

-            $format = '%Y%m%d%H%M%SZ';

-        else if ($format == 'dayhourxcard')

-            $format = '%Y%m%dT%H%M%SZ';

-        else if ($format == 'dayxcard')

-            $format = '%Y%m%d';

-        else if ($format == 'dayrfc')

-            $format = '%Y-%m-%d';             // DATE_RFC3339

-        else if ($format == 'dayhourrfc')

-            $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

-        else if ($format == 'standard')

-            $format = '%Y-%m-%d %H:%M:%S';

+        if ($format == 'day') {
+                    $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short);
+        } else if ($format == 'hour') {
+                    $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short);
+        } else if ($format == 'hourduration') {
+                    $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration);
+        } else if ($format == 'daytext') {
+                    $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text);
+        } else if ($format == 'daytextshort') {
+            // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

+            $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short);
+        } else if ($format == 'dayhour') {
+                    $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short);
+        } else if ($format == 'dayhoursec') {
+                    $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short);
+        } else if ($format == 'dayhourtext') {
+                    $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text);
+        } else if ($format == 'dayhourtextshort') {
+                    $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short);
+        }
+        // Format not sensitive to language

+        else if ($format == 'dayhourlog') {
+                    $format = '%Y%m%d%H%M%S';
+        } else if ($format == 'dayhourldap') {
+                    $format = '%Y%m%d%H%M%SZ';
+        } else if ($format == 'dayhourxcard') {
+                    $format = '%Y%m%dT%H%M%SZ';
+        } else if ($format == 'dayxcard') {
+                    $format = '%Y%m%d';
+        } else if ($format == 'dayrfc') {
+                    $format = '%Y-%m-%d';
+        }
+        // DATE_RFC3339

+        else if ($format == 'dayhourrfc') {
+                    $format = '%Y-%m-%dT%H:%M:%SZ';
+        }
+        // DATETIME RFC3339

+        else if ($format == 'standard') {
+                    $format = '%Y-%m-%d %H:%M:%S';
+        }
 

         if ($reduceformat) {

             $format = str_replace('%Y', '%y', $format);

@@ -1846,8 +1935,10 @@ 
         }

 

 // If date undefined or "", we return ""

-        if (dol_strlen($time) == 0)

-            return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+        if (dol_strlen($time) == 0) {
+                    return '';
+        }
+        // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1915,8 +2006,9 @@ 
                 $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

                 $ret = adodb_strftime($format, $timetouse, $to_gmt);

-            } else

-                $ret = 'Bad value ' . $time . ' for date';

+            } else {
+                            $ret = 'Bad value ' . $time . ' for date';
+            }
         }

 

         if (preg_match('/__b__/i', $format)) {

@@ -1987,10 +2079,14 @@ 
        // global Globals::$conf;

 

         $usealternatemethod = false;

-        if ($timestamp <= 0)

-            $usealternatemethod = true;    // <= 1970

-        if ($timestamp >= 2145913200)

-            $usealternatemethod = true;  // >= 2038

+        if ($timestamp <= 0) {
+                    $usealternatemethod = true;
+        }
+        // <= 1970

+        if ($timestamp >= 2145913200) {
+                    $usealternatemethod = true;
+        }
+        // >= 2038

 

         if ($usealternatemethod) {

             $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -2025,27 +2121,36 @@ 
        // global Globals::$conf;

 //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";

 // Clean parameters

-        if ($hour == -1 || empty($hour))

-            $hour = 0;

-        if ($minute == -1 || empty($minute))

-            $minute = 0;

-        if ($second == -1 || empty($second))

-            $second = 0;

+        if ($hour == -1 || empty($hour)) {
+                    $hour = 0;
+        }
+        if ($minute == -1 || empty($minute)) {
+                    $minute = 0;
+        }
+        if ($second == -1 || empty($second)) {
+                    $second = 0;
+        }
 

 // Check parameters

         if ($check) {

-            if (!$month || !$day)

-                return '';

-            if ($day > 31)

-                return '';

-            if ($month > 12)

-                return '';

-            if ($hour < 0 || $hour > 24)

-                return '';

-            if ($minute < 0 || $minute > 60)

-                return '';

-            if ($second < 0 || $second > 60)

-                return '';

+            if (!$month || !$day) {
+                            return '';
+            }
+            if ($day > 31) {
+                            return '';
+            }
+            if ($month > 12) {
+                            return '';
+            }
+            if ($hour < 0 || $hour > 24) {
+                            return '';
+            }
+            if ($minute < 0 || $minute > 60) {
+                            return '';
+            }
+            if ($second < 0 || $second > 60) {
+                            return '';
+            }
         }

 

         if (method_exists('DateTime', 'getTimestamp')) {

@@ -2102,8 +2207,10 @@ 
 

 // Note that gmmktime and mktime return same value (GMT) when used without parameters

 //if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() static function instead

-        if ($mode == 'gmt')

-            $ret = time(); // Time for now at greenwich.

+        if ($mode == 'gmt') {
+                    $ret = time();
+        }
+        // Time for now at greenwich.

         else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added

             require_once DOL_BASE_PATH . '/core/lib/date.lib.php';

             $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

@@ -2137,8 +2244,9 @@ 
        // global Globals::$conf, Globals::$langs;

         $level = 1024;

 

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            $shortunit = 1;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    $shortunit = 1;
+        }
 

 // Set value text

         if (empty($shortvalue) || $size < ($level * 10)) {

@@ -2173,19 +2281,23 @@ 
     {

        // global Globals::$langs;

 

-        if (empty($url))

-            return '';

+        if (empty($url)) {
+                    return '';
+        }
 

         $link = '<a href="';

-        if (!preg_match('/^http/i', $url))

-            $link .= 'http://';

+        if (!preg_match('/^http/i', $url)) {
+                    $link .= 'http://';
+        }
         $link .= $url;

         $link .= '"';

-        if ($target)

-            $link .= ' target="' . $target . '"';

+        if ($target) {
+                    $link .= ' target="' . $target . '"';
+        }
         $link .= '>';

-        if (!preg_match('/^http/i', $url))

-            $link .= 'http://';

+        if (!preg_match('/^http/i', $url)) {
+                    $link .= 'http://';
+        }
         $link .= dol_trunc($url, $max);

         $link .= '</a>';

         return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto(Globals::$langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

@@ -2209,13 +2321,15 @@ 
 

         $newemail = $email;

 

-        if (empty($email))

-            return '&nbsp;';

+        if (empty($email)) {
+                    return '&nbsp;';
+        }
 

         if (!empty($addlink)) {

             $newemail = '<a style="text-overflow: ellipsis;" href="';

-            if (!preg_match('/^mailto:/i', $email))

-                $newemail .= 'mailto:';

+            if (!preg_match('/^mailto:/i', $email)) {
+                            $newemail .= 'mailto:';
+            }
             $newemail .= $email;

             $newemail .= '">';

             $newemail .= dol_trunc($email, $max);

@@ -2228,13 +2342,14 @@ 
             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

                 $type = 'AC_EMAIL';

                 $link = '';

-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

-                if ($link)

-                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';

+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
+                if ($link) {
+                                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';
+                }
             }

-        }

-        else {

+        } else {

             if ($showinvalid && !isValidEmail($email)) {

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

                 $newemail .= img_warning(Globals::$langs->trans("ErrorBadEMail", $email));

@@ -2266,8 +2381,9 @@ 
 

         $newskype = $value;

 

-        if (empty($value))

-            return '&nbsp;';

+        if (empty($value)) {
+                    return '&nbsp;';
+        }
 

         if (!empty($type)) {

             $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

@@ -2288,13 +2404,13 @@ 
             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

                 $addlink = 'AC_SKYPE';

                 $link = '';

-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
                 $newskype .= ($link ? ' ' . $link : '');

             }

             $newskype .= '</div>';

-        }

-        else {

+        } else {

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

             $newskype .= img_warning(Globals::$langs->trans("ErrorBadSocialNetworkValue", $value));

         }

@@ -2323,12 +2439,14 @@ 
         if (empty($phone)) {

             return '';

         }

-        if (empty($countrycode))

-            $countrycode = $mysoc->country_code;

+        if (empty($countrycode)) {
+                    $countrycode = $mysoc->country_code;
+        }
 

 // Short format for small screens

-        if (Globals::$conf->dol_optimize_smallscreen)

-            $separ = '';

+        if (Globals::$conf->dol_optimize_smallscreen) {
+                    $separ = '';
+        }
 

         $newphone = $phone;

         if (strtoupper($countrycode) == "FR") {

@@ -2494,15 +2612,18 @@ 
                 $newphone = '<a href="tel:' . $phone . '"';

                 $newphone .= '>' . $phone . '</a>';

             } else if (!empty(Globals::$conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url

-                if (empty($user->clicktodial_loaded))

-                    $user->fetch_clicktodial();

+                if (empty($user->clicktodial_loaded)) {
+                                    $user->fetch_clicktodial();
+                }
 

 // Define urlmask

                 $urlmask = 'ErrorClickToDialModuleNotConfigured';

-                if (!empty(Globals::$conf->global->CLICKTODIAL_URL))

-                    $urlmask = Globals::$conf->global->CLICKTODIAL_URL;

-                if (!empty($user->clicktodial_url))

-                    $urlmask = $user->clicktodial_url;

+                if (!empty(Globals::$conf->global->CLICKTODIAL_URL)) {
+                                    $urlmask = Globals::$conf->global->CLICKTODIAL_URL;
+                }
+                if (!empty($user->clicktodial_url)) {
+                                    $urlmask = $user->clicktodial_url;
+                }
 

                 $clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');

                 $clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');

@@ -2517,8 +2638,9 @@ 
                 $url = make_substitutions($url, $substitarray);

                 $newphonesav = $newphone;

                 $newphone = '<a href="' . $url . '"';

-                if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET))

-                    $newphone .= ' target="_blank"';

+                if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+                                    $newphone .= ' target="_blank"';
+                }
                 $newphone .= '>' . $newphonesav . '</a>';

             }

 

@@ -2526,12 +2648,15 @@ 
             if (!empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

                 $type = 'AC_TEL';

                 $link = '';

-                if ($addlink == 'AC_FAX')

-                    $type = 'AC_FAX';

-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

-                if ($link)

-                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';

+                if ($addlink == 'AC_FAX') {
+                                    $type = 'AC_FAX';
+                }
+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
+                if ($link) {
+                                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';
+                }
             }

         }

 

@@ -2558,15 +2683,17 @@ 
                     $picto = '';

                 }

             }

-            if ($adddivfloat)

-                $rep .= '<div class="nospan float" style="margin-right: 10px">';

-            else

-                $rep .= '<span style="margin-right: 10px;">';

+            if ($adddivfloat) {
+                            $rep .= '<div class="nospan float" style="margin-right: 10px">';
+            } else {
+                            $rep .= '<span style="margin-right: 10px;">';
+            }
             $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

-            if ($adddivfloat)

-                $rep .= '</div>';

-            else

-                $rep .= '</span>';

+            if ($adddivfloat) {
+                            $rep .= '</div>';
+            } else {
+                            $rep .= '</span>';
+            }
         }

 

         return $rep;

@@ -2596,8 +2723,9 @@ 
             if ($countrycode) { // If success, countrycode is us, fr, ...

                 if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {

                     $ret .= ' ' . img_picto($countrycode . ' ' . Globals::$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

-                } else

-                    $ret .= ' (' . $countrycode . ')';

+                } else {
+                                    $ret .= ' (' . $countrycode . ')';
+                }
             }

         }

 

@@ -2694,26 +2822,33 @@ 
                 $out .= $hookmanager->resPrint;

             }

             if (empty($reshook)) {

-                if (empty($charfornl))

-                    $out .= nl2br($address);

-                else

-                    $out .= preg_replace('/[\r\n]+/', $charfornl, $address);

+                if (empty($charfornl)) {
+                                    $out .= nl2br($address);
+                } else {
+                                    $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+                }
 

                 $showgmap = $showomap = 0;

 

 // TODO Add a hook here

-                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS))

-                    $showgmap = 1;

-                if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS))

-                    $showgmap = 1;

-                if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS))

-                    $showgmap = 1;

-                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS))

-                    $showomap = 1;

-                if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS))

-                    $showomap = 1;

-                if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS))

-                    $showomap = 1;

+                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS)) {
+                                    $showgmap = 1;
+                }
+                if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+                                    $showgmap = 1;
+                }
+                if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+                                    $showgmap = 1;
+                }
+                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+                                    $showomap = 1;
+                }
+                if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+                                    $showomap = 1;
+                }
+                if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+                                    $showomap = 1;
+                }
 

                 if ($showgmap) {

                     $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

@@ -2725,10 +2860,11 @@ 
                 }

             }

         }

-        if ($noprint)

-            return $out;

-        else

-            print $out;

+        if ($noprint) {
+                    return $out;
+        } else {
+                    print $out;
+        }
     }

 

     /**

@@ -2740,10 +2876,12 @@ 
      */

     static function isValidEmail($address, $acceptsupervisorkey = 0)

     {

-        if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__')

-            return true;

-        if (filter_var($address, FILTER_VALIDATE_EMAIL))

-            return true;

+        if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+                    return true;
+        }
+        if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+                    return true;
+        }
 

         return false;

     }

@@ -2765,10 +2903,12 @@ 
                 $mxhosts = array();

                 $weight = array();

                 getmxrr(idn_to_ascii($domain), $mxhosts, $weight);

-                if (count($mxhosts) > 1)

-                    return 1;

-                if (count($mxhosts) == 1 && !empty($mxhosts[0]))

-                    return 1;

+                if (count($mxhosts) > 1) {
+                                    return 1;
+                }
+                if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+                                    return 1;
+                }
 

                 return 0;

             }

@@ -2797,10 +2937,11 @@ 
      */

     static function dol_strlen($string, $stringencoding = 'UTF-8')

     {

-        if (function_exists('mb_strlen'))

-            return mb_strlen($string, $stringencoding);

-        else

-            return strlen($string);

+        if (function_exists('mb_strlen')) {
+                    return mb_strlen($string, $stringencoding);
+        } else {
+                    return strlen($string);
+        }
     }

 

     /**

@@ -2817,8 +2958,9 @@ 
     {

        // global Globals::$langs;

 

-        if (empty($stringencoding))

-            $stringencoding = Globals::$langs->charset_output;

+        if (empty($stringencoding)) {
+                    $stringencoding = Globals::$langs->charset_output;
+        }
 

         $ret = '';

         if (empty($trunconbytes)) {

@@ -2854,48 +2996,55 @@ 
     {

        // global Globals::$conf;

 

-        if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC))

-            return $string;

+        if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC)) {
+                    return $string;
+        }
 

-        if (empty($stringencoding))

-            $stringencoding = 'UTF-8';

-// reduce for small screen

-        if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1)

-            $size = round($size / 3);

+        if (empty($stringencoding)) {
+                    $stringencoding = 'UTF-8';
+        }
+        // reduce for small screen

+        if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1) {
+                    $size = round($size / 3);
+        }
 

 // We go always here

         if ($trunc == 'right') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

-            else

-//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

-                return $string;

-        }

-        elseif ($trunc == 'middle') {

+            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+                // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');
+            } else {
+                //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

+                return $string;
+            }
+        } elseif ($trunc == 'middle') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {

                 $size1 = round($size / 2);

                 $size2 = round($size / 2);

                 return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

-            } else

-                return $string;

-        }

-        elseif ($trunc == 'left') {

+            } else {
+                            return $string;
+            }
+        } elseif ($trunc == 'left') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

-            else

-                return $string;

-        }

-        elseif ($trunc == 'wrap') {

+            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+                // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+                return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
+            } else {
+                            return $string;
+            }
+        } elseif ($trunc == 'wrap') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (dol_strlen($newstring, $stringencoding) > ($size + 1))

-                return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

-            else

-                return $string;

-        } else

-            return 'BadParam3CallingDolTrunc';

+            if (dol_strlen($newstring, $stringencoding) > ($size + 1)) {
+                            return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
+            } else {
+                            return $string;
+            }
+        } else {
+                    return 'BadParam3CallingDolTrunc';
+        }
     }

 

     /**

@@ -3105,8 +3254,9 @@ 
     {

        // global Globals::$conf;

 

-        if (!preg_match('/(\.png|\.gif)$/i', $picto))

-            $picto .= '.png';

+        if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+                    $picto .= '.png';
+        }
 

 //$path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

         $path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

@@ -3128,20 +3278,22 @@ 
     {

        // global Globals::$conf;

 

-        if (!preg_match('/(\.png|\.gif)$/i', $picto))

-            $picto .= '.png';

+        if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+                    $picto .= '.png';
+        }
 

-        if ($pictoisfullpath)

-            $path = $picto;

-        else {

+        if ($pictoisfullpath) {
+                    $path = $picto;
+        } else {

 //$path = DOL_BASE_URI . '/theme/common/' . $picto;

             $path = DOL_BASE_URI . '/theme/common/' . $picto;

 

             if (!empty(Globals::$conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {

                 $themepath = DOL_BASE_PATH . 'theme/' . Globals::$conf->theme . '/img/' . $picto;

 

-                if (file_exists($themepath))

-                    $path = $themepath;

+                if (file_exists($themepath)) {
+                                    $path = $themepath;
+                }
             }

         }

 

@@ -3180,8 +3332,9 @@ 
                 $numaction = 0;

             }

         }

-        if (!is_numeric($numaction))

-            $numaction = 0;

+        if (!is_numeric($numaction)) {
+                    $numaction = 0;
+        }
 

         return img_picto($titlealt, 'stcomm' . $numaction . '.png');

     }

@@ -3197,8 +3350,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Show');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Show');
+        }
 

         return img_picto($titlealt, 'pdf' . $size . '.png');

     }

@@ -3214,8 +3368,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Add');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Add');
+        }
 

         return img_picto($titlealt, 'edit_add.png', $other);

     }

@@ -3231,8 +3386,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Remove');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Remove');
+        }
 

         return img_picto($titlealt, 'edit_remove.png', $other);

     }

@@ -3249,8 +3405,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Modify');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Modify');
+        }
 

         return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . (Globals::$langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));

     }

@@ -3267,8 +3424,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('View');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('View');
+        }
 

         $moreatt = ($float ? 'style="float: right" ' : '') . $other;

 

@@ -3286,8 +3444,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Delete');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Delete');
+        }
 

         return img_picto($titlealt, 'delete.png', $other);

 //return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>';

@@ -3303,8 +3462,9 @@ 
     static function img_printer($titlealt = "default", $other = '')

     {

        // global Globals::$conf, Globals::$langs;

-        if ($titlealt == "default")

-            $titlealt = Globals::$langs->trans("Print");

+        if ($titlealt == "default") {
+                    $titlealt = Globals::$langs->trans("Print");
+        }
         return img_picto($titlealt, 'printer.png', $other);

     }

 

@@ -3319,8 +3479,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Split');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Split');
+        }
 

         return img_picto($titlealt, 'split.png', $other);

     }

@@ -3337,10 +3498,11 @@ 
        // global Globals::$conf, Globals::$langs;

 

         if ($usealttitle) {

-            if (is_string($usealttitle))

-                $usealttitle = dol_escape_htmltag($usealttitle);

-            else

-                $usealttitle = Globals::$langs->trans('Info');

+            if (is_string($usealttitle)) {
+                            $usealttitle = dol_escape_htmltag($usealttitle);
+            } else {
+                            $usealttitle = Globals::$langs->trans('Info');
+            }
         }

 

         return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

@@ -3356,8 +3518,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Informations');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Informations');
+        }
 

         return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');

     }

@@ -3373,8 +3536,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Warning');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Warning');
+        }
 

 //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';

         return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));

@@ -3390,8 +3554,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Error');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Error');
+        }
 

         return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');

     }

@@ -3407,8 +3572,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Next');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Next');
+        }
 

 //return img_picto($titlealt, 'next.png', $moreatt);

         return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

@@ -3425,8 +3591,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Previous');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Previous');
+        }
 

 //return img_picto($titlealt, 'previous.png', $moreatt);

         return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

@@ -3444,8 +3611,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Down');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Down');
+        }
 

         return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

     }

@@ -3462,8 +3630,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Up');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Up');
+        }
 

         return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

     }

@@ -3480,8 +3649,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Left');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Left');
+        }
 

         return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);

     }

@@ -3498,8 +3668,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Right');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Right');
+        }
 

         return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);

     }

@@ -3515,11 +3686,13 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Active');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Active');
+        }
 

-        if ($allow == 1)

-            return img_picto($titlealt, 'tick.png');

+        if ($allow == 1) {
+                    return img_picto($titlealt, 'tick.png');
+        }
 

         return '-';

     }

@@ -3567,8 +3740,9 @@ 
         $mimeimg = dol_mimetype($file, '', 2);

         $mimefa = dol_mimetype($file, '', 4);

 

-        if (empty($titlealt))

-            $titlealt = 'Mime type: ' . $mimetype;

+        if (empty($titlealt)) {
+                    $titlealt = 'Mime type: ' . $mimetype;
+        }
 

 //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

         return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

@@ -3590,13 +3764,15 @@ 
 

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Call');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Call');
+        }
 

-        if ($option == 1)

-            $img = 'call';

-        else

-            $img = 'call_out';

+        if ($option == 1) {
+                    $img = 'call';
+        } else {
+                    $img = 'call_out';
+        }
 

         return img_picto($titlealt, $img);

     }

@@ -3612,8 +3788,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Search');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Search');
+        }
 

         $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

@@ -3634,8 +3811,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Search');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Search');
+        }
 

         $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

@@ -3697,14 +3875,16 @@ 
 

         if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

             $out .= Globals::$langs->trans("DolibarrHasDetectedError") . ".<br>\n";

-            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))

-                $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

+            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+            }
             $out .= Globals::$langs->trans("InformationToHelpDiagnose") . ":<br>\n";

 

             $out .= "<b>" . Globals::$langs->trans("Date") . ":</b> " . dol_print_date(time(), 'dayhourlog') . "<br>\n";

             $out .= "<b>" . Globals::$langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";

-            if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL))

-                $out .= "<b>" . Globals::$langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";

+            if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $out .= "<b>" . Globals::$langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";
+            }
             if (function_exists("phpversion")) {

                 $out .= "<b>" . Globals::$langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";

             }

@@ -3747,18 +3927,20 @@ 
             Globals::$langs->load("errors");

 

 // Merge all into $errors array

-            if (is_array($error) && is_array($errors))

-                $errors = array_merge($error, $errors);

-            elseif (is_array($error))

-                $errors = $error;

-            elseif (is_array($errors))

-                $errors = array_merge(array($error), $errors);

-            else

-                $errors = array_merge(array($error));

+            if (is_array($error) && is_array($errors)) {
+                            $errors = array_merge($error, $errors);
+            } elseif (is_array($error)) {
+                            $errors = $error;
+            } elseif (is_array($errors)) {
+                            $errors = array_merge(array($error), $errors);
+            } else {
+                            $errors = array_merge(array($error));
+            }
 

             foreach ($errors as $msg) {

-                if (empty($msg))

-                    continue;

+                if (empty($msg)) {
+                                    continue;
+                }
                 if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

                     $out .= "<b>" . Globals::$langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

                 } else {                        // Mode CLI

@@ -3776,9 +3958,9 @@ 
             $out .= "<br>\n";

         }

 

-        if (empty($dolibarr_main_prod))

-            print $out;

-        else {

+        if (empty($dolibarr_main_prod)) {
+                    print $out;
+        } else {

             print Globals::$langs->trans("DolibarrHasDetectedError") . '. ';

             print Globals::$langs->trans("YouCanSetOptionDolibarrMainProdToZero");

             define("MAIN_CORE_ERROR", 1);

@@ -3801,16 +3983,18 @@ 
     {

        // global Globals::$langs, Globals::$conf;

 

-        if (empty($email))

-            $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;

+        if (empty($email)) {
+                    $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;
+        }
 

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

         $now = dol_now();

 

         print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

         print Globals::$langs->trans("ErrorContactEMail", $email, $prefixcode . dol_print_date($now, '%Y%m%d'));

-        if ($errormessage)

-            print '<br><br>' . $errormessage;

+        if ($errormessage) {
+                    print '<br><br>' . $errormessage;
+        }
         if (is_array($errormessages) && count($errormessages)) {

             foreach ($errormessages as $mesgtoshow) {

                 print '<br><br>' . $mesgtoshow;

@@ -4053,12 +4237,15 @@ 
         $savtotalnboflines = $totalnboflines;

         $totalnboflines = abs($totalnboflines);

 

-        if ($picto == 'setup')

-            $picto = 'title_setup.png';

-        if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png')

-            $picto = 'title.gif';

-        if ($limit < 0)

-            $limit = Globals::$conf->liste_limit;

+        if ($picto == 'setup') {
+                    $picto = 'title_setup.png';
+        }
+        if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png') {
+                    $picto = 'title.gif';
+        }
+        if ($limit < 0) {
+                    $limit = Globals::$conf->liste_limit;
+        }
         if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) {

             $nextpage = 1;

         } else {

@@ -4072,11 +4259,13 @@ 
 // Left

 //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';

         print '<td class="nobordernopadding valignmiddle">';

-        if ($picto && $titre)

-            print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

+        if ($picto && $titre) {
+                    print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);
+        }
         print '<div class="titre inline-block">' . $titre;

-        if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-            print ' (' . $totalnboflines . ')';

+        if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+                    print ' (' . $totalnboflines . ')';
+        }
         print '</div></td>';

 

 // Center

@@ -4086,21 +4275,24 @@ 
 

 // Right

         print '<td class="nobordernopadding valignmiddle" align="right">';

-        if ($sortfield)

-            $options .= "&sortfield=" . urlencode($sortfield);

-        if ($sortorder)

-            $options .= "&sortorder=" . urlencode($sortorder);

-// Show navigation bar

+        if ($sortfield) {
+                    $options .= "&sortfield=" . urlencode($sortfield);
+        }
+        if ($sortorder) {
+                    $options .= "&sortorder=" . urlencode($sortorder);
+        }
+        // Show navigation bar

         $pagelist = '';

         if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

             if ($totalnboflines) { // If we know total nb of lines

 // Define nb of extra page links before and after selected page + ... + first or last

                 $maxnbofpage = (empty(Globals::$conf->dol_optimize_smallscreen) ? 4 : 1);

 

-                if ($limit > 0)

-                    $nbpages = ceil($totalnboflines / $limit);

-                else

-                    $nbpages = 1;

+                if ($limit > 0) {
+                                    $nbpages = ceil($totalnboflines / $limit);
+                } else {
+                                    $nbpages = 1;
+                }
                 $cpt = ($page - $maxnbofpage);

                 if ($cpt < 0) {

                     $cpt = 0;

@@ -4108,10 +4300,11 @@ 
 

                 if ($cpt >= 1) {

                     $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

-                    if ($cpt > 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                    else if ($cpt == 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';

+                    if ($cpt > 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                    } else if ($cpt == 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';
+                    }
                 }

 

                 do {

@@ -4124,14 +4317,14 @@ 
                 } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

                 if ($cpt < $nbpages) {

-                    if ($cpt < $nbpages - 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                    else if ($cpt == $nbpages - 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';

+                    if ($cpt < $nbpages - 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                    } else if ($cpt == $nbpages - 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';
+                    }
                     $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';

                 }

-            }

-            else {

+            } else {

                 $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

             }

         }

@@ -4167,18 +4360,21 @@ 
             $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';

 //$pagesizechoices.=',0:'.Globals::$langs->trans("All");     // Not yet supported

 //$pagesizechoices.=',2:2';

-            if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES))

-                $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;

+            if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES)) {
+                            $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;
+            }
 

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

             print '<select class="flat selectlimit" name="limit" title="' . dol_escape_htmltag(Globals::$langs->trans("MaxNbOfRecordPerPage")) . '">';

             $tmpchoice = explode(',', $pagesizechoices);

             $tmpkey = $limit . ':' . $limit;

-            if (!in_array($tmpkey, $tmpchoice))

-                $tmpchoice[] = $tmpkey;

+            if (!in_array($tmpkey, $tmpchoice)) {
+                            $tmpchoice[] = $tmpkey;
+            }
             $tmpkey = Globals::$conf->liste_limit . ':' . Globals::$conf->liste_limit;

-            if (!in_array($tmpkey, $tmpchoice))

-                $tmpchoice[] = $tmpkey;

+            if (!in_array($tmpkey, $tmpchoice)) {
+                            $tmpchoice[] = $tmpkey;
+            }
             asort($tmpchoice, SORT_NUMERIC);

             $found = false;

             foreach ($tmpchoice as $val) {

@@ -4254,14 +4450,15 @@ 
         }

 

 // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()

-        if (!preg_match('/\//', $rate))

-            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');

-        else {

+        if (!preg_match('/\//', $rate)) {
+                    $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');
+        } else {

 // TODO Split on / and output with a price2num to have clean numbers without ton of 000.

             $ret = $rate . ($addpercent ? '%' : '');

         }

-        if (($info_bits & 1) && $usestarfornpr >= 0)

-            $ret .= ' *';

+        if (($info_bits & 1) && $usestarfornpr >= 0) {
+                    $ret .= ' *';
+        }
         $ret .= $morelabel;

         return $ret;

     }

@@ -4285,11 +4482,14 @@ 
     {

        // global Globals::$langs, Globals::$conf;

 // Clean parameters

-        if (empty($amount))

-            $amount = 0; // To have a numeric value if amount not defined or = ''

+        if (empty($amount)) {
+                    $amount = 0;
+        }
+        // To have a numeric value if amount not defined or = ''

         $amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)

-        if ($rounding < 0)

-            $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT);

+        if ($rounding < 0) {
+                    $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT);
+        }
         $nbdecimal = $rounding;

 

 // Output separators by default (french)

@@ -4297,18 +4497,22 @@ 
         $thousand = ' ';

 

 // If $outlangs not forced, we use use language

-        if (!is_object($outlangs))

-            $outlangs = Globals::$langs;

-

-        if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-            $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");

-        if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-            $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");

-        if ($thousand == 'None')

-            $thousand = '';

-        else if ($thousand == 'Space')

-            $thousand = ' ';

-//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

+        if (!is_object($outlangs)) {
+                    $outlangs = Globals::$langs;
+        }
+

+        if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+                    $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+        }
+        if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+                    $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+        }
+        if ($thousand == 'None') {
+                    $thousand = '';
+        } else if ($thousand == 'Space') {
+                    $thousand = ' ';
+        }
+        //print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

 //print "amount=".$amount."-";

         $amount = str_replace(',', '.', $amount); // should be useless

 //print $amount."-";

@@ -4319,9 +4523,10 @@ 
         $end = '';

 

 // We increase nbdecimal if there is more decimal than asked (to not loose information)

-        if (dol_strlen($decpart) > $nbdecimal)

-            $nbdecimal = dol_strlen($decpart);

-// Si on depasse max

+        if (dol_strlen($decpart) > $nbdecimal) {
+                    $nbdecimal = dol_strlen($decpart);
+        }
+        // Si on depasse max

         if ($trunc && $nbdecimal > Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN) {

             $nbdecimal = Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN;

             if (preg_match('/\.\.\./i', Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN)) {

@@ -4331,8 +4536,9 @@ 
         }

 

 // If force rounding

-        if ($forcerounding >= 0)

-            $nbdecimal = $forcerounding;

+        if ($forcerounding >= 0) {
+                    $nbdecimal = $forcerounding;
+        }
 

 // Format number

         $output = number_format($amount, $nbdecimal, $dec, $thousand);

@@ -4343,13 +4549,14 @@ 
 // Add symbol of currency if requested

         $cursymbolbefore = $cursymbolafter = '';

         if ($currency_code) {

-            if ($currency_code == 'auto')

-                $currency_code = Globals::$conf->currency;

+            if ($currency_code == 'auto') {
+                            $currency_code = Globals::$conf->currency;
+            }
 

             $listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'MXN', 'PEN', 'CNY');

-            if (in_array($currency_code, $listofcurrenciesbefore))

-                $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

-            else {

+            if (in_array($currency_code, $listofcurrenciesbefore)) {
+                            $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
+            } else {

                 $tmpcur = $outlangs->getCurrencySymbol($currency_code);

                 $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

             }

@@ -4382,15 +4589,18 @@ 
 // Decimal delimiter for PHP and database SQL requests must be '.'

         $dec = ',';

         $thousand = ' ';

-        if (Globals::$langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-            $dec = Globals::$langs->transnoentitiesnoconv("SeparatorDecimal");

-        if (Globals::$langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-            $thousand = Globals::$langs->transnoentitiesnoconv("SeparatorThousand");

-        if ($thousand == 'None')

-            $thousand = '';

-        elseif ($thousand == 'Space')

-            $thousand = ' ';

-//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

+        if (Globals::$langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+                    $dec = Globals::$langs->transnoentitiesnoconv("SeparatorDecimal");
+        }
+        if (Globals::$langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+                    $thousand = Globals::$langs->transnoentitiesnoconv("SeparatorThousand");
+        }
+        if ($thousand == 'None') {
+                    $thousand = '';
+        } elseif ($thousand == 'Space') {
+                    $thousand = ' ';
+        }
+        //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

 // Convert value to universal number format (no thousand separator, '.' as decimal separator)

         if ($alreadysqlnb != 1) { // If not a PHP number or unknown, we change format

 //print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';

@@ -4405,8 +4615,10 @@ 
             }

 //print "QQ".$amount.'<br>';

 // Now make replace (the main goal of function)

-            if ($thousand != ',' && $thousand != '.')

-                $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+            if ($thousand != ',' && $thousand != '.') {
+                            $amount = str_replace(',', '.', $amount);
+            }
+            // To accept 2 notations for french users

             $amount = str_replace(' ', '', $amount);  // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

@@ -4415,20 +4627,24 @@ 
 // Now, make a rounding if required

         if ($rounding) {

             $nbofdectoround = '';

-            if ($rounding == 'MU')

-                $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT;

-            elseif ($rounding == 'MT')

-                $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT;

-            elseif ($rounding == 'MS')

-                $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK;

-            elseif (is_numeric($rounding))

-                $nbofdectoround = $rounding;

-//print "RR".$amount.' - '.$nbofdectoround.'<br>';

-            if (dol_strlen($nbofdectoround))

-                $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.

-            else

-                return 'ErrorBadParameterProvidedToFunction';

-//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

+            if ($rounding == 'MU') {
+                            $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT;
+            } elseif ($rounding == 'MT') {
+                            $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT;
+            } elseif ($rounding == 'MS') {
+                            $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK;
+            } elseif (is_numeric($rounding)) {
+                            $nbofdectoround = $rounding;
+            }
+            //print "RR".$amount.' - '.$nbofdectoround.'<br>';

+            if (dol_strlen($nbofdectoround)) {
+                            $amount = round($amount, $nbofdectoround);
+            }
+            // $nbofdectoround can be 0.

+            else {
+                            return 'ErrorBadParameterProvidedToFunction';
+            }
+            //print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

 // Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number

 // to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.

             if (is_numeric($amount)) {

@@ -4441,8 +4657,10 @@ 
 //print "TT".$amount.'<br>';

 // Always make replace because each math static function (like round) replace

 // with local values and we want a number that has a SQL string format x.y

-            if ($thousand != ',' && $thousand != '.')

-                $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+            if ($thousand != ',' && $thousand != '.') {
+                            $amount = str_replace(',', '.', $amount);
+            }
+            // To accept 2 notations for french users

             $amount = str_replace(' ', '', $amount);  // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

@@ -4501,8 +4719,9 @@ 
     {

        // global $db, Globals::$conf, $mysoc;

 

-        if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

-            $thirdparty_seller = $mysoc;

+        if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {
+                    $thirdparty_seller = $mysoc;
+        }
 

         dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

 

@@ -4520,37 +4739,43 @@ 
 // Some test to guess with no need to make database access

         if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax

             if ($local == 1) {

-                if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0")

-                    return 0;

+                if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {
+                                    return 0;
+                }
                 if ($thirdparty_seller->id == $mysoc->id) {

-                    if (!$thirdparty_buyer->localtax1_assuj)

-                        return 0;

-                }

-                else {

-                    if (!$thirdparty_seller->localtax1_assuj)

-                        return 0;

+                    if (!$thirdparty_buyer->localtax1_assuj) {
+                                            return 0;
+                    }
+                } else {

+                    if (!$thirdparty_seller->localtax1_assuj) {
+                                            return 0;
+                    }
                 }

             }

 

             if ($local == 2) {

 //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

-                if (!$mysoc->localtax2_assuj)

-                    return 0;  // If main vat is 0, IRPF may be different than 0.

+                if (!$mysoc->localtax2_assuj) {
+                                    return 0;
+                }
+                // If main vat is 0, IRPF may be different than 0.

                 if ($thirdparty_seller->id == $mysoc->id) {

-                    if (!$thirdparty_buyer->localtax2_assuj)

-                        return 0;

-                }

-                else {

-                    if (!$thirdparty_seller->localtax2_assuj)

-                        return 0;

+                    if (!$thirdparty_buyer->localtax2_assuj) {
+                                            return 0;
+                    }
+                } else {

+                    if (!$thirdparty_seller->localtax2_assuj) {
+                                            return 0;
+                    }
                 }

             }

-        }

-        else {

-            if ($local == 1 && !$thirdparty_seller->localtax1_assuj)

-                return 0;

-            if ($local == 2 && !$thirdparty_seller->localtax2_assuj)

-                return 0;

+        } else {

+            if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {
+                            return 0;
+            }
+            if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {
+                            return 0;
+            }
         }

 

 // For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.

@@ -4592,19 +4817,23 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

         $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-        if ($vatratecode)

-            $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

-        else

-            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+        if ($vatratecode) {
+                    $sql .= " AND t.code ='" . $vatratecode . "'";
+        }
+        // If we have the code, we use it in priority

+        else {
+                    $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";
+        }
         dol_syslog("get_localtax", LOG_DEBUG);

         $resql = $db->query($sql);

 

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($local == 1)

-                return $obj->localtax1;

-            elseif ($local == 2)

-                return $obj->localtax2;

+            if ($local == 1) {
+                            return $obj->localtax1;
+            } elseif ($local == 2) {
+                            return $obj->localtax2;
+            }
         }

 

         return 0;

@@ -4650,10 +4879,11 @@ 
         $resql = $db->query($sql);

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($local == 1)

-                return $obj->localtax1;

-            elseif ($local == 2)

-                return $obj->localtax2;

+            if ($local == 1) {
+                            return $obj->localtax1;
+            } elseif ($local == 2) {
+                            return $obj->localtax2;
+            }
         }

 

         return 0;

@@ -4679,9 +4909,9 @@ 
 // Search local taxes

         $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-        if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

-        else {

+        if ($firstparamisid) {
+                    $sql .= " WHERE t.rowid = " . (int) $vatrate;
+        } else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

             if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4694,19 +4924,22 @@ 
               else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

             $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

             $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-            if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+            if ($vatratecode) {
+                            $sql .= " AND t.code = '" . $vatratecode . "'";
+            }
         }

 

         $resql = $db->query($sql);

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($obj)

-                return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);

-            else

-                return array();

-        } else

-            dol_print_error($db);

+            if ($obj) {
+                            return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);
+            } else {
+                            return array();
+            }
+        } else {
+                    dol_print_error($db);
+        }
 

         return array();

     }

@@ -4736,9 +4969,9 @@ 
 // Search local taxes

         $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-        if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

-        else {

+        if ($firstparamisid) {
+                    $sql .= " WHERE t.rowid = " . (int) $vatrate;
+        } else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

             if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "x.x (yy)"

@@ -4747,13 +4980,17 @@ 
             }

 

             $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

-            if ($mysoc->country_code == 'ES')

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

-            else

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

+            if ($mysoc->country_code == 'ES') {
+                            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";
+            }
+            // local tax in spain use the buyer country ??

+            else {
+                            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
+            }
             $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-            if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+            if ($vatratecode) {
+                            $sql .= " AND t.code = '" . $vatratecode . "'";
+            }
         }

 

         $resql = $db->query($sql);

@@ -4799,17 +5036,17 @@ 
                 if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object

                     $product->get_buyprice($idprodfournprice, 0, 0, 0);

                     $ret = $product->vatrate_supplier;

-                    if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

-                }

-                else {

+                    if ($product->default_vat_code) {
+                                            $ret .= ' (' . $product->default_vat_code . ')';
+                    }
+                } else {

                     $ret = $product->tva_tx;    // Default vat of product we defined

-                    if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                    if ($product->default_vat_code) {
+                                            $ret .= ' (' . $product->default_vat_code . ')';
+                    }
                 }

                 $found = 1;

-            }

-            else {

+            } else {

 // TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.

 // May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on

             }

@@ -4829,14 +5066,18 @@ 
                     $obj = $db->fetch_object($resql);

                     if ($obj) {

                         $ret = $obj->vat_rate;

-                        if ($obj->default_vat_code)

-                            $ret .= ' (' . $obj->default_vat_code . ')';

+                        if ($obj->default_vat_code) {
+                                                    $ret .= ' (' . $obj->default_vat_code . ')';
+                        }
                     }

                     $db->free($sql);

-                } else

-                    dol_print_error($db);

-            } else

-                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+                } else {
+                                    dol_print_error($db);
+                }
+            } else {
+                            $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+            }
+            // Forced value if autodetect fails

         }

 

         dol_syslog("get_product_vat_for_country: ret=" . $ret);

@@ -4891,13 +5132,15 @@ 
             if ($resql) {

                 $obj = $db->fetch_object($resql);

                 if ($obj) {

-                    if ($local == 1)

-                        $ret = $obj->localtax1;

-                    elseif ($local == 2)

-                        $ret = $obj->localtax2;

+                    if ($local == 1) {
+                                            $ret = $obj->localtax1;
+                    } elseif ($local == 2) {
+                                            $ret = $obj->localtax2;
+                    }
                 }

-            } else

-                dol_print_error($db);

+            } else {
+                            dol_print_error($db);
+            }
         }

 

         dol_syslog("get_product_localtax_for_country: ret=" . $ret);

@@ -5000,15 +5243,16 @@ 
        // global $db;

 

         if ($idprodfournprice > 0) {

-            if (!class_exists('ProductFournisseur'))

-                require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+            if (!class_exists('ProductFournisseur')) {
+                            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+            }
             $prodprice = new ProductFournisseur($db);

             $prodprice->fetch_product_fournisseur_price($idprodfournprice);

             return $prodprice->fourn_tva_npr;

-        }

-        elseif ($idprod > 0) {

-            if (!class_exists('Product'))

-                require_once DOL_BASE_PATH . 'product/class/product.class.php';

+        } elseif ($idprod > 0) {

+            if (!class_exists('Product')) {
+                            require_once DOL_BASE_PATH . 'product/class/product.class.php';
+            }
             $prod = new Product($db);

             $prod->fetch($idprod);

             return $prod->tva_npr;

@@ -5034,30 +5278,35 @@ 
     {

        // global $mysoc;

 

-        if (!is_object($thirdparty_seller))

-            return -1;

-        if (!is_object($thirdparty_buyer))

-            return -1;

+        if (!is_object($thirdparty_seller)) {
+                    return -1;
+        }
+        if (!is_object($thirdparty_buyer)) {
+                    return -1;
+        }
 

         if ($local == 1) { // Localtax 1

             if ($mysoc->country_code == 'ES') {

-                if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj)

-                    return 0;

-            }

-            else {

+                if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {
+                                    return 0;
+                }
+            } else {

 // Si vendeur non assujeti a Localtax1, localtax1 par default=0

-                if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj)

-                    return 0;

-                if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off')

-                    return 0;

-            }

-        }

-        elseif ($local == 2) { //I Localtax 2

+                if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {
+                                    return 0;
+                }
+                if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {
+                                    return 0;
+                }
+            }

+        } elseif ($local == 2) { //I Localtax 2

 // Si vendeur non assujeti a Localtax2, localtax2 par default=0

-            if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj)

-                return 0;

-            if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off')

-                return 0;

+            if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) {
+                            return 0;
+            }
+            if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {
+                            return 0;
+            }
         }

 

         if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) {

@@ -5082,31 +5331,38 @@ 
         $classname = '';

         if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0

             $result = Globals::$langs->trans('yes');

-            if ($case == 1 || $case == 3)

-                $result = Globals::$langs->trans("Yes");

-            if ($case == 2)

-                $result = '<input type="checkbox" value="1" checked disabled>';

-            if ($case == 3)

-                $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+            if ($case == 1 || $case == 3) {
+                            $result = Globals::$langs->trans("Yes");
+            }
+            if ($case == 2) {
+                            $result = '<input type="checkbox" value="1" checked disabled>';
+            }
+            if ($case == 3) {
+                            $result = '<input type="checkbox" value="1" checked disabled> ' . $result;
+            }
 

             $classname = 'ok';

-        }

-        elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

+        } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

             $result = Globals::$langs->trans("no");

-            if ($case == 1 || $case == 3)

-                $result = Globals::$langs->trans("No");

-            if ($case == 2)

-                $result = '<input type="checkbox" value="0" disabled>';

-            if ($case == 3)

-                $result = '<input type="checkbox" value="0" disabled> ' . $result;

-

-            if ($color == 2)

-                $classname = 'ok';

-            else

-                $classname = 'error';

-        }

-        if ($color)

-            return '<font class="' . $classname . '">' . $result . '</font>';

+            if ($case == 1 || $case == 3) {
+                            $result = Globals::$langs->trans("No");
+            }
+            if ($case == 2) {
+                            $result = '<input type="checkbox" value="0" disabled>';
+            }
+            if ($case == 3) {
+                            $result = '<input type="checkbox" value="0" disabled> ' . $result;
+            }
+

+            if ($color == 2) {
+                            $classname = 'ok';
+            } else {
+                            $classname = 'error';
+            }
+        }

+        if ($color) {
+                    return '<font class="' . $classname . '">' . $result . '</font>';
+        }
         return $result;

     }

 

@@ -5132,23 +5388,27 @@ 
         $path = '';

 

         $arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');

-        if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))

-            $arrayforoldpath[] = 'product';

+        if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+                    $arrayforoldpath[] = 'product';
+        }
         if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {

 // This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.

-            if (empty($alpha))

-                $num = preg_replace('/([^0-9])/i', '', $num);

-            else

-                $num = preg_replace('/^.*\-/i', '', $num);

+            if (empty($alpha)) {
+                            $num = preg_replace('/([^0-9])/i', '', $num);
+            } else {
+                            $num = preg_replace('/^.*\-/i', '', $num);
+            }
             $num = substr("000" . $num, -$level);

-            if ($level == 1)

-                $path = substr($num, 0, 1);

-            if ($level == 2)

-                $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

-            if ($level == 3)

-                $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

-        }

-        else {

+            if ($level == 1) {
+                            $path = substr($num, 0, 1);
+            }
+            if ($level == 2) {
+                            $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);
+            }
+            if ($level == 3) {
+                            $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);
+            }
+        } else {

 // TODO

 // We will enhance here a common way of forging path for document storage

 // Here, object->id, object->ref and modulepart are required.

@@ -5159,8 +5419,9 @@ 
             }

         }

 

-        if (empty($withoutslash) && !empty($path))

-            $path .= '/';

+        if (empty($withoutslash) && !empty($path)) {
+                    $path .= '/';
+        }
 

         return $path;

     }

@@ -5180,8 +5441,9 @@ 
         dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

 

         $dir_osencoded = dol_osencode($dir);

-        if (@is_dir($dir_osencoded))

-            return 0;

+        if (@is_dir($dir_osencoded)) {
+                    return 0;
+        }
 

         $nberr = 0;

         $nbcreated = 0;

@@ -5196,12 +5458,15 @@ 
         $cdir = explode("/", $dir);

         $num = count($cdir);

         for ($i = 0; $i < $num; $i++) {

-            if ($i > 0)

-                $ccdir .= '/' . $cdir[$i];

-            else

-                $ccdir .= $cdir[$i];

-            if (preg_match("/^.:$/", $ccdir, $regs))

-                continue; // Si chemin Windows incomplet, on poursuit par rep suivant

+            if ($i > 0) {
+                            $ccdir .= '/' . $cdir[$i];
+            } else {
+                            $ccdir .= $cdir[$i];
+            }
+            if (preg_match("/^.:$/", $ccdir, $regs)) {
+                            continue;
+            }
+            // Si chemin Windows incomplet, on poursuit par rep suivant

 

 

 

@@ -5293,8 +5558,9 @@ 
      */

     static function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)

     {

-        if ($removelinefeed == 2)

-            $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);

+        if ($removelinefeed == 2) {
+                    $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+        }
         $temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);

 

         if ($strip_tags) {

@@ -5311,8 +5577,9 @@ 
         $temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);

 

 // Supprime aussi les retours

-        if ($removelinefeed == 1)

-            $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);

+        if ($removelinefeed == 1) {
+                    $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+        }
 

 // et les espaces doubles

         while (strpos($temp, "  ")) {

@@ -5398,18 +5665,21 @@ 
             if ($charset == 'UTF-8') {

                 $pattern = '/(<br[^>]*>)/Uu';

             } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-            else

-                $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+            else {
+                            $pattern = '/(<br[^>]*>)/U';
+            }
+            // /U is to have UNGREEDY regex to limit to one html tag.

             $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

             $firstline = '';

             $i = 0;

             $nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator

             while (($i < $nba) && ($i < ($nboflines * 2))) {

-                if ($i % 2 == 0)

-                    $firstline .= $a[$i];

-                elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1)))

-                    $firstline .= ($ishtml ? "<br>\n" : "\n");

+                if ($i % 2 == 0) {
+                                    $firstline .= $a[$i];
+                } elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+                                    $firstline .= ($ishtml ? "<br>\n" : "\n");
+                }
                 $i++;

             }

             unset($a);

@@ -5458,15 +5728,18 @@ 
         $newstring = $stringtoencode;

         if (dol_textishtml($stringtoencode)) { // Check if text is already HTML or not

             $newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.

-            if ($removelasteolbr)

-                $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)

+            if ($removelasteolbr) {
+                            $newstring = preg_replace('/<br>$/i', '', $newstring);
+            }
+            // Remove last <br> (remove only last one)

             $newstring = strtr($newstring, array('&' => '__and__', '<' => '__lt__', '>' => '__gt__', '"' => '__dquot__'));

             $newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding

             $newstring = strtr($newstring, array('__and__' => '&', '__lt__' => '<', '__gt__' => '>', '__dquot__' => '"'));

-        }

-        else {

-            if ($removelasteolbr)

-                $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)

+        } else {

+            if ($removelasteolbr) {
+                            $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring);
+            }
+            // Remove last \n (may remove several)

             $newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);

         }

 // Other substitutions that htmlentities does not do

@@ -5568,8 +5841,9 @@ 
      */

     static function dol_nboflines($s, $maxchar = 0)

     {

-        if ($s == '')

-            return 0;

+        if ($s == '') {
+                    return 0;
+        }
         $arraystring = explode("\n", $s);

         $nb = count($arraystring);

 

@@ -5588,15 +5862,18 @@ 
     static function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')

     {

         $repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");

-        if (dol_textishtml($text))

-            $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");

+        if (dol_textishtml($text)) {
+                    $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+        }
 

         $text = strtr($text, $repTable);

         if ($charset == 'UTF-8') {

             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-        else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+        else {
+                    $pattern = '/(<br[^>]*>)/U';
+        }
+        // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $nblines = (int) floor((count($a) + 1) / 2);

@@ -5643,39 +5920,47 @@ 
     static function dol_textishtml($msg, $option = 0)

     {

         if ($option == 1) {

-            if (preg_match('/<html/i', $msg))

-                return true;

-            elseif (preg_match('/<body/i', $msg))

-                return true;

-            elseif (preg_match('/<br/i', $msg))

-                return true;

+            if (preg_match('/<html/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<body/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<br/i', $msg)) {
+                            return true;
+            }
             return false;

-        }

-        else {

-            if (preg_match('/<html/i', $msg))

-                return true;

-            elseif (preg_match('/<body/i', $msg))

-                return true;

-            elseif (preg_match('/<(b|em|i|u)>/i', $msg))

-                return true;

-            elseif (preg_match('/<br\/>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg))

-                return true;

-            elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg))

-                return true; // must accept <img src="http://example.com/aaa.png" />

-            elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg))

-                return true; // must accept <a href="http://example.com/aaa.png" />

-            elseif (preg_match('/<h[0-9]>/i', $msg))

-                return true;

-            elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-                return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

-            elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-                return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+        } else {

+            if (preg_match('/<html/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<body/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<br\/>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
+                            return true;
+            }
+            // must accept <img src="http://example.com/aaa.png" />

+            elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {
+                            return true;
+            }
+            // must accept <a href="http://example.com/aaa.png" />

+            elseif (preg_match('/<h[0-9]>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+                            return true;
+            }
+            // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+            elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
+                            return true;
+            }
+            // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

             return false;

         }

@@ -5827,12 +6112,14 @@ 
                 $birthday = dol_print_date($object->birth, 'day');

 

                 $substitutionarray['__MEMBER_ID__'] = $object->id;

-                if (method_exists($object, 'getCivilityLabel'))

-                    $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();

+                if (method_exists($object, 'getCivilityLabel')) {
+                                    $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+                }
                 $substitutionarray['__MEMBER_FIRSTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->firstname) : $object->firstname;

                 $substitutionarray['__MEMBER_LASTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->lastname) : $object->lastname;

-                if (method_exists($object, 'getFullName'))

-                    $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);

+                if (method_exists($object, 'getFullName')) {
+                                    $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+                }
                 $substitutionarray['__MEMBER_COMPANY__'] = $msgishtml ? dol_htmlentitiesbr($object->societe) : $object->societe;

                 $substitutionarray['__MEMBER_ADDRESS__'] = $msgishtml ? dol_htmlentitiesbr($object->address) : $object->address;

                 $substitutionarray['__MEMBER_ZIP__'] = $msgishtml ? dol_htmlentitiesbr($object->zip) : $object->zip;

@@ -5880,10 +6167,12 @@ 
                     $dateplannedstart = '';

                     $datenextexpiration = '';

                     foreach ($object->lines as $line) {

-                        if ($line->date_ouverture_prevue > $dateplannedstart)

-                            $dateplannedstart = $line->date_ouverture_prevue;

-                        if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration))

-                            $datenextexpiration = $line->date_fin_prevue;

+                        if ($line->date_ouverture_prevue > $dateplannedstart) {
+                                                    $dateplannedstart = $line->date_ouverture_prevue;
+                        }
+                        if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+                                                    $datenextexpiration = $line->date_fin_prevue;
+                        }
                     }

                     $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');

                     $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');

@@ -5893,8 +6182,9 @@ 
 

 // Create dynamic tags for __EXTRAFIELD_FIELD__

                 if ($object->table_element && $object->id > 0) {

-                    if (!is_object($extrafields))

-                        $extrafields = new ExtraFields($db);

+                    if (!is_object($extrafields)) {
+                                            $extrafields = new ExtraFields($db);
+                    }
                     $extrafields->fetch_name_optionals_label($object->table_element, true);

 

                     if ($object->fetch_optionals() > 0) {

@@ -5915,12 +6205,15 @@ 
                     require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

                     $outputlangs->loadLangs(array('paypal', 'other'));

                     $typeforonlinepayment = 'free';

-                    if (is_object($object) && $object->element == 'commande')

-                        $typeforonlinepayment = 'order';

-                    if (is_object($object) && $object->element == 'facture')

-                        $typeforonlinepayment = 'invoice';

-                    if (is_object($object) && $object->element == 'member')

-                        $typeforonlinepayment = 'member';

+                    if (is_object($object) && $object->element == 'commande') {
+                                            $typeforonlinepayment = 'order';
+                    }
+                    if (is_object($object) && $object->element == 'facture') {
+                                            $typeforonlinepayment = 'invoice';
+                    }
+                    if (is_object($object) && $object->element == 'member') {
+                                            $typeforonlinepayment = 'member';
+                    }
                     $url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);

                     $paymenturl = $url;

                 }

@@ -5930,16 +6223,19 @@ 
 

                 if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+                }
                 if (!empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+                }
                 if (!empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+                }
             }

         }

         if (empty($exclude) || !in_array('objectamount', $exclude)) {

@@ -5949,18 +6245,22 @@ 
             $substitutionarray['__AMOUNT__'] = is_object($object) ? $object->total_ttc : '';

             $substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';

             $substitutionarray['__AMOUNT_VAT__'] = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(1))

-                $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(2))

-                $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';

+            if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                            $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
+            }
+            if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                            $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+            }
 

             $substitutionarray['__AMOUNT_FORMATED__'] = is_object($object) ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

             $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

             $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency)) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(1))

-                $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(2))

-                $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

+            if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                            $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            }
+            if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                            $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            }
 

 // TODO Add keys for foreign multicurrency

 // For backward compatibility

@@ -6030,23 +6330,27 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if (!is_array($substitutionarray))

-            return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

+        if (!is_array($substitutionarray)) {
+                    return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+        }
 

-        if (empty($outputlangs))

-            $outputlangs = Globals::$langs;

+        if (empty($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
 

 // Make substitution for language keys

         if (is_object($outputlangs)) {

             while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {

                 $msgishtml = 0;

-                if (DolUtils::dol_textishtml($text, 1))

-                    $msgishtml = 1;

+                if (DolUtils::dol_textishtml($text, 1)) {
+                                    $msgishtml = 1;
+                }
 

 // If key is __(TranslationKey|langfile)__, then force load of langfile.lang

                 $tmp = explode('|', $reg[1]);

-                if (!empty($tmp[1]))

-                    $outputlangs->load($tmp[1]);

+                if (!empty($tmp[1])) {
+                                    $outputlangs->load($tmp[1]);
+                }
 

                 $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

             }

@@ -6056,23 +6360,29 @@ 
 // it is also converted.

         while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {

             $msgishtml = 0;

-            if (DolUtils::dol_textishtml($text, 1))

-                $msgishtml = 1;

+            if (DolUtils::dol_textishtml($text, 1)) {
+                            $msgishtml = 1;
+            }
 

             $keyfound = $reg[1];

-            if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound))

-                $newval = '*****forbidden*****';

-            else

-                $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;

+            if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+                            $newval = '*****forbidden*****';
+            } else {
+                            $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;
+            }
             $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

         }

 

 // Make substitition for array $substitutionarray

         foreach ($substitutionarray as $key => $value) {

-            if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = '';  // Protection

-            if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = ''; // Protection

+            if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                            $value = '';
+            }
+            // Protection

+            if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                            $value = '';
+            }
+            // Protection

 

             $text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example

         }

@@ -6118,8 +6428,9 @@ 
             $dir = dol_buildpath($reldir, 0);

 

 // Check if directory exists

-            if (!dol_is_dir($dir))

-                continue;

+            if (!dol_is_dir($dir)) {
+                            continue;
+            }
 

             $substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');

             foreach ($substitfiles as $substitfile) {

@@ -6131,8 +6442,9 @@ 
                     require_once $dir . $substitfile['name'];

                     // Call the user's function, and only if it is defined

                     $function_name = $module . "_" . $callfunc;

-                    if (function_exists($function_name))

-                        $function_name($substitutionarray, $outputlangs, $object, $parameters);

+                    if (function_exists($function_name)) {
+                                            $function_name($substitutionarray, $outputlangs, $object, $parameters);
+                    }
                 }

             }

         }

@@ -6168,8 +6480,9 @@ 
 

         $out = '';

 

-        if (!is_object($outputlangs))

-            $outputlangs = Globals::$langs;

+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
 

         if ($date_start && $date_end) {

             $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

@@ -6198,20 +6511,22 @@ 
 

         $ret = '';

 // If order not defined, we use the setup

-        if ($nameorder < 0)

-            $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);

+        if ($nameorder < 0) {
+                    $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+        }
         if ($nameorder && ((string) $nameorder != '2')) {

             $ret .= $firstname;

-            if ($firstname && $lastname)

-                $ret .= ' ';

+            if ($firstname && $lastname) {
+                            $ret .= ' ';
+            }
             $ret .= $lastname;

-        }

-        else if ($nameorder == 2) {

+        } else if ($nameorder == 2) {

             $ret .= $firstname;

         } else {

             $ret .= $lastname;

-            if ($firstname && $lastname)

-                $ret .= ' ';

+            if ($firstname && $lastname) {
+                            $ret .= ' ';
+            }
             $ret .= $firstname;

         }

         return $ret;

@@ -6231,13 +6546,14 @@ 
     {

 //dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function

         if (!is_array($mesgs)) {  // If mesgs is a string

-            if ($mesgs)

-                $_SESSION['dol_events'][$style][] = $mesgs;

-        }

-        else {      // If mesgs is an array

+            if ($mesgs) {
+                            $_SESSION['dol_events'][$style][] = $mesgs;
+            }
+        } else {      // If mesgs is an array

             foreach ($mesgs as $mesg) {

-                if ($mesg)

-                    $_SESSION['dol_events'][$style][] = $mesg;

+                if ($mesg) {
+                                    $_SESSION['dol_events'][$style][] = $mesg;
+                }
             }

         }

     }

@@ -6257,13 +6573,16 @@ 
         if (empty($mesg) && empty($mesgs)) {

             dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

         } else {

-            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-                dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

-            if (empty($mesgs))

-                setEventMessage($mesg, $style);

-            else {

-                if (!empty($mesg) && !in_array($mesg, $mesgs))

-                    setEventMessage($mesg, $style); // Add message string if not already into array

+            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
+                            dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
+            }
+            if (empty($mesgs)) {
+                            setEventMessage($mesg, $style);
+            } else {

+                if (!empty($mesg) && !in_array($mesg, $mesgs)) {
+                                    setEventMessage($mesg, $style);
+                }
+                // Add message string if not already into array

                 setEventMessage($mesgs, $style);

             }

         }

@@ -6282,22 +6601,25 @@ 
     {

 // Show mesgs

         if (isset($_SESSION['dol_events']['mesgs'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+            }
             unset($_SESSION['dol_events']['mesgs']);

         }

 

 // Show errors

         if (isset($_SESSION['dol_events']['errors'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+            }
             unset($_SESSION['dol_events']['errors']);

         }

 

 // Show warnings

         if (isset($_SESSION['dol_events']['warnings'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+            }
             unset($_SESSION['dol_events']['warnings']);

         }

     }

@@ -6338,8 +6660,9 @@ 
                 foreach ($mesgarray as $message) {

                     $ret++;

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

-                    if ($ret < count($mesgarray))

-                        $out .= "<br>\n";

+                    if ($ret < count($mesgarray)) {
+                                            $out .= "<br>\n";
+                    }
                 }

             }

             if ($mesgstring) {

@@ -6405,8 +6728,9 @@ 
      */

     static function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0)

     {

-        if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0))

-            return;

+        if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {
+                    return;
+        }
 

         $iserror = 0;

         $iswarning = 0;

@@ -6421,14 +6745,17 @@ 
                     break;

                 }

             }

-        } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring))

-            $iserror++;

-        else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring))

-            $iswarning++;

-        if ($style == 'error')

-            $iserror++;

-        if ($style == 'warning')

-            $iswarning++;

+        } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {
+                    $iserror++;
+        } else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {
+                    $iswarning++;
+        }
+        if ($style == 'error') {
+                    $iserror++;
+        }
+        if ($style == 'warning') {
+                    $iswarning++;
+        }
 

         if ($iserror || $iswarning) {

 // Remove div from texts

@@ -6447,8 +6774,9 @@ 
                 $mesgarray = $newmesgarray;

             }

             print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);

-        } else

-            print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);

+        } else {
+                    print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+        }
     }

 

     /**

@@ -6489,15 +6817,17 @@ 
             $sizearray = count($array);

             if ($sizearray > 0) {

                 $temp = array();

-                foreach (array_keys($array) as $key)

-                    $temp[$key] = $array[$key][$index];

+                foreach (array_keys($array) as $key) {
+                                    $temp[$key] = $array[$key][$index];
+                }
 

-                if (!$natsort)

-                    ($order == 'asc') ? asort($temp) : arsort($temp);

-                else {

+                if (!$natsort) {
+                                    ($order == 'asc') ? asort($temp) : arsort($temp);
+                } else {

                     ($case_sensitive) ? natsort($temp) : natcasesort($temp);

-                    if ($order != 'asc')

-                        $temp = array_reverse($temp, true);

+                    if ($order != 'asc') {
+                                            $temp = array_reverse($temp, true);
+                    }
                 }

 

                 $sorted = array();

@@ -6523,23 +6853,38 @@ 
 // We must use here a binary strlen static function (so not dol_strlen)

         $strLength = dol_strlen($str);

         for ($i = 0; $i < $strLength; $i++) {

-            if (ord($str[$i]) < 0x80)

-                continue; // 0bbbbbbb

-            elseif ((ord($str[$i]) & 0xE0) == 0xC0)

-                $n = 1; // 110bbbbb

-            elseif ((ord($str[$i]) & 0xF0) == 0xE0)

-                $n = 2; // 1110bbbb

-            elseif ((ord($str[$i]) & 0xF8) == 0xF0)

-                $n = 3; // 11110bbb

-            elseif ((ord($str[$i]) & 0xFC) == 0xF8)

-                $n = 4; // 111110bb

-            elseif ((ord($str[$i]) & 0xFE) == 0xFC)

-                $n = 5; // 1111110b

-            else

-                return false; // Does not match any model

+            if (ord($str[$i]) < 0x80) {
+                            continue;
+            }
+            // 0bbbbbbb

+            elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+                            $n = 1;
+            }
+            // 110bbbbb

+            elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+                            $n = 2;
+            }
+            // 1110bbbb

+            elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+                            $n = 3;
+            }
+            // 11110bbb

+            elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+                            $n = 4;
+            }
+            // 111110bb

+            elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+                            $n = 5;
+            }
+            // 1111110b

+            else {
+                            return false;
+            }
+            // Does not match any model

             for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?

-                if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))

-                    return false;

+                if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+                                    return false;
+                }
             }

         }

         return true;

@@ -6557,15 +6902,21 @@ 
        // global Globals::$conf;

 

         $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

-        if (empty($tmp) && !empty($_SERVER["WINDIR"]))

-            $tmp = 'iso-8859-1'; // By default for windows

-        if (empty($tmp))

-            $tmp = 'utf-8';          // By default for other

-        if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING))

-            $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;

-

-        if ($tmp == 'iso-8859-1')

-            return utf8_decode($str);

+        if (empty($tmp) && !empty($_SERVER["WINDIR"])) {
+                    $tmp = 'iso-8859-1';
+        }
+        // By default for windows

+        if (empty($tmp)) {
+                    $tmp = 'utf-8';
+        }
+        // By default for other

+        if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING)) {
+                    $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;
+        }
+

+        if ($tmp == 'iso-8859-1') {
+                    return utf8_decode($str);
+        }
         return $str;

     }

 

@@ -6586,8 +6937,9 @@ 
     {

        // global $cache_codes;

 // If key empty

-        if ($key == '')

-            return '';

+        if ($key == '') {
+                    return '';
+        }
 

 // Check in cache

         if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

@@ -6599,20 +6951,21 @@ 
         $sql = "SELECT " . $fieldid . " as valuetoget";

         $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

         $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

-        if (!empty($entityfilter))

-            $sql .= " AND entity IN (" . getEntity($tablename) . ")";

+        if (!empty($entityfilter)) {
+                    $sql .= " AND entity IN (" . getEntity($tablename) . ")";
+        }
 

         $resql = $db->query($sql);

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($obj)

-                $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;

-            else

-                $cache_codes[$tablename][$key][$fieldid] = '';

+            if ($obj) {
+                            $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+            } else {
+                            $cache_codes[$tablename][$key][$fieldid] = '';
+            }
             $db->free($resql);

             return $cache_codes[$tablename][$key][$fieldid];

-        }

-        else {

+        } else {

             return -1;

         }

     }

@@ -6658,16 +7011,17 @@ 
         // global $soc;       // For backward compatibility

 //print $s."<br>\n";

         if ($returnvalue) {

-            if ($hideerrors)

-                return @eval('return ' . $s . ';');

-            else

-                return eval('return ' . $s . ';');

-        }

-        else {

-            if ($hideerrors)

-                @eval($s);

-            else

-                eval($s);

+            if ($hideerrors) {
+                            return @eval('return ' . $s . ';');
+            } else {
+                            return eval('return ' . $s . ';');
+            }
+        } else {

+            if ($hideerrors) {
+                            @eval($s);
+            } else {
+                            eval($s);
+            }
         }

     }

 

@@ -6693,8 +7047,9 @@ 
     {

        // global Globals::$langs;

 

-        if (empty($codelang))

-            return '';

+        if (empty($codelang)) {
+                    return '';
+        }
 

         if ($codelang == 'auto') {

             return '<span class="fa fa-globe"></span>';

@@ -6708,9 +7063,9 @@ 
             'sv_SV' => 'se'

         );

 

-        if (isset($langtocountryflag[$codelang]))

-            $flagImage = $langtocountryflag[$codelang];

-        else {

+        if (isset($langtocountryflag[$codelang])) {
+                    $flagImage = $langtocountryflag[$codelang];
+        } else {

             $tmparray = explode('_', $codelang);

             $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

         }

@@ -6728,15 +7083,20 @@ 
     {

        // global $mysoc;

 

-        if (strtoupper($countrycode) == 'MQ')

-            return 'fr_CA';

-        if (strtoupper($countrycode) == 'SE')

-            return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

+        if (strtoupper($countrycode) == 'MQ') {
+                    return 'fr_CA';
+        }
+        if (strtoupper($countrycode) == 'SE') {
+                    return 'sv_SE';
+        }
+        // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

         if (strtoupper($countrycode) == 'CH') {

-            if ($mysoc->country_code == 'FR')

-                return 'fr_CH';

-            if ($mysoc->country_code == 'DE')

-                return 'de_CH';

+            if ($mysoc->country_code == 'FR') {
+                            return 'fr_CH';
+            }
+            if ($mysoc->country_code == 'DE') {
+                            return 'de_CH';
+            }
         }

 

 // Locale list taken from:

@@ -6914,8 +7274,9 @@ 
         );

 

         $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

-        if (in_array($buildprimarykeytotest, $locales))

-            return strtolower($countrycode) . '_' . strtoupper($countrycode);

+        if (in_array($buildprimarykeytotest, $locales)) {
+                    return strtolower($countrycode) . '_' . strtoupper($countrycode);
+        }
 

         foreach ($locales as $locale) {

             $locale_language = locale_get_primary_language($locale);

@@ -6969,18 +7330,21 @@ 
 

                 if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {

                     if (count($values) == 6) {       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'

-                        if ($values[0] != $type)

-                            continue;

+                        if ($values[0] != $type) {
+                                                    continue;
+                        }
 

                         if (verifCond($values[4])) {

-                            if ($values[3])

-                                Globals::$langs->load($values[3]);

+                            if ($values[3]) {
+                                                            Globals::$langs->load($values[3]);
+                            }
                             if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                                 $substitutionarray = array();

                                 complete_substitutions_array($substitutionarray, Globals::$langs, $object, array('needforkey' => $values[2]));

                                 $label = make_substitutions($reg[1], $substitutionarray);

-                            } else

-                                $label = Globals::$langs->trans($values[2]);

+                            } else {
+                                                            $label = Globals::$langs->trans($values[2]);
+                            }
 

                             //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

                             $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

@@ -6988,30 +7352,32 @@ 
                             $head[$h][2] = str_replace('+', '', $values[1]);

                             $h++;

                         }

-                    }

-                    else if (count($values) == 5) {       // deprecated

+                    } else if (count($values) == 5) {       // deprecated

                         dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);

 

-                        if ($values[0] != $type)

-                            continue;

-                        if ($values[3])

-                            Globals::$langs->load($values[3]);

+                        if ($values[0] != $type) {
+                                                    continue;
+                        }
+                        if ($values[3]) {
+                                                    Globals::$langs->load($values[3]);
+                        }
                         if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                             $substitutionarray = array();

                             complete_substitutions_array($substitutionarray, Globals::$langs, $object, array('needforkey' => $values[2]));

                             $label = make_substitutions($reg[1], $substitutionarray);

-                        } else

-                            $label = Globals::$langs->trans($values[2]);

+                        } else {
+                                                    $label = Globals::$langs->trans($values[2]);
+                        }
 

                         $head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);

                         $head[$h][1] = $label;

                         $head[$h][2] = str_replace('+', '', $values[1]);

                         $h++;

                     }

-                }

-                else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

-                    if ($values[0] != $type)

-                        continue;

+                } else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

+                    if ($values[0] != $type) {
+                                            continue;
+                    }
                     $tabname = str_replace('-', '', $values[1]);

                     foreach ($head as $key => $val) {

                         $condition = (!empty($values[3]) ? verifCond($values[3]) : 1);

@@ -7053,10 +7419,11 @@ 
         // global $action;

         // global $micro_start_time;

 

-        if ($zone == 'private')

-            print "\n" . '<!-- Common footer for private page -->' . "\n";

-        else

-            print "\n" . '<!-- Common footer for public page -->' . "\n";

+        if ($zone == 'private') {
+                    print "\n" . '<!-- Common footer for private page -->' . "\n";
+        } else {
+                    print "\n" . '<!-- Common footer for public page -->' . "\n";
+        }
 

 // A div to store page_y POST parameter so we can read it using javascript

         print "\n<!-- A div to store page_y POST paramater -->\n";

@@ -7065,8 +7432,9 @@ 
         $parameters = array();

         $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks

         if (empty($reshook)) {

-            if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER))

-                print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";

+            if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER)) {
+                            print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";
+            }
 

             print "\n";

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

@@ -7089,8 +7457,9 @@ 
                     print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

                     $relativepathstring = $_SERVER["PHP_SELF"];

                     // Clean $relativepathstring

-                    if (constant('DOL_BASE_URI'))

-                        $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);

+                    if (constant('DOL_BASE_URI')) {
+                                            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                    }
                     $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

                     $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7101,14 +7470,17 @@ 
                                 $tmpqueryarraytohave = explode('&', $defkey);

                                 $foundintru = 0;

                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                        $foundintru = 1;

+                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                            $foundintru = 1;
+                                    }
                                 }

-                                if (!$foundintru)

-                                    $qualified = 1;

+                                if (!$foundintru) {
+                                                                    $qualified = 1;
+                                }
                                 //var_dump($defkey.'-'.$qualified);

-                            } else

-                                $qualified = 1;

+                            } else {
+                                                            $qualified = 1;
+                            }
 

                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

@@ -7127,14 +7499,17 @@ 
                                 $tmpqueryarraytohave = explode('&', $defkey);

                                 $foundintru = 0;

                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                        $foundintru = 1;

+                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                            $foundintru = 1;
+                                    }
                                 }

-                                if (!$foundintru)

-                                    $qualified = 1;

+                                if (!$foundintru) {
+                                                                    $qualified = 1;
+                                }
                                 //var_dump($defkey.'-'.$qualified);

-                            } else

-                                $qualified = 1;

+                            } else {
+                                                            $qualified = 1;
+                            }
 

                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

@@ -7173,8 +7548,9 @@ 
                     print "\n";

                     print "/* JS CODE TO ENABLE to add memory info */\n";

                     print 'window.console && console.log("';

-                    if (!empty(Globals::$conf->global->MEMCACHED_SERVER))

-                        print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';

+                    if (!empty(Globals::$conf->global->MEMCACHED_SERVER)) {
+                                            print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';
+                    }
                     print 'MAIN_OPTIMIZE_SPEED=' . (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                     if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in// global variable.

                         $micro_end_time = microtime(true);

@@ -7304,8 +7680,9 @@ 
 

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

         $res = '';

-        if (!is_array($fields))

-            $fields = array($fields);

+        if (!is_array($fields)) {
+                    $fields = array($fields);
+        }
 

         $nboffields = count($fields);

         $end2 = count($crits);

@@ -7368,8 +7745,9 @@ 
                     $tmpcrits = explode('|', $crit);

                     $i3 = 0;

                     foreach ($tmpcrits as $tmpcrit) {

-                        if (empty($tmpcrit))

-                            continue;

+                        if (empty($tmpcrit)) {
+                                                    continue;
+                        }
 

                         $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

@@ -7405,8 +7783,9 @@ 
                 }

                 $i++;

             }

-            if ($newres)

-                $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+            if ($newres) {
+                            $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');
+            }
             $j++;

         }

         $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

@@ -7446,29 +7825,37 @@ 
     static function getImageFileNameForSize($file, $extName, $extImgTarget = '')

     {

         $dirName = dirname($file);

-        if ($dirName == '.')

-            $dirName = '';

+        if ($dirName == '.') {
+                    $dirName = '';
+        }
 

         $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove extension, whatever is its case

         $fileName = basename($fileName);

 

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');

-

-        if (!$extImgTarget)

-            return $file;

+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+        }
+

+        if (!$extImgTarget) {
+                    return $file;
+        }
 

         $subdir = '';

-        if ($extName)

-            $subdir = 'thumbs/';

+        if ($extName) {
+                    $subdir = 'thumbs/';
+        }
 

         return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

     }

@@ -7486,8 +7873,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if (empty(Globals::$conf->use_javascript_ajax))

-            return '';

+        if (empty(Globals::$conf->use_javascript_ajax)) {
+                    return '';
+        }
 

         $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');

 //$mime_preview[]='vnd.oasis.opendocument.presentation';

@@ -7495,17 +7883,19 @@ 
         $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);

 

         if ($alldata == 1) {

-            if ($num_mime !== false)

-                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

-            else

-                return array();

+            if ($num_mime !== false) {
+                            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);
+            } else {
+                            return array();
+            }
         }

 

 // old behavior

-        if ($num_mime !== false)

-            return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';

-        else

-            return '';

+        if ($num_mime !== false) {
+                    return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';
+        } else {
+                    return '';
+        }
     }

 

     /**

@@ -7523,8 +7913,9 @@ 
 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

-        if ($addlink)

-            $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>';

+        if ($addlink) {
+                    $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>';
+        }
         return $out;

     }

 

@@ -7906,8 +8297,9 @@ 
         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

             $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

-            if ($checkentity)

-                $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+            if ($checkentity) {
+                            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+            }
 

             $resql = $db->query($sql);

             if ($resql) {

@@ -7919,11 +8311,14 @@ 
             }

         }

 

-        if (!empty($dictvalues[$tablename][$id]))

-            return $dictvalues[$tablename][$id]->{$field}; // Found

+        if (!empty($dictvalues[$tablename][$id])) {
+                    return $dictvalues[$tablename][$id]->{$field};
+        }
+        // Found

         else { // Not found

-            if ($id > 0)

-                return $id;

+            if ($id > 0) {
+                            return $id;
+            }
             return '';

         }

     }

@@ -7953,8 +8348,9 @@ 
                 $b = hexdec($hexb);

             }

             $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

-            if ($bright > 0.6)

-                $res = 1;

+            if ($bright > 0.6) {
+                            $res = 1;
+            }
         }

         return $res;

     }

@@ -7972,8 +8368,10 @@ 
        // global Globals::$conf;

 //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];

 //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);

-        if (empty($menuentry['enabled']))

-            return 0; // Entry disabled by condition

+        if (empty($menuentry['enabled'])) {
+                    return 0;
+        }
+        // Entry disabled by condition

         if ($type_user && $menuentry['module']) {

             $tmploops = explode('|', $menuentry['module']);

             $found = 0;

@@ -7983,15 +8381,23 @@ 
                     break;

                 }

             }

-            if (!$found)

-                return 0; // Entry is for menus all excluded to external users

-        }

-        if (!$menuentry['perms'] && $type_user)

-            return 0;            // No permissions and user is external

-        if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

-            return 0; // No permissions and option to hide when not allowed, even for internal user, is on

-        if (!$menuentry['perms'])

-            return 2;               // No permissions and user is external

+            if (!$found) {
+                            return 0;
+            }
+            // Entry is for menus all excluded to external users

+        }

+        if (!$menuentry['perms'] && $type_user) {
+                    return 0;
+        }
+        // No permissions and user is external

+        if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+                    return 0;
+        }
+        // No permissions and option to hide when not allowed, even for internal user, is on

+        if (!$menuentry['perms']) {
+                    return 2;
+        }
+        // No permissions and user is external

         return 1;

     }

 

Helpers/EldyLib.php

Spacing +409 added lines, -409 removed lines

@@ -412,14 +412,14 @@ 
                     $param = (isset($tmp[1]) ? $tmp[1] : '');

 

                     if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) {

-                        $param .= ($param ? '&' : '') . 'mainmenu=' . $newTabMenu[$i]['mainmenu'] . '&leftmenu=';

+                        $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';

                     }

 //$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad

-                    $url = DolUtils::dol_buildpath($url, 1) . ($param ? '?' . $param : '');

+                    $url = DolUtils::dol_buildpath($url, 1).($param ? '?'.$param : '');

 //$shorturl = $shorturl.($param?'?'.$param:'');

                     $shorturl = $url;

                     if (BASE_URI) {

-                        $shorturl = preg_replace('/^' . preg_quote(BASE_URI, '/') . '/', '', $shorturl);

+                        $shorturl = preg_replace('/^'.preg_quote(BASE_URI, '/').'/', '', $shorturl);

                     }

                 }

 

@@ -445,7 +445,7 @@ 
         if (empty($noout)) {

             foreach ($menu->liste as $menkey => $menuval) {

                 self::print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);

-                self::print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? BASE_URI : '') . $menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));

+                self::print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? BASE_URI : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));

                 self::print_end_menu_entry($menuval['enabled']);

             }

         }

@@ -470,7 +470,7 @@ 
         global $conf;

 

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

-        print '<ul class="tmenu"' . (empty(Conf::$global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"') . '>';

+        print '<ul class="tmenu"'.(empty(Conf::$global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';

     }

 

     /**

@@ -484,7 +484,7 @@ 
     static function print_start_menu_entry($idsel, $classname, $showmode)

     {

         if ($showmode) {

-            print '<li ' . $classname . ' id="mainmenutd_' . $idsel . '">';

+            print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';

 //print '<div class="tmenuleft tmenusep"></div>';

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

         }

@@ -507,17 +507,17 @@ 
         // global Globals::$langs;

 

         if ($showmode == 1) {

-            print '<a class="tmenuimage" tabindex="-1" href="' . $url . '"' . ($atarget ? ' target="' . $atarget . '"' : '') . '>';

-            print '<div class="' . $id . ' ' . $idsel . ' topmenuimage"><span class="' . $id . ' tmenuimage" id="mainmenuspan_' . $idsel . '"></span></div>';

+            print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';

+            print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';

             print '</a>';

-            print '<a ' . $classname . ' id="mainmenua_' . $idsel . '" href="' . $url . '"' . ($atarget ? ' target="' . $atarget . '"' : '') . '>';

+            print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';

             print '<span class="mainmenuaspan">';

             print $text;

             print '</span>';

             print '</a>';

         } elseif ($showmode == 2) {

-            print '<div class="' . $id . ' ' . $idsel . ' topmenuimage tmenudisabled"><span class="' . $id . '" id="mainmenuspan_' . $idsel . '"></span></div>';

-            print '<a class="tmenudisabled" id="mainmenua_' . $idsel . '" href="#" title="' . dol_escape_htmltag(Globals::$langs->trans("NotAllowed")) . '">';

+            print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';

+            print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag(Globals::$langs->trans("NotAllowed")).'">';

             print '<span class="mainmenuaspan">';

             print $text;

             print '</span>';

@@ -581,38 +581,38 @@ 
 // Show logo company

         if (empty(Conf::$global->MAIN_MENU_INVERT) && empty($noout) && !empty(Conf::$global->MAIN_SHOW_LOGO) && empty(Conf::$global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

             $mysoc->logo_mini = Conf::$global->MAIN_INFO_SOCIETE_LOGO_MINI;

-            if (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_mini)) {

-                $urllogo = DOL_BASE_URI . '/viewimage.php?cache=1&modulepart=mycompany&file=' . urlencode('logos/thumbs/' . $mysoc->logo_mini);

+            if (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {

+                $urllogo = DOL_BASE_URI.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);

             } else {

-                $urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';

+                $urllogo = DOL_BASE_URI.'/theme/dolibarr_logo.png';

             }

             $title = Globals::$langs->trans("GoIntoSetupToChangeLogo");

-            print "\n" . '<!-- Show logo on menu -->' . "\n";

-            print '<div class="blockvmenuimpair blockvmenulogo">' . "\n";

+            print "\n".'<!-- Show logo on menu -->'."\n";

+            print '<div class="blockvmenuimpair blockvmenulogo">'."\n";

             print '<div class="menu_titre" id="menu_titre_logo"></div>';

             print '<div class="menu_top" id="menu_top_logo"></div>';

             print '<div class="menu_contenu" id="menu_contenu_logo">';

-            print '<div class="center"><img class="mycompany" title="' . dol_escape_htmltag($title) . '" alt="" src="' . $urllogo . '" style="max-width: 70%"></div>' . "\n";

+            print '<div class="center"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 70%"></div>'."\n";

             print '</div>';

             print '<div class="menu_end" id="menu_end_logo"></div>';

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

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

         }

 

         if (is_array($moredata) && !empty($moredata['searchform'])) { // searchform can contains select2 code or link to show old search form or link to switch on search page

             print "\n";

             print "<!-- Begin SearchForm -->\n";

-            print '<div id="blockvmenusearch" class="blockvmenusearch">' . "\n";

+            print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";

             print $moredata['searchform'];

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

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

             print "<!-- End SearchForm -->\n";

         }

 

         if (is_array($moredata) && !empty($moredata['bookmarks'])) {

             print "\n";

             print "<!-- Begin Bookmarks -->\n";

-            print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">' . "\n";

+            print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";

             print $moredata['bookmarks'];

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

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

             print "<!-- End Bookmarks -->\n";

         }

 

@@ -629,11 +629,11 @@ 
 

 // Home - dashboard

 //$newmenu->add("/index.php?mainmenu=home&leftmenu=home", Globals::$langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright"></i>');

-                $newmenu->add(BASE_URI . "?controller=home&method=home&mainmenu=home&leftmenu=home", Globals::$langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright"></i>');

+                $newmenu->add(BASE_URI."?controller=home&method=home&mainmenu=home&leftmenu=home", Globals::$langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright"></i>');

 

 // Setup

 //$newmenu->add("/admin/index.php?mainmenu=home&leftmenu=setup", Globals::$langs->trans("Setup"), 0, Globals::$user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright"></i>');

-                $newmenu->add(BASE_URI . "?controller=admin&method=index&mainmenu=home&leftmenu=setup", Globals::$langs->trans("Setup"), 0, Globals::$user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright"></i>');

+                $newmenu->add(BASE_URI."?controller=admin&method=index&mainmenu=home&leftmenu=setup", Globals::$langs->trans("Setup"), 0, Globals::$user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright"></i>');

 

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup") {

 // Load translation files required by the page

@@ -642,14 +642,14 @@ 
                     $warnpicto = '';

                     if (empty(Conf::$global->MAIN_INFO_SOCIETE_NOM) || empty(Conf::$global->MAIN_INFO_SOCIETE_COUNTRY)) {

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

-                        $warnpicto = ' ' . img_warning(Globals::$langs->trans("WarningMandatorySetupNotComplete"));

+                        $warnpicto = ' '.img_warning(Globals::$langs->trans("WarningMandatorySetupNotComplete"));

                     }

 //$newmenu->add("/admin/company.php?mainmenu=home", Globals::$langs->trans("MenuCompanySetup") . $warnpicto, 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=company&mainmenu=home", Globals::$langs->trans("MenuCompanySetup") . $warnpicto, 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=company&mainmenu=home", Globals::$langs->trans("MenuCompanySetup").$warnpicto, 1);

                     $warnpicto = '';

                     if (count($conf->modules) <= (empty(Conf::$global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : Conf::$global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) { // If only user module enabled

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

-                        $warnpicto = ' ' . img_warning(Globals::$langs->trans("WarningMandatorySetupNotComplete"));

+                        $warnpicto = ' '.img_warning(Globals::$langs->trans("WarningMandatorySetupNotComplete"));

                     }

                     /*

                       $newmenu->add("/admin/modules.php?mainmenu=home", Globals::$langs->trans("Modules") . $warnpicto, 1);

@@ -668,42 +668,42 @@ 
                       $newmenu->add("/admin/dict.php?mainmenu=home", Globals::$langs->trans("Dictionary"), 1);

                       $newmenu->add("/admin/const.php?mainmenu=home", Globals::$langs->trans("OtherSetup"), 1);

                      */

-                    $newmenu->add(BASE_URI . "?controller=admin&method=modules&mainmenu=home", Globals::$langs->trans("Modules") . $warnpicto, 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=menus&mainmenu=home", Globals::$langs->trans("Menus"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=ihm&mainmenu=home", Globals::$langs->trans("GUISetup"), 1);

-

-                    $newmenu->add(BASE_URI . "?controller=admin&method=translation&mainmenu=home", Globals::$langs->trans("Translation"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=defaultvalues&mainmenu=home", Globals::$langs->trans("DefaultValues"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=boxes&mainmenu=home", Globals::$langs->trans("Boxes"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=delais&mainmenu=home", Globals::$langs->trans("MenuWarnings"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=security_other&mainmenu=home", Globals::$langs->trans("Security"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=limits&mainmenu=home", Globals::$langs->trans("MenuLimits"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=pdf&mainmenu=home", Globals::$langs->trans("PDF"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=mails&mainmenu=home", Globals::$langs->trans("Emails"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=sms&mainmenu=home", Globals::$langs->trans("SMS"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=dict&mainmenu=home", Globals::$langs->trans("Dictionary"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin&method=const&mainmenu=home", Globals::$langs->trans("OtherSetup"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=modules&mainmenu=home", Globals::$langs->trans("Modules").$warnpicto, 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=menus&mainmenu=home", Globals::$langs->trans("Menus"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=ihm&mainmenu=home", Globals::$langs->trans("GUISetup"), 1);

+

+                    $newmenu->add(BASE_URI."?controller=admin&method=translation&mainmenu=home", Globals::$langs->trans("Translation"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=defaultvalues&mainmenu=home", Globals::$langs->trans("DefaultValues"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=boxes&mainmenu=home", Globals::$langs->trans("Boxes"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=delais&mainmenu=home", Globals::$langs->trans("MenuWarnings"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=security_other&mainmenu=home", Globals::$langs->trans("Security"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=limits&mainmenu=home", Globals::$langs->trans("MenuLimits"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=pdf&mainmenu=home", Globals::$langs->trans("PDF"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=mails&mainmenu=home", Globals::$langs->trans("Emails"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=sms&mainmenu=home", Globals::$langs->trans("SMS"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=dict&mainmenu=home", Globals::$langs->trans("Dictionary"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin&method=const&mainmenu=home", Globals::$langs->trans("OtherSetup"), 1);

                 }

 

 // System tools

 //$newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", Globals::$langs->trans("AdminTools"), 0, Globals::$user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');

-                $newmenu->add(BASE_URI . "?controller=admin/tools&method=index&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("AdminTools"), 0, Globals::$user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');

+                $newmenu->add(BASE_URI."?controller=admin/tools&method=index&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("AdminTools"), 0, Globals::$user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');

 

                 if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu)) {

 // Load translation files required by the page

                     Globals::$langs->loadLangs(array('admin', 'help'));

 

 //$newmenu->add('/admin/system/dolibarr.php?mainmenu=home&leftmenu=admintools_info', Globals::$langs->trans('InfoDolibarr'), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin/system&method=dolibarr&mainmenu=home&leftmenu=admintools_info", Globals::$langs->trans('InfoDolibarr'), 1);

+                    $newmenu->add(BASE_URI."?controller=admin/system&method=dolibarr&mainmenu=home&leftmenu=admintools_info", Globals::$langs->trans('InfoDolibarr'), 1);

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == 'admintools_info') {

                         /*

                           $newmenu->add('/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info', Globals::$langs->trans('Modules'), 2);

                           $newmenu->add('/admin/triggers.php?mainmenu=home&leftmenu=admintools_info', Globals::$langs->trans('Triggers'), 2);

                           $newmenu->add('/admin/system/filecheck.php?mainmenu=home&leftmenu=admintools_info', Globals::$langs->trans('FileCheck'), 2);

                          */

-                        $newmenu->add(BASE_URI . '?controller=admin/system&method=modules&mainmenu=home&leftmenu=admintools_info', Globals::$langs->trans('Modules'), 2);

-                        $newmenu->add(BASE_URI . '?controller=admin&method=triggers&mainmenu=home&leftmenu=admintools_info', Globals::$langs->trans('Triggers'), 2);

-                        $newmenu->add(BASE_URI . '?controller=admin/system&method=filecheck&mainmenu=home&leftmenu=admintools_info', Globals::$langs->trans('FileCheck'), 2);

+                        $newmenu->add(BASE_URI.'?controller=admin/system&method=modules&mainmenu=home&leftmenu=admintools_info', Globals::$langs->trans('Modules'), 2);

+                        $newmenu->add(BASE_URI.'?controller=admin&method=triggers&mainmenu=home&leftmenu=admintools_info', Globals::$langs->trans('Triggers'), 2);

+                        $newmenu->add(BASE_URI.'?controller=admin/system&method=filecheck&mainmenu=home&leftmenu=admintools_info', Globals::$langs->trans('FileCheck'), 2);

                     }

                     /*

                       $newmenu->add('/admin/system/browser.php?mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoBrowser'), 1);

@@ -723,33 +723,33 @@ 
                       $newmenu->add("/admin/tools/listsessions.php?mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Sessions"), 1);

                       $newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools', Globals::$langs->trans('ExternalResources'), 1);

                      */

-                    $newmenu->add(BASE_URI . '?controller=admin/system&method=browser&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoBrowser'), 1);

-                    $newmenu->add(BASE_URI . '?controller=admin/system&method=os&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoOS'), 1);

-                    $newmenu->add(BASE_URI . '?controller=admin/system&method=web&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoWebServer'), 1);

-                    $newmenu->add(BASE_URI . '?controller=admin/system&method=phpinfo&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoPHP'), 1);

+                    $newmenu->add(BASE_URI.'?controller=admin/system&method=browser&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoBrowser'), 1);

+                    $newmenu->add(BASE_URI.'?controller=admin/system&method=os&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoOS'), 1);

+                    $newmenu->add(BASE_URI.'?controller=admin/system&method=web&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoWebServer'), 1);

+                    $newmenu->add(BASE_URI.'?controller=admin/system&method=phpinfo&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoPHP'), 1);

 //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', Globals::$langs->trans('XDebug'),1);

-                    $newmenu->add(BASE_URI . '?controller=admin/system&method=database&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoDatabase'), 1);

+                    $newmenu->add(BASE_URI.'?controller=admin/system&method=database&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('InfoDatabase'), 1);

                     if (function_exists('eaccelerator_info')) {

-                        $newmenu->add(BASE_URI . "?controller=admin/tools&method=eaccelerator&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("EAccelerator"), 1);

+                        $newmenu->add(BASE_URI."?controller=admin/tools&method=eaccelerator&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("EAccelerator"), 1);

                     }

 //$newmenu->add("/admin/system/perf.php?mainmenu=home&leftmenu=admintools", Globals::$langs->trans("InfoPerf"),1);

-                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=dolibarr_export&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Backup"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=dolibarr_import&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Restore"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=update&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("MenuUpgrade"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=purge&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Purge"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=listevents&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Audit"), 1);

-                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=listsessions&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Sessions"), 1);

-                    $newmenu->add(BASE_URI . '?controller=admin/system&method=about&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('ExternalResources'), 1);

+                    $newmenu->add(BASE_URI."?controller=admin/tools&method=dolibarr_export&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Backup"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin/tools&method=dolibarr_import&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Restore"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin/tools&method=update&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("MenuUpgrade"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin/tools&method=purge&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Purge"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin/tools&method=listevents&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Audit"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin/tools&method=listsessions&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("Sessions"), 1);

+                    $newmenu->add(BASE_URI.'?controller=admin/system&method=about&mainmenu=home&leftmenu=admintools', Globals::$langs->trans('ExternalResources'), 1);

 

                     if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {

                         Globals::$langs->load("products");

 //$newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=admintools", Globals::$langs->trans("ProductVatMassChange"), 1, Globals::$user->admin);

-                        $newmenu->add(BASE_URI . "?controller=product/admin&method=product_tools&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("ProductVatMassChange"), 1, Globals::$user->admin);

+                        $newmenu->add(BASE_URI."?controller=product/admin&method=product_tools&mainmenu=home&leftmenu=admintools", Globals::$langs->trans("ProductVatMassChange"), 1, Globals::$user->admin);

                     }

                 }

 

 //$newmenu->add("/user/home.php?leftmenu=users", Globals::$langs->trans("MenuUsersAndGroups"), 0, Globals::$user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', '<i class="fa fa-users fa-fw paddingright"></i>');

-                $newmenu->add(BASE_URI . "?controller=user&method=home&leftmenu=users", Globals::$langs->trans("MenuUsersAndGroups"), 0, Globals::$user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', '<i class="fa fa-users fa-fw paddingright"></i>');

+                $newmenu->add(BASE_URI."?controller=user&method=home&leftmenu=users", Globals::$langs->trans("MenuUsersAndGroups"), 0, Globals::$user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', '<i class="fa fa-users fa-fw paddingright"></i>');

                 if (Globals::$user->rights->user->user->lire) {

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {

                         $newmenu->add("", Globals::$langs->trans("Users"), 1, Globals::$user->rights->user->user->lire || Globals::$user->admin);

@@ -765,16 +765,16 @@ 
                           $newmenu->add("/user/group/card.php?leftmenu=users&action=create", Globals::$langs->trans("NewGroup"), 2, ((Conf::$global->MAIN_USE_ADVANCED_PERMS ? Globals::$user->rights->user->group_advance->write : Globals::$user->rights->user->user->creer) || Globals::$user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && Conf::$global->MULTICOMPANY_TRANSVERSE_MODE));

                           $newmenu->add("/user/group/list.php?leftmenu=users", Globals::$langs->trans("ListOfGroups"), 2, ((Conf::$global->MAIN_USE_ADVANCED_PERMS ? Globals::$user->rights->user->group_advance->read : Globals::$user->rights->user->user->lire) || Globals::$user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && Conf::$global->MULTICOMPANY_TRANSVERSE_MODE));

                          */

-                        $newmenu->add(BASE_URI . "?controller=user&method=card&leftmenu=users&action=create", Globals::$langs->trans("NewUser"), 2, (Globals::$user->rights->user->user->creer || Globals::$user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && Conf::$global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');

-                        $newmenu->add(BASE_URI . "?controller=user&method=list&leftmenu=users", Globals::$langs->trans("ListOfUsers"), 2, Globals::$user->rights->user->user->lire || Globals::$user->admin);

-                        $newmenu->add(BASE_URI . "?controller=user&method=hierarchy&leftmenu=users", Globals::$langs->trans("HierarchicView"), 2, Globals::$user->rights->user->user->lire || Globals::$user->admin);

+                        $newmenu->add(BASE_URI."?controller=user&method=card&leftmenu=users&action=create", Globals::$langs->trans("NewUser"), 2, (Globals::$user->rights->user->user->creer || Globals::$user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && Conf::$global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');

+                        $newmenu->add(BASE_URI."?controller=user&method=list&leftmenu=users", Globals::$langs->trans("ListOfUsers"), 2, Globals::$user->rights->user->user->lire || Globals::$user->admin);

+                        $newmenu->add(BASE_URI."?controller=user&method=hierarchy&leftmenu=users", Globals::$langs->trans("HierarchicView"), 2, Globals::$user->rights->user->user->lire || Globals::$user->admin);

                         if (!empty($conf->categorie->enabled)) {

                             Globals::$langs->load("categories");

-                            $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=users&type=7", Globals::$langs->trans("UsersCategoriesShort"), 2, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

+                            $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=users&type=7", Globals::$langs->trans("UsersCategoriesShort"), 2, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

                         }

                         $newmenu->add("", Globals::$langs->trans("Groups"), 1, (Globals::$user->rights->user->user->lire || Globals::$user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && Conf::$global->MULTICOMPANY_TRANSVERSE_MODE));

-                        $newmenu->add(BASE_URI . "?controller=user/group&method=card&leftmenu=users&action=create", Globals::$langs->trans("NewGroup"), 2, ((Conf::$global->MAIN_USE_ADVANCED_PERMS ? Globals::$user->rights->user->group_advance->write : Globals::$user->rights->user->user->creer) || Globals::$user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && Conf::$global->MULTICOMPANY_TRANSVERSE_MODE));

-                        $newmenu->add(BASE_URI . "?controller=user/group&method=list&leftmenu=users", Globals::$langs->trans("ListOfGroups"), 2, ((Conf::$global->MAIN_USE_ADVANCED_PERMS ? Globals::$user->rights->user->group_advance->read : Globals::$user->rights->user->user->lire) || Globals::$user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && Conf::$global->MULTICOMPANY_TRANSVERSE_MODE));

+                        $newmenu->add(BASE_URI."?controller=user/group&method=card&leftmenu=users&action=create", Globals::$langs->trans("NewGroup"), 2, ((Conf::$global->MAIN_USE_ADVANCED_PERMS ? Globals::$user->rights->user->group_advance->write : Globals::$user->rights->user->user->creer) || Globals::$user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && Conf::$global->MULTICOMPANY_TRANSVERSE_MODE));

+                        $newmenu->add(BASE_URI."?controller=user/group&method=list&leftmenu=users", Globals::$langs->trans("ListOfGroups"), 2, ((Conf::$global->MAIN_USE_ADVANCED_PERMS ? Globals::$user->rights->user->group_advance->read : Globals::$user->rights->user->user->lire) || Globals::$user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && Conf::$global->MULTICOMPANY_TRANSVERSE_MODE));

                     }

                 }

             }

@@ -787,26 +787,26 @@ 
                 if (!empty($conf->societe->enabled)) {

                     Globals::$langs->load("companies");

 //$newmenu->add("/societe/index.php?leftmenu=thirdparties", Globals::$langs->trans("ThirdParty"), 0, Globals::$user->rights->societe->lire, '', $mainmenu, 'thirdparties');

-                    $newmenu->add(BASE_URI . "?controller=societe&method=index&leftmenu=thirdparties", Globals::$langs->trans("ThirdParty"), 0, Globals::$user->rights->societe->lire, '', $mainmenu, 'thirdparties');

+                    $newmenu->add(BASE_URI."?controller=societe&method=index&leftmenu=thirdparties", Globals::$langs->trans("ThirdParty"), 0, Globals::$user->rights->societe->lire, '', $mainmenu, 'thirdparties');

 

                     if (Globals::$user->rights->societe->creer) {

 //$newmenu->add("/societe/card.php?action=create", Globals::$langs->trans("MenuNewThirdParty"), 1);

-                        $newmenu->add(BASE_URI . "?controller=societe&method=card&action=create", Globals::$langs->trans("MenuNewThirdParty"), 1);

+                        $newmenu->add(BASE_URI."?controller=societe&method=card&action=create", Globals::$langs->trans("MenuNewThirdParty"), 1);

                         if (!$conf->use_javascript_ajax) {

 //$newmenu->add("/societe/card.php?action=create&private=1", Globals::$langs->trans("MenuNewPrivateIndividual"), 1);

-                            $newmenu->add(BASE_URI . "?controller=societe&method=card&action=create&private=1", Globals::$langs->trans("MenuNewPrivateIndividual"), 1);

+                            $newmenu->add(BASE_URI."?controller=societe&method=card&action=create&private=1", Globals::$langs->trans("MenuNewPrivateIndividual"), 1);

                         }

                     }

                 }

 

 //$newmenu->add("/societe/list.php?leftmenu=thirdparties", Globals::$langs->trans("List"), 1);

-                $newmenu->add(BASE_URI . "?controller=societe&method=list&leftmenu=thirdparties", Globals::$langs->trans("List"), 1);

+                $newmenu->add(BASE_URI."?controller=societe&method=list&leftmenu=thirdparties", Globals::$langs->trans("List"), 1);

 

 // Prospects

                 if (!empty($conf->societe->enabled) && empty(Conf::$global->SOCIETE_DISABLE_PROSPECTS)) {

                     Globals::$langs->load("commercial");

 //$newmenu->add("/societe/list.php?type=p&leftmenu=prospects", Globals::$langs->trans("ListProspectsShort"), 1, Globals::$user->rights->societe->lire, '', $mainmenu, 'prospects');

-                    $newmenu->add(BASE_URI . "?controller=societe&method=list&type=p&leftmenu=prospects", Globals::$langs->trans("ListProspectsShort"), 1, Globals::$user->rights->societe->lire, '', $mainmenu, 'prospects');

+                    $newmenu->add(BASE_URI."?controller=societe&method=list&type=p&leftmenu=prospects", Globals::$langs->trans("ListProspectsShort"), 1, Globals::$user->rights->societe->lire, '', $mainmenu, 'prospects');

                     /* no more required, there is a filter that can do more

                       if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=-1", Globals::$langs->trans("LastProspectDoNotContact"), 2, Globals::$user->rights->societe->lire);

                       if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=0", Globals::$langs->trans("LastProspectNeverContacted"), 2, Globals::$user->rights->societe->lire);

@@ -815,7 +815,7 @@ 
                       if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=3", Globals::$langs->trans("LastProspectContactDone"), 2, Globals::$user->rights->societe->lire);

                      */

 //$newmenu->add("/societe/card.php?leftmenu=prospects&action=create&type=p", Globals::$langs->trans("MenuNewProspect"), 2, Globals::$user->rights->societe->creer);

-                    $newmenu->add(BASE_URI . "?controller=societe&method=card&leftmenu=prospects&action=create&type=p", Globals::$langs->trans("MenuNewProspect"), 2, Globals::$user->rights->societe->creer);

+                    $newmenu->add(BASE_URI."?controller=societe&method=card&leftmenu=prospects&action=create&type=p", Globals::$langs->trans("MenuNewProspect"), 2, Globals::$user->rights->societe->creer);

 //$newmenu->add("/contact/list.php?leftmenu=customers&type=p", Globals::$langs->trans("Contacts"), 2, Globals::$user->rights->societe->contact->lire);

                 }

 

@@ -823,10 +823,10 @@ 
                 if (!empty($conf->societe->enabled) && empty(Conf::$global->SOCIETE_DISABLE_CUSTOMERS)) {

                     Globals::$langs->load("commercial");

 //$newmenu->add("/societe/list.php?type=c&leftmenu=customers", Globals::$langs->trans("ListCustomersShort"), 1, Globals::$user->rights->societe->lire, '', $mainmenu, 'customers');

-                    $newmenu->add(BASE_URI . "?controller=societe&method=list&type=c&leftmenu=customers", Globals::$langs->trans("ListCustomersShort"), 1, Globals::$user->rights->societe->lire, '', $mainmenu, 'customers');

+                    $newmenu->add(BASE_URI."?controller=societe&method=list&type=c&leftmenu=customers", Globals::$langs->trans("ListCustomersShort"), 1, Globals::$user->rights->societe->lire, '', $mainmenu, 'customers');

 

 //$newmenu->add("/societe/card.php?leftmenu=customers&action=create&type=c", Globals::$langs->trans("MenuNewCustomer"), 2, Globals::$user->rights->societe->creer);

-                    $newmenu->add(BASE_URI . "?controller=societe&method=card&leftmenu=customers&action=create&type=c", Globals::$langs->trans("MenuNewCustomer"), 2, Globals::$user->rights->societe->creer);

+                    $newmenu->add(BASE_URI."?controller=societe&method=card&leftmenu=customers&action=create&type=c", Globals::$langs->trans("MenuNewCustomer"), 2, Globals::$user->rights->societe->creer);

 //$newmenu->add("/contact/list.php?leftmenu=customers&type=c", Globals::$langs->trans("Contacts"), 2, Globals::$user->rights->societe->contact->lire);

                 }

 

@@ -835,8 +835,8 @@ 
                     Globals::$langs->load("suppliers");

 //$newmenu->add("/societe/list.php?type=f&leftmenu=suppliers", Globals::$langs->trans("ListSuppliersShort"), 1, (Globals::$user->rights->fournisseur->lire || Globals::$user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');

 //$newmenu->add("/societe/card.php?leftmenu=suppliers&action=create&type=f", Globals::$langs->trans("MenuNewSupplier"), 2, Globals::$user->rights->societe->creer && (Globals::$user->rights->fournisseur->lire || Globals::$user->rights->supplier_proposal->lire));

-                    $newmenu->add(BASE_URI . "?controller=societe&method=list&type=f&leftmenu=suppliers", Globals::$langs->trans("ListSuppliersShort"), 1, (Globals::$user->rights->fournisseur->lire || Globals::$user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');

-                    $newmenu->add(BASE_URI . "?controller=societe&method=card&leftmenu=suppliers&action=create&type=f", Globals::$langs->trans("MenuNewSupplier"), 2, Globals::$user->rights->societe->creer && (Globals::$user->rights->fournisseur->lire || Globals::$user->rights->supplier_proposal->lire));

+                    $newmenu->add(BASE_URI."?controller=societe&method=list&type=f&leftmenu=suppliers", Globals::$langs->trans("ListSuppliersShort"), 1, (Globals::$user->rights->fournisseur->lire || Globals::$user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');

+                    $newmenu->add(BASE_URI."?controller=societe&method=card&leftmenu=suppliers&action=create&type=f", Globals::$langs->trans("MenuNewSupplier"), 2, Globals::$user->rights->societe->creer && (Globals::$user->rights->fournisseur->lire || Globals::$user->rights->supplier_proposal->lire));

                 }

 

 // Categories

@@ -852,12 +852,12 @@ 
                             $menutoshow = Globals::$langs->trans("ProspectsCategoriesShort");

                         }

 //$newmenu->add("/categories/index.php?leftmenu=cat&type=2", $menutoshow, 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

-                        $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=2", $menutoshow, 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

+                        $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=cat&type=2", $menutoshow, 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

                     }

 // Categories suppliers

                     if (!empty($conf->fournisseur->enabled)) {

 //$newmenu->add("/categories/index.php?leftmenu=catfournish&type=1", Globals::$langs->trans("SuppliersCategoriesShort"), 1, Globals::$user->rights->categorie->lire);

-                        $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=catfournish&type=1", Globals::$langs->trans("SuppliersCategoriesShort"), 1, Globals::$user->rights->categorie->lire);

+                        $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=catfournish&type=1", Globals::$langs->trans("SuppliersCategoriesShort"), 1, Globals::$user->rights->categorie->lire);

                     }

                 }

 

@@ -865,30 +865,30 @@ 
 //$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty(Conf::$global->SOCIETE_ADDRESSES_MANAGEMENT) ? Globals::$langs->trans("Contacts") : Globals::$langs->trans("ContactsAddresses")), 0, Globals::$user->rights->societe->contact->lire, '', $mainmenu, 'contacts');

 //$newmenu->add("/contact/card.php?leftmenu=contacts&action=create", (!empty(Conf::$global->SOCIETE_ADDRESSES_MANAGEMENT) ? Globals::$langs->trans("NewContact") : Globals::$langs->trans("NewContactAddress")), 1, Globals::$user->rights->societe->contact->creer);

 //$newmenu->add("/contact/list.php?leftmenu=contacts", Globals::$langs->trans("List"), 1, Globals::$user->rights->societe->contact->lire);

-                $newmenu->add(BASE_URI . "?controller=societe&method=index&leftmenu=thirdparties", (!empty(Conf::$global->SOCIETE_ADDRESSES_MANAGEMENT) ? Globals::$langs->trans("Contacts") : Globals::$langs->trans("ContactsAddresses")), 0, Globals::$user->rights->societe->contact->lire, '', $mainmenu, 'contacts');

-                $newmenu->add(BASE_URI . "?controller=contact&method=card&leftmenu=contacts&action=create", (!empty(Conf::$global->SOCIETE_ADDRESSES_MANAGEMENT) ? Globals::$langs->trans("NewContact") : Globals::$langs->trans("NewContactAddress")), 1, Globals::$user->rights->societe->contact->creer);

-                $newmenu->add(BASE_URI . "?controller=contact&method=list&leftmenu=contacts", Globals::$langs->trans("List"), 1, Globals::$user->rights->societe->contact->lire);

+                $newmenu->add(BASE_URI."?controller=societe&method=index&leftmenu=thirdparties", (!empty(Conf::$global->SOCIETE_ADDRESSES_MANAGEMENT) ? Globals::$langs->trans("Contacts") : Globals::$langs->trans("ContactsAddresses")), 0, Globals::$user->rights->societe->contact->lire, '', $mainmenu, 'contacts');

+                $newmenu->add(BASE_URI."?controller=contact&method=card&leftmenu=contacts&action=create", (!empty(Conf::$global->SOCIETE_ADDRESSES_MANAGEMENT) ? Globals::$langs->trans("NewContact") : Globals::$langs->trans("NewContactAddress")), 1, Globals::$user->rights->societe->contact->creer);

+                $newmenu->add(BASE_URI."?controller=contact&method=list&leftmenu=contacts", Globals::$langs->trans("List"), 1, Globals::$user->rights->societe->contact->lire);

                 if (empty(Conf::$global->SOCIETE_DISABLE_PROSPECTS)) {

 //$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", Globals::$langs->trans("Prospects"), 2, Globals::$user->rights->societe->contact->lire);

-                    $newmenu->add(BASE_URI . "?controller=contact&method=list&leftmenu=contacts&type=p", Globals::$langs->trans("Prospects"), 2, Globals::$user->rights->societe->contact->lire);

+                    $newmenu->add(BASE_URI."?controller=contact&method=list&leftmenu=contacts&type=p", Globals::$langs->trans("Prospects"), 2, Globals::$user->rights->societe->contact->lire);

                 }

                 if (empty(Conf::$global->SOCIETE_DISABLE_CUSTOMERS)) {

 //$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", Globals::$langs->trans("Customers"), 2, Globals::$user->rights->societe->contact->lire);

-                    $newmenu->add(BASE_URI . "?controller=contact&method=list&leftmenu=contacts&type=c", Globals::$langs->trans("Customers"), 2, Globals::$user->rights->societe->contact->lire);

+                    $newmenu->add(BASE_URI."?controller=contact&method=list&leftmenu=contacts&type=c", Globals::$langs->trans("Customers"), 2, Globals::$user->rights->societe->contact->lire);

                 }

                 if (!empty($conf->fournisseur->enabled)) {

 //$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", Globals::$langs->trans("Suppliers"), 2, Globals::$user->rights->societe->contact->lire);

-                    $newmenu->add(BASE_URI . "?controller=contact&method=list&leftmenu=contacts&type=f", Globals::$langs->trans("Suppliers"), 2, Globals::$user->rights->societe->contact->lire);

+                    $newmenu->add(BASE_URI."?controller=contact&method=list&leftmenu=contacts&type=f", Globals::$langs->trans("Suppliers"), 2, Globals::$user->rights->societe->contact->lire);

                 }

 //$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", Globals::$langs->trans("ContactOthers"), 2, Globals::$user->rights->societe->contact->lire);

-                $newmenu->add(BASE_URI . "?controller=contact&methos=list&leftmenu=contacts&type=o", Globals::$langs->trans("ContactOthers"), 2, Globals::$user->rights->societe->contact->lire);

+                $newmenu->add(BASE_URI."?controller=contact&methos=list&leftmenu=contacts&type=o", Globals::$langs->trans("ContactOthers"), 2, Globals::$user->rights->societe->contact->lire);

 //$newmenu->add("/contact/list.php?userid=Globals::$user->id", Globals::$langs->trans("MyContacts"), 1, Globals::$user->rights->societe->contact->lire);

 // Categories

                 if (!empty($conf->categorie->enabled)) {

                     Globals::$langs->load("categories");

 // Categories Contact

 //$newmenu->add("/categories/index.php?leftmenu=catcontact&type=4", Globals::$langs->trans("ContactCategoriesShort"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

-                    $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=catcontact&type=4", Globals::$langs->trans("ContactCategoriesShort"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

+                    $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=catcontact&type=4", Globals::$langs->trans("ContactCategoriesShort"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

                 }

             }

 

@@ -904,9 +904,9 @@ 
 //$newmenu->add("/comm/propal/index.php?leftmenu=propals", Globals::$langs->trans("Proposals"), 0, Globals::$user->rights->propale->lire, '', $mainmenu, 'propals', 100);

 //$newmenu->add("/comm/propal/card.php?action=create&leftmenu=propals", Globals::$langs->trans("NewPropal"), 1, Globals::$user->rights->propale->creer);

 //$newmenu->add("/comm/propal/list.php?leftmenu=propals", Globals::$langs->trans("List"), 1, Globals::$user->rights->propale->lire);

-                    $newmenu->add(BASE_URI . "?controller=comm/propal&method=index&leftmenu=propals", Globals::$langs->trans("Proposals"), 0, Globals::$user->rights->propale->lire, '', $mainmenu, 'propals', 100);

-                    $newmenu->add(BASE_URI . "?controller=comm/propal&method=card&action=create&leftmenu=propals", Globals::$langs->trans("NewPropal"), 1, Globals::$user->rights->propale->creer);

-                    $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals", Globals::$langs->trans("List"), 1, Globals::$user->rights->propale->lire);

+                    $newmenu->add(BASE_URI."?controller=comm/propal&method=index&leftmenu=propals", Globals::$langs->trans("Proposals"), 0, Globals::$user->rights->propale->lire, '', $mainmenu, 'propals', 100);

+                    $newmenu->add(BASE_URI."?controller=comm/propal&method=card&action=create&leftmenu=propals", Globals::$langs->trans("NewPropal"), 1, Globals::$user->rights->propale->creer);

+                    $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals", Globals::$langs->trans("List"), 1, Globals::$user->rights->propale->lire);

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {

                         /*

                           $newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=0", Globals::$langs->trans("PropalsDraft"), 2, Globals::$user->rights->propale->lire);

@@ -915,15 +915,15 @@ 
                           $newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=3", Globals::$langs->trans("PropalStatusNotSigned"), 2, Globals::$user->rights->propale->lire);

                           $newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=4", Globals::$langs->trans("PropalStatusBilled"), 2, Globals::$user->rights->propale->lire);

                          */

-                        $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals&viewstatut=0", Globals::$langs->trans("PropalsDraft"), 2, Globals::$user->rights->propale->lire);

-                        $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals&viewstatut=1", Globals::$langs->trans("PropalsOpened"), 2, Globals::$user->rights->propale->lire);

-                        $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals&viewstatut=2", Globals::$langs->trans("PropalStatusSigned"), 2, Globals::$user->rights->propale->lire);

-                        $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals&viewstatut=3", Globals::$langs->trans("PropalStatusNotSigned"), 2, Globals::$user->rights->propale->lire);

-                        $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals&viewstatut=4", Globals::$langs->trans("PropalStatusBilled"), 2, Globals::$user->rights->propale->lire);

+                        $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals&viewstatut=0", Globals::$langs->trans("PropalsDraft"), 2, Globals::$user->rights->propale->lire);

+                        $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals&viewstatut=1", Globals::$langs->trans("PropalsOpened"), 2, Globals::$user->rights->propale->lire);

+                        $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals&viewstatut=2", Globals::$langs->trans("PropalStatusSigned"), 2, Globals::$user->rights->propale->lire);

+                        $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals&viewstatut=3", Globals::$langs->trans("PropalStatusNotSigned"), 2, Globals::$user->rights->propale->lire);

+                        $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals&viewstatut=4", Globals::$langs->trans("PropalStatusBilled"), 2, Globals::$user->rights->propale->lire);

 //$newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=2,3,4", Globals::$langs->trans("PropalStatusClosedShort"), 2, Globals::$user->rights->propale->lire);

                     }

 //$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->propale->lire);

-                    $newmenu->add(BASE_URI . "?controller=comm/propal/stats&method=index&leftmenu=propals", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->propale->lire);

+                    $newmenu->add(BASE_URI."?controller=comm/propal/stats&method=index&leftmenu=propals", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->propale->lire);

                 }

 

 // Customers orders

@@ -932,26 +932,26 @@ 
 //$newmenu->add("/commande/index.php?leftmenu=orders", Globals::$langs->trans("CustomersOrders"), 0, Globals::$user->rights->commande->lire, '', $mainmenu, 'orders', 200);

 //$newmenu->add("/commande/card.php?action=create&leftmenu=orders", Globals::$langs->trans("NewOrder"), 1, Globals::$user->rights->commande->creer);

 //$newmenu->add("/commande/list.php?leftmenu=orders", Globals::$langs->trans("List"), 1, Globals::$user->rights->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=commande&method=index&leftmenu=orders", Globals::$langs->trans("CustomersOrders"), 0, Globals::$user->rights->commande->lire, '', $mainmenu, 'orders', 200);

-                    $newmenu->add(BASE_URI . "?controller=commande&method=card&action=create&leftmenu=orders", Globals::$langs->trans("NewOrder"), 1, Globals::$user->rights->commande->creer);

-                    $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders", Globals::$langs->trans("List"), 1, Globals::$user->rights->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=commande&method=index&leftmenu=orders", Globals::$langs->trans("CustomersOrders"), 0, Globals::$user->rights->commande->lire, '', $mainmenu, 'orders', 200);

+                    $newmenu->add(BASE_URI."?controller=commande&method=card&action=create&leftmenu=orders", Globals::$langs->trans("NewOrder"), 1, Globals::$user->rights->commande->creer);

+                    $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders", Globals::$langs->trans("List"), 1, Globals::$user->rights->commande->lire);

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=0", Globals::$langs->trans("StatusOrderDraftShort"), 2, Globals::$user->rights->commande->lire);

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=1", Globals::$langs->trans("StatusOrderValidated"), 2, Globals::$user->rights->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=0", Globals::$langs->trans("StatusOrderDraftShort"), 2, Globals::$user->rights->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=1", Globals::$langs->trans("StatusOrderValidated"), 2, Globals::$user->rights->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=0", Globals::$langs->trans("StatusOrderDraftShort"), 2, Globals::$user->rights->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=1", Globals::$langs->trans("StatusOrderValidated"), 2, Globals::$user->rights->commande->lire);

                         if (!empty($conf->expedition->enabled)) {

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=2", Globals::$langs->trans("StatusOrderSentShort"), 2, Globals::$user->rights->commande->lire);

-                            $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=2", Globals::$langs->trans("StatusOrderSentShort"), 2, Globals::$user->rights->commande->lire);

+                            $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=2", Globals::$langs->trans("StatusOrderSentShort"), 2, Globals::$user->rights->commande->lire);

                         }

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=3", Globals::$langs->trans("StatusOrderDelivered"), 2, Globals::$user->rights->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=3", Globals::$langs->trans("StatusOrderDelivered"), 2, Globals::$user->rights->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=3", Globals::$langs->trans("StatusOrderDelivered"), 2, Globals::$user->rights->commande->lire);

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=4", Globals::$langs->trans("StatusOrderProcessed"), 2, Globals::$user->rights->commande->lire);

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-1", Globals::$langs->trans("StatusOrderCanceledShort"), 2, Globals::$user->rights->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=-1", Globals::$langs->trans("StatusOrderCanceledShort"), 2, Globals::$user->rights->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=-1", Globals::$langs->trans("StatusOrderCanceledShort"), 2, Globals::$user->rights->commande->lire);

                     }

 //$newmenu->add("/commande/stats/index.php?leftmenu=orders", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=commande/stats&method=index&leftmenu=orders", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=commande/stats&method=index&leftmenu=orders", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->commande->lire);

                 }

 

 // Suppliers orders

@@ -960,16 +960,16 @@ 
 //$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", Globals::$langs->trans("SuppliersOrders"), 0, Globals::$user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);

 //$newmenu->add("/fourn/commande/card.php?action=create&leftmenu=orders_suppliers", Globals::$langs->trans("NewOrder"), 1, Globals::$user->rights->fournisseur->commande->creer);

 //$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", Globals::$langs->trans("List"), 1, Globals::$user->rights->fournisseur->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=index&leftmenu=orders_suppliers", Globals::$langs->trans("SuppliersOrders"), 0, Globals::$user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=card&action=create&leftmenu=orders_suppliers", Globals::$langs->trans("NewOrder"), 1, Globals::$user->rights->fournisseur->commande->creer);

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers", Globals::$langs->trans("List"), 1, Globals::$user->rights->fournisseur->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=index&leftmenu=orders_suppliers", Globals::$langs->trans("SuppliersOrders"), 0, Globals::$user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=card&action=create&leftmenu=orders_suppliers", Globals::$langs->trans("NewOrder"), 1, Globals::$user->rights->fournisseur->commande->creer);

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers", Globals::$langs->trans("List"), 1, Globals::$user->rights->fournisseur->commande->lire);

 

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {

 //$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", Globals::$langs->trans("StatusOrderDraftShort"), 2, Globals::$user->rights->fournisseur->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=0", Globals::$langs->trans("StatusOrderDraftShort"), 2, Globals::$user->rights->fournisseur->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=0", Globals::$langs->trans("StatusOrderDraftShort"), 2, Globals::$user->rights->fournisseur->commande->lire);

                         if (empty(Conf::$global->SUPPLIER_ORDER_HIDE_VALIDATED)) {

 //$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", Globals::$langs->trans("StatusOrderValidated"), 2, Globals::$user->rights->fournisseur->commande->lire);

-                            $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=1", Globals::$langs->trans("StatusOrderValidated"), 2, Globals::$user->rights->fournisseur->commande->lire);

+                            $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=1", Globals::$langs->trans("StatusOrderValidated"), 2, Globals::$user->rights->fournisseur->commande->lire);

                         }

                         /*

                           $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", Globals::$langs->trans("StatusOrderApprovedShort"), 2, Globals::$user->rights->fournisseur->commande->lire);

@@ -979,16 +979,16 @@ 
                           $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", Globals::$langs->trans("StatusOrderCanceled"), 2, Globals::$user->rights->fournisseur->commande->lire);

                           $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", Globals::$langs->trans("StatusOrderRefused"), 2, Globals::$user->rights->fournisseur->commande->lire);

                          */

-                        $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=2", Globals::$langs->trans("StatusOrderApprovedShort"), 2, Globals::$user->rights->fournisseur->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=3", Globals::$langs->trans("StatusOrderOnProcessShort"), 2, Globals::$user->rights->fournisseur->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=4", Globals::$langs->trans("StatusOrderReceivedPartiallyShort"), 2, Globals::$user->rights->fournisseur->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=5", Globals::$langs->trans("StatusOrderReceivedAll"), 2, Globals::$user->rights->fournisseur->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=6,7", Globals::$langs->trans("StatusOrderCanceled"), 2, Globals::$user->rights->fournisseur->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=9", Globals::$langs->trans("StatusOrderRefused"), 2, Globals::$user->rights->fournisseur->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=2", Globals::$langs->trans("StatusOrderApprovedShort"), 2, Globals::$user->rights->fournisseur->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=3", Globals::$langs->trans("StatusOrderOnProcessShort"), 2, Globals::$user->rights->fournisseur->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=4", Globals::$langs->trans("StatusOrderReceivedPartiallyShort"), 2, Globals::$user->rights->fournisseur->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=5", Globals::$langs->trans("StatusOrderReceivedAll"), 2, Globals::$user->rights->fournisseur->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=6,7", Globals::$langs->trans("StatusOrderCanceled"), 2, Globals::$user->rights->fournisseur->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=9", Globals::$langs->trans("StatusOrderRefused"), 2, Globals::$user->rights->fournisseur->commande->lire);

                     }

 // Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", Globals::$langs->trans("StatusOrderBilled"), 2, Globals::$user->rights->fournisseur->commande->lire);

 //$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&mode=supplier", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->fournisseur->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=commande/stats&method=index&leftmenu=orders_suppliers&mode=supplier", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->fournisseur->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=commande/stats&method=index&leftmenu=orders_suppliers&mode=supplier", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->fournisseur->commande->lire);

                 }

 

 // Contrat

@@ -1000,10 +1000,10 @@ 
                       $newmenu->add("/contrat/list.php?leftmenu=contracts", Globals::$langs->trans("List"), 1, Globals::$user->rights->contrat->lire);

                       $newmenu->add("/contrat/services_list.php?leftmenu=contracts", Globals::$langs->trans("MenuServices"), 1, Globals::$user->rights->contrat->lire);

                      */

-                    $newmenu->add(BASE_URI . "?controller=contrat&method=index&leftmenu=contracts", Globals::$langs->trans("ContractsSubscriptions"), 0, Globals::$user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000);

-                    $newmenu->add(BASE_URI . "?controller=contrat&method=card&action=create&leftmenu=contracts", Globals::$langs->trans("NewContractSubscription"), 1, Globals::$user->rights->contrat->creer);

-                    $newmenu->add(BASE_URI . "?controller=contrat&method=list&leftmenu=contracts", Globals::$langs->trans("List"), 1, Globals::$user->rights->contrat->lire);

-                    $newmenu->add(BASE_URI . "?controller=contrat&method=services_list&leftmenu=contracts", Globals::$langs->trans("MenuServices"), 1, Globals::$user->rights->contrat->lire);

+                    $newmenu->add(BASE_URI."?controller=contrat&method=index&leftmenu=contracts", Globals::$langs->trans("ContractsSubscriptions"), 0, Globals::$user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000);

+                    $newmenu->add(BASE_URI."?controller=contrat&method=card&action=create&leftmenu=contracts", Globals::$langs->trans("NewContractSubscription"), 1, Globals::$user->rights->contrat->creer);

+                    $newmenu->add(BASE_URI."?controller=contrat&method=list&leftmenu=contracts", Globals::$langs->trans("List"), 1, Globals::$user->rights->contrat->lire);

+                    $newmenu->add(BASE_URI."?controller=contrat&method=services_list&leftmenu=contracts", Globals::$langs->trans("MenuServices"), 1, Globals::$user->rights->contrat->lire);

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {

                         /*

                           $newmenu->add("/contrat/services_list.php?leftmenu=contracts&mode=0", Globals::$langs->trans("MenuInactiveServices"), 2, Globals::$user->rights->contrat->lire);

@@ -1011,10 +1011,10 @@ 
                           $newmenu->add("/contrat/services_list.php?leftmenu=contracts&mode=4&filter=expired", Globals::$langs->trans("MenuExpiredServices"), 2, Globals::$user->rights->contrat->lire);

                           $newmenu->add("/contrat/services_list.php?leftmenu=contracts&mode=5", Globals::$langs->trans("MenuClosedServices"), 2, Globals::$user->rights->contrat->lire);

                          */

-                        $newmenu->add(BASE_URI . "?controller=contrat&method=services_list&leftmenu=contracts&mode=0", Globals::$langs->trans("MenuInactiveServices"), 2, Globals::$user->rights->contrat->lire);

-                        $newmenu->add(BASE_URI . "?controller=contrat&method=services_list&leftmenu=contracts&mode=4", Globals::$langs->trans("MenuRunningServices"), 2, Globals::$user->rights->contrat->lire);

-                        $newmenu->add(BASE_URI . "?controller=contrat&method=services_list&leftmenu=contracts&mode=4&filter=expired", Globals::$langs->trans("MenuExpiredServices"), 2, Globals::$user->rights->contrat->lire);

-                        $newmenu->add(BASE_URI . "?controller=contrat&method=services_list&leftmenu=contracts&mode=5", Globals::$langs->trans("MenuClosedServices"), 2, Globals::$user->rights->contrat->lire);

+                        $newmenu->add(BASE_URI."?controller=contrat&method=services_list&leftmenu=contracts&mode=0", Globals::$langs->trans("MenuInactiveServices"), 2, Globals::$user->rights->contrat->lire);

+                        $newmenu->add(BASE_URI."?controller=contrat&method=services_list&leftmenu=contracts&mode=4", Globals::$langs->trans("MenuRunningServices"), 2, Globals::$user->rights->contrat->lire);

+                        $newmenu->add(BASE_URI."?controller=contrat&method=services_list&leftmenu=contracts&mode=4&filter=expired", Globals::$langs->trans("MenuExpiredServices"), 2, Globals::$user->rights->contrat->lire);

+                        $newmenu->add(BASE_URI."?controller=contrat&method=services_list&leftmenu=contracts&mode=5", Globals::$langs->trans("MenuClosedServices"), 2, Globals::$user->rights->contrat->lire);

                     }

                 }

 

@@ -1028,11 +1028,11 @@ 
                       $newmenu->add("/fichinter/card-red.php?leftmenu=ficheinter", Globals::$langs->trans("ModelList"), 1, Globals::$user->rights->ficheinter->lire, '', '', '', 203);

                       $newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->fournisseur->commande->lire);

                      */

-                    $newmenu->add(BASE_URI . "?controller=fichinter&method=index&leftmenu=ficheinter", Globals::$langs->trans("Interventions"), 0, Globals::$user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200);

-                    $newmenu->add(BASE_URI . "?controller=fichinter&method=card&action=create&leftmenu=ficheinter", Globals::$langs->trans("NewIntervention"), 1, Globals::$user->rights->ficheinter->creer, '', '', '', 201);

-                    $newmenu->add(BASE_URI . "?controller=fichinter&method=list&leftmenu=ficheinter", Globals::$langs->trans("List"), 1, Globals::$user->rights->ficheinter->lire, '', '', '', 202);

-                    $newmenu->add(BASE_URI . "?controller=fichinter&method=card-red&leftmenu=ficheinter", Globals::$langs->trans("ModelList"), 1, Globals::$user->rights->ficheinter->lire, '', '', '', 203);

-                    $newmenu->add(BASE_URI . "?controller=fichinter/stats&method=index&leftmenu=ficheinter", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->fournisseur->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=fichinter&method=index&leftmenu=ficheinter", Globals::$langs->trans("Interventions"), 0, Globals::$user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200);

+                    $newmenu->add(BASE_URI."?controller=fichinter&method=card&action=create&leftmenu=ficheinter", Globals::$langs->trans("NewIntervention"), 1, Globals::$user->rights->ficheinter->creer, '', '', '', 201);

+                    $newmenu->add(BASE_URI."?controller=fichinter&method=list&leftmenu=ficheinter", Globals::$langs->trans("List"), 1, Globals::$user->rights->ficheinter->lire, '', '', '', 202);

+                    $newmenu->add(BASE_URI."?controller=fichinter&method=card-red&leftmenu=ficheinter", Globals::$langs->trans("ModelList"), 1, Globals::$user->rights->ficheinter->lire, '', '', '', 203);

+                    $newmenu->add(BASE_URI."?controller=fichinter/stats&method=index&leftmenu=ficheinter", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->fournisseur->commande->lire);

                 }

             }

 

@@ -1050,9 +1050,9 @@ 
                       $newmenu->add("/compta/facture/card.php?action=create", Globals::$langs->trans("NewBill"), 1, Globals::$user->rights->facture->creer);

                       $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", Globals::$langs->trans("List"), 1, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');

                      */

-                    $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills", Globals::$langs->trans("BillsCustomers"), 0, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills');

-                    $newmenu->add(BASE_URI . "?controller=compta/facture&method=card&action=create", Globals::$langs->trans("NewBill"), 1, Globals::$user->rights->facture->creer);

-                    $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills", Globals::$langs->trans("List"), 1, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');

+                    $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills", Globals::$langs->trans("BillsCustomers"), 0, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills');

+                    $newmenu->add(BASE_URI."?controller=compta/facture&method=card&action=create", Globals::$langs->trans("NewBill"), 1, Globals::$user->rights->facture->creer);

+                    $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills", Globals::$langs->trans("List"), 1, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');

 

                     if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu)) {

                         /*

@@ -1061,24 +1061,24 @@ 
                           $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&search_status=2", Globals::$langs->trans("BillShortStatusPaid"), 2, Globals::$user->rights->facture->lire);

                           $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&search_status=3", Globals::$langs->trans("BillShortStatusCanceled"), 2, Globals::$user->rights->facture->lire);

                          */

-                        $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills_draft&search_status=0", Globals::$langs->trans("BillShortStatusDraft"), 2, Globals::$user->rights->facture->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills_notpaid&search_status=1", Globals::$langs->trans("BillShortStatusNotPaid"), 2, Globals::$user->rights->facture->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills_paid&search_status=2", Globals::$langs->trans("BillShortStatusPaid"), 2, Globals::$user->rights->facture->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills_canceled&search_status=3", Globals::$langs->trans("BillShortStatusCanceled"), 2, Globals::$user->rights->facture->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills_draft&search_status=0", Globals::$langs->trans("BillShortStatusDraft"), 2, Globals::$user->rights->facture->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills_notpaid&search_status=1", Globals::$langs->trans("BillShortStatusNotPaid"), 2, Globals::$user->rights->facture->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills_paid&search_status=2", Globals::$langs->trans("BillShortStatusPaid"), 2, Globals::$user->rights->facture->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills_canceled&search_status=3", Globals::$langs->trans("BillShortStatusCanceled"), 2, Globals::$user->rights->facture->lire);

                     }

 //$newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates", Globals::$langs->trans("ListOfTemplates"), 1, Globals::$user->rights->facture->creer, '', $mainmenu, 'customers_bills_templates');    // No need to see recurring invoices, if user has no permission to create invoice.

 //$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment", Globals::$langs->trans("Payments"), 1, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment');

-                    $newmenu->add(BASE_URI . "?controller=compta/facture&method=invoicetemplate_list&leftmenu=customers_bills_templates", Globals::$langs->trans("ListOfTemplates"), 1, Globals::$user->rights->facture->creer, '', $mainmenu, 'customers_bills_templates');    // No need to see recurring invoices, if user has no permission to create invoice.

-                    $newmenu->add(BASE_URI . "?controller=compta/paiement&method=list&leftmenu=customers_bills_payment", Globals::$langs->trans("Payments"), 1, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment');

+                    $newmenu->add(BASE_URI."?controller=compta/facture&method=invoicetemplate_list&leftmenu=customers_bills_templates", Globals::$langs->trans("ListOfTemplates"), 1, Globals::$user->rights->facture->creer, '', $mainmenu, 'customers_bills_templates'); // No need to see recurring invoices, if user has no permission to create invoice.

+                    $newmenu->add(BASE_URI."?controller=compta/paiement&method=list&leftmenu=customers_bills_payment", Globals::$langs->trans("Payments"), 1, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment');

 

                     if (!empty(Conf::$global->BILL_ADD_PAYMENT_VALIDATION)) {

 //$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_tovalid", Globals::$langs->trans("MenuToValid"), 2, Globals::$user->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');

-                        $newmenu->add(BASE_URI . "?controller=compta/paiement&method=tovalidate&leftmenu=customers_bills_tovalid", Globals::$langs->trans("MenuToValid"), 2, Globals::$user->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');

+                        $newmenu->add(BASE_URI."?controller=compta/paiement&method=tovalidate&leftmenu=customers_bills_tovalid", Globals::$langs->trans("MenuToValid"), 2, Globals::$user->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');

                     }

 //$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_reports", Globals::$langs->trans("Reportings"), 2, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_reports');

 //$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_stats');

-                    $newmenu->add(BASE_URI . "?controller=compta/paiement&method=rapport&leftmenu=customers_bills_reports", Globals::$langs->trans("Reportings"), 2, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_reports');

-                    $newmenu->add(BASE_URI . "?controller=compta/facture/stats&method=index&leftmenu=customers_bills_stats", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_stats');

+                    $newmenu->add(BASE_URI."?controller=compta/paiement&method=rapport&leftmenu=customers_bills_reports", Globals::$langs->trans("Reportings"), 2, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_reports');

+                    $newmenu->add(BASE_URI."?controller=compta/facture/stats&method=index&leftmenu=customers_bills_stats", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->facture->lire, '', $mainmenu, 'customers_bills_stats');

                 }

 

 // Suppliers invoices

@@ -1087,25 +1087,25 @@ 
 //$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", Globals::$langs->trans("BillsSuppliers"), 0, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');

 //$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&action=create", Globals::$langs->trans("NewBill"), 1, Globals::$user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');

 //$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", Globals::$langs->trans("List"), 1, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');

-                    $newmenu->add(BASE_URI . "?controller=fourn/facture&method=list&leftmenu=suppliers_bills", Globals::$langs->trans("BillsSuppliers"), 0, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');

-                    $newmenu->add(BASE_URI . "?controller=fourn/facture&method=card&leftmenu=suppliers_bills&action=create", Globals::$langs->trans("NewBill"), 1, Globals::$user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');

-                    $newmenu->add(BASE_URI . "?controller=fourn/facture&method=list&leftmenu=suppliers_bills", Globals::$langs->trans("List"), 1, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');

+                    $newmenu->add(BASE_URI."?controller=fourn/facture&method=list&leftmenu=suppliers_bills", Globals::$langs->trans("BillsSuppliers"), 0, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');

+                    $newmenu->add(BASE_URI."?controller=fourn/facture&method=card&leftmenu=suppliers_bills&action=create", Globals::$langs->trans("NewBill"), 1, Globals::$user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');

+                    $newmenu->add(BASE_URI."?controller=fourn/facture&method=list&leftmenu=suppliers_bills", Globals::$langs->trans("List"), 1, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');

 

                     if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {

 //$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&search_status=0", Globals::$langs->trans("BillShortStatusDraft"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_draft');

 //$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_notpaid&search_status=1", Globals::$langs->trans("BillShortStatusNotPaid"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_notpaid');

 //$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&search_status=2", Globals::$langs->trans("BillShortStatusPaid"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');

-                        $newmenu->add(BASE_URI . "?controller=fourn/facture&method=list&leftmenu=suppliers_bills_draft&search_status=0", Globals::$langs->trans("BillShortStatusDraft"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_draft');

-                        $newmenu->add(BASE_URI . "?controller=fourn/facture&method=list&leftmenu=suppliers_bills_notpaid&search_status=1", Globals::$langs->trans("BillShortStatusNotPaid"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_notpaid');

-                        $newmenu->add(BASE_URI . "?controller=fourn/facture&method=list&leftmenu=suppliers_bills_paid&search_status=2", Globals::$langs->trans("BillShortStatusPaid"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');

+                        $newmenu->add(BASE_URI."?controller=fourn/facture&method=list&leftmenu=suppliers_bills_draft&search_status=0", Globals::$langs->trans("BillShortStatusDraft"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_draft');

+                        $newmenu->add(BASE_URI."?controller=fourn/facture&method=list&leftmenu=suppliers_bills_notpaid&search_status=1", Globals::$langs->trans("BillShortStatusNotPaid"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_notpaid');

+                        $newmenu->add(BASE_URI."?controller=fourn/facture&method=list&leftmenu=suppliers_bills_paid&search_status=2", Globals::$langs->trans("BillShortStatusPaid"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');

                     }

 

 //$newmenu->add("/fourn/facture/paiement.php?leftmenu=suppliers_bills_payment", Globals::$langs->trans("Payments"), 1, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');

 //$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_report", Globals::$langs->trans("Reportings"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');

 //$newmenu->add("/compta/facture/stats/index.php?mode=supplier&leftmenu=suppliers_bills_stats", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');

-                    $newmenu->add(BASE_URI . "?controller=fourn/facture&method=paiement&leftmenu=suppliers_bills_payment", Globals::$langs->trans("Payments"), 1, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');

-                    $newmenu->add(BASE_URI . "?controller=fourn/facture&method=rapport&leftmenu=suppliers_bills_report", Globals::$langs->trans("Reportings"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');

-                    $newmenu->add(BASE_URI . "?controller=compta/facture/stats&method=index&mode=supplier&leftmenu=suppliers_bills_stats", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');

+                    $newmenu->add(BASE_URI."?controller=fourn/facture&method=paiement&leftmenu=suppliers_bills_payment", Globals::$langs->trans("Payments"), 1, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');

+                    $newmenu->add(BASE_URI."?controller=fourn/facture&method=rapport&leftmenu=suppliers_bills_report", Globals::$langs->trans("Reportings"), 2, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');

+                    $newmenu->add(BASE_URI."?controller=compta/facture/stats&method=index&mode=supplier&leftmenu=suppliers_bills_stats", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');

                 }

 

 // Orders

@@ -1113,7 +1113,7 @@ 
                     Globals::$langs->load("orders");

                     if (!empty($conf->facture->enabled)) {

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-3&billed=0&contextpage=billableorders", Globals::$langs->trans("MenuOrdersToBill2"), 0, Globals::$user->rights->commande->lire, '', $mainmenu, 'orders');

-                        $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=-3&billed=0&contextpage=billableorders", Globals::$langs->trans("MenuOrdersToBill2"), 0, Globals::$user->rights->commande->lire, '', $mainmenu, 'orders');

+                        $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=-3&billed=0&contextpage=billableorders", Globals::$langs->trans("MenuOrdersToBill2"), 0, Globals::$user->rights->commande->lire, '', $mainmenu, 'orders');

                     }

 //                  if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", Globals::$langs->trans("StatusOrderToBill"), 1, Globals::$user->rights->commande->lire);

                 }

@@ -1123,7 +1123,7 @@ 
                     if (!empty(Conf::$global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE)) {

                         Globals::$langs->load("supplier");

 //$newmenu->add("/fourn/commande/list.php?leftmenu=orders&search_status=5&billed=0", Globals::$langs->trans("MenuOrdersSupplierToBill"), 0, Globals::$user->rights->commande->lire, '', $mainmenu, 'orders');

-                        $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders&search_status=5&billed=0", Globals::$langs->trans("MenuOrdersSupplierToBill"), 0, Globals::$user->rights->commande->lire, '', $mainmenu, 'orders');

+                        $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders&search_status=5&billed=0", Globals::$langs->trans("MenuOrdersSupplierToBill"), 0, Globals::$user->rights->commande->lire, '', $mainmenu, 'orders');

 //                  if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", Globals::$langs->trans("StatusOrderToBill"), 1, Globals::$user->rights->commande->lire);

                     }

                 }

@@ -1133,12 +1133,12 @@ 
                 if (!empty($conf->don->enabled)) {

                     Globals::$langs->load("donations");

 //$newmenu->add("/don/index.php?leftmenu=donations&mainmenu=billing", Globals::$langs->trans("Donations"), 0, Globals::$user->rights->don->lire, '', $mainmenu, 'donations');

-                    $newmenu->add(BASE_URI . "?controller=don&method=index&leftmenu=donations&mainmenu=billing", Globals::$langs->trans("Donations"), 0, Globals::$user->rights->don->lire, '', $mainmenu, 'donations');

+                    $newmenu->add(BASE_URI."?controller=don&method=index&leftmenu=donations&mainmenu=billing", Globals::$langs->trans("Donations"), 0, Globals::$user->rights->don->lire, '', $mainmenu, 'donations');

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {

 //$newmenu->add("/don/card.php?leftmenu=donations&action=create", Globals::$langs->trans("NewDonation"), 1, Globals::$user->rights->don->creer);

 //$newmenu->add("/don/list.php?leftmenu=donations", Globals::$langs->trans("List"), 1, Globals::$user->rights->don->lire);

-                        $newmenu->add(BASE_URI . "?controller=don&method=card&leftmenu=donations&action=create", Globals::$langs->trans("NewDonation"), 1, Globals::$user->rights->don->creer);

-                        $newmenu->add(BASE_URI . "?controller=don&method=list&leftmenu=donations", Globals::$langs->trans("List"), 1, Globals::$user->rights->don->lire);

+                        $newmenu->add(BASE_URI."?controller=don&method=card&leftmenu=donations&action=create", Globals::$langs->trans("NewDonation"), 1, Globals::$user->rights->don->creer);

+                        $newmenu->add(BASE_URI."?controller=don&method=list&leftmenu=donations", Globals::$langs->trans("List"), 1, Globals::$user->rights->don->lire);

                     }

 // if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->don->lire);

                 }

@@ -1149,24 +1149,24 @@ 
 

                     $permtoshowmenu = ((!empty($conf->tax->enabled) && Globals::$user->rights->tax->charges->lire) || (!empty($conf->salaries->enabled) && !empty(Globals::$user->rights->salaries->read)) || (!empty($conf->loan->enabled) && Globals::$user->rights->loan->read) || (!empty($conf->banque->enabled) && Globals::$user->rights->banque->lire));

 //$newmenu->add("/compta/charges/index.php?leftmenu=tax&mainmenu=billing", Globals::$langs->trans("MenuSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax');

-                    $newmenu->add(BASE_URI . "?controller=compta/charges&method=index&leftmenu=tax&mainmenu=billing", Globals::$langs->trans("MenuSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax');

+                    $newmenu->add(BASE_URI."?controller=compta/charges&method=index&leftmenu=tax&mainmenu=billing", Globals::$langs->trans("MenuSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax');

 

 // Social contributions

                     if (!empty($conf->tax->enabled)) {

 //$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", Globals::$langs->trans("MenuSocialContributions"), 1, Globals::$user->rights->tax->charges->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/sociales&method=list&leftmenu=tax_social", Globals::$langs->trans("MenuSocialContributions"), 1, Globals::$user->rights->tax->charges->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/sociales&method=list&leftmenu=tax_social", Globals::$langs->trans("MenuSocialContributions"), 1, Globals::$user->rights->tax->charges->lire);

                         if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {

 //$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", Globals::$langs->trans("MenuNewSocialContribution"), 2, Globals::$user->rights->tax->charges->creer);

 //$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", Globals::$langs->trans("List"), 2, Globals::$user->rights->tax->charges->lire);

 //$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&mainmenu=billing&mode=sconly", Globals::$langs->trans("Payments"), 2, Globals::$user->rights->tax->charges->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/sociales&method=card&leftmenu=tax_social&action=create", Globals::$langs->trans("MenuNewSocialContribution"), 2, Globals::$user->rights->tax->charges->creer);

-                            $newmenu->add(BASE_URI . "?controller=compta/sociales&method=list&leftmenu=tax_social", Globals::$langs->trans("List"), 2, Globals::$user->rights->tax->charges->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/sociales&method=payments&leftmenu=tax_social&mainmenu=billing&mode=sconly", Globals::$langs->trans("Payments"), 2, Globals::$user->rights->tax->charges->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/sociales&method=card&leftmenu=tax_social&action=create", Globals::$langs->trans("MenuNewSocialContribution"), 2, Globals::$user->rights->tax->charges->creer);

+                            $newmenu->add(BASE_URI."?controller=compta/sociales&method=list&leftmenu=tax_social", Globals::$langs->trans("List"), 2, Globals::$user->rights->tax->charges->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/sociales&method=payments&leftmenu=tax_social&mainmenu=billing&mode=sconly", Globals::$langs->trans("Payments"), 2, Globals::$user->rights->tax->charges->lire);

                         }

 // VAT

                         if (empty(Conf::$global->TAX_DISABLE_VAT_MENUS)) {

 //$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&mainmenu=billing", Globals::$langs->transcountry("VAT", $mysoc->country_code), 1, Globals::$user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');

-                            $newmenu->add(BASE_URI . "?controller=compta/tva&method=list&leftmenu=tax_vat&mainmenu=billing", Globals::$langs->transcountry("VAT", $mysoc->country_code), 1, Globals::$user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');

+                            $newmenu->add(BASE_URI."?controller=compta/tva&method=list&leftmenu=tax_vat&mainmenu=billing", Globals::$langs->transcountry("VAT", $mysoc->country_code), 1, Globals::$user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');

                             if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {

                                 /*

                                   $newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", Globals::$langs->trans("New"), 2, Globals::$user->rights->tax->charges->creer);

@@ -1175,18 +1175,18 @@ 
                                   $newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", Globals::$langs->trans("ReportByCustomers"), 2, Globals::$user->rights->tax->charges->lire);

                                   $newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", Globals::$langs->trans("ReportByQuarter"), 2, Globals::$user->rights->tax->charges->lire);

                                  */

-                                $newmenu->add(BASE_URI . "?controller=compta/tva&method=card&leftmenu=tax_vat&action=create", Globals::$langs->trans("New"), 2, Globals::$user->rights->tax->charges->creer);

-                                $newmenu->add(BASE_URI . "?controller=compta/tva&method=list&leftmenu=tax_vat", Globals::$langs->trans("List"), 2, Globals::$user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/tva&method=index&leftmenu=tax_vat", Globals::$langs->trans("ReportByMonth"), 2, Globals::$user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/tva&method=clients&leftmenu=tax_vat", Globals::$langs->trans("ReportByCustomers"), 2, Globals::$user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/tva&method=quadri_detail&leftmenu=tax_vat", Globals::$langs->trans("ReportByQuarter"), 2, Globals::$user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/tva&method=card&leftmenu=tax_vat&action=create", Globals::$langs->trans("New"), 2, Globals::$user->rights->tax->charges->creer);

+                                $newmenu->add(BASE_URI."?controller=compta/tva&method=list&leftmenu=tax_vat", Globals::$langs->trans("List"), 2, Globals::$user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/tva&method=index&leftmenu=tax_vat", Globals::$langs->trans("ReportByMonth"), 2, Globals::$user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/tva&method=clients&leftmenu=tax_vat", Globals::$langs->trans("ReportByCustomers"), 2, Globals::$user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/tva&method=quadri_detail&leftmenu=tax_vat", Globals::$langs->trans("ReportByQuarter"), 2, Globals::$user->rights->tax->charges->lire);

                             }

                             global $mysoc;

 

 //Local Taxes 1

                             if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1")) {

 //$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&mainmenu=billing&localTaxType=1", Globals::$langs->transcountry("LT1", $mysoc->country_code), 1, Globals::$user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=list&leftmenu=tax_1_vat&mainmenu=billing&localTaxType=1", Globals::$langs->transcountry("LT1", $mysoc->country_code), 1, Globals::$user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=list&leftmenu=tax_1_vat&mainmenu=billing&localTaxType=1", Globals::$langs->transcountry("LT1", $mysoc->country_code), 1, Globals::$user->rights->tax->charges->lire);

                                 if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {

                                     /*

                                       $newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&localTaxType=1", Globals::$langs->trans("New"), 2, Globals::$user->rights->tax->charges->creer);

@@ -1195,17 +1195,17 @@ 
                                       $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&localTaxType=1", Globals::$langs->trans("ReportByCustomers"), 2, Globals::$user->rights->tax->charges->lire);

                                       $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&localTaxType=1", Globals::$langs->trans("ReportByQuarter"), 2, Globals::$user->rights->tax->charges->lire);

                                      */

-                                    $newmenu->add(BASE_URI . "?controller=compta/localtax&method=card&leftmenu=tax_1_vat&action=create&localTaxType=1", Globals::$langs->trans("New"), 2, Globals::$user->rights->tax->charges->creer);

-                                    $newmenu->add(BASE_URI . "?controller=compta/localtax&method=list&leftmenu=tax_1_vat&localTaxType=1", Globals::$langs->trans("List"), 2, Globals::$user->rights->tax->charges->lire);

-                                    $newmenu->add(BASE_URI . "?controller=compta/localtax&method=index&leftmenu=tax_1_vat&localTaxType=1", Globals::$langs->trans("ReportByMonth"), 2, Globals::$user->rights->tax->charges->lire);

-                                    $newmenu->add(BASE_URI . "?controller=compta/localtax&method=clients&leftmenu=tax_1_vat&localTaxType=1", Globals::$langs->trans("ReportByCustomers"), 2, Globals::$user->rights->tax->charges->lire);

-                                    $newmenu->add(BASE_URI . "?controller=compta/localtax&method=quadri_detail&leftmenu=tax_1_vat&localTaxType=1", Globals::$langs->trans("ReportByQuarter"), 2, Globals::$user->rights->tax->charges->lire);

+                                    $newmenu->add(BASE_URI."?controller=compta/localtax&method=card&leftmenu=tax_1_vat&action=create&localTaxType=1", Globals::$langs->trans("New"), 2, Globals::$user->rights->tax->charges->creer);

+                                    $newmenu->add(BASE_URI."?controller=compta/localtax&method=list&leftmenu=tax_1_vat&localTaxType=1", Globals::$langs->trans("List"), 2, Globals::$user->rights->tax->charges->lire);

+                                    $newmenu->add(BASE_URI."?controller=compta/localtax&method=index&leftmenu=tax_1_vat&localTaxType=1", Globals::$langs->trans("ReportByMonth"), 2, Globals::$user->rights->tax->charges->lire);

+                                    $newmenu->add(BASE_URI."?controller=compta/localtax&method=clients&leftmenu=tax_1_vat&localTaxType=1", Globals::$langs->trans("ReportByCustomers"), 2, Globals::$user->rights->tax->charges->lire);

+                                    $newmenu->add(BASE_URI."?controller=compta/localtax&method=quadri_detail&leftmenu=tax_1_vat&localTaxType=1", Globals::$langs->trans("ReportByQuarter"), 2, Globals::$user->rights->tax->charges->lire);

                                 }

                             }

 //Local Taxes 2

                             if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1")) {

 //$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&mainmenu=billing&localTaxType=2", Globals::$langs->transcountry("LT2", $mysoc->country_code), 1, Globals::$user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=list&leftmenu=tax_2_vat&mainmenu=billing&localTaxType=2", Globals::$langs->transcountry("LT2", $mysoc->country_code), 1, Globals::$user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=list&leftmenu=tax_2_vat&mainmenu=billing&localTaxType=2", Globals::$langs->transcountry("LT2", $mysoc->country_code), 1, Globals::$user->rights->tax->charges->lire);

                                 if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {

                                     /*

                                       $newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&localTaxType=2", Globals::$langs->trans("New"), 2, Globals::$user->rights->tax->charges->creer);

@@ -1214,11 +1214,11 @@ 
                                       $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&localTaxType=2", Globals::$langs->trans("ReportByCustomers"), 2, Globals::$user->rights->tax->charges->lire);

                                       $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&localTaxType=2", Globals::$langs->trans("ReportByQuarter"), 2, Globals::$user->rights->tax->charges->lire);

                                      */

-                                    $newmenu->add(BASE_URI . "?controller=compta/localtax&method=card&leftmenu=tax_2_vat&action=create&localTaxType=2", Globals::$langs->trans("New"), 2, Globals::$user->rights->tax->charges->creer);

-                                    $newmenu->add(BASE_URI . "?controller=compta/localtax&method=list&leftmenu=tax_2_vat&localTaxType=2", Globals::$langs->trans("List"), 2, Globals::$user->rights->tax->charges->lire);

-                                    $newmenu->add(BASE_URI . "?controller=compta/localtax&method=index&leftmenu=tax_2_vat&localTaxType=2", Globals::$langs->trans("ReportByMonth"), 2, Globals::$user->rights->tax->charges->lire);

-                                    $newmenu->add(BASE_URI . "?controller=compta/localtax&method=clients&leftmenu=tax_2_vat&localTaxType=2", Globals::$langs->trans("ReportByCustomers"), 2, Globals::$user->rights->tax->charges->lire);

-                                    $newmenu->add(BASE_URI . "?controller=compta/localtax&method=quadri_detail&leftmenu=tax_2_vat&localTaxType=2", Globals::$langs->trans("ReportByQuarter"), 2, Globals::$user->rights->tax->charges->lire);

+                                    $newmenu->add(BASE_URI."?controller=compta/localtax&method=card&leftmenu=tax_2_vat&action=create&localTaxType=2", Globals::$langs->trans("New"), 2, Globals::$user->rights->tax->charges->creer);

+                                    $newmenu->add(BASE_URI."?controller=compta/localtax&method=list&leftmenu=tax_2_vat&localTaxType=2", Globals::$langs->trans("List"), 2, Globals::$user->rights->tax->charges->lire);

+                                    $newmenu->add(BASE_URI."?controller=compta/localtax&method=index&leftmenu=tax_2_vat&localTaxType=2", Globals::$langs->trans("ReportByMonth"), 2, Globals::$user->rights->tax->charges->lire);

+                                    $newmenu->add(BASE_URI."?controller=compta/localtax&method=clients&leftmenu=tax_2_vat&localTaxType=2", Globals::$langs->trans("ReportByCustomers"), 2, Globals::$user->rights->tax->charges->lire);

+                                    $newmenu->add(BASE_URI."?controller=compta/localtax&method=quadri_detail&leftmenu=tax_2_vat&localTaxType=2", Globals::$langs->trans("ReportByQuarter"), 2, Globals::$user->rights->tax->charges->lire);

                                 }

                             }

                         }

@@ -1228,14 +1228,14 @@ 
                     if (!empty($conf->salaries->enabled)) {

                         Globals::$langs->load("salaries");

 //$newmenu->add("/compta/salaries/list.php?leftmenu=tax_salary&mainmenu=billing", Globals::$langs->trans("Salaries"), 1, Globals::$user->rights->salaries->read, '', $mainmenu, 'tax_salary');

-                        $newmenu->add(BASE_URI . "?controller=compta/salaries&method=list&leftmenu=tax_salary&mainmenu=billing", Globals::$langs->trans("Salaries"), 1, Globals::$user->rights->salaries->read, '', $mainmenu, 'tax_salary');

+                        $newmenu->add(BASE_URI."?controller=compta/salaries&method=list&leftmenu=tax_salary&mainmenu=billing", Globals::$langs->trans("Salaries"), 1, Globals::$user->rights->salaries->read, '', $mainmenu, 'tax_salary');

                         if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {

 //$newmenu->add("/compta/salaries/card.php?leftmenu=tax_salary&action=create", Globals::$langs->trans("NewPayment"), 2, Globals::$user->rights->salaries->write);

 //$newmenu->add("/compta/salaries/list.php?leftmenu=tax_salary", Globals::$langs->trans("Payments"), 2, Globals::$user->rights->salaries->read);

 //$newmenu->add("/compta/salaries/stats/index.php?leftmenu=tax_salary", Globals::$langs->trans("Statistics"), 2, Globals::$user->rights->salaries->read);

-                            $newmenu->add(BASE_URI . "?controller=compta/salaries&method=card&leftmenu=tax_salary&action=create", Globals::$langs->trans("NewPayment"), 2, Globals::$user->rights->salaries->write);

-                            $newmenu->add(BASE_URI . "?controller=compta/salaries&method=list&leftmenu=tax_salary", Globals::$langs->trans("Payments"), 2, Globals::$user->rights->salaries->read);

-                            $newmenu->add(BASE_URI . "?controller=compta/salaries/stats&method=index&leftmenu=tax_salary", Globals::$langs->trans("Statistics"), 2, Globals::$user->rights->salaries->read);

+                            $newmenu->add(BASE_URI."?controller=compta/salaries&method=card&leftmenu=tax_salary&action=create", Globals::$langs->trans("NewPayment"), 2, Globals::$user->rights->salaries->write);

+                            $newmenu->add(BASE_URI."?controller=compta/salaries&method=list&leftmenu=tax_salary", Globals::$langs->trans("Payments"), 2, Globals::$user->rights->salaries->read);

+                            $newmenu->add(BASE_URI."?controller=compta/salaries/stats&method=index&leftmenu=tax_salary", Globals::$langs->trans("Statistics"), 2, Globals::$user->rights->salaries->read);

                         }

                     }

 

@@ -1243,10 +1243,10 @@ 
                     if (!empty($conf->loan->enabled)) {

                         Globals::$langs->load("loan");

 //$newmenu->add("/loan/list.php?leftmenu=tax_loan&mainmenu=billing", Globals::$langs->trans("Loans"), 1, Globals::$user->rights->loan->read, '', $mainmenu, 'tax_loan');

-                        $newmenu->add(BASE_URI . "?controller=loan&method=list&leftmenu=tax_loan&mainmenu=billing", Globals::$langs->trans("Loans"), 1, Globals::$user->rights->loan->read, '', $mainmenu, 'tax_loan');

+                        $newmenu->add(BASE_URI."?controller=loan&method=list&leftmenu=tax_loan&mainmenu=billing", Globals::$langs->trans("Loans"), 1, Globals::$user->rights->loan->read, '', $mainmenu, 'tax_loan');

                         if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {

 //$newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", Globals::$langs->trans("NewLoan"), 2, Globals::$user->rights->loan->write);

-                            $newmenu->add(BASE_URI . "?controller=loan&method=card&leftmenu=tax_loan&action=create", Globals::$langs->trans("NewLoan"), 2, Globals::$user->rights->loan->write);

+                            $newmenu->add(BASE_URI."?controller=loan&method=card&leftmenu=tax_loan&action=create", Globals::$langs->trans("NewLoan"), 2, Globals::$user->rights->loan->write);

 //$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",Globals::$langs->trans("Payments"),2,Globals::$user->rights->loan->read);

                         }

                     }

@@ -1255,12 +1255,12 @@ 
                     if (!empty($conf->banque->enabled) && empty(Conf::$global->BANK_USE_OLD_VARIOUS_PAYMENT)) {

                         Globals::$langs->load("banks");

 //$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&mainmenu=billing", Globals::$langs->trans("MenuVariousPayment"), 1, Globals::$user->rights->banque->lire, '', $mainmenu, 'tax_various');

-                        $newmenu->add(BASE_URI . "?controller=compta/bank/various_payment&method=list&leftmenu=tax_various&mainmenu=billing", Globals::$langs->trans("MenuVariousPayment"), 1, Globals::$user->rights->banque->lire, '', $mainmenu, 'tax_various');

+                        $newmenu->add(BASE_URI."?controller=compta/bank/various_payment&method=list&leftmenu=tax_various&mainmenu=billing", Globals::$langs->trans("MenuVariousPayment"), 1, Globals::$user->rights->banque->lire, '', $mainmenu, 'tax_various');

                         if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {

 //$newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", Globals::$langs->trans("New"), 2, Globals::$user->rights->banque->modifier);

 //$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", Globals::$langs->trans("List"), 2, Globals::$user->rights->banque->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/bank/various_payment&method=card&leftmenu=tax_various&action=create", Globals::$langs->trans("New"), 2, Globals::$user->rights->banque->modifier);

-                            $newmenu->add(BASE_URI . "?controller=compta/bank/various_payment&method=list&leftmenu=tax_various", Globals::$langs->trans("List"), 2, Globals::$user->rights->banque->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/bank/various_payment&method=card&leftmenu=tax_various&action=create", Globals::$langs->trans("New"), 2, Globals::$user->rights->banque->modifier);

+                            $newmenu->add(BASE_URI."?controller=compta/bank/various_payment&method=list&leftmenu=tax_various", Globals::$langs->trans("List"), 2, Globals::$user->rights->banque->lire);

                         }

                     }

                 }

@@ -1278,11 +1278,11 @@ 
 

                     $permtoshowmenu = (!empty($conf->accounting->enabled) || Globals::$user->rights->accounting->bind->write || Globals::$user->rights->compta->resultat->lire);

 //$newmenu->add("/accountancy/index.php?leftmenu=accountancy", Globals::$langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');

-                    $newmenu->add(BASE_URI . "?controller=accountancy&method=index&leftmenu=accountancy", Globals::$langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');

+                    $newmenu->add(BASE_URI."?controller=accountancy&method=index&leftmenu=accountancy", Globals::$langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');

 

 // Chart of account

 //$newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", Globals::$langs->trans("Setup"), 1, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);

-                    $newmenu->add(BASE_URI . "?controller=accountancy&method=index&leftmenu=accountancy_admin", Globals::$langs->trans("Setup"), 1, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);

+                    $newmenu->add(BASE_URI."?controller=accountancy&method=index&leftmenu=accountancy_admin", Globals::$langs->trans("Setup"), 1, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);

                     if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/', $leftmenu)) {

                         /*

                           $newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("General"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_general', 10);

@@ -1292,71 +1292,71 @@ 
                           $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("AccountingCategory"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);

                           $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuDefaultAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);

                          */

-                        $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=index&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("General"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_general', 10);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=journals_list&id=35&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("AccountingJournals"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 20);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=accountmodel&id=31&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("Pcg_version"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 30);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=account&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("Chartofaccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 40);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=categories_list&id=32&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("AccountingCategory"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=defaultaccounts&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuDefaultAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);

+                        $newmenu->add(BASE_URI."?controller=accountancy/admin&method=index&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("General"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_general', 10);

+                        $newmenu->add(BASE_URI."?controller=accountancy/admin&method=journals_list&id=35&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("AccountingJournals"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 20);

+                        $newmenu->add(BASE_URI."?controller=accountancy/admin&method=accountmodel&id=31&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("Pcg_version"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 30);

+                        $newmenu->add(BASE_URI."?controller=accountancy/admin&method=account&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("Chartofaccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 40);

+                        $newmenu->add(BASE_URI."?controller=accountancy/admin&method=categories_list&id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("AccountingCategory"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);

+                        $newmenu->add(BASE_URI."?controller=accountancy/admin&method=defaultaccounts&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuDefaultAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);

                         if (!empty($conf->banque->enabled)) {

 //$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", Globals::$langs->trans("MenuBankAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 51);

-                            $newmenu->add(BASE_URI . "?controller=compta/bank&method=list&mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", Globals::$langs->trans("MenuBankAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 51);

+                            $newmenu->add(BASE_URI."?controller=compta/bank&method=list&mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", Globals::$langs->trans("MenuBankAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 51);

                         }

                         if (!empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled)) {

 //$newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuVatAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 52);

-                            $newmenu->add(BASE_URI . "?controller=admin&method=dict&id=10&from=accountancy&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuVatAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 52);

+                            $newmenu->add(BASE_URI."?controller=admin&method=dict&id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuVatAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 52);

                         }

                         if (!empty($conf->tax->enabled)) {

 //$newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuTaxAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 53);

-                            $newmenu->add(BASE_URI . "?controller=admin&method=dict&id=7&from=accountancy&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuTaxAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 53);

+                            $newmenu->add(BASE_URI."?controller=admin&method=dict&id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuTaxAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 53);

                         }

                         if (!empty($conf->expensereport->enabled)) {

 //$newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuExpenseReportAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 54);

-                            $newmenu->add(BASE_URI . "?controller=admin&method=dict&id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuExpenseReportAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 54);

+                            $newmenu->add(BASE_URI."?controller=admin&method=dict&id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuExpenseReportAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 54);

                         }

 //$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuProductsAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 55);

 //$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("ExportOptions"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 60);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=productaccount&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuProductsAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 55);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=export&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("ExportOptions"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 60);

+                        $newmenu->add(BASE_URI."?controller=accountancy/admin&method=productaccount&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("MenuProductsAccounts"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 55);

+                        $newmenu->add(BASE_URI."?controller=accountancy/admin&method=export&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("ExportOptions"), 2, Globals::$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 60);

 

 // Fiscal year

                         if (Conf::$global->MAIN_FEATURES_LEVEL > 1) {

 // Not yet used. In a future will lock some periods.

 //$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("FiscalPeriod"), 2, Globals::$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');

-                            $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=fiscalyear&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("FiscalPeriod"), 2, Globals::$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');

+                            $newmenu->add(BASE_URI."?controller=accountancy/admin&method=fiscalyear&mainmenu=accountancy&leftmenu=accountancy_admin", Globals::$langs->trans("FiscalPeriod"), 2, Globals::$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');

                         }

                     }

 

 // Binding

                     if (!empty($conf->facture->enabled)) {

 //$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&mainmenu=accountancy", Globals::$langs->trans("CustomersVentilation"), 1, Globals::$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');

-                        $newmenu->add(BASE_URI . "?controller=accountancy/customer&method=index&leftmenu=accountancy_dispatch_customer&mainmenu=accountancy", Globals::$langs->trans("CustomersVentilation"), 1, Globals::$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');

+                        $newmenu->add(BASE_URI."?controller=accountancy/customer&method=index&leftmenu=accountancy_dispatch_customer&mainmenu=accountancy", Globals::$langs->trans("CustomersVentilation"), 1, Globals::$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');

                         if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {

 //$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", Globals::$langs->trans("ToBind"), 2, Globals::$user->rights->accounting->bind->write);

 //$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", Globals::$langs->trans("Binded"), 2, Globals::$user->rights->accounting->bind->write);

-                            $newmenu->add(BASE_URI . "?controller=accountancy/customer&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", Globals::$langs->trans("ToBind"), 2, Globals::$user->rights->accounting->bind->write);

-                            $newmenu->add(BASE_URI . "?controller=accountancy/customer&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", Globals::$langs->trans("Binded"), 2, Globals::$user->rights->accounting->bind->write);

+                            $newmenu->add(BASE_URI."?controller=accountancy/customer&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", Globals::$langs->trans("ToBind"), 2, Globals::$user->rights->accounting->bind->write);

+                            $newmenu->add(BASE_URI."?controller=accountancy/customer&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", Globals::$langs->trans("Binded"), 2, Globals::$user->rights->accounting->bind->write);

                         }

                     }

                     if (!empty($conf->supplier_invoice->enabled)) {

 //$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&mainmenu=accountancy", Globals::$langs->trans("SuppliersVentilation"), 1, Globals::$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');

-                        $newmenu->add(BASE_URI . "?controller=accountancy/supplier&method=index&leftmenu=accountancy_dispatch_supplier&mainmenu=accountancy", Globals::$langs->trans("SuppliersVentilation"), 1, Globals::$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');

+                        $newmenu->add(BASE_URI."?controller=accountancy/supplier&method=index&leftmenu=accountancy_dispatch_supplier&mainmenu=accountancy", Globals::$langs->trans("SuppliersVentilation"), 1, Globals::$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');

                         if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {

 //$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", Globals::$langs->trans("ToBind"), 2, Globals::$user->rights->accounting->bind->write);

 //$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", Globals::$langs->trans("Binded"), 2, Globals::$user->rights->accounting->bind->write);

-                            $newmenu->add(BASE_URI . "?controller=accountancy/supplier&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", Globals::$langs->trans("ToBind"), 2, Globals::$user->rights->accounting->bind->write);

-                            $newmenu->add(BASE_URI . "?controller=accountancy/supplier&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", Globals::$langs->trans("Binded"), 2, Globals::$user->rights->accounting->bind->write);

+                            $newmenu->add(BASE_URI."?controller=accountancy/supplier&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", Globals::$langs->trans("ToBind"), 2, Globals::$user->rights->accounting->bind->write);

+                            $newmenu->add(BASE_URI."?controller=accountancy/supplier&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", Globals::$langs->trans("Binded"), 2, Globals::$user->rights->accounting->bind->write);

                         }

                     }

 

                     if (!empty($conf->expensereport->enabled)) {

 //$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&mainmenu=accountancy", Globals::$langs->trans("ExpenseReportsVentilation"), 1, Globals::$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');

-                        $newmenu->add(BASE_URI . "?controller=accountancy/expensereport&method=index&leftmenu=accountancy_dispatch_expensereport&mainmenu=accountancy", Globals::$langs->trans("ExpenseReportsVentilation"), 1, Globals::$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');

+                        $newmenu->add(BASE_URI."?controller=accountancy/expensereport&method=index&leftmenu=accountancy_dispatch_expensereport&mainmenu=accountancy", Globals::$langs->trans("ExpenseReportsVentilation"), 1, Globals::$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');

                         if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {

 //$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", Globals::$langs->trans("ToBind"), 2, Globals::$user->rights->accounting->bind->write);

 //$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", Globals::$langs->trans("Binded"), 2, Globals::$user->rights->accounting->bind->write);

-                            $newmenu->add(BASE_URI . "?controller=accountancy/expensereport&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", Globals::$langs->trans("ToBind"), 2, Globals::$user->rights->accounting->bind->write);

-                            $newmenu->add(BASE_URI . "?controller=accountancy/expensereport&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", Globals::$langs->trans("Binded"), 2, Globals::$user->rights->accounting->bind->write);

+                            $newmenu->add(BASE_URI."?controller=accountancy/expensereport&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", Globals::$langs->trans("ToBind"), 2, Globals::$user->rights->accounting->bind->write);

+                            $newmenu->add(BASE_URI."?controller=accountancy/expensereport&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", Globals::$langs->trans("Binded"), 2, Globals::$user->rights->accounting->bind->write);

                         }

                     }

 

@@ -1366,8 +1366,8 @@ 
 

 // Multi journal

                         $sql = "SELECT rowid, code, label, nature";

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

-                        $sql .= " WHERE entity = " . $conf->entity;

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

+                        $sql .= " WHERE entity = ".$conf->entity;

                         $sql .= " AND active = 1";

                         $sql .= " ORDER BY label DESC";

 

@@ -1408,7 +1408,7 @@ 
                                         Globals::$langs->load('accountancy');

                                         $journallabel = Globals::$langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...

 //$newmenu->add('/accountancy/journal/' . $nature . 'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=' . $objp->rowid, $journallabel, 2, Globals::$user->rights->accounting->comptarapport->lire);

-                                        $newmenu->add(BASE_URI . '?controller=accountancy/journal&method=' . $nature . 'journal&mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=' . $objp->rowid, $journallabel, 2, Globals::$user->rights->accounting->comptarapport->lire);

+                                        $newmenu->add(BASE_URI.'?controller=accountancy/journal&method='.$nature.'journal&mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, Globals::$user->rights->accounting->comptarapport->lire);

                                     }

                                     $i++;

                                 }

@@ -1423,31 +1423,31 @@ 
 

 // General Ledger

 //$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_generalledger", Globals::$langs->trans("Bookkeeping"), 1, Globals::$user->rights->accounting->mouvements->lire);

-                    $newmenu->add(BASE_URI . "?controller=accountancy/bookkeeping&method=list&mainmenu=accountancy&leftmenu=accountancy_generalledger", Globals::$langs->trans("Bookkeeping"), 1, Globals::$user->rights->accounting->mouvements->lire);

+                    $newmenu->add(BASE_URI."?controller=accountancy/bookkeeping&method=list&mainmenu=accountancy&leftmenu=accountancy_generalledger", Globals::$langs->trans("Bookkeeping"), 1, Globals::$user->rights->accounting->mouvements->lire);

 

 // Balance

 //$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance", Globals::$langs->trans("AccountBalance"), 1, Globals::$user->rights->accounting->mouvements->lire);

-                    $newmenu->add(BASE_URI . "?controller=accountancy/bookkeeping&method=balance&mainmenu=accountancy&leftmenu=accountancy_balance", Globals::$langs->trans("AccountBalance"), 1, Globals::$user->rights->accounting->mouvements->lire);

+                    $newmenu->add(BASE_URI."?controller=accountancy/bookkeeping&method=balance&mainmenu=accountancy&leftmenu=accountancy_balance", Globals::$langs->trans("AccountBalance"), 1, Globals::$user->rights->accounting->mouvements->lire);

 

 // Files

                     if (!empty(Conf::$global->MAIN_FEATURES_LEVEL) && Conf::$global->MAIN_FEATURES_LEVEL > 2) {

 //$newmenu->add("/compta/compta-files.php?mainmenu=accountancy&leftmenu=accountancy_files", Globals::$langs->trans("AccountantFiles"), 1, Globals::$user->rights->accounting->mouvements->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta&method=compta-files&mainmenu=accountancy&leftmenu=accountancy_files", Globals::$langs->trans("AccountantFiles"), 1, Globals::$user->rights->accounting->mouvements->lire);

+                        $newmenu->add(BASE_URI."?controller=compta&method=compta-files&mainmenu=accountancy&leftmenu=accountancy_files", Globals::$langs->trans("AccountantFiles"), 1, Globals::$user->rights->accounting->mouvements->lire);

                     }

 

 // Reports

                     Globals::$langs->load("compta");

 

 //$newmenu->add("/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report", Globals::$langs->trans("Reportings"), 1, Globals::$user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');

-                    $newmenu->add(BASE_URI . "?controller=compta/resultat&method=index&mainmenu=accountancy&leftmenu=accountancy_report", Globals::$langs->trans("Reportings"), 1, Globals::$user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');

+                    $newmenu->add(BASE_URI."?controller=compta/resultat&method=index&mainmenu=accountancy&leftmenu=accountancy_report", Globals::$langs->trans("Reportings"), 1, Globals::$user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');

 

                     if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

 //$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", Globals::$langs->trans("MenuReportInOut"), 2, Globals::$user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", Globals::$langs->trans("ByPredefinedAccountGroups"), 3, Globals::$user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", Globals::$langs->trans("ByPersonalizedAccountGroups"), 3, Globals::$user->rights->accounting->comptarapport->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/resultat&method=index&leftmenu=accountancy_report", Globals::$langs->trans("MenuReportInOut"), 2, Globals::$user->rights->accounting->comptarapport->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/resultat&method=clientfourn&leftmenu=accountancy_report", Globals::$langs->trans("ByPredefinedAccountGroups"), 3, Globals::$user->rights->accounting->comptarapport->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/resultat&method=result&leftmenu=accountancy_report", Globals::$langs->trans("ByPersonalizedAccountGroups"), 3, Globals::$user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/resultat&method=index&leftmenu=accountancy_report", Globals::$langs->trans("MenuReportInOut"), 2, Globals::$user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/resultat&method=clientfourn&leftmenu=accountancy_report", Globals::$langs->trans("ByPredefinedAccountGroups"), 3, Globals::$user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/resultat&method=result&leftmenu=accountancy_report", Globals::$langs->trans("ByPersonalizedAccountGroups"), 3, Globals::$user->rights->accounting->comptarapport->lire);

                     }

 

                     $modecompta = 'CREANCES-DETTES';

@@ -1462,11 +1462,11 @@ 
                               $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ByProductsAndServices"), 3, Globals::$user->rights->accounting->comptarapport->lire);

                               $newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ByVatRate"), 3, Globals::$user->rights->accounting->comptarapport->lire);

                              */

-                            $newmenu->add(BASE_URI . "?controller=compta/stats&method=index&leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ReportTurnover"), 2, Globals::$user->rights->accounting->comptarapport->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/stats&method=casoc&leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ByCompanies"), 3, Globals::$user->rights->accounting->comptarapport->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/stats&method=cabyuser&leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ByUsers"), 3, Globals::$user->rights->accounting->comptarapport->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/stats&method=cabyprodserv&leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ByProductsAndServices"), 3, Globals::$user->rights->accounting->comptarapport->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/stats&method=byratecountry&leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ByVatRate"), 3, Globals::$user->rights->accounting->comptarapport->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/stats&method=index&leftmenu=accountancy_report&modecompta = ".$modecompta, Globals::$langs->trans("ReportTurnover"), 2, Globals::$user->rights->accounting->comptarapport->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/stats&method=casoc&leftmenu=accountancy_report&modecompta = ".$modecompta, Globals::$langs->trans("ByCompanies"), 3, Globals::$user->rights->accounting->comptarapport->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/stats&method=cabyuser&leftmenu=accountancy_report&modecompta = ".$modecompta, Globals::$langs->trans("ByUsers"), 3, Globals::$user->rights->accounting->comptarapport->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/stats&method=cabyprodserv&leftmenu=accountancy_report&modecompta = ".$modecompta, Globals::$langs->trans("ByProductsAndServices"), 3, Globals::$user->rights->accounting->comptarapport->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/stats&method=byratecountry&leftmenu=accountancy_report&modecompta = ".$modecompta, Globals::$langs->trans("ByVatRate"), 3, Globals::$user->rights->accounting->comptarapport->lire);

                         }

                     }

 

@@ -1477,9 +1477,9 @@ 
 //$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ReportTurnoverCollected"), 2, Globals::$user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ByCompanies"), 3, Globals::$user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ByUsers"), 3, Globals::$user->rights->accounting->comptarapport->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/stats&method=index&leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ReportTurnoverCollected"), 2, Globals::$user->rights->accounting->comptarapport->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/stats&method=casoc&leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ByCompanies"), 3, Globals::$user->rights->accounting->comptarapport->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/stats&method=cabyuser&leftmenu=accountancy_report&modecompta = " . $modecompta, Globals::$langs->trans("ByUsers"), 3, Globals::$user->rights->accounting->comptarapport->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/stats&method=index&leftmenu=accountancy_report&modecompta = ".$modecompta, Globals::$langs->trans("ReportTurnoverCollected"), 2, Globals::$user->rights->accounting->comptarapport->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/stats&method=casoc&leftmenu=accountancy_report&modecompta = ".$modecompta, Globals::$langs->trans("ByCompanies"), 3, Globals::$user->rights->accounting->comptarapport->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/stats&method=cabyuser&leftmenu=accountancy_report&modecompta = ".$modecompta, Globals::$langs->trans("ByUsers"), 3, Globals::$user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta = ".$modecompta, Globals::$langs->trans("ByProductsAndServices"),3,Globals::$user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta = ".$modecompta, Globals::$langs->trans("ByVatRate"),3,Globals::$user->rights->accounting->comptarapport->lire);

                         }

@@ -1492,19 +1492,19 @@ 
 

 // Bilan, resultats

 //$newmenu->add("/compta/resultat/index.php?leftmenu=report&mainmenu=accountancy", Globals::$langs->trans("Reportings"), 0, Globals::$user->rights->compta->resultat->lire, '', $mainmenu, 'ca');

-                    $newmenu->add(BASE_URI . "?controller=compta/resultat&method=index&leftmenu=report&mainmenu=accountancy", Globals::$langs->trans("Reportings"), 0, Globals::$user->rights->compta->resultat->lire, '', $mainmenu, 'ca');

+                    $newmenu->add(BASE_URI."?controller=compta/resultat&method=index&leftmenu=report&mainmenu=accountancy", Globals::$langs->trans("Reportings"), 0, Globals::$user->rights->compta->resultat->lire, '', $mainmenu, 'ca');

 

                     if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {

 //$newmenu->add("/compta/resultat/index.php?leftmenu=report", Globals::$langs->trans("MenuReportInOut"), 1, Globals::$user->rights->compta->resultat->lire);

 //$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", Globals::$langs->trans("ByCompanies"), 2, Globals::$user->rights->compta->resultat->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/resultat&method=index&leftmenu=report", Globals::$langs->trans("MenuReportInOut"), 1, Globals::$user->rights->compta->resultat->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/resultat&method=clientfourn&leftmenu=report", Globals::$langs->trans("ByCompanies"), 2, Globals::$user->rights->compta->resultat->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/resultat&method=index&leftmenu=report", Globals::$langs->trans("MenuReportInOut"), 1, Globals::$user->rights->compta->resultat->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/resultat&method=clientfourn&leftmenu=report", Globals::$langs->trans("ByCompanies"), 2, Globals::$user->rights->compta->resultat->lire);

                         /* On verra ca avec module compabilite expert

                           $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,Globals::$user->rights->compta->resultat->lire);

                           $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,Globals::$user->rights->compta->resultat->lire);

                          */

 //$newmenu->add("/compta/stats/index.php?leftmenu=report", Globals::$langs->trans("ReportTurnover"), 1, Globals::$user->rights->compta->resultat->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=index&leftmenu=report", Globals::$langs->trans("ReportTurnover"), 1, Globals::$user->rights->compta->resultat->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=index&leftmenu=report", Globals::$langs->trans("ReportTurnover"), 1, Globals::$user->rights->compta->resultat->lire);

 

                         /*

                           $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,Globals::$user->rights->compta->resultat->lire);

@@ -1517,16 +1517,16 @@ 
 //$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", Globals::$langs->trans("ByUsers"), 2, Globals::$user->rights->compta->resultat->lire);

 //$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", Globals::$langs->trans("ByProductsAndServices"), 2, Globals::$user->rights->compta->resultat->lire);

 //$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report", Globals::$langs->trans("ByVatRate"), 2, Globals::$user->rights->compta->resultat->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=casoc&leftmenu=report", Globals::$langs->trans("ByCompanies"), 2, Globals::$user->rights->compta->resultat->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=cabyuser&leftmenu=report", Globals::$langs->trans("ByUsers"), 2, Globals::$user->rights->compta->resultat->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=cabyprodserv&leftmenu=report", Globals::$langs->trans("ByProductsAndServices"), 2, Globals::$user->rights->compta->resultat->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=byratecountry&leftmenu=report", Globals::$langs->trans("ByVatRate"), 2, Globals::$user->rights->compta->resultat->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=casoc&leftmenu=report", Globals::$langs->trans("ByCompanies"), 2, Globals::$user->rights->compta->resultat->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=cabyuser&leftmenu=report", Globals::$langs->trans("ByUsers"), 2, Globals::$user->rights->compta->resultat->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=cabyprodserv&leftmenu=report", Globals::$langs->trans("ByProductsAndServices"), 2, Globals::$user->rights->compta->resultat->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=byratecountry&leftmenu=report", Globals::$langs->trans("ByVatRate"), 2, Globals::$user->rights->compta->resultat->lire);

 

 // Journaux

 //$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", Globals::$langs->trans("SellsJournal"), 1, Globals::$user->rights->compta->resultat->lire, '', '', '', 50);

 //$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", Globals::$langs->trans("PurchasesJournal"), 1, Globals::$user->rights->compta->resultat->lire, '', '', '', 51);

-                        $newmenu->add(BASE_URI . "?controller=compta/journal&method=sellsjournal&leftmenu=report", Globals::$langs->trans("SellsJournal"), 1, Globals::$user->rights->compta->resultat->lire, '', '', '', 50);

-                        $newmenu->add(BASE_URI . "?controller=compta/journal&method=purchasesjournal&leftmenu=report", Globals::$langs->trans("PurchasesJournal"), 1, Globals::$user->rights->compta->resultat->lire, '', '', '', 51);

+                        $newmenu->add(BASE_URI."?controller=compta/journal&method=sellsjournal&leftmenu=report", Globals::$langs->trans("SellsJournal"), 1, Globals::$user->rights->compta->resultat->lire, '', '', '', 50);

+                        $newmenu->add(BASE_URI."?controller=compta/journal&method=purchasesjournal&leftmenu=report", Globals::$langs->trans("PurchasesJournal"), 1, Globals::$user->rights->compta->resultat->lire, '', '', '', 51);

                     }

 //if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",Globals::$langs->trans("Journaux"),1,Globals::$user->rights->compta->resultat->lire||Globals::$user->rights->accounting->comptarapport->lire);

                 }

@@ -1538,15 +1538,15 @@ 
 //$newmenu->add("/asset/card.php?action=create", Globals::$langs->trans("MenuNewAsset"), 1, Globals::$user->rights->asset->write);

 //$newmenu->add("/asset/list.php?leftmenu=asset&mainmenu=accountancy", Globals::$langs->trans("MenuListAssets"), 1, Globals::$user->rights->asset->read);

 //$newmenu->add("/asset/type.php?leftmenu=asset_type", Globals::$langs->trans("MenuTypeAssets"), 1, Globals::$user->rights->asset->read, '', $mainmenu, 'asset_type');

-                    $newmenu->add(BASE_URI . "?controller=asset&method=list&leftmenu=asset&mainmenu=accountancy", Globals::$langs->trans("MenuAssets"), 0, Globals::$user->rights->asset->read, '', $mainmenu, 'asset');

-                    $newmenu->add(BASE_URI . "?controller=asset&method=card&action=create", Globals::$langs->trans("MenuNewAsset"), 1, Globals::$user->rights->asset->write);

-                    $newmenu->add(BASE_URI . "?controller=asset&method=list&leftmenu=asset&mainmenu=accountancy", Globals::$langs->trans("MenuListAssets"), 1, Globals::$user->rights->asset->read);

-                    $newmenu->add(BASE_URI . "?controller=asset&method=type&leftmenu=asset_type", Globals::$langs->trans("MenuTypeAssets"), 1, Globals::$user->rights->asset->read, '', $mainmenu, 'asset_type');

+                    $newmenu->add(BASE_URI."?controller=asset&method=list&leftmenu=asset&mainmenu=accountancy", Globals::$langs->trans("MenuAssets"), 0, Globals::$user->rights->asset->read, '', $mainmenu, 'asset');

+                    $newmenu->add(BASE_URI."?controller=asset&method=card&action=create", Globals::$langs->trans("MenuNewAsset"), 1, Globals::$user->rights->asset->write);

+                    $newmenu->add(BASE_URI."?controller=asset&method=list&leftmenu=asset&mainmenu=accountancy", Globals::$langs->trans("MenuListAssets"), 1, Globals::$user->rights->asset->read);

+                    $newmenu->add(BASE_URI."?controller=asset&method=type&leftmenu=asset_type", Globals::$langs->trans("MenuTypeAssets"), 1, Globals::$user->rights->asset->read, '', $mainmenu, 'asset_type');

                     if ($usemenuhider || empty($leftmenu) || preg_match('/asset_type/', $leftmenu)) {

 //$newmenu->add("/asset/type.php?leftmenu=asset_type&action=create", Globals::$langs->trans("MenuNewTypeAssets"), 2, Globals::$user->rights->asset->write);

 //$newmenu->add("/asset/type.php?leftmenu=asset_type", Globals::$langs->trans("MenuListTypeAssets"), 2, Globals::$user->rights->asset->read);

-                        $newmenu->add(BASE_URI . "?controller=asset&method=type&leftmenu=asset_type&action=create", Globals::$langs->trans("MenuNewTypeAssets"), 2, Globals::$user->rights->asset->write);

-                        $newmenu->add(BASE_URI . "?controller=asset&mtehod=type&leftmenu=asset_type", Globals::$langs->trans("MenuListTypeAssets"), 2, Globals::$user->rights->asset->read);

+                        $newmenu->add(BASE_URI."?controller=asset&method=type&leftmenu=asset_type&action=create", Globals::$langs->trans("MenuNewTypeAssets"), 2, Globals::$user->rights->asset->write);

+                        $newmenu->add(BASE_URI."?controller=asset&mtehod=type&leftmenu=asset_type", Globals::$langs->trans("MenuListTypeAssets"), 2, Globals::$user->rights->asset->read);

                     }

                 }

             }

@@ -1571,28 +1571,28 @@ 
 

                       $newmenu->add("/compta/bank/transfer.php", Globals::$langs->trans("MenuBankInternalTransfer"), 1, Globals::$user->rights->banque->transfer);

                      */

-                    $newmenu->add(BASE_URI . "?controller=compta/bank&method=list&leftmenu=bank&mainmenu=bank", Globals::$langs->trans("MenuBankCash"), 0, Globals::$user->rights->banque->lire, '', $mainmenu, 'bank');

+                    $newmenu->add(BASE_URI."?controller=compta/bank&method=list&leftmenu=bank&mainmenu=bank", Globals::$langs->trans("MenuBankCash"), 0, Globals::$user->rights->banque->lire, '', $mainmenu, 'bank');

 

-                    $newmenu->add(BASE_URI . "?controller=compta/bank&method=card&action=create", Globals::$langs->trans("MenuNewFinancialAccount"), 1, Globals::$user->rights->banque->configurer);

-                    $newmenu->add(BASE_URI . "?controller=compta/bank&method=list&leftmenu=bank&mainmenu=bank", Globals::$langs->trans("List"), 1, Globals::$user->rights->banque->lire, '', $mainmenu, 'bank');

-                    $newmenu->add(BASE_URI . "?controller=compta/bank&method=bankentries_list", Globals::$langs->trans("ListTransactions"), 1, Globals::$user->rights->banque->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/bank&method=budget", Globals::$langs->trans("ListTransactionsByCategory"), 1, Globals::$user->rights->banque->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/bank&method=card&action=create", Globals::$langs->trans("MenuNewFinancialAccount"), 1, Globals::$user->rights->banque->configurer);

+                    $newmenu->add(BASE_URI."?controller=compta/bank&method=list&leftmenu=bank&mainmenu=bank", Globals::$langs->trans("List"), 1, Globals::$user->rights->banque->lire, '', $mainmenu, 'bank');

+                    $newmenu->add(BASE_URI."?controller=compta/bank&method=bankentries_list", Globals::$langs->trans("ListTransactions"), 1, Globals::$user->rights->banque->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/bank&method=budget", Globals::$langs->trans("ListTransactionsByCategory"), 1, Globals::$user->rights->banque->lire);

 

-                    $newmenu->add(BASE_URI . "?controller=compta/bank&method=transfer", Globals::$langs->trans("MenuBankInternalTransfer"), 1, Globals::$user->rights->banque->transfer);

+                    $newmenu->add(BASE_URI."?controller=compta/bank&method=transfer", Globals::$langs->trans("MenuBankInternalTransfer"), 1, Globals::$user->rights->banque->transfer);

                 }

 

                 if (!empty($conf->categorie->enabled)) {

                     Globals::$langs->load("categories");

 //$newmenu->add("/categories/index.php?type = 5", Globals::$langs->trans("Rubriques"), 1, Globals::$user->rights->categorie->creer, '', $mainmenu, 'tags');

 //$newmenu->add("/compta/bank/categ.php", Globals::$langs->trans("RubriquesTransactions"), 1, Globals::$user->rights->categorie->creer, '', $mainmenu, 'tags');

-                    $newmenu->add(BASE_URI . "?controller=categories&method=index&type=5", Globals::$langs->trans("Rubriques"), 1, Globals::$user->rights->categorie->creer, '', $mainmenu, 'tags');

-                    $newmenu->add(BASE_URI . "?controller=compta/bank&method=categ", Globals::$langs->trans("RubriquesTransactions"), 1, Globals::$user->rights->categorie->creer, '', $mainmenu, 'tags');

+                    $newmenu->add(BASE_URI."?controller=categories&method=index&type=5", Globals::$langs->trans("Rubriques"), 1, Globals::$user->rights->categorie->creer, '', $mainmenu, 'tags');

+                    $newmenu->add(BASE_URI."?controller=compta/bank&method=categ", Globals::$langs->trans("RubriquesTransactions"), 1, Globals::$user->rights->categorie->creer, '', $mainmenu, 'tags');

                 }

 

 // Prelevements

                 if (!empty($conf->prelevement->enabled)) {

 //$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank", Globals::$langs->trans("StandingOrders"), 0, Globals::$user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');

-                    $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=index&leftmenu=withdraw&mainmenu=bank", Globals::$langs->trans("StandingOrders"), 0, Globals::$user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');

+                    $newmenu->add(BASE_URI."?controller=compta/prelevement&method=index&leftmenu=withdraw&mainmenu=bank", Globals::$langs->trans("StandingOrders"), 0, Globals::$user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');

 

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {

 //$newmenu->add("/compta/prelevement/demandes.php?status = 0&mainmenu=bank",Globals::$langs->trans("StandingOrderToProcess"),1,Globals::$user->rights->prelevement->bons->lire);

@@ -1605,12 +1605,12 @@ 
                           $newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", Globals::$langs->trans("Rejects"), 1, Globals::$user->rights->prelevement->bons->lire);

                           $newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->prelevement->bons->lire);

                          */

-                        $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=create&mainmenu=bank", Globals::$langs->trans("NewStandingOrder"), 1, Globals::$user->rights->prelevement->bons->creer);

+                        $newmenu->add(BASE_URI."?controller=compta/prelevement&method=create&mainmenu=bank", Globals::$langs->trans("NewStandingOrder"), 1, Globals::$user->rights->prelevement->bons->creer);

 

-                        $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=bons&mainmenu=bank", Globals::$langs->trans("WithdrawalsReceipts"), 1, Globals::$user->rights->prelevement->bons->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=list&mainmenu=bank", Globals::$langs->trans("WithdrawalsLines"), 1, Globals::$user->rights->prelevement->bons->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=rejets&mainmenu=bank", Globals::$langs->trans("Rejects"), 1, Globals::$user->rights->prelevement->bons->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=stats&mainmenu=bank", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->prelevement->bons->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/prelevement&method=bons&mainmenu=bank", Globals::$langs->trans("WithdrawalsReceipts"), 1, Globals::$user->rights->prelevement->bons->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/prelevement&method=list&mainmenu=bank", Globals::$langs->trans("WithdrawalsLines"), 1, Globals::$user->rights->prelevement->bons->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/prelevement&method=rejets&mainmenu=bank", Globals::$langs->trans("Rejects"), 1, Globals::$user->rights->prelevement->bons->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/prelevement&method=stats&mainmenu=bank", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->prelevement->bons->lire);

 

 //$newmenu->add("/compta/prelevement/config.php",Globals::$langs->trans("Setup"),1,Globals::$user->rights->prelevement->bons->configurer);

                     }

@@ -1619,12 +1619,12 @@ 
 // Gestion cheques

                 if (empty(Conf::$global->BANK_DISABLE_CHECK_DEPOSIT) && !empty($conf->banque->enabled) && (!empty($conf->facture->enabled) || !empty(Conf::$global->MAIN_MENU_CHEQUE_DEPOSIT_ON))) {

 //$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank", Globals::$langs->trans("MenuChequeDeposits"), 0, Globals::$user->rights->banque->cheque, '', $mainmenu, 'checks');

-                    $newmenu->add(BASE_URI . "?controller=compta/paiement/cheque&method=index&leftmenu=checks&mainmenu=bank", Globals::$langs->trans("MenuChequeDeposits"), 0, Globals::$user->rights->banque->cheque, '', $mainmenu, 'checks');

+                    $newmenu->add(BASE_URI."?controller=compta/paiement/cheque&method=index&leftmenu=checks&mainmenu=bank", Globals::$langs->trans("MenuChequeDeposits"), 0, Globals::$user->rights->banque->cheque, '', $mainmenu, 'checks');

                     if (preg_match('/checks/', $leftmenu)) {

 //$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&action=new&mainmenu=bank", Globals::$langs->trans("NewChequeDeposit"), 1, Globals::$user->rights->banque->cheque);

 //$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&mainmenu=bank", Globals::$langs->trans("List"), 1, Globals::$user->rights->banque->cheque);

-                        $newmenu->add(BASE_URI . "?controller=compta/paiement/cheque&method=card&leftmenu=checks_bis&action=new&mainmenu=bank", Globals::$langs->trans("NewChequeDeposit"), 1, Globals::$user->rights->banque->cheque);

-                        $newmenu->add(BASE_URI . "?controller=compta/paiement/cheque&method=list&leftmenu=checks_bis&mainmenu=bank", Globals::$langs->trans("List"), 1, Globals::$user->rights->banque->cheque);

+                        $newmenu->add(BASE_URI."?controller=compta/paiement/cheque&method=card&leftmenu=checks_bis&action=new&mainmenu=bank", Globals::$langs->trans("NewChequeDeposit"), 1, Globals::$user->rights->banque->cheque);

+                        $newmenu->add(BASE_URI."?controller=compta/paiement/cheque&method=list&leftmenu=checks_bis&mainmenu=bank", Globals::$langs->trans("List"), 1, Globals::$user->rights->banque->cheque);

                     }

                 }

 

@@ -1634,9 +1634,9 @@ 
 //$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", Globals::$langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol');

 //$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", Globals::$langs->trans("NewCashFence"), 1, $permtomakecashfence);

 //$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", Globals::$langs->trans("List"), 1, $permtomakecashfence);

-                    $newmenu->add(BASE_URI . "?controller=compta/cashcontrol&method=cashcontrol_list&action=list", Globals::$langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol');

-                    $newmenu->add(BASE_URI . "?controller=compta/cashcontrol&method=cashcontrol_card&action=create", Globals::$langs->trans("NewCashFence"), 1, $permtomakecashfence);

-                    $newmenu->add(BASE_URI . "?controller=compta/cashcontrol&method=cashcontrol_list&action=list", Globals::$langs->trans("List"), 1, $permtomakecashfence);

+                    $newmenu->add(BASE_URI."?controller=compta/cashcontrol&method=cashcontrol_list&action=list", Globals::$langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol');

+                    $newmenu->add(BASE_URI."?controller=compta/cashcontrol&method=cashcontrol_card&action=create", Globals::$langs->trans("NewCashFence"), 1, $permtomakecashfence);

+                    $newmenu->add(BASE_URI."?controller=compta/cashcontrol&method=cashcontrol_list&action=list", Globals::$langs->trans("List"), 1, $permtomakecashfence);

                 }

             }

 

@@ -1649,34 +1649,34 @@ 
 //$newmenu->add("/product/index.php?leftmenu=product&type=0", Globals::$langs->trans("Products"), 0, Globals::$user->rights->produit->lire, '', $mainmenu, 'product');

 //$newmenu->add("/product/card.php?leftmenu=product&action=create&type=0", Globals::$langs->trans("NewProduct"), 1, Globals::$user->rights->produit->creer);

 //$newmenu->add("/product/list.php?leftmenu=product&type=0", Globals::$langs->trans("List"), 1, Globals::$user->rights->produit->lire);

-                    $newmenu->add(BASE_URI . "?controller=product&method=index&leftmenu=product&type=0", Globals::$langs->trans("Products"), 0, Globals::$user->rights->produit->lire, '', $mainmenu, 'product');

-                    $newmenu->add(BASE_URI . "?controller=product&method=card&leftmenu=product&action=create&type=0", Globals::$langs->trans("NewProduct"), 1, Globals::$user->rights->produit->creer);

-                    $newmenu->add(BASE_URI . "?controller=product&method=list&leftmenu=product&type=0", Globals::$langs->trans("List"), 1, Globals::$user->rights->produit->lire);

+                    $newmenu->add(BASE_URI."?controller=product&method=index&leftmenu=product&type=0", Globals::$langs->trans("Products"), 0, Globals::$user->rights->produit->lire, '', $mainmenu, 'product');

+                    $newmenu->add(BASE_URI."?controller=product&method=card&leftmenu=product&action=create&type=0", Globals::$langs->trans("NewProduct"), 1, Globals::$user->rights->produit->creer);

+                    $newmenu->add(BASE_URI."?controller=product&method=list&leftmenu=product&type=0", Globals::$langs->trans("List"), 1, Globals::$user->rights->produit->lire);

                     if (!empty($conf->stock->enabled)) {

 //$newmenu->add("/product/reassort.php?type = 0", Globals::$langs->trans("Stocks"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->stock->lire);

-                        $newmenu->add(BASE_URI . "?controller=product&method=reassort&type=0", Globals::$langs->trans("Stocks"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->stock->lire);

+                        $newmenu->add(BASE_URI."?controller=product&method=reassort&type=0", Globals::$langs->trans("Stocks"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->stock->lire);

                     }

                     if (!empty($conf->productbatch->enabled)) {

                         Globals::$langs->load("stocks");

 //$newmenu->add("/product/reassortlot.php?type = 0", Globals::$langs->trans("StocksByLotSerial"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->stock->lire);

 //$newmenu->add("/product/stock/productlot_list.php", Globals::$langs->trans("LotSerial"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->stock->lire);

-                        $newmenu->add(BASE_URI . "?controller=product&method=reassortlot&type=0", Globals::$langs->trans("StocksByLotSerial"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->stock->lire);

-                        $newmenu->add(BASE_URI . "?controller=product/stock&method=productlot_list", Globals::$langs->trans("LotSerial"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->stock->lire);

+                        $newmenu->add(BASE_URI."?controller=product&method=reassortlot&type=0", Globals::$langs->trans("StocksByLotSerial"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->stock->lire);

+                        $newmenu->add(BASE_URI."?controller=product/stock&method=productlot_list", Globals::$langs->trans("LotSerial"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->stock->lire);

                     }

                     if (!empty($conf->variants->enabled)) {

 //$newmenu->add("/variants/list.php", Globals::$langs->trans("VariantAttributes"), 1, Globals::$user->rights->produit->lire);

-                        $newmenu->add(BASE_URI . "?controller=variants&method=list", Globals::$langs->trans("VariantAttributes"), 1, Globals::$user->rights->produit->lire);

+                        $newmenu->add(BASE_URI."?controller=variants&method=list", Globals::$langs->trans("VariantAttributes"), 1, Globals::$user->rights->produit->lire);

                     }

                     if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled)) {

 // $newmenu->add("/product/stats/card.php?id = all&leftmenu=stats&type=0", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->propale->lire);

-                        $newmenu->add(BASE_URI . "?controller=product/stats&method=card&id=all&leftmenu=stats&type=0", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->propale->lire);

+                        $newmenu->add(BASE_URI."?controller=product/stats&method=card&id=all&leftmenu=stats&type=0", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->produit->lire && Globals::$user->rights->propale->lire);

                     }

 

 // Categories

                     if (!empty($conf->categorie->enabled)) {

                         Globals::$langs->load("categories");

 //$newmenu->add("/categories/index.php?leftmenu=cat&type=0", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

-                        $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=0", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

+                        $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=cat&type=0", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

                         //if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", Globals::$langs->trans("List"), 1, Globals::$user->rights->categorie->lire);

                     }

                 }

@@ -1686,18 +1686,18 @@ 
                     //$newmenu->add("/product/index.php?leftmenu=service&type=1", Globals::$langs->trans("Services"), 0, Globals::$user->rights->service->lire, '', $mainmenu, 'service');

                     //$newmenu->add("/product/card.php?leftmenu=service&action=create&type=1", Globals::$langs->trans("NewService"), 1, Globals::$user->rights->service->creer);

                     //$newmenu->add("/product/list.php?leftmenu=service&type=1", Globals::$langs->trans("List"), 1, Globals::$user->rights->service->lire);

-                    $newmenu->add(BASE_URI . "?controller=product&method=index&leftmenu=service&type=1", Globals::$langs->trans("Services"), 0, Globals::$user->rights->service->lire, '', $mainmenu, 'service');

-                    $newmenu->add(BASE_URI . "?controller=product&method=card&leftmenu=service&action=create&type=1", Globals::$langs->trans("NewService"), 1, Globals::$user->rights->service->creer);

-                    $newmenu->add(BASE_URI . "?controller=product&method=list&leftmenu=service&type=1", Globals::$langs->trans("List"), 1, Globals::$user->rights->service->lire);

+                    $newmenu->add(BASE_URI."?controller=product&method=index&leftmenu=service&type=1", Globals::$langs->trans("Services"), 0, Globals::$user->rights->service->lire, '', $mainmenu, 'service');

+                    $newmenu->add(BASE_URI."?controller=product&method=card&leftmenu=service&action=create&type=1", Globals::$langs->trans("NewService"), 1, Globals::$user->rights->service->creer);

+                    $newmenu->add(BASE_URI."?controller=product&method=list&leftmenu=service&type=1", Globals::$langs->trans("List"), 1, Globals::$user->rights->service->lire);

                     if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled)) {

                         //$newmenu->add("/product/stats/card.php?id = all&leftmenu=stats&type=1", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->service->lire && Globals::$user->rights->propale->lire);

-                        $newmenu->add(BASE_URI . "?controller=product/stats&method=card&id=all&leftmenu=stats&type=1", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->service->lire && Globals::$user->rights->propale->lire);

+                        $newmenu->add(BASE_URI."?controller=product/stats&method=card&id=all&leftmenu=stats&type=1", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->service->lire && Globals::$user->rights->propale->lire);

                     }

                     // Categories

                     if (!empty($conf->categorie->enabled)) {

                         Globals::$langs->load("categories");

                         //$newmenu->add("/categories/index.php?leftmenu=cat&type=0", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

-                        $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=0", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

+                        $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=cat&type=0", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

                         //if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", Globals::$langs->trans("List"), 1, Globals::$user->rights->categorie->lire);

                     }

                 }

@@ -1713,15 +1713,15 @@ 
 

                       $newmenu->add("/product/stock/massstockmove.php", Globals::$langs->trans("MassStockTransferShort"), 1, Globals::$user->rights->stock->mouvement->creer);

                      */

-                    $newmenu->add(BASE_URI . "?controller=product/stock&method=index&leftmenu=stock", Globals::$langs->trans("Warehouses"), 0, Globals::$user->rights->stock->lire, '', $mainmenu, 'stock');

-                    $newmenu->add(BASE_URI . "?controller=product/stock&method=card&action=create", Globals::$langs->trans("MenuNewWarehouse"), 1, Globals::$user->rights->stock->creer);

-                    $newmenu->add(BASE_URI . "?controller=product/stock&method=list", Globals::$langs->trans("List"), 1, Globals::$user->rights->stock->lire);

-                    $newmenu->add(BASE_URI . "?controller=product/stock&method=movement_list", Globals::$langs->trans("Movements"), 1, Globals::$user->rights->stock->mouvement->lire);

+                    $newmenu->add(BASE_URI."?controller=product/stock&method=index&leftmenu=stock", Globals::$langs->trans("Warehouses"), 0, Globals::$user->rights->stock->lire, '', $mainmenu, 'stock');

+                    $newmenu->add(BASE_URI."?controller=product/stock&method=card&action=create", Globals::$langs->trans("MenuNewWarehouse"), 1, Globals::$user->rights->stock->creer);

+                    $newmenu->add(BASE_URI."?controller=product/stock&method=list", Globals::$langs->trans("List"), 1, Globals::$user->rights->stock->lire);

+                    $newmenu->add(BASE_URI."?controller=product/stock&method=movement_list", Globals::$langs->trans("Movements"), 1, Globals::$user->rights->stock->mouvement->lire);

 

-                    $newmenu->add(BASE_URI . "?controller=product/stock&method=massstockmove", Globals::$langs->trans("MassStockTransferShort"), 1, Globals::$user->rights->stock->mouvement->creer);

+                    $newmenu->add(BASE_URI."?controller=product/stock&method=massstockmove", Globals::$langs->trans("MassStockTransferShort"), 1, Globals::$user->rights->stock->mouvement->creer);

                     if ($conf->supplier_order->enabled) {

                         //$newmenu->add("/product/stock/replenish.php", Globals::$langs->trans("Replenishment"), 1, Globals::$user->rights->stock->mouvement->creer && Globals::$user->rights->fournisseur->lire);

-                        $newmenu->add(BASE_URI . "?controller=product/stock&method=replenish", Globals::$langs->trans("Replenishment"), 1, Globals::$user->rights->stock->mouvement->creer && Globals::$user->rights->fournisseur->lire);

+                        $newmenu->add(BASE_URI."?controller=product/stock&method=replenish", Globals::$langs->trans("Replenishment"), 1, Globals::$user->rights->stock->mouvement->creer && Globals::$user->rights->fournisseur->lire);

                     }

                 }

 

@@ -1733,16 +1733,16 @@ 
                             //$newmenu->add("/product/inventory/list.php?leftmenu=stock", Globals::$langs->trans("Inventory"), 0, Globals::$user->rights->stock->lire, '', $mainmenu, 'stock');

                             //$newmenu->add("/product/inventory/card.php?action=create", Globals::$langs->trans("NewInventory"), 1, Globals::$user->rights->stock->creer);

                             //$newmenu->add("/product/inventory/list.php", Globals::$langs->trans("List"), 1, Globals::$user->rights->stock->lire);

-                            $newmenu->add(BASE_URI . "?controller=product/inventory&method=list&leftmenu=stock", Globals::$langs->trans("Inventory"), 0, Globals::$user->rights->stock->lire, '', $mainmenu, 'stock');

-                            $newmenu->add(BASE_URI . "?controller=product/inventory&method=card&action=create", Globals::$langs->trans("NewInventory"), 1, Globals::$user->rights->stock->creer);

-                            $newmenu->add(BASE_URI . "?controller=product/inventory&method=list", Globals::$langs->trans("List"), 1, Globals::$user->rights->stock->lire);

+                            $newmenu->add(BASE_URI."?controller=product/inventory&method=list&leftmenu=stock", Globals::$langs->trans("Inventory"), 0, Globals::$user->rights->stock->lire, '', $mainmenu, 'stock');

+                            $newmenu->add(BASE_URI."?controller=product/inventory&method=card&action=create", Globals::$langs->trans("NewInventory"), 1, Globals::$user->rights->stock->creer);

+                            $newmenu->add(BASE_URI."?controller=product/inventory&method=list", Globals::$langs->trans("List"), 1, Globals::$user->rights->stock->lire);

                         } else {

                             //$newmenu->add("/product/inventory/list.php?leftmenu=stock", Globals::$langs->trans("Inventory"), 0, Globals::$user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');

                             //$newmenu->add("/product/inventory/card.php?action=create", Globals::$langs->trans("NewInventory"), 1, Globals::$user->rights->stock->inventory_advance->write);

                             //$newmenu->add("/product/inventory/list.php", Globals::$langs->trans("List"), 1, Globals::$user->rights->stock->inventory_advance->read);

-                            $newmenu->add(BASE_URI . "?controller=product/inventory&method=list&leftmenu=stock", Globals::$langs->trans("Inventory"), 0, Globals::$user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');

-                            $newmenu->add(BASE_URI . "?controller=product/inventory&method=card&action=create", Globals::$langs->trans("NewInventory"), 1, Globals::$user->rights->stock->inventory_advance->write);

-                            $newmenu->add(BASE_URI . "?controller=product/inventory&method=list", Globals::$langs->trans("List"), 1, Globals::$user->rights->stock->inventory_advance->read);

+                            $newmenu->add(BASE_URI."?controller=product/inventory&method=list&leftmenu=stock", Globals::$langs->trans("Inventory"), 0, Globals::$user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');

+                            $newmenu->add(BASE_URI."?controller=product/inventory&method=card&action=create", Globals::$langs->trans("NewInventory"), 1, Globals::$user->rights->stock->inventory_advance->write);

+                            $newmenu->add(BASE_URI."?controller=product/inventory&method=list", Globals::$langs->trans("List"), 1, Globals::$user->rights->stock->inventory_advance->read);

                         }

                     }

                 }

@@ -1753,19 +1753,19 @@ 
                     //$newmenu->add("/expedition/index.php?leftmenu=sendings", Globals::$langs->trans("Shipments"), 0, Globals::$user->rights->expedition->lire, '', $mainmenu, 'sendings');

                     //$newmenu->add("/expedition/card.php?action=create2&leftmenu=sendings", Globals::$langs->trans("NewSending"), 1, Globals::$user->rights->expedition->creer);

                     //$newmenu->add("/expedition/list.php?leftmenu=sendings", Globals::$langs->trans("List"), 1, Globals::$user->rights->expedition->lire);

-                    $newmenu->add(BASE_URI . "?controller=expedition&method=index&leftmenu=sendings", Globals::$langs->trans("Shipments"), 0, Globals::$user->rights->expedition->lire, '', $mainmenu, 'sendings');

-                    $newmenu->add(BASE_URI . "?controller=expedition&method=card&action=create2&leftmenu=sendings", Globals::$langs->trans("NewSending"), 1, Globals::$user->rights->expedition->creer);

-                    $newmenu->add(BASE_URI . "?controller=expedition&method=list&leftmenu=sendings", Globals::$langs->trans("List"), 1, Globals::$user->rights->expedition->lire);

+                    $newmenu->add(BASE_URI."?controller=expedition&method=index&leftmenu=sendings", Globals::$langs->trans("Shipments"), 0, Globals::$user->rights->expedition->lire, '', $mainmenu, 'sendings');

+                    $newmenu->add(BASE_URI."?controller=expedition&method=card&action=create2&leftmenu=sendings", Globals::$langs->trans("NewSending"), 1, Globals::$user->rights->expedition->creer);

+                    $newmenu->add(BASE_URI."?controller=expedition&method=list&leftmenu=sendings", Globals::$langs->trans("List"), 1, Globals::$user->rights->expedition->lire);

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {

                         //$newmenu->add("/expedition/list.php?leftmenu=sendings&viewstatut=0", Globals::$langs->trans("StatusSendingDraftShort"), 2, Globals::$user->rights->expedition->lire);

                         //$newmenu->add("/expedition/list.php?leftmenu=sendings&viewstatut=1", Globals::$langs->trans("StatusSendingValidatedShort"), 2, Globals::$user->rights->expedition->lire);

                         //$newmenu->add("/expedition/list.php?leftmenu=sendings&viewstatut=2", Globals::$langs->trans("StatusSendingProcessedShort"), 2, Globals::$user->rights->expedition->lire);

-                        $newmenu->add(BASE_URI . "?controller=expedition&method=list&leftmenu=sendings&viewstatut=0", Globals::$langs->trans("StatusSendingDraftShort"), 2, Globals::$user->rights->expedition->lire);

-                        $newmenu->add(BASE_URI . "?controller=expedition&method=list&leftmenu=sendings&viewstatut=1", Globals::$langs->trans("StatusSendingValidatedShort"), 2, Globals::$user->rights->expedition->lire);

-                        $newmenu->add(BASE_URI . "?controller=expedition&method=list&leftmenu=sendings&viewstatut=2", Globals::$langs->trans("StatusSendingProcessedShort"), 2, Globals::$user->rights->expedition->lire);

+                        $newmenu->add(BASE_URI."?controller=expedition&method=list&leftmenu=sendings&viewstatut=0", Globals::$langs->trans("StatusSendingDraftShort"), 2, Globals::$user->rights->expedition->lire);

+                        $newmenu->add(BASE_URI."?controller=expedition&method=list&leftmenu=sendings&viewstatut=1", Globals::$langs->trans("StatusSendingValidatedShort"), 2, Globals::$user->rights->expedition->lire);

+                        $newmenu->add(BASE_URI."?controller=expedition&method=list&leftmenu=sendings&viewstatut=2", Globals::$langs->trans("StatusSendingProcessedShort"), 2, Globals::$user->rights->expedition->lire);

                     }

                     //$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->expedition->lire);

-                    $newmenu->add(BASE_URI . "?controller=expedition/stats&method=index&leftmenu=sendings", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->expedition->lire);

+                    $newmenu->add(BASE_URI."?controller=expedition/stats&method=index&leftmenu=sendings", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->expedition->lire);

                 }

 

                 // Receptions

@@ -1774,23 +1774,23 @@ 
                     //$newmenu->add("/reception/index.php?leftmenu=receptions", Globals::$langs->trans("Receptions"), 0, Globals::$user->rights->reception->lire, '', $mainmenu, 'receptions');

                     //$newmenu->add("/reception/card.php?action=create2&leftmenu=receptions", Globals::$langs->trans("NewReception"), 1, Globals::$user->rights->reception->creer);

                     //$newmenu->add("/reception/list.php?leftmenu=receptions", Globals::$langs->trans("List"), 1, Globals::$user->rights->reception->lire);

-                    $newmenu->add(BASE_URI . "?controller=reception&method=index&leftmenu=receptions", Globals::$langs->trans("Receptions"), 0, Globals::$user->rights->reception->lire, '', $mainmenu, 'receptions');

-                    $newmenu->add(BASE_URI . "?controller=reception&method=card&action=create2&leftmenu=receptions", Globals::$langs->trans("NewReception"), 1, Globals::$user->rights->reception->creer);

-                    $newmenu->add(BASE_URI . "?controller=reception&method=list&leftmenu=receptions", Globals::$langs->trans("List"), 1, Globals::$user->rights->reception->lire);

+                    $newmenu->add(BASE_URI."?controller=reception&method=index&leftmenu=receptions", Globals::$langs->trans("Receptions"), 0, Globals::$user->rights->reception->lire, '', $mainmenu, 'receptions');

+                    $newmenu->add(BASE_URI."?controller=reception&method=card&action=create2&leftmenu=receptions", Globals::$langs->trans("NewReception"), 1, Globals::$user->rights->reception->creer);

+                    $newmenu->add(BASE_URI."?controller=reception&method=list&leftmenu=receptions", Globals::$langs->trans("List"), 1, Globals::$user->rights->reception->lire);

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {

                         //$newmenu->add("/reception/list.php?leftmenu=receptions&viewstatut=0", Globals::$langs->trans("StatusReceptionDraftShort"), 2, Globals::$user->rights->reception->lire);

-                        $newmenu->add(BASE_URI . "?controller=reception&method=list&leftmenu=receptions&viewstatut=0", Globals::$langs->trans("StatusReceptionDraftShort"), 2, Globals::$user->rights->reception->lire);

+                        $newmenu->add(BASE_URI."?controller=reception&method=list&leftmenu=receptions&viewstatut=0", Globals::$langs->trans("StatusReceptionDraftShort"), 2, Globals::$user->rights->reception->lire);

                     }

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {

                         //$newmenu->add("/reception/list.php?leftmenu=receptions&viewstatut=1", Globals::$langs->trans("StatusReceptionValidatedShort"), 2, Globals::$user->rights->reception->lire);

-                        $newmenu->add(BASE_URI . "?controller=reception&method=list&leftmenu=receptions&viewstatut=1", Globals::$langs->trans("StatusReceptionValidatedShort"), 2, Globals::$user->rights->reception->lire);

+                        $newmenu->add(BASE_URI."?controller=reception&method=list&leftmenu=receptions&viewstatut=1", Globals::$langs->trans("StatusReceptionValidatedShort"), 2, Globals::$user->rights->reception->lire);

                     }

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {

                         //$newmenu->add("/reception/list.php?leftmenu=receptions&viewstatut=2", Globals::$langs->trans("StatusReceptionProcessedShort"), 2, Globals::$user->rights->reception->lire);

-                        $newmenu->add(BASE_URI . "?controller=reception&method=list&leftmenu=receptions&viewstatut=2", Globals::$langs->trans("StatusReceptionProcessedShort"), 2, Globals::$user->rights->reception->lire);

+                        $newmenu->add(BASE_URI."?controller=reception&method=list&leftmenu=receptions&viewstatut=2", Globals::$langs->trans("StatusReceptionProcessedShort"), 2, Globals::$user->rights->reception->lire);

                     }

                     //$newmenu->add("/reception/stats/index.php?leftmenu=receptions", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->reception->lire);

-                    $newmenu->add(BASE_URI . "?controller=reception/stats&method=index&leftmenu=receptions", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->reception->lire);

+                    $newmenu->add(BASE_URI."?controller=reception/stats&method=index&leftmenu=receptions", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->reception->lire);

                 }

             }

 

@@ -1824,32 +1824,32 @@ 
                     // Project assigned to user

                     //$newmenu->add("/projet/index.php?leftmenu=projects" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $titleboth, 0, Globals::$user->rights->projet->lire, '', $mainmenu, 'projects');

                     //$newmenu->add("/projet/card.php?leftmenu=projects&action=create" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $titlenew, 1, Globals::$user->rights->projet->creer);

-                    $newmenu->add(BASE_URI . "?controller=projet&method=index&leftmenu=projects" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $titleboth, 0, Globals::$user->rights->projet->lire, '', $mainmenu, 'projects');

-                    $newmenu->add(BASE_URI . "?controller=projet&method=card&leftmenu=projects&action=create" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $titlenew, 1, Globals::$user->rights->projet->creer);

+                    $newmenu->add(BASE_URI."?controller=projet&method=index&leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, Globals::$user->rights->projet->lire, '', $mainmenu, 'projects');

+                    $newmenu->add(BASE_URI."?controller=projet&method=card&leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, Globals::$user->rights->projet->creer);

 

                     if (Conf::$global->PROJECT_USE_OPPORTUNITIES == 0) {

                         //$newmenu->add("/projet/list.php?leftmenu=projets" . ($search_project_user ? '&search_project_user=' . $search_project_user : '') . '&search_status=99', Globals::$langs->trans("List"), 1, $showmode, '', 'project', 'list');

-                        $newmenu->add(BASE_URI . "?controller=projet&method=list&leftmenu=projets" . ($search_project_user ? '&search_project_user=' . $search_project_user : '') . '&search_status=99', Globals::$langs->trans("List"), 1, $showmode, '', 'project', 'list');

+                        $newmenu->add(BASE_URI."?controller=projet&method=list&leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', Globals::$langs->trans("List"), 1, $showmode, '', 'project', 'list');

                     } elseif (Conf::$global->PROJECT_USE_OPPORTUNITIES == 1) {

                         //$newmenu->add("/projet/list.php?leftmenu=projets" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), Globals::$langs->trans("List"), 1, $showmode, '', 'project', 'list');

                         //$newmenu->add('/projet/list.php?mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99&contextpage=lead', Globals::$langs->trans("ListOpenLeads"), 2, $showmode);

                         //$newmenu->add('/projet/list.php?mainmenu=project&leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', Globals::$langs->trans("ListOpenProjects"), 2, $showmode);

-                        $newmenu->add(BASE_URI . "?controller=projet&method=list&leftmenu=projets" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), Globals::$langs->trans("List"), 1, $showmode, '', 'project', 'list');

-                        $newmenu->add(BASE_URI . '?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99&contextpage=lead', Globals::$langs->trans("ListOpenLeads"), 2, $showmode);

-                        $newmenu->add(BASE_URI . '?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', Globals::$langs->trans("ListOpenProjects"), 2, $showmode);

+                        $newmenu->add(BASE_URI."?controller=projet&method=list&leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), Globals::$langs->trans("List"), 1, $showmode, '', 'project', 'list');

+                        $newmenu->add(BASE_URI.'?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99&contextpage=lead', Globals::$langs->trans("ListOpenLeads"), 2, $showmode);

+                        $newmenu->add(BASE_URI.'?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', Globals::$langs->trans("ListOpenProjects"), 2, $showmode);

                     } elseif (Conf::$global->PROJECT_USE_OPPORTUNITIES == 2) { // 2 = leads only

                         //$newmenu->add('/projet/list.php?mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99', Globals::$langs->trans("List"), 2, $showmode);

-                        $newmenu->add(BASE_URI . '?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99', Globals::$langs->trans("List"), 2, $showmode);

+                        $newmenu->add(BASE_URI.'?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99', Globals::$langs->trans("List"), 2, $showmode);

                     }

 

                     //$newmenu->add("/projet/stats/index.php?leftmenu=projects", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->projet->lire);

-                    $newmenu->add(BASE_URI . "?controller=projet/stats&method=index&leftmenu=projects", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->projet->lire);

+                    $newmenu->add(BASE_URI."?controller=projet/stats&method=index&leftmenu=projects", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->projet->lire);

 

                     // Categories

                     if (!empty($conf->categorie->enabled)) {

                         Globals::$langs->load("categories");

                         //$newmenu->add("/categories/index.php?leftmenu=cat&type=6", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

-                        $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=6", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

+                        $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=cat&type=6", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

                     }

 

                     if (empty(Conf::$global->PROJECT_HIDE_TASKS)) {

@@ -1862,12 +1862,12 @@ 
 

                           $newmenu->add("/projet/activity/perweek.php?leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), Globals::$langs->trans("NewTimeSpent"), 0, Globals::$user->rights->projet->lire);

                          */

-                        $newmenu->add(BASE_URI . "?controller=projet/activity&method=index&leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), Globals::$langs->trans("Activities"), 0, Globals::$user->rights->projet->lire);

-                        $newmenu->add(BASE_URI . "?controller=projet&method=tasks&leftmenu=tasks&action=create", Globals::$langs->trans("NewTask"), 1, Globals::$user->rights->projet->creer);

-                        $newmenu->add(BASE_URI . "?controller=projet/tasks&method=list&leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), Globals::$langs->trans("List"), 1, Globals::$user->rights->projet->lire);

-                        $newmenu->add(BASE_URI . "?controller=projet/tasks/stats&method=index&leftmenu=projects", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->projet->lire);

+                        $newmenu->add(BASE_URI."?controller=projet/activity&method=index&leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), Globals::$langs->trans("Activities"), 0, Globals::$user->rights->projet->lire);

+                        $newmenu->add(BASE_URI."?controller=projet&method=tasks&leftmenu=tasks&action=create", Globals::$langs->trans("NewTask"), 1, Globals::$user->rights->projet->creer);

+                        $newmenu->add(BASE_URI."?controller=projet/tasks&method=list&leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), Globals::$langs->trans("List"), 1, Globals::$user->rights->projet->lire);

+                        $newmenu->add(BASE_URI."?controller=projet/tasks/stats&method=index&leftmenu=projects", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->projet->lire);

 

-                        $newmenu->add(BASE_URI . "?controller=projet/activity&method=perweek&leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), Globals::$langs->trans("NewTimeSpent"), 0, Globals::$user->rights->projet->lire);

+                        $newmenu->add(BASE_URI."?controller=projet/activity&method=perweek&leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), Globals::$langs->trans("NewTimeSpent"), 0, Globals::$user->rights->projet->lire);

                     }

                 }

             }

@@ -1883,9 +1883,9 @@ 
                     //$newmenu->add("/user/list.php?leftmenu=hrm&mode=employee", Globals::$langs->trans("Employees"), 0, Globals::$user->rights->hrm->employee->read, '', $mainmenu, 'hrm');

                     //$newmenu->add("/user/card.php?action=create&employee = 1", Globals::$langs->trans("NewEmployee"), 1, Globals::$user->rights->hrm->employee->write);

                     //$newmenu->add("/user/list.php?leftmenu=hrm&mode=employee&contextpage = employeelist", Globals::$langs->trans("List"), 1, Globals::$user->rights->hrm->employee->read);

-                    $newmenu->add(BASE_URI . "?controller=user&method=list&leftmenu=hrm&mode=employee", Globals::$langs->trans("Employees"), 0, Globals::$user->rights->hrm->employee->read, '', $mainmenu, 'hrm');

-                    $newmenu->add(BASE_URI . "?controller=user&method=card&action=create&employee = 1", Globals::$langs->trans("NewEmployee"), 1, Globals::$user->rights->hrm->employee->write);

-                    $newmenu->add(BASE_URI . "?controller=user&method=list&leftmenu=hrm&mode=employee&contextpage = employeelist", Globals::$langs->trans("List"), 1, Globals::$user->rights->hrm->employee->read);

+                    $newmenu->add(BASE_URI."?controller=user&method=list&leftmenu=hrm&mode=employee", Globals::$langs->trans("Employees"), 0, Globals::$user->rights->hrm->employee->read, '', $mainmenu, 'hrm');

+                    $newmenu->add(BASE_URI."?controller=user&method=card&action=create&employee = 1", Globals::$langs->trans("NewEmployee"), 1, Globals::$user->rights->hrm->employee->write);

+                    $newmenu->add(BASE_URI."?controller=user&method=list&leftmenu=hrm&mode=employee&contextpage = employeelist", Globals::$langs->trans("List"), 1, Globals::$user->rights->hrm->employee->read);

                 }

 

                 // Leave/Holiday/Vacation module

@@ -1896,9 +1896,9 @@ 
                     //$newmenu->add("/holiday/list.php?leftmenu=hrm", Globals::$langs->trans("CPTitreMenu"), 0, Globals::$user->rights->holiday->read, '', $mainmenu, 'hrm');

                     //$newmenu->add("/holiday/card.php?action=request", Globals::$langs->trans("New"), 1, Globals::$user->rights->holiday->write);

                     //$newmenu->add("/holiday/list.php?leftmenu=hrm", Globals::$langs->trans("List"), 1, Globals::$user->rights->holiday->read);

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=list&leftmenu=hrm", Globals::$langs->trans("CPTitreMenu"), 0, Globals::$user->rights->holiday->read, '', $mainmenu, 'hrm');

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=card&action=request", Globals::$langs->trans("New"), 1, Globals::$user->rights->holiday->write);

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=list&leftmenu=hrm", Globals::$langs->trans("List"), 1, Globals::$user->rights->holiday->read);

+                    $newmenu->add(BASE_URI."?controller=holiday&method=list&leftmenu=hrm", Globals::$langs->trans("CPTitreMenu"), 0, Globals::$user->rights->holiday->read, '', $mainmenu, 'hrm');

+                    $newmenu->add(BASE_URI."?controller=holiday&method=card&action=request", Globals::$langs->trans("New"), 1, Globals::$user->rights->holiday->write);

+                    $newmenu->add(BASE_URI."?controller=holiday&method=list&leftmenu=hrm", Globals::$langs->trans("List"), 1, Globals::$user->rights->holiday->read);

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "hrm") {

                         /*

                           $newmenu->add("/holiday/list.php?search_statut = 1&leftmenu=hrm", Globals::$langs->trans("DraftCP"), 2, Globals::$user->rights->holiday->read);

@@ -1907,18 +1907,18 @@ 
                           $newmenu->add("/holiday/list.php?search_statut = 4&leftmenu=hrm", Globals::$langs->trans("CancelCP"), 2, Globals::$user->rights->holiday->read);

                           $newmenu->add("/holiday/list.php?search_statut = 5&leftmenu=hrm", Globals::$langs->trans("RefuseCP"), 2, Globals::$user->rights->holiday->read);

                          */

-                        $newmenu->add(BASE_URI . "?controller=holiday&method=list&search_statut=1&leftmenu=hrm", Globals::$langs->trans("DraftCP"), 2, Globals::$user->rights->holiday->read);

-                        $newmenu->add(BASE_URI . "?controller=holiday&method=list&search_statut=2&leftmenu=hrm", Globals::$langs->trans("ToReviewCP"), 2, Globals::$user->rights->holiday->read);

-                        $newmenu->add(BASE_URI . "?controller=holiday&method=list&search_statut=3&leftmenu=hrm", Globals::$langs->trans("ApprovedCP"), 2, Globals::$user->rights->holiday->read);

-                        $newmenu->add(BASE_URI . "?controller=holiday&method=list&search_statut=4&leftmenu=hrm", Globals::$langs->trans("CancelCP"), 2, Globals::$user->rights->holiday->read);

-                        $newmenu->add(BASE_URI . "?controller=holiday&method=list&search_statut=5&leftmenu=hrm", Globals::$langs->trans("RefuseCP"), 2, Globals::$user->rights->holiday->read);

+                        $newmenu->add(BASE_URI."?controller=holiday&method=list&search_statut=1&leftmenu=hrm", Globals::$langs->trans("DraftCP"), 2, Globals::$user->rights->holiday->read);

+                        $newmenu->add(BASE_URI."?controller=holiday&method=list&search_statut=2&leftmenu=hrm", Globals::$langs->trans("ToReviewCP"), 2, Globals::$user->rights->holiday->read);

+                        $newmenu->add(BASE_URI."?controller=holiday&method=list&search_statut=3&leftmenu=hrm", Globals::$langs->trans("ApprovedCP"), 2, Globals::$user->rights->holiday->read);

+                        $newmenu->add(BASE_URI."?controller=holiday&method=list&search_statut=4&leftmenu=hrm", Globals::$langs->trans("CancelCP"), 2, Globals::$user->rights->holiday->read);

+                        $newmenu->add(BASE_URI."?controller=holiday&method=list&search_statut=5&leftmenu=hrm", Globals::$langs->trans("RefuseCP"), 2, Globals::$user->rights->holiday->read);

                     }

                     //$newmenu->add("/holiday/define_holiday.php?action=request", Globals::$langs->trans("MenuConfCP"), 1, Globals::$user->rights->holiday->read);

                     //$newmenu->add("/holiday/month_report.php", Globals::$langs->trans("MenuReportMonth"), 1, Globals::$user->rights->holiday->read_all);

                     //$newmenu->add("/holiday/view_log.php?action=request", Globals::$langs->trans("MenuLogCP"), 1, Globals::$user->rights->holiday->define_holiday);

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=define_holiday&action=request", Globals::$langs->trans("MenuConfCP"), 1, Globals::$user->rights->holiday->read);

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=month_report", Globals::$langs->trans("MenuReportMonth"), 1, Globals::$user->rights->holiday->read_all);

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=view_log&action=request", Globals::$langs->trans("MenuLogCP"), 1, Globals::$user->rights->holiday->define_holiday);

+                    $newmenu->add(BASE_URI."?controller=holiday&method=define_holiday&action=request", Globals::$langs->trans("MenuConfCP"), 1, Globals::$user->rights->holiday->read);

+                    $newmenu->add(BASE_URI."?controller=holiday&method=month_report", Globals::$langs->trans("MenuReportMonth"), 1, Globals::$user->rights->holiday->read_all);

+                    $newmenu->add(BASE_URI."?controller=holiday&method=view_log&action=request", Globals::$langs->trans("MenuLogCP"), 1, Globals::$user->rights->holiday->define_holiday);

                 }

 

                 // Trips and expenses (old module)

@@ -1930,10 +1930,10 @@ 
                       $newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&mainmenu=hrm", Globals::$langs->trans("List"), 1, Globals::$user->rights->deplacement->lire);

                       $newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&mainmenu=hrm", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->deplacement->lire);

                      */

-                    $newmenu->add(BASE_URI . "?controller=compta/deplacement&method=index&leftmenu=tripsandexpenses&mainmenu=hrm", Globals::$langs->trans("TripsAndExpenses"), 0, Globals::$user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses');

-                    $newmenu->add(BASE_URI . "?controller=compta/deplacement&method=card&action=create&leftmenu=tripsandexpenses&mainmenu=hrm", Globals::$langs->trans("New"), 1, Globals::$user->rights->deplacement->creer);

-                    $newmenu->add(BASE_URI . "?controller=compta/deplacement&method=list&leftmenu=tripsandexpenses&mainmenu=hrm", Globals::$langs->trans("List"), 1, Globals::$user->rights->deplacement->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/deplacement/stats&method=index&leftmenu=tripsandexpenses&mainmenu=hrm", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->deplacement->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/deplacement&method=index&leftmenu=tripsandexpenses&mainmenu=hrm", Globals::$langs->trans("TripsAndExpenses"), 0, Globals::$user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses');

+                    $newmenu->add(BASE_URI."?controller=compta/deplacement&method=card&action=create&leftmenu=tripsandexpenses&mainmenu=hrm", Globals::$langs->trans("New"), 1, Globals::$user->rights->deplacement->creer);

+                    $newmenu->add(BASE_URI."?controller=compta/deplacement&method=list&leftmenu=tripsandexpenses&mainmenu=hrm", Globals::$langs->trans("List"), 1, Globals::$user->rights->deplacement->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/deplacement/stats&method=index&leftmenu=tripsandexpenses&mainmenu=hrm", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->deplacement->lire);

                 }

 

                 // Expense report

@@ -1953,18 +1953,18 @@ 
                       }

                       $newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->expensereport->lire);

                      */

-                    $newmenu->add(BASE_URI . "?controller=expensereport&method=index&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("TripsAndExpenses"), 0, Globals::$user->rights->expensereport->lire, '', $mainmenu, 'expensereport');

-                    $newmenu->add(BASE_URI . "?controller=expensereport&method=card&action=create&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("New"), 1, Globals::$user->rights->expensereport->creer);

-                    $newmenu->add(BASE_URI . "?controller=expensereport&method=list&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("List"), 1, Globals::$user->rights->expensereport->lire);

+                    $newmenu->add(BASE_URI."?controller=expensereport&method=index&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("TripsAndExpenses"), 0, Globals::$user->rights->expensereport->lire, '', $mainmenu, 'expensereport');

+                    $newmenu->add(BASE_URI."?controller=expensereport&method=card&action=create&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("New"), 1, Globals::$user->rights->expensereport->creer);

+                    $newmenu->add(BASE_URI."?controller=expensereport&method=list&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("List"), 1, Globals::$user->rights->expensereport->lire);

                     if ($usemenuhider || empty($leftmenu) || $leftmenu == "expensereport") {

-                        $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=0&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Draft"), 2, Globals::$user->rights->expensereport->lire);

-                        $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=2&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Validated"), 2, Globals::$user->rights->expensereport->lire);

-                        $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=5&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Approved"), 2, Globals::$user->rights->expensereport->lire);

-                        $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=6&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Paid"), 2, Globals::$user->rights->expensereport->lire);

-                        $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=4&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Canceled"), 2, Globals::$user->rights->expensereport->lire);

-                        $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=99&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Refused"), 2, Globals::$user->rights->expensereport->lire);

-                    }

-                    $newmenu->add(BASE_URI . "?controller=expensereport/stats&method=index&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->expensereport->lire);

+                        $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=0&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Draft"), 2, Globals::$user->rights->expensereport->lire);

+                        $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=2&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Validated"), 2, Globals::$user->rights->expensereport->lire);

+                        $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=5&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Approved"), 2, Globals::$user->rights->expensereport->lire);

+                        $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=6&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Paid"), 2, Globals::$user->rights->expensereport->lire);

+                        $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=4&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Canceled"), 2, Globals::$user->rights->expensereport->lire);

+                        $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=99&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Refused"), 2, Globals::$user->rights->expensereport->lire);

+                    }

+                    $newmenu->add(BASE_URI."?controller=expensereport/stats&method=index&leftmenu=expensereport&mainmenu=hrm", Globals::$langs->trans("Statistics"), 1, Globals::$user->rights->expensereport->lire);

                 }

 

                 if (!empty($conf->projet->enabled)) {

@@ -1974,7 +1974,7 @@ 
                         $search_project_user = DolUtils::GETPOST('search_project_user', 'int');

 

                         //$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), Globals::$langs->trans("NewTimeSpent"), 0, Globals::$user->rights->projet->lire);

-                        $newmenu->add(BASE_URI . "?controller=projet/activity&method=perweek&leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), Globals::$langs->trans("NewTimeSpent"), 0, Globals::$user->rights->projet->lire);

+                        $newmenu->add(BASE_URI."?controller=projet/activity&method=perweek&leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), Globals::$langs->trans("NewTimeSpent"), 0, Globals::$user->rights->projet->lire);

                     }

                 }

             }

@@ -1987,24 +1987,24 @@ 
                 if (empty(Globals::$user->socid)) { // limit to internal users

                     Globals::$langs->load("mails");

                     //$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", Globals::$langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates');

-                    $newmenu->add(BASE_URI . "?controller=admin&method=mails_templates&leftmenu=email_templates", Globals::$langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates');

+                    $newmenu->add(BASE_URI."?controller=admin&method=mails_templates&leftmenu=email_templates", Globals::$langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates');

                 }

 

                 if (!empty($conf->mailing->enabled)) {

                     //$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", Globals::$langs->trans("EMailings"), 0, Globals::$user->rights->mailing->lire, '', $mainmenu, 'mailing');

                     //$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&action=create", Globals::$langs->trans("NewMailing"), 1, Globals::$user->rights->mailing->creer);

                     //$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", Globals::$langs->trans("List"), 1, Globals::$user->rights->mailing->lire);

-                    $newmenu->add(BASE_URI . "?controller=comm/mailing&method=index&leftmenu=mailing", Globals::$langs->trans("EMailings"), 0, Globals::$user->rights->mailing->lire, '', $mainmenu, 'mailing');

-                    $newmenu->add(BASE_URI . "?controller=comm/mailing&method=card&leftmenu=mailing&action=create", Globals::$langs->trans("NewMailing"), 1, Globals::$user->rights->mailing->creer);

-                    $newmenu->add(BASE_URI . "?controller=comm/mailing&method=list&leftmenu=mailing", Globals::$langs->trans("List"), 1, Globals::$user->rights->mailing->lire);

+                    $newmenu->add(BASE_URI."?controller=comm/mailing&method=index&leftmenu=mailing", Globals::$langs->trans("EMailings"), 0, Globals::$user->rights->mailing->lire, '', $mainmenu, 'mailing');

+                    $newmenu->add(BASE_URI."?controller=comm/mailing&method=card&leftmenu=mailing&action=create", Globals::$langs->trans("NewMailing"), 1, Globals::$user->rights->mailing->creer);

+                    $newmenu->add(BASE_URI."?controller=comm/mailing&method=list&leftmenu=mailing", Globals::$langs->trans("List"), 1, Globals::$user->rights->mailing->lire);

                 }

 

                 if (!empty($conf->export->enabled)) {

                     Globals::$langs->load("exports");

                     //$newmenu->add("/exports/index.php?leftmenu=export", Globals::$langs->trans("FormatedExport"), 0, Globals::$user->rights->export->lire, '', $mainmenu, 'export');

                     //$newmenu->add("/exports/export.php?leftmenu=export", Globals::$langs->trans("NewExport"), 1, Globals::$user->rights->export->creer);

-                    $newmenu->add(BASE_URI . "?controller=exports&methodindex&leftmenu=export", Globals::$langs->trans("FormatedExport"), 0, Globals::$user->rights->export->lire, '', $mainmenu, 'export');

-                    $newmenu->add(BASE_URI . "?controller=exports&method=export&leftmenu=export", Globals::$langs->trans("NewExport"), 1, Globals::$user->rights->export->creer);

+                    $newmenu->add(BASE_URI."?controller=exports&methodindex&leftmenu=export", Globals::$langs->trans("FormatedExport"), 0, Globals::$user->rights->export->lire, '', $mainmenu, 'export');

+                    $newmenu->add(BASE_URI."?controller=exports&method=export&leftmenu=export", Globals::$langs->trans("NewExport"), 1, Globals::$user->rights->export->creer);

                     //$newmenu->add("/exports/export.php?leftmenu=export",Globals::$langs->trans("List"),1, Globals::$user->rights->export->lire);

                 }

 

@@ -2012,8 +2012,8 @@ 
                     Globals::$langs->load("exports");

                     //$newmenu->add("/imports/index.php?leftmenu=import", Globals::$langs->trans("FormatedImport"), 0, Globals::$user->rights->import->run, '', $mainmenu, 'import');

                     //$newmenu->add("/imports/import.php?leftmenu=import", Globals::$langs->trans("NewImport"), 1, Globals::$user->rights->import->run);

-                    $newmenu->add(BASE_URI . "?controller=imports&method=index&leftmenu=import", Globals::$langs->trans("FormatedImport"), 0, Globals::$user->rights->import->run, '', $mainmenu, 'import');

-                    $newmenu->add(BASE_URI . "?controller=imports&method=import&leftmenu=import", Globals::$langs->trans("NewImport"), 1, Globals::$user->rights->import->run);

+                    $newmenu->add(BASE_URI."?controller=imports&method=index&leftmenu=import", Globals::$langs->trans("FormatedImport"), 0, Globals::$user->rights->import->run, '', $mainmenu, 'import');

+                    $newmenu->add(BASE_URI."?controller=imports&method=import&leftmenu=import", Globals::$langs->trans("NewImport"), 1, Globals::$user->rights->import->run);

                 }

             }

 

@@ -2056,30 +2056,30 @@ 
                       $newmenu->add("/adherents/type.php?leftmenu=setup&mainmenu=members&action=create", Globals::$langs->trans("New"), 1, Globals::$user->rights->adherent->configurer);

                       $newmenu->add("/adherents/type.php?leftmenu=setup&mainmenu=members", Globals::$langs->trans("List"), 1, Globals::$user->rights->adherent->configurer);

                      */

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=index&leftmenu=members&mainmenu=members", Globals::$langs->trans("Members"), 0, Globals::$user->rights->adherent->lire, '', $mainmenu, 'members');

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=card&leftmenu=members&action=create", Globals::$langs->trans("NewMember"), 1, Globals::$user->rights->adherent->creer);

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members", Globals::$langs->trans("List"), 1, Globals::$user->rights->adherent->lire);

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members&statut=-1", Globals::$langs->trans("MenuMembersToValidate"), 2, Globals::$user->rights->adherent->lire);

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members&statut=1", Globals::$langs->trans("MenuMembersValidated"), 2, Globals::$user->rights->adherent->lire);

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members&statut=1&filter = uptodate", Globals::$langs->trans("MenuMembersUpToDate"), 2, Globals::$user->rights->adherent->lire);

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members&statut=1&filter = outofdate", Globals::$langs->trans("MenuMembersNotUpToDate"), 2, Globals::$user->rights->adherent->lire);

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members&statut=0", Globals::$langs->trans("MenuMembersResiliated"), 2, Globals::$user->rights->adherent->lire);

-                    $newmenu->add(BASE_URI . "?controller=adherents/stats&method=index&leftmenu=members", Globals::$langs->trans("MenuMembersStats"), 1, Globals::$user->rights->adherent->lire);

-                    $newmenu->add(BASE_URI . "?controller=adherents/cartes&method=carte&leftmenu=export", Globals::$langs->trans("MembersCards"), 1, Globals::$user->rights->adherent->export);

+                    $newmenu->add(BASE_URI."?controller=adherents&method=index&leftmenu=members&mainmenu=members", Globals::$langs->trans("Members"), 0, Globals::$user->rights->adherent->lire, '', $mainmenu, 'members');

+                    $newmenu->add(BASE_URI."?controller=adherents&method=card&leftmenu=members&action=create", Globals::$langs->trans("NewMember"), 1, Globals::$user->rights->adherent->creer);

+                    $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members", Globals::$langs->trans("List"), 1, Globals::$user->rights->adherent->lire);

+                    $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members&statut=-1", Globals::$langs->trans("MenuMembersToValidate"), 2, Globals::$user->rights->adherent->lire);

+                    $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members&statut=1", Globals::$langs->trans("MenuMembersValidated"), 2, Globals::$user->rights->adherent->lire);

+                    $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members&statut=1&filter = uptodate", Globals::$langs->trans("MenuMembersUpToDate"), 2, Globals::$user->rights->adherent->lire);

+                    $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members&statut=1&filter = outofdate", Globals::$langs->trans("MenuMembersNotUpToDate"), 2, Globals::$user->rights->adherent->lire);

+                    $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members&statut=0", Globals::$langs->trans("MenuMembersResiliated"), 2, Globals::$user->rights->adherent->lire);

+                    $newmenu->add(BASE_URI."?controller=adherents/stats&method=index&leftmenu=members", Globals::$langs->trans("MenuMembersStats"), 1, Globals::$user->rights->adherent->lire);

+                    $newmenu->add(BASE_URI."?controller=adherents/cartes&method=carte&leftmenu=export", Globals::$langs->trans("MembersCards"), 1, Globals::$user->rights->adherent->export);

                     if (!empty(Conf::$global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu == 'none' || $leftmenu == "members" || $leftmenu == "export")) {

-                        $newmenu->add(BASE_URI . "?controller=adherents&method=htpasswd&leftmenu=export", Globals::$langs->trans("Filehtpasswd"), 1, Globals::$user->rights->adherent->export);

+                        $newmenu->add(BASE_URI."?controller=adherents&method=htpasswd&leftmenu=export", Globals::$langs->trans("Filehtpasswd"), 1, Globals::$user->rights->adherent->export);

                     }

                     if (!empty($conf->categorie->enabled)) {

                         Globals::$langs->load("categories");

-                        $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=3", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

-                    }

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=index&leftmenu=members&mainmenu=members", Globals::$langs->trans("Subscriptions"), 0, Globals::$user->rights->adherent->cotisation->lire);

-                    $newmenu->add(BASE_URI . "?controller=adherents&methodlist&leftmenu=members&statut=-1,1&mainmenu=members", Globals::$langs->trans("NewSubscription"), 1, Globals::$user->rights->adherent->cotisation->creer);

-                    $newmenu->add(BASE_URI . "?controller=adherents/subscription&method=list&leftmenu=members", Globals::$langs->trans("List"), 1, Globals::$user->rights->adherent->cotisation->lire);

-                    $newmenu->add(BASE_URI . "?controller=adherents/stats&method=index&leftmenu=members", Globals::$langs->trans("MenuMembersStats"), 1, Globals::$user->rights->adherent->lire);

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=type&leftmenu=setup&mainmenu=members", Globals::$langs->trans("MembersTypes"), 0, Globals::$user->rights->adherent->configurer, '', $mainmenu, 'setup');

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=type&leftmenu=setup&mainmenu=members&action=create", Globals::$langs->trans("New"), 1, Globals::$user->rights->adherent->configurer);

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=type&leftmenu=setup&mainmenu=members", Globals::$langs->trans("List"), 1, Globals::$user->rights->adherent->configurer);

+                        $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=cat&type=3", Globals::$langs->trans("Categories"), 1, Globals::$user->rights->categorie->lire, '', $mainmenu, 'cat');

+                    }

+                    $newmenu->add(BASE_URI."?controller=adherents&method=index&leftmenu=members&mainmenu=members", Globals::$langs->trans("Subscriptions"), 0, Globals::$user->rights->adherent->cotisation->lire);

+                    $newmenu->add(BASE_URI."?controller=adherents&methodlist&leftmenu=members&statut=-1,1&mainmenu=members", Globals::$langs->trans("NewSubscription"), 1, Globals::$user->rights->adherent->cotisation->creer);

+                    $newmenu->add(BASE_URI."?controller=adherents/subscription&method=list&leftmenu=members", Globals::$langs->trans("List"), 1, Globals::$user->rights->adherent->cotisation->lire);

+                    $newmenu->add(BASE_URI."?controller=adherents/stats&method=index&leftmenu=members", Globals::$langs->trans("MenuMembersStats"), 1, Globals::$user->rights->adherent->lire);

+                    $newmenu->add(BASE_URI."?controller=adherents&method=type&leftmenu=setup&mainmenu=members", Globals::$langs->trans("MembersTypes"), 0, Globals::$user->rights->adherent->configurer, '', $mainmenu, 'setup');

+                    $newmenu->add(BASE_URI."?controller=adherents&method=type&leftmenu=setup&mainmenu=members&action=create", Globals::$langs->trans("New"), 1, Globals::$user->rights->adherent->configurer);

+                    $newmenu->add(BASE_URI."?controller=adherents&method=type&leftmenu=setup&mainmenu=members", Globals::$langs->trans("List"), 1, Globals::$user->rights->adherent->configurer);

                 }

             }

 

@@ -2090,11 +2090,11 @@ 
             //var_dump($newmenu->liste);    //

             // We update newmenu for special dynamic menus

             if (!empty(Globals::$user->rights->banque->lire) && $mainmenu == 'bank') { // Entry for each bank account

-                require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

 

                 $sql = "SELECT rowid, label, courant, rappro";

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

-                $sql .= " WHERE entity = " . $conf->entity;

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

+                $sql .= " WHERE entity = ".$conf->entity;

                 $sql .= " AND clos = 0";

                 $sql .= " ORDER BY label";

 

@@ -2105,16 +2105,16 @@ 
 

                     if ($numr > 0) {

                         //$newmenu->add('/compta/bank/list.php', Globals::$langs->trans("BankAccounts"), 0, Globals::$user->rights->banque->lire);

-                        $newmenu->add(BASE_URI . '?controller=compta/bank?method=list', Globals::$langs->trans("BankAccounts"), 0, Globals::$user->rights->banque->lire);

+                        $newmenu->add(BASE_URI.'?controller=compta/bank?method=list', Globals::$langs->trans("BankAccounts"), 0, Globals::$user->rights->banque->lire);

                     }

 

                     while ($i < $numr) {

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

 //$newmenu->add('/compta/bank/card.php?id=' . $objp->rowid, $objp->label, 1, Globals::$user->rights->banque->lire);

-                        $newmenu->add(BASE_URI . '?controller=compta/bank&method=card&id=' . $objp->rowid, $objp->label, 1, Globals::$user->rights->banque->lire);

+                        $newmenu->add(BASE_URI.'?controller=compta/bank&method=card&id='.$objp->rowid, $objp->label, 1, Globals::$user->rights->banque->lire);

                         if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos)) {  // If not cash account and not closed and can be reconciliate

                             //$newmenu->add('/compta/bank/bankentries_list.php?action=reconcile&contextpage=banktransactionlist-' . $objp->rowid . '&account=' . $objp->rowid . '&id=' . $objp->rowid . '&search_conciliated=0', Globals::$langs->trans("Conciliate"), 2, Globals::$user->rights->banque->consolidate);

-                            $newmenu->add(BASE_URI . '?controller=compta/bank&method=bankentries_list&action=reconcile&contextpage=banktransactionlist-' . $objp->rowid . '&account=' . $objp->rowid . '&id=' . $objp->rowid . '&search_conciliated=0', Globals::$langs->trans("Conciliate"), 2, Globals::$user->rights->banque->consolidate);

+                            $newmenu->add(BASE_URI.'?controller=compta/bank&method=bankentries_list&action=reconcile&contextpage=banktransactionlist-'.$objp->rowid.'&account='.$objp->rowid.'&id='.$objp->rowid.'&search_conciliated=0', Globals::$langs->trans("Conciliate"), 2, Globals::$user->rights->banque->consolidate);

                         }

                         $i++;

                     }

@@ -2128,11 +2128,11 @@ 
                 $MAXFTP = 20;

                 $i = 1;

                 while ($i <= $MAXFTP) {

-                    $paramkey = 'FTP_NAME_' . $i;

+                    $paramkey = 'FTP_NAME_'.$i;

                     //print $paramkey;

                     if (!empty(Conf::$global->$paramkey)) {

                         //$link = "/ftp/index.php?idmenu = " . $_SESSION["idmenu"] . "&numero_ftp = " . $i;

-                        $link = BASE_URI . "?controller=ftp&method=index&idmenu=" . $_SESSION["idmenu"] . "&numero_ftp=" . $i;

+                        $link = BASE_URI."?controller=ftp&method=index&idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;

 

                         $newmenu->add($link, dol_trunc(Conf::$global->$paramkey, 24));

                     }

@@ -2193,9 +2193,9 @@ 
                         }

                     }

                     if ($altok % 2 == 0) {

-                        print '<div class="blockvmenu blockvmenuimpair' . $invert . ($lastopened ? ' blockvmenulast' : '') . ($altok == 1 ? ' blockvmenufirst' : '') . '">' . "\n";

+                        print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";

                     } else {

-                        print '<div class="blockvmenu blockvmenupair' . $invert . ($lastopened ? ' blockvmenulast' : '') . ($altok == 1 ? ' blockvmenufirst' : '') . '">' . "\n";

+                        print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";

                     }

                 }

 

@@ -2217,48 +2217,48 @@ 
                 if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url'])) {

                     $tmp = explode('?', $menu_array[$i]['url'], 2);

                     $url = $shorturl = $tmp[0];

-                    $param = (isset($tmp[1]) ? $tmp[1] : '');    // params in url of the menu link

+                    $param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link

                     // Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.

                     if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu'])) {

-                        $param .= ($param ? '&' : '') . 'mainmenu=' . $menu_array[$i]['mainmenu'] . '&leftmenu=';

+                        $param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';

                     }

                     if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu'])) {

-                        $param .= ($param ? '&' : '') . 'leftmenu=';

+                        $param .= ($param ? '&' : '').'leftmenu=';

                     }

                     //$url.="idmenu = ".$menu_array[$i]['rowid'];    // Already done by menuLoad

-                    $url = DolUtils::dol_buildpath($url, 1) . ($param ? '?' . $param : '');

+                    $url = DolUtils::dol_buildpath($url, 1).($param ? '?'.$param : '');

                     $shorturlwithoutparam = $shorturl;

-                    $shorturl = $shorturl . ($param ? '?' . $param : '');

+                    $shorturl = $shorturl.($param ? '?'.$param : '');

                 }

 

 

-                print '<!-- Process menu entry with mainmenu=' . $menu_array[$i]['mainmenu'] . ', leftmenu=' . $menu_array[$i]['leftmenu'] . ', level=' . $menu_array[$i]['level'] . ' enabled=' . $menu_array[$i]['enabled'] . ', position=' . $menu_array[$i]['position'] . ' -->' . "\n";

+                print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";

 

                 // Menu level 0

                 if ($menu_array[$i]['level'] == 0) {

                     if ($menu_array[$i]['enabled']) {     // Enabled so visible

-                        print '<div class="menu_titre">' . $tabstring;

+                        print '<div class="menu_titre">'.$tabstring;

                         if ($shorturlwithoutparam) {

-                            print '<a class="vmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';

+                            print '<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

                         } else {

                             print '<span class="vmenu">';

                         }

-                        print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '') . $menu_array[$i]['titre'];

+                        print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '').$menu_array[$i]['titre'];

                         if ($shorturlwithoutparam) {

                             print '</a>';

                         } else {

                             print '</span>';

                         }

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

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

                         $lastlevel0 = 'enabled';

                     } else if ($showmenu) {                 // Not enabled but visible (so greyed)

-                        print '<div class="menu_titre">' . $tabstring . '<font class="vmenudisabled">' . $menu_array[$i]['titre'] . '</font></div>' . "\n";

+                        print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";

                         $lastlevel0 = 'greyed';

                     } else {

                         $lastlevel0 = 'hidden';

                     }

                     if ($showmenu) {

-                        print '<div class="menu_top"></div>' . "\n";

+                        print '<div class="menu_top"></div>'."\n";

                     }

                 }

 

@@ -2266,13 +2266,13 @@ 
                 if ($menu_array[$i]['level'] > 0) {

                     $cssmenu = '';

                     if ($menu_array[$i]['url']) {

-                        $cssmenu = ' menu_contenu' . dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

+                        $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

                     }

 

                     if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {     // Enabled so visible, except if parent was not enabled.

-                        print '<div class="menu_contenu' . $cssmenu . '">' . $tabstring;

+                        print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;

                         if ($shorturlwithoutparam) {

-                            print '<a class="vsmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';

+                            print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

                         } else {

                             print '<span class="vsmenu">';

                         }

@@ -2286,26 +2286,26 @@ 
                         if (!strstr($menu_array[$i]['titre'], '<table')) {

                             print '<br>';

                         }

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

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

                     } else if ($showmenu && $lastlevel0 == 'enabled') {       // Not enabled but visible (so greyed), except if parent was not enabled.

-                        print '<div class="menu_contenu' . $cssmenu . '">' . $tabstring . '<font class="vsmenudisabled vsmenudisabledmargin">' . $menu_array[$i]['titre'] . '</font><br></div>' . "\n";

+                        print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";

                     }

                 }

 

                 // If next is a new block or if there is nothing after

                 if (empty($menu_array[$i + 1]['level'])) {               // End menu block

                     if ($showmenu) {

-                        print '<div class="menu_end"></div>' . "\n";

+                        print '<div class="menu_end"></div>'."\n";

                     }

                     if ($blockvmenuopened) {

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

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

                         $blockvmenuopened = false;

                     }

                 }

             }

 

             if ($altok) {

-                print '<div class="blockvmenuend"></div>';    // End menu block

+                print '<div class="blockvmenuend"></div>'; // End menu block

             }

         }

 

Braces +34 added lines, -22 removed lines

@@ -303,8 +303,9 @@ 
             if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") {

                 $classname = 'class="tmenusel"';

                 $_SESSION['idmenu'] = '';

-            } else

-                $classname = 'class="tmenu"';

+            } else {
+                            $classname = 'class="tmenu"';
+            }
             $idsel = 'bank';

 

 //$menu->add('/compta/bank/list.php?mainmenu=bank&leftmenu=', Globals::$langs->trans("MenuBankCash"), 0, $showmode, $atarget, "bank", '', 52, $id, $idsel, $classname);

@@ -1383,25 +1384,33 @@ 
                                     $nature = '';

 

 // Must match array $sourceList defined into journals_list.php

-                                    if ($objp->nature == 2 && !empty($conf->facture->enabled))

-                                        $nature = "sells";

-                                    if ($objp->nature == 3 && !empty($conf->fournisseur->enabled))

-                                        $nature = "purchases";

-                                    if ($objp->nature == 4 && !empty($conf->banque->enabled))

-                                        $nature = "bank";

-                                    if ($objp->nature == 5 && !empty($conf->expensereport->enabled))

-                                        $nature = "expensereports";

-                                    if ($objp->nature == 1)

-                                        $nature = "various";

-                                    if ($objp->nature == 8)

-                                        $nature = "inventory";

-                                    if ($objp->nature == 9)

-                                        $nature = "hasnew";

+                                    if ($objp->nature == 2 && !empty($conf->facture->enabled)) {
+                                                                            $nature = "sells";
+                                    }
+                                    if ($objp->nature == 3 && !empty($conf->fournisseur->enabled)) {
+                                                                            $nature = "purchases";
+                                    }
+                                    if ($objp->nature == 4 && !empty($conf->banque->enabled)) {
+                                                                            $nature = "bank";
+                                    }
+                                    if ($objp->nature == 5 && !empty($conf->expensereport->enabled)) {
+                                                                            $nature = "expensereports";
+                                    }
+                                    if ($objp->nature == 1) {
+                                                                            $nature = "various";
+                                    }
+                                    if ($objp->nature == 8) {
+                                                                            $nature = "inventory";
+                                    }
+                                    if ($objp->nature == 9) {
+                                                                            $nature = "hasnew";
+                                    }
 

 // To enable when page exists

                                     if (empty(Conf::$global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {

-                                        if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory')

-                                            $nature = '';

+                                        if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') {
+                                                                                    $nature = '';
+                                        }
                                     }

 

                                     if ($nature) {

@@ -1416,8 +1425,9 @@ 
 // Should not happend. Entries are added

                                 $newmenu->add('', Globals::$langs->trans("NoJournalDefined"), 2, Globals::$user->rights->accounting->comptarapport->lire);

                             }

-                        } else

-                            dol_print_error(Config::$dbEngine);

+                        } else {
+                                                    dol_print_error(Config::$dbEngine);
+                        }
                         Config::$dbEngine->free($resql);

                     }

 

@@ -1451,8 +1461,10 @@ 
                     }

 

                     $modecompta = 'CREANCES-DETTES';

-                    if (!empty($conf->accounting->enabled) && !empty(Globals::$user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')

-                        $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

+                    if (!empty($conf->accounting->enabled) && !empty(Globals::$user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+                                            $modecompta = 'BOOKKEEPING';
+                    }
+                    // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

                     if ($modecompta) {

                         if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

                             /*

Base/MenuManager.php

Spacing +21 added lines, -21 removed lines

@@ -38,8 +38,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;

@@ -163,16 +163,16 @@ 
 

         if ($mode == 'topnb') {

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

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

+            EldyLib::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

-            EldyLib::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

+            EldyLib::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">';

@@ -193,13 +193,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; }

@@ -209,21 +209,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) {

@@ -257,7 +257,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);

@@ -276,14 +276,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';

@@ -307,17 +307,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/AlixarView.php

Spacing +91 added lines, -91 removed lines

@@ -116,7 +116,7 @@ 
 // html header
         $this->top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-        print '<body id="mainbody"' . ($morecssonbody ? ' class="' . $morecssonbody . '"' : '') . '>' . "\n";
+        print '<body id="mainbody"'.($morecssonbody ? ' class="'.$morecssonbody.'"' : '').'>'."\n";
 
 // top menu and left menu area
         if (empty(Globals::$conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) {
@@ -124,7 +124,7 @@ 
         }
 
         if (empty(Globals::$conf->dol_hide_leftmenu)) {
-            $this->left_menu('', $help_url, '', '', 1, $title, 1);  // $menumanager is retreived with a global $menumanager inside this function
+            $this->left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function
         }
 
 // main area
@@ -175,13 +175,13 @@ 
          * Top menu
          */
         if ((empty(Globals::$conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
-            print "\n" . '<!-- Start top horizontal -->' . "\n";
+            print "\n".'<!-- Start top horizontal -->'."\n";
 
-            print '<div class="side-nav-vert' . (DolUtils::GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '') . '"><div id="id-top">';  // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
+            print '<div class="side-nav-vert'.(DolUtils::GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
 // Show menu entries
-            print '<div id="tmenu_tooltip' . (empty(Globals::$conf->global->MAIN_MENU_INVERT) ? '' : 'invert') . '" class="tmenu">' . "\n";
+            print '<div id="tmenu_tooltip'.(empty(Globals::$conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n";
             $this->menumanager->atarget = $target;
-            $this->menumanager->showmenu('top', array('searchform' => $searchform, 'bookmarks' => $bookmarks));      // This contains a \n
+            $this->menumanager->showmenu('top', array('searchform' => $searchform, 'bookmarks' => $bookmarks)); // This contains a \n
             print "</div>\n";
 
 // Define link to login card
@@ -189,36 +189,36 @@ 
             if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
                 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
+                    if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli))
+                        $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
                 } else
-                    $appli .= " " . DOL_VERSION;
+                    $appli .= " ".DOL_VERSION;
             } else
-                $appli .= " " . DOL_VERSION;
+                $appli .= " ".DOL_VERSION;
 
             if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))
-                $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+                $appli .= "<br>".Globals::$langs->trans("LevelOfFeature").': '.Globals::$conf->global->MAIN_FEATURES_LEVEL;
 
             $logouttext = '';
             if (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 //$logouthtmltext=$appli.'<br>';
                 $logouthtmltext = '';
                 if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') { {
-                        $logouthtmltext .= Globals::$langs->trans("Logout") . '<br>';
+                        $logouthtmltext .= Globals::$langs->trans("Logout").'<br>';
                     }
 
 //$logouttext .='<a accesskey="l" href="'.DOL_BASE_URI.'/user/logout.php">';
-                    $logouttext .= '<a accesskey="l" href="' . BASE_URI . '?controller=user&method=logout">';
+                    $logouttext .= '<a accesskey="l" href="'.BASE_URI.'?controller=user&method=logout">';
 //$logouttext .= img_picto(Globals::$langs->trans('Logout').":".Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
                     $logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
                     $logouttext .= '</a>';
                 } else {
                     $logouthtmltext .= Globals::$langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
-                    $logouttext .= img_picto(Globals::$langs->trans('Logout') . ":" . Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+                    $logouttext .= img_picto(Globals::$langs->trans('Logout').":".Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
                 }
             }
 
-            print '<div class="login_block">' . "\n";
+            print '<div class="login_block">'."\n";
 
 // Add login user link
             $toprightmenu .= '<div class="login_block_user">';
@@ -229,18 +229,18 @@ 
             $toprightmenu .= Globals::$user->getNomUrl($mode, '', 1, 0, 11, 0, (Globals::$user->firstname ? 'firstname' : -1), 'atoplogin');
             $toprightmenu .= '</div></div>';
 
-            $toprightmenu .= '</div>' . "\n";
+            $toprightmenu .= '</div>'."\n";
 
             $toprightmenu .= '<div class="login_block_other">';
 
 // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
             $parameters = array();
-            $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
             if (is_numeric($result)) {
                 if ($result == 0)
-                    $toprightmenu .= Globals::$hookManager->resPrint;  // add
+                    $toprightmenu .= Globals::$hookManager->resPrint; // add
                 else
-                    $toprightmenu = Globals::$hookManager->resPrint;      // replace
+                    $toprightmenu = Globals::$hookManager->resPrint; // replace
             }
             else {
                 $toprightmenu .= $result; // For backward compatibility
@@ -249,7 +249,7 @@ 
 // Link to module builder
             if (!empty(Globals::$conf->modulebuilder->enabled)) {
 //$text = '<a href="' . DOL_BASE_URI . '/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
-                $text = '<a href="' . BASE_URI . '?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+                $text = '<a href="'.BASE_URI.'?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
 //$text.= img_picto(":".Globals::$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
                 $text .= '<span class="fa fa-bug atoplogin"></span>';
                 $text .= '</a>';
@@ -263,12 +263,12 @@ 
                 if (is_array($_POST)) {
                     foreach ($_POST as $key => $value) {
                         if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
-                            $qs .= '&' . $key . '=' . urlencode($value);
+                            $qs .= '&'.$key.'='.urlencode($value);
                         }
                     }
                 }
-                $qs .= (($qs && $morequerystring) ? '&' : '') . $morequerystring;
-                $text = '<a href="' . dol_escape_htmltag($_SERVER["PHP_SELF"]) . '?' . $qs . ($qs ? '&' : '') . 'optioncss=print" target="_blank">';
+                $qs .= (($qs && $morequerystring) ? '&' : '').$morequerystring;
+                $text = '<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank">';
 //$text.= img_picto(":".Globals::$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
                 $text .= '<span class="fa fa-print atoplogin"></span>';
                 $text .= '</a>';
@@ -297,12 +297,12 @@ 
                     $text = '';
                     if (!empty(Globals::$conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
                         Globals::$langs->load('admin');
-                        $appli .= '<br>' . Globals::$langs->trans("Database") . ': ' . $db->database_name;
+                        $appli .= '<br>'.Globals::$langs->trans("Database").': '.$db->database_name;
                     }
-                    $title = $appli . '<br>';
+                    $title = $appli.'<br>';
                     $title .= Globals::$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
                     if ($mode == 'wiki') {
-                        $title .= ' - ' . Globals::$langs->trans("PageWiki") . ' &quot;' . dol_escape_htmltag(strtr($helppage, '_', ' ')) . '&quot;';
+                        $title .= ' - '.Globals::$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
                     }
                     $text .= '<a class="help" target="_blank" rel="noopener" href="';
                     if ($mode == 'wiki') {
@@ -328,7 +328,7 @@ 
 
             print $toprightmenu;
 
-            print "</div>\n";  // end div class="login_block"
+            print "</div>\n"; // end div class="login_block"
 
             print '</div></div>';
 
@@ -337,7 +337,7 @@ 
         }
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+            print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss ? ' '.$morecss : '').'">';
     }
 
     /**
@@ -369,7 +369,7 @@ 
 // Instantiate hooks of thirdparty module
             Globals::$hookManager->initHooks(array('searchform', 'leftblock'));
 
-            print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
+            print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
             if (Globals::$conf->browser->layout == 'phone')
                 Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
@@ -381,7 +381,7 @@ 
             }
             $selected = -1;
             $usedbyinclude = 1;
-            include_once DOL_BASE_PATH . '/core/ajax/selectsearchbox.php'; // This set $arrayresult
+            include_once DOL_BASE_PATH.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
             if (Globals::$conf->use_javascript_ajax && empty(Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
 //$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_BASE_URI.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, Globals::$langs->trans("Search"), 1);
@@ -396,7 +396,7 @@ 
 // Execute hook printSearchForm
             $parameters = array('searchform' => $searchform);
 
-            $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
             if (empty($reshook)) {
                 $searchform .= Globals::$hookManager->resPrint;
             } else
@@ -404,10 +404,10 @@ 
 
 // Force special value for $searchform
             if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty(Globals::$conf->use_javascript_ajax)) {
-                $urltosearch = DOL_BASE_URI . '/core/search_page.php?showtitlebefore=1';
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="' . $urltosearch . '" alt="' . dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")) . '">' . Globals::$langs->trans("Search") . '...</a></div></div>';
+                $urltosearch = DOL_BASE_URI.'/core/search_page.php?showtitlebefore=1';
+                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")).'">'.Globals::$langs->trans("Search").'...</a></div></div>';
             } elseif (Globals::$conf->use_javascript_ajax && !empty(Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="' . dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")) . '">' . Globals::$langs->trans("Search") . '...</a></div><div id="divsearchforms2" style="display: none">' . $searchform . '</div>';
+                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")).'">'.Globals::$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
                 $searchform .= '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
@@ -420,16 +420,16 @@ 
 
 // Define $bookmarks
             if (!empty(Globals::$conf->bookmark->enabled) && Globals::$user->rights->bookmark->lire) {
-                include_once DOL_BASE_PATH . '/bookmarks/bookmarks.lib.php';
+                include_once DOL_BASE_PATH.'/bookmarks/bookmarks.lib.php';
                 Globals::$langs->load("bookmarks");
 
                 $bookmarks = printBookmarksList($db, Globals::$langs);
             }
 
 // Left column
-            print '<!-- Begin left menu -->' . "\n";
+            print '<!-- Begin left menu -->'."\n";
 
-            print '<div class="vmenu"' . (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"') . '>' . "\n\n";
+            print '<div class="vmenu"'.(empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n";
 
 // Show left menu with other forms
             $this->menumanager->menu_array = $menu_array_before;
@@ -438,7 +438,7 @@ 
 // Dolibarr version + help + bug report link
             print "\n";
             print "<!-- Begin Help Block-->\n";
-            print '<div id="blockvmenuhelp" class="blockvmenuhelp">' . "\n";
+            print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
 // Version
             if (empty(Globals::$conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
@@ -460,15 +460,15 @@ 
                     $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
                     $doliurl = '';
                     if (preg_match('/\d\.\d/', $appli)) {
-                        if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                            $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
+                        if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli))
+                            $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
                     } else
-                        $appli .= " " . DOL_VERSION;
+                        $appli .= " ".DOL_VERSION;
                 } else
-                    $appli .= " " . DOL_VERSION;
+                    $appli .= " ".DOL_VERSION;
                 print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
                 if ($doliurl)
-                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+                    print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
                 else
                     print '<span class="help">';
                 print $appli;
@@ -476,12 +476,12 @@ 
                     print '</a>';
                 else
                     print '</span>';
-                print '</div>' . "\n";
+                print '</div>'."\n";
             }
 
 // Link to bugtrack
             if (!empty(Globals::$conf->global->MAIN_BUGTRACK_ENABLELINK)) {
-                require_once DOL_BASE_PATH . '/core/lib/functions2.lib.php';
+                require_once DOL_BASE_PATH.'/core/lib/functions2.lib.php';
 
                 $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
                 $bugbaseurl .= '?title=';
@@ -490,16 +490,16 @@ 
                 $bugbaseurl .= urlencode("# Bug\n");
                 $bugbaseurl .= urlencode("\n");
                 $bugbaseurl .= urlencode("## Environment\n");
-                $bugbaseurl .= urlencode("- **Version**: " . DOL_VERSION . "\n");
-                $bugbaseurl .= urlencode("- **OS**: " . php_uname('s') . "\n");
-                $bugbaseurl .= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-                $bugbaseurl .= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-                $bugbaseurl .= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-                $bugbaseurl .= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
+                $bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+                $bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+                $bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+                $bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+                $bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+                $bugbaseurl .= urlencode("- **URL**: ".$_SERVER["REQUEST_URI"]."\n");
                 $bugbaseurl .= urlencode("\n");
                 $bugbaseurl .= urlencode("## Report\n");
                 print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
-                print '<a class="help" target="_blank" rel="noopener" href="' . $bugbaseurl . '">' . Globals::$langs->trans("FindBug") . '</a>';
+                print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.Globals::$langs->trans("FindBug").'</a>';
                 print '</div>';
             }
 
@@ -513,14 +513,14 @@ 
 
 // Execute hook printLeftBlock
             $parameters = array();
-            $reshook = Globals::$hookManager->executeHooks('printLeftBlock', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $reshook = Globals::$hookManager->executeHooks('printLeftBlock', $parameters); // Note that $action and $object may have been modified by some hooks
             print Globals::$hookManager->resPrint;
 
             print '</div></div> <!-- End side-nav id-left -->'; // End div id="side-nav" div id="id-left"
         }
 
         print "\n";
-        print '<!-- Begin right area -->' . "\n";
+        print '<!-- Begin right area -->'."\n";
 
         if (empty($leftmenuwithoutmainarea))
             main_area($title);
@@ -541,7 +541,7 @@ 
 
         print "\n";
 
-        print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
+        print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
         if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED))
             print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
@@ -607,17 +607,17 @@ 
         // global Globals::$conf, Globals::$langs, Globals::$user;
 
         $ret = '';
-        $ret .= '<form action="' . $urlaction . '" method="post" class="searchform">';
-        $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+        $ret .= '<form action="'.$urlaction.'" method="post" class="searchform">';
+        $ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         $ret .= '<input type="hidden" name="mode" value="search">';
-        $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag(Globals::$user->login) . '">';
+        $ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag(Globals::$user->login).'">';
         if ($showtitlebefore)
-            $ret .= $title . ' ';
-        $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
-        $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
-        $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
-        $ret .= ' placeholder="' . strip_tags($title) . '"';
-        $ret .= ' name="' . $htmlinputname . '" id="' . $prefhtmlinputname . $htmlinputname . '" />';
+            $ret .= $title.' ';
+        $ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
+        $ret .= ' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+        $ret .= ($accesskey ? ' accesskey="'.$accesskey.'"' : '');
+        $ret .= ' placeholder="'.strip_tags($title).'"';
+        $ret .= ' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
 //$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.Globals::$langs->trans("Go").'">';
         $ret .= '<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
         $ret .= '<span class="fa fa-search"></span>';
@@ -642,7 +642,7 @@ 
         // global $delayedhtmlcontent;
         // global $contextpage, $page, $limit;
 
-        $ext = 'layout=' . Globals::$conf->browser->layout . '&version=' . urlencode(DOL_VERSION);
+        $ext = 'layout='.Globals::$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
 // Global html output events ($mesgs, $errors, $warnings)
         dol_htmloutput_events($disabledoutputofmessages);
@@ -652,15 +652,15 @@ 
         if (is_object(Globals::$user) && !empty(Globals::$user->lastsearch_values_tmp) && is_array(Globals::$user->lastsearch_values_tmp)) {
 // Clean and save data
             foreach (Globals::$user->lastsearch_values_tmp as $key => $val) {
-                unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
+                unset($_SESSION['lastsearch_values_tmp_'.$key]); // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
                     if (empty($val['sortfield']))
                         unset($val['sortfield']);
                     if (empty($val['sortorder']))
                         unset($val['sortorder']);
-                    dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
-                    $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
-                    unset($_SESSION['lastsearch_values_' . $key]);
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
+                    $_SESSION['lastsearch_values_tmp_'.$key] = json_encode($val);
+                    unset($_SESSION['lastsearch_values_'.$key]);
                 }
             }
         }
@@ -669,37 +669,37 @@ 
         $relativepathstring = $_SERVER["PHP_SELF"];
 // 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);
         if (preg_match('/list\.php$/', $relativepathstring)) {
-            unset($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
+            unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
             if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+                $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
             if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+                $_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;
             if (!empty($limit) && $limit != Globals::$conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+                $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
 
-            unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_page_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_limit_' . $relativepathstring]);
+            unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_'.$relativepathstring]);
         }
 
 // Core error message
         if (!empty(Globals::$conf->global->MAIN_CORE_ERROR)) {
 // Ajax version
             if (Globals::$conf->use_javascript_ajax) {
-                $title = img_warning() . ' ' . Globals::$langs->trans('CoreErrorTitle');
+                $title = img_warning().' '.Globals::$langs->trans('CoreErrorTitle');
                 print ajax_dialog($title, Globals::$langs->trans('CoreErrorMessage'));
             }
 // html version
             else {
-                $msg = img_warning() . ' ' . Globals::$langs->trans('CoreErrorMessage');
-                print '<div class="error">' . $msg . '</div>';
+                $msg = img_warning().' '.Globals::$langs->trans('CoreErrorMessage');
+                print '<div class="error">'.$msg.'</div>';
             }
 
 //define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
@@ -707,17 +707,17 @@ 
 
         print "\n\n";
 
-        print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
+        print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
         if (empty(Globals::$conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+            print '</div> <!-- End div id-right -->'."\n"; // End div id-right
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+            print '</div> <!-- End div id-container -->'."\n"; // End div container
 
         print "\n";
         if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+            print '<!-- '.$comment.' -->'."\n";
 
         printCommonFooter($zone);
 
@@ -725,8 +725,8 @@ 
             print $delayedhtmlcontent;
 
         if (!empty(Globals::$conf->use_javascript_ajax)) {
-            print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";
-            print '<script type="text/javascript" src="' . BASE_URI . '?controller=core/js/&method=lib_foot.js&lang=' . Globals::$langs->defaultlang . ($ext ? '&' . $ext : '') . '"></script>' . "\n";
+            print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+            print '<script type="text/javascript" src="'.BASE_URI.'?controller=core/js/&method=lib_foot.js&lang='.Globals::$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
         }
 
 // Wrapper to add log when clicking on download or preview
@@ -738,7 +738,7 @@ 
                 <script type="text/javascript">
                     jQuery(document).ready(function () {
                         $('a.documentpreview').click(function () {
-                            $.post('<?php echo DOL_BASE_URI . "/blockedlog/ajax/block-add.php" ?>'
+                            $.post('<?php echo DOL_BASE_URI."/blockedlog/ajax/block-add.php" ?>'
                                     , {
                                         id:<?php echo $object->id; ?>
                                         , element: '<?php echo $object->element ?>'
@@ -747,7 +747,7 @@ 
                             );
                         });
                         $('a.documentdownload').click(function () {
-                            $.post('<?php echo DOL_BASE_URI . "/blockedlog/ajax/block-add.php" ?>'
+                            $.post('<?php echo DOL_BASE_URI."/blockedlog/ajax/block-add.php" ?>'
                                     , {
                                         id:<?php echo $object->id; ?>
                                         , element: '<?php echo $object->element ?>'
@@ -763,7 +763,7 @@ 
 
 // A div for the address popup
         print "\n<!-- A div to allow dialog popup -->\n";
-        print '<div id="dialogforpopup" style="display: none;"></div>' . "\n";
+        print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
         print "</body>\n";
 

Braces +123 added lines, -80 removed lines

@@ -189,15 +189,20 @@ 
             if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
                 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-                } else
-                    $appli .= " " . DOL_VERSION;
-            } else
-                $appli .= " " . DOL_VERSION;
+                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                            $appli .= " (" . DOL_VERSION . ")";
+                    }
+                    // If new title contains a version that is different than core
+                } else {
+                                    $appli .= " " . DOL_VERSION;
+                }
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
 
-            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))
-                $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+            }
 
             $logouttext = '';
             if (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
@@ -237,12 +242,15 @@ 
             $parameters = array();
             $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
             if (is_numeric($result)) {
-                if ($result == 0)
-                    $toprightmenu .= Globals::$hookManager->resPrint;  // add
-                else
-                    $toprightmenu = Globals::$hookManager->resPrint;      // replace
-            }
-            else {
+                if ($result == 0) {
+                                    $toprightmenu .= Globals::$hookManager->resPrint;
+                }
+                // add
+                else {
+                                    $toprightmenu = Globals::$hookManager->resPrint;
+                }
+                // replace
+            } else {
                 $toprightmenu .= $result; // For backward compatibility
             }
 
@@ -336,8 +344,9 @@ 
             print "<!-- End top horizontal menu -->\n\n";
         }
 
-        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile)) {
+                    print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+        }
     }
 
     /**
@@ -362,8 +371,9 @@ 
         $searchform = '';
         $bookmarks = '';
 
-        if (!empty($menu_array_before))
-            dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+        if (!empty($menu_array_before)) {
+                    dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+        }
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
 // Instantiate hooks of thirdparty module
@@ -371,8 +381,10 @@ 
 
             print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
 
-            if (Globals::$conf->browser->layout == 'phone')
-                Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+            if (Globals::$conf->browser->layout == 'phone') {
+                            Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1;
+            }
+            // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
             print "\n";
 
@@ -399,8 +411,9 @@ 
             $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
             if (empty($reshook)) {
                 $searchform .= Globals::$hookManager->resPrint;
-            } else
-                $searchform = Globals::$hookManager->resPrint;
+            } else {
+                            $searchform = Globals::$hookManager->resPrint;
+            }
 
 // Force special value for $searchform
             if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty(Globals::$conf->use_javascript_ajax)) {
@@ -444,38 +457,49 @@ 
             if (empty(Globals::$conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
                 $doliurl = 'https://www.dolibarr.org';
 //local communities
-                if (preg_match('/fr/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.fr';
-                if (preg_match('/es/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.es';
-                if (preg_match('/de/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.de';
-                if (preg_match('/it/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.it';
-                if (preg_match('/gr/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.gr';
+                if (preg_match('/fr/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.fr';
+                }
+                if (preg_match('/es/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.es';
+                }
+                if (preg_match('/de/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.de';
+                }
+                if (preg_match('/it/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.it';
+                }
+                if (preg_match('/gr/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.gr';
+                }
 
                 $appli = constant('DOL_APPLICATION_TITLE');
                 if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                     $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
                     $doliurl = '';
                     if (preg_match('/\d\.\d/', $appli)) {
-                        if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                            $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-                    } else
-                        $appli .= " " . DOL_VERSION;
-                } else
-                    $appli .= " " . DOL_VERSION;
+                        if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                                    $appli .= " (" . DOL_VERSION . ")";
+                        }
+                        // If new title contains a version that is different than core
+                    } else {
+                                            $appli .= " " . DOL_VERSION;
+                    }
+                } else {
+                                    $appli .= " " . DOL_VERSION;
+                }
                 print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-                if ($doliurl)
-                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
-                else
-                    print '<span class="help">';
+                if ($doliurl) {
+                                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+                } else {
+                                    print '<span class="help">';
+                }
                 print $appli;
-                if ($doliurl)
-                    print '</a>';
-                else
-                    print '</span>';
+                if ($doliurl) {
+                                    print '</a>';
+                } else {
+                                    print '</span>';
+                }
                 print '</div>' . "\n";
             }
 
@@ -522,8 +546,9 @@ 
         print "\n";
         print '<!-- Begin right area -->' . "\n";
 
-        if (empty($leftmenuwithoutmainarea))
-            main_area($title);
+        if (empty($leftmenuwithoutmainarea)) {
+                    main_area($title);
+        }
     }
 
     /**
@@ -536,15 +561,17 @@ 
     {
 // global Globals::$conf, Globals::$langs;
 
-        if (empty(Globals::$conf->dol_hide_leftmenu))
-            print '<div id="id-right">';
+        if (empty(Globals::$conf->dol_hide_leftmenu)) {
+                    print '<div id="id-right">';
+        }
 
         print "\n";
 
         print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
 
-        if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-            print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+        if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+                    print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+        }
     }
 
     /**
@@ -569,18 +596,21 @@ 
 // If WIKI URL
             if (preg_match('/^es/i', Globals::$langs->defaultlang)) {
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/ES:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             if (preg_match('/^fr/i', Globals::$langs->defaultlang)) {
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/FR:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             if (empty($helppage)) { // If help page not already found
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/EN:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             $mode = 'wiki';
         }
@@ -611,8 +641,9 @@ 
         $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
         $ret .= '<input type="hidden" name="mode" value="search">';
         $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag(Globals::$user->login) . '">';
-        if ($showtitlebefore)
-            $ret .= $title . ' ';
+        if ($showtitlebefore) {
+                    $ret .= $title . ' ';
+        }
         $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
         $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
         $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
@@ -654,10 +685,12 @@ 
             foreach (Globals::$user->lastsearch_values_tmp as $key => $val) {
                 unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
-                    if (empty($val['sortfield']))
-                        unset($val['sortfield']);
-                    if (empty($val['sortorder']))
-                        unset($val['sortorder']);
+                    if (empty($val['sortfield'])) {
+                                            unset($val['sortfield']);
+                    }
+                    if (empty($val['sortorder'])) {
+                                            unset($val['sortorder']);
+                    }
                     dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
                     $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
                     unset($_SESSION['lastsearch_values_' . $key]);
@@ -668,8 +701,9 @@ 
 
         $relativepathstring = $_SERVER["PHP_SELF"];
 // Clean $relativepathstring
-        if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        if (constant('DOL_BASE_URI')) {
+                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        }
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
@@ -677,12 +711,15 @@ 
             unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
             unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
 
-            if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
-            if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
-            if (!empty($limit) && $limit != Globals::$conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            if (!empty($contextpage)) {
+                            $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+            }
+            if (!empty($page) && $page > 1) {
+                            $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+            }
+            if (!empty($limit) && $limit != Globals::$conf->limit) {
+                            $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            }
 
             unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
             unset($_SESSION['lastsearch_page_' . $relativepathstring]);
@@ -709,20 +746,26 @@ 
 
         print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
 
-        if (empty(Globals::$conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+        if (empty(Globals::$conf->dol_hide_leftmenu)) {
+                    print '</div> <!-- End div id-right -->' . "\n";
+        }
+        // End div id-right
 
-        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile)) {
+                    print '</div> <!-- End div id-container -->' . "\n";
+        }
+        // End div container
 
         print "\n";
-        if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+        if ($comment) {
+                    print '<!-- ' . $comment . ' -->' . "\n";
+        }
 
         printCommonFooter($zone);
 
-        if (!empty($delayedhtmlcontent))
-            print $delayedhtmlcontent;
+        if (!empty($delayedhtmlcontent)) {
+                    print $delayedhtmlcontent;
+        }
 
         if (!empty(Globals::$conf->use_javascript_ajax)) {
             print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";

Base/User.php

Indentation +1 added lines, -1 removed lines

@@ -2963,7 +2963,7 @@
     function load_state_board()

     {

 // phpcs:enable

-       // global $conf;

+        // global $conf;

 

         $this->nb = array();

 

Spacing +337 added lines, -337 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($conf->multicompany->enabled) || empty($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($conf->multicompany->enabled) && !empty($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";

-                DolUtils::dol_syslog(get_class($this) . "::fetch user not found", LOG_DEBUG);

+                DolUtils::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);

 

-        DolUtils::dol_syslog(get_class($this) . "::addrights $rid, $allmodule, $allperms, $entity");

+        DolUtils::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()

     {

-        DolUtils::dol_syslog(get_class($this) . "::clearrights reset user->rights");

+        DolUtils::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($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {

-            $sql .= " AND r.entity IN (0," . (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "") . Globals::$conf->entity . ")";

+            $sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($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($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {

             if (!empty($conf->multicompany->enabled) && !empty($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);

 

-        DolUtils::dol_syslog(get_class($this) . "::setstatus", LOG_DEBUG);

+        DolUtils::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);

 

-        DolUtils::dol_syslog(get_class($this) . "::delete", LOG_DEBUG);

+        DolUtils::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++;

-                DolUtils::dol_syslog(get_class($this) . "::delete error -4 " . $this->error, LOG_ERR);

+                DolUtils::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;

-            DolUtils::dol_syslog(get_class($this) . "::delete", LOG_DEBUG);

+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->id;

+            DolUtils::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

         }

-        DolUtils::dol_syslog(get_class($this) . "::create login=" . $this->login . ", user=" . (is_object(Globals::$user) ? Globals::$user->id : ''), LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object(Globals::$user) ? Globals::$user->id : ''), LOG_DEBUG);

 

 // Check parameters

         if (!empty($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($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($conf->entity).")";

 

-        DolUtils::dol_syslog(get_class($this) . "::create", LOG_DEBUG);

+        DolUtils::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';

-                DolUtils::dol_syslog(get_class($this) . "::create " . $this->error, LOG_WARNING);

+                DolUtils::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);

 

-                DolUtils::dol_syslog(get_class($this) . "::create", LOG_DEBUG);

+                DolUtils::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($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;

-                        DolUtils::dol_syslog(get_class($this) . "::create " . $this->error, LOG_ERR);

+                        DolUtils::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);

 

-            DolUtils::dol_syslog(get_class($this) . "::create_from_contact", LOG_DEBUG);

+            DolUtils::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

-            DolUtils::dol_syslog(get_class($this) . "::create_from_contact - 0");

+            DolUtils::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;

 

-                DolUtils::dol_syslog(get_class($this) . "::create_from_member", LOG_DEBUG);

+                DolUtils::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;

 

-        DolUtils::dol_syslog(get_class($this) . "::update notrigger=" . $notrigger . ", nosyncmember=" . $nosyncmember . ", nosyncmemberpass=" . $nosyncmemberpass);

+        DolUtils::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;

 

-        DolUtils::dol_syslog(get_class($this) . "::update", LOG_DEBUG);

+        DolUtils::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) {

-                DolUtils::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;

+                DolUtils::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

-            DolUtils::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;

+            DolUtils::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) {

-                    DolUtils::dol_syslog(get_class($this) . "::update user is linked with a member. We try to update member too.", LOG_DEBUG);

+                    DolUtils::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;

-                            DolUtils::dol_syslog(get_class($this) . "::update error after calling adh->update to sync it with user: " . $this->error, LOG_ERR);

+                            DolUtils::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) {

-                    DolUtils::dol_syslog(get_class($this) . "::update user is linked with a contact. We try to update contact too.", LOG_DEBUG);

+                    DolUtils::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;

-                            DolUtils::dol_syslog(get_class($this) . "::update error after calling adh->update to sync it with user: " . $this->error, LOG_ERR);

+                            DolUtils::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 {

-                DolUtils::dol_syslog(get_class($this) . "::update error=" . $this->error, LOG_ERR);

+                DolUtils::dol_syslog(get_class($this)."::update error=".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -1;

             }

@@ -1639,20 +1639,20 @@ 
 // phpcs:enable

         $now = dol_now();

 

-        $sql = "UPDATE " . MAIN_DB_PREFIX . "user SET";

+        $sql = "UPDATE ".MAIN_DB_PREFIX."user SET";

         $sql .= " datepreviouslogin = datelastlogin,";

-        $sql .= " datelastlogin = '" . Config::$dbEngine->idate($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 .= " datelastlogin = '".Config::$dbEngine->idate($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;

 

-        DolUtils::dol_syslog(get_class($this) . "::update_last_login_date user->id=" . $this->id . " " . $sql, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::update_last_login_date user->id=".$this->id." ".$sql, LOG_DEBUG);

         $resql = Config::$dbEngine->query($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;

         }

     }

@@ -1670,11 +1670,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;

 

-        DolUtils::dol_syslog(get_class($this) . "::setPassword user=" . Globals::$user->id . " password=" . preg_replace('/./i', '*', $password) . " changelater=" . $changelater . " notrigger=" . $notrigger . " nosyncmember=" . $nosyncmember, LOG_DEBUG);

+        DolUtils::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) {

@@ -1692,17 +1692,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($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;

 

-            DolUtils::dol_syslog(get_class($this) . "::setPassword", LOG_DEBUG);

+            DolUtils::dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);

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

             if ($result) {

                 if (Config::$dbEngine->affected_rows($result)) {

@@ -1711,7 +1711,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.

@@ -1722,7 +1722,7 @@ 
                             $result = $adh->setPassword(Globals::$user, $this->pass, (empty($conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1), 1); // Cryptage non gere dans module adherent

                             if ($result < 0) {

                                 $this->error = $adh->error;

-                                DolUtils::dol_syslog(get_class($this) . "::setPassword " . $this->error, LOG_ERR);

+                                DolUtils::dol_syslog(get_class($this)."::setPassword ".$this->error, LOG_ERR);

                                 $error++;

                             }

                         } else {

@@ -1731,7 +1731,7 @@ 
                         }

                     }

 

-                    DolUtils::dol_syslog(get_class($this) . "::setPassword notrigger=" . $notrigger . " error=" . $error, LOG_DEBUG);

+                    DolUtils::dol_syslog(get_class($this)."::setPassword notrigger=".$notrigger." error=".$error, LOG_DEBUG);

 

                     if (!$error && !$notrigger) {

 // Call trigger

@@ -1758,11 +1758,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;

 

-            DolUtils::dol_syslog(get_class($this) . "::setPassword", LOG_DEBUG); // No log

+            DolUtils::dol_syslog(get_class($this)."::setPassword", LOG_DEBUG); // No log

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

             if ($result) {

                 return $password;

@@ -1788,7 +1788,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;

 

@@ -1813,36 +1813,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

 

-            DolUtils::dol_syslog(get_class($this) . "::send_password changelater is off, url=" . $url);

+            DolUtils::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";

 

-            DolUtils::dol_syslog(get_class($this) . "::send_password changelater is on, url=" . $url);

+            DolUtils::dol_syslog(get_class($this)."::send_password changelater is on, url=".$url);

         }

 

         $mailfile = new CMailFile(

@@ -1853,7 +1853,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;

         }

     }

@@ -1878,8 +1878,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) {

@@ -1913,21 +1913,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;

 

-        DolUtils::dol_syslog(get_class($this) . '::update_clicktodial', LOG_DEBUG);

+        DolUtils::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)."')";

 

-        DolUtils::dol_syslog(get_class($this) . '::update_clicktodial', LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);

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

         if ($result) {

             Config::$dbEngine->commit();

@@ -1957,20 +1957,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

@@ -1985,7 +1985,7 @@ 
                 Config::$dbEngine->commit();

                 return 1;

             } else {

-                DolUtils::dol_syslog(get_class($this) . "::SetInGroup " . $this->error, LOG_ERR);

+                DolUtils::dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -2;

             }

@@ -2014,15 +2014,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

@@ -2038,7 +2038,7 @@ 
                 return 1;

             } else {

                 $this->error = $interface->error;

-                DolUtils::dol_syslog(get_class($this) . "::RemoveFromGroup " . $this->error, LOG_ERR);

+                DolUtils::dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -2;

             }

@@ -2062,7 +2062,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 .= Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass, $imagesize);

         $result .= '</a>';

 

@@ -2112,49 +2112,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>: ' . DolUtils::yn($this->admin);

+            $label .= '<br><b>'.Globals::$langs->trans("Administrator").'</b>: '.DolUtils::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($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> ' . dol_print_date($this->datelastlogin, "dayhour", 'tzuser');

-            $label .= '<br><b>' . Globals::$langs->trans("PreviousConnexion") . ':</b> ' . 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> ' . $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> '.dol_print_date($this->datelastlogin, "dayhour", 'tzuser');

+            $label .= '<br><b>'.Globals::$langs->trans("PreviousConnexion").':</b> '.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> '.$menumanager->name;

             $s = 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 . ($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.($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 ($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) {

@@ -2162,10 +2162,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

@@ -2178,16 +2178,16 @@ 
             }

         }

 

-        $linkstart = '<a href="' . $url . '"';

+        $linkstart = '<a href="'.$url.'"';

         $linkclose = "";

         if (empty($notooltip)) {

             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

                 Globals::$langs->load("users");

                 $label = Globals::$langs->trans("ShowUser");

-                $linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';

+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';

             }

-            $linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';

-            $linkclose .= ' class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"';

+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';

+            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';

 

             /*

               $hookmanager->initHooks(array('userdao'));

@@ -2197,7 +2197,7 @@ 
              */

         }

 

-        $linkstart .= $linkclose . '>';

+        $linkstart .= $linkclose.'>';

         $linkend = '</a>';

 

 //if ($withpictoimg == -1) $result.='<div class="nowrap">';

@@ -2209,15 +2209,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 : '') . '>' . Form::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 : '').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1).'</div>';

             }

             $result .= $picto;

         }

         if ($withpictoimg > -2 && $withpictoimg != 2) {

             if (empty($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);

@@ -2235,7 +2235,7 @@ 
         global $action;

         $hookmanager->initHooks(array('userdao'));

         $parameters = array('id' => $this->id, 'getnomurl' => $result);

-        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

         if ($reshook > 0) {

             $result = $hookmanager->resPrint;

         } else {

@@ -2259,7 +2259,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

@@ -2269,7 +2269,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>';

         }

 

@@ -2326,9 +2326,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) {

@@ -2338,15 +2338,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"');

             }

         }

     }

@@ -2367,11 +2367,11 @@ 
         global $conf;

         $dn = '';

         if ($mode == 0) {

-            $dn = Globals::$conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS] . "," . Globals::$conf->global->LDAP_USER_DN;

+            $dn = Globals::$conf->global->LDAP_KEY_USERS."=".$info[$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[$conf->global->LDAP_KEY_USERS];

+            $dn = Globals::$conf->global->LDAP_KEY_USERS."=".$info[$conf->global->LDAP_KEY_USERS];

         }

         return $dn;

     }

@@ -2569,8 +2569,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) {

@@ -2599,9 +2599,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) {

@@ -2629,19 +2629,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;

             }

         }

 

@@ -2692,7 +2692,7 @@ 
 

         $result = $this->update(Globals::$user);

 

-        DolUtils::dol_syslog(get_class($this) . "::update_ldap2dolibarr result=" . $result, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::update_ldap2dolibarr result=".$result, LOG_DEBUG);

 

         return $result;

     }

@@ -2707,10 +2707,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;

 

-        DolUtils::dol_syslog(get_class($this) . "::get_children result=" . $result, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_children result=".$result, LOG_DEBUG);

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

         if ($res) {

             $this->users = array();

@@ -2739,11 +2739,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').")";

 

-        DolUtils::dol_syslog(get_class($this) . "::loadParentOf", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::loadParentOf", LOG_DEBUG);

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

         if ($resql) {

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

@@ -2785,20 +2785,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 = $hookmanager->executeHooks('printUserListWhere', $parameters);    // Note that $action and $object may have been modified by hook

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

         if ($reshook > 0) {

             $sql .= $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;

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::get_full_tree get user list", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_full_tree get user list", LOG_DEBUG);

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

         if ($resql) {

             $i = 0;

@@ -2824,7 +2824,7 @@ 
         }

 

 // We add the fullpath property to each elements of first level (no parent exists)

-        DolUtils::dol_syslog(get_class($this) . "::get_full_tree call to build_path_from_id_user", LOG_DEBUG);

+        DolUtils::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) {

@@ -2836,18 +2836,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]);

                 }

             }

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::get_full_tree dol_sort_array", LOG_DEBUG);

+        DolUtils::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);

@@ -2875,10 +2875,10 @@ 
 

             $idtoscan = $this->id;

 

-            DolUtils::dol_syslog("Build childid for id = " . $idtoscan);

+            DolUtils::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'];

                 }

             }

@@ -2904,16 +2904,16 @@ 
     function build_path_from_id_user($id_user, $protection = 0)

     {

 // phpcs:enable

-        DolUtils::dol_syslog(get_class($this) . "::build_path_from_id_user id_user=" . $id_user . " protection=" . $protection, LOG_DEBUG);

+        DolUtils::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

-            DolUtils::dol_syslog(get_class($this) . "::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);

+            DolUtils::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;

@@ -2922,11 +2922,11 @@ 
         while (!empty($this->parentof[$cursor_user])) {

             if (in_array($this->parentof[$cursor_user], Globals::$useridfound)) {

                 DolUtils::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];

         }

@@ -2968,10 +2968,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) {

@@ -3036,8 +3036,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) {

@@ -3047,7 +3047,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;

                 }

@@ -3074,7 +3074,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

@@ -3082,25 +3082,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);

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);

 

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

         if ($resql) {

Braces +10 added lines, -8 removed lines

@@ -520,16 +520,17 @@ 
                     $nid = $obj->id;

 

                     $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++;

+                    if (!Config::$dbEngine->query($sql)) {
+                                            $error++;
+                    }
                     $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_rights (entity, fk_user, fk_id) VALUES (" . $entity . ", " . $this->id . ", " . $nid . ")";

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

-                        $error++;

+                    if (!Config::$dbEngine->query($sql)) {
+                                            $error++;
+                    }
 

                     $i++;

                 }

-            }

-            else {

+            } else {

                 $error++;

                 dol_print_error(Config::$dbEngine);

             }

@@ -2224,8 +2225,9 @@ 
             } else {

                 $result .= $this->getFullName(Globals::$langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);

             }

-            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

-                $result .= '</div>';

+            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+                            $result .= '</div>';
+            }
         }

         $result .= (($option == 'nolink') ? '' : $linkend);

 //if ($withpictoimg == -1) $result.='</div>';

Base/Conf.php

Spacing +101 added lines, -101 removed lines

@@ -36,8 +36,8 @@ 
     //! Used to store current currency (ISO code like 'USD', 'EUR', ...)

     public $currency;

     //! Used to store current css (from theme)

-    public $theme;        // Contains current theme ("eldy", "auguria", ...)

-    public $css;          // Contains full path of css page ("/theme/eldy/style.css.php", ...)

+    public $theme; // Contains current theme ("eldy", "auguria", ...)

+    public $css; // Contains full path of css page ("/theme/eldy/style.css.php", ...)

     //! Used to store current menu handler

     public $standard_menu;

     public $modules = array(); // List of activated modules

@@ -54,11 +54,11 @@ 
     public $entity = 1;

     //! Used to store list of entities to use for each element

     public $entities = array();

-    public $dol_hide_topmenu;   // Set if we force param dol_hide_topmenu into login url

-    public $dol_hide_leftmenu;   // Set if we force param dol_hide_leftmenu into login url

+    public $dol_hide_topmenu; // Set if we force param dol_hide_topmenu into login url

+    public $dol_hide_leftmenu; // Set if we force param dol_hide_leftmenu into login url

     public $dol_optimize_smallscreen; // Set if we force param dol_optimize_smallscreen into login url or if browser is smartphone

-    public $dol_no_mouse_hover;   // Set if we force param dol_no_mouse_hover into login url or if browser is smartphone

-    public $dol_use_jmobile;   // Set if we force param dol_use_jmobile into login url

+    public $dol_no_mouse_hover; // Set if we force param dol_no_mouse_hover into login url or if browser is smartphone

+    public $dol_use_jmobile; // Set if we force param dol_use_jmobile into login url

 

     /**

      * Constructor

@@ -79,7 +79,7 @@ 
         $this->multicompany = new \stdClass();

 

         //! Charset for HTML output and for storing data in memory

-        $this->file->character_set_client = 'UTF-8';   // UTF-8, ISO-8859-1

+        $this->file->character_set_client = 'UTF-8'; // UTF-8, ISO-8859-1

         // First level object

         // TODO Remove this part.

         $this->expedition_bon = new \stdClass();

@@ -113,13 +113,13 @@ 
     {

         global $conf;

 

-        dol_syslog(get_class($this) . "::setValues");

+        dol_syslog(get_class($this)."::setValues");

 

         //Define all global constants into Conf::$global->key=value

-        $sql = "SELECT " . $db->decrypt('name') . " as name,";

-        $sql .= " " . $db->decrypt('value') . " as value, entity";

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

-        $sql .= " WHERE entity IN (0," . $this->entity . ")";

+        $sql = "SELECT ".$db->decrypt('name')." as name,";

+        $sql .= " ".$db->decrypt('value')." as value, entity";

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

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

         $sql .= " ORDER BY entity"; // This is to have entity 0 first, then entity 1 that overwrite.

 

         $resql = $db->query($sql);

@@ -159,13 +159,13 @@ 
                             if (is_array($arrValue) && !empty($arrValue))

                                 $value = $arrValue;

                             else if (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl')))

-                                $value = '/' . $modulename . '/core/' . $partname . '/';

+                                $value = '/'.$modulename.'/core/'.$partname.'/';

                             else if (in_array($partname, array('models', 'theme')))

-                                $value = '/' . $modulename . '/';

+                                $value = '/'.$modulename.'/';

                             else if (in_array($partname, array('sms')))

-                                $value = '/' . $modulename . '/';

+                                $value = '/'.$modulename.'/';

                             else if ($value == 1)

-                                $value = '/' . $modulename . '/core/modules/' . $partname . '/'; // ex: partname = societe

+                                $value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe

                             $this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array

                         }

                         // If this is a module constant (must be at end)

@@ -178,7 +178,7 @@ 
                             if (!isset($this->$modulename) || !is_object($this->$modulename))

                                 $this->$modulename = new \stdClass();

                             $this->$modulename->enabled = true;

-                            $this->modules[] = $modulename;              // Add this module in list of enabled modules

+                            $this->modules[] = $modulename; // Add this module in list of enabled modules

                         }

                     }

                 }

@@ -193,7 +193,7 @@ 
             $filesList = explode(":", Conf::$global->LOCAL_CONSTS_FILES);

             foreach ($filesList as $file) {

                 $file = dol_sanitizeFileName($file);

-                include_once DOL_DOCUMENT_ROOT . "/" . $file . "/" . $file . "_consts.php";

+                include_once DOL_DOCUMENT_ROOT."/".$file."/".$file."_consts.php";

                 foreach ($file2bddconsts as $key => $value) {

                     Conf::$global->$key = $value;

                 }

@@ -209,7 +209,7 @@ 
             try {

                 date_default_timezone_set(Conf::$global->MAIN_SERVER_TZ);

             } catch (Exception $e) {

-                dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=" . Conf::$global->MAIN_SERVER_TZ, LOG_ERR);

+                dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=".Conf::$global->MAIN_SERVER_TZ, LOG_ERR);

             }

         }

 

@@ -269,18 +269,18 @@ 
         $rootforuser = DOL_DATA_ROOT;

         // If multicompany module is enabled, we redefine the root of data

         if (!empty($this->multicompany->enabled) && !empty($this->entity) && $this->entity > 1) {

-            $rootfordata .= '/' . $this->entity;

+            $rootfordata .= '/'.$this->entity;

         }

 

         // Define default dir_output and dir_temp for directories of modules

         foreach ($this->modules as $module) {

             //var_dump($module);

             // For multicompany sharings

-            $this->$module->multidir_output = array($this->entity => $rootfordata . "/" . $module);

-            $this->$module->multidir_temp = array($this->entity => $rootfordata . "/" . $module . "/temp");

+            $this->$module->multidir_output = array($this->entity => $rootfordata."/".$module);

+            $this->$module->multidir_temp = array($this->entity => $rootfordata."/".$module."/temp");

             // For backward compatibility

-            $this->$module->dir_output = $rootfordata . "/" . $module;

-            $this->$module->dir_temp = $rootfordata . "/" . $module . "/temp";

+            $this->$module->dir_output = $rootfordata."/".$module;

+            $this->$module->dir_temp = $rootfordata."/".$module."/temp";

         }

 

         // External modules storage

@@ -290,45 +290,45 @@ 
                     foreach ($dirs as $type => $name) {

                         $subdir = ($type == 'temp' ? '/temp' : '');

                         // For multicompany sharings

-                        $varname = 'multidir_' . $type;

-                        $this->$module->$varname = array($this->entity => $rootfordata . "/" . $name . $subdir);

+                        $varname = 'multidir_'.$type;

+                        $this->$module->$varname = array($this->entity => $rootfordata."/".$name.$subdir);

                         // For backward compatibility

-                        $varname = 'dir_' . $type;

-                        $this->$module->$varname = $rootfordata . "/" . $name . $subdir;

+                        $varname = 'dir_'.$type;

+                        $this->$module->$varname = $rootfordata."/".$name.$subdir;

                     }

                 }

             }

         }

 

         // For mycompany storage

-        $this->mycompany->dir_output = $rootfordata . "/mycompany";

-        $this->mycompany->dir_temp = $rootfordata . "/mycompany/temp";

+        $this->mycompany->dir_output = $rootfordata."/mycompany";

+        $this->mycompany->dir_temp = $rootfordata."/mycompany/temp";

 

         // For admin storage

-        $this->admin->dir_output = $rootfordata . '/admin';

-        $this->admin->dir_temp = $rootfordata . '/admin/temp';

+        $this->admin->dir_output = $rootfordata.'/admin';

+        $this->admin->dir_temp = $rootfordata.'/admin/temp';

 

         // For user storage

-        $this->user->multidir_output = array($this->entity => $rootfordata . "/users");

-        $this->user->multidir_temp = array($this->entity => $rootfordata . "/users/temp");

+        $this->user->multidir_output = array($this->entity => $rootfordata."/users");

+        $this->user->multidir_temp = array($this->entity => $rootfordata."/users/temp");

         // For backward compatibility

-        $this->user->dir_output = $rootforuser . "/users";

-        $this->user->dir_temp = $rootforuser . "/users/temp";

+        $this->user->dir_output = $rootforuser."/users";

+        $this->user->dir_temp = $rootforuser."/users/temp";

 

         // For usergroup storage

-        $this->usergroup->dir_output = $rootforuser . "/usergroups";

-        $this->usergroup->dir_temp = $rootforuser . "/usergroups/temp";

+        $this->usergroup->dir_output = $rootforuser."/usergroups";

+        $this->usergroup->dir_temp = $rootforuser."/usergroups/temp";

 

         // For proposal storage

-        $this->propal->multidir_output = array($this->entity => $rootfordata . "/propale");

-        $this->propal->multidir_temp = array($this->entity => $rootfordata . "/propale/temp");

+        $this->propal->multidir_output = array($this->entity => $rootfordata."/propale");

+        $this->propal->multidir_temp = array($this->entity => $rootfordata."/propale/temp");

         // For backward compatibility

-        $this->propal->dir_output = $rootfordata . "/propale";

-        $this->propal->dir_temp = $rootfordata . "/propale/temp";

+        $this->propal->dir_output = $rootfordata."/propale";

+        $this->propal->dir_temp = $rootfordata."/propale/temp";

 

         // For medias storage

-        $this->medias->multidir_output = array($this->entity => $rootfordata . "/medias");

-        $this->medias->multidir_temp = array($this->entity => $rootfordata . "/medias/temp");

+        $this->medias->multidir_output = array($this->entity => $rootfordata."/medias");

+        $this->medias->multidir_temp = array($this->entity => $rootfordata."/medias/temp");

 

         // Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.

         // Sous module bons d'expedition

@@ -339,72 +339,72 @@ 
         // Module fournisseur

         if (!empty($this->fournisseur)) {

             $this->fournisseur->commande = new \stdClass();

-            $this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata . "/fournisseur/commande");

-            $this->fournisseur->commande->multidir_temp = array($this->entity => $rootfordata . "/fournisseur/commande/temp");

-            $this->fournisseur->commande->dir_output = $rootfordata . "/fournisseur/commande";  // For backward compatibility

-            $this->fournisseur->commande->dir_temp = $rootfordata . "/fournisseur/commande/temp"; // For backward compatibility

+            $this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");

+            $this->fournisseur->commande->multidir_temp = array($this->entity => $rootfordata."/fournisseur/commande/temp");

+            $this->fournisseur->commande->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility

+            $this->fournisseur->commande->dir_temp = $rootfordata."/fournisseur/commande/temp"; // For backward compatibility

             $this->fournisseur->facture = new \stdClass();

-            $this->fournisseur->facture->multidir_output = array($this->entity => $rootfordata . "/fournisseur/facture");

-            $this->fournisseur->facture->multidir_temp = array($this->entity => $rootfordata . "/fournisseur/facture/temp");

-            $this->fournisseur->facture->dir_output = $rootfordata . "/fournisseur/facture";  // For backward compatibility

-            $this->fournisseur->facture->dir_temp = $rootfordata . "/fournisseur/facture/temp"; // For backward compatibility

+            $this->fournisseur->facture->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");

+            $this->fournisseur->facture->multidir_temp = array($this->entity => $rootfordata."/fournisseur/facture/temp");

+            $this->fournisseur->facture->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility

+            $this->fournisseur->facture->dir_temp = $rootfordata."/fournisseur/facture/temp"; // For backward compatibility

             $this->supplierproposal = new \stdClass();

-            $this->supplierproposal->multidir_output = array($this->entity => $rootfordata . "/supplier_proposal");

-            $this->supplierproposal->multidir_temp = array($this->entity => $rootfordata . "/supplier_proposal/temp");

-            $this->supplierproposal->dir_output = $rootfordata . "/supplier_proposal";    // For backward compatibility

-            $this->supplierproposal->dir_temp = $rootfordata . "/supplier_proposal/temp";   // For backward compatibility

+            $this->supplierproposal->multidir_output = array($this->entity => $rootfordata."/supplier_proposal");

+            $this->supplierproposal->multidir_temp = array($this->entity => $rootfordata."/supplier_proposal/temp");

+            $this->supplierproposal->dir_output = $rootfordata."/supplier_proposal"; // For backward compatibility

+            $this->supplierproposal->dir_temp = $rootfordata."/supplier_proposal/temp"; // For backward compatibility

             $this->fournisseur->payment = new \stdClass();

-            $this->fournisseur->payment->multidir_output = array($this->entity => $rootfordata . "/fournisseur/payment");

-            $this->fournisseur->payment->multidir_temp = array($this->entity => $rootfordata . "/fournisseur/payment/temp");

-            $this->fournisseur->payment->dir_output = $rootfordata . "/fournisseur/payment";  // For backward compatibility

-            $this->fournisseur->payment->dir_temp = $rootfordata . "/fournisseur/payment/temp"; // For backward compatibility

+            $this->fournisseur->payment->multidir_output = array($this->entity => $rootfordata."/fournisseur/payment");

+            $this->fournisseur->payment->multidir_temp = array($this->entity => $rootfordata."/fournisseur/payment/temp");

+            $this->fournisseur->payment->dir_output = $rootfordata."/fournisseur/payment"; // For backward compatibility

+            $this->fournisseur->payment->dir_temp = $rootfordata."/fournisseur/payment/temp"; // For backward compatibility

             // To prepare split of module fournisseur into fournisseur + supplier_order + supplier_invoice

             if (!empty($this->fournisseur->enabled) && empty(Conf::$global->MAIN_USE_NEW_SUPPLIERMOD)) {  // By default, if module supplier is on, we set new properties

                 $this->supplier_order = new \stdClass();

                 $this->supplier_order->enabled = 1;

-                $this->supplier_order->multidir_output = array($this->entity => $rootfordata . "/fournisseur/commande");

-                $this->supplier_order->multidir_temp = array($this->entity => $rootfordata . "/fournisseur/commande/temp");

-                $this->supplier_order->dir_output = $rootfordata . "/fournisseur/commande";   // For backward compatibility

-                $this->supplier_order->dir_temp = $rootfordata . "/fournisseur/commande/temp";  // For backward compatibility

+                $this->supplier_order->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");

+                $this->supplier_order->multidir_temp = array($this->entity => $rootfordata."/fournisseur/commande/temp");

+                $this->supplier_order->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility

+                $this->supplier_order->dir_temp = $rootfordata."/fournisseur/commande/temp"; // For backward compatibility

                 $this->supplier_invoice = new \stdClass();

                 $this->supplier_invoice->enabled = 1;

-                $this->supplier_invoice->multidir_output = array($this->entity => $rootfordata . "/fournisseur/facture");

-                $this->supplier_invoice->multidir_temp = array($this->entity => $rootfordata . "/fournisseur/facture/temp");

-                $this->supplier_invoice->dir_output = $rootfordata . "/fournisseur/facture";  // For backward compatibility

-                $this->supplier_invoice->dir_temp = $rootfordata . "/fournisseur/facture/temp";  // For backward compatibility

+                $this->supplier_invoice->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");

+                $this->supplier_invoice->multidir_temp = array($this->entity => $rootfordata."/fournisseur/facture/temp");

+                $this->supplier_invoice->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility

+                $this->supplier_invoice->dir_temp = $rootfordata."/fournisseur/facture/temp"; // For backward compatibility

                 $this->supplierproposal = new \stdClass();

-                $this->supplierproposal->multidir_output = array($this->entity => $rootfordata . "/supplier_proposal");

-                $this->supplierproposal->multidir_temp = array($this->entity => $rootfordata . "/supplier_proposal/temp");

-                $this->supplierproposal->dir_output = $rootfordata . "/supplier_proposal";   // For backward compatibility

-                $this->supplierproposal->dir_temp = $rootfordata . "/supplier_proposal/temp";  // For backward compatibility

+                $this->supplierproposal->multidir_output = array($this->entity => $rootfordata."/supplier_proposal");

+                $this->supplierproposal->multidir_temp = array($this->entity => $rootfordata."/supplier_proposal/temp");

+                $this->supplierproposal->dir_output = $rootfordata."/supplier_proposal"; // For backward compatibility

+                $this->supplierproposal->dir_temp = $rootfordata."/supplier_proposal/temp"; // For backward compatibility

             }

         }

 

         // Module product/service

-        $this->product->multidir_output = array($this->entity => $rootfordata . "/produit");

-        $this->product->multidir_temp = array($this->entity => $rootfordata . "/produit/temp");

-        $this->service->multidir_output = array($this->entity => $rootfordata . "/produit");

-        $this->service->multidir_temp = array($this->entity => $rootfordata . "/produit/temp");

+        $this->product->multidir_output = array($this->entity => $rootfordata."/produit");

+        $this->product->multidir_temp = array($this->entity => $rootfordata."/produit/temp");

+        $this->service->multidir_output = array($this->entity => $rootfordata."/produit");

+        $this->service->multidir_temp = array($this->entity => $rootfordata."/produit/temp");

         // For backward compatibility

-        $this->product->dir_output = $rootfordata . "/produit";

-        $this->product->dir_temp = $rootfordata . "/produit/temp";

-        $this->service->dir_output = $rootfordata . "/produit";

-        $this->service->dir_temp = $rootfordata . "/produit/temp";

+        $this->product->dir_output = $rootfordata."/produit";

+        $this->product->dir_temp = $rootfordata."/produit/temp";

+        $this->service->dir_output = $rootfordata."/produit";

+        $this->service->dir_temp = $rootfordata."/produit/temp";

 

         // Module productbatch

-        $this->productbatch->multidir_output = array($this->entity => $rootfordata . "/produitlot");

-        $this->productbatch->multidir_temp = array($this->entity => $rootfordata . "/produitlot/temp");

+        $this->productbatch->multidir_output = array($this->entity => $rootfordata."/produitlot");

+        $this->productbatch->multidir_temp = array($this->entity => $rootfordata."/produitlot/temp");

 

         // Module contrat

-        $this->contrat->multidir_output = array($this->entity => $rootfordata . "/contract");

-        $this->contrat->multidir_temp = array($this->entity => $rootfordata . "/contract/temp");

+        $this->contrat->multidir_output = array($this->entity => $rootfordata."/contract");

+        $this->contrat->multidir_temp = array($this->entity => $rootfordata."/contract/temp");

         // For backward compatibility

-        $this->contrat->dir_output = $rootfordata . "/contract";

-        $this->contrat->dir_temp = $rootfordata . "/contract/temp";

+        $this->contrat->dir_output = $rootfordata."/contract";

+        $this->contrat->dir_temp = $rootfordata."/contract/temp";

 

         // Module bank

-        $this->bank->dir_output = $rootfordata . "/bank";

-        $this->bank->dir_temp = $rootfordata . "/bank/temp";

+        $this->bank->dir_output = $rootfordata."/bank";

+        $this->bank->dir_temp = $rootfordata."/bank/temp";

 

 

         // Set some default values

@@ -427,7 +427,7 @@ 
         if (empty(Conf::$global->USER_PASSWORD_GENERATED))

             Conf::$global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator

         if (empty(Conf::$global->MAIN_UMASK))

-            Conf::$global->MAIN_UMASK = '0664';         // Default mask

+            Conf::$global->MAIN_UMASK = '0664'; // Default mask

 

 

 

@@ -466,7 +466,7 @@ 
         $this->currency = Conf::$global->MAIN_MONNAIE;

 

         if (empty(Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY))

-            Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;   // Less than 1 minutes to be sure

+            Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure

 

 

 

@@ -474,7 +474,7 @@ 
 

             // conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)

         if (empty(Conf::$global->ACCOUNTING_MODE))

-            Conf::$global->ACCOUNTING_MODE = 'RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'

+            Conf::$global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'

 

 

 

@@ -504,7 +504,7 @@ 
             Conf::$global->MAIN_THEME = Conf::$global->MAIN_FORCETHEME;

         $this->theme = Conf::$global->MAIN_THEME;

         //$this->css  = "/theme/".$this->theme."/style.css.php";

-        $this->css = '?controller=theme/' . $this->theme . '&method=style.css';

+        $this->css = '?controller=theme/'.$this->theme.'&method=style.css';

 

         // conf->email_from = email pour envoi par dolibarr des mails automatiques

         $this->email_from = "robot@example.com";

@@ -524,8 +524,8 @@ 
             Conf::$global->MAIN_EMAIL_ADD_TRACK_ID = 1;

 

         // Format for date (used by default when not found or not searched in lang)

-        $this->format_date_short = "%d/%m/%Y";            // Format of day with PHP/C tags (strftime functions)

-        $this->format_date_short_java = "dd/MM/yyyy";     // Format of day with Java tags

+        $this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)

+        $this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags

         $this->format_hour_short = "%H:%M";

         $this->format_hour_short_duration = "%H:%M";

         $this->format_date_text_short = "%d %b %Y";

@@ -549,9 +549,9 @@ 
 

         // Default pdf option

         if (!isset(Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES))

-            Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES = 1;    // use dash between lines

+            Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines

         if (!isset(Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT))

-            Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1;  // allow html content into free footer text

+            Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1; // allow html content into free footer text

 

 

 

@@ -566,7 +566,7 @@ 
 

         // By default, we propagate contacts

         if (!isset(Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))

-            Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*';  // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)

+            Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*'; // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)

 

 

 

@@ -589,7 +589,7 @@ 
             Conf::$global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.

         if (!empty($this->modules_parts['moduleforexternal'])) {  // Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list

             foreach ($this->modules_parts['moduleforexternal'] as $key => $value)

-                Conf::$global->MAIN_MODULES_FOR_EXTERNAL .= "," . $key;

+                Conf::$global->MAIN_MODULES_FOR_EXTERNAL .= ",".$key;

         }

 

         // Enable select2

@@ -682,7 +682,7 @@ 
 

         // Save inconsistent option

         if (empty(Conf::$global->AGENDA_USE_EVENT_TYPE) && (!isset(Conf::$global->AGENDA_DEFAULT_FILTER_TYPE) || Conf::$global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) {

-            Conf::$global->AGENDA_DEFAULT_FILTER_TYPE = '0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.

+            Conf::$global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.

         }

 

         if (!isset(Conf::$global->MAIN_EXTRAFIELDS_IN_ONE_TD))

@@ -723,7 +723,7 @@ 
                 $dir = dol_buildpath($reldir, 0);

                 $newdir = dol_osencode($dir);

                 if (is_dir($newdir)) {

-                    $file = $newdir . $handler . '.php';

+                    $file = $newdir.$handler.'.php';

                     if (file_exists($file)) {

                         $handler_files[] = $file;

                     }

@@ -731,7 +731,7 @@ 
             }

 

             if (empty($handler_files)) {

-                throw new Exception('Missing log handler file ' . $handler . '.php');

+                throw new Exception('Missing log handler file '.$handler.'.php');

             }

 

             require_once $handler_files[0];

Braces +229 added lines, -151 removed lines

@@ -156,27 +156,32 @@ 
                                 $this->modules_parts[$partname] = array();

                             }

                             $arrValue = json_decode($value, true);

-                            if (is_array($arrValue) && !empty($arrValue))

-                                $value = $arrValue;

-                            else if (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl')))

-                                $value = '/' . $modulename . '/core/' . $partname . '/';

-                            else if (in_array($partname, array('models', 'theme')))

-                                $value = '/' . $modulename . '/';

-                            else if (in_array($partname, array('sms')))

-                                $value = '/' . $modulename . '/';

-                            else if ($value == 1)

-                                $value = '/' . $modulename . '/core/modules/' . $partname . '/'; // ex: partname = societe

+                            if (is_array($arrValue) && !empty($arrValue)) {
+                                                            $value = $arrValue;
+                            } else if (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) {
+                                                            $value = '/' . $modulename . '/core/' . $partname . '/';
+                            } else if (in_array($partname, array('models', 'theme'))) {
+                                                            $value = '/' . $modulename . '/';
+                            } else if (in_array($partname, array('sms'))) {
+                                                            $value = '/' . $modulename . '/';
+                            } else if ($value == 1) {
+                                                            $value = '/' . $modulename . '/core/modules/' . $partname . '/';
+                            }
+                            // ex: partname = societe

                             $this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array

                         }

                         // If this is a module constant (must be at end)

                         elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg)) {

                             $modulename = strtolower($reg[1]);

-                            if ($modulename == 'propale')

-                                $modulename = 'propal';

-                            if ($modulename == 'supplierproposal')

-                                $modulename = 'supplier_proposal';

-                            if (!isset($this->$modulename) || !is_object($this->$modulename))

-                                $this->$modulename = new \stdClass();

+                            if ($modulename == 'propale') {
+                                                            $modulename = 'propal';
+                            }
+                            if ($modulename == 'supplierproposal') {
+                                                            $modulename = 'supplier_proposal';
+                            }
+                            if (!isset($this->$modulename) || !is_object($this->$modulename)) {
+                                                            $this->$modulename = new \stdClass();
+                            }
                             $this->$modulename->enabled = true;

                             $this->modules[] = $modulename;              // Add this module in list of enabled modules

                         }

@@ -224,46 +229,60 @@ 
         }

 

         // Clean some variables

-        if (empty(Conf::$global->MAIN_MENU_STANDARD))

-            Conf::$global->MAIN_MENU_STANDARD = "eldy_menu.php";

-        if (empty(Conf::$global->MAIN_MENUFRONT_STANDARD))

-            Conf::$global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";

-        if (empty(Conf::$global->MAIN_MENU_SMARTPHONE))

-            Conf::$global->MAIN_MENU_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones

-        if (empty(Conf::$global->MAIN_MENUFRONT_SMARTPHONE))

-            Conf::$global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones

+        if (empty(Conf::$global->MAIN_MENU_STANDARD)) {
+                    Conf::$global->MAIN_MENU_STANDARD = "eldy_menu.php";
+        }
+        if (empty(Conf::$global->MAIN_MENUFRONT_STANDARD)) {
+                    Conf::$global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";
+        }
+        if (empty(Conf::$global->MAIN_MENU_SMARTPHONE)) {
+                    Conf::$global->MAIN_MENU_SMARTPHONE = "eldy_menu.php";
+        }
+        // Use eldy by default because smartphone does not work on all phones

+        if (empty(Conf::$global->MAIN_MENUFRONT_SMARTPHONE)) {
+                    Conf::$global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php";
+        }
+        // Use eldy by default because smartphone does not work on all phones

 

 

 

 

             // Clean var use vat for company

-        if (!isset(Conf::$global->FACTURE_TVAOPTION))

-            Conf::$global->FACTURE_TVAOPTION = 1;

-        else if (!empty(Conf::$global->FACTURE_TVAOPTION) && !is_numeric(Conf::$global->FACTURE_TVAOPTION)) {

+        if (!isset(Conf::$global->FACTURE_TVAOPTION)) {
+                    Conf::$global->FACTURE_TVAOPTION = 1;
+        } else if (!empty(Conf::$global->FACTURE_TVAOPTION) && !is_numeric(Conf::$global->FACTURE_TVAOPTION)) {

             // Old value of option, we clean to use new value (0 or 1)

-            if (Conf::$global->FACTURE_TVAOPTION != "franchise")

-                Conf::$global->FACTURE_TVAOPTION = 1;

-            else

-                Conf::$global->FACTURE_TVAOPTION = 0;

+            if (Conf::$global->FACTURE_TVAOPTION != "franchise") {
+                            Conf::$global->FACTURE_TVAOPTION = 1;
+            } else {
+                            Conf::$global->FACTURE_TVAOPTION = 0;
+            }
         }

 

         // Variable globales LDAP

-        if (empty(Conf::$global->LDAP_FIELD_FULLNAME))

-            Conf::$global->LDAP_FIELD_FULLNAME = '';

-        if (!isset(Conf::$global->LDAP_KEY_USERS))

-            Conf::$global->LDAP_KEY_USERS = Conf::$global->LDAP_FIELD_FULLNAME;

-        if (!isset(Conf::$global->LDAP_KEY_GROUPS))

-            Conf::$global->LDAP_KEY_GROUPS = Conf::$global->LDAP_FIELD_FULLNAME;

-        if (!isset(Conf::$global->LDAP_KEY_CONTACTS))

-            Conf::$global->LDAP_KEY_CONTACTS = Conf::$global->LDAP_FIELD_FULLNAME;

-        if (!isset(Conf::$global->LDAP_KEY_MEMBERS))

-            Conf::$global->LDAP_KEY_MEMBERS = Conf::$global->LDAP_FIELD_FULLNAME;

-        if (!isset(Conf::$global->LDAP_KEY_MEMBERS_TYPES))

-            Conf::$global->LDAP_KEY_MEMBERS_TYPES = Conf::$global->LDAP_FIELD_FULLNAME;

+        if (empty(Conf::$global->LDAP_FIELD_FULLNAME)) {
+                    Conf::$global->LDAP_FIELD_FULLNAME = '';
+        }
+        if (!isset(Conf::$global->LDAP_KEY_USERS)) {
+                    Conf::$global->LDAP_KEY_USERS = Conf::$global->LDAP_FIELD_FULLNAME;
+        }
+        if (!isset(Conf::$global->LDAP_KEY_GROUPS)) {
+                    Conf::$global->LDAP_KEY_GROUPS = Conf::$global->LDAP_FIELD_FULLNAME;
+        }
+        if (!isset(Conf::$global->LDAP_KEY_CONTACTS)) {
+                    Conf::$global->LDAP_KEY_CONTACTS = Conf::$global->LDAP_FIELD_FULLNAME;
+        }
+        if (!isset(Conf::$global->LDAP_KEY_MEMBERS)) {
+                    Conf::$global->LDAP_KEY_MEMBERS = Conf::$global->LDAP_FIELD_FULLNAME;
+        }
+        if (!isset(Conf::$global->LDAP_KEY_MEMBERS_TYPES)) {
+                    Conf::$global->LDAP_KEY_MEMBERS_TYPES = Conf::$global->LDAP_FIELD_FULLNAME;
+        }
 

         // Load translation object with current language

-        if (empty(Conf::$global->MAIN_LANG_DEFAULT))

-            Conf::$global->MAIN_LANG_DEFAULT = "en_US";

+        if (empty(Conf::$global->MAIN_LANG_DEFAULT)) {
+                    Conf::$global->MAIN_LANG_DEFAULT = "en_US";
+        }
 

         $rootfordata = DOL_DATA_ROOT;

         $rootforuser = DOL_DATA_ROOT;

@@ -413,21 +432,29 @@ 
         Conf::$global->MAIN_MAIL_USE_MULTI_PART = 1;

 

         // societe

-        if (empty(Conf::$global->SOCIETE_CODECLIENT_ADDON))

-            Conf::$global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";

-        if (empty(Conf::$global->SOCIETE_CODECOMPTA_ADDON))

-            Conf::$global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";

-

-        if (empty(Conf::$global->CHEQUERECEIPTS_ADDON))

-            Conf::$global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';

-        if (empty($conf->global->TICKETSUP_ADDON))

-            Conf::$global->TICKETSUP_ADDON = 'mod_ticket_simple';

+        if (empty(Conf::$global->SOCIETE_CODECLIENT_ADDON)) {
+                    Conf::$global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";
+        }
+        if (empty(Conf::$global->SOCIETE_CODECOMPTA_ADDON)) {
+                    Conf::$global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";
+        }
+

+        if (empty(Conf::$global->CHEQUERECEIPTS_ADDON)) {
+                    Conf::$global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
+        }
+        if (empty($conf->global->TICKETSUP_ADDON)) {
+                    Conf::$global->TICKETSUP_ADDON = 'mod_ticket_simple';
+        }
 

         // Security

-        if (empty(Conf::$global->USER_PASSWORD_GENERATED))

-            Conf::$global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator

-        if (empty(Conf::$global->MAIN_UMASK))

-            Conf::$global->MAIN_UMASK = '0664';         // Default mask

+        if (empty(Conf::$global->USER_PASSWORD_GENERATED)) {
+                    Conf::$global->USER_PASSWORD_GENERATED = 'standard';
+        }
+        // Default password generator

+        if (empty(Conf::$global->MAIN_UMASK)) {
+                    Conf::$global->MAIN_UMASK = '0664';
+        }
+        // Default mask

 

 

 

@@ -435,8 +462,9 @@ 
 

             // conf->use_javascript_ajax

         $this->use_javascript_ajax = 1;

-        if (isset(Conf::$global->MAIN_DISABLE_JAVASCRIPT))

-            $this->use_javascript_ajax = !Conf::$global->MAIN_DISABLE_JAVASCRIPT;

+        if (isset(Conf::$global->MAIN_DISABLE_JAVASCRIPT)) {
+                    $this->use_javascript_ajax = !Conf::$global->MAIN_DISABLE_JAVASCRIPT;
+        }
         // If no javascript_ajax, Ajax features are disabled.

         if (empty($this->use_javascript_ajax)) {

             unset(Conf::$global->PRODUIT_USE_SEARCH_TO_SELECT);

@@ -452,29 +480,34 @@ 
             Conf::$global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 0;

             Conf::$global->STOCK_CALCULATE_ON_SUPPLIER_BILL = 0;

             Conf::$global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;

-            if (empty($this->reception->enabled))

-                Conf::$global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;

-            else {

+            if (empty($this->reception->enabled)) {
+                            Conf::$global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;
+            } else {

                 Conf::$global->STOCK_CALCULATE_ON_RECEPTION = 1;

                 Conf::$global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 0;

             }

         }

 

         // conf->currency

-        if (empty(Conf::$global->MAIN_MONNAIE))

-            Conf::$global->MAIN_MONNAIE = 'EUR';

+        if (empty(Conf::$global->MAIN_MONNAIE)) {
+                    Conf::$global->MAIN_MONNAIE = 'EUR';
+        }
         $this->currency = Conf::$global->MAIN_MONNAIE;

 

-        if (empty(Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY))

-            Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;   // Less than 1 minutes to be sure

+        if (empty(Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) {
+                    Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;
+        }
+        // Less than 1 minutes to be sure

 

 

 

 

 

             // conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)

-        if (empty(Conf::$global->ACCOUNTING_MODE))

-            Conf::$global->ACCOUNTING_MODE = 'RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'

+        if (empty(Conf::$global->ACCOUNTING_MODE)) {
+                    Conf::$global->ACCOUNTING_MODE = 'RECETTES-DEPENSES';
+        }
+        // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'

 

 

 

@@ -484,44 +517,53 @@ 
         Conf::$global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;

 

         // MAIN_HTML_TITLE

-        if (!isset(Conf::$global->MAIN_HTML_TITLE))

-            Conf::$global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';

+        if (!isset(Conf::$global->MAIN_HTML_TITLE)) {
+                    Conf::$global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
+        }
 

         // conf->liste_limit = constante de taille maximale des listes

-        if (empty(Conf::$global->MAIN_SIZE_LISTE_LIMIT))

-            Conf::$global->MAIN_SIZE_LISTE_LIMIT = 25;

+        if (empty(Conf::$global->MAIN_SIZE_LISTE_LIMIT)) {
+                    Conf::$global->MAIN_SIZE_LISTE_LIMIT = 25;
+        }
         $this->liste_limit = Conf::$global->MAIN_SIZE_LISTE_LIMIT;

 

         // conf->product->limit_size = constante de taille maximale des select de produit

-        if (!isset(Conf::$global->PRODUIT_LIMIT_SIZE))

-            Conf::$global->PRODUIT_LIMIT_SIZE = 1000;

+        if (!isset(Conf::$global->PRODUIT_LIMIT_SIZE)) {
+                    Conf::$global->PRODUIT_LIMIT_SIZE = 1000;
+        }
         $this->product->limit_size = Conf::$global->PRODUIT_LIMIT_SIZE;

 

         // conf->theme et $this->css

-        if (empty(Conf::$global->MAIN_THEME))

-            Conf::$global->MAIN_THEME = "eldy";

-        if (!empty(Conf::$global->MAIN_FORCETHEME))

-            Conf::$global->MAIN_THEME = Conf::$global->MAIN_FORCETHEME;

+        if (empty(Conf::$global->MAIN_THEME)) {
+                    Conf::$global->MAIN_THEME = "eldy";
+        }
+        if (!empty(Conf::$global->MAIN_FORCETHEME)) {
+                    Conf::$global->MAIN_THEME = Conf::$global->MAIN_FORCETHEME;
+        }
         $this->theme = Conf::$global->MAIN_THEME;

         //$this->css  = "/theme/".$this->theme."/style.css.php";

         $this->css = '?controller=theme/' . $this->theme . '&method=style.css';

 

         // conf->email_from = email pour envoi par dolibarr des mails automatiques

         $this->email_from = "robot@example.com";

-        if (!empty(Conf::$global->MAIN_MAIL_EMAIL_FROM))

-            $this->email_from = Conf::$global->MAIN_MAIL_EMAIL_FROM;

+        if (!empty(Conf::$global->MAIN_MAIL_EMAIL_FROM)) {
+                    $this->email_from = Conf::$global->MAIN_MAIL_EMAIL_FROM;
+        }
 

         // conf->notification->email_from = email pour envoi par Dolibarr des notifications

         $this->notification->email_from = $this->email_from;

-        if (!empty(Conf::$global->NOTIFICATION_EMAIL_FROM))

-            $this->notification->email_from = Conf::$global->NOTIFICATION_EMAIL_FROM;

+        if (!empty(Conf::$global->NOTIFICATION_EMAIL_FROM)) {
+                    $this->notification->email_from = Conf::$global->NOTIFICATION_EMAIL_FROM;
+        }
 

         // conf->mailing->email_from = email pour envoi par Dolibarr des mailings

         $this->mailing->email_from = $this->email_from;

-        if (!empty(Conf::$global->MAILING_EMAIL_FROM))

-            $this->mailing->email_from = Conf::$global->MAILING_EMAIL_FROM;

-        if (!isset(Conf::$global->MAIN_EMAIL_ADD_TRACK_ID))

-            Conf::$global->MAIN_EMAIL_ADD_TRACK_ID = 1;

+        if (!empty(Conf::$global->MAILING_EMAIL_FROM)) {
+                    $this->mailing->email_from = Conf::$global->MAILING_EMAIL_FROM;
+        }
+        if (!isset(Conf::$global->MAIN_EMAIL_ADD_TRACK_ID)) {
+                    Conf::$global->MAIN_EMAIL_ADD_TRACK_ID = 1;
+        }
 

         // Format for date (used by default when not found or not searched in lang)

         $this->format_date_short = "%d/%m/%Y";            // Format of day with PHP/C tags (strftime functions)

@@ -536,81 +578,105 @@ 
         $this->format_date_hour_text = "%d %B %Y %H:%M";

 

         // Duration of workday

-        if (!isset(Conf::$global->MAIN_DURATION_OF_WORKDAY))

-            Conf::$global->MAIN_DURATION_OF_WORKDAY = 86400;

+        if (!isset(Conf::$global->MAIN_DURATION_OF_WORKDAY)) {
+                    Conf::$global->MAIN_DURATION_OF_WORKDAY = 86400;
+        }
 

         // Limites decimales si non definie (peuvent etre egale a 0)

-        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_UNIT))

-            Conf::$global->MAIN_MAX_DECIMALS_UNIT = 5;

-        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_TOT))

-            Conf::$global->MAIN_MAX_DECIMALS_TOT = 2;

-        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_SHOWN))

-            Conf::$global->MAIN_MAX_DECIMALS_SHOWN = 8;

+        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_UNIT)) {
+                    Conf::$global->MAIN_MAX_DECIMALS_UNIT = 5;
+        }
+        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_TOT)) {
+                    Conf::$global->MAIN_MAX_DECIMALS_TOT = 2;
+        }
+        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_SHOWN)) {
+                    Conf::$global->MAIN_MAX_DECIMALS_SHOWN = 8;
+        }
 

         // Default pdf option

-        if (!isset(Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES))

-            Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES = 1;    // use dash between lines

-        if (!isset(Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT))

-            Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1;  // allow html content into free footer text

+        if (!isset(Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES)) {
+                    Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES = 1;
+        }
+        // use dash between lines

+        if (!isset(Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+                    Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1;
+        }
+        // allow html content into free footer text

 

 

 

 

 

             // Set default value to MAIN_SHOW_LOGO

-        if (!isset(Conf::$global->MAIN_SHOW_LOGO))

-            Conf::$global->MAIN_SHOW_LOGO = 1;

+        if (!isset(Conf::$global->MAIN_SHOW_LOGO)) {
+                    Conf::$global->MAIN_SHOW_LOGO = 1;
+        }
 

         // Default max file size for upload

         $this->maxfilesize = (empty(Conf::$global->MAIN_UPLOAD_DOC) ? 0 : (int) Conf::$global->MAIN_UPLOAD_DOC * 1024);

 

         // By default, we propagate contacts

-        if (!isset(Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))

-            Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*';  // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)

+        if (!isset(Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) {
+                    Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*';
+        }
+        // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)

 

 

 

 

 

             // By default, we do not use the zip town table but the table of third parties

-        if (!isset(Conf::$global->MAIN_USE_ZIPTOWN_DICTIONNARY))

-            Conf::$global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;

+        if (!isset(Conf::$global->MAIN_USE_ZIPTOWN_DICTIONNARY)) {
+                    Conf::$global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;
+        }
 

         // By default, we open card if one found

-        if (!isset(Conf::$global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE))

-            Conf::$global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;

+        if (!isset(Conf::$global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) {
+                    Conf::$global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;
+        }
 

         // By default, we show state code in combo list

-        if (!isset(Conf::$global->MAIN_SHOW_STATE_CODE))

-            Conf::$global->MAIN_SHOW_STATE_CODE = 1;

+        if (!isset(Conf::$global->MAIN_SHOW_STATE_CODE)) {
+                    Conf::$global->MAIN_SHOW_STATE_CODE = 1;
+        }
 

         // Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"

-        if (!isset(Conf::$global->MAIN_MODULES_FOR_EXTERNAL))

-            Conf::$global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.

+        if (!isset(Conf::$global->MAIN_MODULES_FOR_EXTERNAL)) {
+                    Conf::$global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog';
+        }
+        // '' means 'all'. Note that contact is added here as it should be a module later.

         if (!empty($this->modules_parts['moduleforexternal'])) {  // Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list

-            foreach ($this->modules_parts['moduleforexternal'] as $key => $value)

-                Conf::$global->MAIN_MODULES_FOR_EXTERNAL .= "," . $key;

+            foreach ($this->modules_parts['moduleforexternal'] as $key => $value) {
+                            Conf::$global->MAIN_MODULES_FOR_EXTERNAL .= "," . $key;
+            }
         }

 

         // Enable select2

-        if (empty(Conf::$global->MAIN_USE_JQUERY_MULTISELECT) || Conf::$global->MAIN_USE_JQUERY_MULTISELECT == '1')

-            Conf::$global->MAIN_USE_JQUERY_MULTISELECT = 'select2';

+        if (empty(Conf::$global->MAIN_USE_JQUERY_MULTISELECT) || Conf::$global->MAIN_USE_JQUERY_MULTISELECT == '1') {
+                    Conf::$global->MAIN_USE_JQUERY_MULTISELECT = 'select2';
+        }
 

         // Timeouts

-        if (empty(Conf::$global->MAIN_USE_CONNECT_TIMEOUT))

-            Conf::$global->MAIN_USE_CONNECT_TIMEOUT = 10;

-        if (empty(Conf::$global->MAIN_USE_RESPONSE_TIMEOUT))

-            Conf::$global->MAIN_USE_RESPONSE_TIMEOUT = 30;

+        if (empty(Conf::$global->MAIN_USE_CONNECT_TIMEOUT)) {
+                    Conf::$global->MAIN_USE_CONNECT_TIMEOUT = 10;
+        }
+        if (empty(Conf::$global->MAIN_USE_RESPONSE_TIMEOUT)) {
+                    Conf::$global->MAIN_USE_RESPONSE_TIMEOUT = 30;
+        }
 

         // Set default variable to calculate VAT as if option tax_mode was 0 (standard)

-        if (empty(Conf::$global->TAX_MODE_SELL_PRODUCT))

-            Conf::$global->TAX_MODE_SELL_PRODUCT = 'invoice';

-        if (empty(Conf::$global->TAX_MODE_BUY_PRODUCT))

-            Conf::$global->TAX_MODE_BUY_PRODUCT = 'invoice';

-        if (empty(Conf::$global->TAX_MODE_SELL_SERVICE))

-            Conf::$global->TAX_MODE_SELL_SERVICE = 'payment';

-        if (empty(Conf::$global->TAX_MODE_BUY_SERVICE))

-            Conf::$global->TAX_MODE_BUY_SERVICE = 'payment';

+        if (empty(Conf::$global->TAX_MODE_SELL_PRODUCT)) {
+                    Conf::$global->TAX_MODE_SELL_PRODUCT = 'invoice';
+        }
+        if (empty(Conf::$global->TAX_MODE_BUY_PRODUCT)) {
+                    Conf::$global->TAX_MODE_BUY_PRODUCT = 'invoice';
+        }
+        if (empty(Conf::$global->TAX_MODE_SELL_SERVICE)) {
+                    Conf::$global->TAX_MODE_SELL_SERVICE = 'payment';
+        }
+        if (empty(Conf::$global->TAX_MODE_BUY_SERVICE)) {
+                    Conf::$global->TAX_MODE_BUY_SERVICE = 'payment';
+        }
 

         // Delay before warnings

         // Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx

@@ -618,8 +684,9 @@ 
             $this->adherent->subscription = new \stdClass();

             $this->adherent->subscription->warning_delay = (isset(Conf::$global->MAIN_DELAY_MEMBERS) ? Conf::$global->MAIN_DELAY_MEMBERS : 0) * 24 * 60 * 60;

         }

-        if (isset($this->agenda))

-            $this->agenda->warning_delay = (isset(Conf::$global->MAIN_DELAY_ACTIONS_TODO) ? Conf::$global->MAIN_DELAY_ACTIONS_TODO : 7) * 24 * 60 * 60;

+        if (isset($this->agenda)) {
+                    $this->agenda->warning_delay = (isset(Conf::$global->MAIN_DELAY_ACTIONS_TODO) ? Conf::$global->MAIN_DELAY_ACTIONS_TODO : 7) * 24 * 60 * 60;
+        }
         if (isset($this->projet)) {

             $this->projet->warning_delay = (isset(Conf::$global->MAIN_DELAY_PROJECT_TO_CLOSE) ? Conf::$global->MAIN_DELAY_PROJECT_TO_CLOSE : 7) * 24 * 60 * 60;

             $this->projet->task = new StdClass();

@@ -669,44 +736,55 @@ 
         }

 

         // For modules that want to disable top or left menu

-        if (!empty(Conf::$global->MAIN_HIDE_TOP_MENU))

-            $this->dol_hide_topmenu = Conf::$global->MAIN_HIDE_TOP_MENU;

-        if (!empty(Conf::$global->MAIN_HIDE_LEFT_MENU))

-            $this->dol_hide_leftmenu = Conf::$global->MAIN_HIDE_LEFT_MENU;

+        if (!empty(Conf::$global->MAIN_HIDE_TOP_MENU)) {
+                    $this->dol_hide_topmenu = Conf::$global->MAIN_HIDE_TOP_MENU;
+        }
+        if (!empty(Conf::$global->MAIN_HIDE_LEFT_MENU)) {
+                    $this->dol_hide_leftmenu = Conf::$global->MAIN_HIDE_LEFT_MENU;
+        }
 

-        if (empty(Conf::$global->MAIN_SIZE_SHORTLIST_LIMIT))

-            Conf::$global->MAIN_SIZE_SHORTLIST_LIMIT = 3;

+        if (empty(Conf::$global->MAIN_SIZE_SHORTLIST_LIMIT)) {
+                    Conf::$global->MAIN_SIZE_SHORTLIST_LIMIT = 3;
+        }
 

-        if (!isset(Conf::$global->THEME_HIDE_BORDER_ON_INPUT))

-            Conf::$global->THEME_HIDE_BORDER_ON_INPUT = 0;

+        if (!isset(Conf::$global->THEME_HIDE_BORDER_ON_INPUT)) {
+                    Conf::$global->THEME_HIDE_BORDER_ON_INPUT = 0;
+        }
 

         // Save inconsistent option

         if (empty(Conf::$global->AGENDA_USE_EVENT_TYPE) && (!isset(Conf::$global->AGENDA_DEFAULT_FILTER_TYPE) || Conf::$global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) {

             Conf::$global->AGENDA_DEFAULT_FILTER_TYPE = '0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.

         }

 

-        if (!isset(Conf::$global->MAIN_EXTRAFIELDS_IN_ONE_TD))

-            Conf::$global->MAIN_EXTRAFIELDS_IN_ONE_TD = 1;

+        if (!isset(Conf::$global->MAIN_EXTRAFIELDS_IN_ONE_TD)) {
+                    Conf::$global->MAIN_EXTRAFIELDS_IN_ONE_TD = 1;
+        }
 

         Conf::$global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';

         Conf::$global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';

 

         // For backward compatibility

-        if (isset($this->product))

-            $this->produit = $this->product;

-        if (isset($this->facture))

-            $this->invoice = $this->facture;

-        if (isset($this->commande))

-            $this->order = $this->commande;

-        if (isset($this->contrat))

-            $this->contract = $this->contrat;

-        if (isset($this->categorie))

-            $this->category = $this->categorie;

+        if (isset($this->product)) {
+                    $this->produit = $this->product;
+        }
+        if (isset($this->facture)) {
+                    $this->invoice = $this->facture;
+        }
+        if (isset($this->commande)) {
+                    $this->order = $this->commande;
+        }
+        if (isset($this->contrat)) {
+                    $this->contract = $this->contrat;
+        }
+        if (isset($this->categorie)) {
+                    $this->category = $this->categorie;
+        }
 

         // Object $mc

         if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {

-            if (is_object($mc))

-                $mc->setValues($this);

+            if (is_object($mc)) {
+                            $mc->setValues($this);
+            }
         }

 

         // We init log handlers

Base/Menu.php

Indentation +3 added lines, -3 removed lines

@@ -33,11 +33,11 @@ 
     var $liste;

 

     /**

-	 *	Constructor

+     *	Constructor

      */

     function __construct()

     {

-      	$this->liste = array();

+            $this->liste = array();

     }

 

     /**

@@ -69,7 +69,7 @@ 
      */

     function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')

     {

-    	$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);

+        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);

     }

 

     /**

Spacing +10 added lines, -10 removed lines

@@ -67,9 +67,9 @@ 
      * @param	string	$prefix		Prefix to title (image or picto)

      * @return	void

      */

-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')

+    function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')

     {

-    	$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);

+    	$this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);

     }

 

     /**

@@ -90,12 +90,12 @@ 
      * @param	string	$prefix		Prefix to title (image or picto)

      * @return	void

      */

-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')

+    function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')

     {

-        $array_start = array_slice($this->liste,0,($idafter+1));

-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));

-        $array_end   = array_slice($this->liste,($idafter+1));

-        $this->liste=array_merge($array_start,$array_new,$array_end);

+        $array_start = array_slice($this->liste, 0, ($idafter + 1));

+        $array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));

+        $array_end   = array_slice($this->liste, ($idafter + 1));

+        $this->liste = array_merge($array_start, $array_new, $array_end);

     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -119,10 +119,10 @@ 
      */

     function getNbOfVisibleMenuEntries()

     {

-        $nb=0;

-        foreach($this->liste as $val)

+        $nb = 0;

+        foreach ($this->liste as $val)

         {

-            if (! empty($val['enabled'])) $nb++;

+            if (!empty($val['enabled'])) $nb++;

         }

         return $nb;

     }

Braces +3 added lines, -1 removed lines

@@ -122,7 +122,9 @@
         $nb=0;

         foreach($this->liste as $val)

         {

-            if (! empty($val['enabled'])) $nb++;

+            if (! empty($val['enabled'])) {
+                $nb++;
+            }
         }

         return $nb;

     }

Base/CommonObject.php

Indentation +7078 added lines, -7078 removed lines

@@ -21,7382 +21,7382 @@
 

 abstract class CommonObject

 {

-	/**

+    /**

      * @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 string 		Error string

+     * @see             errors

+     */

+    public $error;

 

-	/**

-	 * @var int

-	 * @see getFullAddress(), state

-	 */

-	public $state_id;

+    /**

+     * @var string[]	Array of error strings

+     */

+    public $errors=array();

 

-	/**

-	 * @var string

-	 * @see getFullAddress(), state

-	 */

-    public $state_code;

+    /**

+     * @var string ID to identify managed object

+     */

+    public $element;

 

     /**

-	 * @var string

-	 * @see getFullAddress(), region

-	 */

-	public $region;

+     * @var string Name of table without prefix where object is stored

+     */

+    public $table_element;

 

-	/**

-	 * @var string

-	 * @see getFullAddress(), region

-	 */

-    public $region_code;

+    /**

+     * @var int    Name of subtable line

+     */

+    public $table_element_line='';

 

-	/**

-	 * @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 = ".$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;

-		}

-		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 .= DolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder);

+    /**

+     * @var string		Key value used to track if data is coming from import wizard

+     */

+    public $import_key;

 

-        return DolUtils::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,', ',$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);

-		if ($coords)

-		{

-			if (! empty($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($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress

-				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)

-		{

-            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $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($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($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 = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

-			else if ($this->element == 'societe') $idtype = $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 = ".$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($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($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-				if (! empty($user->admin) && empty($user->entity) && $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($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($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-				if (! empty($user->admin) && empty($user->entity) && $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 = ".$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 .= DolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder);

 

-		if ($shipping_method_id<0) $shipping_method_id='NULL';

-		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');

+        return DolUtils::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)

+    /**

+     * 	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'];

+        }

+

+        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,', ',$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);

+        if ($coords)

+        {

+            if (! empty($conf->use_javascript_ajax))

             {

-                // Call trigger

-                $this->context=array('shippingmethodupdate'=>1);

-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

-                if ($result < 0) $error++;

-                // End call trigger

+                $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 ($error)

+

+        if (! in_array($this->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress

+                && empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)

         {

-            $this->db->rollback();

-            return -1;

-        } else {

-            $this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;

-            $this->db->commit();

-            return 1;

+            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {

+                $out.=($outdone?' - ':'').$this->region.' - '.$this->state;

+            }

+            else {

+                $out.=($outdone?' - ':'').$this->state;

+            }

+            $outdone++;

         }

-	}

-

-

-	/**

-	 *  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 (! 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++;

+        }

 

-        $error = 0;

+        $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($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>';

 

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

+        $out.='<!-- END Part to show address block -->';

+

+        return $out;

+    }

 

-		if ($fk_account<0) $fk_account='NULL';

-		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');

+    /**

+     * 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;

 

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET fk_account = ".$fk_account;

-		$sql.= " WHERE rowid=".$this->id;

+        if (empty($this->last_main_doc))

+        {

+            return '';		// No way to known which document name to use

+        }

 

-        $resql = $this->db->query($sql);

-        if (! $resql)

+        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)

         {

-            dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());

-            $this->error = $this->db->lasterror();

-            $error++;

+            $this->error = $ecmfile->error;

+            $this->errors = $ecmfile->errors;

+            return -1;

         }

-        else

+

+        if (empty($ecmfile->id))

         {

-            if (!$notrigger)

+            // Add entry into index

+            if ($initsharekey)

             {

-                // Call trigger

-                $this->context=array('bankaccountupdate'=>1);

-                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

-                if ($result < 0) $error++;

-                // End call trigger

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

         }

-        if ($error)

+        elseif (empty($ecmfile->share))

         {

-            $this->db->rollback();

-            return -1;

+            // 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

         {

-            $this->fk_account = ($fk_account=='NULL')?null:$fk_account;

-            $this->db->commit();

-            return 1;

+            $linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');

         }

-    }

 

+        // Here $ecmfile->share is defined

+        return $linktoreturn;

+    }

 

-	// 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)

-	{

+    /**

+     *  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

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

-				}

+        global $user,$langs;

 

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

-	}

+        dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");

 

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

+        // 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;

+        }

 

-		// Get rang of line

-		$rang = $this->getRangOfLine($rowid);

+        $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;

+            }

+        }

 

-		// Update position of line

-		$this->updateLineUp($rowid, $rang);

-	}

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

+        }

 

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

-		}

-	}

+        $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;

+                }

+            }

+        }

 

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

-		}

-	}

+        if(!$already_added) {

 

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

-			}

-		}

-	}

+            $this->db->begin();

 

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

-		}

-	}

+            // 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.= ")";

+

+            $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

-	/**

-	 *  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='')

-	{

+    /**

+     *    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

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

-		}

-	}

+        $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;

+    }

 

     // 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)

-	{

+    /**

+     *      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

-		return $this->update_note($note,'_public');

-	}

+        // 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;

+        }

+    }

 

     // 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)

-	{

+    /**

+     *    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 $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($conf->global->$MODULE)) {

-				$modsactivated = explode(',', $conf->global->$MODULE);

-				foreach ($modsactivated as $mod) {

-					if ($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($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$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];

-						//

-					}

-				}

+        global $user;

 

-				$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++;

-			}

+        $this->db->begin();

 

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

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

+        $sql.= " WHERE rowid =".$rowid;

 

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

-				}

-			}

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

+            }

 

-			if (! $error)

-			{

-				return 1;

-			}

-			else

-			{

-				return -1;

-			}

-		}

-		else

-		{

-			dol_print_error($this->db,'Bad request in update_price');

-			return -1;

-		}

-	}

+            $this->db->commit();

+            return 1;

+        }

+        else

+        {

+            $this->error=$this->db->lasterror();

+            $this->db->rollback();

+            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)

-	{

+    /**

+     *    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

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

-		 }*/

+        $temp = array();

+        $typeContact = $this->liste_type_contact($source,'',0,0,$code);

 

-		// 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++;

-			}

+        foreach($typeContact as $key => $value)

+        {

+            array_push($temp,$key);

+        }

+        $listId = implode(",", $temp);

 

-			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 ($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

-			}

+        $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 (! $error)

-			{

-				$this->db->commit();

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

+        }

+    }

 

-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)

-				{

-					$this->statut = $status;

-					$this->status = $status;

-				}

+    // 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);

+

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

+                }

+

+                $i++;

+            }

 

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

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

+        }

+    }

+

+    // 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)

             {

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

+                $obj = $this->db->fetch_object($resql);

 

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

+                $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;

+        }

+    }

 

-			$weightUnit=0;

-			$volumeUnit=0;

-			if (! empty($weight_units)) $weightUnit = $weight_units;

-			if (! empty($volume_units)) $volumeUnit = $volume_units;

+    /**

+     *      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;

 

-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''

-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''

+        $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;

+        }

 

-			//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 = "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;

+    }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

-	/**

-	 *    Return incoterms informations

-	 *    TODO Use a cache for label get

-	 *

-	 *    @return	string	incoterms info

-	 */

-	function display_incoterms()

-	{

+    /**

+     *		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

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

+        if (empty($contactid)) $contactid=$this->contactid;

 

-				$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 ExtraFields($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($conf->modules_parts['tpl'],array('/core/tpl'));

-		foreach($dirtpls as $reldir)

-		{

-			$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');

-			if (empty($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($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 ExtraFields($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($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>';

-			}

+        if (empty($contactid)) return 0;

 

-			// VAT

-			print '<td class="linecolvat" align="right" width="80">'.$langs->trans('VAT').'</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;

+    }

 

-			// Price HT

-			print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</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;

 

-			// Multicurrency

-			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';

+        if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))

+            return 0;

 

-			if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';

+        require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

 

-			// Qty

-			print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</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($conf->global->PRODUCT_USE_UNITS)

-			{

-				print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';

-			}

+        if ($idtofetch) {

+            $thirdparty = new Societe($this->db);

+            $result = $thirdparty->fetch($idtofetch);

+            $this->thirdparty = $thirdparty;

 

-			// Reduction short

-			print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';

+            // Use first price level if level not defined for third party

+            if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->thirdparty->price_level)) {

+                $this->thirdparty->price_level = 1;

+            }

 

-			if ($this->situation_cycle_ref) {

-				print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';

-			}

+            return $result;

+        } else

+            return -1;

+    }

 

-			if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))

-			{

-				if (!empty($user->rights->margins->creer))

-				{

-					if ($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($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)

-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';

-				if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)

-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</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;

+        }

 

-			// Total HT

-			print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';

+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';

 

-			// Multicurrency

-			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';

+        $query = $this->db->query($sql);

 

-			if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';

+        if (!$this->db->num_rows($query)) {

+            return 0;

+        }

 

-			print '<td class="linecoledit"></td>';  // No width to allow autodim

+        $result = $this->db->fetch_object($query);

 

-			print '<td class="linecoldelete" width="10"></td>';

+        return $this->fetch($result->rowid);

+    }

 

-			print '<td class="linecolmove" width="10"></td>';

+    // 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;

 

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

+        dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);

 

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

+        $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 = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

+            else if ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;

+            else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);

+        }

 

-				// Define output language and label

-				if (! empty($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($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;

-				}

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

+    }

 

-				$text.= ' - '.(! empty($line->label)?$line->label:$label);

-				$description.=(! empty($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 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';

 

-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');

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

 

-			// Output template part (modules that overwrite templates must declare this into descriptor)

-			// Use global variables + $dateSelector + $seller and $buyer

-			$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));

-			foreach($dirtpls as $reldir)

-			{

-				$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');

-				if (empty($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($conf->modules_parts['tpl'],array('/core/tpl'));

-			foreach($dirtpls as $reldir)

-			{

-				$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');

-				if (empty($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($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';

-		print '<td align="right">'.$langs->trans('Qty').'</td>';

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

-				}

+        $project = new Project($this->db);

+        $result = $project->fetch($this->fk_project);

 

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

-			}

-		}

+        $this->projet = $project;	// deprecated

+        $this->project = $project;

+        return $result;

+    }

 

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

-		}

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

 

-        // 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($this->fk_product)) return 0;

 

-		$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 ($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($conf->modules_parts['tpl'],array('/core/tpl'));

-		foreach($dirtpls as $reldir)

-		{

-			$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');

-			if (empty($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($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$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 = ".$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($conf->global->$varfortemplatedir))

-				{

-					$dirtoscan=$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;

-						}

-					}

-				}

+    /**

+     *	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($srctemplatepath))

-				{

-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';

-					return -1;

-				}

-			}

+        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 ($obj->type == 'odt' && ! empty($srctemplatepath))

-			{

-				if (! dol_is_file($srctemplatepath))

-				{

-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';

-					return -1;

-				}

-			}

+        $error=0;

 

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

+        $this->db->begin();

 

-			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.

+        // 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 ($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 = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok

-							if ($useonlinesignature) $setsharekey=true;

-							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;

-						}

-						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey=true;

-						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey=true;

-						if ($this->element == 'bank_account' && ! empty($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);

-							}

-						}

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";

 

-						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 = $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');

-							}

-						}

+        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");

 

-						/*$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 ($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;

+        }

 

-				// Success in building document. We build meta file.

-				dol_meta_create($this);

+        $sql.= " WHERE ".$id_field." = ".$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 $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($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;

-

-		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname

-	}

-

-

-	/* For triggers */

+        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 (! $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;

+        }

+    }

 

     // 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)

-	{

+    /**

+     *      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 $langs,$conf;

+        global $conf, $user;

 

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

-	}

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

 

-	/* Functions for extrafields */

+        // 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($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($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

+                if (! empty($user->admin) && empty($user->entity) && $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>";

 

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

-            //}

+        $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];

 

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

-							}

+        $sql = "SELECT MIN(te.".$fieldid.")";

+        $sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";

+        if ($this->element == 'user' && ! empty($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($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

+                if (! empty($user->admin) && empty($user->entity) && $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];

 

-							//var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);

-						}

-					}

-				}

+        return 1;

+    }

 

-				$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($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 ExtraFields($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;

-			   	}

-			}

+    /**

+     *      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;

+    }

 

-			$this->db->begin();

 

-			$table_element = $this->table_element;

-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+    /**

+     *	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_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 = '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;

+        }

 

-			$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)."::setProject", LOG_DEBUG);

+        if ($this->db->query($sql))

+        {

+            $this->fk_project = $projectid;

+            return 1;

+        }

+        else

+        {

+            dol_print_error($this->db);

+            return -1;

+        }

+    }

 

-			dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);

-			$resql = $this->db->query($sql);

-			if (! $resql)

-			{

-				$this->error=$this->db->lasterror();

-				$error++;

-			}

+    /**

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

 

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

-			}

+            $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('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 ($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;

+        }

+    }

 

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

+    /**

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

 

-		$objectid = $this->id;

+            $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;

 

-		if ($computed)

-		{

-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

-			else return '';

-		}

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

+        }

+    }

 

-		// 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($conf->fckeditor->enabled) && $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($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($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))

-			{

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

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

-			}

+    /**

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

 

-			$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($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))

-			{

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

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

-			}

+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+            $sql .= ' SET '.$fieldname.' = '.$rate;

+            $sql .= ' WHERE rowid='.$this->id;

 

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

-				}

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

+                        }

+

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

+                        }

+                    }

+                }

+

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

+        }

+    }

 

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

-				if (is_array($fields_label))

-				{

-					$keyList .=', ';

-					$keyList .= implode(', ', $fields_label);

-				}

+    /**

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

 

-				$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 = '.$conf->entity;

-				}

-				$sql.=$sqlwhere;

-				//print $sql;

+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+            $sql .= ' SET '.$fieldname.' = '.$id;

+            $sql .= ' WHERE rowid='.$this->id;

 

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

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

+        }

+    }

 

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

-								}

+    /**

+     *	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;

+

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

+            return -1;

+        }

+

+        $this->db->begin();

+

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

+        $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;

+        }

+    }

+

+

+    /**

+     *  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;

+

+        $error = 0;

+

+        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.')');

+

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+        $sql.= " SET fk_account = ".$fk_account;

+        $sql.= " WHERE rowid=".$this->id;

+

+        $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;

+        }

+    }

+

+

+    // 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++;

+                }

+

+                // 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($conf->global->$MODULE)) {

+                $modsactivated = explode(',', $conf->global->$MODULE);

+                foreach ($modsactivated as $mod) {

+                    if ($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($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$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 ($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($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 ExtraFields($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($conf->modules_parts['tpl'],array('/core/tpl'));

+        foreach($dirtpls as $reldir)

+        {

+            $tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');

+            if (empty($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($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 ExtraFields($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($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($conf->multicurrency->enabled) && $this->multicurrency_code != $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($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($conf->margin->enabled) && empty($user->societe_id))

+            {

+                if (!empty($user->rights->margins->creer))

+                {

+                    if ($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($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)

+                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';

+                if (! empty($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($conf->multicurrency->enabled) && $this->multicurrency_code != $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($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($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($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($conf->modules_parts['tpl'],array('/core/tpl'));

+            foreach($dirtpls as $reldir)

+            {

+                $tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');

+                if (empty($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($conf->modules_parts['tpl'],array('/core/tpl'));

+            foreach($dirtpls as $reldir)

+            {

+                $tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');

+                if (empty($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($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';

+        print '<td align="right">'.$langs->trans('Qty').'</td>';

+        if($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 ($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($conf->modules_parts['tpl'],array('/core/tpl'));

+        foreach($dirtpls as $reldir)

+        {

+            $tpl = dol_buildpath($reldir.'/originproductline.tpl.php');

+            if (empty($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($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$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($conf->global->$varfortemplatedir))

+                {

+                    $dirtoscan=$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 = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok

+                            if ($useonlinesignature) $setsharekey=true;

+                            if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;

+                        }

+                        if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey=true;

+                        if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey=true;

+                        if ($this->element == 'bank_account' && ! empty($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 = $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 $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($conf->global->$keyforfieldname)) return $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 ExtraFields();

+            //}

+

+            // 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($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 ExtraFields($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($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 ExtraFields($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($conf->fckeditor->enabled) && $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($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($conf->use_javascript_ajax) && ! empty($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($conf->use_javascript_ajax) && ! empty($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 = '.$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 = ' . $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 ($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($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,$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 = '.$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 = '.$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($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)

+                    {

+                        if (! empty($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($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($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();

 							}

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

+				    	}

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

+								});

+					    	});

 						}

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

-							}

+						setListDependencies();

+				    });

+				</script>'."\n";

+                $out .= '<!-- /showOptionalsInput --> '."\n";

+            }

+        }

+        return $out;

+    }

 

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

-					}

-				}

+    /**

+     * Returns the rights used for this class

+     * @return stdClass

+     */

+    public function getRights()

+    {

+        global $user;

 

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

-				if (is_array($fields_label)) {

-					$keyList .= ', ';

-					$keyList .= implode(', ', $fields_label);

-				}

+        $element = $this->element;

+        if ($element == 'facturerec') $element='facture';

 

-				$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 = ' . $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) . ' ';

-								}

-							}

+        return $user->rights->{$element};

+    }

 

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

+    /**

+     * 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 (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

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

-								}

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

+            }

+        }

 

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

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

-								}

+        return true;

+    }

 

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

-						}

+    /**

+     * 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;

 

-						$i ++;

-					}

-					$this->db->free($resql);

+        $buyPrice = 0;

 

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

-				}

-			}

+        if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $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($conf->global->MARGIN_TYPE) && $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($conf->global->MARGIN_TYPE) && $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($conf->global->MARGIN_TYPE) && in_array($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;

+    }

 

-			$out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';

+    // 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;

 

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

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

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

 

-			if(! empty($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);

-						});

+        $sortfield='position_name';

+        $sortorder='asc';

 

-						$(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,$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 = '.$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

+        $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($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($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]=$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;

 

-				$obj = $this->db->fetch_object($resql);

+        $error = 0;

 

-				// Several field into label (eq table:code|libelle:rowid)

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

+        $now=dol_now();

 

-				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 = '.$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'

+        $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.

 

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

+        $keys=array();

+        $values = array();

+        foreach ($fieldvalues as $k => $v) {

+            $keys[$k] = $k;

+            $value = $this->fields[$k];

+            $values[$k] = $this->quote($v, $value);

+        }

 

-				$enabled = 1;

-				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))

-				{

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

-				}

+        // 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]='';

 

-				$perms = 1;

-				if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key]))

-				{

-					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);

-				}

+            //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 (($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 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';

+        }

 

-				// Load language if required

-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

+        if ($error) return -1;

 

-				$colspan='3';

-				if (is_array($params) && count($params)>0) {

-					if (array_key_exists('colspan',$params)) {

-						$colspan=$params['colspan'];

-					}

-				}

+        $this->db->begin();

 

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

+        {

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

+            }

+        }

 

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

-						}

-					}

+        if (! $error)

+        {

+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);

+        }

 

-					// add html5 elements

-					$domData  = ' data-element="extrafield"';

-					$domData .= ' data-targetelement="'.$this->element.'"';

-					$domData .= ' data-targetid="'.$this->id.'"';

+        // Create extrafields

+        if (! $error)

+        {

+            $result=$this->insertExtraFields();

+            if ($result < 0) $error++;

+        }

 

-					$html_id = !empty($this->id) ? 'extrarow-'.$this->element.'_'.$key.'_'.$this->id : '';

+        // Triggers

+        if (! $error && ! $notrigger)

+        {

+            // Call triggers

+            $result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);

+            if ($result < 0) { $error++; }

+            // End call triggers

+        }

 

-					$out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.'" '.$domData.' >';

+        // Commit or rollback

+        if ($error) {

+            $this->db->rollback();

+            return -1;

+        } else {

+            $this->db->commit();

+            return $this->id;

+        }

+    }

 

-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)

-					{

-						if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan='0'; }

-					}

 

-					if ($action == 'selectlines') { $colspan++; }

+    /**

+     * 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;

 

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

-								});

-					    	});

-						}

+        $sql = 'SELECT '.$this->getFieldList();

+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

 

-						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($conf->global->ForceBuyingPriceIfNull) && $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($conf->global->MARGIN_TYPE) && $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($conf->global->MARGIN_TYPE) && $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($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($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($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;

-	}

+        $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;

+        }

+    }

 

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

-		 }*/

+    /**

+     * 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;

 

-		completeFileArrayWithDatabaseInfo($filearray, $relativedir);

+        $error = 0;

 

-		if (count($filearray))

-		{

-			if ($sortfield && $sortorder)

-			{

-				$filearray=dol_sort_array($filearray, $sortfield, $sortorder);

-			}

+        $now=dol_now();

 

-			foreach($filearray as $key => $val)

-			{

-				$photo='';

-				$file = $val['name'];

+        $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 (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory

+        $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]);

+        }

 

-				//if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)

-				if (image_format_supported($file) >= 0)

-				{

-					$nbphoto++;

-					$photo = $file;

-					$viewfilename = $file;

+        // 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']);

+			}*/

+        }

 

-					if ($size == 1 || $size == 'small') {   // Format vignette

+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;

 

-						// Find name of thumb file

-						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));

-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';

+        $this->db->begin();

+        if (! $error)

+        {

+            $res = $this->db->query($sql);

+            if ($res===false)

+            {

+                $error++;

+                $this->errors[] = $this->db->lasterror();

+            }

+        }

 

-						// Get filesize of original file

-						$imgarray=dol_getImageSize($dir.$photo);

+        // Update extrafield

+        if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)

+        {

+            $result=$this->insertExtraFields();

+            if ($result < 0)

+            {

+                $error++;

+            }

+        }

 

-						if ($nbbyrow > 0)

-						{

-							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';

+        // 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

+        }

 

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

+        // Commit or rollback

+        if ($error) {

+            $this->db->rollback();

+            return -1;

+        } else {

+            $this->db->commit();

+            return $this->id;

+        }

+    }

 

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

 

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

-						}

+        $this->db->begin();

 

-						// 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 ($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 (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 (! $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 ($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>';

-							}

-						}

-					}

+        if (! $error && ! empty($this->isextrafieldmanaged))

+        {

+            $sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element."_extrafields";

+            $sql.= " WHERE fk_object=" . $this->id;

 

-					// On continue ou on arrete de boucler ?

-					if ($nbmax && $nbphoto >= $nbmax) break;

-				}

-			}

+            $resql = $this->db->query($sql);

+            if (! $resql)

+            {

+                $this->errors[] = $this->db->lasterror();

+                $error++;

+            }

+        }

 

-			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]=$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)

+        {

+            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;

 

-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);

-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;

-		}

+            $res = $this->db->query($sql);

+            if($res===false) {

+                $error++;

+                $this->errors[] = $this->db->lasterror();

+            }

+        }

 

-		return $queryarray;

-	}

+        // Commit or rollback

+        if ($error) {

+            $this->db->rollback();

+            return -1;

+        } else {

+            $this->db->commit();

+            return 1;

+        }

+    }

 

-	/**

-	 * Function to load data from a SQL pointer into properties of current object $this

-	 *

-	 * @param   stdClass    $obj    Contain data of object from database

+    /**

+     * Initialise object with example values

+     * Id must be 0 if object instance is a specimen

+     *

      * @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)

+     */

+    public function initAsSpecimenCommon()

     {

-		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 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 ($error) return -1;

-

-		$this->db->begin();

+        $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($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 +1524 added lines, -1524 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,29 +393,29 @@ 
 	 *  @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 = ".$conf->entity;

+		if ($ref || $ref_ext) $sql .= " AND entity = ".$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;

 		}

@@ -429,7 +429,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)) : '');

 	}

 

 	/**

@@ -441,18 +441,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 .= DolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder);

@@ -468,24 +468,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);

@@ -503,108 +503,108 @@ 
 	{

 		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;

-		$coords = $this->getFullAddress(1,', ',$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);

+		$outdone = 0;

+		$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);

 		if ($coords)

 		{

-			if (! empty($conf->use_javascript_ajax))

+			if (!empty($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($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress

+		if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress

 				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)

 		{

             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $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;">';

-		if (! empty($conf->socialnetworks->enabled))

+		$out .= '<div style="clear: both;">';

+		if (!empty($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;

 	}

@@ -617,17 +617,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)

 		{

@@ -675,26 +675,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

@@ -712,10 +712,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");

@@ -724,43 +724,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;

 		}

@@ -768,35 +768,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();

@@ -811,14 +811,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;

 				}

@@ -834,15 +834,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;

 			}

 		}

@@ -859,23 +859,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;

 		}

 	}

@@ -888,7 +888,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;

@@ -897,14 +897,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; }

 			}

 

@@ -913,7 +913,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

@@ -927,22 +927,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))

@@ -951,7 +951,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			return -1;

 		}

 	}

@@ -966,54 +966,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++;

@@ -1023,7 +1023,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			dol_print_error($this->db);

 			return -1;

 		}

@@ -1039,16 +1039,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);

@@ -1059,7 +1059,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->error();

+			$this->error = $this->db->error();

 			dol_print_error($this->db);

 			return -1;

 		}

@@ -1076,44 +1076,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;

 		}

@@ -1130,53 +1130,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;

 		}

 

@@ -1190,16 +1190,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;

 	}

@@ -1211,7 +1211,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;

@@ -1219,7 +1219,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)

@@ -1282,7 +1282,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')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

@@ -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 = ".$conf->entity;

+			$sql .= " AND entity = ".$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";

-		if ($this->element == 'user' && ! empty($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 .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";

+		if ($this->element == 'user' && !empty($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($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {

-					$sql.= " AND te.entity IS NOT NULL"; // Show all users

+			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

+				if (!empty($user->admin) && empty($user->entity) && $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).")";

+					$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";

-		if ($this->element == 'user' && ! empty($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 .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";

+		if ($this->element == 'user' && !empty($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($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {

-					$sql.= " AND te.entity IS NOT NULL"; // Show all users

+			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

+				if (!empty($user->admin) && empty($user->entity) && $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).")";

+					$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,8 +2669,8 @@ 
 		elseif ($this->element == 'supplier_proposal')

 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";

 

-		if (! empty($MODULE)) {

-			if (! empty($conf->global->$MODULE)) {

+		if (!empty($MODULE)) {

+			if (!empty($conf->global->$MODULE)) {

 				$modsactivated = explode(',', $conf->global->$MODULE);

 				foreach ($modsactivated as $mod) {

 					if ($conf->$mod->enabled)

@@ -2681,44 +2681,44 @@ 
 

 		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($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;

-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';

+		$forcedroundingmode = $roundingadjust;

+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;

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

@@ -2732,7 +2732,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;

 

@@ -2743,54 +2743,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;

@@ -2802,11 +2802,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();

 

@@ -2825,17 +2825,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))

 			{

@@ -2852,16 +2852,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;

 			}

@@ -2872,7 +2872,7 @@ 
 		}

 		else

 		{

-			dol_print_error($this->db,'Bad request in update_price');

+			dol_print_error($this->db, 'Bad request in update_price');

 			return -1;

 		}

 	}

@@ -2886,30 +2886,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))

@@ -2919,7 +2919,7 @@ 
 	  	}

 	  	else

 	  	{

-	  		$this->error=$this->db->lasterror();

+	  		$this->error = $this->db->lasterror();

 	  		$this->db->rollback();

 	  		return 0;

 	  	}

@@ -2947,33 +2947,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))

 		 {

@@ -2983,25 +2983,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;

 

@@ -3018,36 +3018,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];

@@ -3055,31 +3055,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';

 					}

 

@@ -3092,16 +3092,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,21 +3347,21 @@ 
 	 *  @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($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.

+		if (!empty($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)."'";

+		$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)

@@ -3369,7 +3369,7 @@ 
 			$obj = $this->db->fetch_object($resql);

 			if ($obj)

 			{

-				$this->canvas   = $obj->canvas;

+				$this->canvas = $obj->canvas;

 				return 1;

 			}

 			else return 0;

@@ -3391,7 +3391,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)

 		{

@@ -3407,14 +3407,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;

@@ -3422,24 +3422,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");

@@ -3447,24 +3447,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;

@@ -3476,18 +3476,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');

@@ -3501,24 +3501,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'));

@@ -3552,17 +3552,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

@@ -3575,27 +3575,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 {

@@ -3609,18 +3609,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

 			}

 		}

 

@@ -3637,17 +3637,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;

 		}

@@ -3682,7 +3682,7 @@ 
 			}

 		}

 

-		$out .= (($res->code && $this->location_incoterms)?' - ':'').$this->location_incoterms;

+		$out .= (($res->code && $this->location_incoterms) ? ' - ' : '').$this->location_incoterms;

 

 		return $out;

 	}

@@ -3728,11 +3728,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;

@@ -3773,24 +3773,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 ExtraFields($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($conf->modules_parts['tpl'],array('/core/tpl'));

-		foreach($dirtpls as $reldir)

+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));

+		foreach ($dirtpls as $reldir)

 		{

 			$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');

 			if (empty($conf->file->strict_mode)) {

-				$res=@include $tpl;

+				$res = @include $tpl;

 			} else {

-				$res=include $tpl; // for debug

+				$res = include $tpl; // for debug

 			}

 			if ($res) break;

 		}

@@ -3814,24 +3814,24 @@ 
 	 *	@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;

-		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;

+		$usemargins = 0;

+		if (!empty($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 ExtraFields($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))

 		{

@@ -3841,7 +3841,7 @@ 
 			print '<tr class="liste_titre nodrag nodrop">';

 

 			// Adds a line numbering column

-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';

+			if (!empty($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>';

@@ -3865,7 +3865,7 @@ 
 			// Qty

 			print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';

 

-			if($conf->global->PRODUCT_USE_UNITS)

+			if ($conf->global->PRODUCT_USE_UNITS)

 			{

 				print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';

 			}

@@ -3874,10 +3874,10 @@ 
 			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($conf->margin->enabled) && empty($user->societe_id))

+			if ($usemargins && !empty($conf->margin->enabled) && empty($user->societe_id))

 			{

 				if (!empty($user->rights->margins->creer))

 				{

@@ -3887,9 +3887,9 @@ 
 						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';

 				}

 

-				if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)

+				if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)

 					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';

-				if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)

+				if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)

 					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';

 			}

 

@@ -3901,13 +3901,13 @@ 
 

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

@@ -3920,7 +3920,7 @@ 
 		}

 

 		$var = true;

-		$i	 = 0;

+		$i = 0;

 

 		print "<tbody>\n";

 		foreach ($this->lines as $line)

@@ -3933,18 +3933,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++;

@@ -3968,23 +3968,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)

@@ -3997,14 +3997,14 @@ 
 

 				$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($conf->global->MAIN_MULTILANGS))

+				if (!empty($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;

 					}

 

@@ -4012,38 +4012,38 @@ 
 					$prod->fetch($line->fk_product);

 

 					$outputlangs = $langs;

-					$newlang='';

-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');

-					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang=$this->thirdparty->default_lang;		// For language to language of customer

-					if (! empty($newlang))

+					$newlang = '';

+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');

+					if (!empty($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 = 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);

-				$description.=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($line->description));	// Description is what to show on popup. We shown nothing if already into desc.

+				$text .= ' - '.(!empty($line->label) ? $line->label : $label);

+				$description .= (!empty($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($conf->modules_parts['tpl'],array('/core/tpl'));

-			foreach($dirtpls as $reldir)

+			$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));

+			foreach ($dirtpls as $reldir)

 			{

 				$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');

 				if (empty($conf->file->strict_mode)) {

-					$res=@include $tpl;

+					$res = @include $tpl;

 				} else {

-					$res=include $tpl; // for debug

+					$res = include $tpl; // for debug

 				}

 				if ($res) break;

 			}

@@ -4052,21 +4052,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($conf->modules_parts['tpl'],array('/core/tpl'));

-			foreach($dirtpls as $reldir)

+			$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));

+			foreach ($dirtpls as $reldir)

 			{

 				$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');

 				if (empty($conf->file->strict_mode)) {

-					$res=@include $tpl;

+					$res = @include $tpl;

 				} else {

-					$res=include $tpl; // for debug

+					$res = include $tpl; // for debug

 				}

 				if ($res) break;

 			}

@@ -4086,7 +4086,7 @@ 
 	 *	@param	string		$restrictlist		''=All lines, 'services'=Restrict to services only

 	 *  @return	void

 	 */

-	function printOriginLinesList($restrictlist='')

+	function printOriginLinesList($restrictlist = '')

 	{

 		global $langs, $hookmanager, $conf;

 

@@ -4097,26 +4097,26 @@ 
 		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';

 		if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';

 		print '<td align="right">'.$langs->trans('Qty').'</td>';

-		if($conf->global->PRODUCT_USE_UNITS)

+		if ($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;

+		$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

@@ -4140,103 +4140,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

@@ -4247,7 +4247,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);

@@ -4256,19 +4256,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($conf->modules_parts['tpl'],array('/core/tpl'));

-		foreach($dirtpls as $reldir)

+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));

+		foreach ($dirtpls as $reldir)

 		{

 			$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');

 			if (empty($conf->file->strict_mode)) {

-				$res=@include $tpl;

+				$res = @include $tpl;

 			} else {

-				$res=include $tpl; // for debug

+				$res = include $tpl; // for debug

 			}

 			if ($res) break;

 		}

@@ -4286,26 +4286,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))

@@ -4315,7 +4315,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return  0;

 		}

@@ -4330,7 +4330,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;

@@ -4338,22 +4338,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();

@@ -4372,8 +4372,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];

 			}

@@ -4393,43 +4393,43 @@ 
 	 * @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('/');

-		if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);

-		foreach($dirmodels as $reldir)

+		$file = ''; $classname = ''; $filefound = 0;

+		$dirmodels = array('/');

+		if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);

+		foreach ($dirmodels as $reldir)

 		{

-			foreach(array('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;

 				}

 			}

@@ -4439,7 +4439,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;

 

@@ -4448,32 +4448,32 @@ 
 			// 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($conf->global->$varfortemplatedir))

+				$varfortemplatedir = $obj->scandir;

+				if ($varfortemplatedir && !empty($conf->global->$varfortemplatedir))

 				{

-					$dirtoscan=$conf->global->$varfortemplatedir;

+					$dirtoscan = $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;

 						}

 					}

@@ -4481,27 +4481,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

@@ -4512,41 +4512,41 @@ 
 

 			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 = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok

-							if ($useonlinesignature) $setsharekey=true;

-							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;

+							$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok

+							if ($useonlinesignature) $setsharekey = true;

+							if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;

 						}

-						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey=true;

-						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey=true;

-						if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;

+						if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey = true;

+						if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey = true;

+						if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;

 

 						if ($setsharekey)

 						{

@@ -4559,11 +4559,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)

 							{

@@ -4575,11 +4575,11 @@ 
 							$ecmfile->entity = $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;

 

@@ -4596,14 +4596,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);

 						}

 					}

 				}

@@ -4619,15 +4619,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;

 		}

 	}

@@ -4643,9 +4643,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)

@@ -4675,7 +4675,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;

 

@@ -4684,16 +4684,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($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;

 

@@ -4718,21 +4718,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;

@@ -4751,19 +4751,19 @@ 
 	 *  @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)) $rowid=$this->id;

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

+		$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)

@@ -4779,7 +4779,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

 		{

@@ -4798,18 +4798,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);

@@ -4817,17 +4817,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]);

@@ -4863,10 +4863,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;

 		}

@@ -4887,36 +4887,36 @@ 
 	 *  @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($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used

+		if (!empty($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 ExtraFields($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];

@@ -4924,13 +4924,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;

 			   		}

 			   	}

@@ -4941,25 +4941,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;

 						}

@@ -4973,12 +4973,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'...

@@ -4989,7 +4989,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

 									{

@@ -5000,7 +5000,7 @@ 
 			   					}

 			   					else

 			   					{

-			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

+			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept

 			   					}

 			   				}

 			   			}

@@ -5017,13 +5017,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]);

@@ -5032,18 +5032,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;

 								}

@@ -5067,46 +5067,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

 			}

@@ -5135,25 +5135,25 @@ 
 	 *  @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($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used

+		if (!empty($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 ExtraFields($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];

@@ -5166,25 +5166,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;

 					}

@@ -5201,13 +5201,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]);

@@ -5215,8 +5215,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;

 			}

@@ -5225,24 +5225,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;

 			}

@@ -5269,71 +5269,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'];

 		}

@@ -5347,16 +5347,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

 			{

@@ -5375,12 +5375,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';

@@ -5388,237 +5388,237 @@ 
 			// 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($conf->fckeditor->enabled) && $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($conf->fckeditor->enabled) && $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($conf->currency);

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($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($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))

+			if (!empty($conf->use_javascript_ajax) && !empty($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($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))

+			if (!empty($conf->use_javascript_ajax) && !empty($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 = '.$conf->entity;

+					$sqlwhere .= ' AND entity = '.$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)

@@ -5626,10 +5626,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++;

@@ -5640,23 +5640,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')

@@ -5671,24 +5671,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';

 					}

 				}

 

@@ -5699,50 +5699,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 = ' . $conf->entity;

+					$sqlwhere .= ' AND entity = '.$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);

 

@@ -5751,8 +5751,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]};

@@ -5760,18 +5760,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);

@@ -5783,67 +5783,67 @@ 
 								$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 ($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($conf->use_javascript_ajax)) {

-				$out.= '

+			if (!empty($conf->use_javascript_ajax)) {

+				$out .= '

 					<script type="text/javascript">

 					$(document).ready(function() {

 						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {

@@ -5858,7 +5858,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)';

@@ -5880,14 +5880,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;

@@ -5898,28 +5898,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 '';

 

@@ -5943,18 +5943,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

 			{

@@ -5975,90 +5975,90 @@ 
 		}

 

 		// 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')

 		{

-			$value=price($value,0,$langs,0,0,-1,$conf->currency);

+			$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);

 		}

 		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 = '.$conf->entity;

@@ -6067,38 +6067,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]};

 					}

 				}

 			}

@@ -6106,18 +6106,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')

@@ -6132,7 +6132,7 @@ 
 

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

 				$selectkey = $InfoFieldList[2];

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

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

 			}

 

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

@@ -6141,75 +6141,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 = '.$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

@@ -6218,15 +6218,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')

 		{

@@ -6234,7 +6234,7 @@ 
 		}

 

 		//print $type.'-'.$size;

-		$out=$value;

+		$out = $value;

 

 		return $out;

 	}

@@ -6251,11 +6251,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 = '';

 

@@ -6266,10 +6266,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]))

@@ -6283,25 +6283,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))

 						{

@@ -6312,7 +6312,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;

@@ -6324,11 +6324,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'];

 						}

 					}

 

@@ -6341,43 +6341,43 @@ 
 

 					$out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.'" '.$domData.' >';

 

-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)

+					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)

 					{

-						if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan='0'; }

+						if (!empty($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')))

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

@@ -6388,14 +6388,14 @@ 
 

 					$out .= '</td>';

 

-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';

+					if (!empty($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($conf->use_javascript_ajax)) {

+			if (!empty($conf->use_javascript_ajax)) {

 				$out .= '

 				<script type="text/javascript">

 				    jQuery(document).ready(function() {

@@ -6441,7 +6441,7 @@ 
 		global $user;

 

 		$element = $this->element;

-		if ($element == 'facturerec') $element='facture';

+		if ($element == 'facturerec') $element = 'facture';

 

 		return $user->rights->{$element};

 	}

@@ -6458,15 +6458,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;

 			}

@@ -6500,7 +6500,7 @@ 
 		else

 		{

 			// Get cost price for margin calculation

-			if (! empty($fk_product))

+			if (!empty($fk_product))

 			{

 				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice')

 				{

@@ -6537,7 +6537,7 @@ 
 					}

 				}

 

-				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1','pmp','costprice')))

+				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice')))

 				{

 					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';

 					$productFournisseur = new ProductFournisseur($this->db);

@@ -6574,18 +6574,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')

 		{

@@ -6599,28 +6599,28 @@ 
 		}

 

 		// For backward compatibility

-		if ($modulepart == 'product' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))

+		if ($modulepart == 'product' && !empty($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($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs

 		 {

@@ -6634,12 +6634,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

@@ -6654,36 +6654,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)

 						{

@@ -6691,81 +6691,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>';

 							}

 						}

 					}

@@ -6775,18 +6775,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>';

 				}

 			}

 		}

@@ -6805,9 +6805,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;

@@ -6821,9 +6821,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;

@@ -6837,7 +6837,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;

 	}

 

@@ -6849,9 +6849,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;

@@ -6865,7 +6865,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;

@@ -6881,9 +6881,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;

@@ -6897,9 +6897,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;

@@ -6915,13 +6915,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;

 				}

@@ -6930,10 +6930,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});

@@ -6941,19 +6941,19 @@ 
 					$queryarray[$field] = null;

 				}

 			}

-			else if($this->isInt($info))

+			else if ($this->isInt($info))

 			{

-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;

+				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $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

 			{

@@ -6961,7 +6961,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;

@@ -6977,35 +6977,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

 			{

@@ -7014,7 +7014,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;

 	}

 

 	/**

@@ -7056,14 +7056,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;

@@ -7072,58 +7072,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

 		}

@@ -7152,13 +7152,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)

@@ -7195,14 +7195,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;

@@ -7212,10 +7212,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));

 			/*

@@ -7226,13 +7226,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();

@@ -7240,9 +7240,9 @@ 
 		}

 

 		// Update extrafield

-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)

+		if (!$error && empty($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++;

@@ -7250,10 +7250,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

 		}

@@ -7276,68 +7276,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();

 			}

@@ -7378,9 +7378,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 +1380 added lines, -847 removed lines

@@ -401,23 +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 = ".$conf->entity;

+		if ($ref || $ref_ext) {
+		    $sql.= " AND entity = ".$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;

 	}

@@ -446,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 .= DolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder);

@@ -545,14 +558,15 @@ 
 		{

             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $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++;

 		}

@@ -593,13 +607,21 @@ 
 		$out.='<div style="clear: both;">';

 		if (! empty($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>';

@@ -659,10 +681,10 @@ 
 					$this->errors = $ecmfile->errors;

 				}

 				*/

-			}

-			else return '';

-		}

-		elseif (empty($ecmfile->share))

+			} else {
+			    return '';
+			}
+		} elseif (empty($ecmfile->share))

 		{

 			// Add entry into index

 			if ($initsharekey)

@@ -670,8 +692,9 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

 				$ecmfile->share = getRandomPassword(true);

 				$ecmfile->update($user);

-			}

-			else return '';

+			} else {
+			    return '';
+			}
 		}

 

 		// Define $urlwithroot

@@ -685,14 +708,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:'');

 		}

@@ -740,8 +767,7 @@ 
 		if (is_numeric($type_contact))

 		{

 			$id_type_contact=$type_contact;

-		}

-		else

+		} else

 		{

 			// We look for id type_contact

 			$sql = "SELECT tc.rowid";

@@ -754,7 +780,9 @@ 
 			if ($resql)

 			{

 				$obj = $this->db->fetch_object($resql);

-				if ($obj) $id_type_contact=$obj->rowid;

+				if ($obj) {
+				    $id_type_contact=$obj->rowid;
+				}
 			}

 		}

 

@@ -806,8 +834,7 @@ 
 

 				$this->db->commit();

 				return 1;

-			}

-			else

+			} else

 			{

 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')

 				{

@@ -815,15 +842,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

@@ -865,15 +893,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;

@@ -910,8 +941,7 @@ 
 

 			$this->db->commit();

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

@@ -941,15 +971,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;

@@ -974,22 +1004,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);

@@ -1010,8 +1056,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;

 				}

@@ -1020,8 +1065,7 @@ 
 			}

 

 			return $tab;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			dol_print_error($this->db);

@@ -1056,8 +1100,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);

@@ -1081,16 +1124,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;

@@ -1105,13 +1159,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);

@@ -1150,19 +1206,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);

@@ -1173,8 +1239,7 @@ 
 				$result[$i]=$obj->fk_socpeople;

 				$i++;

 			}

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->error();

 			return null;

@@ -1193,9 +1258,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);

@@ -1216,14 +1285,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);

@@ -1236,8 +1307,9 @@ 
 			}

 

 			return $result;

-		} else

-			return -1;

+		} else {
+					return -1;
+		}
 	}

 

 

@@ -1283,18 +1355,24 @@ 
 		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 = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

-			else if ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;

-			else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);

+			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		} else if ($this->element == 'societe') {
+			    $idtype = $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 +1385,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 +1406,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 +1433,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 +1469,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 +1569,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 +1625,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 +1677,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($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($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

 				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {

@@ -1606,9 +1749,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 +1775,44 @@ 
 		if ($this->element == 'user' && ! empty($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($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

 				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {

@@ -1652,9 +1825,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 +1865,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 +1893,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 +1914,7 @@ 
 		{

 			$this->fk_project = $projectid;

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -1748,8 +1934,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 +1949,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 +1989,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 +2094,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 +2121,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 +2136,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 +2165,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 +2176,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 +2198,9 @@ 
 	{

         global $user;

 

-        if (empty($userused)) $userused=$user;

+        if (empty($userused)) {
+            $userused=$user;
+        }
 

         $error = 0;

 

@@ -2016,7 +2211,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 +2230,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 +2260,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 +2309,7 @@ 
 		{

 			$this->modelpdf=$modelpdf;

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return 0;

@@ -2129,7 +2329,9 @@ 
 	{

         global $user;

 

-        if (empty($userused)) $userused=$user;

+        if (empty($userused)) {
+            $userused=$user;
+        }
 

         $error = 0;

 

@@ -2139,7 +2341,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 +2356,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 +2373,7 @@ 
         {

             $this->db->rollback();

             return -1;

-        }

-        else

+        } else

         {

             $this->fk_account = ($fk_account=='NULL')?null:$fk_account;

             $this->db->commit();

@@ -2208,8 +2412,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 +2425,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 +2437,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 +2471,7 @@ 
 						$this->updateRangOfLine($row, ($key+1));

 					}

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2354,7 +2564,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 +2607,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 +2622,7 @@ 
 				{

 					dol_print_error($this->db);

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2429,7 +2642,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 +2657,7 @@ 
 				{

 					dol_print_error($this->db);

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2514,8 +2728,7 @@ 
 				if (! empty($row[0]))

 				{

 					return $row[0];

-				}

-				else

+				} else

 				{

 					return $this->getRangOfLine($fk_parent_line);

 				}

@@ -2562,8 +2775,7 @@ 
 		{

 			$this->ref_ext = $ref_ext;

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->error();

 			return -1;

@@ -2597,7 +2809,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 +2821,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,36 +2871,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($conf->global->$MODULE)) {

 				$modsactivated = explode(',', $conf->global->$MODULE);

 				foreach ($modsactivated as $mod) {

-					if ($conf->$mod->enabled)

-						return 1; // update was disabled by specific setup

+					if ($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($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;

-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';

+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
+		    $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		} elseif ($forcedroundingmode == 'auto') {
+		    $forcedroundingmode='0';
+		}
 

 		$error=0;

 

@@ -2708,15 +2932,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

 

@@ -2746,9 +2977,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)

@@ -2756,7 +2989,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];

 						//

@@ -2772,16 +3007,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)

@@ -2790,7 +3033,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;

@@ -2831,11 +3076,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))

 			{

@@ -2864,13 +3119,11 @@ 
 			if (! $error)

 			{

 				return 1;

-			}

-			else

+			} else

 			{

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db,'Bad request in update_price');

 			return -1;

@@ -2893,10 +3146,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 (";

@@ -2916,8 +3177,7 @@ 
 	  	{

 	  		$this->db->commit();

 	  		return 1;

-	  	}

-	  	else

+	  	} else

 	  	{

 	  		$this->error=$this->db->lasterror();

 	  		$this->db->rollback();

@@ -2962,12 +3222,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);

@@ -2990,15 +3254,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."')";

@@ -3019,13 +3285,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)

 					{

@@ -3042,10 +3306,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))

 					{

@@ -3057,29 +3323,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';

 					}

 

@@ -3088,20 +3346,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 +3367,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 +3380,14 @@ 
 								}

 							}

 						}

-					}

-					else

+					} else

 					{

 						unset($this->linkedObjectsIds[$objecttype]);

 					}

 				}

 			}

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -3156,8 +3409,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 +3422,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 +3434,7 @@ 
 		if ($this->db->query($sql))

 		{

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			return -1;

@@ -3203,8 +3457,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 +3473,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 +3495,7 @@ 
 		if ($this->db->query($sql))

 		{

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->errors[]=$this->error;

@@ -3271,17 +3524,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 +3559,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 +3598,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,8 +3633,13 @@ 
 	{

 		global $conf;

 

-		if (empty($id) && empty($ref)) return 0;

-		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.

+		if (empty($id) && empty($ref)) {
+		    return 0;
+		}
+		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) {
+		    return 0;
+		}
+		// To increase speed. Not enabled by default.

 

 		// Clean parameters

 		$ref = trim($ref);

@@ -3360,8 +3647,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)

@@ -3371,10 +3662,10 @@ 
 			{

 				$this->canvas   = $obj->canvas;

 				return 1;

-			}

-			else return 0;

-		}

-		else

+			} else {
+			    return 0;
+			}
+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -3411,7 +3702,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)

@@ -3445,18 +3738,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;

@@ -3466,8 +3759,9 @@ 
 		{

 			$this->errors[]="ErrorRecordHasChildren";

 			return $haschild;

-		}

-		else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

 	/**

@@ -3483,12 +3777,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;

@@ -3552,16 +3858,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

 			}

 

@@ -3569,8 +3883,7 @@ 
 			if ($this->element == 'shipping') {

 				// for shipments

 				$qty = $line->qty_shipped ? $line->qty_shipped : 0;

-			}

-			else {

+			} else {

 				$qty = $line->qty ? $line->qty : 0;

 			}

 

@@ -3586,19 +3899,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;

@@ -3607,18 +3931,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

 			}

@@ -3650,8 +3976,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			$this->db->commit();

 			return 1;

@@ -3703,13 +4028,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;

@@ -3746,14 +4069,14 @@ 
 					$this->libelle_incoterms = $obj->libelle;

 				}

 				return 1;

-			}

-			else

+			} else

 			{

 				$this->errors[] = $this->db->lasterror();

 				return -1;

 			}

-		}

-		else return -1;

+		} else {
+		    return -1;
+		}
 	}

 

 

@@ -3792,7 +4115,9 @@ 
 			} else {

 				$res=include $tpl; // for debug

 			}

-			if ($res) break;

+			if ($res) {
+			    break;
+			}
 		}

 	}

 

@@ -3822,7 +4147,9 @@ 
 

 		// Define usemargins

 		$usemargins=0;

-		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;

+		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) {
+		    $usemargins=1;
+		}
 

 		$num = count($this->lines);

 

@@ -3841,7 +4168,9 @@ 
 			print '<tr class="liste_titre nodrag nodrop">';

 

 			// Adds a line numbering column

-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';

+			if (! empty($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>';

@@ -3858,9 +4187,13 @@ 
 			print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';

 

 			// Multicurrency

-			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';

+			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $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>';

@@ -3881,25 +4214,32 @@ 
 			{

 				if (!empty($user->rights->margins->creer))

 				{

-					if ($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 ($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($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)

-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';

-				if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)

-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';

+				if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) {
+									print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
+				}
+				if (! empty($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($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';

+			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $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

 

@@ -3929,14 +4269,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

@@ -3983,8 +4324,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)

@@ -4013,8 +4360,13 @@ 
 

 					$outputlangs = $langs;

 					$newlang='';

-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');

-					if (! empty($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($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);

@@ -4022,8 +4374,7 @@ 
 					}

 

 					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;

-				}

-				else

+				} else

 				{

 					$label = $line->product_label;

 				}

@@ -4045,7 +4396,9 @@ 
 				} else {

 					$res=include $tpl; // for debug

 				}

-				if ($res) break;

+				if ($res) {
+				    break;
+				}
 			}

 		}

 

@@ -4068,7 +4421,9 @@ 
 				} else {

 					$res=include $tpl; // for debug

 				}

-				if ($res) break;

+				if ($res) {
+				    break;
+				}
 			}

 		}

 	}

@@ -4095,7 +4450,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($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';

+		if (!empty($conf->multicurrency->enabled)) {
+		    print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		}
 		print '<td align="right">'.$langs->trans('Qty').'</td>';

 		if($conf->global->PRODUCT_USE_UNITS)

 		{

@@ -4118,8 +4475,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);

 				}

@@ -4148,32 +4504,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;

@@ -4191,13 +4552,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 : '');

 			}

 			

@@ -4210,36 +4570,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;';

 		}

@@ -4247,17 +4606,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 ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));

+		if ($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

@@ -4270,7 +4635,9 @@ 
 			} else {

 				$res=include $tpl; // for debug

 			}

-			if ($res) break;

+			if ($res) {
+			    break;
+			}
 		}

 	}

 

@@ -4312,8 +4679,7 @@ 
 		{

 			$this->db->commit();

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

@@ -4348,8 +4714,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			if (! $notrigger)

 			{

@@ -4416,13 +4781,20 @@ 
 		// Search template files

 		$file=''; $classname=''; $filefound=0;

 		$dirmodels=array('/');

-		if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);

+		if (is_array($conf->modules_parts['models'])) {
+		    $dirmodels=array_merge($dirmodels,$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);

@@ -4433,7 +4805,9 @@ 
 					break;

 				}

 			}

-			if ($filefound) break;

+			if ($filefound) {
+			    break;
+			}
 		}

 

 		// If generator was found

@@ -4465,7 +4839,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);
+							}
 						}

 					}

 

@@ -4503,8 +4879,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);

 			}

@@ -4526,9 +4901,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);

 

@@ -4541,18 +4918,30 @@ 
 						if ($this->element == 'propal')

 						{

 							$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok

-							if ($useonlinesignature) $setsharekey=true;

-							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;

+							if ($useonlinesignature) {
+							    $setsharekey=true;
+							}
+							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    $setsharekey=true;
+							}
 						}

-						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey=true;

-						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey=true;

-						if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;

+						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+						    $setsharekey=true;
+						}
+						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+						    $setsharekey=true;
+						}
+						if ($this->element == 'bank_account' && ! empty($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);

 							}

 						}

@@ -4569,8 +4958,7 @@ 
 							{

 								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

 							}

-						}

-						else

+						} else

 						{

 							$ecmfile->entity = $conf->entity;

 							$ecmfile->filepath = $rel_dir;

@@ -4597,17 +4985,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);

 				}

@@ -4616,15 +5007,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);

@@ -4680,13 +5069,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);

@@ -4695,7 +5092,9 @@ 
 

 		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);

 		//var_dump($keyforfieldname);

-		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;

+		if (isset($conf->global->$keyforfieldname)) {
+		    return $conf->global->$keyforfieldname;
+		}
 

 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname

 	}

@@ -4729,8 +5128,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;

 			}

@@ -4754,7 +5152,9 @@ 
 	function fetch_optionals($rowid=null, $optionsArray=null)

 	{

         // phpcs:enable

-		if (empty($rowid)) $rowid=$this->id;

+		if (empty($rowid)) {
+		    $rowid=$this->id;
+		}
 

 		// To avoid SQL errors. Probably not the better solution though

 		if (!$this->table_element) {

@@ -4780,15 +5180,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)

@@ -4824,8 +5226,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;

 							}

@@ -4837,10 +5238,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;

@@ -4859,7 +5262,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);

@@ -4869,8 +5275,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			$this->db->commit();

 			return 1;

@@ -4891,11 +5296,16 @@ 
 	{

 		global $conf,$langs,$user;

 

-		if (empty($userused)) $userused=$user;

+		if (empty($userused)) {
+		    $userused=$user;
+		}
 

 		$error=0;

 

-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used

+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return 0;
+		}
+		// For avoid conflicts if trigger used

 

 		if (! empty($this->array_options))

 		{

@@ -4908,10 +5318,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)

@@ -4925,8 +5338,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);

@@ -4945,8 +5362,7 @@ 
 			   			{

 			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 			   				return -1;

-			  			}

-			   			elseif ($value=='')

+			  			} elseif ($value=='')

 			   			{

 			   				$new_array_options[$key] = null;

 			   			}

@@ -4958,8 +5374,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;

 						}

@@ -4984,27 +5399,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];

 			   			}

@@ -5030,26 +5445,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);

 						}

@@ -5060,7 +5479,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);

@@ -5071,8 +5493,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;

 

@@ -5080,13 +5504,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";

 					}

@@ -5107,7 +5532,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

 			}

 

@@ -5115,14 +5542,14 @@ 
 			{

 				$this->db->rollback();

 				return -1;

-			}

-			else

+			} else

 			{

 				$this->db->commit();

 				return 1;

 			}

-		}

-		else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

 	/**

@@ -5139,11 +5566,16 @@ 
 	{

 		global $conf,$langs,$user;

 

-		if (empty($userused)) $userused=$user;

+		if (empty($userused)) {
+		    $userused=$user;
+		}
 

 		$error=0;

 

-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used

+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return 0;
+		}
+		// For avoid conflicts if trigger used

 

 		if (! empty($this->array_options) && isset($this->array_options["options_".$key]))

 		{

@@ -5170,8 +5602,7 @@ 
 					{

 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);

 						return -1;

-					}

-					elseif ($value=='')

+					} elseif ($value=='')

 					{

 						$this->array_options["options_".$key] = null;

 					}

@@ -5183,8 +5614,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;

 					}

@@ -5236,7 +5666,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

 			}

 

@@ -5245,14 +5677,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;
+		}
 	}

 

 

@@ -5327,8 +5759,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 '';
+			}
 		}

 

 

@@ -5342,33 +5777,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';

 				}

@@ -5383,52 +5812,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($conf->fckeditor->enabled) && $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)) {

@@ -5437,22 +5864,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($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($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))

@@ -5462,10 +5886,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':'');

@@ -5473,8 +5901,7 @@ 
 				$out.='>'.$val.'</option>';

 			}

 			$out.='</select>';

-		}

-		elseif ($type == 'sellist')

+		} elseif ($type == 'sellist')

 		{

 			$out = '';

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

@@ -5541,13 +5968,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';

 				}

@@ -5583,8 +6008,7 @@ 
 							{

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

 							}

-						}

-						else

+						} else

 						{

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

 						}

@@ -5597,25 +6021,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>';

@@ -5635,19 +6059,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)

@@ -5658,13 +6079,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);

 			}

 

@@ -5779,8 +6198,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;

@@ -5802,8 +6222,7 @@ 
 					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);

@@ -5811,18 +6230,19 @@ 
 			if ($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)';

@@ -5900,17 +6320,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';

@@ -5921,7 +6349,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)

@@ -5937,36 +6367,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';

@@ -5975,59 +6398,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,$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]);

@@ -6057,7 +6473,7 @@ 
 				$sql.= " WHERE ".$selectkey."=0";

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

 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);

-			}else {

+			} else {

 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

 			}

 

@@ -6084,12 +6500,11 @@ 
 						}

 						if ($translabel!=$field_toshow) {

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

-						}else {

+						} else {

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

 						}

 					}

-				}

-				else

+				} else

 				{

 					$translabel='';

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

@@ -6097,18 +6512,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='';

@@ -6119,8 +6533,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);

 

@@ -6188,8 +6601,7 @@ 
 			} else {

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

 			}

-		}

-		elseif ($type == 'link')

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

 		{

 			$out='';

 

@@ -6211,24 +6623,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);

 		}

@@ -6255,7 +6664,9 @@ 
 	{

 		global $db, $conf, $langs, $action, $form;

 

-		if (! is_object($form)) $form=new Form($db);

+		if (! is_object($form)) {
+		    $form=new Form($db);
+		}
 

 		$out = '';

 

@@ -6269,7 +6680,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]))

@@ -6283,11 +6696,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) {

@@ -6321,8 +6741,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 ' : '');

@@ -6352,9 +6771,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;

 					}

@@ -6367,11 +6788,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 : '';

@@ -6388,8 +6816,11 @@ 
 

 					$out .= '</td>';

 

-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';

-					else $out .= '</tr>';

+					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+					    $out .= '</tr>';
+					} else {
+					    $out .= '</tr>';
+					}
 					$e++;

 				}

 			}

@@ -6441,7 +6872,9 @@ 
 		global $user;

 

 		$element = $this->element;

-		if ($element == 'facturerec') $element='facture';

+		if ($element == 'facturerec') {
+		    $element='facture';
+		}
 

 		return $user->rights->{$element};

 	}

@@ -6466,7 +6899,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;

 			}

@@ -6493,11 +6929,12 @@ 
 

 		$buyPrice = 0;

 

-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false

+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
+		    // In most cases, test here is false

 		{

-			$buyPrice = $unitPrice * (1 - $discountPercent / 100);

-		}

-		else

+			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
+		}
+		} else

 		{

 			// Get cost price for margin calculation

 			if (! empty($fk_product))

@@ -6515,13 +6952,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($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')

+				} else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')

 				{

 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

 					$product = new Product($this->db);

@@ -6544,8 +6979,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;

@@ -6591,8 +7025,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.'/';

@@ -6655,19 +7088,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";

 

@@ -6675,15 +7115,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)

 						{

@@ -6693,35 +7138,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>';

@@ -6746,15 +7191,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

@@ -6771,7 +7221,9 @@ 
 					}

 

 					// On continue ou on arrete de boucler ?

-					if ($nbmax && $nbphoto >= $nbmax) break;

+					if ($nbmax && $nbphoto >= $nbmax) {
+					    break;
+					}
 				}

 			}

 

@@ -6786,7 +7238,9 @@ 
 						$nbphoto++;

 					}

 

-					if ($nbphoto) $return.= '</table>';

+					if ($nbphoto) {
+					    $return.= '</table>';
+					}
 				}

 			}

 		}

@@ -6807,10 +7261,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;
+		}
 	}

 

 	/**

@@ -6823,10 +7281,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;
+		}
 	}

 

 	/**

@@ -6837,8 +7299,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;
+		}
 	}

 

 	/**

@@ -6851,10 +7316,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;
+		}
 	}

 

 	/**

@@ -6867,10 +7336,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;
+		}
 	}

 

 	/**

@@ -6883,10 +7356,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;
+		}
 	}

 

 	/**

@@ -6899,10 +7376,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;
+		}
 	}

 

 	/**

@@ -6916,21 +7397,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})) {

@@ -6940,28 +7421,35 @@ 
 				} else {

 					$queryarray[$field] = null;

 				}

-			}

-			else if($this->isInt($info))

+			} else if($this->isInt($info))

 			{

-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;

-				else

+				if ($field == 'entity' && is_null($this->{$field})) {
+				    $queryarray[$field]=$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;

@@ -6979,42 +7467,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;
+		}
 	}

 

 	/**

@@ -7037,9 +7530,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)."'";
+		}
 	}

 

 

@@ -7059,8 +7556,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();

@@ -7075,8 +7576,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']))

@@ -7086,11 +7591,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();

 

@@ -7116,7 +7627,9 @@ 
 		if (! $error)

 		{

 			$result=$this->insertExtraFields();

-			if ($result < 0) $error++;

+			if ($result < 0) {
+			    $error++;
+			}
 		}

 

 		// Triggers

@@ -7149,15 +7662,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);

@@ -7168,13 +7690,11 @@ 
 			{

 				$this->setVarsFromFetchObj($obj);

 				return $this->id;

-			}

-			else

+			} else

 			{

 				return 0;

 			}

-		}

-		else

+		} else

 		{

 			$this->error = $this->db->lasterror();

 			$this->errors[] = $this->error;

@@ -7198,8 +7718,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();

@@ -7214,8 +7738,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));

 			/*

@@ -7296,10 +7826,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);

@@ -7406,7 +7937,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);