Fix infinit logs

Fix can set desiredstock to (int) 0 from API Rest

build/generate_filelist_xml.php

@@ -99,6 +99,7 @@ else
 }
 
 print "Release                        : ".$release."\n";
+print "Working on files into          : ".DOL_DOCUMENT_ROOT."\n";
 print "Include custom in signature    : ".$includecustom."\n";
 print "Include constants in signature : ";
 foreach ($includeconstants as $countrycode => $tmp)

htdocs/contact/list.php

@@ -290,7 +290,7 @@ if ($search_firstname)              $sql.= natural_search('p.firstname', $search
 if ($search_societe)                $sql.= natural_search('s.nom', $search_societe);
 if (strlen($search_poste))          $sql.= natural_search('p.poste', $search_poste);
 if (strlen($search_phone_perso))    $sql.= natural_search('p.phone_perso', $search_phone_perso);
-if (strlen($search_phone_pro))      $sql.= natural_search('p.phone', $search_phone);
+if (strlen($search_phone_pro))      $sql.= natural_search('p.phone', $search_phone_pro);
 if (strlen($search_phone_mobile))   $sql.= natural_search('p.phone_mobile', $search_phone_mobile);
 if (strlen($search_fax))            $sql.= natural_search('p.fax', $search_fax);
 if (strlen($search_skype))          $sql.= natural_search('p.skype', $search_skype);

htdocs/core/class/html.form.class.php

@@ -3242,7 +3242,7 @@ class Form
 			            if ($obj->situation_final != 1) {
 							//Not prov?
 			                if (substr($obj->facnumber, 1, 4) != 'PROV') {
-			                    if ($selected == $obj->situation_final) {
+			                    if ($selected == $obj->rowid) {
 			                        $opt .= '<option value="' . $obj->rowid . '" selected>' . $obj->facnumber . '</option>';
 								} else {
 								    $opt .= '<option value="' . $obj->rowid . '">' . $obj->facnumber . '</option>';

htdocs/core/class/html.formfile.class.php

@@ -776,16 +776,16 @@ class FormFile
             {
                 $colspan=2;
 
-                foreach($link_list as $file)
+                foreach($link_list as $link)
                 {
                     $out.='<tr class="oddeven">';
                     $out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
                     $out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
-                    $out.=$file->label;
+                    $out.=$link->label;
                     $out.='</a>';
                     $out.='</td>';
                     $out.='<td align="right">';
-                    $out.=dol_print_date($file->datea,'dayhour');
+                    $out.=dol_print_date($link->datea,'dayhour');
                     $out.='</td>';
                     if ($delallowed || $printer || $morepicto) $out.='<td></td>';
                     $out.='</tr>'."\n";

htdocs/core/class/utils.class.php

@@ -292,17 +292,19 @@ class Utils
 		        dol_syslog("Run command ".$fullcommandcrypted);
 		        $handlein = popen($fullcommandclear, 'r');
 		        $i=0;
-		        while (!feof($handlein))
-		        {
-		            $i++;   // output line number
-		            $read = fgets($handlein);
-		            // Exclude warning line we don't want
-		            if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-		            fwrite($handle,$read);
-		            if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-		            elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+		        if ($handlein) {
+			        while (!feof($handlein))
+			        {
+			            $i++;   // output line number
+			            $read = fgets($handlein);
+			            // Exclude warning line we don't want
+			            if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+			            fwrite($handle,$read);
+			            if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
+			            elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+			        }
+			        pclose($handlein);
 		        }
-		        pclose($handlein);
 
 		        if ($compression == 'none') fclose($handle);
 		        if ($compression == 'gz')   gzclose($handle);

htdocs/core/lib/functions.lib.php

@@ -1251,6 +1251,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                         {
                         	if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
                         	{
+                        	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
                             	$ret = dol_convert_file($file, 'png', $fileimage);
                             	if ($ret < 0) $error++;
                         	}

htdocs/core/lib/security.lib.php

@@ -377,7 +377,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 		if ($feature == 'project') $feature='projet';
 		if ($feature == 'task') $feature='projet_task';
 
-		$check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie'); // Test on entity only (Objects with no link to company)
+		$check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie','expensereport'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe');	 // Test for societe object
 		$checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
 		$checkproject = array('projet','project'); // Test for project object

htdocs/core/lib/security2.lib.php

@@ -126,179 +126,181 @@ function checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmod
  * @param		Societe		$mysoc		Company object
  * @return		void
  */
-function dol_loginfunction($langs,$conf,$mysoc)
-{
-	global $dolibarr_main_demo,$db;
-	global $smartphone,$hookmanager;
-
-	// Instantiate hooks of thirdparty module only if not already define
-	$hookmanager->initHooks(array('mainloginpage'));
-
-	$langs->load("main");
-	$langs->load("other");
-	$langs->load("help");
-	$langs->load("admin");
-
-	$main_authentication=$conf->file->main_authentication;
-	$session_name=session_name();
-
-	$dol_url_root = DOL_URL_ROOT;
-
-	// Title
-	$appli=constant('DOL_APPLICATION_TITLE');
-	$title=$appli.' '.constant('DOL_VERSION');
-	if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
-	$titletruedolibarrversion=constant('DOL_VERSION');	// $title used by login template after the @ to inform of true Dolibarr version
-
-	// Note: $conf->css looks like '/theme/eldy/style.css.php'
-	$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
-	$themepath=dol_buildpath($conf->css,1);
-	if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
+if (! function_exists('dol_loginfunction')) {
+	function dol_loginfunction($langs,$conf,$mysoc)
 	{
-		foreach($conf->modules_parts['theme'] as $reldir)
+		global $dolibarr_main_demo,$db;
+		global $smartphone,$hookmanager;
+	
+		// Instantiate hooks of thirdparty module only if not already define
+		$hookmanager->initHooks(array('mainloginpage'));
+	
+		$langs->load("main");
+		$langs->load("other");
+		$langs->load("help");
+		$langs->load("admin");
+	
+		$main_authentication=$conf->file->main_authentication;
+		$session_name=session_name();
+	
+		$dol_url_root = DOL_URL_ROOT;
+	
+		// Title
+		$appli=constant('DOL_APPLICATION_TITLE');
+		$title=$appli.' '.constant('DOL_VERSION');
+		if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
+		$titletruedolibarrversion=constant('DOL_VERSION');	// $title used by login template after the @ to inform of true Dolibarr version
+	
+		// Note: $conf->css looks like '/theme/eldy/style.css.php'
+		$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
+		$themepath=dol_buildpath($conf->css,1);
+		if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
 		{
-			if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
+			foreach($conf->modules_parts['theme'] as $reldir)
 			{
-				$themepath=dol_buildpath($reldir.$conf->css, 1);
-				break;
+				if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
+				{
+					$themepath=dol_buildpath($reldir.$conf->css, 1);
+					break;
+				}
 			}
 		}
-	}
-	$conf_css = $themepath."?lang=".$langs->defaultlang;
-
-	// Select templates dir
-	if (! empty($conf->modules_parts['tpl']))	// Using this feature slow down application
-	{
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl/'));
-		foreach($dirtpls as $reldir)
+		$conf_css = $themepath."?lang=".$langs->defaultlang;
+	
+		// Select templates dir
+		if (! empty($conf->modules_parts['tpl']))	// Using this feature slow down application
 		{
-			$tmp=dol_buildpath($reldir.'login.tpl.php');
-			if (file_exists($tmp)) { $template_dir=preg_replace('/login\.tpl\.php$/','',$tmp); break; }
+			$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl/'));
+			foreach($dirtpls as $reldir)
+			{
+				$tmp=dol_buildpath($reldir.'login.tpl.php');
+				if (file_exists($tmp)) { $template_dir=preg_replace('/login\.tpl\.php$/','',$tmp); break; }
+			}
 		}
-	}
-	else
-	{
-		$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
-	}
-
-	// Set cookie for timeout management
-	$prefix=dol_getprefix();
-	$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-	if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", '', 0);
-
-	if (GETPOST('urlfrom','alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom','alpha');
-	else unset($_SESSION["urlfrom"]);
-
-	if (! GETPOST("username")) $focus_element='username';
-	else $focus_element='password';
-
-	$demologin='';
-	$demopassword='';
-	if (! empty($dolibarr_main_demo))
-	{
-		$tab=explode(',',$dolibarr_main_demo);
-		$demologin=$tab[0];
-		$demopassword=$tab[1];
-	}
-
-	// Execute hook getLoginPageOptions (for table)
-	$parameters=array('entity' => GETPOST('entity','int'));
-	$reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters);    // Note that $action and $object may have been modified by some hooks.
-	if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
-		$morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
-	} else {
-		$morelogincontent = $hookmanager->resPrint;
-	}
-
-	// Execute hook getLoginPageExtraOptions (eg for js)
-	$parameters=array('entity' => GETPOST('entity','int'));
-	$reshook = $hookmanager->executeHooks('getLoginPageExtraOptions',$parameters);    // Note that $action and $object may have been modified by some hooks.
-	$moreloginextracontent = $hookmanager->resPrint;
-
-	// Login
-	$login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));
-	$password = $demopassword;
-
-	// Show logo (search in order: small company logo, large company logo, theme logo, common logo)
-	$width=0;
-	$urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
-
-	if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
-	{
-		$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_small);
-	}
-	elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
-	{
-		$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($mysoc->logo);
-		$width=128;
-	}
-	elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
-	{
-		$urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
-	}
-	elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
-	{
-		$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
-	}
-
-	// Security graphical code
-	$captcha=0;
-	$captcha_refresh='';
-	if (function_exists("imagecreatefrompng") && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
-	{
-		$captcha=1;
-		$captcha_refresh=img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
-	}
-
-	// Extra link
-	$forgetpasslink=0;
-	$helpcenterlink=0;
-	if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
-	{
-		if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
+		else
 		{
-			$forgetpasslink=1;
+			$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 		}
-
-		if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+	
+		// Set cookie for timeout management
+		$prefix=dol_getprefix();
+		$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
+		if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", '', 0);
+	
+		if (GETPOST('urlfrom','alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom','alpha');
+		else unset($_SESSION["urlfrom"]);
+	
+		if (! GETPOST("username")) $focus_element='username';
+		else $focus_element='password';
+	
+		$demologin='';
+		$demopassword='';
+		if (! empty($dolibarr_main_demo))
 		{
-			$helpcenterlink=1;
+			$tab=explode(',',$dolibarr_main_demo);
+			$demologin=$tab[0];
+			$demopassword=$tab[1];
 		}
+	
+		// Execute hook getLoginPageOptions (for table)
+		$parameters=array('entity' => GETPOST('entity','int'));
+		$reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters);    // Note that $action and $object may have been modified by some hooks.
+		if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
+			$morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
+		} else {
+			$morelogincontent = $hookmanager->resPrint;
+		}
+	
+		// Execute hook getLoginPageExtraOptions (eg for js)
+		$parameters=array('entity' => GETPOST('entity','int'));
+		$reshook = $hookmanager->executeHooks('getLoginPageExtraOptions',$parameters);    // Note that $action and $object may have been modified by some hooks.
+		$moreloginextracontent = $hookmanager->resPrint;
+	
+		// Login
+		$login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));
+		$password = $demopassword;
+	
+		// Show logo (search in order: small company logo, large company logo, theme logo, common logo)
+		$width=0;
+		$urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
+	
+		if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
+		{
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_small);
+		}
+		elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+		{
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($mysoc->logo);
+			$width=128;
+		}
+		elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
+		{
+			$urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
+		}
+		elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
+		{
+			$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+		}
+	
+		// Security graphical code
+		$captcha=0;
+		$captcha_refresh='';
+		if (function_exists("imagecreatefrompng") && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+		{
+			$captcha=1;
+			$captcha_refresh=img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
+		}
+	
+		// Extra link
+		$forgetpasslink=0;
+		$helpcenterlink=0;
+		if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+		{
+			if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
+			{
+				$forgetpasslink=1;
+			}
+	
+			if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+			{
+				$helpcenterlink=1;
+			}
+		}
+	
+		// Home message
+		$main_home='';
+		if (! empty($conf->global->MAIN_HOME))
+		{
+		    $substitutionarray=getCommonSubstitutionArray($langs);
+		    complete_substitutions_array($substitutionarray, $langs);
+		    $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
+	
+			$main_home=dol_htmlcleanlastbr($texttoshow);
+		}
+	
+		// Google AD
+		$main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
+	
+		// Set jquery theme
+		$dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
+		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
+		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
+		$jquerytheme = 'smoothness';
+		if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+	
+		// Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
+		$dol_hide_topmenu=GETPOST('dol_hide_topmenu','int');
+		$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int');
+		$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int');
+		$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int');
+		$dol_use_jmobile=GETPOST('dol_use_jmobile','int');
+	
+		// Include login page template
+		include $template_dir.'login.tpl.php';
+	
+	
+		$_SESSION["dol_loginmesg"] = '';
 	}
-
-	// Home message
-	$main_home='';
-	if (! empty($conf->global->MAIN_HOME))
-	{
-	    $substitutionarray=getCommonSubstitutionArray($langs);
-	    complete_substitutions_array($substitutionarray, $langs);
-	    $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
-
-		$main_home=dol_htmlcleanlastbr($texttoshow);
-	}
-
-	// Google AD
-	$main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
-
-	// Set jquery theme
-	$dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
-	$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-	if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-	$jquerytheme = 'smoothness';
-	if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-
-	// Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
-	$dol_hide_topmenu=GETPOST('dol_hide_topmenu','int');
-	$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int');
-	$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int');
-	$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int');
-	$dol_use_jmobile=GETPOST('dol_use_jmobile','int');
-
-	// Include login page template
-	include $template_dir.'login.tpl.php';
-
-
-	$_SESSION["dol_loginmesg"] = '';
 }
 
 /**

htdocs/fourn/class/fournisseur.commande.class.php

@@ -1178,7 +1178,7 @@ class CommandeFournisseur extends CommonOrder
                         false,
 	                    $this->lines[$i]->date_start,
                         $this->lines[$i]->date_end,
-                        0,
+                        $this->lines[$i]->array_options,
                         $this->lines[$i]->fk_unit
 	                );
 	                if ($result < 0)
@@ -1288,6 +1288,10 @@ class CommandeFournisseur extends CommonOrder
 
 		$this->db->begin();
 
+        // get extrafields so they will be clone
+        foreach($this->lines as $line)
+            $line->fetch_optionals($line->rowid);
+
 		// Load source object
 		$objFrom = clone $this;
 
@@ -3017,48 +3021,59 @@ class CommandeFournisseurLigne extends CommonOrderLine
         if ($result)
         {
             $objp = $this->db->fetch_object($result);
-
-            $this->rowid            = $objp->rowid;
-            $this->id               = $objp->rowid;
-            $this->fk_commande      = $objp->fk_commande;
-            $this->desc             = $objp->description;
-            $this->qty              = $objp->qty;
-            $this->ref_fourn        = $objp->ref;
-            $this->ref_supplier     = $objp->ref;
-            $this->subprice         = $objp->subprice;
-            $this->tva_tx           = $objp->tva_tx;
-            $this->localtax1_tx		= $objp->localtax1_tx;
-            $this->localtax2_tx		= $objp->localtax2_tx;
-            $this->localtax1_type	= $objp->localtax1_type;
-            $this->localtax2_type	= $objp->localtax2_type;
-            $this->remise           = $objp->remise;
-            $this->remise_percent   = $objp->remise_percent;
-            $this->fk_product       = $objp->fk_product;
-            $this->info_bits        = $objp->info_bits;
-            $this->total_ht         = $objp->total_ht;
-            $this->total_tva        = $objp->total_tva;
-            $this->total_localtax1	= $objp->total_localtax1;
-            $this->total_localtax2	= $objp->total_localtax2;
-            $this->total_ttc        = $objp->total_ttc;
-            $this->product_type     = $objp->product_type;
-            $this->special_code     = $objp->special_code;
-
-            $this->ref	            = $objp->product_ref;
-            $this->product_ref      = $objp->product_ref;
-            $this->product_libelle  = $objp->product_libelle;
-            $this->product_desc     = $objp->product_desc;
-
-            $this->date_start       		= $this->db->jdate($objp->date_start);
-            $this->date_end         		= $this->db->jdate($objp->date_end);
-	        $this->fk_unit          		= $objp->fk_unit;
-
-			$this->multicurrency_subprice	= $objp->multicurrency_subprice;
-			$this->multicurrency_total_ht	= $objp->multicurrency_total_ht;
-			$this->multicurrency_total_tva	= $objp->multicurrency_total_tva;
-			$this->multicurrency_total_ttc	= $objp->multicurrency_total_ttc;
-
-            $this->db->free($result);
-            return 1;
+            
+            if (!empty($objp))
+            {
+                
+    
+                $this->rowid            = $objp->rowid;
+                $this->id               = $objp->rowid;
+                $this->fk_commande      = $objp->fk_commande;
+                $this->desc             = $objp->description;
+                $this->qty              = $objp->qty;
+                $this->ref_fourn        = $objp->ref;
+                $this->ref_supplier     = $objp->ref;
+                $this->subprice         = $objp->subprice;
+                $this->tva_tx           = $objp->tva_tx;
+                $this->localtax1_tx		= $objp->localtax1_tx;
+                $this->localtax2_tx		= $objp->localtax2_tx;
+                $this->localtax1_type	= $objp->localtax1_type;
+                $this->localtax2_type	= $objp->localtax2_type;
+                $this->remise           = $objp->remise;
+                $this->remise_percent   = $objp->remise_percent;
+                $this->fk_product       = $objp->fk_product;
+                $this->info_bits        = $objp->info_bits;
+                $this->total_ht         = $objp->total_ht;
+                $this->total_tva        = $objp->total_tva;
+                $this->total_localtax1	= $objp->total_localtax1;
+                $this->total_localtax2	= $objp->total_localtax2;
+                $this->total_ttc        = $objp->total_ttc;
+                $this->product_type     = $objp->product_type;
+                $this->special_code     = $objp->special_code;
+    
+                $this->ref	            = $objp->product_ref;
+                $this->product_ref      = $objp->product_ref;
+                $this->product_libelle  = $objp->product_libelle;
+                $this->product_desc     = $objp->product_desc;
+    
+                $this->date_start       		= $this->db->jdate($objp->date_start);
+                $this->date_end         		= $this->db->jdate($objp->date_end);
+    	        $this->fk_unit          		= $objp->fk_unit;
+    
+    			$this->multicurrency_subprice	= $objp->multicurrency_subprice;
+    			$this->multicurrency_total_ht	= $objp->multicurrency_total_ht;
+    			$this->multicurrency_total_tva	= $objp->multicurrency_total_tva;
+    			$this->multicurrency_total_ttc	= $objp->multicurrency_total_ttc;
+    
+                $this->db->free($result);
+                return 1;
+            }
+            else
+            {
+                $this->error='Supplier order line  with id='.$rowid.' not found';
+                dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
+                return 0;
+            }
         }
         else
         {

htdocs/holiday/card.php

@@ -568,7 +568,7 @@ if ($action == 'confirm_refuse')
         }
 
     } else {
-        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&error=NoMotifRefuse');
+        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'&error=NoMotifRefuse');
         exit;
     }
 }

htdocs/holiday/define_holiday.php

@@ -205,7 +205,7 @@ if ($result < 0)
 	setEventMessages($holiday->error, $holiday->errors, 'errors');
 }
 
-$filters=natural_search(array('u.firstname','u.lastname'), $search_name);
+if(!empty($search_name)) $filters=natural_search(array('u.firstname','u.lastname'), $search_name);
 
 $listUsers = $holiday->fetchUsers(false,true,$filters);
 if (is_numeric($listUsers) && $listUsers < 0)

htdocs/hrm/index.php

@@ -299,7 +299,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 {
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut, u.photo, x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
 	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
-	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	//if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE u.rowid = x.fk_user_author";
 	$sql.= " AND x.entity = ".$conf->entity;
 	if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) $sql.=' AND x.fk_user_author IN ('.join(',',$childids).')';

htdocs/margin/lib/margins.lib.php

@@ -96,6 +96,9 @@ function marges_prepare_head()
 		$head[$h][2] = 'checkMargins';
 	}
 
+	complete_head_from_modules($conf,$langs,null,$head,$h,'margins','remove');
+	complete_head_from_modules($conf,$langs,null,$head,$h,'margins');
+
 	return $head;
 }
 

htdocs/product/class/product.class.php

@@ -884,7 +884,7 @@ class Product extends CommonObject
 			$sql.= ", duration = '" . $this->db->escape($this->duration_value . $this->duration_unit) ."'";
 			$sql.= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy)."'";
 			$sql.= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell)."'";
-			$sql.= ", desiredstock = " . ((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");
+			$sql.= ", desiredstock = " . ((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? $this->desiredstock : "null");
 			$sql.= ", cost_price = " . ($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
 	        $sql.= ", fk_unit= " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
 	        $sql.= ", price_autogen = " . (!$this->price_autogen ? 0 : 1);